@marko/language-tools 2.1.2 → 2.1.4

package/dist/index.js

@@ -3075,31 +3075,35 @@ function getMeta(dir) {
     }
     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) {
-    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 = {
-          compiler,
-          config: {
-            ...config,
-            cache: /* @__PURE__ */ new Map(),
-            translator: require2(config.translator)
-          }
-        };
-        compiler.configure(cached.config);
-        metaByCompiler.set(configPath, cached);
-      }
-    } catch (err) {
-      cached = getMeta();
+    const require2 = (0, import_module.createRequire)(import_path2.default.join(dir, "_.js"));
+    const 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);
   }

package/dist/index.mjs

@@ -3043,31 +3043,35 @@ function getMeta(dir) {
     }
     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) {
-    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 = {
-          compiler,
-          config: {
-            ...config,
-            cache: /* @__PURE__ */ new Map(),
-            translator: require2(config.translator)
-          }
-        };
-        compiler.configure(cached.config);
-        metaByCompiler.set(configPath, cached);
-      }
-    } catch (err) {
-      cached = getMeta();
+    const require2 = createRequire(path2.join(dir, "_.js"));
+    const 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);
   }

package/dist/util/project.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type TS from "typescript/lib/tsserverlibrary";
 import type { TaglibLookup } from "@marko/babel-utils";
 import type * as Compiler from "@marko/compiler";
@@ -23,43 +22,7 @@ interface TypeLibs {
 declare const defaultTypeLibs: Partial<TypeLibs>;
 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;
-    errorRecovery?: boolean | undefined;
-    applyFixes?: Map<number, unknown> | undefined;
-    stripTypes?: boolean | undefined;
-    runtimeId?: string | null | undefined;
-    ast?: boolean | undefined;
-    code?: boolean | undefined;
-    writeVersionComment?: boolean | undefined;
-    ignoreUnrecognizedTags?: boolean | undefined;
-    sourceMaps?: boolean | "inline" | "both" | undefined;
-    translator?: any;
-    fileSystem?: typeof import("fs") | undefined;
-    modules?: "esm" | "cjs" | undefined;
-    resolveVirtualDependency?: ((filename: string, dep: {
-        virtualPath: string;
-        code: string;
-        map?: any;
-    }) => string) | null | undefined;
-    hydrateIncludeImports?: RegExp | ((request: string) => boolean) | undefined;
-    optimize?: boolean | undefined;
-    cache?: Map<unknown, unknown> | undefined;
-    hot?: boolean | undefined;
-    meta?: boolean | undefined;
-    babelConfig?: {
-        [x: string]: unknown;
-        ast?: boolean | null | undefined;
-        code?: boolean | null | undefined;
-        comments?: boolean | null | undefined;
-        compact?: boolean | "auto" | null | undefined;
-        caller?: {
-            [x: string]: unknown;
-            name?: string | undefined;
-        } | undefined;
-        minified?: boolean | null | undefined;
-    } | undefined;
-}, "cache" | "translator"> & {
+export declare function getConfig(dir?: string): Omit<Compiler.Config, "cache" | "translator"> & {
     cache: Map<any, any>;
     translator: {
         [x: string]: unknown;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/language-tools",
   "description": "Marko Language Tools",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
   "peerDependencies": {
     "@marko/compiler": "^5.28.4"
@@ -14,11 +14,11 @@
   },
   "devDependencies": {
     "@babel/code-frame": "^7.22.5",
-    "@marko/compiler": "^5.31.1",
+    "@marko/compiler": "^5.31.2",
     "@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",
+    "@typescript/vfs": "^1.5.0",
     "marko": "^5.29.2",
     "mitata": "^0.1.6",
     "tsx": "^3.12.7"