Skip to content

Commit d404b79

Browse files
committed
fix
1 parent c79f4db commit d404b79

File tree

4 files changed

+11
-12
lines changed

4 files changed

+11
-12
lines changed

packages/eslint-plugin-svelte/src/rules/block-lang.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { createRule } from '../utils/index.js';
22
import { findAttribute, getLangValue } from '../utils/ast-utils.js';
3-
import type { SvelteScriptElement, SvelteStyleElement } from 'svelte-eslint-parser/lib/ast';
3+
import type { AST } from 'svelte-eslint-parser';
44
import type { SuggestionReportDescriptor, SourceCode } from '../types.js';
55

66
export default createRule('block-lang', {
@@ -68,13 +68,13 @@ export default createRule('block-lang', {
6868
const allowedScriptLangs: (string | null)[] = Array.isArray(scriptOption)
6969
? scriptOption
7070
: [scriptOption];
71-
const scriptNodes: SvelteScriptElement[] = [];
71+
const scriptNodes: AST.SvelteScriptElement[] = [];
7272

7373
const styleOption: string | null | (string | null)[] = context.options[0]?.style ?? null;
7474
const allowedStyleLangs: (string | null)[] = Array.isArray(styleOption)
7575
? styleOption
7676
: [styleOption];
77-
const styleNodes: SvelteStyleElement[] = [];
77+
const styleNodes: AST.SvelteStyleElement[] = [];
7878

7979
return {
8080
SvelteScriptElement(node) {
@@ -153,7 +153,7 @@ function buildAddLangSuggestions(
153153

154154
function buildReplaceLangSuggestions(
155155
langs: (string | null)[],
156-
node: SvelteScriptElement | SvelteStyleElement
156+
node: AST.SvelteScriptElement | AST.SvelteStyleElement
157157
): SuggestionReportDescriptor[] {
158158
const tagName = node.name.name;
159159
const langAttribute = findAttribute(node, 'lang');

packages/eslint-plugin-svelte/src/rules/consistent-selector-style.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import type {
66
Node as SelectorNode,
77
Tag as SelectorTag
88
} from 'postcss-selector-parser';
9-
import type { SvelteHTMLElement } from 'svelte-eslint-parser/lib/ast';
109
import { findClassesInAttribute } from '../utils/ast-utils.js';
1110
import {
1211
extractExpressionPrefixLiteral,
@@ -286,7 +285,7 @@ function addToArrayMap<T>(
286285
/**
287286
* Finds all nodes in selections that could be matched by key
288287
*/
289-
function matchSelection(selections: Selections, key: string): SvelteHTMLElement[] {
288+
function matchSelection(selections: Selections, key: string): AST.SvelteHTMLElement[] {
290289
const selection = selections.exact.get(key) ?? [];
291290
selections.affixes.forEach((nodes, [prefix, suffix]) => {
292291
if ((prefix === null || key.startsWith(prefix)) && (suffix === null || key.endsWith(suffix))) {

packages/eslint-plugin-svelte/src/rules/no-navigation-without-base.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { ReferenceTracker } from '@eslint-community/eslint-utils';
44
import { findVariable } from '../utils/ast-utils.js';
55
import { extractExpressionPrefixVariable } from '../utils/expression-affixes.js';
66
import type { RuleContext } from '../types.js';
7-
import type { SvelteLiteral } from 'svelte-eslint-parser/lib/ast';
7+
import type { AST } from 'svelte-eslint-parser';
88

99
export default createRule('no-navigation-without-base', {
1010
meta: {
@@ -236,7 +236,7 @@ function expressionIsEmpty(url: TSESTree.Expression): boolean {
236236
);
237237
}
238238

239-
function expressionIsAbsolute(url: SvelteLiteral | TSESTree.Expression): boolean {
239+
function expressionIsAbsolute(url: AST.SvelteLiteral | TSESTree.Expression): boolean {
240240
switch (url.type) {
241241
case 'BinaryExpression':
242242
return binaryExpressionIsAbsolute(url);
@@ -269,7 +269,7 @@ function urlValueIsAbsolute(url: string): boolean {
269269
return url.includes('://');
270270
}
271271

272-
function expressionIsFragment(url: SvelteLiteral | TSESTree.Expression): boolean {
272+
function expressionIsFragment(url: AST.SvelteLiteral | TSESTree.Expression): boolean {
273273
switch (url.type) {
274274
case 'BinaryExpression':
275275
return binaryExpressionIsFragment(url);

packages/eslint-plugin-svelte/src/utils/expression-affixes.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { TSESTree } from '@typescript-eslint/types';
22
import { findVariable } from './ast-utils.js';
33
import type { RuleContext } from '../types.js';
4-
import type { SvelteLiteral } from 'svelte-eslint-parser/lib/ast';
4+
import type { AST } from 'svelte-eslint-parser';
55

66
// Variable prefix extraction
77

@@ -80,7 +80,7 @@ function extractTemplateLiteralPrefixVariable(
8080

8181
export function extractExpressionPrefixLiteral(
8282
context: RuleContext,
83-
expression: SvelteLiteral | TSESTree.Node
83+
expression: AST.SvelteLiteral | TSESTree.Node
8484
): string | null {
8585
switch (expression.type) {
8686
case 'BinaryExpression':
@@ -147,7 +147,7 @@ function extractTemplateLiteralPrefixLiteral(
147147

148148
export function extractExpressionSuffixLiteral(
149149
context: RuleContext,
150-
expression: SvelteLiteral | TSESTree.Node
150+
expression: AST.SvelteLiteral | TSESTree.Node
151151
): string | null {
152152
switch (expression.type) {
153153
case 'BinaryExpression':

0 commit comments

Comments
 (0)