From 703a22f917ab90994d991297ed40622670c69982 Mon Sep 17 00:00:00 2001 From: baseballyama Date: Mon, 10 Mar 2025 10:03:17 +0900 Subject: [PATCH] fix: check property key instead of value in `valid-prop-names-in-kit-pages` rule --- .changeset/gentle-guests-cross.md | 5 +++++ .../src/rules/valid-prop-names-in-kit-pages.ts | 8 ++++---- .../invalid/errors.yaml | 8 -------- .../svelte-config-from-parser-options/errors.yaml | 8 -------- .../invalid/svelte-config/errors.yaml | 8 -------- .../valid/svelte5-typescript/+page.svelte | 5 +++++ .../valid/svelte5-typescript/_config.json | 13 +++++++++++++ .../valid/svelte5-typescript/requirements.json | 3 +++ 8 files changed, 30 insertions(+), 28 deletions(-) create mode 100644 .changeset/gentle-guests-cross.md create mode 100644 packages/eslint-plugin-svelte/tests/fixtures/rules/valid-prop-names-in-kit-pages/valid/svelte5-typescript/+page.svelte create mode 100644 packages/eslint-plugin-svelte/tests/fixtures/rules/valid-prop-names-in-kit-pages/valid/svelte5-typescript/_config.json create mode 100644 packages/eslint-plugin-svelte/tests/fixtures/rules/valid-prop-names-in-kit-pages/valid/svelte5-typescript/requirements.json diff --git a/.changeset/gentle-guests-cross.md b/.changeset/gentle-guests-cross.md new file mode 100644 index 000000000..ab6a65e2e --- /dev/null +++ b/.changeset/gentle-guests-cross.md @@ -0,0 +1,5 @@ +--- +'eslint-plugin-svelte': patch +--- + +fix: check property key instead of value in `valid-prop-names-in-kit-pages` rule diff --git a/packages/eslint-plugin-svelte/src/rules/valid-prop-names-in-kit-pages.ts b/packages/eslint-plugin-svelte/src/rules/valid-prop-names-in-kit-pages.ts index f6b21ddcf..5554b9cf7 100644 --- a/packages/eslint-plugin-svelte/src/rules/valid-prop-names-in-kit-pages.ts +++ b/packages/eslint-plugin-svelte/src/rules/valid-prop-names-in-kit-pages.ts @@ -16,12 +16,12 @@ function checkProp( for (const p of node.id.properties) { if ( p.type === 'Property' && - p.value.type === 'Identifier' && - !expectedPropNames.includes(p.value.name) + p.key.type === 'Identifier' && + !expectedPropNames.includes(p.key.name) ) { context.report({ - node: p.value, - loc: p.value.loc, + node: p.key, + loc: p.key.loc, messageId: 'unexpected' }); } diff --git a/packages/eslint-plugin-svelte/tests/fixtures/rules/valid-prop-names-in-kit-pages/invalid/errors.yaml b/packages/eslint-plugin-svelte/tests/fixtures/rules/valid-prop-names-in-kit-pages/invalid/errors.yaml index 56a75c0ec..1a2975901 100644 --- a/packages/eslint-plugin-svelte/tests/fixtures/rules/valid-prop-names-in-kit-pages/invalid/errors.yaml +++ b/packages/eslint-plugin-svelte/tests/fixtures/rules/valid-prop-names-in-kit-pages/invalid/errors.yaml @@ -14,11 +14,3 @@ line: 4 column: 20 suggestions: null -- message: disallow props other than data or errors in SvelteKit page components. - line: 5 - column: 21 - suggestions: null -- message: disallow props other than data or errors in SvelteKit page components. - line: 5 - column: 36 - suggestions: null diff --git a/packages/eslint-plugin-svelte/tests/fixtures/rules/valid-prop-names-in-kit-pages/invalid/svelte-config-from-parser-options/errors.yaml b/packages/eslint-plugin-svelte/tests/fixtures/rules/valid-prop-names-in-kit-pages/invalid/svelte-config-from-parser-options/errors.yaml index 56a75c0ec..1a2975901 100644 --- a/packages/eslint-plugin-svelte/tests/fixtures/rules/valid-prop-names-in-kit-pages/invalid/svelte-config-from-parser-options/errors.yaml +++ b/packages/eslint-plugin-svelte/tests/fixtures/rules/valid-prop-names-in-kit-pages/invalid/svelte-config-from-parser-options/errors.yaml @@ -14,11 +14,3 @@ line: 4 column: 20 suggestions: null -- message: disallow props other than data or errors in SvelteKit page components. - line: 5 - column: 21 - suggestions: null -- message: disallow props other than data or errors in SvelteKit page components. - line: 5 - column: 36 - suggestions: null diff --git a/packages/eslint-plugin-svelte/tests/fixtures/rules/valid-prop-names-in-kit-pages/invalid/svelte-config/errors.yaml b/packages/eslint-plugin-svelte/tests/fixtures/rules/valid-prop-names-in-kit-pages/invalid/svelte-config/errors.yaml index 56a75c0ec..1a2975901 100644 --- a/packages/eslint-plugin-svelte/tests/fixtures/rules/valid-prop-names-in-kit-pages/invalid/svelte-config/errors.yaml +++ b/packages/eslint-plugin-svelte/tests/fixtures/rules/valid-prop-names-in-kit-pages/invalid/svelte-config/errors.yaml @@ -14,11 +14,3 @@ line: 4 column: 20 suggestions: null -- message: disallow props other than data or errors in SvelteKit page components. - line: 5 - column: 21 - suggestions: null -- message: disallow props other than data or errors in SvelteKit page components. - line: 5 - column: 36 - suggestions: null diff --git a/packages/eslint-plugin-svelte/tests/fixtures/rules/valid-prop-names-in-kit-pages/valid/svelte5-typescript/+page.svelte b/packages/eslint-plugin-svelte/tests/fixtures/rules/valid-prop-names-in-kit-pages/valid/svelte5-typescript/+page.svelte new file mode 100644 index 000000000..2c292ccbe --- /dev/null +++ b/packages/eslint-plugin-svelte/tests/fixtures/rules/valid-prop-names-in-kit-pages/valid/svelte5-typescript/+page.svelte @@ -0,0 +1,5 @@ + + +{pageData} diff --git a/packages/eslint-plugin-svelte/tests/fixtures/rules/valid-prop-names-in-kit-pages/valid/svelte5-typescript/_config.json b/packages/eslint-plugin-svelte/tests/fixtures/rules/valid-prop-names-in-kit-pages/valid/svelte5-typescript/_config.json new file mode 100644 index 000000000..7a71ebe76 --- /dev/null +++ b/packages/eslint-plugin-svelte/tests/fixtures/rules/valid-prop-names-in-kit-pages/valid/svelte5-typescript/_config.json @@ -0,0 +1,13 @@ +{ + "languageOptions": { + "parserOptions": { + "svelteConfig": { + "kit": { + "files": { + "routes": "tests/fixtures/rules/valid-prop-names-in-kit-pages/invalid/svelte5" + } + } + } + } + } +} diff --git a/packages/eslint-plugin-svelte/tests/fixtures/rules/valid-prop-names-in-kit-pages/valid/svelte5-typescript/requirements.json b/packages/eslint-plugin-svelte/tests/fixtures/rules/valid-prop-names-in-kit-pages/valid/svelte5-typescript/requirements.json new file mode 100644 index 000000000..0192b1098 --- /dev/null +++ b/packages/eslint-plugin-svelte/tests/fixtures/rules/valid-prop-names-in-kit-pages/valid/svelte5-typescript/requirements.json @@ -0,0 +1,3 @@ +{ + "svelte": ">=5.0.0-0" +}