@marko/language-tools 2.5.27 → 2.5.29

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

@@ -54,7 +54,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 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;
 export declare function hasHoists(node: Node.ParentTag): boolean;

package/dist/index.js

@@ -744,11 +744,11 @@ var Extracted = class {
     const sourceOffset = this.sourceOffsetAt(generatedOffset);
     if (sourceOffset !== void 0) return this.parsed.positionAt(sourceOffset);
   }
+  sourceRangeAt(generatedStart, generatedEnd) {
+    return this.#generatedToSource.rangeAt(generatedStart, generatedEnd);
+  }
   sourceLocationAt(generatedStart, generatedEnd) {
-    const sourceRange = this.#generatedToSource.rangeAt(
-      generatedStart,
-      generatedEnd
-    );
+    const sourceRange = this.sourceRangeAt(generatedStart, generatedEnd);
     if (sourceRange) {
       return this.parsed.locationAt(sourceRange);
     }
@@ -762,11 +762,11 @@ var Extracted = class {
       return (0, import_htmljs_parser2.getPosition)(this.#generatedLines, generatedOffset);
     }
   }
+  generatedRangeAt(sourceStart, sourceEnd) {
+    return this.#sourceToGenerated.rangeAt(sourceStart, sourceEnd);
+  }
   generatedLocationAt(sourceStart, sourceEnd) {
-    const generatedRange = this.#sourceToGenerated.rangeAt(
-      sourceStart,
-      sourceEnd
-    );
+    const generatedRange = this.generatedRangeAt(sourceStart, sourceEnd);
     if (generatedRange) {
       return (0, import_htmljs_parser2.getLocation)(
         this.#generatedLines,
@@ -1117,6 +1117,7 @@ function crawlProgramScope(parsed, scriptParser) {
         }
         break;
       }
+      curParent.hoists = true;
       if (curParent === programScope) {
         binding.hoisted = true;
         programScope.bindings[name] = {
@@ -1130,11 +1131,7 @@ function crawlProgramScope(parsed, scriptParser) {
       curParent = curParent.parent;
     }
     if (binding.hoisted) {
-      curParent = scope;
-      while (curParent && !curParent.hoists) {
-        curParent.hoists = true;
-        curParent = curParent.parent;
-      }
+      scope.hoists = true;
     }
   }
   for (const [scope, nodes] of nodesToCheckForMutations) {
@@ -1327,10 +1324,10 @@ function getHoists(node) {
   }
   return result;
 }
-function getHoistSources(node) {
+function getHoistSources(body) {
   let result;
-  if (node.body) {
-    const { bindings } = Scopes.get(node.body);
+  if (body) {
+    const { bindings } = Scopes.get(body);
     for (const key in bindings) {
       if (bindings[key].hoisted) {
         if (result) {
@@ -2150,7 +2147,6 @@ function ${templateName}() {
     // @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")})
   );
-  ${varShared("noop")}({ ${this.#api !== RuntimeAPI.tags ? "component, state, out, " : ""}input, $global, $signal });
 `);
     const body = this.#processBody(program);
     if (body == null ? void 0 : body.content) {
@@ -2160,22 +2156,15 @@ function ${templateName}() {
     if (hoists) {
       this.#extractor.write("const ");
       this.#writeObjectKeys(hoists);
-      this.#extractor.write(` = ${varShared("readScopes")}({`);
-      for (const child of program.body) {
-        if (child.type === 1 /* Tag */) {
-          const renderId = this.#renderIds.get(child);
-          if (renderId !== void 0) {
-            this.#extractor.write(
-              `${varLocal("rendered_" + renderId)}${SEP_COMMA_SPACE}`
-            );
-          }
-        }
-      }
-      this.#extractor.write(`});
-${varShared("noop")}(`);
-      this.#writeObjectKeys(hoists);
-      this.#extractor.write(");\n");
+      this.#extractor.write(
+        " = " + 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 });
+`
+    );
     if (didReturn) {
       this.#extractor.write(`return ${varLocal("return")}.return;
 }
@@ -2261,19 +2250,31 @@ ${varShared("noop")}(`);
       }
     }
   }
-  #writeReturn(returned, localBindings) {
-    if (!returned && !localBindings) {
+  #writeReturn(returned, body) {
+    const hoistSources = getHoistSources(body);
+    const hoistScopes = this.#getBodyHoistScopeExpression(body);
+    const hasHoists2 = !!(hoistScopes || hoistSources);
+    if (!returned && !hasHoists2) {
       this.#extractor.write(`return ${varShared("voidReturn")};
 `);
       return;
     }
     this.#extractor.write(`return new (class MarkoReturn<Return = void> {
 `);
-    if (localBindings) {
-      this.#extractor.write(`[Marko._.scope] = `);
-      this.#writeObjectKeys(localBindings);
-      this.#extractor.write(`;
-`);
+    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");
     }
     this.#extractor.write(`declare return: Return;
 constructor(_?: Return) {}
@@ -2318,7 +2319,7 @@ constructor(_?: Return) {}
               ).write(") {\n");
               const ifBody = this.#processBody(child);
               if (ifBody == null ? void 0 : ifBody.content) {
-                const localBindings = getHoistSources(child);
+                const localBindings = getHoistSources(child.body);
                 this.#writeChildren(child, ifBody.content, true);
                 if (localBindings) {
                   this.#extractor.write("return {\nscope:");
@@ -2340,7 +2341,7 @@ constructor(_?: Return) {}
                   }
                   const alternateBody = this.#processBody(node);
                   if (alternateBody == null ? void 0 : alternateBody.content) {
-                    const localBindings = getHoistSources(node);
+                    const localBindings = getHoistSources(node.body);
                     this.#writeChildren(node, alternateBody.content, true);
                     if (localBindings) {
                       this.#extractor.write("return {\nscope:");
@@ -2383,10 +2384,7 @@ constructor(_?: Return) {}
               if (body == null ? void 0 : body.content) {
                 this.#writeChildren(child, body.content);
               }
-              this.#writeReturn(
-                void 0,
-                (body == null ? void 0 : body.content) ? getHoistSources(child) : void 0
-              );
+              this.#writeReturn(void 0, (body == null ? void 0 : body.content) && child.body);
               this.#extractor.write("\n});\n");
               break;
             }
@@ -2905,7 +2903,7 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
       }
       this.#writeReturn(
         didReturn ? `${varLocal("return")}.return` : void 0,
-        getHoistSources(tag)
+        tag.body
       );
       if (tag.params) {
         this.#extractor.write("})");
@@ -3221,6 +3219,35 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
     }
     return renderId;
   }
+  #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];
+            }
+          }
+        }
+      }
+    }
+    if (hoistIds) {
+      if (hoistIds.length === 1) {
+        return `${varLocal("rendered_" + hoistIds[0])}.scope`;
+      }
+      let result = `${varShared("readScopes")}({ `;
+      let sep = "";
+      for (const renderId of hoistIds) {
+        result += sep + `${varLocal("rendered_" + renderId)}`;
+        sep = SEP_COMMA_SPACE;
+      }
+      return result + " })";
+    }
+  }
   #ensureTagId(tag) {
     let tagId = this.#tagIds.get(tag);
     if (!tagId) {

package/dist/index.mjs

@@ -704,11 +704,11 @@ var Extracted = class {
     const sourceOffset = this.sourceOffsetAt(generatedOffset);
     if (sourceOffset !== void 0) return this.parsed.positionAt(sourceOffset);
   }
+  sourceRangeAt(generatedStart, generatedEnd) {
+    return this.#generatedToSource.rangeAt(generatedStart, generatedEnd);
+  }
   sourceLocationAt(generatedStart, generatedEnd) {
-    const sourceRange = this.#generatedToSource.rangeAt(
-      generatedStart,
-      generatedEnd
-    );
+    const sourceRange = this.sourceRangeAt(generatedStart, generatedEnd);
     if (sourceRange) {
       return this.parsed.locationAt(sourceRange);
     }
@@ -722,11 +722,11 @@ var Extracted = class {
       return getPosition(this.#generatedLines, generatedOffset);
     }
   }
+  generatedRangeAt(sourceStart, sourceEnd) {
+    return this.#sourceToGenerated.rangeAt(sourceStart, sourceEnd);
+  }
   generatedLocationAt(sourceStart, sourceEnd) {
-    const generatedRange = this.#sourceToGenerated.rangeAt(
-      sourceStart,
-      sourceEnd
-    );
+    const generatedRange = this.generatedRangeAt(sourceStart, sourceEnd);
     if (generatedRange) {
       return getLocation(
         this.#generatedLines,
@@ -1077,6 +1077,7 @@ function crawlProgramScope(parsed, scriptParser) {
         }
         break;
       }
+      curParent.hoists = true;
       if (curParent === programScope) {
         binding.hoisted = true;
         programScope.bindings[name] = {
@@ -1090,11 +1091,7 @@ function crawlProgramScope(parsed, scriptParser) {
       curParent = curParent.parent;
     }
     if (binding.hoisted) {
-      curParent = scope;
-      while (curParent && !curParent.hoists) {
-        curParent.hoists = true;
-        curParent = curParent.parent;
-      }
+      scope.hoists = true;
     }
   }
   for (const [scope, nodes] of nodesToCheckForMutations) {
@@ -1287,10 +1284,10 @@ function getHoists(node) {
   }
   return result;
 }
-function getHoistSources(node) {
+function getHoistSources(body) {
   let result;
-  if (node.body) {
-    const { bindings } = Scopes.get(node.body);
+  if (body) {
+    const { bindings } = Scopes.get(body);
     for (const key in bindings) {
       if (bindings[key].hoisted) {
         if (result) {
@@ -2113,7 +2110,6 @@ function ${templateName}() {
     // @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")})
   );
-  ${varShared("noop")}({ ${this.#api !== RuntimeAPI.tags ? "component, state, out, " : ""}input, $global, $signal });
 `);
     const body = this.#processBody(program);
     if (body == null ? void 0 : body.content) {
@@ -2123,22 +2119,15 @@ function ${templateName}() {
     if (hoists) {
       this.#extractor.write("const ");
       this.#writeObjectKeys(hoists);
-      this.#extractor.write(` = ${varShared("readScopes")}({`);
-      for (const child of program.body) {
-        if (child.type === 1 /* Tag */) {
-          const renderId = this.#renderIds.get(child);
-          if (renderId !== void 0) {
-            this.#extractor.write(
-              `${varLocal("rendered_" + renderId)}${SEP_COMMA_SPACE}`
-            );
-          }
-        }
-      }
-      this.#extractor.write(`});
-${varShared("noop")}(`);
-      this.#writeObjectKeys(hoists);
-      this.#extractor.write(");\n");
+      this.#extractor.write(
+        " = " + 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 });
+`
+    );
     if (didReturn) {
       this.#extractor.write(`return ${varLocal("return")}.return;
 }
@@ -2224,19 +2213,31 @@ ${varShared("noop")}(`);
       }
     }
   }
-  #writeReturn(returned, localBindings) {
-    if (!returned && !localBindings) {
+  #writeReturn(returned, body) {
+    const hoistSources = getHoistSources(body);
+    const hoistScopes = this.#getBodyHoistScopeExpression(body);
+    const hasHoists2 = !!(hoistScopes || hoistSources);
+    if (!returned && !hasHoists2) {
       this.#extractor.write(`return ${varShared("voidReturn")};
 `);
       return;
     }
     this.#extractor.write(`return new (class MarkoReturn<Return = void> {
 `);
-    if (localBindings) {
-      this.#extractor.write(`[Marko._.scope] = `);
-      this.#writeObjectKeys(localBindings);
-      this.#extractor.write(`;
-`);
+    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");
     }
     this.#extractor.write(`declare return: Return;
 constructor(_?: Return) {}
@@ -2281,7 +2282,7 @@ constructor(_?: Return) {}
               ).write(") {\n");
               const ifBody = this.#processBody(child);
               if (ifBody == null ? void 0 : ifBody.content) {
-                const localBindings = getHoistSources(child);
+                const localBindings = getHoistSources(child.body);
                 this.#writeChildren(child, ifBody.content, true);
                 if (localBindings) {
                   this.#extractor.write("return {\nscope:");
@@ -2303,7 +2304,7 @@ constructor(_?: Return) {}
                   }
                   const alternateBody = this.#processBody(node);
                   if (alternateBody == null ? void 0 : alternateBody.content) {
-                    const localBindings = getHoistSources(node);
+                    const localBindings = getHoistSources(node.body);
                     this.#writeChildren(node, alternateBody.content, true);
                     if (localBindings) {
                       this.#extractor.write("return {\nscope:");
@@ -2346,10 +2347,7 @@ constructor(_?: Return) {}
               if (body == null ? void 0 : body.content) {
                 this.#writeChildren(child, body.content);
               }
-              this.#writeReturn(
-                void 0,
-                (body == null ? void 0 : body.content) ? getHoistSources(child) : void 0
-              );
+              this.#writeReturn(void 0, (body == null ? void 0 : body.content) && child.body);
               this.#extractor.write("\n});\n");
               break;
             }
@@ -2868,7 +2866,7 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
       }
       this.#writeReturn(
         didReturn ? `${varLocal("return")}.return` : void 0,
-        getHoistSources(tag)
+        tag.body
       );
       if (tag.params) {
         this.#extractor.write("})");
@@ -3184,6 +3182,35 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
     }
     return renderId;
   }
+  #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];
+            }
+          }
+        }
+      }
+    }
+    if (hoistIds) {
+      if (hoistIds.length === 1) {
+        return `${varLocal("rendered_" + hoistIds[0])}.scope`;
+      }
+      let result = `${varShared("readScopes")}({ `;
+      let sep = "";
+      for (const renderId of hoistIds) {
+        result += sep + `${varLocal("rendered_" + renderId)}`;
+        sep = SEP_COMMA_SPACE;
+      }
+      return result + " })";
+    }
+  }
   #ensureTagId(tag) {
     let tagId = this.#tagIds.get(tag);
     if (!tagId) {

package/dist/util/extractor.d.ts

@@ -20,9 +20,17 @@ export declare class Extracted {
     constructor(parsed: Parsed, generated: string, tokens: Token[]);
     sourceOffsetAt(generatedOffset: number): number | undefined;
     sourcePositionAt(generatedOffset: number): Position | undefined;
+    sourceRangeAt(generatedStart: number, generatedEnd: number): {
+        start: number;
+        end: number;
+    } | undefined;
     sourceLocationAt(generatedStart: number, generatedEnd: number): Location | undefined;
     generatedOffsetAt(sourceOffset: number): number | undefined;
     generatedPositionAt(sourceOffset: number): Position | undefined;
+    generatedRangeAt(sourceStart: number, sourceEnd: number): {
+        start: number;
+        end: number;
+    } | undefined;
     generatedLocationAt(sourceStart: number, sourceEnd: number): Location | undefined;
     toString(): string;
 }

package/marko.internal.d.ts

@@ -170,7 +170,7 @@ declare global {
       >(
         input: {
           of: Value | false | void | null;
-          by?: (item: Item, index: number) => string;
+          by?: ((item: Item, index: number) => string) | string;
         },
         content: BodyContent,
       ): ReturnAndScope<BodyContentScope<BodyContent>, void>;

package/package.json

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