@marko/language-tools 2.5.36 → 2.5.38

package/dist/index.js

@@ -2110,17 +2110,16 @@ var ScriptExtractor = class {
       if (isExternalComponentFile) {
         if (this.#scriptLang === "ts" /* ts */) {
           this.#extractor.write(
-            `import type Component from "${stripExt(
+            `export interface Component extends ${varShared("ResolveComponent")}<typeof import("${stripExt(
               (0, import_relative_import_path.relativeImportPath)(this.#filename, componentFileName)
-            )}";
-export { type Component }
+            )}")> {}
 `
           );
         } else {
           this.#extractor.write(
-            `/** @typedef {${varShared("resolveComponent")}(import("${stripExt(
+            `/** @typedef {${varShared("ResolveComponent")}<typeof import("${stripExt(
               (0, import_relative_import_path.relativeImportPath)(this.#filename, componentFileName)
-            )}"))} Component */
+            )}")>} Component */
 `
           );
         }

package/dist/index.mjs

@@ -2073,17 +2073,16 @@ var ScriptExtractor = class {
       if (isExternalComponentFile) {
         if (this.#scriptLang === "ts" /* ts */) {
           this.#extractor.write(
-            `import type Component from "${stripExt(
+            `export interface Component extends ${varShared("ResolveComponent")}<typeof import("${stripExt(
               relativeImportPath(this.#filename, componentFileName)
-            )}";
-export { type Component }
+            )}")> {}
 `
           );
         } else {
           this.#extractor.write(
-            `/** @typedef {${varShared("resolveComponent")}(import("${stripExt(
+            `/** @typedef {${varShared("ResolveComponent")}<typeof import("${stripExt(
               relativeImportPath(this.#filename, componentFileName)
-            )}"))} Component */
+            )}")>} Component */
 `
           );
         }

package/marko.internal.d.ts

@@ -162,15 +162,6 @@ 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 }>,
@@ -470,6 +461,17 @@ declare global {
         (): () => <Input>(input: Input) => ReturnAndScope<Scopes<Input>, void>;
       }
 
+      export type ResolveComponent<Component> = CheckNever<
+        ComponentOf<
+          InstanceOf<
+            Component extends { default: infer Component }
+              ? Component
+              : Component
+          >
+        >,
+        Marko.Component
+      >;
+
       export type Relate<A, B> = B extends A ? A : B;
     }
   }
@@ -631,6 +633,8 @@ type KnownRecordKeys<T> = keyof {
 };
 
 type CheckNever<T, If, Else = T> = [T] extends [never] ? If : Else;
+type ComponentOf<T> = T extends Marko.Component ? T : T & Marko.Component;
+type InstanceOf<T> = T extends abstract new () => infer R ? R : T;
 
 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.36",
+  "version": "2.5.38",
   "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
   "peerDependencies": {
     "@marko/compiler": "^5.28.4"