@marko/language-tools 2.5.25 → 2.5.27

package/dist/extractors/script/index.d.ts

@@ -1,4 +1,4 @@
-import type { TaglibLookup } from "@marko/babel-utils";
+import type { TaglibLookup } from "@marko/compiler/babel-utils";
 import type TS from "typescript/lib/tsserverlibrary";
 import { type Parsed } from "../../parser";
 import type { Meta } from "../../util/project";

package/dist/extractors/script/util/runtime-overrides.d.ts

@@ -1 +1 @@
-export declare function getRuntimeOverrides(runtimeTypes: string, generics: string, applyGenerics: string): string;
+export declare function getRuntimeOverrides(runtimeTypes: string, generics: string, applyGenerics: string, returnType: string): string;

package/dist/extractors/style/index.d.ts

@@ -1,4 +1,4 @@
-import type { TaglibLookup } from "@marko/babel-utils";
+import type { TaglibLookup } from "@marko/compiler/babel-utils";
 import { type Parsed } from "../../parser";
 import { type Extracted } from "../../util/extractor";
 export interface ExtractStyleOptions {

package/dist/index.js

@@ -1824,9 +1824,9 @@ function isTemplateTag(ts, tag) {
 // src/extractors/script/util/runtime-overrides.ts
 var RuntimeOverloads = /* @__PURE__ */ new Map();
 var commentsReg = /\/\*(?:[^*]|\*[^/])*\*\//gm;
-var replaceTokensReg = /\babstract\s+(\w+)|Marko\.(TemplateInput(?:<[^>]+>)?|Component)/gm;
+var replaceTokensReg = /\babstract\s+(\w+)|Marko\.(TemplateInput(?:<[^>]+>)?|Component)|\b(Return)\b/gm;
 var overrideBlockReg = /\/\*[*\s]*@marko-overload-start[*\s]*\*\/([\s\S]+)\/\*[*\s]*@marko-overload-end[*\s]*\*\//g;
-function getRuntimeOverrides(runtimeTypes, generics, applyGenerics) {
+function getRuntimeOverrides(runtimeTypes, generics, applyGenerics, returnType) {
   let overloads = RuntimeOverloads.get(runtimeTypes);
   if (!overloads) {
     const match = overrideBlockReg.exec(runtimeTypes);
@@ -1837,15 +1837,17 @@ function getRuntimeOverrides(runtimeTypes, generics, applyGenerics) {
       let lastIndex = 0;
       content = content.replace(commentsReg, "");
       while (replaceMatch = replaceTokensReg.exec(content)) {
-        const [, methodName, propertyName] = replaceMatch;
+        const [, methodName, propertyName, returnName] = replaceMatch;
         const curText = content.slice(lastIndex, replaceMatch.index);
         lastIndex = replaceTokensReg.lastIndex;
         if (methodName) {
           overloads.push(curText + methodName, 0 /* Generics */);
+        } else if (returnName) {
+          overloads.push(curText, 2 /* Return */);
         } else {
           overloads.push(
             curText,
-            propertyName === "Component" ? 2 /* Component */ : 1 /* Input */
+            propertyName === "Component" ? 3 /* Component */ : 1 /* Input */
           );
         }
       }
@@ -1863,7 +1865,10 @@ function getRuntimeOverrides(runtimeTypes, generics, applyGenerics) {
       case 1 /* Input */:
         result += appliedInput;
         break;
-      case 2 /* Component */:
+      case 2 /* Return */:
+        result += returnType;
+        break;
+      case 3 /* Component */:
         result += appliedComponent;
         break;
       default:
@@ -2182,12 +2187,18 @@ ${varShared("noop")}(`);
     const internalInput = varLocal("input");
     const internalInputWithExtends = `${internalInput} extends unknown`;
     const internalApply = varLocal("apply");
+    const returnTypeStr = didReturn ? `typeof ${templateName + typeArgsStr} extends () => infer Return ? Return : never` : "void";
     const renderAndReturn = `(input: Marko.Directives & Input${typeArgsStr} & ${varShared(
       "Relate"
     )}<${internalInput}, Marko.Directives & Input${typeArgsStr}>) => (${varShared(
       "ReturnWithScope"
-    )}<${internalInput}, ${didReturn ? `typeof ${templateName + typeArgsStr} extends () => infer Return ? Return : never` : "void"}>)`;
-    const templateOverrideClass = `${templateBaseClass}<{${this.#runtimeTypes ? getRuntimeOverrides(this.#runtimeTypes, typeParamsStr, typeArgsStr) : ""}
+    )}<${internalInput}, ${returnTypeStr}>)`;
+    const templateOverrideClass = `${templateBaseClass}<{${this.#runtimeTypes ? getRuntimeOverrides(
+      this.#runtimeTypes,
+      typeParamsStr,
+      typeArgsStr,
+      returnTypeStr
+    ) : ""}
   ${this.#api ? `api: "${this.#api}",` : ""}
   _${typeParamsStr ? `<${internalApply} = 1>(): ${internalApply} extends 0
     ? ${typeParamsStr}() => <${internalInputWithExtends}>${renderAndReturn}
@@ -2447,11 +2458,11 @@ constructor(_?: Return) {}
     const tagName = tag.nameText;
     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) : void 0;
+    const importPath = resolveTagImport(this.#filename, def);
+    const isHTML = !importPath && (def == null ? void 0 : def.html);
     let tagIdentifier;
     let isTemplate = false;
-    if (!isHTML && (!def || importPath)) {
+    if (!def || importPath) {
       const isIdentifier = tagName && REG_TAG_NAME_IDENTIFIER.test(tagName);
       const isMarkoFile = importPath == null ? void 0 : importPath.endsWith(".marko");
       if (isIdentifier || isMarkoFile || !importPath) {

package/dist/index.mjs

@@ -1784,9 +1784,9 @@ function isTemplateTag(ts, tag) {
 // src/extractors/script/util/runtime-overrides.ts
 var RuntimeOverloads = /* @__PURE__ */ new Map();
 var commentsReg = /\/\*(?:[^*]|\*[^/])*\*\//gm;
-var replaceTokensReg = /\babstract\s+(\w+)|Marko\.(TemplateInput(?:<[^>]+>)?|Component)/gm;
+var replaceTokensReg = /\babstract\s+(\w+)|Marko\.(TemplateInput(?:<[^>]+>)?|Component)|\b(Return)\b/gm;
 var overrideBlockReg = /\/\*[*\s]*@marko-overload-start[*\s]*\*\/([\s\S]+)\/\*[*\s]*@marko-overload-end[*\s]*\*\//g;
-function getRuntimeOverrides(runtimeTypes, generics, applyGenerics) {
+function getRuntimeOverrides(runtimeTypes, generics, applyGenerics, returnType) {
   let overloads = RuntimeOverloads.get(runtimeTypes);
   if (!overloads) {
     const match = overrideBlockReg.exec(runtimeTypes);
@@ -1797,15 +1797,17 @@ function getRuntimeOverrides(runtimeTypes, generics, applyGenerics) {
       let lastIndex = 0;
       content = content.replace(commentsReg, "");
       while (replaceMatch = replaceTokensReg.exec(content)) {
-        const [, methodName, propertyName] = replaceMatch;
+        const [, methodName, propertyName, returnName] = replaceMatch;
         const curText = content.slice(lastIndex, replaceMatch.index);
         lastIndex = replaceTokensReg.lastIndex;
         if (methodName) {
           overloads.push(curText + methodName, 0 /* Generics */);
+        } else if (returnName) {
+          overloads.push(curText, 2 /* Return */);
         } else {
           overloads.push(
             curText,
-            propertyName === "Component" ? 2 /* Component */ : 1 /* Input */
+            propertyName === "Component" ? 3 /* Component */ : 1 /* Input */
           );
         }
       }
@@ -1823,7 +1825,10 @@ function getRuntimeOverrides(runtimeTypes, generics, applyGenerics) {
       case 1 /* Input */:
         result += appliedInput;
         break;
-      case 2 /* Component */:
+      case 2 /* Return */:
+        result += returnType;
+        break;
+      case 3 /* Component */:
         result += appliedComponent;
         break;
       default:
@@ -2145,12 +2150,18 @@ ${varShared("noop")}(`);
     const internalInput = varLocal("input");
     const internalInputWithExtends = `${internalInput} extends unknown`;
     const internalApply = varLocal("apply");
+    const returnTypeStr = didReturn ? `typeof ${templateName + typeArgsStr} extends () => infer Return ? Return : never` : "void";
     const renderAndReturn = `(input: Marko.Directives & Input${typeArgsStr} & ${varShared(
       "Relate"
     )}<${internalInput}, Marko.Directives & Input${typeArgsStr}>) => (${varShared(
       "ReturnWithScope"
-    )}<${internalInput}, ${didReturn ? `typeof ${templateName + typeArgsStr} extends () => infer Return ? Return : never` : "void"}>)`;
-    const templateOverrideClass = `${templateBaseClass}<{${this.#runtimeTypes ? getRuntimeOverrides(this.#runtimeTypes, typeParamsStr, typeArgsStr) : ""}
+    )}<${internalInput}, ${returnTypeStr}>)`;
+    const templateOverrideClass = `${templateBaseClass}<{${this.#runtimeTypes ? getRuntimeOverrides(
+      this.#runtimeTypes,
+      typeParamsStr,
+      typeArgsStr,
+      returnTypeStr
+    ) : ""}
   ${this.#api ? `api: "${this.#api}",` : ""}
   _${typeParamsStr ? `<${internalApply} = 1>(): ${internalApply} extends 0
     ? ${typeParamsStr}() => <${internalInputWithExtends}>${renderAndReturn}
@@ -2410,11 +2421,11 @@ constructor(_?: Return) {}
     const tagName = tag.nameText;
     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) : void 0;
+    const importPath = resolveTagImport(this.#filename, def);
+    const isHTML = !importPath && (def == null ? void 0 : def.html);
     let tagIdentifier;
     let isTemplate = false;
-    if (!isHTML && (!def || importPath)) {
+    if (!def || importPath) {
       const isIdentifier = tagName && REG_TAG_NAME_IDENTIFIER.test(tagName);
       const isMarkoFile = importPath == null ? void 0 : importPath.endsWith(".marko");
       if (isIdentifier || isMarkoFile || !importPath) {

package/dist/util/project.d.ts

@@ -1,5 +1,5 @@
-import type { TaglibLookup } from "@marko/babel-utils";
 import type * as Compiler from "@marko/compiler";
+import type { TaglibLookup } from "@marko/compiler/babel-utils";
 import type TS from "typescript/lib/tsserverlibrary";
 import { ScriptLang } from "../extractors/script";
 export interface Meta {

package/marko.internal.d.ts

@@ -135,7 +135,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>(
+      export function renderTemplate<Name extends Marko.Template<any, any>>(
         template: Name,
       ): TemplateRenderer<Name>;
       export function renderNativeTag<Name extends string>(
@@ -328,7 +328,7 @@ declare global {
       // currently falls back to DefaultRenderer too eagerly.
       export type DynamicRenderer<Name> = [0] extends [1 & Name]
         ? DefaultRenderer
-        : [Name] extends [Marko.Template]
+        : [Name] extends [Marko.Template<any, any>]
           ? TemplateRenderer<Name>
           : [Name] extends [string]
             ? NativeTagRenderer<Name>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/language-tools",
   "description": "Marko Language Tools",
-  "version": "2.5.25",
+  "version": "2.5.27",
   "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
   "peerDependencies": {
     "@marko/compiler": "^5.28.4"
@@ -9,7 +9,7 @@
   "dependencies": {
     "@babel/parser": "^7.28.0",
     "@luxass/strip-json-comments": "^1.4.0",
-    "htmljs-parser": "^5.5.4",
+    "htmljs-parser": "^5.6.1",
     "relative-import-path": "^1.0.0"
   },
   "devDependencies": {