@artel/artc 0.9.26061-pre-release → 0.9.26063-pre-release

package/build/Cli.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import {
   CommandLineCompiler
-} from "./chunk-6UH5JW67.js";
-import "./chunk-ZYVAYG57.js";
+} from "./chunk-AKUYQ3K5.js";
+import "./chunk-2EVZAJOP.js";
 import {
   __async
-} from "./chunk-53U5PFPM.js";
+} from "./chunk-JQN6AIUU.js";
 
 // source/Cli.ts
 function main() {

package/build/api/Api.js

@@ -1,7 +1,7 @@
 import {
   Compiler,
   DiagnosticFormatter
-} from "../chunk-ZYVAYG57.js";
+} from "../chunk-2EVZAJOP.js";
 import {
   AccessKind,
   AccessedFunction_entity,
@@ -257,6 +257,7 @@ import {
   formatString,
   getFileExtension,
   getHelperPhrase,
+  getMemoryUsage,
   getOrCreateKeywordDictionary,
   getOrCreateKeywordKindDictionary,
   getRequiredTypeParameterCount,
@@ -321,7 +322,7 @@ import {
   withoutQuotes,
   withoutTemplateQuotes,
   yieldTask
-} from "../chunk-53U5PFPM.js";
+} from "../chunk-JQN6AIUU.js";
 export {
   AccessKind,
   AccessedFunction_entity,
@@ -577,6 +578,7 @@ export {
   FileSystemTree_exports as fsTree,
   getFileExtension,
   getHelperPhrase,
+  getMemoryUsage,
   getOrCreateKeywordDictionary,
   getOrCreateKeywordKindDictionary,
   getRequiredTypeParameterCount,

package/build/api/ApiNodeJS.js

@@ -6,9 +6,9 @@ import {
   PhysicalFileSystem,
   PhysicalTypeScriptLibrariesProvider,
   PrintingDiagnosticAcceptor
-} from "../chunk-6UH5JW67.js";
-import "../chunk-ZYVAYG57.js";
-import "../chunk-53U5PFPM.js";
+} from "../chunk-AKUYQ3K5.js";
+import "../chunk-2EVZAJOP.js";
+import "../chunk-JQN6AIUU.js";
 export {
   CommandLineCompiler,
   FileSystemUri,

package/build/api/ApiServices.js

@@ -53,6 +53,7 @@ import {
   ParameterDeclaration_matchResultParameter,
   ParameterDeclaration_typeMember,
   ParameterDeclaration_universal,
+  PerformanceMeasurement,
   Position,
   ProgramPackageConfiguration,
   Query,
@@ -93,6 +94,7 @@ import {
   findTag,
   forEachChild,
   forEachChild2,
+  getMemoryUsage,
   getModifierKind,
   getOrCreateKeywordDictionary,
   getOrCreateKeywordDictionary2,
@@ -140,13 +142,15 @@ import {
   modifierKindsInSortOrder,
   operatorKinds,
   operatorKinds2,
+  performanceMeasurementStageNames,
+  performanceMeasurementStages,
   setUserLocale,
   sortModifiers,
   tokenKindByOperatorKind,
   traverseTreeAsync,
   traverseTreeAsync2,
   yieldTask
-} from "../chunk-53U5PFPM.js";
+} from "../chunk-JQN6AIUU.js";
 
 // source/services/common/Types.ts
 import * as ls from "vscode-languageserver";
@@ -182,6 +186,8 @@ var NodeLocation = class {
 import * as ls2 from "vscode-languageserver";
 var CustomRequestType = class extends ls2.RequestType {
 };
+var CustomRequestType0 = class extends ls2.RequestType0 {
+};
 var CustomNotificationType = class extends ls2.NotificationType0 {
 };
 var customRequests = {
@@ -193,7 +199,8 @@ var customRequests = {
   emitCodeToString: new CustomRequestType("artel/emitCodeToString"),
   displayFileSystemTree: new CustomRequestType("artel/displayFileSystemTree"),
   createOrUpdateSourceFile: new CustomRequestType("artel/fs.createOrUpdateSourceFile"),
-  deleteSourceFile: new CustomRequestType("artel/fs.deleteSourceFile")
+  deleteSourceFile: new CustomRequestType("artel/fs.deleteSourceFile"),
+  getMemoryUsage: new CustomRequestType0("artel/getMemoryUsage")
 };
 var customNotifications = {
   sourceFileDialectsChanged: new CustomNotificationType("artel/sourceFileDialectsChanged")
@@ -4189,15 +4196,15 @@ var DefaultSwitchMatchNodeSemanticInfo = class {
 
 // source/services/common/node-semantic-info/NodeSemanticInfoService.ts
 var NodeSemanticInfoService = class {
-  static getBetterReferenceTargetsOrPreserve(_analyzer, info) {
+  static getBetterReferenceTargetsOrPreserve(analyzer, info) {
     const currentTargets = info.betterTargets ?? info.targets;
-    const betterTargets = currentTargets.map((t) => this.getBetterReferenceTargets(t)).filter((t) => t !== void 0).flat();
+    const betterTargets = currentTargets.map((t) => this.getBetterReferenceTargets(analyzer, t)).filter((t) => t !== void 0).flat();
     if (isNonEmptyArray(betterTargets)) {
       return new ReferenceNodeSemanticInfo(info.targets, info.isAmbiguous, betterTargets);
     }
     return info;
   }
-  static getBetterReferenceTargets(original) {
+  static getBetterReferenceTargets(analyzer, original) {
     let result;
     let currentTargets = [original];
     let betterTargets;
@@ -4223,7 +4230,9 @@ var NodeSemanticInfoService = class {
                   let field;
                   const translation = currentTarget.entity.translation;
                   if (translation !== void 0) {
-                    const localizationContext = translation.translationPackage.getLocalizationContext();
+                    const localizationContext = analyzer.getLocalizationContextForPackage(
+                      currentTarget.entity.getContainingPackage()
+                    );
                     field = localizationContext.createLocalizedField(
                       specialVariableInfo.fieldOrBaseConstructorParameter
                     );
@@ -4235,7 +4244,9 @@ var NodeSemanticInfoService = class {
                   let parameter;
                   const translation = currentTarget.entity.translation;
                   if (translation !== void 0) {
-                    const localizationContext = translation.translationPackage.getLocalizationContext();
+                    const localizationContext = analyzer.getLocalizationContextForPackage(
+                      currentTarget.entity.getContainingPackage()
+                    );
                     parameter = localizationContext.createLocalizedParameter(
                       specialVariableInfo.fieldOrBaseConstructorParameter
                     );
@@ -4283,7 +4294,9 @@ var NodeSemanticInfoService = class {
                 let field;
                 const translation = currentTarget.parameter.entity.translation;
                 if (translation !== void 0) {
-                  const localizationContext = translation.translationPackage.getLocalizationContext();
+                  const localizationContext = analyzer.getLocalizationContextForPackage(
+                    currentTarget.parameter.entity.getContainingPackage()
+                  );
                   field = localizationContext.createLocalizedField(
                     specialVariableInfo.fieldOrBaseConstructorParameter
                   );
@@ -4295,7 +4308,9 @@ var NodeSemanticInfoService = class {
                 let parameter;
                 const translation = currentTarget.parameter.entity.translation;
                 if (translation !== void 0) {
-                  const localizationContext = translation.translationPackage.getLocalizationContext();
+                  const localizationContext = analyzer.getLocalizationContextForPackage(
+                    currentTarget.parameter.entity.getContainingPackage()
+                  );
                   parameter = localizationContext.createLocalizedParameter(
                     specialVariableInfo.fieldOrBaseConstructorParameter
                   );
@@ -8233,13 +8248,8 @@ var ReferencesService = class {
         return { name: entity.getName() };
       case 2 /* Type */: {
         switch (entity.typeEntityKind) {
-          case 0 /* Function */: {
-            const naming = entity.getNaming();
-            if (naming.kind === "named") {
-              return { name: naming.value };
-            }
+          case 0 /* Function */:
             return void 0;
-          }
           case 1 /* Structured */: {
             const naming = entity.getNaming();
             if (naming.kind === "named") {
@@ -11392,7 +11402,8 @@ var CompilationController = class extends RxObject2 {
         builtInStandardPackagesUri: this.config.builtInStandardPackagesUri,
         // Включаем логирование только при первой загрузке.
         enableLogging: this.config.enableLogging === true && this.previousCompilationLoadResult === void 0,
-        additionalPackageContents: this.config.additionalPackageContents
+        additionalPackageContents: this.config.additionalPackageContents,
+        performance: new PerformanceMeasurement()
       };
       const currentTransaction = Transaction.current;
       const loadResult = yield runNonReactive(() => __async(this, null, function* () {
@@ -19515,13 +19526,12 @@ var _LanguageServer = class _LanguageServer {
       (params) => this.onCreateOrUpdateSourceFile(params)
     );
     this.disposables.push(disposable);
-    disposable = this.connection.onRequest(
-      customRequests.deleteSourceFile,
-      (params) => this.onDeleteSourceFile(params)
-    );
+    disposable = this.connection.onRequest(customRequests.deleteSourceFile, (params) => this.onDeleteSourceFile(params));
     this.disposables.push(disposable);
     disposable = this.connection.onRequest(customRequests.getSourceFileDialect, (params, token) => this.withTaskController(token, (taskController) => this.onGetSourceFileDialect(params, taskController)));
     this.disposables.push(disposable);
+    disposable = this.connection.onRequest(customRequests.getMemoryUsage, () => this.onGetMemoryUsage());
+    this.disposables.push(disposable);
     this.connection.listen();
   }
   dispose() {
@@ -20238,6 +20248,11 @@ var _LanguageServer = class _LanguageServer {
       return result;
     });
   }
+  onGetMemoryUsage() {
+    return __async(this, null, function* () {
+      return getMemoryUsage();
+    });
+  }
   onEmitCodeToString(params, taskController) {
     return __async(this, null, function* () {
       let compilationControllerUri;
@@ -20266,7 +20281,14 @@ var _LanguageServer = class _LanguageServer {
       if (compilationController.mainCompilationState === void 0) {
         return { hasErrors: true, filesWithErrors: [] };
       }
+      let performance2;
       const compilationState = compilationController.mainCompilationState;
+      if (params.measurePerformance === true) {
+        performance2 = compilationState.analyzer.compilation.performance;
+        performance2?.reset();
+        performance2?.enable();
+        performance2?.markCompilationStart();
+      }
       const filesWithErrors = new Array();
       const trackedSourceFiles = this.workspace.trackedSourceFiles.createItemsSnapshot();
       const packageGraph = new SourcePackageDependencyGraph(compilationState.analyzer);
@@ -20286,6 +20308,7 @@ var _LanguageServer = class _LanguageServer {
         }
       }
       if (hasErrors) {
+        performance2?.disable();
         return { hasErrors, filesWithErrors };
       }
       const options7 = {
@@ -20303,9 +20326,35 @@ var _LanguageServer = class _LanguageServer {
 ${e}`);
         result = { hasErrors: true, filesWithErrors: [] };
       }
+      if (params.measurePerformance === true) {
+        performance2?.markCompilationEnd();
+        performance2?.disable();
+        if (performance2 !== void 0) {
+          const message = this.getPerformanceMeasurementResultMessage(performance2);
+          Logger.info("\n" + message);
+        }
+      }
       return result;
     });
   }
+  getPerformanceMeasurementResultMessage(performance2) {
+    let result = "";
+    for (const stage of performanceMeasurementStages) {
+      if (result !== "") {
+        result += "\n";
+      }
+      const duration = performance2.getDurationMs(stage);
+      result += `${performanceMeasurementStageNames[stage]}: ${duration.toFixed(2)}ms`;
+    }
+    const total = performance2.getTotalCompilationTimeMs();
+    if (total !== -1) {
+      if (result !== "") {
+        result += "\n";
+      }
+      result += `Total: ${total.toFixed(2)}ms`;
+    }
+    return result;
+  }
   onProvideServerOwnedDocumentContent(params, taskController) {
     return __async(this, null, function* () {
       const vscodeUri = URI.parse(params.uri);

package/build/{chunk-ZYVAYG57.js → chunk-2EVZAJOP.js}

@@ -11,7 +11,7 @@ import {
   WellKnownDeclarationsLoadError,
   __async,
   createTsInteropInputsForCompilation
-} from "./chunk-53U5PFPM.js";
+} from "./chunk-JQN6AIUU.js";
 
 // source/diagnostic/DiagnosticFormatter.ts
 var DiagnosticFormatter = class _DiagnosticFormatter {
@@ -150,7 +150,8 @@ var Compiler = class {
         treatRootAsPackageIfConfigIsMissing: true,
         userStandardPackagesUri: options?.userStandardPackagesUri,
         builtInStandardPackagesUri: options?.builtInStandardPackagesUri,
-        enableLogging: options?.enableLogging
+        enableLogging: options?.enableLogging,
+        performance: options?.performance
       };
       const { loadResult } = yield CompilationLoader.loadUsingSourcesProvider(
         projectUri,

package/build/{chunk-6UH5JW67.js → chunk-AKUYQ3K5.js}

@@ -1,7 +1,7 @@
 import {
   Compiler,
   DiagnosticFormatter
-} from "./chunk-ZYVAYG57.js";
+} from "./chunk-2EVZAJOP.js";
 import {
   ArtelVersion,
   Cached,
@@ -16,7 +16,7 @@ import {
   __async,
   performanceMeasurementStageNames,
   performanceMeasurementStages
-} from "./chunk-53U5PFPM.js";
+} from "./chunk-JQN6AIUU.js";
 
 // source/executor/FileSystemUri.ts
 import { platform } from "os";
@@ -251,7 +251,8 @@ var NodeCompiler = class {
         workspaceUri: options?.workspacePath !== void 0 ? FileSystemUri.pathToUri(options.workspacePath) : void 0,
         builtInStandardPackagesUri,
         userStandardPackagesUri: options?.userStandardPackagesPath !== void 0 ? FileSystemUri.pathToUri(options.userStandardPackagesPath) : void 0,
-        enableLogging: options?.enableLogging
+        enableLogging: options?.enableLogging,
+        performance: options?.performance
       };
       return yield Compiler.loadCompilation(
         projectUri,
@@ -292,6 +293,14 @@ var NodeCompiler = class {
     });
   }
   static compile(task) {
+    return __async(this, null, function* () {
+      task.performance?.markCompilationStart();
+      const launchPath = yield this.compileWithoutMeasurement(task);
+      task.performance?.markCompilationEnd();
+      return launchPath;
+    });
+  }
+  static compileWithoutMeasurement(task) {
     return __async(this, null, function* () {
       const inputPaths = {
         projectPath: task.projectPath,
@@ -311,6 +320,9 @@ var NodeCompiler = class {
       if (typeScriptLibrariesProvider === void 0) {
         return void 0;
       }
+      if (task.loadCompilationOptions !== void 0) {
+        task.loadCompilationOptions.performance ??= task.performance;
+      }
       const compilation = yield this.loadCompilation(
         task.projectPath,
         typeScriptLibrariesProvider,
@@ -404,9 +416,8 @@ var CommandLineCompiler = class {
       if (parsedArguments.projectPath === void 0 || parsedArguments.outputPath === void 0) {
         return this.errorExitCode;
       }
-      if (parsedArguments.measurePerformance) {
-        PerformanceMeasurement.isEnabled = true;
-      }
+      const performance = parsedArguments.measurePerformance ? new PerformanceMeasurement() : void 0;
+      performance?.enable();
       try {
         const diagnostics = new PrintingDiagnosticAcceptor(parsedArguments.noWarnings);
         const compilerTask = {
@@ -431,6 +442,7 @@ var CommandLineCompiler = class {
             },
             embedSyntaxNodePaths: parsedArguments.embedSyntaxNodePathsIntoCompiledCode
           },
+          performance,
           controller: new TaskController(-1)
         };
         const launchPath = yield NodeCompiler.compile(compilerTask);
@@ -446,8 +458,8 @@ ${e}
 ${e.stack}`);
         return this.errorExitCode;
       }
-      if (parsedArguments.measurePerformance) {
-        this.displayPerformanceMeasurementResults();
+      if (parsedArguments.measurePerformance && performance !== void 0) {
+        this.displayPerformanceMeasurementResults(performance);
       }
       return this.successExitCode;
     });
@@ -463,11 +475,15 @@ ${e.stack}`);
     console.log("artel start <program folder> <build folder>");
     console.log("artel build <program folder> <build folder>");
   }
-  static displayPerformanceMeasurementResults() {
+  static displayPerformanceMeasurementResults(performance) {
     for (const stage of performanceMeasurementStages) {
-      const duration = PerformanceMeasurement.getDurationMs(stage);
+      const duration = performance.getDurationMs(stage);
       console.log(`${performanceMeasurementStageNames[stage]}: ${duration.toFixed(2)}ms`);
     }
+    const total = performance.getTotalCompilationTimeMs();
+    if (total !== -1) {
+      console.log(`Total: ${total.toFixed(2)}ms`);
+    }
   }
   static execute(launchPath, cwdPath) {
     return __async(this, null, function* () {