@marko/language-tools 2.1.0 → 2.1.1

package/dist/index.js

@@ -2932,24 +2932,12 @@ __export(project_exports, {
 });
 var import_path2 = __toESM(require("path"));
 var import_module = require("module");
-var defaultCompiler = __toESM(require("@marko/compiler"));
-var defaultConfig = __toESM(require("@marko/compiler/config"));
-var defaultTranslator = __toESM(require("@marko/translator-default"));
 var import_strip_json_comments = __toESM(require("strip-json-comments"));
 var defaultTypeLibs = {};
 var ignoreErrors = (_err) => {
 };
 var metaByDir = /* @__PURE__ */ new Map();
 var metaByCompiler = /* @__PURE__ */ new Map();
-var defaultMeta = {
-  compiler: defaultCompiler,
-  config: {
-    ...defaultConfig,
-    cache: /* @__PURE__ */ new Map(),
-    translator: defaultTranslator
-  }
-};
-defaultCompiler.configure(defaultMeta.config);
 function getCompiler(dir) {
   return getMeta(dir).compiler;
 }
@@ -3051,7 +3039,6 @@ function getScriptLang(fileName, defaultScriptLang, ts, host) {
   return scriptLang;
 }
 function clearCaches() {
-  clearCacheForMeta(defaultMeta);
   for (const project of metaByCompiler.values()) {
     clearCacheForMeta(project);
   }
@@ -3059,24 +3046,22 @@ function clearCaches() {
 function setDefaultTypePaths(defaults) {
   Object.assign(defaultTypeLibs, defaults);
 }
-function getMeta(dir) {
-  if (!dir)
-    return defaultMeta;
+function getMeta(dir = __dirname) {
   let cached = metaByDir.get(dir);
   if (!cached) {
+    const fallback = dir === __dirname;
     try {
       const require2 = (0, import_module.createRequire)(dir);
-      const compilerConfigPath = require2.resolve("@marko/compiler/config");
-      cached = metaByCompiler.get(compilerConfigPath);
+      const configPath = require2.resolve("@marko/compiler/config");
+      cached = metaByCompiler.get(configPath);
       if (!cached) {
         const compiler = require2(import_path2.default.join(
-          compilerConfigPath,
+          configPath,
           ".."
         ));
-        const config = interopDefault(
-          require2(compilerConfigPath)
-        );
+        const config = interopDefault(require2(configPath));
         cached = {
+          fallback,
           compiler,
           config: {
             ...config,
@@ -3085,10 +3070,12 @@ function getMeta(dir) {
           }
         };
         compiler.configure(cached.config);
-        metaByCompiler.set(compilerConfigPath, cached);
+        metaByCompiler.set(configPath, cached);
       }
-    } catch {
-      cached = defaultMeta;
+    } catch (err) {
+      if (fallback)
+        throw err;
+      cached = getMeta();
     }
     metaByDir.set(dir, cached);
   }
@@ -3105,8 +3092,8 @@ function getTagLookupForProject(meta, dir) {
         ignoreErrors
       );
     } catch {
-      if (meta !== defaultMeta) {
-        lookup = getTagLookupForProject(defaultMeta, dir);
+      if (!meta.fallback) {
+        lookup = getTagLookupForProject(getMeta(), dir);
       }
     }
     if (cache) {

package/dist/index.mjs

@@ -2900,24 +2900,12 @@ __export(project_exports, {
 });
 import path2 from "path";
 import { createRequire } from "module";
-import * as defaultCompiler from "@marko/compiler";
-import * as defaultConfig from "@marko/compiler/config";
-import * as defaultTranslator from "@marko/translator-default";
 import stripJSONComments from "strip-json-comments";
 var defaultTypeLibs = {};
 var ignoreErrors = (_err) => {
 };
 var metaByDir = /* @__PURE__ */ new Map();
 var metaByCompiler = /* @__PURE__ */ new Map();
-var defaultMeta = {
-  compiler: defaultCompiler,
-  config: {
-    ...defaultConfig,
-    cache: /* @__PURE__ */ new Map(),
-    translator: defaultTranslator
-  }
-};
-defaultCompiler.configure(defaultMeta.config);
 function getCompiler(dir) {
   return getMeta(dir).compiler;
 }
@@ -3019,7 +3007,6 @@ function getScriptLang(fileName, defaultScriptLang, ts, host) {
   return scriptLang;
 }
 function clearCaches() {
-  clearCacheForMeta(defaultMeta);
   for (const project of metaByCompiler.values()) {
     clearCacheForMeta(project);
   }
@@ -3027,24 +3014,22 @@ function clearCaches() {
 function setDefaultTypePaths(defaults) {
   Object.assign(defaultTypeLibs, defaults);
 }
-function getMeta(dir) {
-  if (!dir)
-    return defaultMeta;
+function getMeta(dir = __dirname) {
   let cached = metaByDir.get(dir);
   if (!cached) {
+    const fallback = dir === __dirname;
     try {
       const require2 = createRequire(dir);
-      const compilerConfigPath = require2.resolve("@marko/compiler/config");
-      cached = metaByCompiler.get(compilerConfigPath);
+      const configPath = require2.resolve("@marko/compiler/config");
+      cached = metaByCompiler.get(configPath);
       if (!cached) {
         const compiler = require2(path2.join(
-          compilerConfigPath,
+          configPath,
           ".."
         ));
-        const config = interopDefault(
-          require2(compilerConfigPath)
-        );
+        const config = interopDefault(require2(configPath));
         cached = {
+          fallback,
           compiler,
           config: {
             ...config,
@@ -3053,10 +3038,12 @@ function getMeta(dir) {
           }
         };
         compiler.configure(cached.config);
-        metaByCompiler.set(compilerConfigPath, cached);
+        metaByCompiler.set(configPath, cached);
       }
-    } catch {
-      cached = defaultMeta;
+    } catch (err) {
+      if (fallback)
+        throw err;
+      cached = getMeta();
     }
     metaByDir.set(dir, cached);
   }
@@ -3073,8 +3060,8 @@ function getTagLookupForProject(meta, dir) {
         ignoreErrors
       );
     } catch {
-      if (meta !== defaultMeta) {
-        lookup = getTagLookupForProject(defaultMeta, dir);
+      if (!meta.fallback) {
+        lookup = getTagLookupForProject(getMeta(), dir);
       }
     }
     if (cache) {

package/dist/util/project.d.ts

@@ -1,11 +1,12 @@
 /// <reference types="node" />
 import type TS from "typescript/lib/tsserverlibrary";
 import type { TaglibLookup } from "@marko/babel-utils";
-import * as defaultCompiler from "@marko/compiler";
+import type * as Compiler from "@marko/compiler";
 import { ScriptLang } from "../extractors/script";
 export interface Meta {
-    compiler: typeof defaultCompiler;
-    config: Omit<defaultCompiler.Config, "cache" | "translator"> & {
+    fallback: boolean;
+    compiler: typeof Compiler;
+    config: Omit<Compiler.Config, "cache" | "translator"> & {
         cache: Map<any, any>;
         translator: {
             runtimeTypes?: string;
@@ -21,7 +22,7 @@ interface TypeLibs {
     markoTypesCode: string | undefined;
 }
 declare const defaultTypeLibs: Partial<TypeLibs>;
-export declare function getCompiler(dir?: string): typeof defaultCompiler;
+export declare function getCompiler(dir?: string): typeof Compiler;
 export declare function getCache(dir?: string): Map<any, any>;
 export declare function getConfig(dir?: string): Omit<{
     output?: "source" | "html" | "dom" | "hydrate" | "migrate" | undefined;

package/package.json

@@ -1,23 +1,25 @@
 {
   "name": "@marko/language-tools",
   "description": "Marko Language Tools",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
+  "peerDependencies": {
+    "@marko/compiler": "^5.28.4"
+  },
   "dependencies": {
     "@babel/helper-validator-identifier": "^7.22.5",
-    "@babel/parser": "^7.22.5",
-    "@marko/compiler": "5.28.4",
-    "@marko/translator-default": "5.26.5",
+    "@babel/parser": "^7.22.7",
     "htmljs-parser": "^5.5.0",
     "relative-import-path": "^1.0.0"
   },
   "devDependencies": {
     "@babel/code-frame": "^7.22.5",
-    "@marko/compiler": "^5.28.5",
+    "@marko/compiler": "^5.31.1",
+    "@marko/translator-default": "^5.29.1",
     "@types/babel__code-frame": "^7.0.3",
     "@types/babel__helper-validator-identifier": "^7.15.0",
     "@typescript/vfs": "^1.4.0",
-    "marko": "^5.26.5",
+    "marko": "^5.29.1",
     "mitata": "^0.1.6",
     "tsx": "^3.12.7"
   },