@marko/language-tools 2.5.11 → 2.5.13

package/dist/index.js

@@ -1994,7 +1994,7 @@ var ScriptExtractor = class {
   }
   #writeProgram(program) {
     this.#writeCommentPragmas(program);
-    const componentFileName = getComponentFilename(this.#filename);
+    const componentFileName = this.#api !== RuntimeAPI.tags ? getComponentFilename(this.#filename) : void 0;
     const inputType = this.#getInputType(program);
     let componentClassBody;
     for (const node of program.static) {
@@ -2084,35 +2084,37 @@ var ScriptExtractor = class {
         );
       }
     }
-    if (isExternalComponentFile) {
-      if (this.#scriptLang === "ts" /* ts */) {
-        this.#extractor.write(
-          `import type Component from "${stripExt(
-            (0, import_relative_import_path.relativeImportPath)(this.#filename, componentFileName)
-          )}";
+    if (this.#api !== RuntimeAPI.tags) {
+      if (isExternalComponentFile) {
+        if (this.#scriptLang === "ts" /* ts */) {
+          this.#extractor.write(
+            `import type Component from "${stripExt(
+              (0, import_relative_import_path.relativeImportPath)(this.#filename, componentFileName)
+            )}";
 `
-        );
-      } else {
-        this.#extractor.write(
-          `/** @typedef {import("${stripExt(
-            (0, import_relative_import_path.relativeImportPath)(this.#filename, componentFileName)
-          )}") extends infer Component ? Component extends { default: infer Component } ? Component : Component : never} Component */
+          );
+        } else {
+          this.#extractor.write(
+            `/** @typedef {import("${stripExt(
+              (0, import_relative_import_path.relativeImportPath)(this.#filename, componentFileName)
+            )}") extends infer Component ? Component extends { default: infer Component } ? Component : Component : never} Component */
 `
-        );
-      }
-    } else {
-      const body2 = componentClassBody || " {}";
-      if (this.#scriptLang === "ts" /* ts */) {
-        this.#extractor.write(
-          `abstract class Component${typeParamsStr} extends Marko.Component<Input${typeArgsStr}>`
-        ).copy(body2).write("\nexport { type Component }\n");
+          );
+        }
       } else {
-        this.#extractor.write(`/**${jsDocTemplateTagsStr}
-  * @extends {Marko.Component<Input${typeArgsStr}>}
-  * @abstract
-  */
+        const body2 = componentClassBody || " {}";
+        if (this.#scriptLang === "ts" /* ts */) {
+          this.#extractor.write(
+            `abstract class Component${typeParamsStr} extends Marko.Component<Input${typeArgsStr}>`
+          ).copy(body2).write("\nexport { type Component }\n");
+        } else {
+          this.#extractor.write(`/**${jsDocTemplateTagsStr}
+    * @extends {Marko.Component<Input${typeArgsStr}>}
+    * @abstract
+    */
 `);
-        this.#extractor.write(`export class Component extends Marko.Component`).copy(body2).write("\n");
+          this.#extractor.write(`export class Component extends Marko.Component`).copy(body2).write("\n");
+        }
       }
     }
     const didReturn = !!getReturnTag(program);
@@ -2132,16 +2134,16 @@ var ScriptExtractor = class {
 function ${templateName}() {
 `);
     }
-    this.#extractor.write(`  const input = ${this.#getCastedType(`Input${typeArgsStr}`)};
+    this.#extractor.write(`  const input = ${this.#getCastedType(`Input${typeArgsStr}`)};${this.#api !== RuntimeAPI.tags ? `
   const component = ${this.#getCastedType(`Component${typeArgsStr}`)};
   const state = ${varShared("state")}(component);
+  const out = ${varShared("out")};` : ""}
   const $signal = ${this.#getCastedType("AbortSignal")};
   const $global = ${varShared("getGlobal")}(
     // @ts-expect-error We expect the compiler to error because we are checking if the MarkoRun.Context is defined.
     (${varShared("error")}, ${this.#getCastedType("MarkoRun.Context")})
   );
-  const out = ${varShared("out")};
-  ${varShared("noop")}({ input, component, state, out, $global, $signal });
+  ${varShared("noop")}({ ${this.#api !== RuntimeAPI.tags ? "component, state, out, " : ""}input, $global, $signal });
 `);
     const body = this.#processBody(program);
     if (body == null ? void 0 : body.content) {
@@ -2613,7 +2615,7 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
               }
             } else if (attr.args) {
               this.#extractor.write('"').copy(name).write('": ');
-              if (typeof name !== "string" && this.#read(name).startsWith("on")) {
+              if (this.#api !== RuntimeAPI.tags && typeof name !== "string" && this.#read(name).startsWith("on")) {
                 const stringLiteralFirstArgMatch = this.#execAtIndex(
                   REG_ATTR_ARG_LITERAL,
                   attr.args.value.start

package/dist/index.mjs

@@ -1957,7 +1957,7 @@ var ScriptExtractor = class {
   }
   #writeProgram(program) {
     this.#writeCommentPragmas(program);
-    const componentFileName = getComponentFilename(this.#filename);
+    const componentFileName = this.#api !== RuntimeAPI.tags ? getComponentFilename(this.#filename) : void 0;
     const inputType = this.#getInputType(program);
     let componentClassBody;
     for (const node of program.static) {
@@ -2047,35 +2047,37 @@ var ScriptExtractor = class {
         );
       }
     }
-    if (isExternalComponentFile) {
-      if (this.#scriptLang === "ts" /* ts */) {
-        this.#extractor.write(
-          `import type Component from "${stripExt(
-            relativeImportPath(this.#filename, componentFileName)
-          )}";
+    if (this.#api !== RuntimeAPI.tags) {
+      if (isExternalComponentFile) {
+        if (this.#scriptLang === "ts" /* ts */) {
+          this.#extractor.write(
+            `import type Component from "${stripExt(
+              relativeImportPath(this.#filename, componentFileName)
+            )}";
 `
-        );
-      } else {
-        this.#extractor.write(
-          `/** @typedef {import("${stripExt(
-            relativeImportPath(this.#filename, componentFileName)
-          )}") extends infer Component ? Component extends { default: infer Component } ? Component : Component : never} Component */
+          );
+        } else {
+          this.#extractor.write(
+            `/** @typedef {import("${stripExt(
+              relativeImportPath(this.#filename, componentFileName)
+            )}") extends infer Component ? Component extends { default: infer Component } ? Component : Component : never} Component */
 `
-        );
-      }
-    } else {
-      const body2 = componentClassBody || " {}";
-      if (this.#scriptLang === "ts" /* ts */) {
-        this.#extractor.write(
-          `abstract class Component${typeParamsStr} extends Marko.Component<Input${typeArgsStr}>`
-        ).copy(body2).write("\nexport { type Component }\n");
+          );
+        }
       } else {
-        this.#extractor.write(`/**${jsDocTemplateTagsStr}
-  * @extends {Marko.Component<Input${typeArgsStr}>}
-  * @abstract
-  */
+        const body2 = componentClassBody || " {}";
+        if (this.#scriptLang === "ts" /* ts */) {
+          this.#extractor.write(
+            `abstract class Component${typeParamsStr} extends Marko.Component<Input${typeArgsStr}>`
+          ).copy(body2).write("\nexport { type Component }\n");
+        } else {
+          this.#extractor.write(`/**${jsDocTemplateTagsStr}
+    * @extends {Marko.Component<Input${typeArgsStr}>}
+    * @abstract
+    */
 `);
-        this.#extractor.write(`export class Component extends Marko.Component`).copy(body2).write("\n");
+          this.#extractor.write(`export class Component extends Marko.Component`).copy(body2).write("\n");
+        }
       }
     }
     const didReturn = !!getReturnTag(program);
@@ -2095,16 +2097,16 @@ var ScriptExtractor = class {
 function ${templateName}() {
 `);
     }
-    this.#extractor.write(`  const input = ${this.#getCastedType(`Input${typeArgsStr}`)};
+    this.#extractor.write(`  const input = ${this.#getCastedType(`Input${typeArgsStr}`)};${this.#api !== RuntimeAPI.tags ? `
   const component = ${this.#getCastedType(`Component${typeArgsStr}`)};
   const state = ${varShared("state")}(component);
+  const out = ${varShared("out")};` : ""}
   const $signal = ${this.#getCastedType("AbortSignal")};
   const $global = ${varShared("getGlobal")}(
     // @ts-expect-error We expect the compiler to error because we are checking if the MarkoRun.Context is defined.
     (${varShared("error")}, ${this.#getCastedType("MarkoRun.Context")})
   );
-  const out = ${varShared("out")};
-  ${varShared("noop")}({ input, component, state, out, $global, $signal });
+  ${varShared("noop")}({ ${this.#api !== RuntimeAPI.tags ? "component, state, out, " : ""}input, $global, $signal });
 `);
     const body = this.#processBody(program);
     if (body == null ? void 0 : body.content) {
@@ -2576,7 +2578,7 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
               }
             } else if (attr.args) {
               this.#extractor.write('"').copy(name).write('": ');
-              if (typeof name !== "string" && this.#read(name).startsWith("on")) {
+              if (this.#api !== RuntimeAPI.tags && typeof name !== "string" && this.#read(name).startsWith("on")) {
                 const stringLiteralFirstArgMatch = this.#execAtIndex(
                   REG_ATTR_ARG_LITERAL,
                   attr.args.value.start

package/marko.internal.d.ts

@@ -328,18 +328,19 @@ declare global {
       export function attrTagFor<Tag, Path extends readonly string[]>(
         tag: Tag,
         ...path: Path
-      ): <AttrTag>(
-        attrTags: Relate<
-          AttrTag,
-          [0] extends [1 & Tag]
-            ? Marko.AttrTag<unknown>
-            : Marko.Input<Tag> extends infer Input
-              ? [0] extends [1 & Input]
-                ? Marko.AttrTag<unknown>
-                : AttrTagValue<Marko.Input<Tag>, Path>
-              : Marko.AttrTag<unknown>
-        >[],
-      ) => AttrTag;
+      ): <
+        AttrTag extends [0] extends [1 & Tag]
+          ? Marko.AttrTag<unknown>
+          : Marko.Input<Tag> extends infer Input
+            ? [0] extends [1 & Input]
+              ? Marko.AttrTag<unknown>
+              : AttrTagValue<Marko.Input<Tag>, Path>
+            : Marko.AttrTag<unknown>,
+      >(
+        attrTags: AttrTag[],
+      ) => AttrTag extends Marko.AttrTag<infer Input>
+        ? Marko.AttrTag<Input>
+        : any;
 
       // TODO: this could be improved.
       // currently falls back to DefaultRenderer too eagerly.

package/package.json

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