@marko/language-tools 2.5.34 → 2.5.36

package/dist/index.js

@@ -2101,7 +2101,7 @@ var ScriptExtractor = class {
         );
       } else {
         this.#extractor.write(
-          `/** @typedef {${isExternalComponentFile ? "Component['input']" : "Record<string, unknown>"}} Input */
+          `/** @typedef {Record<string, unknown>} Input */
 `
         );
       }
@@ -2113,13 +2113,14 @@ var ScriptExtractor = class {
             `import type Component from "${stripExt(
               (0, import_relative_import_path.relativeImportPath)(this.#filename, componentFileName)
             )}";
+export { type Component }
 `
           );
         } else {
           this.#extractor.write(
-            `/** @typedef {import("${stripExt(
+            `/** @typedef {${varShared("resolveComponent")}(import("${stripExt(
               (0, import_relative_import_path.relativeImportPath)(this.#filename, componentFileName)
-            )}") extends infer Component ? Component extends { default: infer Component } ? Component : Component : never} Component */
+            )}"))} Component */
 `
           );
         }
@@ -3915,7 +3916,12 @@ var marko_default = {
       return ts.isTypeAliasDeclaration(statement) && statement.name.escapedText === "Input" && ts.isTypeLiteralNode(statement.type) && !statement.typeParameters && statement.type.members.length === 0 || ts.isInterfaceDeclaration(statement) && statement.name.escapedText === "Input" && !statement.heritageClauses && !statement.typeParameters && statement.members.length === 0;
     }
     function isExportComponentType(statement) {
-      return ts.isExportDeclaration(statement) && statement.exportClause && ts.isNamedExports(statement.exportClause) && statement.exportClause.elements.length === 1 && ts.isIdentifier(statement.exportClause.elements[0].name) && statement.exportClause.elements[0].name.escapedText === "Component";
+      if (ts.isExportDeclaration(statement)) {
+        return statement.exportClause && ts.isNamedExports(statement.exportClause) && statement.exportClause.elements.length === 1 && ts.isIdentifier(statement.exportClause.elements[0].name) && statement.exportClause.elements[0].name.escapedText === "Component";
+      } else if (ts.isTypeAliasDeclaration(statement)) {
+        return statement.name.text === "Component";
+      }
+      return false;
     }
     function isVariableStatementForName(statement, name) {
       if (ts.isVariableStatement(statement)) {

package/dist/index.mjs

@@ -2064,7 +2064,7 @@ var ScriptExtractor = class {
         );
       } else {
         this.#extractor.write(
-          `/** @typedef {${isExternalComponentFile ? "Component['input']" : "Record<string, unknown>"}} Input */
+          `/** @typedef {Record<string, unknown>} Input */
 `
         );
       }
@@ -2076,13 +2076,14 @@ var ScriptExtractor = class {
             `import type Component from "${stripExt(
               relativeImportPath(this.#filename, componentFileName)
             )}";
+export { type Component }
 `
           );
         } else {
           this.#extractor.write(
-            `/** @typedef {import("${stripExt(
+            `/** @typedef {${varShared("resolveComponent")}(import("${stripExt(
               relativeImportPath(this.#filename, componentFileName)
-            )}") extends infer Component ? Component extends { default: infer Component } ? Component : Component : never} Component */
+            )}"))} Component */
 `
           );
         }
@@ -3878,7 +3879,12 @@ var marko_default = {
       return ts.isTypeAliasDeclaration(statement) && statement.name.escapedText === "Input" && ts.isTypeLiteralNode(statement.type) && !statement.typeParameters && statement.type.members.length === 0 || ts.isInterfaceDeclaration(statement) && statement.name.escapedText === "Input" && !statement.heritageClauses && !statement.typeParameters && statement.members.length === 0;
     }
     function isExportComponentType(statement) {
-      return ts.isExportDeclaration(statement) && statement.exportClause && ts.isNamedExports(statement.exportClause) && statement.exportClause.elements.length === 1 && ts.isIdentifier(statement.exportClause.elements[0].name) && statement.exportClause.elements[0].name.escapedText === "Component";
+      if (ts.isExportDeclaration(statement)) {
+        return statement.exportClause && ts.isNamedExports(statement.exportClause) && statement.exportClause.elements.length === 1 && ts.isIdentifier(statement.exportClause.elements[0].name) && statement.exportClause.elements[0].name.escapedText === "Component";
+      } else if (ts.isTypeAliasDeclaration(statement)) {
+        return statement.name.text === "Component";
+      }
+      return false;
     }
     function isVariableStatementForName(statement, name) {
       if (ts.isVariableStatement(statement)) {

package/marko.internal.d.ts

@@ -162,6 +162,15 @@ declare global {
       export function resolveTemplate<Template>(
         imported: Promise<{ default: Template }>,
       ): Template;
+      export function resolveComponent<Component>(
+        component: Component,
+      ): CheckNever<
+        (Component extends { default: infer Component }
+          ? Component
+          : Component) &
+          Marko.Component<unknown, unknown>,
+        Marko.Component<unknown, unknown>
+      >;
       export function fallbackTemplate<Tag, Template>(
         tag: Tag,
         fallback: Promise<{ default: Template }>,
@@ -621,7 +630,7 @@ type KnownRecordKeys<T> = keyof {
         : CheckNever<T[Key], never, Key>]: 0;
 };
 
-type CheckNever<T, If, Else> = [T] extends [never] ? If : Else;
+type CheckNever<T, If, Else = T> = [T] extends [never] ? If : Else;
 
 type UnionToIntersection<T> = (T extends any ? (_: T) => any : never) extends (
   _: infer U,

package/package.json

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