@marko/language-tools 2.5.14 → 2.5.16

package/dist/index.js

@@ -2431,31 +2431,36 @@ constructor(_?: Return) {}
     const renderId = this.#getRenderId(tag);
     const def = tagName ? this.#lookup.getTag(tagName) : void 0;
     const isHTML = def == null ? void 0 : def.html;
-    const importPath = !isHTML && resolveTagImport(this.#filename, def);
+    const importPath = !isHTML ? resolveTagImport(this.#filename, def) : void 0;
     let tagIdentifier;
     let isTemplate = false;
     if (!isHTML && (!def || importPath)) {
-      const tagId = this.#ensureTagId(tag);
-      tagIdentifier = varLocal("tag_" + tagId);
-      this.#extractor.write(`const ${tagIdentifier} = (
+      const isIdentifier = tagName && REG_TAG_NAME_IDENTIFIER.test(tagName);
+      const isMarkoFile = importPath == null ? void 0 : importPath.endsWith(".marko");
+      if (isIdentifier || isMarkoFile || !importPath) {
+        tagIdentifier = varLocal("tag_" + this.#ensureTagId(tag));
+        this.#extractor.write(`const ${tagIdentifier} = (
 `);
-      if (tagName && REG_TAG_NAME_IDENTIFIER.test(tagName)) {
-        if (importPath) {
+        if (isIdentifier) {
+          if (importPath) {
+            this.#extractor.write(
+              `${varShared("fallbackTemplate")}(${tagName},${isMarkoFile ? `import("${importPath}")` : varShared("any")})`
+            );
+          } else {
+            this.#extractor.copy(tag.name);
+          }
+        } else if (isMarkoFile) {
+          isTemplate = true;
           this.#extractor.write(
-            `${varShared("fallbackTemplate")}(${tagName},import("${importPath}"))`
+            `${varShared("resolveTemplate")}(import("${importPath}"))`
           );
         } else {
-          this.#extractor.copy(tag.name);
+          this.#writeDynamicTagName(tag);
         }
-      } else if (importPath) {
-        isTemplate = importPath.endsWith(".marko");
-        this.#extractor.write(
-          `${varShared("resolveTemplate")}(import("${importPath}"))`
-        );
+        this.#extractor.write("\n);\n");
       } else {
-        this.#writeDynamicTagName(tag);
+        tagIdentifier = varShared("missingTag");
       }
-      this.#extractor.write("\n);\n");
       const attrTagTree = this.#getAttrTagTree(tag);
       if (attrTagTree) {
         this.#writeAttrTagTree(attrTagTree, tagIdentifier);

package/dist/index.mjs

@@ -2394,31 +2394,36 @@ constructor(_?: Return) {}
     const renderId = this.#getRenderId(tag);
     const def = tagName ? this.#lookup.getTag(tagName) : void 0;
     const isHTML = def == null ? void 0 : def.html;
-    const importPath = !isHTML && resolveTagImport(this.#filename, def);
+    const importPath = !isHTML ? resolveTagImport(this.#filename, def) : void 0;
     let tagIdentifier;
     let isTemplate = false;
     if (!isHTML && (!def || importPath)) {
-      const tagId = this.#ensureTagId(tag);
-      tagIdentifier = varLocal("tag_" + tagId);
-      this.#extractor.write(`const ${tagIdentifier} = (
+      const isIdentifier = tagName && REG_TAG_NAME_IDENTIFIER.test(tagName);
+      const isMarkoFile = importPath == null ? void 0 : importPath.endsWith(".marko");
+      if (isIdentifier || isMarkoFile || !importPath) {
+        tagIdentifier = varLocal("tag_" + this.#ensureTagId(tag));
+        this.#extractor.write(`const ${tagIdentifier} = (
 `);
-      if (tagName && REG_TAG_NAME_IDENTIFIER.test(tagName)) {
-        if (importPath) {
+        if (isIdentifier) {
+          if (importPath) {
+            this.#extractor.write(
+              `${varShared("fallbackTemplate")}(${tagName},${isMarkoFile ? `import("${importPath}")` : varShared("any")})`
+            );
+          } else {
+            this.#extractor.copy(tag.name);
+          }
+        } else if (isMarkoFile) {
+          isTemplate = true;
           this.#extractor.write(
-            `${varShared("fallbackTemplate")}(${tagName},import("${importPath}"))`
+            `${varShared("resolveTemplate")}(import("${importPath}"))`
           );
         } else {
-          this.#extractor.copy(tag.name);
+          this.#writeDynamicTagName(tag);
         }
-      } else if (importPath) {
-        isTemplate = importPath.endsWith(".marko");
-        this.#extractor.write(
-          `${varShared("resolveTemplate")}(import("${importPath}"))`
-        );
+        this.#extractor.write("\n);\n");
       } else {
-        this.#writeDynamicTagName(tag);
+        tagIdentifier = varShared("missingTag");
       }
-      this.#extractor.write("\n);\n");
       const attrTagTree = this.#getAttrTagTree(tag);
       if (attrTagTree) {
         this.#writeAttrTagTree(attrTagTree, tagIdentifier);

package/marko.internal.d.ts

@@ -471,20 +471,21 @@ type ComponentEventHandlers<Component extends Marko.Component> = {
   >]: Component[K] extends (...args: any) => any ? Component[K] : never;
 };
 
-type FlatScopes<Input extends object, Objects = Input> = Input[keyof Input &
-  (string | number)] extends infer Prop
-  ? [0] extends [1 & Prop]
-    ? unknown
-    : Prop extends (...args: any) => { [Marko._.scope]: infer Scope }
-      ? unknown extends Scope
-        ? never
-        : Scope
-      : Prop extends object
-        ? Prop extends Extract<Objects, Prop>
-          ? never
-          : FlatScopes<Prop, Objects | Prop>
-        : never
-  : unknown;
+type FlatScopes<Input> = [0] extends [1 & Input]
+  ? never
+  :
+      | (Input[("content" | "renderBody") & keyof Input] extends infer Prop
+          ? Prop extends (...args: any[]) => { [Marko._.scope]: infer Scope }
+            ? Scope
+            : never
+          : never)
+      | (Input[string & keyof Input] extends infer Prop
+          ? Prop extends { [Symbol.iterator]: any }
+            ? Prop extends readonly any[]
+              ? never
+              : FlatScopes<Prop>
+            : never
+          : never);
 
 type MergeScopes<Scopes> = {
   [K in Scopes extends Scopes ? keyof Scopes : never]: Scopes extends Scopes

package/package.json

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