@marko/language-server 1.0.7 → 1.0.9

package/dist/index.mjs

@@ -13,7 +13,7 @@ import {
   TextDocumentSyncKind,
   createConnection
 } from "vscode-languageserver/node";
-import { Project as Project4 } from "@marko/language-tools";
+import { Project as Project5 } from "@marko/language-tools";
 
 // src/utils/file.ts
 import path from "path";
@@ -1177,7 +1177,7 @@ import { URI as URI6 } from "vscode-uri";
 import * as prettier2 from "prettier";
 import {
   NodeType as NodeType9,
-  Project as Project3,
+  Project as Project4,
   ScriptLang,
   extractScript
 } from "@marko/language-tools";
@@ -1186,11 +1186,16 @@ import {
 import path6 from "path";
 import {
   Processors,
+  Project as Project3,
   getExt,
   isDefinitionFile
 } from "@marko/language-tools";
 var fsPathReg = /^(?:[./\\]|[A-Z]:)/i;
 var modulePartsReg = /^((?:@(?:[^/]+)\/)?(?:[^/]+))(.*)$/;
+Project3.setDefaultTypePaths({
+  internalTypesFile: path6.join(__dirname, "marko.internal.d.ts"),
+  markoTypesFile: path6.join(__dirname, "marko.runtime.d.ts")
+});
 function patch(ts2, configFile, extractCache2, resolutionCache, host, ps) {
   var _a, _b, _c;
   const processors = Processors.create({
@@ -1202,6 +1207,17 @@ function patch(ts2, configFile, extractCache2, resolutionCache, host, ps) {
     var _a2;
     return (_a2 = processor.getRootNames) == null ? void 0 : _a2.call(processor);
   }).flat().filter(Boolean);
+  const trackFile = ps ? (fileName) => {
+    ps.getOrCreateScriptInfoForNormalizedPath(
+      fileName,
+      true,
+      void 0,
+      ts2.ScriptKind.Deferred,
+      false,
+      host
+    );
+  } : () => {
+  };
   const getScriptFileNames = host.getScriptFileNames.bind(host);
   host.getScriptFileNames = () => [
     ...new Set(rootNames.concat(getScriptFileNames()))
@@ -1228,14 +1244,7 @@ function patch(ts2, configFile, extractCache2, resolutionCache, host, ps) {
         } catch {
           cached = { snapshot: ts2.ScriptSnapshot.fromString("") };
         }
-        ps == null ? void 0 : ps.getOrCreateScriptInfoForNormalizedPath(
-          fileName,
-          false,
-          void 0,
-          ts2.ScriptKind.Deferred,
-          false,
-          host
-        );
+        trackFile(fileName);
         extractCache2.set(fileName, cached);
       }
       return cached.snapshot;
@@ -1269,7 +1278,8 @@ function patch(ts2, configFile, extractCache2, resolutionCache, host, ps) {
       let normalModuleLiterals = moduleLiterals;
       let resolvedModules;
       for (let i = 0; i < moduleLiterals.length; i++) {
-        const moduleName = moduleLiterals[i].text;
+        const moduleLiteral = moduleLiterals[i];
+        const moduleName = moduleLiteral.text;
         const processor = moduleName[0] !== "*" ? getProcessor(moduleName) : void 0;
         if (processor) {
           let resolvedFileName;
@@ -1327,6 +1337,7 @@ function patch(ts2, configFile, extractCache2, resolutionCache, host, ps) {
           });
         } else if (resolvedModules) {
           resolvedModules.push(void 0);
+          normalModuleLiterals.push(moduleLiteral);
         }
       }
       const normalResolvedModules = normalModuleLiterals.length ? resolveModuleNameLiterals(
@@ -1409,7 +1420,7 @@ var ScriptService = {
         return;
       const tsProject = getTSProject(filename);
       const extracted = processScript(doc, tsProject);
-      const lang = Project3.getScriptLang(
+      const lang = Project4.getScriptLang(
         filename,
         tsProject.markoScriptLang,
         ts,
@@ -1793,8 +1804,8 @@ function processScript(doc, tsProject) {
       ts,
       parsed,
       lookup,
-      scriptLang: Project3.getScriptLang(filename, markoScriptLang, ts, host),
-      runtimeTypesCode: (_a = Project3.getTypeLibs(tsProject.rootDir, ts, host)) == null ? void 0 : _a.markoTypesCode
+      scriptLang: Project4.getScriptLang(filename, markoScriptLang, ts, host),
+      runtimeTypesCode: (_a = Project4.getTypeLibs(tsProject.rootDir, ts, host)) == null ? void 0 : _a.markoTypesCode
     });
   });
 }
@@ -1866,7 +1877,7 @@ function getTSProject(docFsPath) {
     }
   }
   const rootDir = configFile && path7.dirname(configFile) || process.cwd();
-  const cache = Project3.getCache(configFile && rootDir);
+  const cache = Project4.getCache(configFile && rootDir);
   let projectCache = cache.get(getTSProject);
   let cached;
   if (projectCache) {
@@ -3046,7 +3057,7 @@ for (const command in service.commands) {
 }
 function validateDocs() {
   queueDiagnostic();
-  Project4.clearCaches();
+  Project5.clearCaches();
 }
 function queueDiagnostic() {
   clearTimeout(diagnosticTimeout);