Skip to content

Commit 33ab678

Browse files
committed
refactor: update syntax and types to new ast
1 parent d142f82 commit 33ab678

File tree

6 files changed

+19
-18
lines changed

6 files changed

+19
-18
lines changed

src/parsers/importDeclaration.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ import path from 'path';
33
import fs, { constants } from 'fs';
44
import MagicString from 'magic-string';
55
import { parse } from 'svelte/compiler';
6-
import { walk } from 'estree-walker';
7-
import type { TemplateNode } from 'svelte/types/compiler/interfaces.d';
6+
import { walk, type BaseNode } from 'estree-walker';
7+
import type { TemplateNode } from 'svelte/types/compiler/interfaces';
88
import type Processor from '../processors/processor';
99

1010
/**
1111
* Parse CssModules Imports
1212
*/
1313
export default (processor: Processor): void => {
14-
const ast = (processor.ast as unknown) as TemplateNode;
14+
const ast = processor.ast as unknown as BaseNode;
1515
const backup = {
1616
ast: processor.ast,
1717
magicContent: processor.magicContent,

src/parsers/template.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { walk } from 'estree-walker';
2-
import type { Attribute, TemplateNode } from 'svelte/types/compiler/interfaces.d';
1+
import { walk, type BaseNode } from 'estree-walker';
2+
import type { Attribute, TemplateNode } from 'svelte/types/compiler/interfaces';
33
import type Processor from '../processors/processor';
44

55
interface CssVariables {
@@ -118,7 +118,7 @@ export default (processor: Processor): void => {
118118

119119
const cssVar = cssVariables(processor);
120120

121-
walk(processor.ast.html, {
121+
walk(processor.ast.html as BaseNode, {
122122
enter(baseNode) {
123123
const node = baseNode as TemplateNode;
124124
if (node.type === 'Script' || node.type === 'Style') {

src/processors/mixed.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { walk } from 'estree-walker';
2-
import type { Ast, TemplateNode } from 'svelte/types/compiler/interfaces.d';
1+
import { walk, type BaseNode } from 'estree-walker';
2+
import type { Ast, TemplateNode } from 'svelte/types/compiler/interfaces';
33
import type { PluginOptions } from '../types';
44
import Processor from './processor';
55

@@ -31,7 +31,7 @@ const updateSelectorBoundaries = (
3131
* @param processor The CSS Module Processor
3232
*/
3333
const parser = (processor: Processor): void => {
34-
const ast = (processor.ast as unknown) as TemplateNode;
34+
const ast = processor.ast as unknown as BaseNode;
3535
walk(ast, {
3636
enter(baseNode) {
3737
const node = baseNode as TemplateNode;

src/processors/native.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { walk } from 'estree-walker';
2-
import type { Ast, TemplateNode } from 'svelte/types/compiler/interfaces.d';
1+
import { walk, type BaseNode } from 'estree-walker';
2+
import type { Ast, TemplateNode } from 'svelte/types/compiler/interfaces';
33
import type { PluginOptions } from '../types';
44
import Processor from './processor';
55

@@ -32,7 +32,7 @@ const updateSelectorBoundaries = (
3232
* @param processor The CSS Module Processor
3333
*/
3434
const parser = (processor: Processor): void => {
35-
const ast = (processor.ast as unknown) as TemplateNode;
35+
const ast = processor.ast as unknown as BaseNode;
3636
let selectorBoundaries: Boundaries[] = [];
3737

3838
walk(ast, {

src/processors/processor.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export default class Processor {
2222

2323
public ast: Ast;
2424
public style: {
25-
ast: Style;
25+
ast?: Style;
2626
openTag: string;
2727
closeTag: string;
2828
};
@@ -62,7 +62,7 @@ export default class Processor {
6262
const generatedClassName = createClassName(
6363
this.filename,
6464
this.rawContent,
65-
this.ast.css.content.styles,
65+
this.ast.css?.content.styles ?? '',
6666
name,
6767
this.options
6868
);
@@ -125,7 +125,7 @@ export default class Processor {
125125
const varName = child.type === 'String' ? name.replace(/\./, '-') : name;
126126
const generatedVarName = generateName(
127127
this.filename,
128-
this.ast.css.content.styles,
128+
this.ast.css?.content.styles ?? '',
129129
varName,
130130
{
131131
hashSeeder: ['style', 'filepath'],

src/processors/scoped.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import { walk } from 'estree-walker';
2-
import type { Ast, TemplateNode } from 'svelte/types/compiler/interfaces.d';
1+
import { walk, type BaseNode } from 'estree-walker';
2+
import type { Ast, TemplateNode } from 'svelte/types/compiler/interfaces';
3+
34
import type { PluginOptions } from '../types';
45
import Processor from './processor';
56

@@ -8,7 +9,7 @@ import Processor from './processor';
89
* @param processor The CSS Module Processor
910
*/
1011
const parser = (processor: Processor): void => {
11-
const ast = (processor.ast as unknown) as TemplateNode;
12+
const ast = processor.ast as unknown as BaseNode;
1213
walk(ast, {
1314
enter(baseNode) {
1415
const node = baseNode as TemplateNode;

0 commit comments

Comments
 (0)