@marko/language-tools 2.3.1 → 2.4.0

package/dist/index.mjs

@@ -10,8 +10,7 @@ import { TagType, createParser } from "htmljs-parser";
 // src/util/get-node-at-offset.ts
 function getNodeAtOffset(offset, program) {
   const childNode = childAtOffset(offset, program.body);
-  if (childNode)
-    return visitChildNode(offset, childNode);
+  if (childNode) return visitChildNode(offset, childNode);
   return childAtOffset(offset, program.static) || program;
 }
 function visitChildNode(offset, child) {
@@ -75,8 +74,7 @@ function visitAttrNode(offset, attr) {
 }
 function childAtOffset(offset, children) {
   let max = children.length - 1;
-  if (max === -1)
-    return void 0;
+  if (max === -1) return void 0;
   let min = 0;
   while (min < max) {
     const mid = 1 + min + max >>> 1;
@@ -258,6 +256,7 @@ var Builder = class {
     }
     if (!range.expressions.length) {
       switch (nameText = this.#code.slice(range.start, range.end)) {
+        // All statement types will early return.
         case "style": {
           styleBlockReg.lastIndex = range.end;
           const styleBlockMatch = styleBlockReg.exec(this.#code);
@@ -332,6 +331,8 @@ var Builder = class {
           );
           this.#comments = void 0;
           return TagType.statement;
+        // The following are all still tags,
+        // but with a different body type.
         case "area":
         case "base":
         case "br":
@@ -591,8 +592,7 @@ var Builder = class {
   }
   onCloseTagEnd(range) {
     const parent = this.#parentNode;
-    if (hasCloseTag(parent))
-      parent.close.end = range.end;
+    if (hasCloseTag(parent)) parent.close.end = range.end;
     parent.end = range.end;
     this.#parentNode = parent.parent;
   }
@@ -691,8 +691,7 @@ var Extracted = class {
   }
   sourcePositionAt(generatedOffset) {
     const sourceOffset = this.sourceOffsetAt(generatedOffset);
-    if (sourceOffset !== void 0)
-      return this.parsed.positionAt(sourceOffset);
+    if (sourceOffset !== void 0) return this.parsed.positionAt(sourceOffset);
   }
   sourceLocationAt(generatedStart, generatedEnd) {
     const sourceRange = this.#generatedToSource.rangeAt(
@@ -768,8 +767,7 @@ var TokenView = class {
     }
     const startToken = this.#tokens[max];
     const startTokenInStart = this.inStart(startToken);
-    if (startTokenInStart >= inEnd)
-      return;
+    if (startTokenInStart >= inEnd) return;
     max = this.#last;
     while (min < max) {
       const mid = 1 + min + max >>> 1;
@@ -784,8 +782,7 @@ var TokenView = class {
     const endToken = this.#tokens[min];
     const endTokenInStart = this.inStart(endToken);
     const endTokenInEnd = endTokenInStart + endToken.length;
-    if (endTokenInEnd < inStart)
-      return;
+    if (endTokenInEnd < inStart) return;
     const startIndex = inStart - startTokenInStart;
     const endIndex = inEnd - endTokenInStart;
     const start = this.outStart(startToken) + Math.max(0, startIndex);
@@ -947,16 +944,6 @@ var ScriptParser = class {
   }
 };
 
-// src/extractors/script/util/is-valid-identifier.ts
-import {
-  isIdentifierName,
-  isKeyword,
-  isStrictBindReservedWord
-} from "@babel/helper-validator-identifier";
-function isValidIdentifier(name) {
-  return isIdentifierName(name) && !isKeyword(name) && !isStrictBindReservedWord(name, true);
-}
-
 // src/extractors/script/util/attach-scopes.ts
 import * as t from "@babel/types";
 var ATTR_UNAMED = "value";
@@ -1327,6 +1314,10 @@ function* getVarIdentifiers(parsed, lVal, objectPath, sourceName) {
 function trackMutationsInClosures(root, scope, mutations) {
   traverse(root, (node) => {
     switch (node.type) {
+      // Since the root will always be an expression it's impossible
+      // to hit a "FunctionDeclaration" without first going through
+      // a a different function context. So we don't need to track it.
+      // case "FunctionDeclaration":
       case "FunctionExpression":
       case "ObjectMethod":
       case "ArrowFunctionExpression":
@@ -1338,8 +1329,7 @@ function trackMutationsInClosures(root, scope, mutations) {
   });
 }
 function trackMutations(node, scope, mutations, parentBlock, parentBlockShadows, parentBlockMutations) {
-  if (!node)
-    return;
+  if (!node) return;
   let block = parentBlock;
   let blockShadows = parentBlockShadows;
   let blockMutations = parentBlockMutations;
@@ -1462,8 +1452,7 @@ function trackMutations(node, scope, mutations, parentBlock, parentBlockShadows,
   }
   if (block !== parentBlock && blockMutations.length) {
     for (const { name, start } of blockMutations) {
-      if (blockShadows.has(name))
-        continue;
+      if (blockShadows.has(name)) continue;
       const binding = resolveWritableVar(scope, name);
       if (binding) {
         binding.mutated = true;
@@ -1480,10 +1469,8 @@ function trackShadows(node, scope, shadows) {
   }
 }
 function traverse(node, enter) {
-  if (!node)
-    return;
-  if (enter(node))
-    return;
+  if (!node) return;
+  if (enter(node)) return;
   for (const key of t.VISITOR_KEYS[node.type]) {
     const child = node[key];
     if (Array.isArray(child)) {
@@ -1581,8 +1568,7 @@ function getRuntimeOverrides(runtimeTypes, generics, applyGenerics) {
 var MaybeInputTypedefReg = /@typedef\b[\s\S]*\bInput\b/;
 function getJSDocInputType(comment, ts) {
   var _a, _b, _c, _d;
-  if (!MaybeInputTypedefReg.test(comment))
-    return;
+  if (!MaybeInputTypedefReg.test(comment)) return;
   const sourceFile = ts.createSourceFile(
     "_.js",
     comment,
@@ -1591,8 +1577,7 @@ function getJSDocInputType(comment, ts) {
     ts.ScriptKind.JS
   );
   const tags = (_b = (_a = sourceFile.endOfFileToken.jsDoc) == null ? void 0 : _a[0]) == null ? void 0 : _b.tags;
-  if (!(tags && hasInputTypeDef(ts, sourceFile, tags)))
-    return;
+  if (!(tags && hasInputTypeDef(ts, sourceFile, tags))) return;
   let typeParameters;
   for (const tag of tags) {
     if (isTemplateTag(ts, tag)) {
@@ -1642,10 +1627,11 @@ var REG_EXT = /(?<=[/\\][^/\\]+)\.[^.]+$/;
 var REG_BLOCK = /\s*{/y;
 var REG_NEW_LINE = /^|(\r?\n)/g;
 var REG_ATTR_ARG_LITERAL = /(?<=\s*)(["'])((?:[^"'\\]+|\\.|(?!\1))*)\1\s*([,)])/my;
-var REG_TAG_IMPORT = /(?<=(['"]))<([^\1>]+)>(?=\1)/;
+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 IF_TAG_ALTERNATES = /* @__PURE__ */ new WeakMap();
 var WROTE_COMMENT = /* @__PURE__ */ new WeakSet();
 var START_OF_FILE = { start: 0, end: 0 };
@@ -1960,8 +1946,7 @@ constructor(_?: Return) {}
               let renderId = this.#getRenderId(child);
               if (!renderId && alternates) {
                 for (const { node } of alternates) {
-                  if (renderId = this.#getRenderId(node))
-                    break;
+                  if (renderId = this.#getRenderId(node)) break;
                 }
               }
               if (renderId) {
@@ -2132,7 +2117,7 @@ constructor(_?: Return) {}
       if (def) {
         const importPath = resolveTagImport(this.#filename, def);
         const renderer = (importPath == null ? void 0 : importPath.endsWith(".marko")) ? `renderTemplate(import("${importPath}"))` : def.html ? `renderNativeTag("${def.name}")` : "missingTag";
-        if (!def.html && isValidIdentifier(tagName)) {
+        if (!def.html && REG_TAG_NAME_IDENTIFIER.test(tagName)) {
           this.#extractor.write(
             `${varShared("renderPreferLocal")}(
 // @ts-expect-error We expect the compiler to error because we are checking if the tag is defined.
@@ -2142,7 +2127,7 @@ ${varShared(renderer)})`);
         } else {
           this.#extractor.write(varShared(renderer));
         }
-      } else if (isValidIdentifier(tagName)) {
+      } else if (REG_TAG_NAME_IDENTIFIER.test(tagName)) {
         this.#extractor.write(`${varShared("renderDynamicTag")}(
 `).copy(tag.name).write("\n)");
       } else {
@@ -2364,13 +2349,11 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
     }
     if (dynamicAttrTagParents) {
       this.#writeDynamicAttrTagParents(dynamicAttrTagParents);
-      if (wasMerge)
-        this.#extractor.write(`)${SEP_COMMA_NEW_LINE}`);
+      if (wasMerge) this.#extractor.write(`)${SEP_COMMA_NEW_LINE}`);
     }
   }
   #writeStaticAttrTags(staticAttrTags, wasMerge) {
-    if (!wasMerge)
-      this.#extractor.write("...{");
+    if (!wasMerge) this.#extractor.write("...{");
     this.#extractor.write(
       `[${varShared("never")}](){
 const attrTags = ${varShared(
@@ -2386,27 +2369,27 @@ const attrTags = ${varShared(
       }
     }
     this.#extractor.write("\n}");
-    if (!wasMerge)
-      this.#extractor.write("}");
+    if (!wasMerge) this.#extractor.write("}");
     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 ? true : attrTagDef == null ? void 0 : attrTagDef.isRepeated;
+      const isRepeated = attrTag.length > 1;
       const [firstAttrTag] = attrTag;
       const name = (attrTagDef == null ? void 0 : attrTagDef.targetProperty) || nameText.slice(nameText.lastIndexOf(":") + 1);
       this.#extractor.write(`["${name}"`);
       this.#writeTagNameComment(firstAttrTag);
       this.#extractor.write("]: ");
       if (isRepeated) {
-        this.#extractor.write("[\n");
+        this.#extractor.write(`${varShared("repeatedAttrTag")}(
+`);
       }
       for (const childNode of attrTag) {
         this.#writeTagInputObject(childNode);
         this.#extractor.write(SEP_COMMA_NEW_LINE);
       }
       if (isRepeated) {
-        this.#extractor.write(`]${SEP_COMMA_NEW_LINE}`);
+        this.#extractor.write(`)${SEP_COMMA_NEW_LINE}`);
       }
     }
   }
@@ -2445,8 +2428,7 @@ const attrTags = ${varShared(
         case "for": {
           this.#extractor.write(`${varShared("forAttrTag")}({
 `);
-          if (!this.#writeAttrs(tag))
-            this.#writeTagNameComment(tag);
+          if (!this.#writeAttrs(tag)) this.#writeTagNameComment(tag);
           this.#extractor.write("}, \n");
           this.#writeComments(tag);
           this.#extractor.copy(tag.typeParams).write("(\n").copy((_b = tag.params) == null ? void 0 : _b.value).write("\n) => (");
@@ -2456,12 +2438,11 @@ const attrTags = ${varShared(
         }
         case "while": {
           this.#writeComments(tag);
-          this.#extractor.write(`${varShared("mergeAttrTags")}((
-`).copy(
+          this.#extractor.write("((\n").copy(
             this.#getRangeWithoutTrailingComma((_c = tag.args) == null ? void 0 : _c.value) || "undefined"
-          ).write("\n) ? [");
+          ).write("\n) ? ");
           this.#writeDynamicAttrTagBody(tag);
-          this.#extractor.write("] : [])");
+          this.#extractor.write(" : {})");
           break;
         }
       }
@@ -2469,24 +2450,24 @@ const attrTags = ${varShared(
     }
   }
   #writeTagInputObject(tag) {
-    if (!tag.params)
-      this.#writeComments(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.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");
+      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");
     }
     if (this.#writeAttrs(tag)) {
       hasInput = true;
     }
-    const body = this.#processBody(tag);
     let hasRenderBody = false;
     if (body) {
       hasInput = true;
@@ -2532,7 +2513,9 @@ const attrTags = ${varShared(
     if (!hasInput) {
       this.#writeTagNameComment(tag);
     }
-    this.#extractor.write("\n}");
+    if (writeInputObj) {
+      this.#extractor.write("\n}");
+    }
   }
   #writeObjectKeys(keys) {
     this.#extractor.write("{");
@@ -2546,8 +2529,7 @@ const attrTags = ${varShared(
   }
   #copyWithMutationsReplaced(range) {
     const mutations = this.#mutationOffsets;
-    if (!mutations)
-      return this.#extractor.copy(range);
+    if (!mutations) return this.#extractor.copy(range);
     const len = mutations.length;
     let curOffset = range.start;
     let minIndex = 0;
@@ -2597,8 +2579,7 @@ const attrTags = ${varShared(
   #processBody(parent) {
     var _a;
     const { body } = parent;
-    if (!body)
-      return;
+    if (!body) return;
     const last = body.length - 1;
     let renderBody;
     let staticAttrTags;
@@ -2631,56 +2612,55 @@ const attrTags = ${varShared(
             case "if": {
               let alternates;
               hasDynamicAttrTags ||= child.hasAttrTags;
-              loop:
-                while (i <= last) {
-                  const nextChild = body[i++];
-                  switch (nextChild.type) {
-                    case 17 /* Text */:
-                      if (this.#isEmptyText(nextChild)) {
+              loop: while (i <= last) {
+                const nextChild = body[i++];
+                switch (nextChild.type) {
+                  case 17 /* Text */:
+                    if (this.#isEmptyText(nextChild)) {
+                      continue loop;
+                    } else {
+                      break;
+                    }
+                  case 1 /* Tag */:
+                    switch (nextChild.nameText) {
+                      case "else-if": {
+                        const alternate = {
+                          condition: this.#getRangeWithoutTrailingComma(
+                            (_a = nextChild.args) == null ? void 0 : _a.value
+                          ) || this.#getAttrValue(nextChild, ATTR_UNAMED2),
+                          node: nextChild
+                        };
+                        hasDynamicAttrTags ||= nextChild.hasAttrTags;
+                        if (alternates) {
+                          alternates.push(alternate);
+                        } else {
+                          alternates = [alternate];
+                        }
                         continue loop;
-                      } else {
-                        break;
                       }
-                    case 1 /* Tag */:
-                      switch (nextChild.nameText) {
-                        case "else-if": {
-                          const alternate = {
-                            condition: this.#getRangeWithoutTrailingComma(
-                              (_a = nextChild.args) == null ? void 0 : _a.value
-                            ) || this.#getAttrValue(nextChild, ATTR_UNAMED2),
-                            node: nextChild
-                          };
-                          hasDynamicAttrTags ||= nextChild.hasAttrTags;
-                          if (alternates) {
-                            alternates.push(alternate);
-                          } else {
-                            alternates = [alternate];
-                          }
-                          continue loop;
+                      case "else": {
+                        const alternate = {
+                          condition: this.#getAttrValue(nextChild, "if"),
+                          node: nextChild
+                        };
+                        hasDynamicAttrTags ||= nextChild.hasAttrTags;
+                        if (alternates) {
+                          alternates.push(alternate);
+                        } else {
+                          alternates = [alternate];
                         }
-                        case "else": {
-                          const alternate = {
-                            condition: this.#getAttrValue(nextChild, "if"),
-                            node: nextChild
-                          };
-                          hasDynamicAttrTags ||= nextChild.hasAttrTags;
-                          if (alternates) {
-                            alternates.push(alternate);
-                          } else {
-                            alternates = [alternate];
-                          }
-                          if (alternate.condition) {
-                            continue loop;
-                          } else {
-                            break loop;
-                          }
+                        if (alternate.condition) {
+                          continue loop;
+                        } else {
+                          break loop;
                         }
                       }
-                      break;
-                  }
-                  i--;
-                  break;
+                    }
+                    break;
                 }
+                i--;
+                break;
+              }
               IF_TAG_ALTERNATES.set(child, alternates);
             }
           }
@@ -2748,8 +2728,7 @@ const attrTags = ${varShared(
     }
   }
   #getRangeWithoutTrailingComma(range) {
-    if (!range)
-      return void 0;
+    if (!range) return void 0;
     const { start } = range;
     let end = range.end - 1;
     while (end >= start) {
@@ -2804,8 +2783,7 @@ const attrTags = ${varShared(
       const code = this.#read(node);
       code;
       const info = this.#getJSDocInputTypeFromNode(node);
-      if (info)
-        return info;
+      if (info) return info;
     }
   }
   #getJSDocInputTypeFromNode(node) {
@@ -2840,8 +2818,7 @@ const attrTags = ${varShared(
     const start = attr.name.start + 1;
     const end = attr.name.end - 1;
     for (let i = end; i-- > start; ) {
-      if (this.#code.charAt(i) === ":")
-        return i;
+      if (this.#code.charAt(i) === ":") return i;
     }
     return false;
   }
@@ -2933,8 +2910,7 @@ function getTypeLibs(rootDir, ts, host) {
   var _a;
   const config = getConfig(rootDir);
   let typeLibs = config.cache.get(getTypeLibs);
-  if (typeLibs)
-    return typeLibs;
+  if (typeLibs) return typeLibs;
   const resolveTypeCompilerOptions = {
     moduleResolution: ts.ModuleResolutionKind.Bundler
   };
@@ -2979,8 +2955,7 @@ function getTypeLibs(rootDir, ts, host) {
   return typeLibs;
 }
 function getScriptLang(fileName, defaultScriptLang, ts, host) {
-  if (fileName.endsWith(".d.marko"))
-    return "ts" /* ts */;
+  if (fileName.endsWith(".d.marko")) return "ts" /* ts */;
   const dir = path2.dirname(fileName);
   const config = getConfig(dir);
   const cache = config.cache.get(getScriptLang);
@@ -3135,8 +3110,7 @@ __export(processors_exports, {
 // src/util/get-ext.ts
 function getExt(fileName) {
   const extIndex = fileName.lastIndexOf(".");
-  if (extIndex !== -1)
-    return fileName.slice(extIndex);
+  if (extIndex !== -1) return fileName.slice(extIndex);
 }
 
 // src/processors/marko.ts
@@ -3266,8 +3240,7 @@ var marko_default = {
             statement,
             sourceFile
           );
-          if (!/^(?:import|export) /.test(printed))
-            code += "static ";
+          if (!/^(?:import|export) /.test(printed)) code += "static ";
           code += printed + nlChar;
         }
         if (componentImpl == null ? void 0 : componentImpl.members.length) {
@@ -3315,7 +3288,7 @@ var marko_default = {
       return ts.isTypeAliasDeclaration(statement) && statement.name.escapedText === "Input" && ts.isTypeLiteralNode(statement.type) && !statement.typeParameters && statement.type.members.length === 0 || ts.isInterfaceDeclaration(statement) && statement.name.escapedText === "Input" && !statement.heritageClauses && !statement.typeParameters && statement.members.length === 0;
     }
     function isExportComponentType(statement) {
-      return ts.isExportDeclaration(statement) && statement.exportClause && ts.isNamedExports(statement.exportClause) && statement.exportClause.elements.length === 1 && statement.exportClause.elements[0].name.escapedText === "Component";
+      return ts.isExportDeclaration(statement) && statement.exportClause && ts.isNamedExports(statement.exportClause) && statement.exportClause.elements.length === 1 && ts.isIdentifier(statement.exportClause.elements[0].name) && statement.exportClause.elements[0].name.escapedText === "Component";
     }
     function isVariableStatementForName(statement, name) {
       if (ts.isVariableStatement(statement)) {
@@ -3358,8 +3331,7 @@ function isHTMLTag(tag) {
   return builtinTagsRegex.test(tag);
 }
 function getAttributeValueType(value) {
-  if (value === void 0 || value[0] !== "=")
-    return void 0;
+  if (value === void 0 || value[0] !== "=") return void 0;
   value = value.substring(1).trim();
   switch (value) {
     case "NaN":
@@ -3417,8 +3389,7 @@ var HTMLExtractor = class {
     switch (node.type) {
       case 16 /* AttrTag */:
         (_a = node.body) == null ? void 0 : _a.forEach((child) => {
-          if (this.#visitNode(child))
-            hasDynamicBody = true;
+          if (this.#visitNode(child)) hasDynamicBody = true;
         });
         break;
       case 1 /* Tag */: {
@@ -3460,16 +3431,13 @@ var HTMLExtractor = class {
     this.#extractor.copy(node.name);
     this.#extractor.write(` data-marko-node-id="${id}"`);
     (_a = node.attrs) == null ? void 0 : _a.forEach((attr) => {
-      if (attr.type === 10 /* AttrNamed */)
-        this.#writeAttrNamed(attr);
-      else if (attr.type === 15 /* AttrSpread */)
-        hasDynamicAttrs = true;
+      if (attr.type === 10 /* AttrNamed */) this.#writeAttrNamed(attr);
+      else if (attr.type === 15 /* AttrSpread */) hasDynamicAttrs = true;
     });
     this.#extractor.write(">");
     if (!isVoidTag(node.nameText)) {
       (_b = node.body) == null ? void 0 : _b.forEach((child) => {
-        if (this.#visitNode(child))
-          hasDynamicBody = true;
+        if (this.#visitNode(child)) hasDynamicBody = true;
       });
       this.#extractor.write(`</${node.nameText}>`);
     }
@@ -3498,8 +3466,7 @@ var HTMLExtractor = class {
     }
     const valueString = this.#read(attr.value);
     const valueType = getAttributeValueType(valueString);
-    if (valueType === void 0)
-      return;
+    if (valueType === void 0) return;
     switch (valueType) {
       case 0 /* True */:
         break;

package/dist/processors/index.d.ts

@@ -31,6 +31,6 @@ export interface PrintContext {
     typeChecker: ts.TypeChecker;
     formatSettings: Required<ts.FormatCodeSettings>;
 }
-export declare const extensions: `.${string}`[];
-export declare function create(options: CreateProcessorOptions): Record<`.${string}`, Processor>;
+export declare const extensions: ProcessorExtension[];
+export declare function create(options: CreateProcessorOptions): Record<ProcessorExtension, Processor>;
 export declare function has(fileName: string): boolean;

package/dist/util/project.d.ts

@@ -25,8 +25,8 @@ 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: {
+        runtimeTypes?: string;
         [x: string]: unknown;
-        runtimeTypes?: string | undefined;
     };
 };
 export declare function getTagLookup(dir: string): TaglibLookup;