@artel/artc 0.6.25215 → 0.6.25216

package/build/Cli.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import {
   CommandLineCompiler
-} from "./chunk-TT3Q66WU.js";
-import "./chunk-GEFYL4SZ.js";
+} from "./chunk-O7AXOZXA.js";
+import "./chunk-6RYP5SET.js";
 import {
   __async
-} from "./chunk-DZ66PBHU.js";
+} from "./chunk-TJG64G2K.js";
 
 // source/Cli.ts
 function main() {

package/build/api/Api.js

@@ -1,6 +1,6 @@
 import {
   Compiler
-} from "../chunk-GEFYL4SZ.js";
+} from "../chunk-6RYP5SET.js";
 import {
   AccessKind,
   AccessedMethodValueParameter,
@@ -346,7 +346,7 @@ import {
   withoutQuotes,
   withoutTextTemplateQuotes,
   yieldExecution
-} from "../chunk-DZ66PBHU.js";
+} from "../chunk-TJG64G2K.js";
 export {
   AccessKind,
   AccessedMethodValueParameter,

package/build/api/ApiNodeJS.js

@@ -6,9 +6,9 @@ import {
   PhysicalFileSystem,
   PhysicalTypeScriptLibrariesProvider,
   PrintingDiagnosticAcceptor
-} from "../chunk-TT3Q66WU.js";
-import "../chunk-GEFYL4SZ.js";
-import "../chunk-DZ66PBHU.js";
+} from "../chunk-O7AXOZXA.js";
+import "../chunk-6RYP5SET.js";
+import "../chunk-TJG64G2K.js";
 export {
   CommandLineCompiler,
   FileSystemUri,

package/build/api/ApiServices.js

@@ -182,7 +182,7 @@ import {
   unwrapParenthesizedExpressions,
   visitChildren,
   yieldExecution
-} from "../chunk-DZ66PBHU.js";
+} from "../chunk-TJG64G2K.js";
 
 // source/services/CustomCommand.ts
 import * as ls from "vscode-languageserver";
@@ -9478,7 +9478,38 @@ var CompilationController = class extends ObservableObject2 {
     );
     const changeKind = checkTsInteropInputsChanged(newTsProgramLoaderInputs, this._tsProgramLoaderInputs);
     if (changeKind === 1 /* DependenciesOrRootUri */) {
-      this._tsInteropInputs = createNewTsInteropInputs(newTsProgramLoaderInputs, this.config.tsLibrariesProvider);
+      let tsInteropInputs;
+      let tsInteropInputsKey;
+      if (this.config.tsInteropInputsCache !== void 0) {
+        const cachedInputsInfo = this.config.tsInteropInputsCache.getTsInteropInputs(
+          newTsProgramLoaderInputs,
+          this.config.tsLibrariesProvider
+        );
+        if (cachedInputsInfo !== void 0) {
+          tsInteropInputs = cachedInputsInfo.inputs;
+          tsInteropInputsKey = cachedInputsInfo.key;
+        }
+      }
+      if (tsInteropInputs === void 0) {
+        tsInteropInputs = createNewTsInteropInputs(newTsProgramLoaderInputs, this.config.tsLibrariesProvider);
+        if (this.config.tsInteropInputsCache !== void 0) {
+          const cachedInputsInfo = this.config.tsInteropInputsCache.getOrAddTsInteropInputs(
+            newTsProgramLoaderInputs,
+            this.config.tsLibrariesProvider,
+            tsInteropInputs
+          );
+          tsInteropInputs = cachedInputsInfo.inputs;
+          tsInteropInputsKey = cachedInputsInfo.key;
+        }
+      }
+      this._tsInteropInputs = tsInteropInputs;
+      if (this.config.tsInteropInputsCache !== void 0) {
+        const previousTsInteropInputsKey = this._tsInteropInputsKey;
+        this._tsInteropInputsKey = tsInteropInputsKey;
+        if (previousTsInteropInputsKey !== void 0 && previousTsInteropInputsKey !== tsInteropInputsKey) {
+          this.config.tsInteropInputsCache.removeTsInteropInputs(previousTsInteropInputsKey);
+        }
+      }
     }
     this._tsProgramLoaderInputs = newTsProgramLoaderInputs;
     function checkTsInteropInputsChanged(newInputs, oldInputs) {
@@ -9759,6 +9790,9 @@ __decorateClass([
 __decorateClass([
   unobservable2
 ], CompilationController.prototype, "_tsInteropInputs", 2);
+__decorateClass([
+  unobservable2
+], CompilationController.prototype, "_tsInteropInputsKey", 2);
 __decorateClass([
   unobservable2
 ], CompilationController.prototype, "_tsProgramLoaderInputs", 2);
@@ -10125,6 +10159,56 @@ var ConfigurationDirectory = class {
     this.packageUri = packageUri;
   }
 };
+var TsInteropInputsCache = class {
+  constructor() {
+    this._inputsByKey = /* @__PURE__ */ new Map();
+  }
+  getTsInteropInputs(tsProgramLoaderInputs, librariesProvider) {
+    const key = this.createKey(tsProgramLoaderInputs, librariesProvider);
+    const inputsInfo = this._inputsByKey.get(key);
+    if (inputsInfo === void 0) {
+      return void 0;
+    }
+    inputsInfo.referenceCount++;
+    return { inputs: inputsInfo.inputs, key };
+  }
+  getOrAddTsInteropInputs(tsProgramLoaderInputs, librariesProvider, inputs) {
+    const key = this.createKey(tsProgramLoaderInputs, librariesProvider);
+    let resultInputs;
+    const resultInputsInfo = this._inputsByKey.get(key);
+    if (resultInputsInfo === void 0) {
+      this._inputsByKey.set(key, { inputs, referenceCount: 1 });
+      resultInputs = inputs;
+    } else {
+      resultInputsInfo.referenceCount++;
+      resultInputs = resultInputsInfo.inputs;
+    }
+    return { inputs: resultInputs, key };
+  }
+  removeTsInteropInputs(key) {
+    const inputsInfo = this._inputsByKey.get(key);
+    if (inputsInfo !== void 0) {
+      inputsInfo.referenceCount--;
+      if (inputsInfo.referenceCount <= 0) {
+        this._inputsByKey.delete(key);
+      }
+    }
+  }
+  // Ключ состоит из имён файлов стандартных библиотек, npm пакетов, модулей, а также путей ко всем доступным
+  // папкам node_modules.
+  createKey(tsProgramLoaderInputs, librariesProvider) {
+    const nodeModulesUris = new Array();
+    let currentDirectoryUri = tsProgramLoaderInputs.tsProjectUri;
+    while (currentDirectoryUri !== void 0) {
+      const nodeModulesUri = currentDirectoryUri.append("node_modules");
+      if (librariesProvider.directoryExistsSync(nodeModulesUri)) {
+        nodeModulesUris.push(nodeModulesUri);
+      }
+      currentDirectoryUri = currentDirectoryUri.parentUri();
+    }
+    return tsProgramLoaderInputs.orderedStandardLibraryNames.join(",") + ";" + tsProgramLoaderInputs.orderedPackageNames.join(",") + ";" + tsProgramLoaderInputs.orderedModuleNames.join(",") + ";" + nodeModulesUris.map((u) => u.toString()).join(",");
+  }
+};
 
 // source/services/workspace/FileSystemTreeProviderBasedOnWatchedFileSystem.ts
 import {
@@ -11141,6 +11225,7 @@ var _Workspace = class _Workspace extends ObservableObject6 {
     this._controllersWithOpenedFiles = new ObservableMap5();
     this._atLeastOneFileOfCompilationHasBeenOpened = false;
     this._standardPackageContents = new Cached();
+    this._tsInteropInputsCache = new TsInteropInputsCache();
     this._config = config;
     this._files = new WorkspaceFiles(config.fileSystemTreeProvider);
   }
@@ -11359,7 +11444,8 @@ var _Workspace = class _Workspace extends ObservableObject6 {
       standardPackagesUri: this._config.standardPackagesUri,
       showErrorMessage: this._config.showErrorMessage,
       builtInStandardPackagesUri: this._config.builtInStandardPackagesUri,
-      additionalPackageContents: this._config.additionalPackageContents
+      additionalPackageContents: this._config.additionalPackageContents,
+      tsInteropInputsCache: this._tsInteropInputsCache
     };
     return new CompilationController(config);
   }
@@ -11417,6 +11503,9 @@ __decorateClass([
 __decorateClass([
   unobservable6
 ], _Workspace.prototype, "_standardPackageContents", 2);
+__decorateClass([
+  unobservable6
+], _Workspace.prototype, "_tsInteropInputsCache", 2);
 __decorateClass([
   cached
 ], _Workspace.prototype, "compilationControllerByUri", 1);

package/build/{chunk-GEFYL4SZ.js → chunk-6RYP5SET.js}

@@ -10,7 +10,7 @@ import {
   WellKnownDeclarationsLoadError,
   __async,
   createTsInteropInputsForCompilation
-} from "./chunk-DZ66PBHU.js";
+} from "./chunk-TJG64G2K.js";
 
 // source/executor/Compiler.ts
 var Compiler = class {

package/build/{chunk-TT3Q66WU.js → chunk-O7AXOZXA.js}

@@ -1,6 +1,6 @@
 import {
   Compiler
-} from "./chunk-GEFYL4SZ.js";
+} from "./chunk-6RYP5SET.js";
 import {
   ArtelVersion,
   Cached,
@@ -14,7 +14,7 @@ import {
   __async,
   performanceMeasurementStageNames,
   performanceMeasurementStages
-} from "./chunk-DZ66PBHU.js";
+} from "./chunk-TJG64G2K.js";
 
 // source/executor/FileSystemUri.ts
 import { platform } from "os";

package/build/{chunk-DZ66PBHU.js → chunk-TJG64G2K.js}

@@ -577,7 +577,7 @@ var UniqueWithComparatorQuery = class extends Query {
 };
 
 // source/common/Constants.ts
-var ArtelVersion = true ? "0.6.25215" : "";
+var ArtelVersion = true ? "0.6.25216" : "";
 var ArtelSourceFileExtensions = [".\u0430\u0440\u0442", ".\u0430\u0440\u0442\u0435\u043B\u044C", ".art", ".artel"];
 var ArtelSourceFileExtensionSet = new Set(ArtelSourceFileExtensions);
 var ArtelSourceAndConfigurationFileExtensionSet = new Set(ArtelSourceFileExtensionSet).add(".json");

package/build/types/services/workspace/CompilationController.d.ts

@@ -1,5 +1,5 @@
 import { Indicator, ObservableObject } from 'reactronic';
-import { Analyzer } from '../../analysis/index.js';
+import { Analyzer, TsInteropInputs } from '../../analysis/index.js';
 import { CancellationToken, Uri } from '../../common/index.js';
 import { Diagnostic } from '../../diagnostic/Diagnostic.js';
 import { ConvertedConfiguration, ProgramPackageConfiguration, SourceFile, fsTree } from '../../project/index.js';
@@ -23,6 +23,7 @@ export declare class CompilationController extends ObservableObject {
     private _packageConfigurationsVersion;
     private _packageConfigurationsVersionDuringCompilationLoad;
     private _tsInteropInputs;
+    private _tsInteropInputsKey;
     private _tsProgramLoaderInputs;
     private _state;
     private _configurationsOfPackagesOutsideProject;
@@ -61,6 +62,7 @@ export interface CompilationControllerConfig {
     readonly showErrorMessage?: (message: string) => Promise<void>;
     readonly builtInStandardPackagesUri?: Uri;
     readonly additionalPackageContents?: readonly PackageContent[];
+    readonly tsInteropInputsCache?: TsInteropInputsCache;
 }
 export declare enum CompilationControllerState {
     Created = 0,
@@ -69,6 +71,13 @@ export declare enum CompilationControllerState {
     LoadedMainCompilation = 3,
     ErrorsCreatingAnalyzer = 4
 }
+declare class TsProgramLoaderInputs {
+    readonly orderedStandardLibraryNames: readonly string[];
+    readonly orderedPackageNames: readonly string[];
+    readonly orderedModuleNames: readonly string[];
+    readonly tsProjectUri: Uri;
+    constructor(orderedStandardLibraryNames: readonly string[], orderedPackageNames: readonly string[], orderedModuleNames: readonly string[], tsProjectUri: Uri);
+}
 export type DiagnosticsCollectedInBackgroundHandler = (sourceFile: SourceFile, trackedVersion: number | undefined, diagnostics: readonly Diagnostic[], compilationVersion: number, controller: CompilationController) => Promise<void>;
 export type RawPackageConfigurationsChangedHandler = (configurations: readonly ChangedPackageConfiguration[]) => Promise<void>;
 export declare class ChangedPackageConfiguration {
@@ -108,4 +117,17 @@ declare class ConfigurationController extends ObservableObject {
     protected updateJsonConfigurationFile(): void;
     protected processConfiguration(): Promise<void>;
 }
+export declare class TsInteropInputsCache {
+    private readonly _inputsByKey;
+    getTsInteropInputs(tsProgramLoaderInputs: TsProgramLoaderInputs, librariesProvider: TypeScriptLibrariesProvider): {
+        inputs: TsInteropInputs;
+        key: string;
+    } | undefined;
+    getOrAddTsInteropInputs(tsProgramLoaderInputs: TsProgramLoaderInputs, librariesProvider: TypeScriptLibrariesProvider, inputs: TsInteropInputs): {
+        inputs: TsInteropInputs;
+        key: string;
+    };
+    removeTsInteropInputs(key: string): void;
+    private createKey;
+}
 export {};

package/build/types/services/workspace/Workspace.d.ts

@@ -16,6 +16,7 @@ export declare class Workspace extends ObservableObject {
     private _atLeastOneFileOfCompilationHasBeenOpened;
     private readonly _files;
     private _standardPackageContents;
+    private readonly _tsInteropInputsCache;
     get compilationControllers(): readonly CompilationController[];
     get trackedSourceFiles(): ReadonlyClientTrackedSourceFiles;
     get loadedWorkspaceFolderByUri(): ObservableMap<string, fsTree.Directory>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@artel/artc",
-  "version": "0.6.25215",
+  "version": "0.6.25216",
   "description": "Артель Компилятор | Artel Compiler",
   "author": "Nezaboodka Team <contact@nezaboodka.com>",
   "license": "LGPL-3.0-or-later",