@effect/language-service 0.47.0 → 0.47.2

package/cli.js

@@ -2274,6 +2274,21 @@ var containsWith2 = (isEquivalent) => dual(2, (self, a) => {
 });
 var _equivalence2 = /* @__PURE__ */ equivalence();
 var contains2 = /* @__PURE__ */ containsWith2(_equivalence2);
+var chop = /* @__PURE__ */ dual(2, (self, f) => {
+  const input = fromIterable(self);
+  if (isNonEmptyReadonlyArray(input)) {
+    const [b, rest] = f(input);
+    const out = [b];
+    let next = rest;
+    while (isNonEmptyArray(next)) {
+      const [b2, rest2] = f(next);
+      out.push(b2);
+      next = rest2;
+    }
+    return out;
+  }
+  return [];
+});
 var splitAt = /* @__PURE__ */ dual(2, (self, n) => {
   const input = Array.from(self);
   const _n = Math.floor(n);
@@ -2290,6 +2305,13 @@ var splitNonEmptyAt = /* @__PURE__ */ dual(2, (self, n) => {
   return _n >= self.length ? [copy(self), []] : [prepend(self.slice(1, _n), headNonEmpty(self)), self.slice(_n)];
 });
 var copy = (self) => self.slice();
+var chunksOf = /* @__PURE__ */ dual(2, (self, n) => {
+  const input = fromIterable(self);
+  if (isNonEmptyReadonlyArray(input)) {
+    return chop(input, splitNonEmptyAt(n));
+  }
+  return [];
+});
 var unionWith = /* @__PURE__ */ dual(3, (self, that, isEquivalent) => {
   const a = fromIterable(self);
   const b = fromIterable(that);
@@ -14492,6 +14514,7 @@ var succeed7 = succeed;
 var suspend4 = suspend;
 var sync4 = sync;
 var _void = void_;
+var yieldNow4 = yieldNow;
 var catchAll2 = catchAll;
 var catchAllCause2 = catchAllCause;
 var catchIf2 = catchIf;
@@ -32987,6 +33010,10 @@ var makeKeyBuilder = fn2("KeyBuilder")(
 );
 var keyBuilderCache = /* @__PURE__ */ new Map();
 var getOrMakeKeyBuilder = fn2("getOrMakeKeyBuilder")(function* (sourceFile) {
+  while (keyBuilderCache.size > 5) {
+    const oldest = keyBuilderCache.keys().next().value;
+    if (oldest) keyBuilderCache.delete(oldest);
+  }
   const keyBuilder = keyBuilderCache.get(sourceFile.fileName) || (yield* makeKeyBuilder(sourceFile));
   keyBuilderCache.set(sourceFile.fileName, keyBuilder);
   return keyBuilder;
@@ -35211,86 +35238,103 @@ var project2 = file3("project").pipe(
 var extractEffectLspOptions = (compilerOptions) => {
   return (hasProperty(compilerOptions, "plugins") && isArray(compilerOptions.plugins) ? compilerOptions.plugins : []).find((_) => hasProperty(_, "name") && _.name === "@effect/language-service");
 };
+var BATCH_SIZE = 50;
 var diagnostics2 = make58(
   "diagnostics",
   { file: file4, project: project2 },
   fn("diagnostics")(function* ({ file: file5, project: project3 }) {
     const path2 = yield* Path2;
     const tsInstance = yield* getTypeScript;
-    let filesToCheck = [];
+    const filesToCheck = /* @__PURE__ */ new Set();
     let checkedFilesCount = 0;
     let errorsCount = 0;
     let warningsCount = 0;
     let messagesCount = 0;
-    const { service: service3 } = (0, import_project_service.createProjectService)();
     if (isSome2(file5)) {
-      filesToCheck = [...filesToCheck, ...path2.resolve(file5.value ?? "")];
+      filesToCheck.add(path2.resolve(file5.value));
     }
     if (isSome2(project3)) {
       let tsconfigToHandle = [project3.value ?? ""];
       while (tsconfigToHandle.length > 0) {
         const tsconfigPath = tsconfigToHandle.shift();
-        const configFile = tsInstance.readConfigFile(tsconfigPath, tsInstance.sys.readFile);
-        if (configFile.error) continue;
+        const tsconfigAbsolutePath = path2.resolve(tsconfigPath);
+        const configFile = tsInstance.readConfigFile(tsconfigAbsolutePath, tsInstance.sys.readFile);
+        if (configFile.error) {
+          if (!tsconfigAbsolutePath.endsWith("tsconfig.json")) {
+            tsconfigToHandle = [...tsconfigToHandle, path2.resolve(tsconfigPath, "tsconfig.json")];
+          }
+          continue;
+        }
         const parsedConfig = tsInstance.parseJsonConfigFileContent(
           configFile.config,
           tsInstance.sys,
-          tsInstance.sys.getCurrentDirectory()
+          path2.dirname(tsconfigAbsolutePath)
         );
         tsconfigToHandle = [...tsconfigToHandle, ...parsedConfig.projectReferences?.map((_) => _.path) ?? []];
-        filesToCheck = [...filesToCheck, ...parsedConfig.fileNames];
+        parsedConfig.fileNames.forEach((_) => filesToCheck.add(_));
       }
     }
-    if (filesToCheck.length === 0) {
+    if (filesToCheck.size === 0) {
       return yield* new NoFilesToCheckError();
     }
-    for (const filePath of filesToCheck) {
-      service3.openClientFile(filePath);
-      const scriptInfo = service3.getScriptInfo(filePath);
-      if (!scriptInfo) continue;
-      const project4 = scriptInfo.getDefaultProject();
-      const languageService = project4.getLanguageService(true);
-      const program = languageService.getProgram();
-      if (!program) continue;
-      const sourceFile = program.getSourceFile(filePath);
-      if (!sourceFile) continue;
-      const pluginConfig = extractEffectLspOptions(program.getCompilerOptions());
-      if (!pluginConfig) continue;
-      const results = pipe(
-        getSemanticDiagnosticsWithCodeFixes(diagnostics, sourceFile),
-        nanoLayer3,
-        nanoLayer2,
-        nanoLayer,
-        provideService7(TypeCheckerApi, program.getTypeChecker()),
-        provideService7(TypeScriptProgram, program),
-        provideService7(TypeScriptApi, tsInstance),
-        provideService7(
-          LanguageServicePluginOptions,
-          parse4(pluginConfig)
-        ),
-        run9,
-        map((_) => _.diagnostics),
-        map(
-          map4(
-            (_) => _.category === tsInstance.DiagnosticCategory.Suggestion ? { ..._, category: tsInstance.DiagnosticCategory.Message } : _
-          )
-        ),
-        getOrElse(() => [])
-      );
-      checkedFilesCount++;
-      errorsCount += results.filter((_) => _.category === tsInstance.DiagnosticCategory.Error).length;
-      warningsCount += results.filter((_) => _.category === tsInstance.DiagnosticCategory.Warning).length;
-      messagesCount += results.filter((_) => _.category === tsInstance.DiagnosticCategory.Message).length;
-      if (results.length === 0) continue;
-      const formattedResults = tsInstance.formatDiagnosticsWithColorAndContext(results, {
-        getCanonicalFileName: (fileName) => path2.resolve(fileName),
-        getCurrentDirectory: () => path2.resolve("."),
-        getNewLine: () => "\n"
-      });
-      console.log(formattedResults);
+    const filesToCheckArray = fromIterable(filesToCheck);
+    const batches = chunksOf(filesToCheckArray, BATCH_SIZE);
+    for (const batch of batches) {
+      const { service: service3 } = (0, import_project_service.createProjectService)({ options: { loadTypeScriptPlugins: false } });
+      for (const filePath of batch) {
+        service3.openClientFile(filePath);
+        try {
+          const scriptInfo = service3.getScriptInfo(filePath);
+          if (!scriptInfo) continue;
+          const project4 = scriptInfo.getDefaultProject();
+          const languageService = project4.getLanguageService(true);
+          const program = languageService.getProgram();
+          if (!program) continue;
+          const sourceFile = program.getSourceFile(filePath);
+          if (!sourceFile) continue;
+          const pluginConfig = extractEffectLspOptions(program.getCompilerOptions());
+          if (!pluginConfig) continue;
+          const results = pipe(
+            getSemanticDiagnosticsWithCodeFixes(diagnostics, sourceFile),
+            nanoLayer3,
+            nanoLayer2,
+            nanoLayer,
+            provideService7(TypeCheckerApi, program.getTypeChecker()),
+            provideService7(TypeScriptProgram, program),
+            provideService7(TypeScriptApi, tsInstance),
+            provideService7(
+              LanguageServicePluginOptions,
+              parse4(pluginConfig)
+            ),
+            run9,
+            map((_) => _.diagnostics),
+            map(
+              map4(
+                (_) => _.category === tsInstance.DiagnosticCategory.Suggestion ? { ..._, category: tsInstance.DiagnosticCategory.Message } : _
+              )
+            ),
+            getOrElse(() => [])
+          );
+          checkedFilesCount++;
+          errorsCount += results.filter((_) => _.category === tsInstance.DiagnosticCategory.Error).length;
+          warningsCount += results.filter((_) => _.category === tsInstance.DiagnosticCategory.Warning).length;
+          messagesCount += results.filter((_) => _.category === tsInstance.DiagnosticCategory.Message).length;
+          if (results.length > 0) {
+            const formattedResults = tsInstance.formatDiagnosticsWithColorAndContext(results, {
+              getCanonicalFileName: (fileName) => path2.resolve(fileName),
+              getCurrentDirectory: () => path2.resolve("."),
+              getNewLine: () => "\n"
+            });
+            console.log(formattedResults);
+          }
+        } finally {
+          service3.closeClientFile(filePath);
+        }
+      }
+      yield* yieldNow4();
     }
     console.log(
-      `Checked ${checkedFilesCount} files out of ${filesToCheck.length} files. 
+      `Checked ${checkedFilesCount} files out of ${filesToCheck.size} files. 
 ${errorsCount} errors, ${warningsCount} warnings and ${messagesCount} messages.`
     );
   })