@marko/language-tools 2.4.0 → 2.4.2

package/dist/index.js

@@ -1964,7 +1964,7 @@ constructor(_?: Return) {}
     this.#extractor.copy(returned);
     this.#extractor.write(");\n");
   }
-  #writeChildren(parent, children) {
+  #writeChildren(parent, children, skipRenderId = false) {
     var _a, _b;
     const last = children.length - 1;
     let returnTag;
@@ -1979,27 +1979,31 @@ constructor(_?: Return) {}
               break;
             case "if": {
               const alternates = IF_TAG_ALTERNATES.get(child);
-              let renderId = this.#getRenderId(child);
-              if (!renderId && alternates) {
-                for (const { node } of alternates) {
-                  if (renderId = this.#getRenderId(node)) break;
+              let renderId;
+              if (!skipRenderId) {
+                renderId = this.#getRenderId(child);
+                if (!renderId && alternates) {
+                  for (const { node } of alternates) {
+                    if (renderId = this.#getRenderId(node)) break;
+                  }
                 }
-              }
-              if (renderId) {
-                this.#extractor.write(
-                  `${varShared("assertRendered")}(${varShared(
-                    "rendered"
-                  )}, ${renderId}, (() => {
+                if (renderId) {
+                  this.#extractor.write(
+                    `${varShared("assertRendered")}(${varShared(
+                      "rendered"
+                    )}, ${renderId}, (() => {
 `
-                );
+                  );
+                }
               }
               this.#writeComments(child);
               this.#extractor.write("if (").copy(
                 this.#getRangeWithoutTrailingComma((_a = child.args) == null ? void 0 : _a.value) || this.#getAttrValue(child, ATTR_UNAMED2) || "undefined"
               ).write(") {\n");
-              if (child.body) {
+              const ifBody = this.#processBody(child);
+              if (ifBody == null ? void 0 : ifBody.renderBody) {
                 const localBindings = getHoistSources(child);
-                this.#writeChildren(child, child.body);
+                this.#writeChildren(child, ifBody.renderBody, true);
                 if (localBindings) {
                   this.#extractor.write("return {\nscope:");
                   this.#writeObjectKeys(localBindings);
@@ -2018,9 +2022,10 @@ constructor(_?: Return) {}
                   } else {
                     this.#extractor.write("\n} else if (undefined) {\n");
                   }
-                  if (node.body) {
+                  const alternateBody = this.#processBody(node);
+                  if (alternateBody == null ? void 0 : alternateBody.renderBody) {
                     const localBindings = getHoistSources(node);
-                    this.#writeChildren(node, node.body);
+                    this.#writeChildren(node, alternateBody.renderBody, true);
                     if (localBindings) {
                       this.#extractor.write("return {\nscope:");
                       this.#writeObjectKeys(localBindings);
@@ -2487,23 +2492,22 @@ const attrTags = ${varShared(
   }
   #writeTagInputObject(tag) {
     if (!tag.params) this.#writeComments(tag);
-    const body = this.#processBody(tag);
-    let writeInputObj = true;
     let hasInput = false;
+    this.#extractor.write("{\n");
     if (tag.args) {
       hasInput = true;
-      this.#extractor.copy(tag.args.value);
-      if (body || tag.attrs || tag.shorthandId || tag.shorthandClassNames) {
-        this.#extractor.write(",\n{\n");
-      } else {
-        writeInputObj = false;
-      }
-    } else {
-      this.#extractor.write("{\n");
+      this.#extractor.write("[").copy({
+        start: tag.args.start,
+        end: tag.args.start + 1
+      }).write('"value"').copy({
+        start: tag.args.end - 1,
+        end: tag.args.end
+      }).write(`]: ${varShared("tuple")}(`).copy(tag.args.value).write(")").write(",\n");
     }
     if (this.#writeAttrs(tag)) {
       hasInput = true;
     }
+    const body = this.#processBody(tag);
     let hasRenderBody = false;
     if (body) {
       hasInput = true;
@@ -2549,9 +2553,7 @@ const attrTags = ${varShared(
     if (!hasInput) {
       this.#writeTagNameComment(tag);
     }
-    if (writeInputObj) {
-      this.#extractor.write("\n}");
-    }
+    this.#extractor.write("\n}");
   }
   #writeObjectKeys(keys) {
     this.#extractor.write("{");

package/dist/index.mjs

@@ -1928,7 +1928,7 @@ constructor(_?: Return) {}
     this.#extractor.copy(returned);
     this.#extractor.write(");\n");
   }
-  #writeChildren(parent, children) {
+  #writeChildren(parent, children, skipRenderId = false) {
     var _a, _b;
     const last = children.length - 1;
     let returnTag;
@@ -1943,27 +1943,31 @@ constructor(_?: Return) {}
               break;
             case "if": {
               const alternates = IF_TAG_ALTERNATES.get(child);
-              let renderId = this.#getRenderId(child);
-              if (!renderId && alternates) {
-                for (const { node } of alternates) {
-                  if (renderId = this.#getRenderId(node)) break;
+              let renderId;
+              if (!skipRenderId) {
+                renderId = this.#getRenderId(child);
+                if (!renderId && alternates) {
+                  for (const { node } of alternates) {
+                    if (renderId = this.#getRenderId(node)) break;
+                  }
                 }
-              }
-              if (renderId) {
-                this.#extractor.write(
-                  `${varShared("assertRendered")}(${varShared(
-                    "rendered"
-                  )}, ${renderId}, (() => {
+                if (renderId) {
+                  this.#extractor.write(
+                    `${varShared("assertRendered")}(${varShared(
+                      "rendered"
+                    )}, ${renderId}, (() => {
 `
-                );
+                  );
+                }
               }
               this.#writeComments(child);
               this.#extractor.write("if (").copy(
                 this.#getRangeWithoutTrailingComma((_a = child.args) == null ? void 0 : _a.value) || this.#getAttrValue(child, ATTR_UNAMED2) || "undefined"
               ).write(") {\n");
-              if (child.body) {
+              const ifBody = this.#processBody(child);
+              if (ifBody == null ? void 0 : ifBody.renderBody) {
                 const localBindings = getHoistSources(child);
-                this.#writeChildren(child, child.body);
+                this.#writeChildren(child, ifBody.renderBody, true);
                 if (localBindings) {
                   this.#extractor.write("return {\nscope:");
                   this.#writeObjectKeys(localBindings);
@@ -1982,9 +1986,10 @@ constructor(_?: Return) {}
                   } else {
                     this.#extractor.write("\n} else if (undefined) {\n");
                   }
-                  if (node.body) {
+                  const alternateBody = this.#processBody(node);
+                  if (alternateBody == null ? void 0 : alternateBody.renderBody) {
                     const localBindings = getHoistSources(node);
-                    this.#writeChildren(node, node.body);
+                    this.#writeChildren(node, alternateBody.renderBody, true);
                     if (localBindings) {
                       this.#extractor.write("return {\nscope:");
                       this.#writeObjectKeys(localBindings);
@@ -2451,23 +2456,22 @@ const attrTags = ${varShared(
   }
   #writeTagInputObject(tag) {
     if (!tag.params) this.#writeComments(tag);
-    const body = this.#processBody(tag);
-    let writeInputObj = true;
     let hasInput = false;
+    this.#extractor.write("{\n");
     if (tag.args) {
       hasInput = true;
-      this.#extractor.copy(tag.args.value);
-      if (body || tag.attrs || tag.shorthandId || tag.shorthandClassNames) {
-        this.#extractor.write(",\n{\n");
-      } else {
-        writeInputObj = false;
-      }
-    } else {
-      this.#extractor.write("{\n");
+      this.#extractor.write("[").copy({
+        start: tag.args.start,
+        end: tag.args.start + 1
+      }).write('"value"').copy({
+        start: tag.args.end - 1,
+        end: tag.args.end
+      }).write(`]: ${varShared("tuple")}(`).copy(tag.args.value).write(")").write(",\n");
     }
     if (this.#writeAttrs(tag)) {
       hasInput = true;
     }
+    const body = this.#processBody(tag);
     let hasRenderBody = false;
     if (body) {
       hasInput = true;
@@ -2513,9 +2517,7 @@ const attrTags = ${varShared(
     if (!hasInput) {
       this.#writeTagNameComment(tag);
     }
-    if (writeInputObj) {
-      this.#extractor.write("\n}");
-    }
+    this.#extractor.write("\n}");
   }
   #writeObjectKeys(keys) {
     this.#extractor.write("{");

package/marko.internal.d.ts

@@ -310,10 +310,14 @@ declare global {
             ? NativeTagRenderer<Name>
             : [Name] extends [AnyMarkoBody]
               ? BodyRenderer<Name>
-              : [Name] extends [
-                    { renderBody?: infer Name extends AnyMarkoBody },
-                  ]
-                ? BodyRenderer<Name>
+              : [Name] extends [{ renderBody?: AnyMarkoBody }]
+                ? [Name["renderBody"]] extends [AnyMarkoBody]
+                  ? BodyRenderer<Name["renderBody"]>
+                  : BaseRenderer<
+                      RenderBodyInput<
+                        BodyParameters<Exclude<Name["renderBody"], void>>
+                      >
+                    >
                 : DefaultRenderer;
 
       export type TemplateRenderer<Template> = Template extends {
@@ -345,8 +349,12 @@ declare global {
       export interface BodyRenderer<Body extends AnyMarkoBody> {
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-constraint
         (): () => <__marko_internal_input extends unknown>(
-          ...args: BodyParamsWithDefault<Body> &
-            Relate<__marko_internal_input, BodyParamsWithDefault<Body>>
+          input: Marko.Directives &
+            RenderBodyInput<BodyParameters<Body>> &
+            Relate<
+              __marko_internal_input,
+              Marko.Directives & RenderBodyInput<BodyParameters<Body>>
+            >,
         ) => ReturnAndScope<
           Scopes<__marko_internal_input>,
           BodyReturnType<Body>
@@ -393,12 +401,15 @@ type ReturnAndScope<Scope, Return> = {
   scope: Scope;
 };
 
-type BodyParamsWithDefault<Body extends AnyMarkoBody> =
-  Body extends Marko.Body<infer Params, any>
-    ? Params extends []
-      ? [input?: Record<string, never>]
-      : Params
-    : never;
+type RenderBodyInput<Args extends readonly unknown[]> = Args extends {
+  length: infer Length;
+}
+  ? number extends Length
+    ? { value?: Args }
+    : 0 extends Length
+      ? { value?: [] }
+      : { value: Args }
+  : never;
 
 type Scopes<Input> = [0] extends [1 & Input]
   ? never

package/package.json

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