@marko/language-tools 2.0.2 → 2.0.4

package/dist/index.js

@@ -1894,9 +1894,9 @@ function ${templateName}() {
     const internalInput = varLocal("input");
     const internalInputWithExtends = `${internalInput} extends unknown`;
     const internalApply = varLocal("apply");
-    const renderAndReturn = `(input: Input${typeArgsStr} & ${varShared(
+    const renderAndReturn = `(input: Marko.Directives & Input${typeArgsStr} & ${varShared(
       "Relate"
-    )}<${internalInput}, Input${typeArgsStr}>) => (${varShared(
+    )}<${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) : ""}
@@ -2923,6 +2923,7 @@ function getTagLookup(dir) {
   return getTagLookupForProject(getMeta(dir), dir);
 }
 function getTypeLibs(rootDir, ts, host) {
+  var _a;
   const config = getConfig(rootDir);
   let typeLibs = config.cache.get(getTypeLibs);
   if (typeLibs)
@@ -2935,12 +2936,12 @@ function getTypeLibs(rootDir, ts, host) {
     ".marko-run/routes.d.ts"
   );
   const resolveFromFile = import_path2.default.join(rootDir, "_.d.ts");
-  const { resolvedTypeReferenceDirective: resolvedInternalTypes } = ts.resolveTypeReferenceDirective(
+  const internalTypesFile = defaultTypeLibs.internalTypesFile || ((_a = ts.resolveTypeReferenceDirective(
     "@marko/language-tools/marko.internal.d.ts",
     resolveFromFile,
     resolveTypeCompilerOptions,
     host
-  );
+  ).resolvedTypeReferenceDirective) == null ? void 0 : _a.resolvedFileName);
   const { resolvedTypeReferenceDirective: resolvedMarkoTypes } = ts.resolveTypeReferenceDirective(
     config.translator.runtimeTypes || "marko",
     resolveFromFile,
@@ -2953,7 +2954,6 @@ function getTypeLibs(rootDir, ts, host) {
     resolveTypeCompilerOptions,
     host
   );
-  const internalTypesFile = (resolvedInternalTypes == null ? void 0 : resolvedInternalTypes.resolvedFileName) || defaultTypeLibs.internalTypesFile;
   const markoTypesFile = (resolvedMarkoTypes == null ? void 0 : resolvedMarkoTypes.resolvedFileName) || defaultTypeLibs.markoTypesFile;
   const markoRunTypesFile = resolvedMarkoRunTypes == null ? void 0 : resolvedMarkoRunTypes.resolvedFileName;
   if (!internalTypesFile || !markoTypesFile) {

package/dist/index.mjs

@@ -1863,9 +1863,9 @@ function ${templateName}() {
     const internalInput = varLocal("input");
     const internalInputWithExtends = `${internalInput} extends unknown`;
     const internalApply = varLocal("apply");
-    const renderAndReturn = `(input: Input${typeArgsStr} & ${varShared(
+    const renderAndReturn = `(input: Marko.Directives & Input${typeArgsStr} & ${varShared(
       "Relate"
-    )}<${internalInput}, Input${typeArgsStr}>) => (${varShared(
+    )}<${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) : ""}
@@ -2892,6 +2892,7 @@ function getTagLookup(dir) {
   return getTagLookupForProject(getMeta(dir), dir);
 }
 function getTypeLibs(rootDir, ts, host) {
+  var _a;
   const config = getConfig(rootDir);
   let typeLibs = config.cache.get(getTypeLibs);
   if (typeLibs)
@@ -2904,12 +2905,12 @@ function getTypeLibs(rootDir, ts, host) {
     ".marko-run/routes.d.ts"
   );
   const resolveFromFile = path2.join(rootDir, "_.d.ts");
-  const { resolvedTypeReferenceDirective: resolvedInternalTypes } = ts.resolveTypeReferenceDirective(
+  const internalTypesFile = defaultTypeLibs.internalTypesFile || ((_a = ts.resolveTypeReferenceDirective(
     "@marko/language-tools/marko.internal.d.ts",
     resolveFromFile,
     resolveTypeCompilerOptions,
     host
-  );
+  ).resolvedTypeReferenceDirective) == null ? void 0 : _a.resolvedFileName);
   const { resolvedTypeReferenceDirective: resolvedMarkoTypes } = ts.resolveTypeReferenceDirective(
     config.translator.runtimeTypes || "marko",
     resolveFromFile,
@@ -2922,7 +2923,6 @@ function getTypeLibs(rootDir, ts, host) {
     resolveTypeCompilerOptions,
     host
   );
-  const internalTypesFile = (resolvedInternalTypes == null ? void 0 : resolvedInternalTypes.resolvedFileName) || defaultTypeLibs.internalTypesFile;
   const markoTypesFile = (resolvedMarkoTypes == null ? void 0 : resolvedMarkoTypes.resolvedFileName) || defaultTypeLibs.markoTypesFile;
   const markoRunTypesFile = resolvedMarkoRunTypes == null ? void 0 : resolvedMarkoRunTypes.resolvedFileName;
   if (!internalTypesFile || !markoTypesFile) {

package/marko.internal.d.ts

@@ -1,6 +1,9 @@
 // This is a typescript file which defines utilities used in the output of the typescript extractor.
 declare global {
   namespace Marko {
+    // eslint-disable-next-line @typescript-eslint/no-empty-interface
+    export interface Directives {}
+
     // Extend the Body type to keep track of what is yielded (used for scope hoisted types).
     export interface Body<
       in Params extends readonly any[] = [],
@@ -321,22 +324,45 @@ declare global {
         : never;
 
       export interface NativeTagRenderer<Name extends string> {
-        (): () => <Input extends Marko.NativeTags[Name]["input"]>(
-          input: Input
-        ) => ReturnAndScope<Scopes<Input>, Marko.NativeTags[Name]["return"]>;
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-constraint
+        (): () => <__marko_internal_input extends unknown>(
+          input: Marko.Directives &
+            Marko.NativeTags[Name]["input"] &
+            Relate<
+              __marko_internal_input,
+              Marko.Directives & Marko.NativeTags[Name]["input"]
+            >
+        ) => ReturnAndScope<
+          Scopes<__marko_internal_input>,
+          Marko.NativeTags[Name]["return"]
+        >;
       }
 
       export interface BodyRenderer<Body extends AnyMarkoBody> {
-        (): () => <Args extends BodyParameters<Body>>(
-          input: RenderBodyInput<Args>
-        ) => ReturnAndScope<Scopes<Args>, BodyReturnType<Body>>;
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-constraint
+        (): () => <__marko_internal_input extends unknown>(
+          input: Marko.Directives &
+            RenderBodyInput<BodyParameters<Body>> &
+            Relate<
+              __marko_internal_input,
+              Marko.Directives & RenderBodyInput<BodyParameters<Body>>
+            >
+        ) => ReturnAndScope<
+          Scopes<__marko_internal_input>,
+          BodyReturnType<Body>
+        >;
       }
 
       export interface BaseRenderer<
         Input extends Record<PropertyKey, unknown>,
         Return = void
       > {
-        (): () => (input: Input) => ReturnAndScope<Scopes<Input>, Return>;
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-constraint
+        (): () => <__marko_input_with_scope extends unknown>(
+          input: Marko.Directives &
+            Input &
+            Relate<__marko_input_with_scope, Marko.Directives & Input>
+        ) => ReturnAndScope<Scopes<__marko_input_with_scope>, Return>;
       }
 
       export interface DefaultRenderer {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@marko/language-tools",
   "description": "Marko Language Tools",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
   "dependencies": {
     "@babel/helper-validator-identifier": "^7.19.1",
     "@babel/parser": "^7.21.4",
-    "@marko/compiler": "5.27.4",
-    "@marko/translator-default": "5.25.6",
+    "@marko/compiler": "5.27.7",
+    "@marko/translator-default": "5.25.7",
     "htmljs-parser": "^5.4.3",
     "relative-import-path": "^1.0.0"
   },
@@ -17,7 +17,7 @@
     "@types/babel__code-frame": "^7.0.3",
     "@types/babel__helper-validator-identifier": "^7.15.0",
     "@typescript/vfs": "^1.4.0",
-    "marko": "^5.25.5",
+    "marko": "^5.25.6",
     "mitata": "^0.1.6",
     "tsx": "^3.12.6"
   },