@artel/artc 0.9.26025-pre-release → 0.9.26026-pre-release

package/build/Cli.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import {
   CommandLineCompiler
-} from "./chunk-3ZZBPFOL.js";
-import "./chunk-2WJO6BHA.js";
+} from "./chunk-OTUGMPBD.js";
+import "./chunk-JXT5ZWQJ.js";
 import {
   __async
-} from "./chunk-SI24BVXL.js";
+} from "./chunk-XMSHAJ5M.js";
 
 // source/Cli.ts
 function main() {

package/build/api/Api.js

@@ -1,6 +1,6 @@
 import {
   Compiler
-} from "../chunk-2WJO6BHA.js";
+} from "../chunk-JXT5ZWQJ.js";
 import {
   AccessKind,
   AccessedFunction_entity,
@@ -310,7 +310,7 @@ import {
   withoutQuotes,
   withoutTemplateQuotes,
   yieldTask
-} from "../chunk-SI24BVXL.js";
+} from "../chunk-XMSHAJ5M.js";
 export {
   AccessKind,
   AccessedFunction_entity,

package/build/api/ApiNodeJS.js

@@ -6,9 +6,9 @@ import {
   PhysicalFileSystem,
   PhysicalTypeScriptLibrariesProvider,
   PrintingDiagnosticAcceptor
-} from "../chunk-3ZZBPFOL.js";
-import "../chunk-2WJO6BHA.js";
-import "../chunk-SI24BVXL.js";
+} from "../chunk-OTUGMPBD.js";
+import "../chunk-JXT5ZWQJ.js";
+import "../chunk-XMSHAJ5M.js";
 export {
   CommandLineCompiler,
   FileSystemUri,

package/build/api/ApiServices.js

@@ -139,7 +139,7 @@ import {
   traverseTreeAsync,
   traverseTreeAsync2,
   yieldTask
-} from "../chunk-SI24BVXL.js";
+} from "../chunk-XMSHAJ5M.js";
 
 // source/services/common/Types.ts
 import * as ls from "vscode-languageserver";

package/build/{chunk-2WJO6BHA.js → chunk-JXT5ZWQJ.js}

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

package/build/{chunk-3ZZBPFOL.js → chunk-OTUGMPBD.js}

@@ -1,6 +1,6 @@
 import {
   Compiler
-} from "./chunk-2WJO6BHA.js";
+} from "./chunk-JXT5ZWQJ.js";
 import {
   ArtelVersion,
   Cached,
@@ -16,7 +16,7 @@ import {
   __async,
   performanceMeasurementStageNames,
   performanceMeasurementStages
-} from "./chunk-SI24BVXL.js";
+} from "./chunk-XMSHAJ5M.js";
 
 // source/executor/FileSystemUri.ts
 import { platform } from "os";

package/build/{chunk-SI24BVXL.js → chunk-XMSHAJ5M.js}

@@ -780,7 +780,7 @@ var UniqueWithComparatorQuery = class extends Query {
 };
 
 // source/common/Constants.ts
-var ArtelVersion = true ? "0.9.26025-pre-release" : "";
+var ArtelVersion = true ? "0.9.26026-pre-release" : "";
 var ArtelSourceFileExtensions = [".\u0430\u0440\u0442", ".\u0430\u0440\u0442\u0435\u043B\u044C", ".art", ".artel", ".\u0430\u0440\u0442\u043C", ".\u0430\u0440\u0442\u0435\u043B\u044C\u043C", ".artm", ".artelm"];
 var ArtelSourceFileExtensionSet = new Set(ArtelSourceFileExtensions);
 var ArtelSourceAndConfigurationFileExtensionSet = new Set(ArtelSourceFileExtensionSet).add(".json");
@@ -61769,6 +61769,7 @@ var TypeMemberLookupOptions = /* @__PURE__ */ ((TypeMemberLookupOptions2) => {
   TypeMemberLookupOptions2[TypeMemberLookupOptions2["NoTypeExtensionMembers"] = 4] = "NoTypeExtensionMembers";
   TypeMemberLookupOptions2[TypeMemberLookupOptions2["CheckAccessibilityIgnoringReceiverType"] = 8] = "CheckAccessibilityIgnoringReceiverType";
   TypeMemberLookupOptions2[TypeMemberLookupOptions2["NoBaseTypeMembers"] = 16] = "NoBaseTypeMembers";
+  TypeMemberLookupOptions2[TypeMemberLookupOptions2["DoNotContinueSearchInObjectTypeAfterSearchInAspectType"] = 32] = "DoNotContinueSearchInObjectTypeAfterSearchInAspectType";
   TypeMemberLookupOptions2[TypeMemberLookupOptions2["OnlyInstanceOrOnlyStaticMembers"] = 3] = "OnlyInstanceOrOnlyStaticMembers";
   TypeMemberLookupOptions2[TypeMemberLookupOptions2["NoBaseTypeAndExtensionMembers"] = 20] = "NoBaseTypeAndExtensionMembers";
   return TypeMemberLookupOptions2;
@@ -61904,7 +61905,7 @@ var TypeMemberLookupBase = class {
   getAllMembersOfTypeComplete(type, options) {
     const state = new TypeMemberLookupState();
     const result = this.getAllMembersOfType(type, options, state);
-    if (state.searchedInAspect && !state.searchedInStandardObjectType) {
+    if (state.searchedInAspect && !state.searchedInStandardObjectType && (options & 32 /* DoNotContinueSearchInObjectTypeAfterSearchInAspectType */) === 0) {
       const locale = this.tryGetTypeLocale(type) ?? this.context?.locale ?? DefaultLocale;
       const objectTypeMembers = this.getAllMembersOfType(
         this.analyzer.getLocalizedStandardTypes(locale).object,
@@ -62121,7 +62122,7 @@ var TypeMemberLookupByKeyBase = class extends TypeMemberLookupBase {
   getMembersOfTypeByKeyComplete(key, type, options) {
     const state = new TypeMemberLookupState();
     const result = this.getMembersOfTypeByKey(key, type, options, state);
-    if (state.searchedInAspect && !state.searchedInStandardObjectType) {
+    if (state.searchedInAspect && !state.searchedInStandardObjectType && (options & 32 /* DoNotContinueSearchInObjectTypeAfterSearchInAspectType */) === 0) {
       const locale = this.tryGetTypeLocale(type) ?? this.context?.locale ?? DefaultLocale;
       const objectTypeMembers = this.getMembersOfTypeByKey(
         key,
@@ -65530,8 +65531,13 @@ function isNarrowableExpression(node) {
     case 83 /* IdentifierExpression */:
     case 81 /* ObjectExpression */:
       return true;
-    case 70 /* MemberAccessExpression */:
-      return isNarrowableExpression(node.expression);
+    case 70 /* MemberAccessExpression */: {
+      let expression = node.expression;
+      if (expression.kind === 84 /* GenericSpecializationExpression */) {
+        expression = expression.expression;
+      }
+      return isNarrowableExpression(expression);
+    }
     case 55 /* AssertionExpression */:
       return isNarrowableExpression(node.expression);
     case 56 /* AssumptionExpression */:
@@ -65547,8 +65553,13 @@ function isNarrowableReferenceExpression(node) {
     case 83 /* IdentifierExpression */:
     case 81 /* ObjectExpression */:
       return true;
-    case 70 /* MemberAccessExpression */:
-      return isNarrowableExpression(node.expression);
+    case 70 /* MemberAccessExpression */: {
+      let expression = node.expression;
+      if (expression.kind === 84 /* GenericSpecializationExpression */) {
+        expression = expression.expression;
+      }
+      return isNarrowableExpression(expression);
+    }
     default:
       return false;
   }
@@ -79091,8 +79102,13 @@ function isNarrowableExpression2(node) {
     case 1041 /* IdentifierExpression */:
     case 1073 /* ObjectExpression */:
       return true;
-    case 1061 /* MemberAccessExpression */:
-      return isNarrowableExpression2(node.expression);
+    case 1061 /* MemberAccessExpression */: {
+      let expression = node.expression;
+      if (expression.kind === 1040 /* GenericSpecializationExpression */) {
+        expression = expression.expression;
+      }
+      return isNarrowableExpression2(expression);
+    }
     case 1008 /* AssumptionExpression */:
       return isNarrowableExpression2(node.expression);
     case 1093 /* ParenthesizedExpression */:
@@ -79106,8 +79122,13 @@ function isNarrowableReferenceExpression2(node) {
     case 1041 /* IdentifierExpression */:
     case 1073 /* ObjectExpression */:
       return true;
-    case 1061 /* MemberAccessExpression */:
-      return isNarrowableExpression2(node.expression);
+    case 1061 /* MemberAccessExpression */: {
+      let expression = node.expression;
+      if (expression.kind === 1040 /* GenericSpecializationExpression */) {
+        expression = expression.expression;
+      }
+      return isNarrowableExpression2(expression);
+    }
     default:
       return false;
   }
@@ -85204,7 +85225,7 @@ var OverriddenMember = class _OverriddenMember {
         this.analyzer,
         type,
         typeMemberLookupContext,
-        1 /* OnlyInstanceMembers */ | 8 /* CheckAccessibilityIgnoringReceiverType */
+        1 /* OnlyInstanceMembers */ | 8 /* CheckAccessibilityIgnoringReceiverType */ | 32 /* DoNotContinueSearchInObjectTypeAfterSearchInAspectType */
       );
     }
   }
@@ -93819,18 +93840,15 @@ var SourcePackageMemberConflictsValidator = class {
 
 // source/analysis/ArgumentsToParametersMatcher.ts
 var ArgumentToParameterMatcher = class {
-  constructor(analyzer, signature, arguments_, diagnostics, unmatchedRequiredParametersDiagnosticLocation) {
+  constructor(analyzer, parameters, arguments_, diagnostics, unmatchedRequiredParametersDiagnosticLocation) {
     this.analyzer = analyzer;
-    this.signature = signature;
+    this.parameters = parameters;
     this.arguments_ = arguments_;
     this.diagnostics = diagnostics;
     this.unmatchedRequiredParametersDiagnosticLocation = unmatchedRequiredParametersDiagnosticLocation;
   }
   match() {
-    const originalSignatureMathResult = this.matchArgumentsToParameters(
-      this.arguments_,
-      this.signature.getParameters()
-    );
+    const originalSignatureMathResult = this.matchArgumentsToParameters(this.arguments_, this.parameters);
     return originalSignatureMathResult;
   }
   matchArgumentsToParameters(args, parameters) {
@@ -93948,27 +93966,45 @@ var ArgumentToParameterMatchResult = class {
       switch (meaning.kind) {
         case "function-call": {
           if (meaning.suitableOrSingleFunction !== void 0) {
-            const signature = new FunctionMatcherSignature(meaning.suitableOrSingleFunction);
+            const parameters = meaning.suitableOrSingleFunction.getParameters().map((p) => new Parameter2(p.entity, p.type));
             const args = node.argumentList.arguments.map((a) => new SourceMatcherArgument(this.analyzer, a)).toArray();
-            const matcher_ = new ArgumentToParameterMatcher(this.analyzer, signature, args, void 0, void 0);
+            const matcher_ = new ArgumentToParameterMatcher(
+              this.analyzer,
+              parameters,
+              args,
+              void 0,
+              void 0
+            );
             const matchResult = matcher_.match();
             result = this.convertMatchResult(matchResult);
           }
           break;
         }
         case "object-function-call": {
-          const signature = new FunctionTypeMatcherSignature(this.analyzer, meaning.type);
+          const parameters = meaning.type.getParameters().map((p) => new Parameter2(p.entity, p.getType()));
           const args = node.argumentList.arguments.map((a) => new SourceMatcherArgument(this.analyzer, a)).toArray();
-          const matcher_ = new ArgumentToParameterMatcher(this.analyzer, signature, args, void 0, void 0);
+          const matcher_ = new ArgumentToParameterMatcher(
+            this.analyzer,
+            parameters,
+            args,
+            void 0,
+            void 0
+          );
           const matchResult = matcher_.match();
           result = this.convertMatchResult(matchResult);
           break;
         }
         case "constructor-call":
           if (meaning.suitableOrSingleConstructor !== void 0) {
-            const signature = new MatcherConstructorSignature(meaning.suitableOrSingleConstructor);
+            const parameters = meaning.suitableOrSingleConstructor.getParameters().map((p) => new Parameter2(p.entity, p.getType()));
             const args = node.argumentList.arguments.map((a) => new SourceMatcherArgument(this.analyzer, a)).toArray();
-            const matcher_ = new ArgumentToParameterMatcher(this.analyzer, signature, args, void 0, void 0);
+            const matcher_ = new ArgumentToParameterMatcher(
+              this.analyzer,
+              parameters,
+              args,
+              void 0,
+              void 0
+            );
             const matchResult = matcher_.match();
             result = this.convertMatchResult(matchResult);
           }
@@ -93993,9 +94029,15 @@ var ArgumentToParameterMatchResult = class {
       switch (meaning.kind) {
         case "tag-type": {
           if (meaning.suitableOrSingleConstructor !== void 0) {
-            const signature = new MatcherConstructorSignature(meaning.suitableOrSingleConstructor);
+            const parameters = meaning.suitableOrSingleConstructor.getParameters().map((p) => new Parameter2(p.entity, p.getType()));
             const args = node.argumentList?.arguments.map((a) => new SourceMatcherArgument(this.analyzer, a)).toArray() ?? [];
-            const matcher_ = new ArgumentToParameterMatcher(this.analyzer, signature, args, void 0, void 0);
+            const matcher_ = new ArgumentToParameterMatcher(
+              this.analyzer,
+              parameters,
+              args,
+              void 0,
+              void 0
+            );
             const matchResult = matcher_.match();
             result = this.convertMatchResult(matchResult);
           }
@@ -94003,9 +94045,15 @@ var ArgumentToParameterMatchResult = class {
         }
         case "tag-function": {
           if (meaning.suitableOrSingleFunction !== void 0) {
-            const signature = new FunctionMatcherSignature(meaning.suitableOrSingleFunction);
+            const parameters = meaning.suitableOrSingleFunction.getParameters().map((p) => new Parameter2(p.entity, p.type));
             const args = node.argumentList?.arguments.map((a) => new SourceMatcherArgument(this.analyzer, a)).toArray() ?? [];
-            const matcher_ = new ArgumentToParameterMatcher(this.analyzer, signature, args, void 0, void 0);
+            const matcher_ = new ArgumentToParameterMatcher(
+              this.analyzer,
+              parameters,
+              args,
+              void 0,
+              void 0
+            );
             const matchResult = matcher_.match();
             result = this.convertMatchResult(matchResult);
             break;
@@ -94030,9 +94078,15 @@ var ArgumentToParameterMatchResult = class {
       switch (meaning.kind) {
         case "resolved": {
           if (meaning.singleIndexer !== void 0) {
-            const signature = new MatcherIndexerSignature(meaning.singleIndexer);
+            const parameters = meaning.singleIndexer.getParameters().map((p) => new Parameter2(p.entity, p.getType()));
             const args = node.argumentList?.arguments.map((a) => new SourceMatcherArgument(this.analyzer, a)).toArray() ?? [];
-            const matcher_ = new ArgumentToParameterMatcher(this.analyzer, signature, args, void 0, void 0);
+            const matcher_ = new ArgumentToParameterMatcher(
+              this.analyzer,
+              parameters,
+              args,
+              void 0,
+              void 0
+            );
             const matchResult = matcher_.match();
             result = this.convertMatchResult(matchResult);
           }
@@ -94067,15 +94121,6 @@ var MatchResultParameter = class {
     this.type = type;
   }
 };
-var FunctionMatcherSignature = class {
-  constructor(func) {
-    this.func = func;
-    this.parameters = new Cached();
-  }
-  getParameters() {
-    return this.parameters.getOrInsertWith(() => this.func.getParameters().map((p) => new Parameter2(p.entity, p.type)));
-  }
-};
 var Parameter2 = class {
   constructor(entity, type) {
     this.entity = entity;
@@ -94088,34 +94133,6 @@ var Parameter2 = class {
     return this.entity.isOptional();
   }
 };
-var FunctionTypeMatcherSignature = class {
-  constructor(analyzer, value) {
-    this.analyzer = analyzer;
-    this.value = value;
-    this.parameters = new Cached();
-  }
-  getParameters() {
-    return this.parameters.getOrInsertWith(() => this.value.getParameters().map((p) => new Parameter2(p.entity, p.getType())));
-  }
-};
-var MatcherConstructorSignature = class {
-  constructor(value) {
-    this.parameters = new Cached();
-    this.value = value;
-  }
-  getParameters() {
-    return this.parameters.getOrInsertWith(() => this.value.getParameters().map((p) => new Parameter2(p.entity, p.getType())));
-  }
-};
-var MatcherIndexerSignature = class {
-  constructor(value) {
-    this.parameters = new Cached();
-    this.value = value;
-  }
-  getParameters() {
-    return this.parameters.getOrInsertWith(() => this.value.getParameters().map((p) => new Parameter2(p.entity, p.getType())));
-  }
-};
 
 // source/analysis/m/BaseExpressionMeaning.ts
 var Resolver = class {
@@ -94208,7 +94225,7 @@ var BaseOverloadResolver = class {
       const diagnosticsForMatcher = this.signatures.length === 1 ? this.diagnostics : void 0;
       const matcher_ = new ArgumentToParameterMatcher(
         this.analyzer,
-        s,
+        s.getParameters(),
         this.arguments_,
         diagnosticsForMatcher,
         this.nodesForDiagnostic?.access
@@ -95449,9 +95466,15 @@ var Resolver5 = class {
         this.node.expression
       ));
     }
-    const signature = new FunctionTypeMatcherSignature2(this.analyzer, type);
+    const parameters = type.getParameters().map((p) => new MatcherParameter(p.entity));
     const args = this.node.argumentList.arguments.map((a) => new SourceMatcherArgument(this.analyzer, a)).toArray();
-    const matcher_ = new ArgumentToParameterMatcher(this.analyzer, signature, args, this.diagnostics, this.node.argumentList);
+    const matcher_ = new ArgumentToParameterMatcher(
+      this.analyzer,
+      parameters,
+      args,
+      this.diagnostics,
+      this.node.argumentList
+    );
     matcher_.match();
     return new Meaning_objectFunctionCall(type);
   }
@@ -95496,16 +95519,6 @@ var Meaning_unresolved2 = class {
     this.kind = "unresolved";
   }
 };
-var FunctionTypeMatcherSignature2 = class {
-  constructor(analyzer, value) {
-    this.analyzer = analyzer;
-    this.value = value;
-    this.parameters = new Cached();
-  }
-  getParameters() {
-    return this.parameters.getOrInsertWith(() => this.value.getParameters().map((p) => new MatcherParameter(p.entity)));
-  }
-};
 var MatcherParameter = class {
   constructor(entity) {
     this.entity = entity;
@@ -98031,7 +98044,7 @@ var PackageAndStaticVariablesInitializationValidator = class {
   }
   collectStaticFieldsThatNeedToBeInitializedInConstructor(typeEntity, result) {
     for (const member of typeEntity.getMembers().getNamedMembersM()) {
-      if (member.kind === 0 /* Variable */ && member.isStatic() && !member.isConstant() && !isVariableEntityWithExplicitAccessors(member) && member.isPreservedReducedTypeMember() === void 0 && !this.analyzer.isNullAssignableToType(member.getType())) {
+      if (member.kind === 0 /* Variable */ && member.isStatic() && !isVariableEntityWithExplicitAccessors(member) && member.isPreservedReducedTypeMember() === void 0 && !this.analyzer.isNullAssignableToType(member.getType())) {
         const definition = member.getDefinition();
         if (definition.kind === 0 /* Source */) {
           if (definition.value.kind === "single" && (definition.value.node.kind === 1029 /* FieldDeclaration */ || definition.value.node.kind === 1102 /* StaticFieldDeclaration */) && definition.value.node.initializer === void 0) {
@@ -105127,27 +105140,45 @@ var ArgumentToParameterMatchResult2 = class {
       switch (meaning.kind) {
         case "function-call": {
           if (meaning.suitableOrSingleFunction !== void 0) {
-            const signature = new FunctionMatcherSignature2(meaning.suitableOrSingleFunction);
+            const parameters = meaning.suitableOrSingleFunction.getParameters().map((p) => new Parameter3(p.entity, p.type));
             const args = node.argumentList.arguments.map((a) => new SourceMatcherArgument2(this.analyzer, a)).toArray();
-            const matcher_ = new ArgumentToParameterMatcher(this.analyzer, signature, args, void 0, void 0);
+            const matcher_ = new ArgumentToParameterMatcher(
+              this.analyzer,
+              parameters,
+              args,
+              void 0,
+              void 0
+            );
             const matchResult = matcher_.match();
             result = this.convertMatchResult(matchResult);
           }
           break;
         }
         case "object-function-call": {
-          const signature = new FunctionTypeMatcherSignature3(this.analyzer, meaning.type);
+          const parameters = meaning.type.getParameters().map((p) => new Parameter3(p.entity, p.getType()));
           const args = node.argumentList.arguments.map((a) => new SourceMatcherArgument2(this.analyzer, a)).toArray();
-          const matcher_ = new ArgumentToParameterMatcher(this.analyzer, signature, args, void 0, void 0);
+          const matcher_ = new ArgumentToParameterMatcher(
+            this.analyzer,
+            parameters,
+            args,
+            void 0,
+            void 0
+          );
           const matchResult = matcher_.match();
           result = this.convertMatchResult(matchResult);
           break;
         }
         case "constructor-call":
           if (meaning.suitableOrSingleConstructor !== void 0) {
-            const signature = new MatcherConstructorSignature2(meaning.suitableOrSingleConstructor);
+            const parameters = meaning.suitableOrSingleConstructor.getParameters().map((p) => new Parameter3(p.entity, p.getType()));
             const args = node.argumentList.arguments.map((a) => new SourceMatcherArgument2(this.analyzer, a)).toArray();
-            const matcher_ = new ArgumentToParameterMatcher(this.analyzer, signature, args, void 0, void 0);
+            const matcher_ = new ArgumentToParameterMatcher(
+              this.analyzer,
+              parameters,
+              args,
+              void 0,
+              void 0
+            );
             const matchResult = matcher_.match();
             result = this.convertMatchResult(matchResult);
           }
@@ -105171,9 +105202,15 @@ var ArgumentToParameterMatchResult2 = class {
       switch (meaning.kind) {
         case "constructor-call":
           if (meaning.suitableOrSingleConstructor !== void 0) {
-            const signature = new MatcherConstructorSignature2(meaning.suitableOrSingleConstructor);
+            const parameters = meaning.suitableOrSingleConstructor.getParameters().map((p) => new Parameter3(p.entity, p.getType()));
             const args = node.argumentList.arguments.map((a) => new SourceMatcherArgument2(this.analyzer, a)).toArray();
-            const matcher_ = new ArgumentToParameterMatcher(this.analyzer, signature, args, void 0, void 0);
+            const matcher_ = new ArgumentToParameterMatcher(
+              this.analyzer,
+              parameters,
+              args,
+              void 0,
+              void 0
+            );
             const matchResult = matcher_.match();
             result = this.convertMatchResult(matchResult);
           } else {
@@ -105199,9 +105236,15 @@ var ArgumentToParameterMatchResult2 = class {
       switch (meaning.kind) {
         case "constructor-call":
           if (meaning.suitableOrSingleConstructor !== void 0) {
-            const signature = new MatcherConstructorSignature2(meaning.suitableOrSingleConstructor);
+            const parameters = meaning.suitableOrSingleConstructor.getParameters().map((p) => new Parameter3(p.entity, p.getType()));
             const args = node.argumentList.arguments.map((a) => new SourceMatcherArgument2(this.analyzer, a)).toArray();
-            const matcher_ = new ArgumentToParameterMatcher(this.analyzer, signature, args, void 0, void 0);
+            const matcher_ = new ArgumentToParameterMatcher(
+              this.analyzer,
+              parameters,
+              args,
+              void 0,
+              void 0
+            );
             const matchResult = matcher_.match();
             result = this.convertMatchResult(matchResult);
           } else {
@@ -105227,9 +105270,15 @@ var ArgumentToParameterMatchResult2 = class {
       switch (meaning.kind) {
         case "tag-type": {
           if (meaning.suitableOrSingleConstructor !== void 0) {
-            const signature = new MatcherConstructorSignature2(meaning.suitableOrSingleConstructor);
+            const parameters = meaning.suitableOrSingleConstructor.getParameters().map((p) => new Parameter3(p.entity, p.getType()));
             const args = node.argumentList?.arguments.map((a) => new SourceMatcherArgument2(this.analyzer, a)).toArray() ?? [];
-            const matcher_ = new ArgumentToParameterMatcher(this.analyzer, signature, args, void 0, void 0);
+            const matcher_ = new ArgumentToParameterMatcher(
+              this.analyzer,
+              parameters,
+              args,
+              void 0,
+              void 0
+            );
             const matchResult = matcher_.match();
             result = this.convertMatchResult(matchResult);
           }
@@ -105237,9 +105286,15 @@ var ArgumentToParameterMatchResult2 = class {
         }
         case "tag-function": {
           if (meaning.suitableOrSingleFunction !== void 0) {
-            const signature = new FunctionMatcherSignature2(meaning.suitableOrSingleFunction);
+            const parameters = meaning.suitableOrSingleFunction.getParameters().map((p) => new Parameter3(p.entity, p.type));
             const args = node.argumentList?.arguments.map((a) => new SourceMatcherArgument2(this.analyzer, a)).toArray() ?? [];
-            const matcher_ = new ArgumentToParameterMatcher(this.analyzer, signature, args, void 0, void 0);
+            const matcher_ = new ArgumentToParameterMatcher(
+              this.analyzer,
+              parameters,
+              args,
+              void 0,
+              void 0
+            );
             const matchResult = matcher_.match();
             result = this.convertMatchResult(matchResult);
             break;
@@ -105264,9 +105319,15 @@ var ArgumentToParameterMatchResult2 = class {
       switch (meaning.kind) {
         case "resolved": {
           if (meaning.singleIndexer !== void 0) {
-            const signature = new MatcherIndexerSignature2(meaning.singleIndexer);
+            const parameters = meaning.singleIndexer.getParameters().map((p) => new Parameter3(p.entity, p.getType()));
             const args = node.argumentList?.arguments.map((a) => new SourceMatcherArgument2(this.analyzer, a)).toArray() ?? [];
-            const matcher_ = new ArgumentToParameterMatcher(this.analyzer, signature, args, void 0, void 0);
+            const matcher_ = new ArgumentToParameterMatcher(
+              this.analyzer,
+              parameters,
+              args,
+              void 0,
+              void 0
+            );
             const matchResult = matcher_.match();
             result = this.convertMatchResult(matchResult);
           }
@@ -105301,15 +105362,6 @@ var MatchResultParameter3 = class {
     this.type = type;
   }
 };
-var FunctionMatcherSignature2 = class {
-  constructor(func) {
-    this.func = func;
-    this.parameters = new Cached();
-  }
-  getParameters() {
-    return this.parameters.getOrInsertWith(() => this.func.getParameters().map((p) => new Parameter3(p.entity, p.type)));
-  }
-};
 var Parameter3 = class {
   constructor(entity, type) {
     this.entity = entity;
@@ -105322,34 +105374,6 @@ var Parameter3 = class {
     return this.entity.isOptional();
   }
 };
-var FunctionTypeMatcherSignature3 = class {
-  constructor(analyzer, value) {
-    this.analyzer = analyzer;
-    this.value = value;
-    this.parameters = new Cached();
-  }
-  getParameters() {
-    return this.parameters.getOrInsertWith(() => this.value.getParameters().map((p) => new Parameter3(p.entity, p.getType())));
-  }
-};
-var MatcherConstructorSignature2 = class {
-  constructor(value) {
-    this.parameters = new Cached();
-    this.value = value;
-  }
-  getParameters() {
-    return this.parameters.getOrInsertWith(() => this.value.getParameters().map((p) => new Parameter3(p.entity, p.getType())));
-  }
-};
-var MatcherIndexerSignature2 = class {
-  constructor(value) {
-    this.parameters = new Cached();
-    this.value = value;
-  }
-  getParameters() {
-    return this.parameters.getOrInsertWith(() => this.value.getParameters().map((p) => new Parameter3(p.entity, p.getType())));
-  }
-};
 
 // source/analysis/a/ExpressionAnalysisOptions.ts
 var ExpressionAnalysisOptions2 = class _ExpressionAnalysisOptions {
@@ -108780,9 +108804,9 @@ var Resolver15 = class {
         this.node.expression
       ));
     }
-    const signature = new FunctionTypeMatcherSignature4(this.analyzer, type);
+    const parameters = type.getParameters().map((p) => new MatcherParameter2(p.entity));
     const args = this.node.argumentList.arguments.map((a) => new SourceMatcherArgument2(this.analyzer, a)).toArray();
-    const matcher_ = new ArgumentToParameterMatcher(this.analyzer, signature, args, this.diagnostics, this.node.argumentList);
+    const matcher_ = new ArgumentToParameterMatcher(this.analyzer, parameters, args, this.diagnostics, this.node.argumentList);
     matcher_.match();
     return new Meaning_objectFunctionCall2(type);
   }
@@ -108814,16 +108838,6 @@ var Meaning_unresolved12 = class {
     this.kind = "unresolved";
   }
 };
-var FunctionTypeMatcherSignature4 = class {
-  constructor(analyzer, value) {
-    this.analyzer = analyzer;
-    this.value = value;
-    this.parameters = new Cached();
-  }
-  getParameters() {
-    return this.parameters.getOrInsertWith(() => this.value.getParameters().map((p) => new MatcherParameter2(p.entity)));
-  }
-};
 var MatcherParameter2 = class {
   constructor(entity) {
     this.entity = entity;
@@ -111152,7 +111166,7 @@ var PackageAndStaticVariablesInitializationValidator2 = class {
   }
   collectStaticFieldsThatNeedToBeInitializedInConstructor(typeEntity, result) {
     for (const member of typeEntity.getMembers().getNamedMembersA()) {
-      if (member.kind === 0 /* Variable */ && member.isStatic() && !member.isConstant() && !isVariableEntityWithExplicitAccessors(member) && member.isPreservedReducedTypeMember() === void 0 && !this.analyzer.isNullAssignableToType(member.getType())) {
+      if (member.kind === 0 /* Variable */ && member.isStatic() && !isVariableEntityWithExplicitAccessors(member) && member.isPreservedReducedTypeMember() === void 0 && !this.analyzer.isNullAssignableToType(member.getType())) {
         const definition = member.getDefinition();
         if (definition.kind === 0 /* Source */) {
           if (definition.value.kind === "single" && definition.value.node.kind === 46 /* FieldDeclaration */ && definition.value.node.initializer === void 0) {

package/build/types/analysis/ArgumentsToParametersMatcher.d.ts

@@ -2,13 +2,13 @@ import { Name } from '../common/index.js';
 import { DiagnosticAcceptor } from '../diagnostic/Diagnostic.js';
 import { Analyzer } from './Analyzer.js';
 import { NodeOrDiagnosticLocation } from './NodeOrDiagnosticLocation.js';
-export declare class ArgumentToParameterMatcher<TSignature extends ISignature<TParameter>, TParameter extends ISignatureParameter, TArgument extends IArgument> {
+export declare class ArgumentToParameterMatcher<TParameter extends ISignatureParameter, TArgument extends IArgument> {
     private readonly analyzer;
-    private readonly signature;
+    private readonly parameters;
     private readonly arguments_;
     private readonly diagnostics;
     private readonly unmatchedRequiredParametersDiagnosticLocation;
-    constructor(analyzer: Analyzer, signature: TSignature, arguments_: readonly TArgument[], diagnostics: DiagnosticAcceptor | undefined, unmatchedRequiredParametersDiagnosticLocation: NodeOrDiagnosticLocation | undefined);
+    constructor(analyzer: Analyzer, parameters: readonly TParameter[], arguments_: readonly TArgument[], diagnostics: DiagnosticAcceptor | undefined, unmatchedRequiredParametersDiagnosticLocation: NodeOrDiagnosticLocation | undefined);
     match(): MatchResult<TParameter, TArgument>;
     private matchArgumentsToParameters;
     private reportArgumentDiagnostic;
@@ -18,9 +18,6 @@ export declare class MatchResult<TParameter extends ISignatureParameter, TArgume
     readonly isMatching: boolean;
     constructor(mapping: ReadonlyMap<TArgument, TParameter>, isMatching: boolean);
 }
-export interface ISignature<TParameter extends ISignatureParameter> {
-    getParameters(): readonly TParameter[];
-}
 export interface ISignatureParameter {
     getName(): Name | undefined;
     isOptional(): boolean;

package/build/types/analysis/BaseOverloadResolver.d.ts

@@ -30,7 +30,7 @@ export declare abstract class BaseOverloadResolver<TSignature extends ISignature
     private tryChooseBetterSignatureBasedOnParameterCount;
     private reportAmbiguousAccessDiagnostic;
 }
-export interface ISignature<TParameter extends ISignatureParameter> extends matcher.ISignature<TParameter> {
+export interface ISignature<TParameter extends ISignatureParameter> {
     getTypeParameters(): readonly TypeParameterEntity[];
     getParameters(): readonly TParameter[];
     getReturnType(): types.Type | undefined;

package/build/types/analysis/TypeMemberLookup.d.ts

@@ -58,6 +58,7 @@ export declare enum TypeMemberLookupOptions {
      */
     CheckAccessibilityIgnoringReceiverType = 8,
     NoBaseTypeMembers = 16,
+    DoNotContinueSearchInObjectTypeAfterSearchInAspectType = 32,
     OnlyInstanceOrOnlyStaticMembers = 3,
     NoBaseTypeAndExtensionMembers = 20
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@artel/artc",
-  "version": "0.9.26025-pre-release",
+  "version": "0.9.26026-pre-release",
   "description": "Артель Компилятор | Artel Compiler",
   "author": "Nezaboodka Team <contact@nezaboodka.com>",
   "license": "Apache-2.0",