@marko/language-tools 2.5.38 → 2.5.40

package/dist/index.js

@@ -1743,6 +1743,9 @@ function detectAPIFromChild(parsed, child) {
 }
 function detectAPIFromTag(parsed, tag) {
   var _a;
+  if (tag.var) {
+    return RuntimeAPI.tags;
+  }
   switch (tag.nameText) {
     case "macro":
     case "include-text":
@@ -1750,7 +1753,6 @@ function detectAPIFromTag(parsed, tag) {
     case "init-components":
     case "await-reorderer":
     case "while":
-    case "module-code":
       return RuntimeAPI.class;
     case "const":
     case "debug":
@@ -1760,11 +1762,11 @@ function detectAPIFromTag(parsed, tag) {
     case "lifecycle":
     case "log":
     case "return":
+    case "html-script":
+    case "html-style":
+    case "try":
       return RuntimeAPI.tags;
   }
-  if (tag.var) {
-    return RuntimeAPI.tags;
-  }
   if (tag.attrs) {
     for (const attr of tag.attrs) {
       if (attr.type !== 15 /* AttrSpread */) {
@@ -2108,20 +2110,32 @@ var ScriptExtractor = class {
     }
     if (this.#api !== RuntimeAPI.tags) {
       if (isExternalComponentFile) {
+        const componentImport = `"${stripExt((0, import_relative_import_path.relativeImportPath)(this.#filename, componentFileName))}"`;
         if (this.#scriptLang === "ts" /* ts */) {
-          this.#extractor.write(
-            `export interface Component extends ${varShared("ResolveComponent")}<typeof import("${stripExt(
-              (0, import_relative_import_path.relativeImportPath)(this.#filename, componentFileName)
-            )}")> {}
+          if (typeArgsStr) {
+            this.#extractor.write(
+              `import type Component from ${componentImport};
+export type { Component };
 `
-          );
+            );
+          } else {
+            this.#extractor.write(
+              `export interface Component extends ${varShared("ResolveComponent")}<typeof import(${componentImport})> {}
+`
+            );
+          }
         } else {
-          this.#extractor.write(
-            `/** @typedef {${varShared("ResolveComponent")}<typeof import("${stripExt(
-              (0, import_relative_import_path.relativeImportPath)(this.#filename, componentFileName)
-            )}")>} Component */
+          if (typeArgsStr) {
+            this.#extractor.write(
+              `/** @import Component from ${componentImport} */
 `
-          );
+            );
+          } else {
+            this.#extractor.write(
+              `/** @typedef {${varShared("ResolveComponent")}<typeof import(${componentImport})>} Component */
+`
+            );
+          }
         }
       } else {
         const body2 = componentClassBody || " {}";
@@ -2856,7 +2870,9 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
     const isScript = isTextOnlyScript(tag);
     let hasBodyContent = false;
     if (isScript) {
-      this.#extractor.write("async value(){");
+      this.#extractor.write(
+        `async ${this.#api === RuntimeAPI.tags ? "value" : `[${varShared("never")}]`}(){`
+      );
       this.#copyWithMutationsReplaced({
         start: tag.body[0].start,
         end: tag.body[tag.body.length - 1].end

package/dist/index.mjs

@@ -1703,6 +1703,9 @@ function detectAPIFromChild(parsed, child) {
 }
 function detectAPIFromTag(parsed, tag) {
   var _a;
+  if (tag.var) {
+    return RuntimeAPI.tags;
+  }
   switch (tag.nameText) {
     case "macro":
     case "include-text":
@@ -1710,7 +1713,6 @@ function detectAPIFromTag(parsed, tag) {
     case "init-components":
     case "await-reorderer":
     case "while":
-    case "module-code":
       return RuntimeAPI.class;
     case "const":
     case "debug":
@@ -1720,11 +1722,11 @@ function detectAPIFromTag(parsed, tag) {
     case "lifecycle":
     case "log":
     case "return":
+    case "html-script":
+    case "html-style":
+    case "try":
       return RuntimeAPI.tags;
   }
-  if (tag.var) {
-    return RuntimeAPI.tags;
-  }
   if (tag.attrs) {
     for (const attr of tag.attrs) {
       if (attr.type !== 15 /* AttrSpread */) {
@@ -2071,20 +2073,32 @@ var ScriptExtractor = class {
     }
     if (this.#api !== RuntimeAPI.tags) {
       if (isExternalComponentFile) {
+        const componentImport = `"${stripExt(relativeImportPath(this.#filename, componentFileName))}"`;
         if (this.#scriptLang === "ts" /* ts */) {
-          this.#extractor.write(
-            `export interface Component extends ${varShared("ResolveComponent")}<typeof import("${stripExt(
-              relativeImportPath(this.#filename, componentFileName)
-            )}")> {}
+          if (typeArgsStr) {
+            this.#extractor.write(
+              `import type Component from ${componentImport};
+export type { Component };
 `
-          );
+            );
+          } else {
+            this.#extractor.write(
+              `export interface Component extends ${varShared("ResolveComponent")}<typeof import(${componentImport})> {}
+`
+            );
+          }
         } else {
-          this.#extractor.write(
-            `/** @typedef {${varShared("ResolveComponent")}<typeof import("${stripExt(
-              relativeImportPath(this.#filename, componentFileName)
-            )}")>} Component */
+          if (typeArgsStr) {
+            this.#extractor.write(
+              `/** @import Component from ${componentImport} */
 `
-          );
+            );
+          } else {
+            this.#extractor.write(
+              `/** @typedef {${varShared("ResolveComponent")}<typeof import(${componentImport})>} Component */
+`
+            );
+          }
         }
       } else {
         const body2 = componentClassBody || " {}";
@@ -2819,7 +2833,9 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
     const isScript = isTextOnlyScript(tag);
     let hasBodyContent = false;
     if (isScript) {
-      this.#extractor.write("async value(){");
+      this.#extractor.write(
+        `async ${this.#api === RuntimeAPI.tags ? "value" : `[${varShared("never")}]`}(){`
+      );
       this.#copyWithMutationsReplaced({
         start: tag.body[0].start,
         end: tag.body[tag.body.length - 1].end

package/marko.internal.d.ts

@@ -152,7 +152,7 @@ declare global {
           : Handler
         : (...args: any) => any; // If typescript ever actually supports partial application maybe we do this.
 
-      export function renderTemplate<Name extends Marko.Template<any, any>>(
+      export function renderTemplate<Name>(
         template: Name,
       ): TemplateRenderer<Name>;
       export function renderNativeTag<Name extends string>(
@@ -177,19 +177,19 @@ declare global {
       >(input: Input): Input;
 
       export function forOfTag<
-        Value extends Iterable,
+        Value,
         Item extends [0] extends [1 & Value]
           ? any
-          : Value extends readonly (infer Item)[] | Iterable<infer Item>
+          : Value extends Iterable<infer Item>
             ? Item
             : never,
         BodyContent extends Marko.Body<
-          [item: Item, index: number, all: Value],
+          [item: Item, index: number, all: Exclude<Value, false | void | null>],
           void
         >,
       >(
         input: {
-          of: Value | false | void | null;
+          of: Value & (Iterable<unknown> | false | void | null);
           by?: ((item: Item, index: number) => string) | string;
         },
         content: BodyContent,
@@ -210,14 +210,14 @@ declare global {
       ): ReturnAndScope<BodyContentScope<BodyContent>, void>;
 
       export function forToTag<
-        From extends void | number,
         To extends number,
+        From extends void | number,
         Step extends void | number,
         BodyContent extends Marko.Body<[index: number], void>,
       >(
         input: {
-          from?: From;
           to: To;
+          from?: From;
           step?: Step;
           by?: (index: number) => string;
         },
@@ -225,14 +225,14 @@ declare global {
       ): ReturnAndScope<BodyContentScope<BodyContent>, void>;
 
       export function forUntilTag<
-        From extends void | number,
         Until extends number,
+        From extends void | number,
         Step extends void | number,
         BodyContent extends Marko.Body<[index: number], void>,
       >(
         input: {
-          from?: From;
           until: Until;
+          from?: From;
           step?: Step;
           by?: (index: number) => string;
         },
@@ -242,27 +242,27 @@ declare global {
       export function forTag<BodyContent extends AnyMarkoBody>(
         input: (
           | {
-              from?: number;
               to: number;
+              from?: number;
               step?: number;
             }
           | {
-              from?: number;
               until: number;
+              from?: number;
               step?: number;
             }
           | {
-              in: object | false | void | null;
+              in: any;
             }
           | {
-              of: Iterable<unknown> | readonly unknown[] | false | void | null;
+              of: any;
             }
-        ) & { by?: (...args: unknown[]) => string },
+        ) & { by?: string | ((...args: unknown[]) => string) },
         content: BodyContent,
       ): ReturnAndScope<BodyContentScope<BodyContent>, void>;
 
       export function forOfAttrTag<
-        Value extends Iterable,
+        Value,
         Item extends [0] extends [1 & Value]
           ? any
           : Value extends readonly (infer Item)[] | Iterable<infer Item>
@@ -271,14 +271,18 @@ declare global {
         const Return,
       >(
         input: {
-          of: Value | false | void | null;
+          of: Value & (Iterable<unknown> | false | void | null);
         },
-        content: (value: Item, index: number, all: Value) => Return,
+        content: (
+          value: Item,
+          index: number,
+          all: Exclude<Value, false | void | null>,
+        ) => Return,
       ): {
         [Key in keyof Return]: Return[Key] extends
           | readonly (infer Item)[]
           | (infer Item extends Record<PropertyKey, any>)
-          ? AttrTagByListSize<Value, Item>
+          ? AttrTagByListSize<Exclude<Value, false | void | null>, Item>
           : never;
       };
 
@@ -296,14 +300,14 @@ declare global {
       };
 
       export function forToAttrTag<
-        From extends void | number,
         To extends number,
+        From extends void | number,
         Step extends void | number,
         const Return,
       >(
         input: {
-          from?: From;
           to: To;
+          from?: From;
           step?: Step;
         },
         content: (index: number) => Return,
@@ -322,14 +326,14 @@ declare global {
       };
 
       export function forUntilAttrTag<
-        From extends void | number,
         Until extends number,
+        From extends void | number,
         Step extends void | number,
         const Return,
       >(
         input: {
-          from?: From;
           until: Until;
+          from?: From;
           step?: Step;
         },
         content: (index: number) => Return,
@@ -350,19 +354,19 @@ declare global {
       export function forAttrTag<const Return>(
         input:
           | {
-              of: Iterable<unknown> | readonly unknown[] | false | void | null;
+              of: Iterable<unknown> | false | void | null;
             }
           | {
-              in: object;
+              in: object | false | void | null;
             }
           | {
-              from?: number;
               to: number;
+              from?: number;
               step?: number;
             }
           | {
-              from?: number;
               until: number;
+              from?: number;
               step?: number;
             },
         content: (...args: unknown[]) => Return,
@@ -420,7 +424,7 @@ declare global {
         ? Renderer
         : Template extends Marko.Template<infer Input, infer Return>
           ? BaseRenderer<Input, Return>
-          : never;
+          : DefaultRenderer;
 
       export interface NativeTagRenderer<Name extends string> {
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-constraint
@@ -537,14 +541,6 @@ type MergeScopes<Scopes> = {
     : never;
 };
 
-type MergeOptionalScopes<Scopes> = {
-  [K in Scopes extends Scopes ? keyof Scopes : never]: Scopes extends Scopes
-    ? K extends keyof Scopes
-      ? Scopes[K]
-      : undefined
-    : never;
-};
-
 type MergeAttrTags<Attrs extends readonly any[]> = Attrs extends readonly [
   infer A,
   infer B,

package/package.json

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