@marko/language-tools 2.5.42 → 2.5.44

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

@@ -32,7 +32,7 @@ export interface ParamBinding {
     type: BindingType.param;
     name: string;
     node: Node.ParentNode;
-    scope: TagScope;
+    scope: Scope;
     hoisted: false;
 }
 export interface HoistedBinding {
@@ -53,7 +53,11 @@ type Bindings = {
  * Traverses the Marko tree and analyzes the 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 getProgramBindings(node: Node.Program): {
+    all: Repeated<string>;
+    vars: Repeatable<string>;
+    hoists: Repeatable<string>;
+} | undefined;
 export declare function getHoistSources(body: Node.ParentNode["body"]): Repeatable<string>;
 export declare function getMutatedVars(node: Node.ParentNode): Set<VarBinding> | undefined;
 export declare function isMutatedVar(node: Node.ParentNode, name: string): boolean;

package/dist/index.js

@@ -1093,21 +1093,17 @@ function crawlProgramScope(parsed, scriptParser) {
     mutatedBindings: void 0
   };
   programScope.bindings.input = {
-    type: 0 /* var */,
+    type: 1 /* param */,
     name: "input",
     node: program,
     scope: programScope,
-    hoisted: false,
-    mutated: false,
-    sourceName: void 0,
-    objectPath: void 0
+    hoisted: false
   };
   visit(program.body, programScope);
   Scopes.set(program.body, programScope);
   for (const binding of potentialHoists) {
     const { scope, name } = binding;
-    const parentScope = scope.parent;
-    let curParent = parentScope;
+    let curParent = scope.parent;
     while (curParent) {
       const parentBinding = (_a = curParent.bindings) == null ? void 0 : _a[name];
       if (parentBinding) {
@@ -1117,7 +1113,6 @@ function crawlProgramScope(parsed, scriptParser) {
         }
         break;
       }
-      curParent.hoists = true;
       if (curParent === programScope) {
         binding.hoisted = true;
         programScope.bindings[name] = {
@@ -1132,6 +1127,11 @@ function crawlProgramScope(parsed, scriptParser) {
     }
     if (binding.hoisted) {
       scope.hoists = true;
+      curParent = scope.parent;
+      while (curParent && !curParent.hoists && curParent !== programScope) {
+        curParent.hoists = true;
+        curParent = curParent.parent;
+      }
     }
   }
   for (const [scope, nodes] of nodesToCheckForMutations) {
@@ -1328,19 +1328,35 @@ ${read({
     }
   }
 }
-function getHoists(node) {
+function getProgramBindings(node) {
   const { bindings } = Scopes.get(node.body);
-  let result;
+  let hoists;
+  let vars;
   for (const key in bindings) {
-    if (bindings[key].type === 2 /* hoisted */) {
-      if (result) {
-        result.push(key);
-      } else {
-        result = [key];
-      }
+    switch (bindings[key].type) {
+      case 2 /* hoisted */:
+        if (hoists) {
+          hoists.push(key);
+        } else {
+          hoists = [key];
+        }
+        break;
+      case 0 /* var */:
+        if (vars) {
+          vars.push(key);
+        } else {
+          vars = [key];
+        }
+        break;
     }
   }
-  return result;
+  if (hoists || vars) {
+    return {
+      all: vars ? hoists ? [...vars, ...hoists] : vars : hoists,
+      vars,
+      hoists
+    };
+  }
 }
 function getHoistSources(body) {
   let result;
@@ -2014,6 +2030,7 @@ var ScriptExtractor = class {
   #mutationOffsets;
   #tagId = 1;
   #renderId = 1;
+  #closeBrackets = [0];
   constructor(opts) {
     const { parsed, lookup, scriptLang } = opts;
     const { api, interop } = getRuntimeAPI(
@@ -2196,7 +2213,7 @@ function ${templateName}() {
     this.#extractor.write(`  const input = ${this.#getCastedType(`Input${typeArgsStr}`)};${this.#api === RuntimeAPI.class ? `
   const component = ${this.#getCastedType(`Component${typeArgsStr}`)};
   const state = ${varShared("state")}(component);
-  const out = ${varShared("out")};` : ""}
+  const out = ${this.#getCastedType("Marko.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.
@@ -2204,18 +2221,37 @@ function ${templateName}() {
   );
 `);
     const body = this.#processBody(program);
+    const bindings = getProgramBindings(program);
+    if (bindings) {
+      for (const name of bindings.all) {
+        this.#extractor.write(
+          `const ${name} = ${varShared("hoist")}(() => ${varLocal(`hoist__${name}`)});
+`
+        );
+      }
+    }
     if (body == null ? void 0 : body.content) {
       this.#writeChildren(program, body.content);
-    }
-    const hoists = getHoists(program);
-    if (hoists) {
-      this.#extractor.write(
-        `const { ${hoists.join(SEP_COMMA_SPACE)} } = ${this.#getBodyHoistScopeExpression(program.body)};
+      if (bindings) {
+        if (bindings.vars) {
+          for (const name of bindings.vars) {
+            this.#extractor.write(
+              `var ${varLocal(`hoist__${name}`)} = ${name};
 `
-      );
+            );
+          }
+        }
+        if (bindings.hoists) {
+          this.#extractor.write(
+            `var {${bindings.hoists.map((name) => `${name}: ${varLocal(`hoist__${name}`)}`).join(SEP_COMMA_SPACE)}} = ${this.#getBodyHoistScopeExpression(program.body)};
+`
+          );
+        }
+      }
+      this.#endChildren();
     }
     this.#extractor.write(
-      `${varShared("noop")}({ ${hoists ? hoists.join(SEP_COMMA_SPACE) + SEP_COMMA_SPACE : ""}${this.#api === RuntimeAPI.class ? "component, state, out, " : ""}input, $global, $signal });
+      `${varShared("noop")}({ ${bindings ? bindings.all.join(SEP_COMMA_SPACE) + SEP_COMMA_SPACE : ""}${this.#api === RuntimeAPI.class ? "component, state, out, " : ""}input, $global, $signal });
 `
     );
     if (didReturn) {
@@ -2314,7 +2350,7 @@ function ${templateName}() {
     this.#extractor.write(`return new (class MarkoReturn<Return = void> {
 `);
     if (scopeExpr) {
-      this.#extractor.write(`[Marko._.scope] = ${scopeExpr};
+      this.#extractor.write(`[${varShared("scope")}] = ${scopeExpr};
 `);
     }
     this.#extractor.write(`declare return: Return;
@@ -2329,6 +2365,7 @@ constructor(_?: Return) {}
     const last = children.length - 1;
     let returnTag;
     let i = 0;
+    this.#closeBrackets.push(0);
     while (i <= last) {
       const child = children[i++];
       switch (child.type) {
@@ -2372,6 +2409,7 @@ scope: ${scopeExpr}
 };
 `);
                 }
+                this.#endChildren();
               }
               let needsAlternate = true;
               if (alternates) {
@@ -2397,6 +2435,7 @@ scope: ${scopeExpr}
 `
                       );
                     }
+                    this.#endChildren();
                   }
                 }
               }
@@ -2434,6 +2473,9 @@ scope: ${scopeExpr}
                 this.#writeChildren(child, body.content);
               }
               this.#writeReturn(void 0, (body == null ? void 0 : body.content) && child.body);
+              if (body == null ? void 0 : body.content) {
+                this.#endChildren();
+              }
               this.#extractor.write("\n});\n");
               break;
             }
@@ -2445,6 +2487,7 @@ scope: ${scopeExpr}
               const body = this.#processBody(child);
               if (body == null ? void 0 : body.content) {
                 this.#writeChildren(child, body.content);
+                this.#endChildren();
               }
               this.#extractor.write("\n}\n");
               break;
@@ -2464,7 +2507,7 @@ scope: ${scopeExpr}
     }
     const mutatedVars = getMutatedVars(parent);
     if (returnTag || mutatedVars) {
-      this.#extractor.write(`const ${varLocal("return")} = {
+      this.#extractor.write(`var ${varLocal("return")} = {
 `);
       if (returnTag) {
         this.#extractor.write(`return: ${varShared("returnTag")}(`);
@@ -2562,7 +2605,8 @@ scope: ${scopeExpr}
     this.#writeTagInputObject(tag);
     this.#extractor.write(");\n");
     if (renderId && tag.var) {
-      this.#extractor.write(`const `);
+      this.#extractor.write(`{const `);
+      this.#closeBrackets[this.#closeBrackets.length - 1]++;
       this.#copyWithMutationsReplaced(tag.var.value);
       this.#extractor.write(
         ` = ${varLocal("rendered_" + renderId)}.return.${ATTR_UNAMED2};
@@ -2570,6 +2614,12 @@ scope: ${scopeExpr}
       );
     }
   }
+  #endChildren() {
+    const pendingBrackets = this.#closeBrackets.pop();
+    if (pendingBrackets) {
+      this.#extractor.write("}".repeat(pendingBrackets));
+    }
+  }
   #writeDynamicTagName(tag) {
     const dynamicTagNameExpression = this.#getDynamicTagExpression(tag);
     if (dynamicTagNameExpression) {
@@ -2657,7 +2707,9 @@ scope: ${scopeExpr}
                       const valueLiteral = this.#read(boundRange.value);
                       this.#extractor.copy(boundRange.value).copy(boundRange.types).write(`
 )${SEP_COMMA_NEW_LINE}"`).copy(defaultMapPosition).copy(name).write(
-                        `Change"(_${valueLiteral}) {
+                        `Change"(
+// @ts-ignore
+_${valueLiteral}) {
 ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}`
                       ).copy(boundRange.value).write(`= _${valueLiteral};
 }`);
@@ -2948,6 +3000,9 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
         didReturn ? `${varLocal("return")}.return` : void 0,
         tag.body
       );
+      if (body == null ? void 0 : body.content) {
+        this.#endChildren();
+      }
       if (tag.params) {
         this.#extractor.write("})");
       } else {
@@ -3153,6 +3208,7 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
       this.#writeAttrTags(body);
       this.#extractor.write("}");
       if (body.content) {
+        this.#endChildren();
         this.#extractor.write(";\n})()");
       }
     } else {

package/dist/index.mjs

@@ -1053,21 +1053,17 @@ function crawlProgramScope(parsed, scriptParser) {
     mutatedBindings: void 0
   };
   programScope.bindings.input = {
-    type: 0 /* var */,
+    type: 1 /* param */,
     name: "input",
     node: program,
     scope: programScope,
-    hoisted: false,
-    mutated: false,
-    sourceName: void 0,
-    objectPath: void 0
+    hoisted: false
   };
   visit(program.body, programScope);
   Scopes.set(program.body, programScope);
   for (const binding of potentialHoists) {
     const { scope, name } = binding;
-    const parentScope = scope.parent;
-    let curParent = parentScope;
+    let curParent = scope.parent;
     while (curParent) {
       const parentBinding = (_a = curParent.bindings) == null ? void 0 : _a[name];
       if (parentBinding) {
@@ -1077,7 +1073,6 @@ function crawlProgramScope(parsed, scriptParser) {
         }
         break;
       }
-      curParent.hoists = true;
       if (curParent === programScope) {
         binding.hoisted = true;
         programScope.bindings[name] = {
@@ -1092,6 +1087,11 @@ function crawlProgramScope(parsed, scriptParser) {
     }
     if (binding.hoisted) {
       scope.hoists = true;
+      curParent = scope.parent;
+      while (curParent && !curParent.hoists && curParent !== programScope) {
+        curParent.hoists = true;
+        curParent = curParent.parent;
+      }
     }
   }
   for (const [scope, nodes] of nodesToCheckForMutations) {
@@ -1288,19 +1288,35 @@ ${read({
     }
   }
 }
-function getHoists(node) {
+function getProgramBindings(node) {
   const { bindings } = Scopes.get(node.body);
-  let result;
+  let hoists;
+  let vars;
   for (const key in bindings) {
-    if (bindings[key].type === 2 /* hoisted */) {
-      if (result) {
-        result.push(key);
-      } else {
-        result = [key];
-      }
+    switch (bindings[key].type) {
+      case 2 /* hoisted */:
+        if (hoists) {
+          hoists.push(key);
+        } else {
+          hoists = [key];
+        }
+        break;
+      case 0 /* var */:
+        if (vars) {
+          vars.push(key);
+        } else {
+          vars = [key];
+        }
+        break;
     }
   }
-  return result;
+  if (hoists || vars) {
+    return {
+      all: vars ? hoists ? [...vars, ...hoists] : vars : hoists,
+      vars,
+      hoists
+    };
+  }
 }
 function getHoistSources(body) {
   let result;
@@ -1977,6 +1993,7 @@ var ScriptExtractor = class {
   #mutationOffsets;
   #tagId = 1;
   #renderId = 1;
+  #closeBrackets = [0];
   constructor(opts) {
     const { parsed, lookup, scriptLang } = opts;
     const { api, interop } = getRuntimeAPI(
@@ -2159,7 +2176,7 @@ function ${templateName}() {
     this.#extractor.write(`  const input = ${this.#getCastedType(`Input${typeArgsStr}`)};${this.#api === RuntimeAPI.class ? `
   const component = ${this.#getCastedType(`Component${typeArgsStr}`)};
   const state = ${varShared("state")}(component);
-  const out = ${varShared("out")};` : ""}
+  const out = ${this.#getCastedType("Marko.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.
@@ -2167,18 +2184,37 @@ function ${templateName}() {
   );
 `);
     const body = this.#processBody(program);
+    const bindings = getProgramBindings(program);
+    if (bindings) {
+      for (const name of bindings.all) {
+        this.#extractor.write(
+          `const ${name} = ${varShared("hoist")}(() => ${varLocal(`hoist__${name}`)});
+`
+        );
+      }
+    }
     if (body == null ? void 0 : body.content) {
       this.#writeChildren(program, body.content);
-    }
-    const hoists = getHoists(program);
-    if (hoists) {
-      this.#extractor.write(
-        `const { ${hoists.join(SEP_COMMA_SPACE)} } = ${this.#getBodyHoistScopeExpression(program.body)};
+      if (bindings) {
+        if (bindings.vars) {
+          for (const name of bindings.vars) {
+            this.#extractor.write(
+              `var ${varLocal(`hoist__${name}`)} = ${name};
 `
-      );
+            );
+          }
+        }
+        if (bindings.hoists) {
+          this.#extractor.write(
+            `var {${bindings.hoists.map((name) => `${name}: ${varLocal(`hoist__${name}`)}`).join(SEP_COMMA_SPACE)}} = ${this.#getBodyHoistScopeExpression(program.body)};
+`
+          );
+        }
+      }
+      this.#endChildren();
     }
     this.#extractor.write(
-      `${varShared("noop")}({ ${hoists ? hoists.join(SEP_COMMA_SPACE) + SEP_COMMA_SPACE : ""}${this.#api === RuntimeAPI.class ? "component, state, out, " : ""}input, $global, $signal });
+      `${varShared("noop")}({ ${bindings ? bindings.all.join(SEP_COMMA_SPACE) + SEP_COMMA_SPACE : ""}${this.#api === RuntimeAPI.class ? "component, state, out, " : ""}input, $global, $signal });
 `
     );
     if (didReturn) {
@@ -2277,7 +2313,7 @@ function ${templateName}() {
     this.#extractor.write(`return new (class MarkoReturn<Return = void> {
 `);
     if (scopeExpr) {
-      this.#extractor.write(`[Marko._.scope] = ${scopeExpr};
+      this.#extractor.write(`[${varShared("scope")}] = ${scopeExpr};
 `);
     }
     this.#extractor.write(`declare return: Return;
@@ -2292,6 +2328,7 @@ constructor(_?: Return) {}
     const last = children.length - 1;
     let returnTag;
     let i = 0;
+    this.#closeBrackets.push(0);
     while (i <= last) {
       const child = children[i++];
       switch (child.type) {
@@ -2335,6 +2372,7 @@ scope: ${scopeExpr}
 };
 `);
                 }
+                this.#endChildren();
               }
               let needsAlternate = true;
               if (alternates) {
@@ -2360,6 +2398,7 @@ scope: ${scopeExpr}
 `
                       );
                     }
+                    this.#endChildren();
                   }
                 }
               }
@@ -2397,6 +2436,9 @@ scope: ${scopeExpr}
                 this.#writeChildren(child, body.content);
               }
               this.#writeReturn(void 0, (body == null ? void 0 : body.content) && child.body);
+              if (body == null ? void 0 : body.content) {
+                this.#endChildren();
+              }
               this.#extractor.write("\n});\n");
               break;
             }
@@ -2408,6 +2450,7 @@ scope: ${scopeExpr}
               const body = this.#processBody(child);
               if (body == null ? void 0 : body.content) {
                 this.#writeChildren(child, body.content);
+                this.#endChildren();
               }
               this.#extractor.write("\n}\n");
               break;
@@ -2427,7 +2470,7 @@ scope: ${scopeExpr}
     }
     const mutatedVars = getMutatedVars(parent);
     if (returnTag || mutatedVars) {
-      this.#extractor.write(`const ${varLocal("return")} = {
+      this.#extractor.write(`var ${varLocal("return")} = {
 `);
       if (returnTag) {
         this.#extractor.write(`return: ${varShared("returnTag")}(`);
@@ -2525,7 +2568,8 @@ scope: ${scopeExpr}
     this.#writeTagInputObject(tag);
     this.#extractor.write(");\n");
     if (renderId && tag.var) {
-      this.#extractor.write(`const `);
+      this.#extractor.write(`{const `);
+      this.#closeBrackets[this.#closeBrackets.length - 1]++;
       this.#copyWithMutationsReplaced(tag.var.value);
       this.#extractor.write(
         ` = ${varLocal("rendered_" + renderId)}.return.${ATTR_UNAMED2};
@@ -2533,6 +2577,12 @@ scope: ${scopeExpr}
       );
     }
   }
+  #endChildren() {
+    const pendingBrackets = this.#closeBrackets.pop();
+    if (pendingBrackets) {
+      this.#extractor.write("}".repeat(pendingBrackets));
+    }
+  }
   #writeDynamicTagName(tag) {
     const dynamicTagNameExpression = this.#getDynamicTagExpression(tag);
     if (dynamicTagNameExpression) {
@@ -2620,7 +2670,9 @@ scope: ${scopeExpr}
                       const valueLiteral = this.#read(boundRange.value);
                       this.#extractor.copy(boundRange.value).copy(boundRange.types).write(`
 )${SEP_COMMA_NEW_LINE}"`).copy(defaultMapPosition).copy(name).write(
-                        `Change"(_${valueLiteral}) {
+                        `Change"(
+// @ts-ignore
+_${valueLiteral}) {
 ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}`
                       ).copy(boundRange.value).write(`= _${valueLiteral};
 }`);
@@ -2911,6 +2963,9 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
         didReturn ? `${varLocal("return")}.return` : void 0,
         tag.body
       );
+      if (body == null ? void 0 : body.content) {
+        this.#endChildren();
+      }
       if (tag.params) {
         this.#extractor.write("})");
       } else {
@@ -3116,6 +3171,7 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
       this.#writeAttrTags(body);
       this.#extractor.write("}");
       if (body.content) {
+        this.#endChildren();
         this.#extractor.write(";\n})()");
       }
     } else {

package/marko.internal.d.ts

@@ -17,7 +17,6 @@ declare global {
     namespace _ {
       export const voidReturn: MarkoReturn<void>;
       export const scope: unique symbol;
-      export const out: Marko.Out;
       export const never: never;
       export const any: any;
 
@@ -25,6 +24,12 @@ declare global {
         override: Override,
       ): [0] extends [1 & Override] ? Marko.Global : Override;
 
+      export function hoist<T, U = T>(
+        value: () => T,
+      ): T extends (...args: any[]) => any
+        ? (T | (U extends undefined ? () => undefined : never)) & Iterable<T>
+        : never;
+
       export function attrTagNames<Tag>(
         tag: Tag,
         fn: (input: AttrTagNames<Marko.Input<Tag>>) => void,
@@ -99,8 +104,7 @@ declare global {
                 : never
             : never;
         }[keyof Rendered]
-      > &
-        Record<any, never>;
+      >;
 
       export function readScope<Value>(
         value: Value,
@@ -116,8 +120,7 @@ declare global {
               ? never
               : Scope
             : never
-      > &
-        Record<any, never>;
+      >;
 
       export function mutable<Lookup>(lookup: Lookup): UnionToIntersection<
         Lookup extends readonly (infer Item)[]
@@ -507,10 +510,6 @@ type BodyParamsWithDefault<Body extends AnyMarkoBody> =
       : Params
     : never;
 
-type Scopes<Input> = [0] extends [1 & Input]
-  ? never
-  : MergeScopes<FlatScopes<Input>>;
-
 type ComponentEventHandlers<Component extends Marko.Component> = {
   [K in Exclude<
     keyof Component,
@@ -521,7 +520,7 @@ type ComponentEventHandlers<Component extends Marko.Component> = {
   >]: Component[K] extends (...args: any) => any ? Component[K] : never;
 };
 
-type FlatScopes<Input> = [0] extends [1 & Input]
+type Scopes<Input> = [0] extends [1 & Input]
   ? never
   :
       | (Input[("content" | "renderBody") & keyof Input] extends infer Prop
@@ -533,7 +532,7 @@ type FlatScopes<Input> = [0] extends [1 & Input]
           ? Prop extends { [Symbol.iterator]: any }
             ? Prop extends readonly any[]
               ? never
-              : FlatScopes<Prop>
+              : Scopes<Prop>
             : never
           : never);
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/language-tools",
   "description": "Marko Language Tools",
-  "version": "2.5.42",
+  "version": "2.5.44",
   "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
   "peerDependencies": {
     "@marko/compiler": "^5.28.4"