update

Author: baseballyama

.vscode/settings.json

@@ -15,5 +15,6 @@
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": "explicit"
   },
-  "vetur.validation.template": false
+  "vetur.validation.template": false,
+  "editor.formatOnSave": true
 }

package.json

@@ -105,7 +105,7 @@
     "prettier-plugin-svelte": "^3.2.2",
     "rimraf": "^5.0.5",
     "semver": "^7.6.0",
-    "svelte": "^5.0.0-next.94",
+    "svelte": "^5.0.0-next.110",
     "svelte2tsx": "^0.7.6",
     "typescript": "~5.4.4",
     "typescript-eslint-parser-for-extra-files": "^0.6.0"

src/parser/typescript/analyze/index.ts

@@ -38,10 +38,10 @@ export function analyzeTypeScriptInSvelte(
   code: { script: string; rootScope: string; render: string },
   attrs: Record<string, string | undefined>,
   parserOptions: NormalizedParserOptions,
-  context: AnalyzeTypeScriptContext,
+  context: AnalyzeTypeScriptContext
 ): VirtualTypeScriptContext {
   const ctx = new VirtualTypeScriptContext(
-    code.script + code.render + code.rootScope,
+    code.script + code.render + code.rootScope
   );
   ctx.appendOriginal(/^\s*/u.exec(code.script)![0].length);
 
@@ -52,7 +52,7 @@ export function analyzeTypeScriptInSvelte(
       ...parserOptions,
       // Without typings
       project: null,
-    },
+    }
   ) as unknown as TSESParseForESLintResult;
 
   ctx._beforeResult = result;
@@ -65,7 +65,7 @@ export function analyzeTypeScriptInSvelte(
 
   applyTransforms(
     [...analyzeReactiveScopes(result), ...analyzeDollarDerivedScopes(result)],
-    ctx,
+    ctx
   );
 
   analyzeRenderScopes(code, ctx);
@@ -82,7 +82,7 @@ export function analyzeTypeScriptInSvelte(
 export function analyzeTypeScript(
   code: string,
   attrs: Record<string, string | undefined>,
-  parserOptions: NormalizedParserOptions,
+  parserOptions: NormalizedParserOptions
 ): VirtualTypeScriptContext {
   const ctx = new VirtualTypeScriptContext(code);
   ctx.appendOriginal(/^\s*/u.exec(code)![0].length);
@@ -110,7 +110,7 @@ export function analyzeTypeScript(
  */
 function analyzeStoreReferenceNames(
   result: TSESParseForESLintResult,
-  ctx: VirtualTypeScriptContext,
+  ctx: VirtualTypeScriptContext
 ) {
   const scopeManager = result.scopeManager;
   const programScope = getProgramScope(scopeManager as ScopeManager);
@@ -138,7 +138,7 @@ function analyzeStoreReferenceNames(
 ? F extends (value: infer V, ...args: any) => any
 ? V
 : never
-: T;`,
+: T;`
     );
     ctx.restoreContext.addRestoreStatementProcess((node, result) => {
       if (
@@ -162,7 +162,7 @@ function analyzeStoreReferenceNames(
     for (const nm of maybeStoreRefNames) {
       const realName = nm.slice(1);
       ctx.appendVirtualScript(
-        `declare let ${nm}: ${storeValueTypeName}<typeof ${realName}>;`,
+        `declare let ${nm}: ${storeValueTypeName}<typeof ${realName}>;`
       );
       ctx.restoreContext.addRestoreStatementProcess((node, result) => {
         if (
@@ -198,13 +198,13 @@ function analyzeStoreReferenceNames(
 function analyzeDollarDollarVariables(
   result: TSESParseForESLintResult,
   ctx: VirtualTypeScriptContext,
-  slots: Set<SvelteHTMLElement>,
+  slots: Set<SvelteHTMLElement>
 ) {
   const scopeManager = result.scopeManager;
   for (const globalName of globals) {
     if (
       !scopeManager.globalScope!.through.some(
-        (reference) => reference.identifier.name === globalName,
+        (reference) => reference.identifier.name === globalName
       )
     ) {
       continue;
@@ -221,7 +221,7 @@ function analyzeDollarDollarVariables(
         for (const slot of slots) {
           const nameAttr = slot.startTag.attributes.find(
             (attr): attr is SvelteAttribute =>
-              attr.type === "SvelteAttribute" && attr.key.name === "name",
+              attr.type === "SvelteAttribute" && attr.key.name === "name"
           );
           if (!nameAttr || nameAttr.value.length === 0) {
             nameTypes.add('"default"');
@@ -242,17 +242,17 @@ function analyzeDollarDollarVariables(
               .map((value) =>
                 value.type === "SvelteLiteral"
                   ? value.value.replace(/([$`])/gu, "\\$1")
-                  : "${string}",
+                  : "${string}"
               )
-              .join("")}\``,
+              .join("")}\``
           );
         }
 
         appendDeclareVirtualScript(
           globalName,
           `Record<${
             nameTypes.size > 0 ? [...nameTypes].join(" | ") : "any"
-          }, boolean>`,
+          }, boolean>`
         );
         break;
       }
@@ -306,13 +306,13 @@ function analyzeDollarDollarVariables(
  */
 function analyzeRuneVariables(
   result: TSESParseForESLintResult,
-  ctx: VirtualTypeScriptContext,
+  ctx: VirtualTypeScriptContext
 ) {
   const scopeManager = result.scopeManager;
   for (const globalName of globalsForRunes) {
     if (
       !scopeManager.globalScope!.through.some(
-        (reference) => reference.identifier.name === globalName,
+        (reference) => reference.identifier.name === globalName
       )
     ) {
       continue;
@@ -354,7 +354,7 @@ function analyzeRuneVariables(
       }
       // See https://github.com/sveltejs/svelte/blob/dfc55c18f010f620b966e13eb0ad1f9791b5798f/packages/svelte/types/index.d.ts#L2655
       case "$props": {
-        appendDeclareFunctionVirtualScripts(globalName, ["<T>(): T"]);
+        appendDeclareFunctionVirtualScripts(globalName, ["(): any"]);
         break;
       }
       // See https://github.com/sveltejs/svelte/blob/dfc55c18f010f620b966e13eb0ad1f9791b5798f/packages/svelte/types/index.d.ts#L2666
@@ -407,7 +407,7 @@ function analyzeRuneVariables(
 
   function appendDeclareNamespaceVirtualScripts(
     name: string,
-    scripts: string[],
+    scripts: string[]
   ) {
     for (const script of scripts) {
       ctx.appendVirtualScript(`declare namespace ${name} { ${script} }`);
@@ -442,11 +442,11 @@ function analyzeRuneVariables(
  * Transform source code to provide the correct type information in the `$:` statements.
  */
 function* analyzeReactiveScopes(
-  result: TSESParseForESLintResult,
+  result: TSESParseForESLintResult
 ): Iterable<TransformInfo> {
   const scopeManager = result.scopeManager;
   const throughIds = scopeManager.globalScope!.through.map(
-    (reference) => reference.identifier,
+    (reference) => reference.identifier
   );
   for (const statement of result.ast.body) {
     if (statement.type === "LabeledStatement" && statement.label.name === "$") {
@@ -463,8 +463,7 @@ function* analyzeReactiveScopes(
         const left = statement.body.expression.left;
         if (
           throughIds.some(
-            (id) =>
-              left.range[0] <= id.range[0] && id.range[1] <= left.range[1],
+            (id) => left.range[0] <= id.range[0] && id.range[1] <= left.range[1]
           )
         ) {
           const node = statement;
@@ -477,7 +476,7 @@ function* analyzeReactiveScopes(
                 left,
                 expression,
                 result.ast.tokens!,
-                ctx,
+                ctx
               ),
           };
           continue;
@@ -496,11 +495,11 @@ function* analyzeReactiveScopes(
  * Transform source code to provide the correct type information in the `$derived(...)` expression.
  */
 function* analyzeDollarDerivedScopes(
-  result: TSESParseForESLintResult,
+  result: TSESParseForESLintResult
 ): Iterable<TransformInfo> {
   const scopeManager = result.scopeManager;
   const derivedReferences = scopeManager.globalScope!.through.filter(
-    (reference) => reference.identifier.name === "$derived",
+    (reference) => reference.identifier.name === "$derived"
   );
   if (!derivedReferences.length) {
     return;
@@ -528,7 +527,7 @@ function* analyzeDollarDerivedScopes(
  */
 function analyzeRenderScopes(
   code: { script: string; render: string; rootScope: string },
-  ctx: VirtualTypeScriptContext,
+  ctx: VirtualTypeScriptContext
 ) {
   ctx.appendOriginal(code.script.length);
   const renderFunctionName = ctx.generateUniqueId("render");
@@ -560,7 +559,7 @@ function analyzeRenderScopes(
  */
 function applyTransforms(
   transforms: TransformInfo[],
-  ctx: VirtualTypeScriptContext,
+  ctx: VirtualTypeScriptContext
 ) {
   transforms.sort((a, b) => a.node.range[0] - b.node.range[0]);
 
@@ -582,7 +581,7 @@ function transformForDeclareReactiveVar(
   id: TSESTree.Identifier | TSESTree.ArrayPattern | TSESTree.ObjectPattern,
   expression: TSESTree.AssignmentExpression,
   tokens: TSESTree.Token[],
-  ctx: VirtualTypeScriptContext,
+  ctx: VirtualTypeScriptContext
 ): void {
   // e.g.
   //  From:
@@ -626,7 +625,7 @@ function transformForDeclareReactiveVar(
   let expressionCloseParen: TSESTree.Token | null = null;
   const startIndex = sortedLastIndex(
     tokens,
-    (target) => target.range[0] - statement.range[0],
+    (target) => target.range[0] - statement.range[0]
   );
   for (let index = startIndex; index < tokens.length; index++) {
     const token = tokens[index];
@@ -666,7 +665,7 @@ function transformForDeclareReactiveVar(
   ctx.appendVirtualScript("let ");
   ctx.appendOriginal(eq ? eq.range[1] : expression.right.range[0]);
   ctx.appendVirtualScript(
-    `${functionId}();\nfunction ${functionId}(){let ${tmpVarId};return (${tmpVarId} = `,
+    `${functionId}();\nfunction ${functionId}(){let ${tmpVarId};return (${tmpVarId} = `
   );
   ctx.appendOriginal(expression.right.range[1]);
   ctx.appendVirtualScript(`)`);
@@ -772,7 +771,7 @@ function transformForDeclareReactiveVar(
     addElementsToSortedArray(
       program.tokens!,
       [...openParens, ...closeParens],
-      (a, b) => a.range[0] - b.range[0],
+      (a, b) => a.range[0] - b.range[0]
     );
 
     const scopeManager = result.scopeManager as ScopeManager;
@@ -801,7 +800,7 @@ function transformForDeclareReactiveVar(
  */
 function transformForReactiveStatement(
   statement: TSESTree.LabeledStatement,
-  ctx: VirtualTypeScriptContext,
+  ctx: VirtualTypeScriptContext
 ) {
   const functionId = ctx.generateUniqueId("reactiveStatementScopeFunction");
   const originalBody = statement.body;
@@ -834,13 +833,13 @@ function transformForReactiveStatement(
  */
 function transformForDollarDerived(
   derivedCall: TSESTree.CallExpression,
-  ctx: VirtualTypeScriptContext,
+  ctx: VirtualTypeScriptContext
 ) {
   const functionId = ctx.generateUniqueId("$derivedArgument");
   const expression = derivedCall.arguments[0];
   ctx.appendOriginal(expression.range[0]);
   ctx.appendVirtualScript(
-    `(()=>{return ${functionId}();function ${functionId}(){return `,
+    `(()=>{return ${functionId}();function ${functionId}(){return `
   );
   ctx.appendOriginal(expression.range[1]);
   ctx.appendVirtualScript(`}})()`);
@@ -889,7 +888,7 @@ function transformForDollarDerived(
       removeFunctionScope(arg.callee.body.body[1], scopeManager);
       removeIdentifierReference(
         arg.callee.body.body[0].argument.callee,
-        scopeManager.acquire(arg.callee)!,
+        scopeManager.acquire(arg.callee)!
       );
       removeFunctionScope(arg.callee, scopeManager);
       return true;
@@ -903,7 +902,7 @@ function removeFunctionScope(
     | TSESTree.FunctionDeclaration
     | TSESTree.FunctionExpression
     | TSESTree.ArrowFunctionExpression,
-  scopeManager: ScopeManager,
+  scopeManager: ScopeManager
 ) {
   const scope = scopeManager.acquire(node)!;
   const upper = scope.upper!;
@@ -925,12 +924,12 @@ function removeFunctionScope(
       addElementsToSortedArray(
         upperVariable.identifiers,
         variable.identifiers,
-        (a, b) => a.range![0] - b.range![0],
+        (a, b) => a.range![0] - b.range![0]
       );
       addElementsToSortedArray(
         upperVariable.defs,
         variable.defs,
-        (a, b) => a.node.range![0] - b.node.range![0],
+        (a, b) => a.node.range![0] - b.node.range![0]
       );
       addAllReferences(upperVariable.references, variable.references);
     } else {

tests/fixtures/parser/ast/svelte5/docs/runes/08-$props-ts-input.svelte

@@ -1,4 +1,4 @@
 <script lang="ts">
-    type MyProps = {}
-    let { a, b, c, ...everythingElse } = $props<MyProps>();
+  type MyProps = {};
+  let { a, b, c, ...everythingElse }: MyProps = $props();
 </script>

tests/fixtures/parser/ast/svelte5/docs/runes/08-$props-ts-no-unused-vars-result.json

@@ -3,24 +3,24 @@
     "ruleId": "no-unused-vars",
     "code": "a",
     "line": 3,
-    "column": 11
+    "column": 9
   },
   {
     "ruleId": "no-unused-vars",
     "code": "b",
     "line": 3,
-    "column": 14
+    "column": 12
   },
   {
     "ruleId": "no-unused-vars",
     "code": "c",
     "line": 3,
-    "column": 17
+    "column": 15
   },
   {
     "ruleId": "no-unused-vars",
     "code": "everythingElse",
     "line": 3,
-    "column": 23
+    "column": 21
   }
 ]