@marko/language-tools 2.1.1 → 2.1.3

package/dist/index.js

@@ -2928,12 +2928,14 @@ __export(project_exports, {
   getScriptLang: () => getScriptLang,
   getTagLookup: () => getTagLookup,
   getTypeLibs: () => getTypeLibs,
+  setDefaultCompilerMeta: () => setDefaultCompilerMeta,
   setDefaultTypePaths: () => setDefaultTypePaths
 });
 var import_path2 = __toESM(require("path"));
 var import_module = require("module");
 var import_strip_json_comments = __toESM(require("strip-json-comments"));
 var defaultTypeLibs = {};
+var defaultMeta;
 var ignoreErrors = (_err) => {
 };
 var metaByDir = /* @__PURE__ */ new Map();
@@ -3039,6 +3041,9 @@ function getScriptLang(fileName, defaultScriptLang, ts, host) {
   return scriptLang;
 }
 function clearCaches() {
+  if (defaultMeta) {
+    clearCacheForMeta(defaultMeta);
+  }
   for (const project of metaByCompiler.values()) {
     clearCacheForMeta(project);
   }
@@ -3046,36 +3051,67 @@ function clearCaches() {
 function setDefaultTypePaths(defaults) {
   Object.assign(defaultTypeLibs, defaults);
 }
-function getMeta(dir = __dirname) {
+function setDefaultCompilerMeta(compiler, config) {
+  const { translator } = config;
+  if (typeof translator !== "object") {
+    throw new Error("Translator must be fully resolved and loaded.");
+  }
+  defaultMeta = {
+    compiler,
+    config: {
+      ...config,
+      cache: /* @__PURE__ */ new Map(),
+      translator
+    }
+  };
+  compiler.configure(defaultMeta.config);
+}
+function getMeta(dir) {
+  if (!dir) {
+    if (!defaultMeta) {
+      throw new Error(
+        "@marko/compiler must be installed or compiler registered."
+      );
+    }
+    return defaultMeta;
+  }
+  if (defaultMeta) {
+    try {
+      return loadMeta(dir);
+    } catch {
+      metaByDir.set(dir, defaultMeta);
+      return defaultMeta;
+    }
+  }
+  return loadMeta(dir);
+}
+function loadMeta(dir) {
   let cached = metaByDir.get(dir);
   if (!cached) {
-    const fallback = dir === __dirname;
+    let require2 = (0, import_module.createRequire)(dir);
+    let configPath;
     try {
-      const require2 = (0, import_module.createRequire)(dir);
-      const configPath = require2.resolve("@marko/compiler/config");
-      cached = metaByCompiler.get(configPath);
-      if (!cached) {
-        const compiler = require2(import_path2.default.join(
-          configPath,
-          ".."
-        ));
-        const config = interopDefault(require2(configPath));
-        cached = {
-          fallback,
-          compiler,
-          config: {
-            ...config,
-            cache: /* @__PURE__ */ new Map(),
-            translator: require2(config.translator)
-          }
-        };
-        compiler.configure(cached.config);
-        metaByCompiler.set(configPath, cached);
-      }
-    } catch (err) {
-      if (fallback)
-        throw err;
-      cached = getMeta();
+      configPath = require2.resolve("@marko/compiler/config");
+    } catch {
+      require2 = (0, import_module.createRequire)(
+        import_path2.default.dirname(require2.resolve("marko/package.json"))
+      );
+      configPath = require2.resolve("@marko/compiler/config");
+    }
+    cached = metaByCompiler.get(configPath);
+    if (!cached) {
+      const compiler = require2(import_path2.default.dirname(configPath));
+      const config = interopDefault(require2(configPath));
+      cached = {
+        compiler,
+        config: {
+          ...config,
+          cache: /* @__PURE__ */ new Map(),
+          translator: require2(config.translator)
+        }
+      };
+      compiler.configure(cached.config);
+      metaByCompiler.set(configPath, cached);
     }
     metaByDir.set(dir, cached);
   }
@@ -3092,7 +3128,7 @@ function getTagLookupForProject(meta, dir) {
         ignoreErrors
       );
     } catch {
-      if (!meta.fallback) {
+      if (meta !== defaultMeta) {
         lookup = getTagLookupForProject(getMeta(), dir);
       }
     }

package/dist/index.mjs

@@ -2896,12 +2896,14 @@ __export(project_exports, {
   getScriptLang: () => getScriptLang,
   getTagLookup: () => getTagLookup,
   getTypeLibs: () => getTypeLibs,
+  setDefaultCompilerMeta: () => setDefaultCompilerMeta,
   setDefaultTypePaths: () => setDefaultTypePaths
 });
 import path2 from "path";
 import { createRequire } from "module";
 import stripJSONComments from "strip-json-comments";
 var defaultTypeLibs = {};
+var defaultMeta;
 var ignoreErrors = (_err) => {
 };
 var metaByDir = /* @__PURE__ */ new Map();
@@ -3007,6 +3009,9 @@ function getScriptLang(fileName, defaultScriptLang, ts, host) {
   return scriptLang;
 }
 function clearCaches() {
+  if (defaultMeta) {
+    clearCacheForMeta(defaultMeta);
+  }
   for (const project of metaByCompiler.values()) {
     clearCacheForMeta(project);
   }
@@ -3014,36 +3019,67 @@ function clearCaches() {
 function setDefaultTypePaths(defaults) {
   Object.assign(defaultTypeLibs, defaults);
 }
-function getMeta(dir = __dirname) {
+function setDefaultCompilerMeta(compiler, config) {
+  const { translator } = config;
+  if (typeof translator !== "object") {
+    throw new Error("Translator must be fully resolved and loaded.");
+  }
+  defaultMeta = {
+    compiler,
+    config: {
+      ...config,
+      cache: /* @__PURE__ */ new Map(),
+      translator
+    }
+  };
+  compiler.configure(defaultMeta.config);
+}
+function getMeta(dir) {
+  if (!dir) {
+    if (!defaultMeta) {
+      throw new Error(
+        "@marko/compiler must be installed or compiler registered."
+      );
+    }
+    return defaultMeta;
+  }
+  if (defaultMeta) {
+    try {
+      return loadMeta(dir);
+    } catch {
+      metaByDir.set(dir, defaultMeta);
+      return defaultMeta;
+    }
+  }
+  return loadMeta(dir);
+}
+function loadMeta(dir) {
   let cached = metaByDir.get(dir);
   if (!cached) {
-    const fallback = dir === __dirname;
+    let require2 = createRequire(dir);
+    let configPath;
     try {
-      const require2 = createRequire(dir);
-      const configPath = require2.resolve("@marko/compiler/config");
-      cached = metaByCompiler.get(configPath);
-      if (!cached) {
-        const compiler = require2(path2.join(
-          configPath,
-          ".."
-        ));
-        const config = interopDefault(require2(configPath));
-        cached = {
-          fallback,
-          compiler,
-          config: {
-            ...config,
-            cache: /* @__PURE__ */ new Map(),
-            translator: require2(config.translator)
-          }
-        };
-        compiler.configure(cached.config);
-        metaByCompiler.set(configPath, cached);
-      }
-    } catch (err) {
-      if (fallback)
-        throw err;
-      cached = getMeta();
+      configPath = require2.resolve("@marko/compiler/config");
+    } catch {
+      require2 = createRequire(
+        path2.dirname(require2.resolve("marko/package.json"))
+      );
+      configPath = require2.resolve("@marko/compiler/config");
+    }
+    cached = metaByCompiler.get(configPath);
+    if (!cached) {
+      const compiler = require2(path2.dirname(configPath));
+      const config = interopDefault(require2(configPath));
+      cached = {
+        compiler,
+        config: {
+          ...config,
+          cache: /* @__PURE__ */ new Map(),
+          translator: require2(config.translator)
+        }
+      };
+      compiler.configure(cached.config);
+      metaByCompiler.set(configPath, cached);
     }
     metaByDir.set(dir, cached);
   }
@@ -3060,7 +3096,7 @@ function getTagLookupForProject(meta, dir) {
         ignoreErrors
       );
     } catch {
-      if (!meta.fallback) {
+      if (meta !== defaultMeta) {
         lookup = getTagLookupForProject(getMeta(), dir);
       }
     }

package/dist/util/project.d.ts

@@ -4,7 +4,6 @@ import type { TaglibLookup } from "@marko/babel-utils";
 import type * as Compiler from "@marko/compiler";
 import { ScriptLang } from "../extractors/script";
 export interface Meta {
-    fallback: boolean;
     compiler: typeof Compiler;
     config: Omit<Compiler.Config, "cache" | "translator"> & {
         cache: Map<any, any>;
@@ -78,4 +77,5 @@ export declare function getTypeLibs(rootDir: string, ts: typeof TS, host: TS.Mod
 export declare function getScriptLang(fileName: string, defaultScriptLang: ScriptLang, ts: typeof TS, host: TS.ModuleResolutionHost): ScriptLang;
 export declare function clearCaches(): void;
 export declare function setDefaultTypePaths(defaults: typeof defaultTypeLibs): void;
+export declare function setDefaultCompilerMeta(compiler: typeof Compiler, config: Compiler.Config): void;
 export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/language-tools",
   "description": "Marko Language Tools",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
   "peerDependencies": {
     "@marko/compiler": "^5.28.4"
@@ -15,11 +15,11 @@
   "devDependencies": {
     "@babel/code-frame": "^7.22.5",
     "@marko/compiler": "^5.31.1",
-    "@marko/translator-default": "^5.29.1",
+    "@marko/translator-default": "^5.29.2",
     "@types/babel__code-frame": "^7.0.3",
     "@types/babel__helper-validator-identifier": "^7.15.0",
     "@typescript/vfs": "^1.4.0",
-    "marko": "^5.29.1",
+    "marko": "^5.29.2",
     "mitata": "^0.1.6",
     "tsx": "^3.12.7"
   },