@marko/language-tools 2.0.0 → 2.0.1

package/dist/index.js

@@ -2887,7 +2887,8 @@ __export(project_exports, {
   getConfig: () => getConfig,
   getScriptLang: () => getScriptLang,
   getTagLookup: () => getTagLookup,
-  getTypeLibs: () => getTypeLibs
+  getTypeLibs: () => getTypeLibs,
+  setDefaultTypePaths: () => setDefaultTypePaths
 });
 var import_path2 = __toESM(require("path"));
 var import_module = require("module");
@@ -2895,6 +2896,7 @@ 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();
@@ -2951,8 +2953,8 @@ function getTypeLibs(rootDir, ts, host) {
     resolveTypeCompilerOptions,
     host
   );
-  const internalTypesFile = resolvedInternalTypes == null ? void 0 : resolvedInternalTypes.resolvedFileName;
-  const markoTypesFile = resolvedMarkoTypes == null ? void 0 : resolvedMarkoTypes.resolvedFileName;
+  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) {
     throw new Error("Could not resolve marko type files.");
@@ -2977,7 +2979,11 @@ function getScriptLang(fileName, defaultScriptLang, ts, host) {
   const cache = config.cache.get(getScriptLang);
   let scriptLang = cache == null ? void 0 : cache.get(dir);
   if (!scriptLang) {
-    const configPath = ts.findConfigFile(dir, host.fileExists, "marko.json");
+    const configPath = ts.findConfigFile(
+      dir,
+      host.fileExists.bind(host),
+      "marko.json"
+    );
     if (configPath) {
       try {
         const configSource = host.readFile(configPath);
@@ -3010,6 +3016,9 @@ function clearCaches() {
     clearCacheForMeta(project);
   }
 }
+function setDefaultTypePaths(defaults) {
+  Object.assign(defaultTypeLibs, defaults);
+}
 function getMeta(dir) {
   if (!dir)
     return defaultMeta;

package/dist/index.mjs

@@ -2856,7 +2856,8 @@ __export(project_exports, {
   getConfig: () => getConfig,
   getScriptLang: () => getScriptLang,
   getTagLookup: () => getTagLookup,
-  getTypeLibs: () => getTypeLibs
+  getTypeLibs: () => getTypeLibs,
+  setDefaultTypePaths: () => setDefaultTypePaths
 });
 import path2 from "path";
 import { createRequire } from "module";
@@ -2864,6 +2865,7 @@ 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();
@@ -2920,8 +2922,8 @@ function getTypeLibs(rootDir, ts, host) {
     resolveTypeCompilerOptions,
     host
   );
-  const internalTypesFile = resolvedInternalTypes == null ? void 0 : resolvedInternalTypes.resolvedFileName;
-  const markoTypesFile = resolvedMarkoTypes == null ? void 0 : resolvedMarkoTypes.resolvedFileName;
+  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) {
     throw new Error("Could not resolve marko type files.");
@@ -2946,7 +2948,11 @@ function getScriptLang(fileName, defaultScriptLang, ts, host) {
   const cache = config.cache.get(getScriptLang);
   let scriptLang = cache == null ? void 0 : cache.get(dir);
   if (!scriptLang) {
-    const configPath = ts.findConfigFile(dir, host.fileExists, "marko.json");
+    const configPath = ts.findConfigFile(
+      dir,
+      host.fileExists.bind(host),
+      "marko.json"
+    );
     if (configPath) {
       try {
         const configSource = host.readFile(configPath);
@@ -2979,6 +2985,9 @@ function clearCaches() {
     clearCacheForMeta(project);
   }
 }
+function setDefaultTypePaths(defaults) {
+  Object.assign(defaultTypeLibs, defaults);
+}
 function getMeta(dir) {
   if (!dir)
     return defaultMeta;

package/dist/util/project.d.ts

@@ -13,6 +13,14 @@ export interface Meta {
         };
     };
 }
+interface TypeLibs {
+    internalTypesFile: string | undefined;
+    markoRunTypesFile: string | undefined;
+    markoRunGeneratedTypesFile: string | undefined;
+    markoTypesFile: string | undefined;
+    markoTypesCode: string | undefined;
+}
+declare const defaultTypeLibs: Partial<TypeLibs>;
 export declare function getCompiler(dir?: string): typeof defaultCompiler;
 export declare function getCache(dir?: string): Map<any, any>;
 export declare function getConfig(dir?: string): Omit<{
@@ -66,3 +74,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 {};

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@marko/language-tools",
   "description": "Marko Language Tools",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "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.3",
+    "@babel/parser": "^7.21.4",
     "@marko/compiler": "5.27.4",
     "@marko/translator-default": "5.25.4",
     "htmljs-parser": "^5.4.3",
     "relative-import-path": "^1.0.0"
   },
   "devDependencies": {
-    "@babel/code-frame": "^7.18.6",
+    "@babel/code-frame": "^7.21.4",
     "@marko/compiler": "^5.27.4",
     "@types/babel__code-frame": "^7.0.3",
     "@types/babel__helper-validator-identifier": "^7.15.0",