@marko/language-tools 2.5.16 → 2.5.18

package/dist/index.js

@@ -2151,11 +2151,19 @@ function ${templateName}() {
     if (hoists) {
       this.#extractor.write("const ");
       this.#writeObjectKeys(hoists);
-      this.#extractor.write(
-        ` = ${varShared("readScopes")}(${varShared("rendered")});
-`
-      );
-      this.#extractor.write(`${varShared("noop")}(`);
+      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");
     }
@@ -2271,9 +2279,7 @@ constructor(_?: Return) {}
                 }
                 if (renderId) {
                   this.#extractor.write(
-                    `${varShared("assertRendered")}(${varShared(
-                      "rendered"
-                    )}, ${renderId}, (() => {
+                    `const ${varLocal("rendered_" + renderId)} = (() => {
 `
                   );
                 }
@@ -2322,7 +2328,7 @@ constructor(_?: Return) {}
                 this.#extractor.write("\n}\n");
               }
               if (renderId) {
-                this.#extractor.write("\n})())\n");
+                this.#extractor.write("\n})()\n");
               }
               break;
             }
@@ -2330,9 +2336,7 @@ constructor(_?: Return) {}
               const renderId = this.#getRenderId(child);
               if (renderId) {
                 this.#extractor.write(
-                  `${varShared("assertRendered")}(${varShared(
-                    "rendered"
-                  )}, ${renderId}, `
+                  `const ${varLocal("rendered_" + renderId)} = `
                 );
               }
               this.#extractor.write(
@@ -2355,11 +2359,7 @@ constructor(_?: Return) {}
                 void 0,
                 (body == null ? void 0 : body.content) ? getHoistSources(child) : void 0
               );
-              if (renderId) {
-                this.#extractor.write("\n}));\n");
-              } else {
-                this.#extractor.write("\n});\n");
-              }
+              this.#extractor.write("\n});\n");
               break;
             }
             case "while": {
@@ -2405,9 +2405,9 @@ constructor(_?: Return) {}
         for (const binding of mutatedVars) {
           this.#extractor.write(
             `${// TODO use a different format to avoid const annotation.
-            this.#scriptLang === "js" /* js */ ? "/** @type {const} */" : ""}[${JSON.stringify(binding.name) + (binding.sourceName && binding.sourceName !== binding.name ? `, ${JSON.stringify(binding.sourceName)}` : "")}, ${varShared("rendered")}.returns[${this.#getRenderId(
-              binding.node
-            )}]${binding.objectPath || ""}]${SEP_COMMA_NEW_LINE}`
+            this.#scriptLang === "js" /* js */ ? "/** @type {const} */" : ""}[${JSON.stringify(binding.name) + (binding.sourceName && binding.sourceName !== binding.name ? `, ${JSON.stringify(binding.sourceName)}` : "")}, ${varLocal(
+              "rendered_" + this.#getRenderId(binding.node)
+            )}.return${binding.objectPath || ""}]${SEP_COMMA_NEW_LINE}`
           );
         }
         this.#extractor.write(
@@ -2468,9 +2468,7 @@ constructor(_?: Return) {}
       }
     }
     if (renderId) {
-      this.#extractor.write(
-        `${varShared("assertRendered")}(${varShared("rendered")},${renderId},`
-      );
+      this.#extractor.write(`const ${varLocal("rendered_" + renderId)} = `);
     }
     if (isHTML) {
       this.#extractor.write(`${varShared("renderNativeTag")}("`).copy(tag.name).write('")');
@@ -2487,15 +2485,12 @@ constructor(_?: Return) {}
       this.#extractor.write("()()(");
     }
     this.#writeTagInputObject(tag);
-    if (renderId) {
-      this.#extractor.write(`)`);
-    }
     this.#extractor.write(");\n");
     if (renderId && tag.var) {
       this.#extractor.write(`const `);
       this.#copyWithMutationsReplaced(tag.var.value);
       this.#extractor.write(
-        ` = ${varShared("rendered")}.returns[${renderId}].${ATTR_UNAMED2};
+        ` = ${varLocal("rendered_" + renderId)}.return.${ATTR_UNAMED2};
 `
       );
     }

package/dist/index.mjs

@@ -2114,11 +2114,19 @@ function ${templateName}() {
     if (hoists) {
       this.#extractor.write("const ");
       this.#writeObjectKeys(hoists);
-      this.#extractor.write(
-        ` = ${varShared("readScopes")}(${varShared("rendered")});
-`
-      );
-      this.#extractor.write(`${varShared("noop")}(`);
+      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");
     }
@@ -2234,9 +2242,7 @@ constructor(_?: Return) {}
                 }
                 if (renderId) {
                   this.#extractor.write(
-                    `${varShared("assertRendered")}(${varShared(
-                      "rendered"
-                    )}, ${renderId}, (() => {
+                    `const ${varLocal("rendered_" + renderId)} = (() => {
 `
                   );
                 }
@@ -2285,7 +2291,7 @@ constructor(_?: Return) {}
                 this.#extractor.write("\n}\n");
               }
               if (renderId) {
-                this.#extractor.write("\n})())\n");
+                this.#extractor.write("\n})()\n");
               }
               break;
             }
@@ -2293,9 +2299,7 @@ constructor(_?: Return) {}
               const renderId = this.#getRenderId(child);
               if (renderId) {
                 this.#extractor.write(
-                  `${varShared("assertRendered")}(${varShared(
-                    "rendered"
-                  )}, ${renderId}, `
+                  `const ${varLocal("rendered_" + renderId)} = `
                 );
               }
               this.#extractor.write(
@@ -2318,11 +2322,7 @@ constructor(_?: Return) {}
                 void 0,
                 (body == null ? void 0 : body.content) ? getHoistSources(child) : void 0
               );
-              if (renderId) {
-                this.#extractor.write("\n}));\n");
-              } else {
-                this.#extractor.write("\n});\n");
-              }
+              this.#extractor.write("\n});\n");
               break;
             }
             case "while": {
@@ -2368,9 +2368,9 @@ constructor(_?: Return) {}
         for (const binding of mutatedVars) {
           this.#extractor.write(
             `${// TODO use a different format to avoid const annotation.
-            this.#scriptLang === "js" /* js */ ? "/** @type {const} */" : ""}[${JSON.stringify(binding.name) + (binding.sourceName && binding.sourceName !== binding.name ? `, ${JSON.stringify(binding.sourceName)}` : "")}, ${varShared("rendered")}.returns[${this.#getRenderId(
-              binding.node
-            )}]${binding.objectPath || ""}]${SEP_COMMA_NEW_LINE}`
+            this.#scriptLang === "js" /* js */ ? "/** @type {const} */" : ""}[${JSON.stringify(binding.name) + (binding.sourceName && binding.sourceName !== binding.name ? `, ${JSON.stringify(binding.sourceName)}` : "")}, ${varLocal(
+              "rendered_" + this.#getRenderId(binding.node)
+            )}.return${binding.objectPath || ""}]${SEP_COMMA_NEW_LINE}`
           );
         }
         this.#extractor.write(
@@ -2431,9 +2431,7 @@ constructor(_?: Return) {}
       }
     }
     if (renderId) {
-      this.#extractor.write(
-        `${varShared("assertRendered")}(${varShared("rendered")},${renderId},`
-      );
+      this.#extractor.write(`const ${varLocal("rendered_" + renderId)} = `);
     }
     if (isHTML) {
       this.#extractor.write(`${varShared("renderNativeTag")}("`).copy(tag.name).write('")');
@@ -2450,15 +2448,12 @@ constructor(_?: Return) {}
       this.#extractor.write("()()(");
     }
     this.#writeTagInputObject(tag);
-    if (renderId) {
-      this.#extractor.write(`)`);
-    }
     this.#extractor.write(");\n");
     if (renderId && tag.var) {
       this.#extractor.write(`const `);
       this.#copyWithMutationsReplaced(tag.var.value);
       this.#extractor.write(
-        ` = ${varShared("rendered")}.returns[${renderId}].${ATTR_UNAMED2};
+        ` = ${varLocal("rendered_" + renderId)}.return.${ATTR_UNAMED2};
 `
       );
     }

package/marko.internal.d.ts

@@ -34,12 +34,6 @@ declare global {
         fn: (input: AttrTagNames<Input>) => void,
       ): void;
 
-      export const rendered: {
-        scopes: Record<number, never>;
-        returns: Record<number, never>;
-      };
-
-      export const tags: Record<number, unknown>;
       export const content: DefaultBodyContentKey;
 
       export function contentFor<Name>(
@@ -87,36 +81,25 @@ declare global {
         ? Instance
         : never;
 
-      export function readScopes<Rendered>(
-        rendered: Rendered,
-      ): MergeScopes<
-        Rendered extends { scopes: Record<any, infer Scope> } ? Scope : never
+      export function readScopes<Rendered>(rendered: Rendered): MergeScopes<
+        {
+          [K in keyof Rendered]: Rendered[K] extends infer Value
+            ? 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
+            : never;
+        }[keyof Rendered]
       > &
         Record<any, never>;
 
-      export function assertTag<Index extends number, Tags, Tag>(
-        tags: Tags,
-        index: Index,
-        tag: Tag,
-      ): asserts tags is Tags &
-        Record<Index, [0] extends [1 & Tag] ? any : Tag>;
-
-      export function assertRendered<Index extends number, Rendered, Result>(
-        rendered: Rendered,
-        index: Index,
-        result: Result,
-      ): asserts rendered is Rendered & {
-        scopes: Record<
-          Index,
-          MergeOptionalScopes<
-            Result extends { scope: infer Scope } ? Scope : undefined
-          >
-        >;
-        returns: Result extends { return?: infer Return }
-          ? Record<Index, Return>
-          : Record<Index, never>;
-      };
-
       export function mutable<Lookup>(lookup: Lookup): UnionToIntersection<
         Lookup extends readonly (infer Item)[]
           ? Item extends
@@ -174,7 +157,7 @@ declare global {
       >(input: Input): Input;
 
       export function forOfTag<
-        Value,
+        Value extends Iterable,
         Item extends Value extends
           | readonly (infer Item)[]
           | Iterable<infer Item>

package/package.json

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