@marko/language-tools 2.5.30 → 2.5.32

package/dist/extractors/script/util/runtime-overrides.d.ts

@@ -1 +1,2 @@
-export declare function getRuntimeOverrides(runtimeTypes: string, generics: string, applyGenerics: string, returnType: string): string;
+import { RuntimeAPI } from "./get-runtime-api";
+export declare function getRuntimeOverrides(api: RuntimeAPI, runtimeTypes: string, generics: string, applyGenerics: string, returnType: string): string;

package/dist/index.js

@@ -1823,7 +1823,7 @@ var RuntimeOverloads = /* @__PURE__ */ new Map();
 var commentsReg = /\/\*(?:[^*]|\*[^/])*\*\//gm;
 var replaceTokensReg = /\babstract\s+(\w+)|Marko\.(TemplateInput(?:<[^>]+>)?|Component)|\b(Return)\b/gm;
 var overrideBlockReg = /\/\*[*\s]*@marko-overload-start[*\s]*\*\/([\s\S]+)\/\*[*\s]*@marko-overload-end[*\s]*\*\//g;
-function getRuntimeOverrides(runtimeTypes, generics, applyGenerics, returnType) {
+function getRuntimeOverrides(api, runtimeTypes, generics, applyGenerics, returnType) {
   let overloads = RuntimeOverloads.get(runtimeTypes);
   if (!overloads) {
     const match = overrideBlockReg.exec(runtimeTypes);
@@ -1853,7 +1853,7 @@ function getRuntimeOverrides(runtimeTypes, generics, applyGenerics, returnType)
   }
   let result = "";
   const appliedInput = `Marko.TemplateInput<Input${applyGenerics}>`;
-  const appliedComponent = `Component${applyGenerics}`;
+  const appliedComponent = api === RuntimeAPI.tags ? "never" : `Component${applyGenerics}`;
   for (const part of overloads) {
     switch (part) {
       case 0 /* Generics */:
@@ -2154,15 +2154,13 @@ function ${templateName}() {
     }
     const hoists = getHoists(program);
     if (hoists) {
-      this.#extractor.write("const ");
-      this.#writeObjectKeys(hoists);
       this.#extractor.write(
-        " = " + this.#getBodyHoistScopeExpression(program.body)
+        `const { ${hoists.join(SEP_COMMA_SPACE)} } = ${this.#getBodyHoistScopeExpression(program.body)};
+`
       );
     }
     this.#extractor.write(
-      `
-;${varShared("noop")}({ ${hoists ? hoists.join(SEP_COMMA_SPACE) + SEP_COMMA_SPACE : ""}${this.#api !== RuntimeAPI.tags ? "component, state, out, " : ""}input, $global, $signal });
+      `${varShared("noop")}({ ${hoists ? hoists.join(SEP_COMMA_SPACE) + SEP_COMMA_SPACE : ""}${this.#api !== RuntimeAPI.tags ? "component, state, out, " : ""}input, $global, $signal });
 `
     );
     if (didReturn) {
@@ -2183,6 +2181,7 @@ function ${templateName}() {
       "ReturnWithScope"
     )}<${internalInput}, ${returnTypeStr}>)`;
     const templateOverrideClass = `${templateBaseClass}<{${this.#runtimeTypes ? getRuntimeOverrides(
+      this.#api,
       this.#runtimeTypes,
       typeParamsStr,
       typeArgsStr,
@@ -2251,30 +2250,17 @@ function ${templateName}() {
     }
   }
   #writeReturn(returned, body) {
-    const hoistSources = getHoistSources(body);
-    const hoistScopes = this.#getBodyHoistScopeExpression(body);
-    const hasHoists2 = !!(hoistScopes || hoistSources);
-    if (!returned && !hasHoists2) {
+    const scopeExpr = this.#getScopeExpression(body);
+    if (!returned && !scopeExpr) {
       this.#extractor.write(`return ${varShared("voidReturn")};
 `);
       return;
     }
     this.#extractor.write(`return new (class MarkoReturn<Return = void> {
 `);
-    if (hasHoists2) {
-      this.#extractor.write("[Marko._.scope] = ");
-      if (hoistSources) {
-        if (hoistScopes) {
-          this.#extractor.write(`{ ...${hoistScopes}, ...`);
-          this.#writeObjectKeys(hoistSources);
-          this.#extractor.write(" }");
-        } else {
-          this.#writeObjectKeys(hoistSources);
-        }
-      } else {
-        this.#extractor.write(hoistScopes);
-      }
-      this.#extractor.write(";\n");
+    if (scopeExpr) {
+      this.#extractor.write(`[Marko._.scope] = ${scopeExpr};
+`);
     }
     this.#extractor.write(`declare return: Return;
 constructor(_?: Return) {}
@@ -2303,7 +2289,11 @@ constructor(_?: Return) {}
                 renderId = this.#getRenderId(child);
                 if (!renderId && alternates) {
                   for (const { node } of alternates) {
-                    if (renderId = this.#getRenderId(node)) break;
+                    if (renderId = this.#getRenderId(node)) {
+                      this.#renderIds.set(child, renderId);
+                      this.#renderIds.delete(node);
+                      break;
+                    }
                   }
                 }
                 if (renderId) {
@@ -2319,12 +2309,13 @@ constructor(_?: Return) {}
               ).write(") {\n");
               const ifBody = this.#processBody(child);
               if (ifBody == null ? void 0 : ifBody.content) {
-                const localBindings = getHoistSources(child.body);
                 this.#writeChildren(child, ifBody.content, true);
-                if (localBindings) {
-                  this.#extractor.write("return {\nscope:");
-                  this.#writeObjectKeys(localBindings);
-                  this.#extractor.write("\n};\n");
+                const scopeExpr = this.#getScopeExpression(child.body);
+                if (scopeExpr) {
+                  this.#extractor.write(`return {
+scope: ${scopeExpr}
+};
+`);
                 }
               }
               let needsAlternate = true;
@@ -2341,12 +2332,15 @@ constructor(_?: Return) {}
                   }
                   const alternateBody = this.#processBody(node);
                   if (alternateBody == null ? void 0 : alternateBody.content) {
-                    const localBindings = getHoistSources(node.body);
                     this.#writeChildren(node, alternateBody.content, true);
-                    if (localBindings) {
-                      this.#extractor.write("return {\nscope:");
-                      this.#writeObjectKeys(localBindings);
-                      this.#extractor.write("\n};\n");
+                    const scopeExpr = this.#getScopeExpression(node.body);
+                    if (scopeExpr) {
+                      this.#extractor.write(
+                        `return {
+scope: ${scopeExpr}
+};
+`
+                      );
                     }
                   }
                 }
@@ -2357,7 +2351,7 @@ constructor(_?: Return) {}
                 this.#extractor.write("\n}\n");
               }
               if (renderId) {
-                this.#extractor.write("\n})()\n");
+                this.#extractor.write("\n})();\n");
               }
               break;
             }
@@ -2922,13 +2916,6 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
       this.#extractor.write("\n}");
     }
   }
-  #writeObjectKeys(keys) {
-    this.#extractor.write("{");
-    for (const key of keys) {
-      this.#extractor.write(key + SEP_COMMA_SPACE);
-    }
-    this.#extractor.write("}");
-  }
   #getCastedType(type) {
     return this.#scriptLang === "ts" /* ts */ ? `${varShared("any")} as ${type}` : `/** @type {${type}} */(${varShared("any")})`;
   }
@@ -3213,31 +3200,34 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
   }
   #getRenderId(tag) {
     let renderId = this.#renderIds.get(tag);
-    if (renderId === void 0 && tag.var || hasHoists(tag)) {
+    if (!renderId && (tag.var || hasHoists(tag))) {
       renderId = this.#renderId++;
       this.#renderIds.set(tag, renderId);
     }
     return renderId;
   }
+  #getScopeExpression(body) {
+    const sources = getHoistSources(body);
+    const hoists = this.#getBodyHoistScopeExpression(body);
+    return sources ? `{ ${hoists ? `...${hoists}, ` : ""}${sources.join(SEP_COMMA_SPACE)} }` : hoists;
+  }
   #getBodyHoistScopeExpression(body) {
     let hoistIds;
     if (body) {
       for (const child of body) {
-        if (child.type === 1 /* Tag */) {
-          const renderId = this.#renderIds.get(child);
-          if (renderId !== void 0 && hasHoists(child)) {
-            if (hoistIds) {
-              hoistIds.push(renderId);
-            } else {
-              hoistIds = [renderId];
-            }
+        const renderId = child.type === 1 /* Tag */ && this.#renderIds.get(child);
+        if (renderId && (!child.var || hasHoists(child))) {
+          if (hoistIds) {
+            hoistIds.push(renderId);
+          } else {
+            hoistIds = [renderId];
           }
         }
       }
     }
     if (hoistIds) {
       if (hoistIds.length === 1) {
-        return `${varLocal("rendered_" + hoistIds[0])}.scope`;
+        return `${varShared("readScope")}(${varLocal("rendered_" + hoistIds[0])})`;
       }
       let result = `${varShared("readScopes")}({ `;
       let sep = "";

package/dist/index.mjs

@@ -1783,7 +1783,7 @@ var RuntimeOverloads = /* @__PURE__ */ new Map();
 var commentsReg = /\/\*(?:[^*]|\*[^/])*\*\//gm;
 var replaceTokensReg = /\babstract\s+(\w+)|Marko\.(TemplateInput(?:<[^>]+>)?|Component)|\b(Return)\b/gm;
 var overrideBlockReg = /\/\*[*\s]*@marko-overload-start[*\s]*\*\/([\s\S]+)\/\*[*\s]*@marko-overload-end[*\s]*\*\//g;
-function getRuntimeOverrides(runtimeTypes, generics, applyGenerics, returnType) {
+function getRuntimeOverrides(api, runtimeTypes, generics, applyGenerics, returnType) {
   let overloads = RuntimeOverloads.get(runtimeTypes);
   if (!overloads) {
     const match = overrideBlockReg.exec(runtimeTypes);
@@ -1813,7 +1813,7 @@ function getRuntimeOverrides(runtimeTypes, generics, applyGenerics, returnType)
   }
   let result = "";
   const appliedInput = `Marko.TemplateInput<Input${applyGenerics}>`;
-  const appliedComponent = `Component${applyGenerics}`;
+  const appliedComponent = api === RuntimeAPI.tags ? "never" : `Component${applyGenerics}`;
   for (const part of overloads) {
     switch (part) {
       case 0 /* Generics */:
@@ -2117,15 +2117,13 @@ function ${templateName}() {
     }
     const hoists = getHoists(program);
     if (hoists) {
-      this.#extractor.write("const ");
-      this.#writeObjectKeys(hoists);
       this.#extractor.write(
-        " = " + this.#getBodyHoistScopeExpression(program.body)
+        `const { ${hoists.join(SEP_COMMA_SPACE)} } = ${this.#getBodyHoistScopeExpression(program.body)};
+`
       );
     }
     this.#extractor.write(
-      `
-;${varShared("noop")}({ ${hoists ? hoists.join(SEP_COMMA_SPACE) + SEP_COMMA_SPACE : ""}${this.#api !== RuntimeAPI.tags ? "component, state, out, " : ""}input, $global, $signal });
+      `${varShared("noop")}({ ${hoists ? hoists.join(SEP_COMMA_SPACE) + SEP_COMMA_SPACE : ""}${this.#api !== RuntimeAPI.tags ? "component, state, out, " : ""}input, $global, $signal });
 `
     );
     if (didReturn) {
@@ -2146,6 +2144,7 @@ function ${templateName}() {
       "ReturnWithScope"
     )}<${internalInput}, ${returnTypeStr}>)`;
     const templateOverrideClass = `${templateBaseClass}<{${this.#runtimeTypes ? getRuntimeOverrides(
+      this.#api,
       this.#runtimeTypes,
       typeParamsStr,
       typeArgsStr,
@@ -2214,30 +2213,17 @@ function ${templateName}() {
     }
   }
   #writeReturn(returned, body) {
-    const hoistSources = getHoistSources(body);
-    const hoistScopes = this.#getBodyHoistScopeExpression(body);
-    const hasHoists2 = !!(hoistScopes || hoistSources);
-    if (!returned && !hasHoists2) {
+    const scopeExpr = this.#getScopeExpression(body);
+    if (!returned && !scopeExpr) {
       this.#extractor.write(`return ${varShared("voidReturn")};
 `);
       return;
     }
     this.#extractor.write(`return new (class MarkoReturn<Return = void> {
 `);
-    if (hasHoists2) {
-      this.#extractor.write("[Marko._.scope] = ");
-      if (hoistSources) {
-        if (hoistScopes) {
-          this.#extractor.write(`{ ...${hoistScopes}, ...`);
-          this.#writeObjectKeys(hoistSources);
-          this.#extractor.write(" }");
-        } else {
-          this.#writeObjectKeys(hoistSources);
-        }
-      } else {
-        this.#extractor.write(hoistScopes);
-      }
-      this.#extractor.write(";\n");
+    if (scopeExpr) {
+      this.#extractor.write(`[Marko._.scope] = ${scopeExpr};
+`);
     }
     this.#extractor.write(`declare return: Return;
 constructor(_?: Return) {}
@@ -2266,7 +2252,11 @@ constructor(_?: Return) {}
                 renderId = this.#getRenderId(child);
                 if (!renderId && alternates) {
                   for (const { node } of alternates) {
-                    if (renderId = this.#getRenderId(node)) break;
+                    if (renderId = this.#getRenderId(node)) {
+                      this.#renderIds.set(child, renderId);
+                      this.#renderIds.delete(node);
+                      break;
+                    }
                   }
                 }
                 if (renderId) {
@@ -2282,12 +2272,13 @@ constructor(_?: Return) {}
               ).write(") {\n");
               const ifBody = this.#processBody(child);
               if (ifBody == null ? void 0 : ifBody.content) {
-                const localBindings = getHoistSources(child.body);
                 this.#writeChildren(child, ifBody.content, true);
-                if (localBindings) {
-                  this.#extractor.write("return {\nscope:");
-                  this.#writeObjectKeys(localBindings);
-                  this.#extractor.write("\n};\n");
+                const scopeExpr = this.#getScopeExpression(child.body);
+                if (scopeExpr) {
+                  this.#extractor.write(`return {
+scope: ${scopeExpr}
+};
+`);
                 }
               }
               let needsAlternate = true;
@@ -2304,12 +2295,15 @@ constructor(_?: Return) {}
                   }
                   const alternateBody = this.#processBody(node);
                   if (alternateBody == null ? void 0 : alternateBody.content) {
-                    const localBindings = getHoistSources(node.body);
                     this.#writeChildren(node, alternateBody.content, true);
-                    if (localBindings) {
-                      this.#extractor.write("return {\nscope:");
-                      this.#writeObjectKeys(localBindings);
-                      this.#extractor.write("\n};\n");
+                    const scopeExpr = this.#getScopeExpression(node.body);
+                    if (scopeExpr) {
+                      this.#extractor.write(
+                        `return {
+scope: ${scopeExpr}
+};
+`
+                      );
                     }
                   }
                 }
@@ -2320,7 +2314,7 @@ constructor(_?: Return) {}
                 this.#extractor.write("\n}\n");
               }
               if (renderId) {
-                this.#extractor.write("\n})()\n");
+                this.#extractor.write("\n})();\n");
               }
               break;
             }
@@ -2885,13 +2879,6 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
       this.#extractor.write("\n}");
     }
   }
-  #writeObjectKeys(keys) {
-    this.#extractor.write("{");
-    for (const key of keys) {
-      this.#extractor.write(key + SEP_COMMA_SPACE);
-    }
-    this.#extractor.write("}");
-  }
   #getCastedType(type) {
     return this.#scriptLang === "ts" /* ts */ ? `${varShared("any")} as ${type}` : `/** @type {${type}} */(${varShared("any")})`;
   }
@@ -3176,31 +3163,34 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
   }
   #getRenderId(tag) {
     let renderId = this.#renderIds.get(tag);
-    if (renderId === void 0 && tag.var || hasHoists(tag)) {
+    if (!renderId && (tag.var || hasHoists(tag))) {
       renderId = this.#renderId++;
       this.#renderIds.set(tag, renderId);
     }
     return renderId;
   }
+  #getScopeExpression(body) {
+    const sources = getHoistSources(body);
+    const hoists = this.#getBodyHoistScopeExpression(body);
+    return sources ? `{ ${hoists ? `...${hoists}, ` : ""}${sources.join(SEP_COMMA_SPACE)} }` : hoists;
+  }
   #getBodyHoistScopeExpression(body) {
     let hoistIds;
     if (body) {
       for (const child of body) {
-        if (child.type === 1 /* Tag */) {
-          const renderId = this.#renderIds.get(child);
-          if (renderId !== void 0 && hasHoists(child)) {
-            if (hoistIds) {
-              hoistIds.push(renderId);
-            } else {
-              hoistIds = [renderId];
-            }
+        const renderId = child.type === 1 /* Tag */ && this.#renderIds.get(child);
+        if (renderId && (!child.var || hasHoists(child))) {
+          if (hoistIds) {
+            hoistIds.push(renderId);
+          } else {
+            hoistIds = [renderId];
           }
         }
       }
     }
     if (hoistIds) {
       if (hoistIds.length === 1) {
-        return `${varLocal("rendered_" + hoistIds[0])}.scope`;
+        return `${varShared("readScope")}(${varLocal("rendered_" + hoistIds[0])})`;
       }
       let result = `${varShared("readScopes")}({ `;
       let sep = "";

package/marko.internal.d.ts

@@ -100,6 +100,23 @@ declare global {
       > &
         Record<any, never>;
 
+      export function readScope<Value>(
+        value: Value,
+      ): MergeScopes<
+        undefined extends Value
+          ? Value extends { scope: infer Scope }
+            ? [0] extends [1 & Scope]
+              ? never
+              : Partial<Scope>
+            : never
+          : Value extends { scope: infer Scope }
+            ? [0] extends [1 & Scope]
+              ? never
+              : Scope
+            : never
+      > &
+        Record<any, never>;
+
       export function mutable<Lookup>(lookup: Lookup): UnionToIntersection<
         Lookup extends readonly (infer Item)[]
           ? Item extends

package/package.json

@@ -1,23 +1,23 @@
 {
   "name": "@marko/language-tools",
   "description": "Marko Language Tools",
-  "version": "2.5.30",
+  "version": "2.5.32",
   "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
   "peerDependencies": {
     "@marko/compiler": "^5.28.4"
   },
   "dependencies": {
-    "@babel/parser": "^7.28.0",
+    "@babel/parser": "^7.28.3",
     "@luxass/strip-json-comments": "^1.4.0",
-    "htmljs-parser": "^5.7.3",
+    "htmljs-parser": "^5.7.4",
     "relative-import-path": "^1.0.0"
   },
   "devDependencies": {
     "@babel/code-frame": "^7.27.1",
-    "@marko/compiler": "^5.39.32",
+    "@marko/compiler": "^5.39.33",
     "@types/babel__code-frame": "^7.0.6",
     "@typescript/vfs": "^1.6.1",
-    "marko": "^5.37.43",
+    "marko": "^5.37.45",
     "mitata": "^1.0.34",
     "tsx": "^4.20.4"
   },