@marko/language-tools 2.1.4 → 2.1.6

package/dist/index.js

@@ -1066,10 +1066,7 @@ function crawlProgramScope(parsed, scriptParser) {
         case 16 /* AttrTag */: {
           if (child.var) {
             parentScope.bindings ??= {};
-            const parsedFn = scriptParser.expressionAt(
-              child.var.value.start - 6,
-              `${read(child.var.value)}=0`
-            );
+            const parsedFn = scriptParser.expressionAt(child.var.value.start - 6, `${read(child.var.value)}=0`);
             if (parsedFn) {
               const lVal = parsedFn.left;
               checkForMutations(parentScope, lVal);
@@ -1440,7 +1437,9 @@ function trackMutations(node, scope, mutations, parentBlock, parentBlockShadows,
       }
       break;
     case "ClassDeclaration":
-      trackShadows(node.id, scope, parentBlockShadows);
+      if (node.id) {
+        trackShadows(node.id, scope, parentBlockShadows);
+      }
       block = node.body;
       blockShadows = new Set(blockShadows);
       blockMutations = [];
@@ -3168,7 +3167,7 @@ var marko_default = {
   extension: ".marko",
   create({ ts, host, configFile }) {
     const currentDirectory = host.getCurrentDirectory ? host.getCurrentDirectory() : ts.sys.getCurrentDirectory();
-    const defaultScriptLang = configFile && /tsconfig.json$/.test(configFile) ? "ts" /* ts */ : "js" /* js */;
+    const defaultScriptLang = configFile && /tsconfig/g.test(configFile) ? "ts" /* ts */ : "js" /* js */;
     const runtimeTypes = getTypeLibs(currentDirectory, ts, host);
     const rootNames = [
       runtimeTypes.internalTypesFile,
@@ -3450,11 +3449,13 @@ var HTMLExtractor = class {
         hasDynamicAttrs = true;
     });
     this.#extractor.write(">");
-    (_b = node.body) == null ? void 0 : _b.forEach((child) => {
-      if (this.#visitNode(child))
-        hasDynamicBody = true;
-    });
-    this.#extractor.write(`</${node.nameText}>`);
+    if (!isVoidTag(node.nameText)) {
+      (_b = node.body) == null ? void 0 : _b.forEach((child) => {
+        if (this.#visitNode(child))
+          hasDynamicBody = true;
+      });
+      this.#extractor.write(`</${node.nameText}>`);
+    }
     return { hasDynamicAttrs, hasDynamicBody };
   }
   #writeCustomTag(node) {
@@ -3499,6 +3500,27 @@ var HTMLExtractor = class {
     }
   }
 };
+function isVoidTag(tagName) {
+  switch (tagName) {
+    case "area":
+    case "base":
+    case "br":
+    case "col":
+    case "embed":
+    case "hr":
+    case "img":
+    case "input":
+    case "link":
+    case "meta":
+    case "param":
+    case "source":
+    case "track":
+    case "wbr":
+      return true;
+    default:
+      return false;
+  }
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   NodeType,

package/dist/index.mjs

@@ -1034,10 +1034,7 @@ function crawlProgramScope(parsed, scriptParser) {
         case 16 /* AttrTag */: {
           if (child.var) {
             parentScope.bindings ??= {};
-            const parsedFn = scriptParser.expressionAt(
-              child.var.value.start - 6,
-              `${read(child.var.value)}=0`
-            );
+            const parsedFn = scriptParser.expressionAt(child.var.value.start - 6, `${read(child.var.value)}=0`);
             if (parsedFn) {
               const lVal = parsedFn.left;
               checkForMutations(parentScope, lVal);
@@ -1408,7 +1405,9 @@ function trackMutations(node, scope, mutations, parentBlock, parentBlockShadows,
       }
       break;
     case "ClassDeclaration":
-      trackShadows(node.id, scope, parentBlockShadows);
+      if (node.id) {
+        trackShadows(node.id, scope, parentBlockShadows);
+      }
       block = node.body;
       blockShadows = new Set(blockShadows);
       blockMutations = [];
@@ -3136,7 +3135,7 @@ var marko_default = {
   extension: ".marko",
   create({ ts, host, configFile }) {
     const currentDirectory = host.getCurrentDirectory ? host.getCurrentDirectory() : ts.sys.getCurrentDirectory();
-    const defaultScriptLang = configFile && /tsconfig.json$/.test(configFile) ? "ts" /* ts */ : "js" /* js */;
+    const defaultScriptLang = configFile && /tsconfig/g.test(configFile) ? "ts" /* ts */ : "js" /* js */;
     const runtimeTypes = getTypeLibs(currentDirectory, ts, host);
     const rootNames = [
       runtimeTypes.internalTypesFile,
@@ -3418,11 +3417,13 @@ var HTMLExtractor = class {
         hasDynamicAttrs = true;
     });
     this.#extractor.write(">");
-    (_b = node.body) == null ? void 0 : _b.forEach((child) => {
-      if (this.#visitNode(child))
-        hasDynamicBody = true;
-    });
-    this.#extractor.write(`</${node.nameText}>`);
+    if (!isVoidTag(node.nameText)) {
+      (_b = node.body) == null ? void 0 : _b.forEach((child) => {
+        if (this.#visitNode(child))
+          hasDynamicBody = true;
+      });
+      this.#extractor.write(`</${node.nameText}>`);
+    }
     return { hasDynamicAttrs, hasDynamicBody };
   }
   #writeCustomTag(node) {
@@ -3467,6 +3468,27 @@ var HTMLExtractor = class {
     }
   }
 };
+function isVoidTag(tagName) {
+  switch (tagName) {
+    case "area":
+    case "base":
+    case "br":
+    case "col":
+    case "embed":
+    case "hr":
+    case "img":
+    case "input":
+    case "link":
+    case "meta":
+    case "param":
+    case "source":
+    case "track":
+    case "wbr":
+      return true;
+    default:
+      return false;
+  }
+}
 export {
   NodeType,
   processors_exports as Processors,

package/marko.internal.d.ts

@@ -224,7 +224,7 @@ declare global {
       ): {
         [Key in keyof Return]: Return[Key] extends
           | readonly (infer Item)[]
-          | infer Item
+          | infer Item extends Record<PropertyKey, any>
           ? AttrTagByListSize<Value, Item>
           : never;
       };
@@ -237,7 +237,7 @@ declare global {
       ): {
         [Key in keyof Return]: Return[Key] extends
           | readonly (infer Item)[]
-          | infer Item
+          | infer Item extends Record<PropertyKey, any>
           ? AttrTagByObjectSize<Value, Item>
           : never;
       };
@@ -257,7 +257,7 @@ declare global {
       ): {
         [Key in keyof Return]: Return[Key] extends
           | readonly (infer Item)[]
-          | infer Item
+          | infer Item extends Record<PropertyKey, any>
           ? number extends From | To | Step
             ? MaybeRepeatable<Item>
             : Step extends 0
@@ -285,7 +285,7 @@ declare global {
       }): {
         [Key in keyof Return]: Return[Key] extends
           | readonly (infer Item)[]
-          | infer Item
+          | infer Item extends Record<PropertyKey, any>
           ? MaybeRepeatable<Item>
           : never;
       };

package/package.json

@@ -1,27 +1,27 @@
 {
   "name": "@marko/language-tools",
   "description": "Marko Language Tools",
-  "version": "2.1.4",
+  "version": "2.1.6",
   "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
   "peerDependencies": {
     "@marko/compiler": "^5.28.4"
   },
   "dependencies": {
-    "@babel/helper-validator-identifier": "^7.22.5",
-    "@babel/parser": "^7.22.7",
+    "@babel/helper-validator-identifier": "^7.22.20",
+    "@babel/parser": "^7.23.0",
     "htmljs-parser": "^5.5.0",
     "relative-import-path": "^1.0.0"
   },
   "devDependencies": {
-    "@babel/code-frame": "^7.22.5",
-    "@marko/compiler": "^5.31.2",
-    "@marko/translator-default": "^5.29.2",
-    "@types/babel__code-frame": "^7.0.3",
+    "@babel/code-frame": "^7.22.13",
+    "@marko/compiler": "^5.33.2",
+    "@marko/translator-default": "^5.31.3",
+    "@types/babel__code-frame": "^7.0.4",
     "@types/babel__helper-validator-identifier": "^7.15.0",
     "@typescript/vfs": "^1.5.0",
-    "marko": "^5.29.2",
+    "marko": "^5.31.10",
     "mitata": "^0.1.6",
-    "tsx": "^3.12.7"
+    "tsx": "^3.13.0"
   },
   "exports": {
     ".": {