@artel/artc 0.6.25191 → 0.6.25192

package/build/Cli.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import {
   CommandLineCompiler
-} from "./chunk-BQHCAH6D.js";
-import "./chunk-QRBDQKYM.js";
+} from "./chunk-C76RSUHL.js";
+import "./chunk-YBBE3UAB.js";
 import {
   __async
-} from "./chunk-O2JKESUU.js";
+} from "./chunk-JCOXBBRE.js";
 
 // source/Cli.ts
 function main() {

package/build/api/Api.js

@@ -1,6 +1,6 @@
 import {
   Compiler
-} from "../chunk-QRBDQKYM.js";
+} from "../chunk-YBBE3UAB.js";
 import {
   AccessKind,
   AccessedMethodValueParameter,
@@ -330,7 +330,7 @@ import {
   visitChildrenRecursively,
   withoutQuotes,
   yieldExecution
-} from "../chunk-O2JKESUU.js";
+} from "../chunk-JCOXBBRE.js";
 export {
   AccessKind,
   AccessedMethodValueParameter,

package/build/api/ApiNodeJS.js

@@ -6,9 +6,9 @@ import {
   PhysicalFileSystem,
   PhysicalTypeScriptLibrariesProvider,
   PrintingDiagnosticAcceptor
-} from "../chunk-BQHCAH6D.js";
-import "../chunk-QRBDQKYM.js";
-import "../chunk-O2JKESUU.js";
+} from "../chunk-C76RSUHL.js";
+import "../chunk-YBBE3UAB.js";
+import "../chunk-JCOXBBRE.js";
 export {
   CommandLineCompiler,
   FileSystemUri,

package/build/api/ApiServices.js

@@ -182,7 +182,7 @@ import {
   unwrapParenthesizedExpressions,
   visitChildren,
   yieldExecution
-} from "../chunk-O2JKESUU.js";
+} from "../chunk-JCOXBBRE.js";
 
 // source/services/CustomCommand.ts
 import * as ls from "vscode-languageserver";
@@ -267,7 +267,7 @@ function cast(value) {
 }
 
 // source/services/LanguageServer.ts
-import { atomicAction as atomicAction7 } from "reactronic";
+import { atomicRun as atomicRun3, atomic as atomic6 } from "reactronic";
 import * as ls2 from "vscode-languageserver";
 import { TextDocument } from "vscode-languageserver-textdocument";
 import { URI as URI2, Utils } from "vscode-uri";
@@ -1482,7 +1482,7 @@ var CompletionService = class {
       kinds.add(43 /* As */).add(13 /* Is */).add(19 /* And */).add(20 /* Or */).add(21 /* Xor */).add(26 /* When */);
     }
     if (this.isModifierLevelContext(positionDescription)) {
-      kinds.add(53 /* InType */).add(50 /* InFamily */).add(51 /* InFile */).add(52 /* InPackage */);
+      kinds.add(53 /* InType */).add(50 /* InHierarchy */).add(51 /* InFile */).add(52 /* InPackage */);
     }
     if (this.isRepeatWhileKeywordContext(positionDescription)) {
       kinds.add(24 /* RepeatWhile */);
@@ -6698,7 +6698,7 @@ var SignatureInfo = class {
 };
 
 // source/services/source-generation/SourceGenerationService.ts
-import { ObservableMap as ObservableMap6, ObservableObject as ObservableObject7, Transaction as Transaction4, atomicAction as atomicAction6, reactiveProcess as reactiveProcess6 } from "reactronic";
+import { ObservableMap as ObservableMap6, ObservableObject as ObservableObject7, Transaction as Transaction4, atomicRun as atomicRun2, reactive as reactive6 } from "reactronic";
 
 // source/tree/green/SyntaxToCode.ts
 var SyntaxToCode = class _SyntaxToCode {
@@ -7774,7 +7774,7 @@ var modifierSortOrder = {
 };
 
 // source/services/workspace/ClientTrackedSourceFiles.ts
-import { ObservableMap, ObservableObject, unobservable, ReactiveSystem, atomicAction } from "reactronic";
+import { ObservableMap, ObservableObject, unobservable, ReactiveSystem, atomic } from "reactronic";
 var ClientTrackedSourceFiles = class extends ObservableObject {
   constructor() {
     super(...arguments);
@@ -7831,16 +7831,16 @@ var ClientTrackedSourceFiles = class extends ObservableObject {
   }
 };
 __decorateClass([
-  atomicAction
+  atomic
 ], ClientTrackedSourceFiles.prototype, "track", 1);
 __decorateClass([
-  atomicAction
+  atomic
 ], ClientTrackedSourceFiles.prototype, "update", 1);
 __decorateClass([
-  atomicAction
+  atomic
 ], ClientTrackedSourceFiles.prototype, "save", 1);
 __decorateClass([
-  atomicAction
+  atomic
 ], ClientTrackedSourceFiles.prototype, "close", 1);
 var ClientTrackedSourceFile = class extends ObservableObject {
   constructor(uri, text, version, isSaved) {
@@ -7878,9 +7878,9 @@ import {
   Transaction,
   options,
   unobservable as unobservable2,
-  atomicAction as atomicAction2,
-  reactiveProcess,
-  nonreactive
+  atomic as atomic2,
+  reactive,
+  nonReactiveRun
 } from "reactronic";
 var highPriorityDiagnosticsCollectionIndicator = Indicator.create(
   "HighPriorityDiagnosticsCollectionIndicator",
@@ -8009,7 +8009,7 @@ var CompilationController = class extends ObservableObject2 {
         provideConfiguration: configurationProvider,
         standardPackagesUri: this.config.standardPackagesUri
       };
-      const loadResult = yield nonreactive(
+      const loadResult = yield nonReactiveRun(
         () => __async(this, null, function* () {
           return yield CompilationLoader.loadFromFileSystemTree(this._rootDirectory, this._fileSystemTree, loadConfig, void 0);
         })
@@ -8048,7 +8048,7 @@ var CompilationController = class extends ObservableObject2 {
               child.text;
               break;
             case "directory":
-              if (nonreactive(() => CompilationLoader.isConfigurationDirectory(child))) {
+              if (nonReactiveRun(() => CompilationLoader.isConfigurationDirectory(child))) {
                 child.version;
               } else {
                 subscribeToFileSystemRecursively(child);
@@ -8141,7 +8141,7 @@ var CompilationController = class extends ObservableObject2 {
   }
   updateConfigurationControllers() {
     subscribeToFileSystemRecursively(this._rootDirectory);
-    const configurationDirectories = nonreactive(() => this.findConfigurationDirectories());
+    const configurationDirectories = nonReactiveRun(() => this.findConfigurationDirectories());
     const preservedControllerByPackageUri = /* @__PURE__ */ new Map();
     const addedConfigurationDirectoryByPackageUri = /* @__PURE__ */ new Map();
     const deletedConfigurationControllerByPackageUri = new Map(this._configurationControllerByPackageUri);
@@ -8180,7 +8180,7 @@ var CompilationController = class extends ObservableObject2 {
       directory.version;
       for (const child of directory.getChildren()) {
         if (child.kind === "directory") {
-          if (!nonreactive(() => CompilationLoader.isConfigurationDirectory(child))) {
+          if (!nonReactiveRun(() => CompilationLoader.isConfigurationDirectory(child))) {
             subscribeToFileSystemRecursively(child);
           }
         }
@@ -8212,8 +8212,8 @@ var CompilationController = class extends ObservableObject2 {
       if (currentTransaction.isCanceled) {
         return;
       }
-      const trackedSourceFiles = nonreactive(() => this.config.trackedSourceFiles.createItemsSnapshot());
-      const compilationState = nonreactive(() => this._mainCompilationState);
+      const trackedSourceFiles = nonReactiveRun(() => this.config.trackedSourceFiles.createItemsSnapshot());
+      const compilationState = nonReactiveRun(() => this._mainCompilationState);
       if (compilationState === void 0) {
         return;
       }
@@ -8379,33 +8379,33 @@ __decorateClass([
   unobservable2
 ], CompilationController.prototype, "_configurationsOfPackagesOutsideProject", 2);
 __decorateClass([
-  atomicAction2
+  atomic2
 ], CompilationController.prototype, "notifyReportedSourceFileDiagnostics", 1);
 __decorateClass([
-  reactiveProcess,
+  reactive,
   options({ reentrance: Reentrance.cancelPrevious, order: 24 })
 ], CompilationController.prototype, "reloadMainCompilation", 1);
 __decorateClass([
-  reactiveProcess,
+  reactive,
   options({ order: 25 })
 ], CompilationController.prototype, "updateState", 1);
 __decorateClass([
-  reactiveProcess,
+  reactive,
   options({ order: 20 })
 ], CompilationController.prototype, "updateConfigurationControllers", 1);
 __decorateClass([
-  reactiveProcess,
+  reactive,
   options({ order: 21 })
 ], CompilationController.prototype, "onConfigurationsUpdated", 1);
 __decorateClass([
-  reactiveProcess
+  reactive
 ], CompilationController.prototype, "onMainAnalyzerChanged", 1);
 __decorateClass([
-  reactiveProcess,
+  reactive,
   options({ reentrance: Reentrance.cancelAndWaitPrevious })
 ], CompilationController.prototype, "collectDiagnosticsInBackground", 1);
 __decorateClass([
-  reactiveProcess,
+  reactive,
   options({ reentrance: Reentrance.waitAndRestart })
 ], CompilationController.prototype, "onRawPackageConfigurationsUpdated", 1);
 var TsProgramLoaderInputs = class {
@@ -8467,11 +8467,11 @@ var ReadonlyCompilationState = class {
   }
 };
 __decorateClass([
-  atomicAction2,
+  atomic2,
   options({ reentrance: Reentrance.runSideBySide, indicator: highPriorityDiagnosticsCollectionIndicator })
 ], ReadonlyCompilationState.prototype, "collectSourceFileDiagnosticsWithHighPriority", 1);
 __decorateClass([
-  atomicAction2,
+  atomic2,
   options({ reentrance: Reentrance.runSideBySide })
 ], ReadonlyCompilationState.prototype, "collectSourceFileDiagnosticsWithLowPriority", 1);
 var DiagnosticsCollectionSummary = class {
@@ -8560,7 +8560,7 @@ var ConfigurationController = class extends ObservableObject2 {
       this._convertedConfigurationVersion++;
     });
   }
-  // @reactiveProcess
+  // @reactive
   // @options({ reentrance: Reentrance.cancelPrevious, order: 21 })
   // private async reloadCompilation(): Promise<void> {
   //   if (!this._mainCompilationController.isConfigurationsProcessingEnabled) {
@@ -8573,7 +8573,7 @@ var ConfigurationController = class extends ObservableObject2 {
   //   subscribeToFileSystemRecursively(this.rootDirectory)
   //   const currentTransaction = Transaction.current
   //   const cancellationToken = new GenericCancellationToken(() => currentTransaction.isCanceled)
-  //   const compilation = await nonreactive(async () =>
+  //   const compilation = await nonReactiveRun(async () =>
   //     await PackageConfigurationInterpreter.loadConfigurationCompilation(this.rootDirectory, undefined,
   //       this._compilationState?.analyzer.compilation, cancellationToken),
   //   )
@@ -8591,7 +8591,7 @@ var ConfigurationController = class extends ObservableObject2 {
   //           child.text // подписка
   //           break
   //         case 'directory':
-  //           if (nonreactive(() => CompilationLoader.isPackageConfigurationDirectory(directory))) {
+  //           if (nonReactiveRun(() => CompilationLoader.isPackageConfigurationDirectory(directory))) {
   //             // Для папки с конфигурацией подписываемся только на изменение её содержимого.
   //             // Если она не будет содержать ни одного файла - перестанет считаться конфигурационной папкой.
   //             // Вложенные файлы не являются частью главной компиляции, поэтому на них не нужно подписываться.
@@ -8607,7 +8607,7 @@ var ConfigurationController = class extends ObservableObject2 {
   //     }
   //   }
   // }
-  // @reactiveProcess
+  // @reactive
   // @options({ reentrance: Reentrance.cancelPrevious, order: 22 })
   // private async analyze(): Promise<void> {
   //   if (!this._mainCompilationController.isConfigurationsProcessingEnabled) {
@@ -8617,7 +8617,7 @@ var ConfigurationController = class extends ObservableObject2 {
   //     const compilationState = this._compilationState
   //     const currentTransaction = Transaction.current
   //     const cancellationToken = new GenericCancellationToken(() => currentTransaction.isCanceled)
-  //     const trackedSourceFileByUri = nonreactive(() =>
+  //     const trackedSourceFileByUri = nonReactiveRun(() =>
   //       this._mainCompilationController.config.trackedSourceFiles.createItemsSnapshot(),
   //     )
   //     const diagnosticsOfSourceFilesPromises =
@@ -8641,11 +8641,11 @@ var ConfigurationController = class extends ObservableObject2 {
   //     }
   //   }
   // }
-  // @reactiveProcess
+  // @reactive
   // private diagnosticsChanged(): void {
   //   this._configurationDiagnostics // подписка
   // }
-  // @reactiveProcess
+  // @reactive
   // @options({ reentrance: Reentrance.cancelAndWaitPrevious })
   // private async reportDiagnostics(): Promise<void> {
   //   if (!this._mainCompilationController.isConfigurationsProcessingEnabled) {
@@ -8657,7 +8657,7 @@ var ConfigurationController = class extends ObservableObject2 {
   //   if (this._diagnosticsChangedIndicator.isBusy) {
   //     return
   //   }
-  //   const diagnostics = nonreactive(() => this._configurationDiagnostics)
+  //   const diagnostics = nonReactiveRun(() => this._configurationDiagnostics)
   //   if (diagnostics === undefined) {
   //     return
   //   }
@@ -8671,7 +8671,7 @@ var ConfigurationController = class extends ObservableObject2 {
   //     }
   //   }
   // }
-  // @reactiveProcess
+  // @reactive
   // @options({ reentrance: Reentrance.cancelPrevious, order: 23 })
   // private async interpretConfiguration(): Promise<void> {
   //   if (!this._mainCompilationController.isConfigurationsProcessingEnabled) {
@@ -8694,7 +8694,7 @@ var ConfigurationController = class extends ObservableObject2 {
   //     }
   //     else {
   //       const analyzer = this._compilationState.analyzer
-  //       const result = await nonreactive(async () =>
+  //       const result = await nonReactiveRun(async () =>
   //         await PackageConfigurationInterpreter.compileAndExecuteConfiguration(analyzer, undefined),
   //       )
   //       if (!Transaction.current.isCanceled) {
@@ -8725,11 +8725,11 @@ __decorateClass([
   unobservable2
 ], ConfigurationController.prototype, "_mainCompilationController", 2);
 __decorateClass([
-  reactiveProcess,
+  reactive,
   options({ reentrance: Reentrance.cancelPrevious, order: 21 })
 ], ConfigurationController.prototype, "updateJsonConfigurationFile", 1);
 __decorateClass([
-  reactiveProcess,
+  reactive,
   options({ reentrance: Reentrance.cancelPrevious, order: 22 })
 ], ConfigurationController.prototype, "processConfiguration", 1);
 var ConfigurationDirectory = class {
@@ -8749,8 +8749,8 @@ import {
   unobservable as unobservable3,
   ReactiveSystem as ReactiveSystem3,
   Transaction as Transaction2,
-  atomicAction as atomicAction3,
-  reactiveProcess as reactiveProcess2
+  atomic as atomic3,
+  reactive as reactive2
 } from "reactronic";
 var FileSystemTreeProviderBasedOnWatchedFileSystem = class extends ObservableObject3 {
   // Используется в качестве множества.
@@ -9118,7 +9118,7 @@ var FileSystemTreeProviderBasedOnWatchedFileSystem = class extends ObservableObj
       this.fileSystemTree.deleteFileOrDirectory(uri);
     }
   }
-  // @reactiveProcess
+  // @reactive
   // @options({ order: 0 })
   // protected unloadWorkspaceFoldersThatNoLongerContainArtelProject(): void {
   //   if (this.isMissingConfigurationDirectoryAllowed) {
@@ -9273,29 +9273,29 @@ __decorateClass([
   unobservable3
 ], FileSystemTreeProviderBasedOnWatchedFileSystem.prototype, "_loadedDirectoryUris", 2);
 __decorateClass([
-  reactiveProcess2
+  reactive2
 ], FileSystemTreeProviderBasedOnWatchedFileSystem.prototype, "onTrackedSourceFilesUpdated", 1);
 __decorateClass([
-  reactiveProcess2
+  reactive2
 ], FileSystemTreeProviderBasedOnWatchedFileSystem.prototype, "onWorkspaceFolderUrisUpdated", 1);
 __decorateClass([
-  reactiveProcess2,
+  reactive2,
   options2({ order: 0 })
 ], FileSystemTreeProviderBasedOnWatchedFileSystem.prototype, "updateLoadedWorkspaceFolders", 1);
 __decorateClass([
-  atomicAction3
+  atomic3
 ], FileSystemTreeProviderBasedOnWatchedFileSystem.prototype, "addWorkspaceFoldersWorker", 1);
 __decorateClass([
-  atomicAction3
+  atomic3
 ], FileSystemTreeProviderBasedOnWatchedFileSystem.prototype, "removeWorkspaceFoldersWorker", 1);
 __decorateClass([
-  atomicAction3
+  atomic3
 ], FileSystemTreeProviderBasedOnWatchedFileSystem.prototype, "onFileSystemTreeUpdatedWorker", 1);
 __decorateClass([
-  atomicAction3
+  atomic3
 ], FileSystemTreeProviderBasedOnWatchedFileSystem.prototype, "stopTrackingSourceFile", 1);
 __decorateClass([
-  atomicAction3
+  atomic3
 ], FileSystemTreeProviderBasedOnWatchedFileSystem.prototype, "updateFileSystemTree", 1);
 var SimpleFileSystemUpdateNotificationsPublisher = class {
   constructor() {
@@ -9433,17 +9433,17 @@ __decorateClass([
   unobservable3
 ], TaskQueue.prototype, "_tasks", 2);
 __decorateClass([
-  atomicAction3
+  atomic3
 ], TaskQueue.prototype, "addTask", 1);
 __decorateClass([
-  reactiveProcess2
+  reactive2
 ], TaskQueue.prototype, "processTasks", 1);
 __decorateClass([
-  reactiveProcess2
+  reactive2
 ], TaskQueue.prototype, "executeTask", 1);
 
 // source/services/workspace/ManuallyUpdatedFileSystemTreeProvider.ts
-import { ObservableMap as ObservableMap3, ObservableObject as ObservableObject4, options as options3, unobservable as unobservable4, reactiveProcess as reactiveProcess3, ReactiveSystem as ReactiveSystem4 } from "reactronic";
+import { ObservableMap as ObservableMap3, ObservableObject as ObservableObject4, options as options3, unobservable as unobservable4, reactive as reactive3, ReactiveSystem as ReactiveSystem4 } from "reactronic";
 var ManuallyUpdatedFileSystemTreeProvider = class extends ObservableObject4 {
   constructor() {
     super(...arguments);
@@ -9559,10 +9559,10 @@ __decorateClass([
   unobservable4
 ], ManuallyUpdatedFileSystemTreeProvider.prototype, "_manuallyCreatedSourceFileTextByUri", 2);
 __decorateClass([
-  reactiveProcess3
+  reactive3
 ], ManuallyUpdatedFileSystemTreeProvider.prototype, "onTrackedSourceFilesUpdated", 1);
 __decorateClass([
-  reactiveProcess3,
+  reactive3,
   options3({ order: 0 })
 ], ManuallyUpdatedFileSystemTreeProvider.prototype, "updateLoadedWorkspaceFolderByUri", 1);
 
@@ -9576,10 +9576,11 @@ import {
   ReactiveSystem as ReactiveSystem6,
   Reentrance as Reentrance2,
   Transaction as Transaction3,
-  atomicAction as atomicAction5,
-  reactiveProcess as reactiveProcess5,
-  cachedResult,
-  nonreactive as nonreactive2
+  atomic as atomic5,
+  reactive as reactive5,
+  cached,
+  atomicRun,
+  nonReactiveRun as nonReactiveRun2
 } from "reactronic";
 
 // source/services/workspace/WorkspaceFiles.ts
@@ -9589,9 +9590,9 @@ import {
   ObservableObject as ObservableObject5,
   options as options4,
   unobservable as unobservable5,
-  reactiveProcess as reactiveProcess4,
+  reactive as reactive4,
   ReactiveSystem as ReactiveSystem5,
-  atomicAction as atomicAction4
+  atomic as atomic4
 } from "reactronic";
 var WorkspaceFiles = class extends ObservableObject5 {
   constructor(fileSystemTreeProvider) {
@@ -9706,19 +9707,19 @@ __decorateClass([
   unobservable5
 ], WorkspaceFiles.prototype, "_fileSystemTreeProvider", 2);
 __decorateClass([
-  atomicAction4
+  atomic4
 ], WorkspaceFiles.prototype, "addWorkspaceFolders", 1);
 __decorateClass([
-  atomicAction4
+  atomic4
 ], WorkspaceFiles.prototype, "removeWorkspaceFolders", 1);
 __decorateClass([
-  atomicAction4
+  atomic4
 ], WorkspaceFiles.prototype, "trackSourceFile", 1);
 __decorateClass([
-  atomicAction4
+  atomic4
 ], WorkspaceFiles.prototype, "updateTrackedSourceFile", 1);
 __decorateClass([
-  reactiveProcess4,
+  reactive4,
   options4({ order: 1 })
 ], WorkspaceFiles.prototype, "updateWorkspaceFolderWithArtelProjectByUri", 1);
 
@@ -9754,7 +9755,7 @@ var _Workspace = class _Workspace extends ObservableObject6 {
   }
   static create(config) {
     return __async(this, null, function* () {
-      return yield atomicAction5(() => __async(this, null, function* () {
+      return yield atomicRun(() => __async(this, null, function* () {
         let startTime = performance.now();
         const configurationPackagesTsInteropInputs = PackageConfigurationInterpreter.createTsInteropInputsForInterpretation(config.tsLibrariesProvider);
         Logger.info(`\u0417\u0430\u0433\u0440\u0443\u0437\u043A\u0430 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A TS \u0437\u0430\u043D\u044F\u043B\u0430 ${Math.round(performance.now() - startTime)} \u043C\u0441.`);
@@ -9878,7 +9879,7 @@ var _Workspace = class _Workspace extends ObservableObject6 {
       }
       const controllerToLoad = this.getControllerToLoad();
       if (controllerToLoad !== void 0) {
-        if (!nonreactive2(() => controllerToLoad.isConfigurationsProcessingEnabled)) {
+        if (!nonReactiveRun2(() => controllerToLoad.isConfigurationsProcessingEnabled)) {
           yield new Promise((r) => setTimeout(r, 50));
           if (Transaction3.current.isCanceled) {
             return;
@@ -9991,24 +9992,24 @@ __decorateClass([
   unobservable6
 ], _Workspace.prototype, "_files", 2);
 __decorateClass([
-  cachedResult
+  cached
 ], _Workspace.prototype, "compilationControllerByUri", 1);
 __decorateClass([
-  atomicAction5
+  atomic5
 ], _Workspace.prototype, "notifyClosedTextDocument", 1);
 __decorateClass([
-  reactiveProcess5,
+  reactive5,
   options5({ order: 10 })
 ], _Workspace.prototype, "updateCompilationControllers", 1);
 __decorateClass([
-  reactiveProcess5,
+  reactive5,
   options5({ reentrance: Reentrance2.cancelPrevious })
 ], _Workspace.prototype, "processControllersWithUnprocessedConfigs", 1);
 __decorateClass([
-  reactiveProcess5
+  reactive5
 ], _Workspace.prototype, "updateIsDiagnosticsCollectionInBackgroundEnabled", 1);
 __decorateClass([
-  reactiveProcess5,
+  reactive5,
   options5({ reentrance: Reentrance2.cancelPrevious })
 ], _Workspace.prototype, "updateControllersWithOpenedFiles", 1);
 var Workspace = _Workspace;
@@ -11058,8 +11059,8 @@ var EntityToSyntax = class {
       case "type":
         levelKeyword = 53 /* InType */;
         break;
-      case "type-family":
-        levelKeyword = 50 /* InFamily */;
+      case "type-hierarchy":
+        levelKeyword = 50 /* InHierarchy */;
         break;
       case "file":
         levelKeyword = 51 /* InFile */;
@@ -11176,7 +11177,7 @@ var SourceGenerationService = class extends ObservableObject7 {
       }
       const containingPackage = getPackageContainingEntity(entity);
       const compilationController = this.getOrGeneratePackageSource(analyzer, containingPackage, localizationContext).compilationController;
-      atomicAction6(() => compilationController.isConfigurationsProcessingEnabled = true);
+      atomicRun2(() => compilationController.isConfigurationsProcessingEnabled = true);
       yield compilationController.waitFullyLoaded();
       const compilationState = compilationController.mainCompilationState;
       if (compilationState?.analyzer.compilation.mainPackage === void 0) {
@@ -11243,7 +11244,7 @@ var SourceGenerationService = class extends ObservableObject7 {
       const code = new SyntaxToCode(node, { keywordsLocale: packageLocale }).convert();
       const generatedPackageUri = new Uri(GeneratedSourceFileScheme, [key]);
       const generatedFileUri = generatedPackageUri.append(`${packageEntity.getName().toString()}.art`);
-      const fileSystemTree = atomicAction6(() => new FileSystemTree());
+      const fileSystemTree = atomicRun2(() => new FileSystemTree());
       const packageDirectory = fileSystemTree.addDirectory(generatedPackageUri);
       fileSystemTree.addFile(generatedFileUri, code);
       const systemPackageLocale = localizationContext?.getTranslationLocale(analyzer.systemPackage) ?? analyzer.systemPackage.getLocale();
@@ -11261,10 +11262,10 @@ var SourceGenerationService = class extends ObservableObject7 {
         mainPackageConfigurationIfMissing: packageConfiguration,
         getTreatRootAsPackageIfConfigIsMissing: () => true
       };
-      const controller = atomicAction6(() => new CompilationController(controllerConfig));
+      const controller = atomicRun2(() => new CompilationController(controllerConfig));
       result = new GeneratedPackageState(controller, generatedFileUri);
       this.setDeleteGeneratedPackageTimeout(key, result, deleteGeneratedPackageTimeoutMs);
-      atomicAction6(() => this._generatedPackageStates.set(key, result));
+      atomicRun2(() => this._generatedPackageStates.set(key, result));
     }
     return result;
   }
@@ -11359,7 +11360,7 @@ var SourceGenerationService = class extends ObservableObject7 {
   }
 };
 __decorateClass([
-  reactiveProcess6
+  reactive6
 ], SourceGenerationService.prototype, "onOpenedSourceFilesChanged", 1);
 var deleteGeneratedPackageTimeoutMs = 1e4;
 var GeneratedPackageState = class {
@@ -11763,13 +11764,13 @@ var LanguageServer = class {
           this._fileSystemUpdateNotificationsPublisher = new SimpleFileSystemUpdateNotificationsPublisher();
           const fileSystem = this._config.fileSystemSynchronizationMode.fileSystem;
           const publisher = this._fileSystemUpdateNotificationsPublisher;
-          fileSystemTreeProvider = atomicAction7(
+          fileSystemTreeProvider = atomicRun3(
             () => new FileSystemTreeProviderBasedOnWatchedFileSystem(fileSystem, publisher)
           );
           break;
         }
         case "client-to-server-requests": {
-          this._manuallyUpdatedFileSystemTreeProvider = atomicAction7(() => new ManuallyUpdatedFileSystemTreeProvider());
+          this._manuallyUpdatedFileSystemTreeProvider = atomicRun3(() => new ManuallyUpdatedFileSystemTreeProvider());
           fileSystemTreeProvider = this._manuallyUpdatedFileSystemTreeProvider;
           break;
         }
@@ -11784,9 +11785,9 @@ var LanguageServer = class {
         initiallyOpenedFileUris: params.initializationOptions?.initiallyOpenedFileUris?.map((u) => this.convertVscodeUriToUri(URI2.parse(u))),
         standardPackagesUri: params.initializationOptions?.standardPackagesUri !== void 0 ? this.convertVscodeUriToUri(URI2.parse(params.initializationOptions.standardPackagesUri)) : void 0
       };
-      this._workspace = yield atomicAction7(() => Workspace.create(config));
+      this._workspace = yield atomicRun3(() => Workspace.create(config));
       this._workspace.addWorkspaceFolders(workspaceFolderUris);
-      this._sourceGenerationService = atomicAction7(
+      this._sourceGenerationService = atomicRun3(
         () => new SourceGenerationService(
           this._workspace.trackedSourceFiles,
           this._config.tsLibrariesProvider,
@@ -11962,13 +11963,13 @@ var LanguageServer = class {
   onWorkspaceDiagnostic(params, token) {
     return __async(this, null, function* () {
       this._workspaceDiagnosticsPartialResultToken = params.partialResultToken;
-      atomicAction7(() => this._workspace.isReadyToAcceptWorkspaceDiagnostics = true);
+      atomicRun3(() => this._workspace.isReadyToAcceptWorkspaceDiagnostics = true);
       while (!token.isCancellationRequested) {
         yield new Promise((r) => setTimeout(r, 1e3));
       }
       if (this._workspaceDiagnosticsPartialResultToken === params.partialResultToken) {
         this._workspaceDiagnosticsPartialResultToken = void 0;
-        atomicAction7(() => this._workspace.isReadyToAcceptWorkspaceDiagnostics = false);
+        atomicRun3(() => this._workspace.isReadyToAcceptWorkspaceDiagnostics = false);
       }
       throw new CancelledError();
     });
@@ -12786,7 +12787,7 @@ ${e}`);
   }
 };
 __decorateClass([
-  atomicAction7
+  atomic6
 ], LanguageServer.prototype, "onDidChangeWorkspaceFolders", 1);
 var FileSystemSynchronizationMode;
 ((FileSystemSynchronizationMode2) => {

package/build/{chunk-BQHCAH6D.js → chunk-C76RSUHL.js}

@@ -1,6 +1,6 @@
 import {
   Compiler
-} from "./chunk-QRBDQKYM.js";
+} from "./chunk-YBBE3UAB.js";
 import {
   ArtelVersion,
   Cached,
@@ -14,7 +14,7 @@ import {
   __async,
   performanceMeasurementStageNames,
   performanceMeasurementStages
-} from "./chunk-O2JKESUU.js";
+} from "./chunk-JCOXBBRE.js";
 
 // source/executor/FileSystemUri.ts
 import { platform } from "os";

package/build/{chunk-O2JKESUU.js → chunk-JCOXBBRE.js}

@@ -521,7 +521,7 @@ var UniqueQuery = class extends Query {
 };
 
 // source/common/Constants.ts
-var ArtelVersion = true ? "0.6.25191" : "";
+var ArtelVersion = true ? "0.6.25192" : "";
 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");
@@ -1132,7 +1132,7 @@ var KeywordKind = /* @__PURE__ */ ((KeywordKind5) => {
   KeywordKind5[KeywordKind5["Await"] = 47] = "Await";
   KeywordKind5[KeywordKind5["Dispose"] = 48] = "Dispose";
   KeywordKind5[KeywordKind5["OnDispose"] = 49] = "OnDispose";
-  KeywordKind5[KeywordKind5["InFamily"] = 50] = "InFamily";
+  KeywordKind5[KeywordKind5["InHierarchy"] = 50] = "InHierarchy";
   KeywordKind5[KeywordKind5["InFile"] = 51] = "InFile";
   KeywordKind5[KeywordKind5["InPackage"] = 52] = "InPackage";
   KeywordKind5[KeywordKind5["InType"] = 53] = "InType";
@@ -10698,7 +10698,7 @@ var Scanner = class _Scanner {
       }
       index++;
     }
-    if (index === length && textWithoutQuotes.charCodeAt(index) === 45 /* Minus */) {
+    if (index === length && textWithoutQuotes.charCodeAt(index - 1) === 45 /* Minus */) {
       return false;
     }
     return true;
@@ -12091,8 +12091,7 @@ var englishKeywords = new Lazy(() => [
   { keyword: "on dispose", kind: 49 /* OnDispose */, dialects: [2 /* Special */] },
   { keyword: "destruction", kind: 49 /* OnDispose */, dialects: [1 /* Usual */] },
   { keyword: "in type", kind: 53 /* InType */, dialects: [1 /* Usual */, 2 /* Special */] },
-  { keyword: "in family", kind: 50 /* InFamily */, dialects: [2 /* Special */] },
-  { keyword: "in hierarchy", kind: 50 /* InFamily */, dialects: [1 /* Usual */] },
+  { keyword: "in hierarchy", kind: 50 /* InHierarchy */, dialects: [1 /* Usual */, 2 /* Special */] },
   { keyword: "in file", kind: 51 /* InFile */, dialects: [1 /* Usual */, 2 /* Special */] },
   { keyword: "in package", kind: 52 /* InPackage */, dialects: [1 /* Usual */, 2 /* Special */] },
   { keyword: "ref", kind: 56 /* Reference */, dialects: [1 /* Usual */, 2 /* Special */] },
@@ -12191,8 +12190,7 @@ var russianKeywords = new Lazy(() => [
   { keyword: "\u043F\u0440\u0438 \u0443\u043D\u0438\u0447\u0442\u043E\u0436\u0435\u043D\u0438\u0438", kind: 49 /* OnDispose */, dialects: [2 /* Special */] },
   { keyword: "\u0443\u043D\u0438\u0447\u0442\u043E\u0436\u0435\u043D\u0438\u0435", kind: 49 /* OnDispose */, dialects: [1 /* Usual */] },
   { keyword: "\u0432 \u0442\u0438\u043F\u0435", kind: 53 /* InType */, dialects: [1 /* Usual */, 2 /* Special */] },
-  { keyword: "\u0432 \u0441\u0435\u043C\u0435\u0439\u0441\u0442\u0432\u0435", kind: 50 /* InFamily */, dialects: [2 /* Special */] },
-  { keyword: "\u0432 \u0438\u0435\u0440\u0430\u0440\u0445\u0438\u0438", kind: 50 /* InFamily */, dialects: [1 /* Usual */] },
+  { keyword: "\u0432 \u0438\u0435\u0440\u0430\u0440\u0445\u0438\u0438", kind: 50 /* InHierarchy */, dialects: [1 /* Usual */, 2 /* Special */] },
   { keyword: "\u0432 \u0444\u0430\u0439\u043B\u0435", kind: 51 /* InFile */, dialects: [1 /* Usual */, 2 /* Special */] },
   { keyword: "\u0432 \u043F\u0430\u043A\u0435\u0442\u0435", kind: 52 /* InPackage */, dialects: [1 /* Usual */, 2 /* Special */] },
   { keyword: "\u0441\u0441\u044B\u043B\u043A\u0430", kind: 56 /* Reference */, dialects: [1 /* Usual */, 2 /* Special */] },
@@ -12368,7 +12366,7 @@ var FileSystemTree_exports = {};
 __export(FileSystemTree_exports, {
   FileSystemTree: () => FileSystemTree
 });
-import { ObservableObject, ReactiveSystem, unobservable, atomicAction } from "reactronic";
+import { ObservableObject, ReactiveSystem, unobservable, atomic } from "reactronic";
 var FileSystemTree = class extends ObservableObject {
   constructor(handleInconsistentRequestsWithoutErrors = false, deleteEmptyDirectories = false) {
     super();
@@ -12581,19 +12579,19 @@ __decorateClass([
   unobservable
 ], FileSystemTree.prototype, "_rootByScheme", 2);
 __decorateClass([
-  atomicAction
+  atomic
 ], FileSystemTree.prototype, "addFile", 1);
 __decorateClass([
-  atomicAction
+  atomic
 ], FileSystemTree.prototype, "addDirectory", 1);
 __decorateClass([
-  atomicAction
+  atomic
 ], FileSystemTree.prototype, "deleteFileOrDirectory", 1);
 __decorateClass([
-  atomicAction
+  atomic
 ], FileSystemTree.prototype, "updateFile", 1);
 __decorateClass([
-  atomicAction
+  atomic
 ], FileSystemTree.prototype, "addOrUpdateFile", 1);
 var DirectoryInternal = class extends ObservableObject {
   constructor(uri, name, parent) {
@@ -12668,10 +12666,10 @@ __decorateClass([
   unobservable
 ], DirectoryInternal.prototype, "_childByName", 2);
 __decorateClass([
-  atomicAction
+  atomic
 ], DirectoryInternal.prototype, "addChild", 1);
 __decorateClass([
-  atomicAction
+  atomic
 ], DirectoryInternal.prototype, "deleteChild", 1);
 var FileInternal = class extends ObservableObject {
   constructor(uri, name, text, parent) {
@@ -12728,12 +12726,12 @@ __decorateClass([
   unobservable
 ], FileInternal.prototype, "_isDisposed", 2);
 __decorateClass([
-  atomicAction
+  atomic
 ], FileInternal.prototype, "update", 1);
 
 // source/generated/BuiltInSystemPackages.ts
-import { atomicAction as atomicAction2 } from "reactronic";
-var builtInSystemPackagesFileSystemTree = atomicAction2(() => {
+import { atomicRun } from "reactronic";
+var builtInSystemPackagesFileSystemTree = atomicRun(() => {
   const fileSystemTree = new FileSystemTree();
   fileSystemTree.addDirectory(new Uri("artel-builtin", ["\u0421\u0438\u0441\u0442\u0435\u043C\u043D\u044B\u0435\u041F\u0430\u043A\u0435\u0442\u044B", "\u0410\u0440\u0442\u0435\u043B\u044C"]));
   fileSystemTree.addDirectory(new Uri("artel-builtin", ["\u0421\u0438\u0441\u0442\u0435\u043C\u043D\u044B\u0435\u041F\u0430\u043A\u0435\u0442\u044B", "\u0410\u0440\u0442\u0435\u043B\u044C", ".\u0430\u0440\u0442\u0435\u043B\u044C"]));
@@ -18933,7 +18931,7 @@ var ModifierParser = class {
       if (this.parser.currentTokenOrKeyword.kind === "keyword") {
         switch (this.parser.currentTokenOrKeyword.keywordKind) {
           case 53 /* InType */:
-          case 50 /* InFamily */:
+          case 50 /* InHierarchy */:
           case 51 /* InFile */:
           case 52 /* InPackage */:
             constraint = this.parser.parseTokenOrKeyword().asKeyword();
@@ -21984,7 +21982,7 @@ var RussianConfigurationTranslator = class {
 };
 
 // source/project/CompilationLoader.ts
-import { atomicAction as atomicAction3 } from "reactronic";
+import { atomicRun as atomicRun2 } from "reactronic";
 var CompilationLoader = class _CompilationLoader {
   constructor(rootDirectory, fileSystemTree, config, diagnostics, cancellationToken) {
     this._configurationsByPackageOrGroupUri = /* @__PURE__ */ new Map();
@@ -22001,10 +21999,10 @@ var CompilationLoader = class _CompilationLoader {
   }
   static loadUsingSourcesProvider(uri, sourcesProvider, config, diagnostics, workspaceUri, namesOfDirectoriesToIgnore, cancellationToken) {
     return __async(this, null, function* () {
-      const fileSystemTree = atomicAction3(() => new FileSystemTree());
+      const fileSystemTree = atomicRun2(() => new FileSystemTree());
       const namesOfDirectoriesToIgnoreSet = new Set(namesOfDirectoriesToIgnore ?? DefaultNamesOfDirectoriesToIgnore);
       PerformanceMeasurement.markStart(3 /* IO */);
-      const rootDirectory = yield atomicAction3(() => _CompilationLoader.loadArtelFiles(
+      const rootDirectory = yield atomicRun2(() => _CompilationLoader.loadArtelFiles(
         uri,
         sourcesProvider,
         fileSystemTree,
@@ -43569,7 +43567,7 @@ var TsPropertyEntity = class {
           case "package":
             result = false;
             break;
-          case "type-family":
+          case "type-hierarchy":
             break;
           default:
             Debug.never(isHidden);
@@ -43671,7 +43669,7 @@ var TsAccessorEntity = class {
           case "package":
             result = false;
             break;
-          case "type-family":
+          case "type-hierarchy":
             break;
           default:
             Debug.never(isHidden);
@@ -43809,7 +43807,7 @@ var TsMethodEntity = class {
           case "package":
             result = false;
             break;
-          case "type-family":
+          case "type-hierarchy":
             break;
           default:
             Debug.never(isHidden);
@@ -51979,7 +51977,7 @@ var SemanticContextBasedEntityHidingMatcher = class {
     switch (hiding.kind) {
       case "type":
         return this.type === hiding.typeEntity;
-      case "type-family":
+      case "type-hierarchy":
         return this.type === hiding.baseTypeEntity;
       case "file":
         return this.sourceFile === hiding.sourceFile;
@@ -54199,7 +54197,7 @@ var Analyzer2 = class _Analyzer {
     if (modifier !== void 0) {
       switch (modifier.level?.keywordKind) {
         case 53 /* InType */:
-        case 50 /* InFamily */:
+        case 50 /* InHierarchy */:
           return void 0;
         case 51 /* InFile */:
         case void 0:
@@ -54222,7 +54220,7 @@ var Analyzer2 = class _Analyzer {
           const type = query.container().getContextualTypeEntity(this);
           return type !== void 0 ? new EntityHidingLevel_type(type) : void 0;
         }
-        case 50 /* InFamily */: {
+        case 50 /* InHierarchy */: {
           const type = query.container().getContextualTypeEntity(this);
           return type !== void 0 ? new EntityHidingLevel_typeFamily(type) : void 0;
         }
@@ -59929,7 +59927,7 @@ var EntityHidingLevel_type = class {
 var EntityHidingLevel_typeFamily = class {
   constructor(baseTypeEntity) {
     this.baseTypeEntity = baseTypeEntity;
-    this.kind = "type-family";
+    this.kind = "type-hierarchy";
   }
 };
 var EntityHidingLevel_file = class {

package/build/{chunk-QRBDQKYM.js → chunk-YBBE3UAB.js}

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

package/build/types/entities/EntityHiding.d.ts

@@ -9,7 +9,7 @@ export declare class EntityHidingLevel_type {
 }
 export declare class EntityHidingLevel_typeFamily {
     readonly baseTypeEntity: TypeEntity;
-    readonly kind = "type-family";
+    readonly kind = "type-hierarchy";
     constructor(baseTypeEntity: TypeEntity);
 }
 export declare class EntityHidingLevel_file {

package/build/types/tree/KeywordKind.d.ts

@@ -49,7 +49,7 @@ export declare enum KeywordKind {
     Await = 47,
     Dispose = 48,
     OnDispose = 49,
-    InFamily = 50,
+    InHierarchy = 50,
     InFile = 51,
     InPackage = 52,
     InType = 53,

package/build/types/tree/green/Nodes.d.ts

@@ -2124,7 +2124,7 @@ export declare class Modifier extends BaseNode {
 }
 export type ModifierKeyword = Keyword<ModifierKeywordKind>;
 export type ModifierKeywordKind = KeywordKind.Const | KeywordKind.Hidden | KeywordKind.Abstract | KeywordKind.Static | KeywordKind.Redefinable | KeywordKind.Redefined | KeywordKind.Async | KeywordKind.Observable | KeywordKind.Consistent;
-export type ModifierLevelKeyword = Keyword<KeywordKind.InType> | Keyword<KeywordKind.InFamily> | Keyword<KeywordKind.InFile> | Keyword<KeywordKind.InPackage>;
+export type ModifierLevelKeyword = Keyword<KeywordKind.InType> | Keyword<KeywordKind.InHierarchy> | Keyword<KeywordKind.InFile> | Keyword<KeywordKind.InPackage>;
 export declare class ParameterClause extends BaseNode {
     readonly kind = NodeKind.ParameterClause;
     readonly children: readonly [

package/build/types/tree/red/Nodes.d.ts

@@ -2109,7 +2109,7 @@ export declare class Modifier extends BaseNode {
 }
 export type ModifierKeyword = Keyword<ModifierKeywordKind>;
 export type ModifierKeywordKind = KeywordKind.Const | KeywordKind.Hidden | KeywordKind.Abstract | KeywordKind.Static | KeywordKind.Redefinable | KeywordKind.Redefined | KeywordKind.Async | KeywordKind.Observable | KeywordKind.Consistent;
-export type ModifierLevelKeyword = Keyword<KeywordKind.InType> | Keyword<KeywordKind.InFamily> | Keyword<KeywordKind.InFile> | Keyword<KeywordKind.InPackage>;
+export type ModifierLevelKeyword = Keyword<KeywordKind.InType> | Keyword<KeywordKind.InHierarchy> | Keyword<KeywordKind.InFile> | Keyword<KeywordKind.InPackage>;
 export type ParameterClauseParent = PackageMethodDeclaration | NestedMethodDeclaration | MethodLiteral | TypeConstructorDeclaration | TypeDestructorDeclaration | TypeMethodDeclaration | MethodTypeDeclarationBody;
 export declare class ParameterClause extends BaseNode {
     readonly kind = NodeKind.ParameterClause;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@artel/artc",
-  "version": "0.6.25191",
+  "version": "0.6.25192",
   "description": "Артель Компилятор | Artel Compiler",
   "author": "Nezaboodka Team <contact@nezaboodka.com>",
   "license": "Apache License 2.0",
@@ -41,7 +41,7 @@
     "@babel/types": "7.23.0",
     "@vscode/l10n": "0.0.18",
     "jsonc-parser": "3.3.1",
-    "reactronic": "0.92.25006",
+    "reactronic": "0.92.25008",
     "typescript": "5.5.4",
     "vscode-json-languageservice": "5.4.2",
     "vscode-languageserver": "9.0.1",