fix: return tags api overloads

Author: DylanPiercey

.changeset/curvy-readers-study.md

@@ -0,0 +1,8 @@
+---
+"@marko/language-server": patch
+"@marko/language-tools": patch
+"@marko/type-check": patch
+"marko-vscode": patch
+---
+
+Fix return api overloads for tags api components.

package-lock.json

@@ -18,7 +18,7 @@
     "prettier": "^3.6.2",
     "tsx": "^4.20.3",
     "typescript": "^5.8.3",
-    "typescript-eslint": "^8.36.0"
+    "typescript-eslint": "^8.37.0"
   },
   "private": true,
   "scripts": {

package.json

@@ -11,10 +11,10 @@
     "@marko/language-tools": "^2.5.25",
     "@marko/babel-utils": "^6.6.3",
     "@marko/compiler": "^5.39.29",
-    "htmljs-parser": "^5.5.4",
+    "htmljs-parser": "^5.6.1",
     "marko": "^5.37.41",
     "prettier": "^3.6.2",
-    "prettier-plugin-marko": "^3.2.1",
+    "prettier-plugin-marko": "^3.2.7",
     "relative-import-path": "^1.0.0",
     "typescript": "^5.8.3",
     "vscode-css-languageservice": "^6.3.7",

packages/language-server/package.json

@@ -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>

packages/language-tools/marko.internal.d.ts

@@ -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": {

packages/language-tools/package.json

@@ -378,20 +378,24 @@ function ${templateName}() {\n`);
     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"
-    }>)`;
+    )}<${internalInput}, ${returnTypeStr}>)`;
     const templateOverrideClass = `${templateBaseClass}<{${
       this.#runtimeTypes
-        ? getRuntimeOverrides(this.#runtimeTypes, typeParamsStr, typeArgsStr)
+        ? getRuntimeOverrides(
+            this.#runtimeTypes,
+            typeParamsStr,
+            typeArgsStr,
+            returnTypeStr,
+          )
         : ""
     }
   ${this.#api ? `api: "${this.#api}",` : ""}

packages/language-tools/src/extractors/script/index.ts

@@ -1,20 +1,22 @@
 const RuntimeOverloads = new Map<string, (string | Replacement)[]>();
 const commentsReg = /\/\*(?:[^*]|\*[^/])*\*\//gm;
 const replaceTokensReg =
-  /\babstract\s+(\w+)|Marko\.(TemplateInput(?:<[^>]+>)?|Component)/gm;
+  /\babstract\s+(\w+)|Marko\.(TemplateInput(?:<[^>]+>)?|Component)|\b(Return)\b/gm;
 const overrideBlockReg =
   /\/\*[*\s]*@marko-overload-start[*\s]*\*\/([\s\S]+)\/\*[*\s]*@marko-overload-end[*\s]*\*\//g;
 
 enum Replacement {
   Generics,
   Input,
+  Return,
   Component,
 }
 
 export function getRuntimeOverrides(
   runtimeTypes: string,
   generics: string,
   applyGenerics: string,
+  returnType: string,
 ) {
   let overloads = RuntimeOverloads.get(runtimeTypes);
 
@@ -29,12 +31,14 @@ export function getRuntimeOverrides(
       content = content.replace(commentsReg, ""); // remove all comments within the overloads.
 
       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, Replacement.Generics);
+        } else if (returnName) {
+          overloads.push(curText, Replacement.Return);
         } else {
           overloads.push(
             curText,
@@ -61,6 +65,9 @@ export function getRuntimeOverrides(
       case Replacement.Input:
         result += appliedInput;
         break;
+      case Replacement.Return:
+        result += returnType;
+        break;
       case Replacement.Component:
         result += appliedComponent;
         break;

packages/language-tools/src/extractors/script/util/runtime-overrides.ts

@@ -6,7 +6,7 @@
   "dependencies": {
     "@babel/code-frame": "^7.27.1",
     "@luxass/strip-json-comments": "^1.4.0",
-    "@marko/language-tools": "^2.5.24",
+    "@marko/language-tools": "^2.5.25",
     "arg": "^5.0.2",
     "kleur": "^4.1.5",
     "typescript": "^5.8.3"