@marko/language-tools 2.5.22 → 2.5.24

package/dist/index.js

@@ -1740,8 +1740,6 @@ function detectAPIFromTag(parsed, tag) {
     case "const":
     case "debug":
     case "define":
-    case "html-script":
-    case "html-style":
     case "id":
     case "let":
     case "lifecycle":
@@ -2808,24 +2806,35 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
   }
   #writeTagInputObject(tag) {
     if (!tag.params) this.#writeComments(tag);
+    const body = this.#processBody(tag);
     let hasInput = false;
-    this.#extractor.write("{\n");
-    if (tag.args) {
+    let writeInputObj = true;
+    if (tag.args && (this.#api !== RuntimeAPI.class || !!this.#getDynamicTagExpression(tag))) {
       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 (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");
+      }
     }
     if (this.#writeAttrs(tag)) {
       hasInput = true;
     }
     const isScript = isTextOnlyScript(tag);
     let hasBodyContent = false;
-    let body;
     if (isScript) {
       this.#extractor.write("async value(){");
       this.#copyWithMutationsReplaced({
@@ -2833,15 +2842,12 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
         end: tag.body[tag.body.length - 1].end
       });
       this.#extractor.write(`}${SEP_COMMA_NEW_LINE}`);
-    } else {
-      body = this.#processBody(tag);
-      if (body) {
-        hasInput = true;
-        this.#writeAttrTags(body);
-        hasBodyContent = body.content !== void 0;
-      } else if (tag.close) {
-        hasBodyContent = true;
-      }
+    } else if (body) {
+      hasInput = true;
+      this.#writeAttrTags(body);
+      hasBodyContent = body.content !== void 0;
+    } else if (tag.close) {
+      hasBodyContent = true;
     }
     if (tag.params || hasBodyContent) {
       this.#extractor.write("[");
@@ -2903,7 +2909,9 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
     if (!hasInput) {
       this.#writeTagNameComment(tag);
     }
-    this.#extractor.write("\n}");
+    if (writeInputObj) {
+      this.#extractor.write("\n}");
+    }
   }
   #writeObjectKeys(keys) {
     this.#extractor.write("{");
@@ -3476,7 +3484,7 @@ var defaultMeta;
 var ignoreErrors = (_err) => {
 };
 var metaByDir = /* @__PURE__ */ new Map();
-var metaByCompiler = /* @__PURE__ */ new Map();
+var metaByTranslator = /* @__PURE__ */ new Map();
 function getCompiler(dir) {
   return getMeta(dir).compiler;
 }
@@ -3579,7 +3587,7 @@ function clearCaches() {
   if (defaultMeta) {
     clearCacheForMeta(defaultMeta);
   }
-  for (const project of metaByCompiler.values()) {
+  for (const project of metaByTranslator.values()) {
     clearCacheForMeta(project);
   }
 }
@@ -3625,20 +3633,21 @@ function loadMeta(dir) {
   if (!cached) {
     const require2 = (0, import_module.createRequire)(import_path2.default.join(dir, "_.js"));
     const configPath = require2.resolve("@marko/compiler/config");
-    cached = metaByCompiler.get(configPath);
+    const config = interopDefault(require2(configPath));
+    const translatorPath = require2.resolve(config.translator);
+    cached = metaByTranslator.get(translatorPath);
     if (!cached) {
       const compiler = require2(import_path2.default.dirname(configPath));
-      const config = interopDefault(require2(configPath));
       cached = {
         compiler,
         config: {
           ...config,
           cache: /* @__PURE__ */ new Map(),
-          translator: require2(config.translator)
+          translator: require2(translatorPath)
         }
       };
       compiler.configure(cached.config);
-      metaByCompiler.set(configPath, cached);
+      metaByTranslator.set(translatorPath, cached);
     }
     metaByDir.set(dir, cached);
   }

package/dist/index.mjs

@@ -1700,8 +1700,6 @@ function detectAPIFromTag(parsed, tag) {
     case "const":
     case "debug":
     case "define":
-    case "html-script":
-    case "html-style":
     case "id":
     case "let":
     case "lifecycle":
@@ -2771,24 +2769,35 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
   }
   #writeTagInputObject(tag) {
     if (!tag.params) this.#writeComments(tag);
+    const body = this.#processBody(tag);
     let hasInput = false;
-    this.#extractor.write("{\n");
-    if (tag.args) {
+    let writeInputObj = true;
+    if (tag.args && (this.#api !== RuntimeAPI.class || !!this.#getDynamicTagExpression(tag))) {
       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 (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");
+      }
     }
     if (this.#writeAttrs(tag)) {
       hasInput = true;
     }
     const isScript = isTextOnlyScript(tag);
     let hasBodyContent = false;
-    let body;
     if (isScript) {
       this.#extractor.write("async value(){");
       this.#copyWithMutationsReplaced({
@@ -2796,15 +2805,12 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
         end: tag.body[tag.body.length - 1].end
       });
       this.#extractor.write(`}${SEP_COMMA_NEW_LINE}`);
-    } else {
-      body = this.#processBody(tag);
-      if (body) {
-        hasInput = true;
-        this.#writeAttrTags(body);
-        hasBodyContent = body.content !== void 0;
-      } else if (tag.close) {
-        hasBodyContent = true;
-      }
+    } else if (body) {
+      hasInput = true;
+      this.#writeAttrTags(body);
+      hasBodyContent = body.content !== void 0;
+    } else if (tag.close) {
+      hasBodyContent = true;
     }
     if (tag.params || hasBodyContent) {
       this.#extractor.write("[");
@@ -2866,7 +2872,9 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
     if (!hasInput) {
       this.#writeTagNameComment(tag);
     }
-    this.#extractor.write("\n}");
+    if (writeInputObj) {
+      this.#extractor.write("\n}");
+    }
   }
   #writeObjectKeys(keys) {
     this.#extractor.write("{");
@@ -3439,7 +3447,7 @@ var defaultMeta;
 var ignoreErrors = (_err) => {
 };
 var metaByDir = /* @__PURE__ */ new Map();
-var metaByCompiler = /* @__PURE__ */ new Map();
+var metaByTranslator = /* @__PURE__ */ new Map();
 function getCompiler(dir) {
   return getMeta(dir).compiler;
 }
@@ -3542,7 +3550,7 @@ function clearCaches() {
   if (defaultMeta) {
     clearCacheForMeta(defaultMeta);
   }
-  for (const project of metaByCompiler.values()) {
+  for (const project of metaByTranslator.values()) {
     clearCacheForMeta(project);
   }
 }
@@ -3588,20 +3596,21 @@ function loadMeta(dir) {
   if (!cached) {
     const require2 = createRequire(path2.join(dir, "_.js"));
     const configPath = require2.resolve("@marko/compiler/config");
-    cached = metaByCompiler.get(configPath);
+    const config = interopDefault(require2(configPath));
+    const translatorPath = require2.resolve(config.translator);
+    cached = metaByTranslator.get(translatorPath);
     if (!cached) {
       const compiler = require2(path2.dirname(configPath));
-      const config = interopDefault(require2(configPath));
       cached = {
         compiler,
         config: {
           ...config,
           cache: /* @__PURE__ */ new Map(),
-          translator: require2(config.translator)
+          translator: require2(translatorPath)
         }
       };
       compiler.configure(cached.config);
-      metaByCompiler.set(configPath, cached);
+      metaByTranslator.set(translatorPath, cached);
     }
     metaByDir.set(dir, cached);
   }

package/marko.internal.d.ts

@@ -336,14 +336,11 @@ declare global {
               ? BodyRenderer<Name>
               : [Name] extends [
                     {
-                      [BodyContentKey in DefaultBodyContentKey]?: infer BodyValue;
+                      [BodyContentKey in DefaultBodyContentKey]?: infer BodyValue extends
+                        AnyMarkoBody;
                     },
                   ]
-                ? [BodyValue] extends [AnyMarkoBody]
-                  ? BodyRenderer<BodyValue>
-                  : BaseRenderer<
-                      BodyContentInput<BodyParameters<Exclude<BodyValue, void>>>
-                    >
+                ? BodyRenderer<BodyValue>
                 : DefaultRenderer;
 
       export type TemplateRenderer<Template> = Template extends {
@@ -372,12 +369,8 @@ declare global {
       export interface BodyRenderer<Body extends AnyMarkoBody> {
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-constraint
         (): () => <__marko_internal_input extends unknown>(
-          input: Marko.Directives &
-            BodyContentInput<BodyParameters<Body>> &
-            Relate<
-              __marko_internal_input,
-              Marko.Directives & BodyContentInput<BodyParameters<Body>>
-            >,
+          ...args: BodyParamsWithDefault<Body> &
+            Relate<__marko_internal_input, BodyParamsWithDefault<Body>>
         ) => ReturnAndScope<
           Scopes<__marko_internal_input>,
           BodyReturnType<Body>
@@ -419,15 +412,12 @@ type ReturnAndScope<Scope, Return> = {
   scope: Scope;
 };
 
-type BodyContentInput<Args extends readonly unknown[]> = Args extends {
-  length: infer Length;
-}
-  ? number extends Length
-    ? { value?: Args }
-    : 0 extends Length
-      ? { value?: [] }
-      : { value: Args }
-  : never;
+type BodyParamsWithDefault<Body extends AnyMarkoBody> =
+  Body extends Marko.Body<infer Params, any>
+    ? Params extends []
+      ? [input?: Record<string, never>]
+      : Params
+    : never;
 
 type Scopes<Input> = [0] extends [1 & Input]
   ? never

package/package.json

@@ -1,25 +1,25 @@
 {
   "name": "@marko/language-tools",
   "description": "Marko Language Tools",
-  "version": "2.5.22",
+  "version": "2.5.24",
   "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
   "peerDependencies": {
     "@marko/compiler": "^5.28.4"
   },
   "dependencies": {
-    "@babel/parser": "^7.26.7",
+    "@babel/parser": "^7.27.5",
     "@luxass/strip-json-comments": "^1.4.0",
-    "htmljs-parser": "^5.5.3",
+    "htmljs-parser": "^5.5.4",
     "relative-import-path": "^1.0.0"
   },
   "devDependencies": {
-    "@babel/code-frame": "^7.26.2",
-    "@marko/compiler": "^5.39.11",
+    "@babel/code-frame": "^7.27.1",
+    "@marko/compiler": "^5.39.26",
     "@types/babel__code-frame": "^7.0.6",
-    "@typescript/vfs": "^1.6.0",
-    "marko": "^5.37.12",
-    "mitata": "^1.0.33",
-    "tsx": "^4.19.2"
+    "@typescript/vfs": "^1.6.1",
+    "marko": "^5.37.38",
+    "mitata": "^1.0.34",
+    "tsx": "^4.20.3"
   },
   "exports": {
     ".": {