@marko/language-tools 2.5.12 → 2.5.14

package/dist/extractors/script/util/attach-scopes.d.ts

@@ -9,11 +9,13 @@ export interface ProgramScope {
     parent: undefined;
     hoists: false;
     bindings: Bindings;
+    mutatedBindings: undefined | Set<VarBinding>;
 }
 export interface TagScope {
     parent: Scope;
     hoists: boolean;
     bindings: undefined | Bindings;
+    mutatedBindings: undefined | Set<VarBinding>;
 }
 export type Binding = VarBinding | ParamBinding | HoistedBinding;
 export interface VarBinding {
@@ -53,7 +55,7 @@ type Bindings = {
 export declare function crawlProgramScope(parsed: Parsed, scriptParser: ScriptParser): [number, ...number[]] | [...number[], number] | undefined;
 export declare function getHoists(node: Node.Program): Repeatable<string>;
 export declare function getHoistSources(node: Node.ParentNode): Repeatable<string>;
-export declare function getMutatedVars(node: Node.ParentNode): Repeatable<VarBinding>;
+export declare function getMutatedVars(node: Node.ParentNode): Set<VarBinding> | undefined;
 export declare function isMutatedVar(node: Node.ParentNode, name: string): boolean;
 export declare function hasHoists(node: Node.ParentTag): boolean;
 export declare function getBoundAttrMemberExpressionStartOffset(value: Node.AttrValue): number | undefined;

package/dist/index.js

@@ -28,8 +28,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
-var src_exports = {};
-__export(src_exports, {
+var index_exports = {};
+__export(index_exports, {
   NodeType: () => NodeType,
   Processors: () => processors_exports,
   Project: () => project_exports,
@@ -46,7 +46,7 @@ __export(src_exports, {
   isDefinitionFile: () => isDefinitionFile,
   parse: () => parse
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 
 // src/parser.ts
 var import_htmljs_parser = require("htmljs-parser");
@@ -1083,7 +1083,8 @@ function crawlProgramScope(parsed, scriptParser) {
   const programScope = {
     parent: void 0,
     hoists: false,
-    bindings: {}
+    bindings: {},
+    mutatedBindings: void 0
   };
   programScope.bindings.input = {
     type: 0 /* var */,
@@ -1178,7 +1179,8 @@ function crawlProgramScope(parsed, scriptParser) {
             const bodyScope = {
               parent: parentScope,
               hoists: false,
-              bindings: {}
+              bindings: {},
+              mutatedBindings: void 0
             };
             if (child.params) {
               bodyScope.bindings ??= {};
@@ -1249,6 +1251,9 @@ ${read({
                               );
                               if (binding) {
                                 binding.mutated = true;
+                                (parentScope.mutatedBindings ||= /* @__PURE__ */ new Set()).add(
+                                  binding
+                                );
                               }
                             }
                             break;
@@ -1333,24 +1338,16 @@ function getHoistSources(node) {
   return result;
 }
 function getMutatedVars(node) {
-  let result;
-  const { bindings } = Scopes.get(node.body);
-  for (const key in bindings) {
-    const binding = bindings[key];
-    if (binding.type === 0 /* var */ && binding.mutated) {
-      if (result) {
-        result.push(binding);
-      } else {
-        result = [binding];
-      }
-    }
-  }
-  return result;
+  return Scopes.get(node.body).mutatedBindings;
 }
 function isMutatedVar(node, name) {
-  const { bindings } = Scopes.get(node.body);
-  const binding = bindings == null ? void 0 : bindings[name];
-  return (binding == null ? void 0 : binding.type) === 0 /* var */ && binding.mutated;
+  const { mutatedBindings } = Scopes.get(node.body);
+  if (mutatedBindings) {
+    for (const binding of mutatedBindings) {
+      if (binding.name === name) return true;
+    }
+  }
+  return false;
 }
 function hasHoists(node) {
   return node.body ? Scopes.get(node.body).hoists : false;
@@ -1600,6 +1597,7 @@ function trackMutations(node, scope, mutations, parentBlock, parentBlockShadows,
       if (binding) {
         binding.mutated = true;
         mutations.push(start);
+        (scope.mutatedBindings ||= /* @__PURE__ */ new Set()).add(binding);
       }
     }
   }
@@ -1994,7 +1992,7 @@ var ScriptExtractor = class {
   }
   #writeProgram(program) {
     this.#writeCommentPragmas(program);
-    const componentFileName = getComponentFilename(this.#filename);
+    const componentFileName = this.#api !== RuntimeAPI.tags ? getComponentFilename(this.#filename) : void 0;
     const inputType = this.#getInputType(program);
     let componentClassBody;
     for (const node of program.static) {
@@ -2084,35 +2082,37 @@ var ScriptExtractor = class {
         );
       }
     }
-    if (isExternalComponentFile) {
-      if (this.#scriptLang === "ts" /* ts */) {
-        this.#extractor.write(
-          `import type Component from "${stripExt(
-            (0, import_relative_import_path.relativeImportPath)(this.#filename, componentFileName)
-          )}";
+    if (this.#api !== RuntimeAPI.tags) {
+      if (isExternalComponentFile) {
+        if (this.#scriptLang === "ts" /* ts */) {
+          this.#extractor.write(
+            `import type Component from "${stripExt(
+              (0, import_relative_import_path.relativeImportPath)(this.#filename, componentFileName)
+            )}";
 `
-        );
-      } else {
-        this.#extractor.write(
-          `/** @typedef {import("${stripExt(
-            (0, import_relative_import_path.relativeImportPath)(this.#filename, componentFileName)
-          )}") extends infer Component ? Component extends { default: infer Component } ? Component : Component : never} Component */
+          );
+        } else {
+          this.#extractor.write(
+            `/** @typedef {import("${stripExt(
+              (0, import_relative_import_path.relativeImportPath)(this.#filename, componentFileName)
+            )}") extends infer Component ? Component extends { default: infer Component } ? Component : Component : never} Component */
 `
-        );
-      }
-    } else {
-      const body2 = componentClassBody || " {}";
-      if (this.#scriptLang === "ts" /* ts */) {
-        this.#extractor.write(
-          `abstract class Component${typeParamsStr} extends Marko.Component<Input${typeArgsStr}>`
-        ).copy(body2).write("\nexport { type Component }\n");
+          );
+        }
       } else {
-        this.#extractor.write(`/**${jsDocTemplateTagsStr}
-  * @extends {Marko.Component<Input${typeArgsStr}>}
-  * @abstract
-  */
+        const body2 = componentClassBody || " {}";
+        if (this.#scriptLang === "ts" /* ts */) {
+          this.#extractor.write(
+            `abstract class Component${typeParamsStr} extends Marko.Component<Input${typeArgsStr}>`
+          ).copy(body2).write("\nexport { type Component }\n");
+        } else {
+          this.#extractor.write(`/**${jsDocTemplateTagsStr}
+    * @extends {Marko.Component<Input${typeArgsStr}>}
+    * @abstract
+    */
 `);
-        this.#extractor.write(`export class Component extends Marko.Component`).copy(body2).write("\n");
+          this.#extractor.write(`export class Component extends Marko.Component`).copy(body2).write("\n");
+        }
       }
     }
     const didReturn = !!getReturnTag(program);
@@ -2132,16 +2132,16 @@ var ScriptExtractor = class {
 function ${templateName}() {
 `);
     }
-    this.#extractor.write(`  const input = ${this.#getCastedType(`Input${typeArgsStr}`)};
+    this.#extractor.write(`  const input = ${this.#getCastedType(`Input${typeArgsStr}`)};${this.#api !== RuntimeAPI.tags ? `
   const component = ${this.#getCastedType(`Component${typeArgsStr}`)};
   const state = ${varShared("state")}(component);
+  const out = ${varShared("out")};` : ""}
   const $signal = ${this.#getCastedType("AbortSignal")};
   const $global = ${varShared("getGlobal")}(
     // @ts-expect-error We expect the compiler to error because we are checking if the MarkoRun.Context is defined.
     (${varShared("error")}, ${this.#getCastedType("MarkoRun.Context")})
   );
-  const out = ${varShared("out")};
-  ${varShared("noop")}({ input, component, state, out, $global, $signal });
+  ${varShared("noop")}({ ${this.#api !== RuntimeAPI.tags ? "component, state, out, " : ""}input, $global, $signal });
 `);
     const body = this.#processBody(program);
     if (body == null ? void 0 : body.content) {
@@ -2613,7 +2613,7 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
               }
             } else if (attr.args) {
               this.#extractor.write('"').copy(name).write('": ');
-              if (typeof name !== "string" && this.#read(name).startsWith("on")) {
+              if (this.#api !== RuntimeAPI.tags && typeof name !== "string" && this.#read(name).startsWith("on")) {
                 const stringLiteralFirstArgMatch = this.#execAtIndex(
                   REG_ATTR_ARG_LITERAL,
                   attr.args.value.start

package/dist/index.mjs

@@ -1043,7 +1043,8 @@ function crawlProgramScope(parsed, scriptParser) {
   const programScope = {
     parent: void 0,
     hoists: false,
-    bindings: {}
+    bindings: {},
+    mutatedBindings: void 0
   };
   programScope.bindings.input = {
     type: 0 /* var */,
@@ -1138,7 +1139,8 @@ function crawlProgramScope(parsed, scriptParser) {
             const bodyScope = {
               parent: parentScope,
               hoists: false,
-              bindings: {}
+              bindings: {},
+              mutatedBindings: void 0
             };
             if (child.params) {
               bodyScope.bindings ??= {};
@@ -1209,6 +1211,9 @@ ${read({
                               );
                               if (binding) {
                                 binding.mutated = true;
+                                (parentScope.mutatedBindings ||= /* @__PURE__ */ new Set()).add(
+                                  binding
+                                );
                               }
                             }
                             break;
@@ -1293,24 +1298,16 @@ function getHoistSources(node) {
   return result;
 }
 function getMutatedVars(node) {
-  let result;
-  const { bindings } = Scopes.get(node.body);
-  for (const key in bindings) {
-    const binding = bindings[key];
-    if (binding.type === 0 /* var */ && binding.mutated) {
-      if (result) {
-        result.push(binding);
-      } else {
-        result = [binding];
-      }
-    }
-  }
-  return result;
+  return Scopes.get(node.body).mutatedBindings;
 }
 function isMutatedVar(node, name) {
-  const { bindings } = Scopes.get(node.body);
-  const binding = bindings == null ? void 0 : bindings[name];
-  return (binding == null ? void 0 : binding.type) === 0 /* var */ && binding.mutated;
+  const { mutatedBindings } = Scopes.get(node.body);
+  if (mutatedBindings) {
+    for (const binding of mutatedBindings) {
+      if (binding.name === name) return true;
+    }
+  }
+  return false;
 }
 function hasHoists(node) {
   return node.body ? Scopes.get(node.body).hoists : false;
@@ -1560,6 +1557,7 @@ function trackMutations(node, scope, mutations, parentBlock, parentBlockShadows,
       if (binding) {
         binding.mutated = true;
         mutations.push(start);
+        (scope.mutatedBindings ||= /* @__PURE__ */ new Set()).add(binding);
       }
     }
   }
@@ -1957,7 +1955,7 @@ var ScriptExtractor = class {
   }
   #writeProgram(program) {
     this.#writeCommentPragmas(program);
-    const componentFileName = getComponentFilename(this.#filename);
+    const componentFileName = this.#api !== RuntimeAPI.tags ? getComponentFilename(this.#filename) : void 0;
     const inputType = this.#getInputType(program);
     let componentClassBody;
     for (const node of program.static) {
@@ -2047,35 +2045,37 @@ var ScriptExtractor = class {
         );
       }
     }
-    if (isExternalComponentFile) {
-      if (this.#scriptLang === "ts" /* ts */) {
-        this.#extractor.write(
-          `import type Component from "${stripExt(
-            relativeImportPath(this.#filename, componentFileName)
-          )}";
+    if (this.#api !== RuntimeAPI.tags) {
+      if (isExternalComponentFile) {
+        if (this.#scriptLang === "ts" /* ts */) {
+          this.#extractor.write(
+            `import type Component from "${stripExt(
+              relativeImportPath(this.#filename, componentFileName)
+            )}";
 `
-        );
-      } else {
-        this.#extractor.write(
-          `/** @typedef {import("${stripExt(
-            relativeImportPath(this.#filename, componentFileName)
-          )}") extends infer Component ? Component extends { default: infer Component } ? Component : Component : never} Component */
+          );
+        } else {
+          this.#extractor.write(
+            `/** @typedef {import("${stripExt(
+              relativeImportPath(this.#filename, componentFileName)
+            )}") extends infer Component ? Component extends { default: infer Component } ? Component : Component : never} Component */
 `
-        );
-      }
-    } else {
-      const body2 = componentClassBody || " {}";
-      if (this.#scriptLang === "ts" /* ts */) {
-        this.#extractor.write(
-          `abstract class Component${typeParamsStr} extends Marko.Component<Input${typeArgsStr}>`
-        ).copy(body2).write("\nexport { type Component }\n");
+          );
+        }
       } else {
-        this.#extractor.write(`/**${jsDocTemplateTagsStr}
-  * @extends {Marko.Component<Input${typeArgsStr}>}
-  * @abstract
-  */
+        const body2 = componentClassBody || " {}";
+        if (this.#scriptLang === "ts" /* ts */) {
+          this.#extractor.write(
+            `abstract class Component${typeParamsStr} extends Marko.Component<Input${typeArgsStr}>`
+          ).copy(body2).write("\nexport { type Component }\n");
+        } else {
+          this.#extractor.write(`/**${jsDocTemplateTagsStr}
+    * @extends {Marko.Component<Input${typeArgsStr}>}
+    * @abstract
+    */
 `);
-        this.#extractor.write(`export class Component extends Marko.Component`).copy(body2).write("\n");
+          this.#extractor.write(`export class Component extends Marko.Component`).copy(body2).write("\n");
+        }
       }
     }
     const didReturn = !!getReturnTag(program);
@@ -2095,16 +2095,16 @@ var ScriptExtractor = class {
 function ${templateName}() {
 `);
     }
-    this.#extractor.write(`  const input = ${this.#getCastedType(`Input${typeArgsStr}`)};
+    this.#extractor.write(`  const input = ${this.#getCastedType(`Input${typeArgsStr}`)};${this.#api !== RuntimeAPI.tags ? `
   const component = ${this.#getCastedType(`Component${typeArgsStr}`)};
   const state = ${varShared("state")}(component);
+  const out = ${varShared("out")};` : ""}
   const $signal = ${this.#getCastedType("AbortSignal")};
   const $global = ${varShared("getGlobal")}(
     // @ts-expect-error We expect the compiler to error because we are checking if the MarkoRun.Context is defined.
     (${varShared("error")}, ${this.#getCastedType("MarkoRun.Context")})
   );
-  const out = ${varShared("out")};
-  ${varShared("noop")}({ input, component, state, out, $global, $signal });
+  ${varShared("noop")}({ ${this.#api !== RuntimeAPI.tags ? "component, state, out, " : ""}input, $global, $signal });
 `);
     const body = this.#processBody(program);
     if (body == null ? void 0 : body.content) {
@@ -2576,7 +2576,7 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
               }
             } else if (attr.args) {
               this.#extractor.write('"').copy(name).write('": ');
-              if (typeof name !== "string" && this.#read(name).startsWith("on")) {
+              if (this.#api !== RuntimeAPI.tags && typeof name !== "string" && this.#read(name).startsWith("on")) {
                 const stringLiteralFirstArgMatch = this.#execAtIndex(
                   REG_ATTR_ARG_LITERAL,
                   attr.args.value.start

package/package.json

@@ -1,24 +1,24 @@
 {
   "name": "@marko/language-tools",
   "description": "Marko Language Tools",
-  "version": "2.5.12",
+  "version": "2.5.14",
   "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
   "peerDependencies": {
     "@marko/compiler": "^5.28.4"
   },
   "dependencies": {
-    "@babel/parser": "^7.26.3",
-    "@luxass/strip-json-comments": "^1.3.2",
+    "@babel/parser": "^7.26.7",
+    "@luxass/strip-json-comments": "^1.4.0",
     "htmljs-parser": "^5.5.3",
     "relative-import-path": "^1.0.0"
   },
   "devDependencies": {
     "@babel/code-frame": "^7.26.2",
-    "@marko/compiler": "^5.39.6",
+    "@marko/compiler": "^5.39.11",
     "@types/babel__code-frame": "^7.0.6",
     "@typescript/vfs": "^1.6.0",
-    "marko": "^5.37.7",
-    "mitata": "^1.0.21",
+    "marko": "^5.37.12",
+    "mitata": "^1.0.33",
     "tsx": "^4.19.2"
   },
   "exports": {