feat: update svelte to 5.0.0-next.115 && minor refactor (#513)

sveltejs · Apr 29, 2024 · 37f0061 · 37f0061
1 parent 7c0861b
commit 37f0061
Show file tree

Hide file tree

Showing 92 changed files with 1,017 additions and 70 deletions.
diff --git a/.changeset/new-ways-mix.md b/.changeset/new-ways-mix.md
@@ -0,0 +1,5 @@
+---
+"svelte-eslint-parser": minor
+---
+
+feat: add support for $host and $state.snapshot
diff --git a/.changeset/violet-adults-knock.md b/.changeset/violet-adults-knock.md
@@ -0,0 +1,5 @@
+---
+"svelte-eslint-parser": minor
+---
+
+feat: update svelte to 5.0.0-next.115 && minor refactor
diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
     "version:ci": "env-cmd -e version-ci pnpm run build:meta && changeset version"
   },
   "peerDependencies": {
-    "svelte": "^3.37.0 || ^4.0.0 || ^5.0.0-next.112"
+    "svelte": "^3.37.0 || ^4.0.0 || ^5.0.0-next.115"
   },
   "peerDependenciesMeta": {
     "svelte": {
@@ -68,16 +68,16 @@
     "@ota-meshi/eslint-plugin": "^0.15.3",
     "@types/benchmark": "^2.1.5",
     "@types/chai": "^4.3.14",
-    "@types/eslint": "^8.56.7",
+    "@types/eslint": "^8.56.10",
     "@types/eslint-scope": "^3.7.7",
     "@types/eslint-visitor-keys": "^3.3.0",
     "@types/estree": "^1.0.5",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^20.12.5",
+    "@types/node": "^20.12.7",
     "@types/semver": "^7.5.8",
-    "@typescript-eslint/eslint-plugin": "^7.5.0",
-    "@typescript-eslint/parser": "~7.7.0",
-    "@typescript-eslint/types": "~7.7.0",
+    "@typescript-eslint/eslint-plugin": "^7.7.1",
+    "@typescript-eslint/parser": "~7.7.1",
+    "@typescript-eslint/types": "~7.7.1",
     "benchmark": "^2.1.4",
     "chai": "^4.4.1",
     "env-cmd": "^10.1.0",
@@ -87,27 +87,27 @@
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-json-schema-validator": "^5.1.0",
-    "eslint-plugin-jsonc": "^2.15.0",
-    "eslint-plugin-n": "^17.0.0",
+    "eslint-plugin-jsonc": "^2.15.1",
+    "eslint-plugin-n": "^17.3.1",
     "eslint-plugin-node-dependencies": "^0.12.0",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-regexp": "^2.4.0",
-    "eslint-plugin-svelte": "^2.35.1",
+    "eslint-plugin-regexp": "^2.5.0",
+    "eslint-plugin-svelte": "^2.38.0",
     "eslint-plugin-yml": "^1.14.0",
     "estree-walker": "^3.0.3",
     "locate-character": "^3.0.0",
-    "magic-string": "^0.30.9",
+    "magic-string": "^0.30.10",
     "mocha": "^10.4.0",
     "mocha-chai-jest-snapshot": "^1.1.4",
     "nyc": "^15.1.0",
     "prettier": "~3.2.5",
     "prettier-plugin-pkg": "^0.18.1",
-    "prettier-plugin-svelte": "^3.2.2",
+    "prettier-plugin-svelte": "^3.2.3",
     "rimraf": "^5.0.5",
     "semver": "^7.6.0",
-    "svelte": "^5.0.0-next.112",
-    "svelte2tsx": "^0.7.6",
-    "typescript": "~5.4.4",
+    "svelte": "^5.0.0-next.115",
+    "svelte2tsx": "^0.7.7",
+    "typescript": "~5.4.5",
     "typescript-eslint-parser-for-extra-files": "^0.6.0"
   },
   "publishConfig": {

diff --git a/src/parser/compat.ts b/src/parser/compat.ts
@@ -2,7 +2,6 @@
 import type ESTree from "estree";
 import type * as SvAST from "./svelte-ast-types";
 import type * as Compiler from "svelte/compiler";
-import { parseAttributes } from "./html";
 
 export type Child =
   | Compiler.Text
@@ -31,16 +30,22 @@ export function getModuleFromRoot(
 }
 export function getOptionsFromRoot(
   svelteAst: Compiler.Root | SvAST.AstLegacy,
-  code: string,
 ): Compiler.SvelteOptionsRaw | null {
   const root = svelteAst as Compiler.Root;
   if (root.options) {
-    if ((root.options as any).__raw__) {
-      return (root.options as any).__raw__;
-    }
-    // If there is no `__raw__` property in the `SvelteOptions` node,
-    // we will parse `<svelte:options>` ourselves.
-    return parseSvelteOptions(root.options, code);
+    return {
+      type: "SvelteOptions",
+      name: "svelte:options",
+      attributes: root.options.attributes,
+      fragment: {
+        type: "Fragment",
+        nodes: [],
+        transparent: true,
+      },
+      start: root.options.start,
+      end: root.options.end,
+      parent: null as any,
+    };
   }
   return null;
 }
@@ -239,40 +244,3 @@ export function getDeclaratorFromConstTag(
     (node as SvAST.ConstTag).expression
   );
 }
-
-function parseSvelteOptions(
-  options: Compiler.SvelteOptions,
-  code: string,
-): Compiler.SvelteOptionsRaw {
-  const { start, end } = options;
-  const nameEndName = start + "<svelte:options".length;
-  const { attributes, index: tagEndIndex } = parseAttributes(
-    code,
-    nameEndName + 1,
-  );
-  const fragment: Compiler.Fragment = {
-    type: "Fragment",
-    nodes: [],
-    transparent: true,
-  };
-  if (code.startsWith(">", tagEndIndex)) {
-    const childEndIndex = code.indexOf("</svelte:options", tagEndIndex);
-    fragment.nodes.push({
-      type: "Text",
-      data: code.slice(tagEndIndex + 1, childEndIndex),
-      start: tagEndIndex + 1,
-      end: childEndIndex,
-      raw: code.slice(tagEndIndex + 1, childEndIndex),
-      parent: fragment,
-    });
-  }
-  return {
-    type: "SvelteOptions",
-    name: "svelte:options",
-    attributes,
-    fragment,
-    start,
-    end,
-    parent: null as any,
-  };
-}
diff --git a/src/parser/converts/root.ts b/src/parser/converts/root.ts
@@ -49,7 +49,7 @@ export function convertSvelteRoot(
   const fragment = getFragmentFromRoot(svelteAst);
   if (fragment) {
     let children = getChildren(fragment);
-    const options = getOptionsFromRoot(svelteAst, ctx.code);
+    const options = getOptionsFromRoot(svelteAst);
     if (options) {
       children = [...children];
       if (

diff --git a/src/parser/globals.ts b/src/parser/globals.ts
@@ -8,6 +8,7 @@ export const globalsForRunes = [
   "$props",
   "$bindable",
   "$inspect",
+  "$host",
 ] as const;
 const globalsForSvelte5 = [...globalsForSvelte4, ...globalsForRunes];
 export const globals = svelteVersion.gte(5)

diff --git a/src/parser/template.ts b/src/parser/template.ts
@@ -21,10 +21,16 @@ export function parseTemplate(
   svelteAst: Compiler.Root | SvAST.AstLegacy;
 } {
   try {
-    const svelteAst = parse(code, {
+    const options: {
+      filename?: string | undefined;
+      modern: true;
+    } = {
       filename: parserOptions.filePath,
-      ...(svelteVersion.gte(5) ? { modern: true } : {}),
-    }) as never as Compiler.Root | SvAST.AstLegacy;
+      ...(svelteVersion.gte(5) ? { modern: true } : ({} as never)),
+    };
+    const svelteAst = parse(code, options) as never as
+      | Compiler.Root
+      | SvAST.AstLegacy;
     const ast = convertSvelteRoot(svelteAst, ctx);
 
     return {

diff --git a/src/parser/typescript/analyze/index.ts b/src/parser/typescript/analyze/index.ts
@@ -262,6 +262,7 @@ function analyzeDollarDollarVariables(
       case "$props":
       case "$bindable":
       case "$inspect":
+      case "$host":
         // Processed by `analyzeRuneVariables`.
         break;
       default: {
@@ -318,7 +319,7 @@ function analyzeRuneVariables(
       continue;
     }
     switch (globalName) {
-      // See https://github.com/sveltejs/svelte/blob/dfc55c18f010f620b966e13eb0ad1f9791b5798f/packages/svelte/types/index.d.ts#L2492
+      // See https://github.com/sveltejs/svelte/blob/bda32edb1a4f2d383d96071750d6bfa9421b2175/packages/svelte/types/index.d.ts#L2585
       case "$state": {
         appendDeclareFunctionVirtualScripts(globalName, [
           "<T>(initial: T): T",
@@ -328,9 +329,12 @@ function analyzeRuneVariables(
           "export function frozen<T>(initial: T): Readonly<T>;",
           "export function frozen<T>(): Readonly<T> | undefined;",
         ]);
+        appendDeclareNamespaceVirtualScripts(globalName, [
+          "export function snapshot<T>(state: T): T;",
+        ]);
         break;
       }
-      // See https://github.com/sveltejs/svelte/blob/dfc55c18f010f620b966e13eb0ad1f9791b5798f/packages/svelte/types/index.d.ts#L2535
+      // See https://github.com/sveltejs/svelte/blob/bda32edb1a4f2d383d96071750d6bfa9421b2175/packages/svelte/types/index.d.ts#L2648
       case "$derived": {
         appendDeclareFunctionVirtualScripts(globalName, [
           "<T>(expression: T): T",
@@ -340,7 +344,7 @@ function analyzeRuneVariables(
         ]);
         break;
       }
-      // See https://github.com/sveltejs/svelte/blob/dfc55c18f010f620b966e13eb0ad1f9791b5798f/packages/svelte/types/index.d.ts#L2574
+      // See https://github.com/sveltejs/svelte/blob/bda32edb1a4f2d383d96071750d6bfa9421b2175/packages/svelte/types/index.d.ts#L2687
       case "$effect": {
         appendDeclareFunctionVirtualScripts(globalName, [
           "(fn: () => void | (() => void)): void",
@@ -352,23 +356,30 @@ function analyzeRuneVariables(
         ]);
         break;
       }
-      // See https://github.com/sveltejs/svelte/blob/dfc55c18f010f620b966e13eb0ad1f9791b5798f/packages/svelte/types/index.d.ts#L2655
+      // See https://github.com/sveltejs/svelte/blob/bda32edb1a4f2d383d96071750d6bfa9421b2175/packages/svelte/types/index.d.ts#L2768
       case "$props": {
         appendDeclareFunctionVirtualScripts(globalName, ["(): any"]);
         break;
       }
-      // See https://github.com/sveltejs/svelte/blob/dfc55c18f010f620b966e13eb0ad1f9791b5798f/packages/svelte/types/index.d.ts#L2666
+      // See https://github.com/sveltejs/svelte/blob/bda32edb1a4f2d383d96071750d6bfa9421b2175/packages/svelte/types/index.d.ts#L2779
       case "$bindable": {
         appendDeclareFunctionVirtualScripts(globalName, ["<T>(t?: T): T"]);
         break;
       }
-      // See https://github.com/sveltejs/svelte/blob/dfc55c18f010f620b966e13eb0ad1f9791b5798f/packages/svelte/types/index.d.ts#L2686
+      // See https://github.com/sveltejs/svelte/blob/bda32edb1a4f2d383d96071750d6bfa9421b2175/packages/svelte/types/index.d.ts#L2799
       case "$inspect": {
         appendDeclareFunctionVirtualScripts(globalName, [
           `<T extends any[]>(...values: T): { with: (fn: (type: 'init' | 'update', ...values: T) => void) => void }`,
         ]);
         break;
       }
+      // See https://github.com/sveltejs/svelte/blob/bda32edb1a4f2d383d96071750d6bfa9421b2175/packages/svelte/types/index.d.ts#L2822
+      case "$host": {
+        appendDeclareFunctionVirtualScripts(globalName, [
+          `<El extends HTMLElement = HTMLElement>(): El`,
+        ]);
+        break;
+      }
       default: {
         const _: never = globalName;
         throw Error(`Unknown global: ${_}`);

diff --git a/tests/fixtures/parser/ast/$$slots-scope-output-svelte5.json b/tests/fixtures/parser/ast/$$slots-scope-output-svelte5.json
@@ -77,6 +77,12 @@
       "identifiers": [],
       "defs": [],
       "references": []
+    },
+    {
+      "name": "$host",
+      "identifiers": [],
+      "defs": [],
+      "references": []
     }
   ]
 }
diff --git a/...ures/parser/ast/docs/template-syntax/02-attributes-and-props/10-scope-output-svelte5.json b/...ures/parser/ast/docs/template-syntax/02-attributes-and-props/10-scope-output-svelte5.json
@@ -77,6 +77,12 @@
       "identifiers": [],
       "defs": [],
       "references": []
+    },
+    {
+      "name": "$host",
+      "identifiers": [],
+      "defs": [],
+      "references": []
     }
   ]
 }
diff --git a/...ures/parser/ast/docs/template-syntax/02-attributes-and-props/11-scope-output-svelte5.json b/...ures/parser/ast/docs/template-syntax/02-attributes-and-props/11-scope-output-svelte5.json
@@ -77,6 +77,12 @@
       "identifiers": [],
       "defs": [],
       "references": []
+    },
+    {
+      "name": "$host",
+      "identifiers": [],
+      "defs": [],
+      "references": []
     }
   ]
 }
diff --git a/.../fixtures/parser/ast/docs/template-syntax/13-slot/02-$$slots/01-scope-output-svelte5.json b/.../fixtures/parser/ast/docs/template-syntax/13-slot/02-$$slots/01-scope-output-svelte5.json
@@ -77,6 +77,12 @@
       "identifiers": [],
       "defs": [],
       "references": []
+    },
+    {
+      "name": "$host",
+      "identifiers": [],
+      "defs": [],
+      "references": []
     }
   ]
 }
diff --git a/tests/fixtures/parser/ast/svelte5/docs/fine-grained-reactivity/example01-scope-output.json b/tests/fixtures/parser/ast/svelte5/docs/fine-grained-reactivity/example01-scope-output.json
@@ -124,6 +124,12 @@
       "identifiers": [],
       "defs": [],
       "references": []
+    },
+    {
+      "name": "$host",
+      "identifiers": [],
+      "defs": [],
+      "references": []
     }
   ],
   "references": [],

diff --git a/tests/fixtures/parser/ast/svelte5/docs/functions/01-untrack-scope-output.json b/tests/fixtures/parser/ast/svelte5/docs/functions/01-untrack-scope-output.json
@@ -102,6 +102,12 @@
       "identifiers": [],
       "defs": [],
       "references": []
+    },
+    {
+      "name": "$host",
+      "identifiers": [],
+      "defs": [],
+      "references": []
     }
   ],
   "references": [],

diff --git a/tests/fixtures/parser/ast/svelte5/docs/old-vs-new/01-counter-scope-output.json b/tests/fixtures/parser/ast/svelte5/docs/old-vs-new/01-counter-scope-output.json
@@ -126,6 +126,12 @@
       "identifiers": [],
       "defs": [],
       "references": []
+    },
+    {
+      "name": "$host",
+      "identifiers": [],
+      "defs": [],
+      "references": []
     }
   ],
   "references": [],

diff --git a/tests/fixtures/parser/ast/svelte5/docs/old-vs-new/02-tracking-dependencies-scope-output.json b/tests/fixtures/parser/ast/svelte5/docs/old-vs-new/02-tracking-dependencies-scope-output.json
@@ -125,6 +125,12 @@
       "identifiers": [],
       "defs": [],
       "references": []
+    },
+    {
+      "name": "$host",
+      "identifiers": [],
+      "defs": [],
+      "references": []
     }
   ],
   "references": [],

diff --git a/.../fixtures/parser/ast/svelte5/docs/old-vs-new/03-untracking-dependencies-scope-output.json b/.../fixtures/parser/ast/svelte5/docs/old-vs-new/03-untracking-dependencies-scope-output.json
@@ -125,6 +125,12 @@
       "identifiers": [],
       "defs": [],
       "references": []
+    },
+    {
+      "name": "$host",
+      "identifiers": [],
+      "defs": [],
+      "references": []
     }
   ],
   "references": [],