@marko/language-tools 2.5.5 → 2.5.7

package/dist/index.mjs

@@ -1614,6 +1614,120 @@ function tryReaddirSync(dir) {
   }
 }
 
+// src/extractors/script/util/get-runtime-api.ts
+var RuntimeAPI = {
+  tags: "tags",
+  class: "class"
+};
+function getRuntimeAPI(translator, parsed) {
+  return detectAPIFromTranslator(translator) || detectAPIFromFileName(parsed.filename) || detectAPIFromProgram(parsed, parsed.program);
+}
+function detectAPIFromTranslator(translator) {
+  switch (translator == null ? void 0 : translator.preferAPI) {
+    case "class":
+      return RuntimeAPI.class;
+    case "tags":
+      return RuntimeAPI.tags;
+  }
+}
+function detectAPIFromFileName(filename) {
+  for (let end = filename.length, i = end; --i; ) {
+    switch (filename[i]) {
+      case "/":
+      case "\\":
+        if (filename.startsWith("tags", i + 1)) {
+          return RuntimeAPI.tags;
+        } else if (filename.startsWith("components", i + 1)) {
+          return;
+        }
+        end = i;
+        break;
+    }
+  }
+}
+function detectAPIFromProgram(parsed, program) {
+  if (program.comments) {
+    switch (parsed.read(program.comments[0].value).trim()) {
+      case "use tags":
+        return RuntimeAPI.tags;
+      case "use class":
+        return RuntimeAPI.class;
+    }
+  }
+  if (program.static) {
+    for (const stmt of program.static) {
+      switch (stmt.type) {
+        case 26 /* Class */:
+        case 27 /* Style */:
+          return RuntimeAPI.class;
+      }
+    }
+  }
+  return detectAPIFromBody(parsed, program.body);
+}
+function detectAPIFromBody(parsed, body) {
+  if (body) {
+    for (const child of body) {
+      const api = detectAPIFromChild(parsed, child);
+      if (api) return api;
+    }
+  }
+}
+function detectAPIFromChild(parsed, child) {
+  switch (child.type) {
+    case 23 /* Scriptlet */:
+      return RuntimeAPI.class;
+    case 1 /* Tag */:
+    case 16 /* AttrTag */:
+      return detectAPIFromTag(parsed, child);
+  }
+}
+function detectAPIFromTag(parsed, tag) {
+  var _a;
+  switch (tag.nameText) {
+    case "macro":
+    case "include-text":
+    case "include-html":
+    case "init-components":
+    case "await-reorderer":
+    case "while":
+    case "module-code":
+      return RuntimeAPI.class;
+    case "const":
+    case "debug":
+    case "define":
+    case "html-script":
+    case "html-style":
+    case "id":
+    case "let":
+    case "lifecycle":
+    case "log":
+    case "return":
+      return RuntimeAPI.tags;
+  }
+  if (tag.var) {
+    return RuntimeAPI.tags;
+  }
+  if (tag.attrs) {
+    for (const attr of tag.attrs) {
+      if (attr.type !== 15 /* AttrSpread */) {
+        if (((_a = attr.value) == null ? void 0 : _a.type) === 13 /* AttrValue */ && attr.value.bound) {
+          return RuntimeAPI.tags;
+        }
+        if (attr.args) {
+          return RuntimeAPI.class;
+        }
+        if (/^(?:key|no-update(?:-body)?(?:-if)?)$|:(scoped:no-update)$/.test(
+          parsed.read(attr.name)
+        )) {
+          return RuntimeAPI.class;
+        }
+      }
+    }
+  }
+  return detectAPIFromBody(parsed, tag.body);
+}
+
 // src/extractors/script/util/jsdoc-input-type.ts
 var MaybeInputTypedefReg = /@typedef\b[\s\S]*\bInput\b/;
 function getJSDocInputType(comment, ts) {
@@ -1793,7 +1907,7 @@ var REG_TAG_IMPORT = /(?<=(['"]))<([^'">]+)>(?=\1)/;
 var REG_INPUT_TYPE = /\s*(interface|type)\s+Input\b/y;
 var REG_OBJECT_PROPERTY = /^[_$a-z][_$a-z0-9]*$/i;
 var REG_COMMENT_PRAGMA = /\/\/(?:\s*@ts-|\/\s*<)/y;
-var REG_TAG_NAME_IDENTIFIER = /^[A-Z][a-zA-Z_$]+$/;
+var REG_TAG_NAME_IDENTIFIER = /^[A-Z][a-zA-Z0-9_$]+$/;
 var IF_TAG_ALTERNATES = /* @__PURE__ */ new WeakMap();
 var WROTE_COMMENT = /* @__PURE__ */ new WeakSet();
 var START_OF_FILE = { start: 0, end: 0 };
@@ -1813,11 +1927,14 @@ var ScriptExtractor = class {
   #scriptParser;
   #read;
   #lookup;
+  #tagIds = /* @__PURE__ */ new Map();
   #renderIds = /* @__PURE__ */ new Map();
   #scriptLang;
   #ts;
   #runtimeTypes;
+  #api;
   #mutationOffsets;
+  #tagId = 1;
   #renderId = 1;
   constructor(opts) {
     const { parsed, lookup, scriptLang } = opts;
@@ -1831,6 +1948,7 @@ var ScriptExtractor = class {
     this.#extractor = new Extractor(parsed);
     this.#scriptParser = new ScriptParser(parsed);
     this.#read = parsed.read.bind(parsed);
+    this.#api = getRuntimeAPI(opts.translator, parsed);
     this.#mutationOffsets = crawlProgramScope(this.#parsed, this.#scriptParser);
     this.#writeProgram(parsed.program);
   }
@@ -1989,8 +2107,8 @@ function ${templateName}() {
   ${varShared("noop")}({ input, component, state, out, $global, $signal });
 `);
     const body = this.#processBody(program);
-    if (body == null ? void 0 : body.renderBody) {
-      this.#writeChildren(program, body.renderBody);
+    if (body == null ? void 0 : body.content) {
+      this.#writeChildren(program, body.content);
     }
     const hoists = getHoists(program);
     if (hoists) {
@@ -2021,6 +2139,7 @@ function ${templateName}() {
       "ReturnWithScope"
     )}<${internalInput}, ${didReturn ? `typeof ${templateName + typeArgsStr} extends () => infer Return ? Return : never` : "void"}>)`;
     const templateOverrideClass = `${templateBaseClass}<{${this.#runtimeTypes ? getRuntimeOverrides(this.#runtimeTypes, typeParamsStr, typeArgsStr) : ""}
+  ${this.#api ? `api: "${this.#api}",` : ""}
   _${typeParamsStr ? `<${internalApply} = 1>(): ${internalApply} extends 0
     ? ${typeParamsStr}() => <${internalInputWithExtends}>${renderAndReturn}
     : () => <${internalInputWithExtends}, ${typeParamsStr.slice(
@@ -2127,9 +2246,9 @@ constructor(_?: Return) {}
                 this.#getRangeWithoutTrailingComma((_a = child.args) == null ? void 0 : _a.value) || this.#getAttrValue(child, ATTR_UNAMED2) || "undefined"
               ).write(") {\n");
               const ifBody = this.#processBody(child);
-              if (ifBody == null ? void 0 : ifBody.renderBody) {
+              if (ifBody == null ? void 0 : ifBody.content) {
                 const localBindings = getHoistSources(child);
-                this.#writeChildren(child, ifBody.renderBody, true);
+                this.#writeChildren(child, ifBody.content, true);
                 if (localBindings) {
                   this.#extractor.write("return {\nscope:");
                   this.#writeObjectKeys(localBindings);
@@ -2149,9 +2268,9 @@ constructor(_?: Return) {}
                     this.#extractor.write("\n} else if (undefined) {\n");
                   }
                   const alternateBody = this.#processBody(node);
-                  if (alternateBody == null ? void 0 : alternateBody.renderBody) {
+                  if (alternateBody == null ? void 0 : alternateBody.content) {
                     const localBindings = getHoistSources(node);
-                    this.#writeChildren(node, alternateBody.renderBody, true);
+                    this.#writeChildren(node, alternateBody.content, true);
                     if (localBindings) {
                       this.#extractor.write("return {\nscope:");
                       this.#writeObjectKeys(localBindings);
@@ -2192,12 +2311,12 @@ constructor(_?: Return) {}
               }
               this.#extractor.write("\n) => {\n");
               const body = this.#processBody(child);
-              if (body == null ? void 0 : body.renderBody) {
-                this.#writeChildren(child, body.renderBody);
+              if (body == null ? void 0 : body.content) {
+                this.#writeChildren(child, body.content);
               }
               this.#writeReturn(
                 void 0,
-                (body == null ? void 0 : body.renderBody) ? getHoistSources(child) : void 0
+                (body == null ? void 0 : body.content) ? getHoistSources(child) : void 0
               );
               if (renderId) {
                 this.#extractor.write("\n}));\n");
@@ -2212,8 +2331,8 @@ constructor(_?: Return) {}
                 this.#getRangeWithoutTrailingComma((_b = child.args) == null ? void 0 : _b.value) || "undefined"
               ).write("\n) {\n");
               const body = this.#processBody(child);
-              if (body == null ? void 0 : body.renderBody) {
-                this.#writeChildren(child, body.renderBody);
+              if (body == null ? void 0 : body.content) {
+                this.#writeChildren(child, body.content);
               }
               this.#extractor.write("\n}\n");
               break;
@@ -2273,51 +2392,53 @@ constructor(_?: Return) {}
   #writeTag(tag) {
     const tagName = tag.nameText;
     const renderId = this.#getRenderId(tag);
-    let nestedTagType;
+    const def = tagName ? this.#lookup.getTag(tagName) : void 0;
     if (renderId) {
       this.#extractor.write(
-        `${varShared("assertRendered")}(${varShared(
-          "rendered"
-        )}, ${renderId}, `
+        `${varShared("assertRendered")}(${varShared("rendered")},${renderId},`
       );
     }
-    if (tagName) {
-      const def = this.#lookup.getTag(tagName);
-      if (def) {
-        const importPath = resolveTagImport(this.#filename, def);
-        const isMarkoFile = importPath == null ? void 0 : importPath.endsWith(".marko");
-        if (isMarkoFile) {
-          nestedTagType = `import("${importPath}").Input`;
-        }
-        const renderer = (importPath == null ? void 0 : importPath.endsWith(".marko")) ? `renderTemplate(import("${importPath}"))` : def.html ? `renderNativeTag("${def.name}")` : "missingTag";
-        if (!def.html && REG_TAG_NAME_IDENTIFIER.test(tagName)) {
+    if (def == null ? void 0 : def.html) {
+      this.#extractor.write(`${varShared("renderNativeTag")}("`).copy(tag.name).write('")');
+    } else {
+      const importPath = def && resolveTagImport(this.#filename, def);
+      if (def && !importPath) {
+        this.#extractor.write(varShared("missingTag"));
+      } else {
+        const tagId = this.#ensureTagId(tag);
+        let isDynamic = true;
+        this.#extractor.write(
+          `(${varShared("assertTag")}(${varShared("tags")},${tagId},(
+`
+        );
+        if (tagName && REG_TAG_NAME_IDENTIFIER.test(tagName)) {
+          if (importPath) {
+            this.#extractor.write(
+              `${varShared("fallbackTemplate")}(${tagName},import("${importPath}"))`
+            );
+          } else {
+            this.#extractor.copy(tag.name);
+          }
+        } else if (importPath) {
+          isDynamic = !importPath.endsWith(".marko");
           this.#extractor.write(
-            `${varShared("renderPreferLocal")}(
-// @ts-expect-error We expect the compiler to error because we are checking if the tag is defined.
-(${varShared("error")}, `
-          ).copy(tag.name).write(`),
-${varShared(renderer)})`);
+            `${varShared("resolveTemplate")}(import("${importPath}"))`
+          );
         } else {
-          this.#extractor.write(varShared(renderer));
+          this.#writeDynamicTagName(tag);
         }
-      } else if (REG_TAG_NAME_IDENTIFIER.test(tagName)) {
-        nestedTagType = `Marko.Input<typeof ${this.#read(tag.name)}>`;
-        this.#extractor.write(`${varShared("renderDynamicTag")}(
-`).copy(tag.name).write("\n)");
-      } else {
-        this.#extractor.write(`${varShared("missingTag")}`);
+        this.#extractor.write(
+          `
+)),${varShared(isDynamic ? "renderDynamicTag" : "renderTemplate")}(${varShared("tags")}[${tagId}]))`
+        );
       }
-    } else {
-      this.#extractor.write(`${varShared("renderDynamicTag")}(`);
-      this.#writeDynamicTagName(tag);
-      this.#extractor.write(")");
     }
     if (tag.typeArgs) {
       this.#extractor.write(`<0>()`).copy(tag.typeArgs).write("()(");
     } else {
       this.#extractor.write("()()(");
     }
-    this.#writeTagInputObject(tag, nestedTagType);
+    this.#writeTagInputObject(tag);
     if (renderId) {
       this.#extractor.write(`)`);
     }
@@ -2501,7 +2622,7 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
     );
     return hasAttrs;
   }
-  #writeAttrTags({ staticAttrTags, dynamicAttrTagParents }, inMerge, nestedTagType) {
+  #writeAttrTags({ staticAttrTags, dynamicAttrTagParents }, inMerge) {
     let wasMerge = false;
     if (dynamicAttrTagParents) {
       if (staticAttrTags) {
@@ -2517,7 +2638,7 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
       }
     }
     if (staticAttrTags) {
-      this.#writeStaticAttrTags(staticAttrTags, inMerge, nestedTagType);
+      this.#writeStaticAttrTags(staticAttrTags, inMerge);
       if (dynamicAttrTagParents)
         this.#extractor.write(`}${SEP_COMMA_NEW_LINE}`);
     }
@@ -2526,7 +2647,7 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
       if (wasMerge) this.#extractor.write(`)${SEP_COMMA_NEW_LINE}`);
     }
   }
-  #writeStaticAttrTags(staticAttrTags, wasMerge, nestedTagType) {
+  #writeStaticAttrTags(staticAttrTags, wasMerge) {
     if (!wasMerge) this.#extractor.write("...{");
     this.#extractor.write(
       `[${varShared("never")}](){
@@ -2547,36 +2668,40 @@ const attrTags = ${varShared(
     this.#extractor.write(SEP_COMMA_NEW_LINE);
     for (const nameText in staticAttrTags) {
       const attrTag = staticAttrTags[nameText];
-      const attrTagDef = this.#lookup.getTag(nameText);
       const isRepeated = attrTag.length > 1;
       const [firstAttrTag] = attrTag;
-      const name = (attrTagDef == null ? void 0 : attrTagDef.targetProperty) || nameText.slice(nameText.lastIndexOf(":") + 1);
+      const name = this.#getAttrTagName(firstAttrTag);
       this.#extractor.write(`["${name}"`);
       this.#writeTagNameComment(firstAttrTag);
       this.#extractor.write("]: ");
       if (isRepeated) {
-        this.#extractor.write(`${varShared("repeatedAttrTag")}(
-...
-`);
-        if (nestedTagType && this.#scriptLang === "js" /* js */) {
+        const tagId = this.#tagIds.get(firstAttrTag.owner);
+        if (tagId) {
+          let accessor = `["${name}"]`;
+          let curTag = firstAttrTag.parent;
+          while (curTag) {
+            if (curTag.type === 16 /* AttrTag */) {
+              accessor = `["${this.#getAttrTagName(curTag)}"]${accessor}`;
+            } else if (!isControlFlowTag(curTag)) {
+              break;
+            }
+            curTag = curTag.parent;
+          }
           this.#extractor.write(
-            `/** @satisfies {${nestedTagType}["${name}"][]} */
+            `${varShared("attrTags")}(${varShared("input")}(${varShared("tags")}[${tagId}])${accessor})([
 `
           );
-        }
-        this.#extractor.write(`([
+        } else {
+          this.#extractor.write(`${varShared("attrTags")}()([
 `);
+        }
       }
       for (const childNode of attrTag) {
         this.#writeTagInputObject(childNode);
         this.#extractor.write(SEP_COMMA_NEW_LINE);
       }
       if (isRepeated) {
-        this.#extractor.write("])");
-        if (nestedTagType && this.#scriptLang === "ts" /* ts */) {
-          this.#extractor.write(` satisfies ${nestedTagType}["${name}"][]`);
-        }
-        this.#extractor.write(`)${SEP_COMMA_NEW_LINE}`);
+        this.#extractor.write(`])${SEP_COMMA_NEW_LINE}`);
       }
     }
   }
@@ -2639,7 +2764,7 @@ const attrTags = ${varShared(
       this.#extractor.write(SEP_COMMA_NEW_LINE);
     }
   }
-  #writeTagInputObject(tag, nestedTagType) {
+  #writeTagInputObject(tag) {
     if (!tag.params) this.#writeComments(tag);
     let hasInput = false;
     this.#extractor.write("{\n");
@@ -2657,7 +2782,7 @@ const attrTags = ${varShared(
       hasInput = true;
     }
     const isScript = isTextOnlyScript(tag);
-    let hasRenderBody = false;
+    let hasBodyContent = false;
     let body;
     if (isScript) {
       this.#extractor.write("async value(){");
@@ -2670,14 +2795,35 @@ const attrTags = ${varShared(
       body = this.#processBody(tag);
       if (body) {
         hasInput = true;
-        this.#writeAttrTags(body, false, nestedTagType);
-        hasRenderBody = body.renderBody !== void 0;
+        this.#writeAttrTags(body, false);
+        hasBodyContent = body.content !== void 0;
       } else if (tag.close) {
-        hasRenderBody = true;
+        hasBodyContent = true;
       }
     }
-    if (tag.params || hasRenderBody) {
-      this.#extractor.write('["renderBody"');
+    if (tag.params || hasBodyContent) {
+      this.#extractor.write("[");
+      switch (this.#api) {
+        case RuntimeAPI.tags:
+          this.#extractor.write('"content"');
+          break;
+        case RuntimeAPI.class:
+          this.#extractor.write('"renderBody"');
+          break;
+        default: {
+          const tagId = this.#tagIds.get(
+            tag.type === 16 /* AttrTag */ ? tag.owner : tag
+          );
+          if (tagId) {
+            this.#extractor.write(
+              `${varShared("contentFor")}(${varShared("tags")}[${tagId}])`
+            );
+          } else {
+            this.#extractor.write(varShared("content"));
+          }
+          break;
+        }
+      }
       this.#writeTagNameComment(tag);
       this.#extractor.write("]: ");
       if (tag.params) {
@@ -2691,8 +2837,8 @@ const attrTags = ${varShared(
 `);
       }
       let didReturn = false;
-      if (body == null ? void 0 : body.renderBody) {
-        didReturn = this.#writeChildren(tag, body.renderBody);
+      if (body == null ? void 0 : body.content) {
+        didReturn = this.#writeChildren(tag, body.content);
       }
       if (!tag.params) {
         this.#extractor.write(`return () => {
@@ -2781,7 +2927,7 @@ const attrTags = ${varShared(
     const { body } = parent;
     if (!body) return;
     const last = body.length - 1;
-    let renderBody;
+    let content;
     let staticAttrTags;
     let dynamicAttrTagParents;
     let i = 0;
@@ -2870,48 +3016,48 @@ const attrTags = ${varShared(
             } else {
               dynamicAttrTagParents = [child];
             }
-          } else if (renderBody) {
-            renderBody.push(child);
+          } else if (content) {
+            content.push(child);
           } else {
-            renderBody = [child];
+            content = [child];
           }
           break;
         }
         case 17 /* Text */: {
           if (!this.#isEmptyText(child)) {
-            if (renderBody) {
-              renderBody.push(child);
+            if (content) {
+              content.push(child);
             } else {
-              renderBody = [child];
+              content = [child];
             }
           }
           break;
         }
         default:
-          if (renderBody) {
-            renderBody.push(child);
+          if (content) {
+            content.push(child);
           } else {
-            renderBody = [child];
+            content = [child];
           }
           break;
       }
     }
-    if (renderBody || staticAttrTags || dynamicAttrTagParents) {
-      return { renderBody, staticAttrTags, dynamicAttrTagParents };
+    if (content || staticAttrTags || dynamicAttrTagParents) {
+      return { content, staticAttrTags, dynamicAttrTagParents };
     }
   }
   #writeDynamicAttrTagBody(tag) {
     const body = this.#processBody(tag);
     if (body) {
-      if (body.renderBody) {
+      if (body.content) {
         this.#extractor.write("(() => {\n");
-        this.#writeChildren(tag, body.renderBody);
+        this.#writeChildren(tag, body.content);
         this.#extractor.write("return ");
       }
       this.#extractor.write("{\n");
       this.#writeAttrTags(body, true);
       this.#extractor.write("}");
-      if (body.renderBody) {
+      if (body.content) {
         this.#extractor.write(";\n})()");
       }
     } else {
@@ -3014,6 +3160,14 @@ const attrTags = ${varShared(
     }
     return renderId;
   }
+  #ensureTagId(tag) {
+    let tagId = this.#tagIds.get(tag);
+    if (!tagId) {
+      tagId = this.#tagId++;
+      this.#tagIds.set(tag, tagId);
+    }
+    return tagId;
+  }
   #getNamedAttrModifierIndex(attr) {
     const start = attr.name.start + 1;
     const end = attr.name.end - 1;
@@ -3022,6 +3176,11 @@ const attrTags = ${varShared(
     }
     return false;
   }
+  #getAttrTagName(tag) {
+    var _a;
+    const { nameText } = tag;
+    return ((_a = this.#lookup.getTag(nameText)) == null ? void 0 : _a.targetProperty) || nameText.slice(nameText.lastIndexOf(":") + 1);
+  }
   #testAtIndex(reg, index) {
     reg.lastIndex = index;
     return reg.test(this.#code);
@@ -3511,6 +3670,7 @@ var marko_default = {
         return extractScript({
           ts,
           parsed,
+          translator: getConfig(dir).translator,
           lookup: getTagLookup(dir),
           scriptLang: getScriptLang(
             fileName,
@@ -3660,6 +3820,7 @@ export {
   getLines,
   getLocation,
   getPosition,
+  isControlFlowTag,
   isDefinitionFile,
   parse
 };

package/dist/parser.d.ts

@@ -80,7 +80,7 @@ export declare namespace Node {
     interface AttrTag extends Range, Commentable {
         type: NodeType.AttrTag;
         parent: ParentTag;
-        owner: ParentTag | undefined;
+        owner: Tag | undefined;
         concise: boolean;
         selfClosed: boolean;
         hasAttrTags: boolean;
@@ -225,3 +225,9 @@ export declare function parse(code: string, filename?: string): {
     program: Node.Program;
     code: string;
 };
+/**
+ * Used to check if a node should be ignored as the parent of an attribute tag.
+ * When control flow is the parent of an attribute tag, we add the attribute tag to
+ * the closest non control flow ancestor attrs instead.
+ */
+export declare function isControlFlowTag(node: Node.Tag): node is Node.ControlFlowTag;

package/dist/util/project.d.ts

@@ -7,6 +7,7 @@ export interface Meta {
     config: Omit<Compiler.Config, "cache" | "translator"> & {
         cache: Map<any, any>;
         translator: {
+            preferAPI?: string;
             runtimeTypes?: string;
             [x: string]: unknown;
         };
@@ -25,6 +26,7 @@ export declare function getCache(dir?: string): Map<any, any>;
 export declare function getConfig(dir?: string): Omit<Compiler.Config, "cache" | "translator"> & {
     cache: Map<any, any>;
     translator: {
+        preferAPI?: string;
         runtimeTypes?: string;
         [x: string]: unknown;
     };