@artel/artc 0.9.26001 → 0.9.26003

package/build/{chunk-FLMCFMMG.js → chunk-MLUN6742.js}

@@ -780,7 +780,7 @@ var UniqueWithComparatorQuery = class extends Query {
 };
 
 // source/common/Constants.ts
-var ArtelVersion = true ? "0.9.26001" : "";
+var ArtelVersion = true ? "0.9.26003" : "";
 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");
@@ -4579,7 +4579,7 @@ var TypeEntity;
   function isAbstract(entity) {
     switch (entity.typeEntityKind) {
       case 1 /* Structured */:
-        return entity.isAbstract() || entity.getStructuredTypeKind() === 2 /* Aspect */;
+        return entity.isAbstract() || entity.structuredTypeKind === 2 /* Aspect */;
       case 0 /* Function */:
       case 2 /* Parameter */:
       case 3 /* Variant */:
@@ -4594,9 +4594,9 @@ var TypeEntity;
   function isAbstractOrAliasedAbstract(entity) {
     switch (entity.typeEntityKind) {
       case 1 /* Structured */:
-        return entity.isAbstract() || entity.getStructuredTypeKind() === 2 /* Aspect */;
+        return entity.isAbstract() || entity.structuredTypeKind === 2 /* Aspect */;
       case 4 /* Alias */: {
-        const aliasedTypeEntity = entity.getAliasedType().cycleFree.getEntity();
+        const aliasedTypeEntity = entity.getAliasedType().cycleFree.entity;
         return aliasedTypeEntity !== void 0 ? isAbstractOrAliasedAbstract(aliasedTypeEntity) : false;
       }
       case 0 /* Function */:
@@ -4612,7 +4612,7 @@ var TypeEntity;
   function isBasic(entity) {
     switch (entity.typeEntityKind) {
       case 1 /* Structured */:
-        return entity.markedBasic() || entity.getStructuredTypeKind() === 2 /* Aspect */;
+        return entity.markedBasic() || entity.structuredTypeKind === 2 /* Aspect */;
       case 0 /* Function */:
       case 2 /* Parameter */:
       case 3 /* Variant */:
@@ -4627,9 +4627,9 @@ var TypeEntity;
   function isBasicOrAliasedBasic(entity) {
     switch (entity.typeEntityKind) {
       case 1 /* Structured */:
-        return entity.markedBasic() || entity.getStructuredTypeKind() === 2 /* Aspect */;
+        return entity.markedBasic() || entity.structuredTypeKind === 2 /* Aspect */;
       case 4 /* Alias */: {
-        const aliasedTypeEntity = entity.getAliasedType().cycleFree.getEntity();
+        const aliasedTypeEntity = entity.getAliasedType().cycleFree.entity;
         return aliasedTypeEntity !== void 0 ? isBasicOrAliasedBasic(aliasedTypeEntity) : false;
       }
       case 0 /* Function */:
@@ -4829,9 +4829,8 @@ function ifTypeEntityIsFunctionTypeAliasThenFunctionType(entity) {
   if (entity.typeEntityKind === 4 /* Alias */) {
     const aliasedType = entity.getAliasedType().cycleFree;
     if (aliasedType.kind === "function") {
-      const aliasedTypeEntity = aliasedType.getEntity();
-      if (aliasedTypeEntity.subkind === "anonymous") {
-        result = aliasedTypeEntity;
+      if (aliasedType.entity.subkind === "anonymous") {
+        result = aliasedType.entity;
       }
     }
   }
@@ -29281,7 +29280,7 @@ var TypeDeclarationStructured_entity = class {
     return this.entity.getTypeParameters().map((p) => new TypeParameterValue_typeParameter(p));
   }
   getStructuredTypeKind() {
-    return this.entity.getStructuredTypeKind();
+    return this.entity.structuredTypeKind;
   }
   getContainer() {
     return createTypeEntityContainer(this.entity);
@@ -29491,7 +29490,7 @@ var StructuredTypeUsage_type = class {
     this.kind = "structured";
   }
   ifNamedThenEntity() {
-    const entity = this.type.getEntity();
+    const entity = this.type.entity;
     switch (entity.subkind) {
       case "package":
       case "local":
@@ -29503,13 +29502,13 @@ var StructuredTypeUsage_type = class {
     }
   }
   getStructuredTypeKind() {
-    return this.type.getStructuredTypeKind();
+    return this.type.structuredTypeKind;
   }
   getTypeParameterValues() {
-    return Query.from(this.type.getSubstitutions().getTypes()).map((t) => new TypeParameterValue_typeArgument(t)).toArray();
+    return Query.from(this.type.substitutions.getTypes()).map((t) => new TypeParameterValue_typeArgument(t)).toArray();
   }
   getContainer() {
-    return createTypeEntityContainer(this.type.getEntity());
+    return createTypeEntityContainer(this.type.entity);
   }
 };
 var StructuredTypeUsage_entity = class {
@@ -29529,7 +29528,7 @@ var StructuredTypeUsage_entity = class {
     }
   }
   getStructuredTypeKind() {
-    return this.entity.getStructuredTypeKind();
+    return this.entity.structuredTypeKind;
   }
   getTypeParameterValues() {
     return this.entity.getTypeParameters().map((p) => new TypeParameterValue_typeParameter(p));
@@ -29544,10 +29543,10 @@ var VariantTypeUsage_type = class {
     this.kind = "variant";
   }
   ifNamedThenEntity() {
-    return this.type.getEntity();
+    return this.type.entity;
   }
   getContainer() {
-    return createTypeEntityContainer(this.type.getEntity());
+    return createTypeEntityContainer(this.type.entity);
   }
 };
 var VariantTypeUsage_entity = class {
@@ -29574,7 +29573,7 @@ var FunctionTypeUsage_type = class {
     return this.type.isAsync();
   }
   getTypeParameterValues() {
-    return Query.from(this.type.getSubstitutions().getTypes()).map((t) => new TypeParameterValue_typeArgument(t)).toArray();
+    return Query.from(this.type.substitutions.getTypes()).map((t) => new TypeParameterValue_typeArgument(t)).toArray();
   }
   getParameters() {
     return this.type.getParameters().map((p) => new ParameterDeclaration_typeMember(p));
@@ -29583,7 +29582,7 @@ var FunctionTypeUsage_type = class {
     return this.type.getReturnType();
   }
   getContainer() {
-    return createTypeEntityContainer(this.type.getEntity());
+    return createTypeEntityContainer(this.type.entity);
   }
 };
 var FunctionTypeUsage_entity = class {
@@ -29616,16 +29615,16 @@ var AliasTypeUsage_type = class {
     this.kind = "alias";
   }
   getEntity() {
-    return this.type.getEntity();
+    return this.type.entity;
   }
   getTypeParameterValues() {
-    return Query.from(this.type.getSubstitutions().getTypes()).map((t) => new TypeParameterValue_typeArgument(t)).toArray();
+    return Query.from(this.type.substitutions.getTypes()).map((t) => new TypeParameterValue_typeArgument(t)).toArray();
   }
   getAliasedType() {
     return this.type.getAliasedType();
   }
   getContainer() {
-    return createTypeEntityContainer(this.type.getEntity());
+    return createTypeEntityContainer(this.type.entity);
   }
 };
 var AliasTypeUsage_entity = class {
@@ -29652,16 +29651,16 @@ var ReducedTypeUsage_type = class {
     this.kind = "reduced";
   }
   getEntity() {
-    return this.type.getEntity();
+    return this.type.entity;
   }
   getTypeParameterValues() {
-    return Query.from(this.type.getSubstitutions().getTypes()).map((t) => new TypeParameterValue_typeArgument(t)).toArray();
+    return Query.from(this.type.substitutions.getTypes()).map((t) => new TypeParameterValue_typeArgument(t)).toArray();
   }
   getReductionSource() {
     return this.type.getReductionSource();
   }
   getContainer() {
-    return createTypeEntityContainer(this.type.getEntity());
+    return createTypeEntityContainer(this.type.entity);
   }
 };
 var ReducedTypeUsage_entity = class {
@@ -29688,7 +29687,7 @@ var ParameterTypeUsage_type = class {
     this.kind = "parameter";
   }
   getEntity() {
-    return this.type.getEntity();
+    return this.type.entity;
   }
   isNullExcluded() {
     return this.type.isNullExcluded;
@@ -30524,7 +30523,7 @@ var DisplayServiceA = class extends BaseDisplayService {
     }
     return types.map((t) => {
       let typeText = this.displayTypeInternal(t, lessDetailsTypeDisplayOptions);
-      if (t.kind === "function" && t.getEntity().getNaming().kind === "anonymous") {
+      if (t.kind === "function" && t.entity.getNaming().kind === "anonymous") {
         typeText = `(${typeText})`;
       }
       return typeText;
@@ -31145,7 +31144,7 @@ var DisplayServiceM = class extends BaseDisplayService {
     }
     return types.map((t) => {
       let typeText = this.displayTypeInternal(t, lessDetailsTypeDisplayOptions2);
-      if (t.kind === "function" && t.getEntity().getNaming().kind === "anonymous") {
+      if (t.kind === "function" && t.entity.getNaming().kind === "anonymous") {
         typeText = `(${typeText})`;
       }
       return typeText;
@@ -31600,9 +31599,8 @@ var OriginalBaseAspectTypes = class extends BaseAspectTypes {
           for (const declaredAspect of this.declared) {
             const unaliased = declaredAspect.unaliasAndGetReductionSource();
             if (unaliased.kind === "structured") {
-              const baseTypeEntity = unaliased.getEntity();
-              baseTypeEntity.getBaseAspectTypes().resolveBaseAspectTypes(circularityTrackingStack);
-              baseTypeEntity.getBaseObjectType().resolveBaseObjectType(circularityTrackingStack);
+              unaliased.entity.getBaseAspectTypes().resolveBaseAspectTypes(circularityTrackingStack);
+              unaliased.entity.getBaseObjectType().resolveBaseObjectType(circularityTrackingStack);
             }
             if (!circularityTrackingStack[stackIndex]) {
               cycleFreeAspects.push(declaredAspect);
@@ -31670,9 +31668,8 @@ var OriginalBaseObjectType = class extends BaseObjectType {
           if (this.declared !== void 0) {
             const declared = this.declared.unaliasAndGetReductionSource();
             if (declared.kind === "structured") {
-              const baseTypeEntity = declared.getEntity();
-              baseTypeEntity.getBaseObjectType().resolveBaseObjectType(circularityTrackingStack);
-              baseTypeEntity.getBaseAspectTypes().resolveBaseAspectTypes(circularityTrackingStack);
+              declared.entity.getBaseObjectType().resolveBaseObjectType(circularityTrackingStack);
+              declared.entity.getBaseAspectTypes().resolveBaseAspectTypes(circularityTrackingStack);
             }
           }
           let result;
@@ -31825,12 +31822,12 @@ var TypeMemberEntity;
 ((TypeMemberEntity12) => {
   function isAspectMember(entity) {
     const containingEntity = entity.getContainingEntity();
-    return containingEntity.kind === 2 /* Type */ && containingEntity.typeEntityKind === 1 /* Structured */ && containingEntity.getStructuredTypeKind() === 2 /* Aspect */;
+    return containingEntity.kind === 2 /* Type */ && containingEntity.typeEntityKind === 1 /* Structured */ && containingEntity.structuredTypeKind === 2 /* Aspect */;
   }
   TypeMemberEntity12.isAspectMember = isAspectMember;
   function isClassMember(entity) {
     const containingEntity = entity.getContainingEntity();
-    return containingEntity.kind === 2 /* Type */ && containingEntity.typeEntityKind === 1 /* Structured */ && containingEntity.getStructuredTypeKind() === 0 /* Class */;
+    return containingEntity.kind === 2 /* Type */ && containingEntity.typeEntityKind === 1 /* Structured */ && containingEntity.structuredTypeKind === 0 /* Class */;
   }
   TypeMemberEntity12.isClassMember = isClassMember;
   function isReducedTypeMember(entity) {
@@ -31839,15 +31836,7 @@ var TypeMemberEntity;
   }
   TypeMemberEntity12.isReducedTypeMember = isReducedTypeMember;
   function isBasic(entity) {
-    switch (entity.kind) {
-      case 0 /* Variable */:
-      case 1 /* Function */:
-      case 3 /* Indexer */:
-      case 4 /* DereferenceOperator */:
-        return !entity.isStatic() && (entity.markedBasic() || entity.markedAbstract());
-      default:
-        Debug.never(entity);
-    }
+    return !entity.isStatic() && (entity.markedBasic() || entity.markedAbstract());
   }
   TypeMemberEntity12.isBasic = isBasic;
   function isAbstract(entity) {
@@ -32199,32 +32188,32 @@ var EntityLocalizationContext = class {
     switch (type.kind) {
       case "structured":
         return this.analyzer.typeFactory.getStructuredType(
-          this.getLocalizedStructuredTypeEntity(type.getEntity()),
-          this.createLocalizedSubstitutions(type.getSubstitutions())
+          this.getLocalizedStructuredTypeEntity(type.entity),
+          this.createLocalizedSubstitutions(type.substitutions)
         );
       case "function":
         return this.analyzer.typeFactory.getFunctionType(
-          this.getLocalizedFunctionTypeEntity(type.getEntity()),
-          this.createLocalizedSubstitutions(type.getSubstitutions())
+          this.getLocalizedFunctionTypeEntity(type.entity),
+          this.createLocalizedSubstitutions(type.substitutions)
         );
       case "variant":
         return this.analyzer.typeFactory.getVariantType(
-          this.getLocalizedVariantTypeEntity(type.getEntity()),
-          this.createLocalizedSubstitutions(type.getSubstitutions())
+          this.getLocalizedVariantTypeEntity(type.entity),
+          this.createLocalizedSubstitutions(type.substitutions)
         );
       case "alias":
         return this.analyzer.typeFactory.getAliasType(
-          this.getLocalizedAliasTypeEntity(type.getEntity()),
-          this.createLocalizedSubstitutions(type.getSubstitutions())
+          this.getLocalizedAliasTypeEntity(type.entity),
+          this.createLocalizedSubstitutions(type.substitutions)
         );
       case "reduced":
         return this.analyzer.typeFactory.getReducedType(
-          this.getLocalizedReducedTypeEntity(type.getEntity()),
-          this.createLocalizedSubstitutions(type.getSubstitutions())
+          this.getLocalizedReducedTypeEntity(type.entity),
+          this.createLocalizedSubstitutions(type.substitutions)
         );
       case "parameter":
         return this.analyzer.typeFactory.getParameterType(
-          this.getLocalizedTypeParameterEntity(type.getEntity()),
+          this.getLocalizedTypeParameterEntity(type.entity),
           type.isNullExcluded
         );
       case "unresolved":
@@ -32472,10 +32461,10 @@ var OriginalAliasedType = class extends AliasedType {
       case "parameter":
         break;
       case "alias":
-        type.getEntity().getAliasedType().resolveAliasedType(circularityTrackingStack);
+        type.entity.getAliasedType().resolveAliasedType(circularityTrackingStack);
         break;
       case "reduced":
-        type.getEntity().getReductionSource().resolveReductionSource(circularityTrackingStack);
+        type.entity.getReductionSource().resolveReductionSource(circularityTrackingStack);
         break;
       case "union":
         for (const constituentType of type.originalTypes) {
@@ -32904,10 +32893,10 @@ var OriginalReductionSource = class extends ReductionSource {
       case "parameter":
         break;
       case "alias":
-        type.getEntity().getAliasedType().resolveAliasedType(circularityTrackingStack);
+        type.entity.getAliasedType().resolveAliasedType(circularityTrackingStack);
         break;
       case "reduced":
-        type.getEntity().getReductionSource().resolveReductionSource(circularityTrackingStack);
+        type.entity.getReductionSource().resolveReductionSource(circularityTrackingStack);
         break;
       case "union":
         for (const constituentType of type.originalTypes) {
@@ -33129,7 +33118,7 @@ var OriginalTypeParameterConstraint = class extends TypeParameterConstraint {
         this.state = { kind: "resolving", stackIndex: circularityTrackingStack.length };
         circularityTrackingStack.push(false);
         try {
-          this.declared.getEntity().getConstraint().resolveConstraint(circularityTrackingStack);
+          this.declared.entity.getConstraint().resolveConstraint(circularityTrackingStack);
           let result;
           if (circularityTrackingStack[this.state.stackIndex]) {
             result = new CycleFreeConstraintResolutionResult(void 0, true);
@@ -34327,14 +34316,14 @@ var IntrinsicPackageStructuredTypeEntity = class {
   /**
    * После создания необходимо вызывать setMembers.
    */
-  constructor(analyzer, name, containingPackage, typeParameters, isBasic_, isAbstract_, _structuredTypeKind, baseObjectType, baseAspectTypes, isHidden_, substitutionApplicationMode_) {
+  constructor(analyzer, name, containingPackage, typeParameters, isBasic_, isAbstract_, structuredTypeKind_, baseObjectType, baseAspectTypes, isHidden_, substitutionApplicationMode_) {
     this.analyzer = analyzer;
     this.name = name;
     this.containingPackage = containingPackage;
     this.typeParameters = typeParameters;
     this.isBasic_ = isBasic_;
     this.isAbstract_ = isAbstract_;
-    this._structuredTypeKind = _structuredTypeKind;
+    this.structuredTypeKind_ = structuredTypeKind_;
     this.baseObjectType = baseObjectType;
     this.baseAspectTypes = baseAspectTypes;
     this.isHidden_ = isHidden_;
@@ -34345,6 +34334,9 @@ var IntrinsicPackageStructuredTypeEntity = class {
     this.safeBaseObjectType = new Cached();
     this.safeBaseAspectTypes = new Cached();
   }
+  get structuredTypeKind() {
+    return this.structuredTypeKind_;
+  }
   getNaming() {
     return new EntityNaming_named(this.name);
   }
@@ -34374,9 +34366,6 @@ var IntrinsicPackageStructuredTypeEntity = class {
   isAbstract() {
     return this.isAbstract_;
   }
-  getStructuredTypeKind() {
-    return this._structuredTypeKind;
-  }
   getArity() {
     return this.typeParameters.length;
   }
@@ -34436,10 +34425,10 @@ var IntrinsicAnonymousStructuredTypeEntity = class {
   /**
    * После создания необходимо вызывать setMembers.
    */
-  constructor(analyzer, typeParameters, _structuredTypeKind, baseObjectType, baseAspectTypes, isHidden_, substitutionApplicationMode, containingPackage) {
+  constructor(analyzer, typeParameters, structuredTypeKind_, baseObjectType, baseAspectTypes, isHidden_, substitutionApplicationMode, containingPackage) {
     this.analyzer = analyzer;
     this.typeParameters = typeParameters;
-    this._structuredTypeKind = _structuredTypeKind;
+    this.structuredTypeKind_ = structuredTypeKind_;
     this.baseObjectType = baseObjectType;
     this.baseAspectTypes = baseAspectTypes;
     this.isHidden_ = isHidden_;
@@ -34451,6 +34440,9 @@ var IntrinsicAnonymousStructuredTypeEntity = class {
     this.safeBaseObjectType = new Cached();
     this.safeBaseAspectTypes = new Cached();
   }
+  get structuredTypeKind() {
+    return this.structuredTypeKind_;
+  }
   getNaming() {
     return new EntityNaming_anonymous();
   }
@@ -34474,9 +34466,6 @@ var IntrinsicAnonymousStructuredTypeEntity = class {
   isAbstract() {
     return false;
   }
-  getStructuredTypeKind() {
-    return this._structuredTypeKind;
-  }
   getArity() {
     return this.typeParameters.length;
   }
@@ -41070,7 +41059,7 @@ var EntityMap = class _EntityMap {
             this.analyzer.originalWellKnownDeclarations.fieldProxy
           ));
           if (proxyTag !== void 0) {
-            const originalTagEntity = proxyTag.type.getEntity();
+            const originalTagEntity = proxyTag.type.entity;
             Debug.assertNotNull(originalTagEntity, "\u0422\u0438\u043F \u0442\u0435\u0433\u0430 \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u0441\u043E\u044E\u0437\u043D\u044B\u043C \u0438\u043B\u0438 \u043D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u044B\u043C.");
             result.details.isProxiedField = {
               tagType: this.getTypeOrExtensionEntity(originalTagEntity),
@@ -41292,8 +41281,7 @@ var EntityMap = class _EntityMap {
             Debug.never(entity);
         }
         result.typeOrExtensionKind = 0 /* StructuredType */;
-        const structuredTypeKind = entity.getStructuredTypeKind();
-        switch (structuredTypeKind) {
+        switch (entity.structuredTypeKind) {
           case 0 /* Class */:
             result.details.structuredTypeKind = 0 /* Class */;
             break;
@@ -41304,16 +41292,15 @@ var EntityMap = class _EntityMap {
             result.details.structuredTypeKind = 2 /* Aspect */;
             break;
           default:
-            Debug.never(structuredTypeKind);
+            Debug.never(entity.structuredTypeKind);
         }
-        const baseTypeEntity = entity.getBaseObjectType().cycleFree?.getEntity();
+        const baseTypeEntity = entity.getBaseObjectType().cycleFree?.entity;
         if (baseTypeEntity !== void 0) {
           result.baseObjectType = this.unaliasTypeEntity(this.getTypeOrExtensionEntity(baseTypeEntity));
         }
         result.baseAspectTypes = Query.from(entity.getBaseAspectTypes().cycleFree).mapAndFilter((t) => {
-          const entity2 = t.getEntity();
-          if (entity2 !== void 0) {
-            return this.unaliasTypeEntity(this.getTypeOrExtensionEntity(entity2));
+          if (t.entity !== void 0) {
+            return this.unaliasTypeEntity(this.getTypeOrExtensionEntity(t.entity));
           } else {
             return void 0;
           }
@@ -41342,7 +41329,7 @@ var EntityMap = class _EntityMap {
         result.containingPackage = this.getContainingPackageAndAccumulateIfMember(entity, result);
         result.name = this.getEntityNameText(entity);
         result.typeOrExtensionKind = 3 /* VariantType */;
-        const baseTypeEntity = entity.getBaseObjectType().cycleFree?.getEntity();
+        const baseTypeEntity = entity.getBaseObjectType().cycleFree?.entity;
         if (baseTypeEntity !== void 0) {
           result.baseObjectType = this.unaliasTypeEntity(this.getTypeOrExtensionEntity(baseTypeEntity));
         }
@@ -41384,7 +41371,7 @@ var EntityMap = class _EntityMap {
         result.containingPackage = this.getContainingPackageAndAccumulateIfMember(entity, result);
         result.name = EmitPhaseName.ofAnonymousType(result.containingPackage.locale);
         result.typeOrExtensionKind = 4 /* FunctionType */;
-        const baseTypeEntity = entity.getBaseObjectType().cycleFree?.getEntity();
+        const baseTypeEntity = entity.getBaseObjectType().cycleFree?.entity;
         if (baseTypeEntity !== void 0) {
           result.baseObjectType = this.unaliasTypeEntity(this.getTypeOrExtensionEntity(baseTypeEntity));
         }
@@ -41489,8 +41476,8 @@ var EntityMap = class _EntityMap {
       case "alias":
       case "reduced":
       case "parameter": {
-        const entity = this.getTypeOrExtensionEntity(type.getEntity());
-        const typeArguments = Query.from(type.getSubstitutions().getTypes()).map((t) => this.getType(t)).toArray();
+        const entity = this.getTypeOrExtensionEntity(type.entity);
+        const typeArguments = Query.from(type.substitutions.getTypes()).map((t) => this.getType(t)).toArray();
         return new SimpleType(entity, typeArguments);
       }
       case "union": {
@@ -49585,7 +49572,7 @@ var IrBuilderA = class {
         const args = this.buildArgumentList(expression.argumentList, parameters);
         const isAsyncFunctionCall = meaning.type.isAsync();
         const returnType = this.entityMap.getType(meaning.type.getReturnType());
-        const isCallOfFunctionWithObjectParameter = findObjectParameter(meaning.type.getEntity().getParameters()) !== void 0;
+        const isCallOfFunctionWithObjectParameter = findObjectParameter(meaning.type.entity.getParameters()) !== void 0;
         return callExpression(
           irExpression,
           isOptionalAccess,
@@ -50128,17 +50115,17 @@ var IrBuilderA = class {
   getEntityFromType(type) {
     switch (type.kind) {
       case "structured":
-        return this.entityMap.getStructuredTypeEntity(type.getEntity());
+        return this.entityMap.getStructuredTypeEntity(type.entity);
       case "variant":
-        return this.entityMap.getVariantTypeEntity(type.getEntity());
+        return this.entityMap.getVariantTypeEntity(type.entity);
       case "function":
-        return this.entityMap.getFunctionTypeEntity(type.getEntity());
+        return this.entityMap.getFunctionTypeEntity(type.entity);
       case "alias":
-        return this.entityMap.getAliasTypeEntity(type.getEntity());
+        return this.entityMap.getAliasTypeEntity(type.entity);
       case "reduced":
-        return this.entityMap.getReducedTypeEntity(type.getEntity());
+        return this.entityMap.getReducedTypeEntity(type.entity);
       case "parameter":
-        return this.entityMap.getTypeParameterEntity(type.getEntity());
+        return this.entityMap.getTypeParameterEntity(type.entity);
       case "unresolved":
         throw new EmitterError("Invalid or unresolved type");
       case "substitution-stub":
@@ -51798,6 +51785,51 @@ __decorateClass([
 ], _IrToJs.prototype, "convertDecorator", 1);
 var IrToJs = _IrToJs;
 
+// source/analysis/m/TextIdentity.ts
+var TextIdentity = class _TextIdentity {
+  static keyFromTextLiteralSuffix(node) {
+    let result;
+    if (node.suffix !== void 0 && node.suffix.value !== "!") {
+      result = Name.parse(node.suffix.value.slice(1)).key;
+    }
+    return result;
+  }
+  static keyFromLocalizableTextLiteral(node) {
+    const key = _TextIdentity.keyFromTextLiteralSuffix(node);
+    if (key !== void 0) {
+      return key;
+    }
+    return unescapeText(withoutQuotes(node.text.value));
+  }
+  static keyFromLocalizableTextTemplateLiteral(node) {
+    const key = _TextIdentity.keyFromTextLiteralSuffix(node);
+    if (key !== void 0) {
+      return key;
+    }
+    const fragments = [unescapeText(withoutTemplateQuotes(node.head.value))];
+    node.spanList.spans.forEach((x) => fragments.push(unescapeText(withoutTemplateQuotes(x.text.value))));
+    return fragments.join("_");
+  }
+  static keyFromTextTranslationSource(node) {
+    const key = _TextIdentity.keyFromTextLiteralSuffix(node);
+    if (key !== void 0) {
+      return key;
+    }
+    switch (node.kind) {
+      case 1120 /* TranslationTextLiteral */: {
+        return unescapeText(withoutQuotes(node.text.value));
+      }
+      case 1121 /* TranslationTextTemplate */: {
+        const fragments = [unescapeText(withoutTemplateQuotes(node.head.value))];
+        node.spanList.spans.forEach((x) => fragments.push(unescapeText(withoutTemplateQuotes(x.text.value))));
+        return fragments.join("_");
+      }
+      default:
+        Debug.never(node);
+    }
+  }
+};
+
 // source/analysis/m/TreeQuery.ts
 var TreeQuery2 = class {
   static getSourceFile(node, analyzer) {
@@ -51869,51 +51901,6 @@ var TypeMemberQuery2 = class {
   }
 };
 
-// source/analysis/m/TextIdentity.ts
-var TextIdentity = class _TextIdentity {
-  static keyFromTextLiteralSuffix(node) {
-    let result;
-    if (node.suffix !== void 0 && node.suffix.value !== "!") {
-      result = Name.parse(node.suffix.value.slice(1)).key;
-    }
-    return result;
-  }
-  static keyFromLocalizableTextLiteral(node) {
-    const key = _TextIdentity.keyFromTextLiteralSuffix(node);
-    if (key !== void 0) {
-      return key;
-    }
-    return unescapeText(withoutQuotes(node.text.value));
-  }
-  static keyFromLocalizableTextTemplateLiteral(node) {
-    const key = _TextIdentity.keyFromTextLiteralSuffix(node);
-    if (key !== void 0) {
-      return key;
-    }
-    const fragments = [unescapeText(withoutTemplateQuotes(node.head.value))];
-    node.spanList.spans.forEach((x) => fragments.push(unescapeText(withoutTemplateQuotes(x.text.value))));
-    return fragments.join("_");
-  }
-  static keyFromTextTranslationSource(node) {
-    const key = _TextIdentity.keyFromTextLiteralSuffix(node);
-    if (key !== void 0) {
-      return key;
-    }
-    switch (node.kind) {
-      case 1120 /* TranslationTextLiteral */: {
-        return unescapeText(withoutQuotes(node.text.value));
-      }
-      case 1121 /* TranslationTextTemplate */: {
-        const fragments = [unescapeText(withoutTemplateQuotes(node.head.value))];
-        node.spanList.spans.forEach((x) => fragments.push(unescapeText(withoutTemplateQuotes(x.text.value))));
-        return fragments.join("_");
-      }
-      default:
-        Debug.never(node);
-    }
-  }
-};
-
 // source/emitter/IrBuilderM.ts
 var IrBuilderM = class {
   constructor(ectx, entityMap, declarationUsageInfoOfAllPackages) {
@@ -53131,7 +53118,7 @@ var IrBuilderM = class {
         const args = this.buildArgumentList(expression.argumentList, parameters);
         const isAsyncFunctionCall = meaning.type.isAsync();
         const returnType = this.entityMap.getType(meaning.type.getReturnType());
-        const isCallOfFunctionWithObjectParameter = findObjectParameter(meaning.type.getEntity().getParameters()) !== void 0;
+        const isCallOfFunctionWithObjectParameter = findObjectParameter(meaning.type.entity.getParameters()) !== void 0;
         return callExpression(
           irExpression,
           isOptionalAccess,
@@ -53644,17 +53631,17 @@ var IrBuilderM = class {
   getEntityFromType(type) {
     switch (type.kind) {
       case "structured":
-        return this.entityMap.getStructuredTypeEntity(type.getEntity());
+        return this.entityMap.getStructuredTypeEntity(type.entity);
       case "variant":
-        return this.entityMap.getVariantTypeEntity(type.getEntity());
+        return this.entityMap.getVariantTypeEntity(type.entity);
       case "function":
-        return this.entityMap.getFunctionTypeEntity(type.getEntity());
+        return this.entityMap.getFunctionTypeEntity(type.entity);
       case "alias":
-        return this.entityMap.getAliasTypeEntity(type.getEntity());
+        return this.entityMap.getAliasTypeEntity(type.entity);
       case "reduced":
-        return this.entityMap.getReducedTypeEntity(type.getEntity());
+        return this.entityMap.getReducedTypeEntity(type.entity);
       case "parameter":
-        return this.entityMap.getTypeParameterEntity(type.getEntity());
+        return this.entityMap.getTypeParameterEntity(type.entity);
       case "unresolved":
         throw new EmitterError("Invalid or unresolved type");
       case "substitution-stub":
@@ -55019,7 +55006,7 @@ var BaseType = class {
   }
   isPossiblyAliasedOrReducedStructure() {
     const type = this.asType.unaliasAndGetReductionSource();
-    return type.kind === "structured" && type.getStructuredTypeKind() === 1 /* Structure */;
+    return type.kind === "structured" && type.structuredTypeKind === 1 /* Structure */;
   }
   toString() {
     return new DisplayService(this.analyzer, 1 /* Ru */, DefaultDialect).displayType(this.asType);
@@ -55044,9 +55031,6 @@ var AliasType = class extends BaseType {
   getTypeParameters() {
     return this.entity.getTypeParameters();
   }
-  getSubstitutions() {
-    return this.substitutions;
-  }
   applySubstitutions(substitutions) {
     if (substitutions.size === 0) {
       return this;
@@ -55073,9 +55057,6 @@ var AliasType = class extends BaseType {
   equals(other, considerLocale = false) {
     return this === other || other.kind === "alias" && (considerLocale ? this.entity === other.entity : this.entity.getOriginalEntity() === other.entity.getOriginalEntity()) && this.substitutions.equals(other.substitutions, considerLocale);
   }
-  getEntity() {
-    return this.entity;
-  }
 };
 
 // source/types/collections/TypeDictionary.ts
@@ -55165,7 +55146,7 @@ var TypeDictionary = class {
     if (key.kind === "function") {
       return this.bucketForTypesWithoutEntity;
     }
-    let entity = key.getEntity();
+    let entity = key.entity;
     if (entity === void 0) {
       return this.bucketForTypesWithoutEntity;
     }
@@ -55180,7 +55161,7 @@ var TypeDictionary = class {
     return bucket;
   }
   getExistingBucket(key) {
-    let entity = key.getEntity();
+    let entity = key.entity;
     if (entity === void 0) {
       return this.bucketForTypesWithoutEntity;
     }
@@ -55483,7 +55464,7 @@ var TypeSet = class _TypeSet {
     if (key.kind === "function") {
       return this.bucketForTypesWithoutEntity;
     }
-    let entity = key.getEntity();
+    let entity = key.entity;
     if (entity === void 0) {
       return this.bucketForTypesWithoutEntity;
     }
@@ -55498,7 +55479,7 @@ var TypeSet = class _TypeSet {
     return bucket;
   }
   getExistingBucket(key) {
-    let entity = key.getEntity();
+    let entity = key.entity;
     if (entity === void 0) {
       return this.bucketForTypesWithoutEntity;
     }
@@ -55954,9 +55935,6 @@ var FunctionType = class extends BaseType {
   getTypeParameters() {
     return this.entity.getTypeParameters();
   }
-  getSubstitutions() {
-    return this.substitutions;
-  }
   applySubstitutions(substitutions) {
     if (substitutions.size === 0) {
       return this;
@@ -56001,9 +55979,6 @@ var FunctionType = class extends BaseType {
     }
     return (considerLocale ? this.entity === other.entity : this.entity.getOriginalEntity() === other.entity.getOriginalEntity()) && this.substitutions.equals(other.substitutions, considerLocale);
   }
-  getEntity() {
-    return this.entity;
-  }
   isAsync() {
     return this.entity.isAsync();
   }
@@ -56026,6 +56001,12 @@ var IntersectionType = class extends BaseType {
     this.unaliasedFlattenedTypes_ = new Cached();
     this.originalTypes = originalTypes;
   }
+  get entity() {
+    return void 0;
+  }
+  get substitutions() {
+    return Substitutions.empty();
+  }
   get unaliasedFlattenedTypes() {
     return this.unaliasedFlattenedTypes_.getOrInsertWith(() => this.unaliasAndFlattenTypes());
   }
@@ -56039,9 +56020,6 @@ var IntersectionType = class extends BaseType {
       (t1, t2) => t1.equals(t2, considerLocale)
     );
   }
-  getSubstitutions() {
-    return Substitutions.empty();
-  }
   applySubstitutions(substitutions) {
     if (substitutions.size === 0) {
       return this;
@@ -56058,9 +56036,6 @@ var IntersectionType = class extends BaseType {
     }
     return this.analyzer.typeFactory.getIntersectionType(types);
   }
-  getEntity() {
-    return void 0;
-  }
   unaliasAndFlattenTypes() {
     const originalTypes = this.originalTypes;
     if (!originalTypes.some((t) => t.kind === "alias")) {
@@ -56088,6 +56063,9 @@ var ParameterType = class extends BaseType {
     this.entity = entity;
     this.isNullExcluded = isNullExcluded;
   }
+  get substitutions() {
+    return Substitutions.empty();
+  }
   /**
    * Ограничение параметра типа с учётом флага {@link isNullExcluded}.
    */
@@ -56103,12 +56081,6 @@ var ParameterType = class extends BaseType {
   get asType() {
     return this;
   }
-  getSubstitutions() {
-    return Substitutions.empty();
-  }
-  getEntity() {
-    return this.entity;
-  }
   applySubstitutions(substitutions) {
     return substitutions.map.get(this.entity.getOriginalEntity()) ?? this;
   }
@@ -56143,9 +56115,6 @@ var ReducedType = class extends BaseType {
   getTypeParameters() {
     return this.entity.getTypeParameters();
   }
-  getSubstitutions() {
-    return this.substitutions;
-  }
   applySubstitutions(substitutions) {
     if (substitutions.size === 0) {
       return this;
@@ -56172,9 +56141,6 @@ var ReducedType = class extends BaseType {
   equals(other, considerLocale = false) {
     return this === other || other.kind === "reduced" && (considerLocale ? this.entity === other.entity : this.entity.getOriginalEntity() === other.entity.getOriginalEntity()) && this.substitutions.equals(other.substitutions, considerLocale);
   }
-  getEntity() {
-    return this.entity;
-  }
 };
 
 // source/types/StandardTypes.ts
@@ -56358,15 +56324,15 @@ var StructuredType = class extends BaseType {
     this.entity = entity;
     this.substitutions = substitutions;
   }
+  get structuredTypeKind() {
+    return this.entity.structuredTypeKind;
+  }
   get isNullType() {
     return this.entity.getOriginalEntity() === this.analyzer.originalWellKnownDeclarations.nullEntity;
   }
   get asType() {
     return this;
   }
-  getSubstitutions() {
-    return this.substitutions;
-  }
   getTypeParameters() {
     return this.entity.getTypeParameters();
   }
@@ -56393,17 +56359,14 @@ var StructuredType = class extends BaseType {
     }
     return this.analyzer.typeFactory.getStructuredType(this.entity, newSubstitutions);
   }
-  getStructuredTypeKind() {
-    return this.entity.getStructuredTypeKind();
-  }
   isClass() {
-    return this.entity.getStructuredTypeKind() === 0 /* Class */;
+    return this.entity.structuredTypeKind === 0 /* Class */;
   }
   isStructure() {
-    return this.entity.getStructuredTypeKind() === 1 /* Structure */;
+    return this.entity.structuredTypeKind === 1 /* Structure */;
   }
   isAspect() {
-    return this.entity.getStructuredTypeKind() === 2 /* Aspect */;
+    return this.entity.structuredTypeKind === 2 /* Aspect */;
   }
   markedBasic() {
     return this.entity.markedBasic();
@@ -56412,10 +56375,7 @@ var StructuredType = class extends BaseType {
     return this.entity.isAbstract();
   }
   equals(other, considerLocale = false) {
-    return this === other || other.kind === "structured" && (considerLocale ? this.entity === other.entity : this.entity.getOriginalEntity() === other.entity.getOriginalEntity()) && this.substitutions.equals(other.getSubstitutions(), considerLocale);
-  }
-  getEntity() {
-    return this.entity;
+    return this === other || other.kind === "structured" && (considerLocale ? this.entity === other.entity : this.entity.getOriginalEntity() === other.entity.getOriginalEntity()) && this.substitutions.equals(other.substitutions, considerLocale);
   }
   getBaseObjectType() {
     return this.baseObjectType.getOrInsertWith(() => this.entity.getBaseObjectType().cycleFree?.applySubstitutions(this.substitutions));
@@ -56432,21 +56392,21 @@ var SubstitutionStubType = class extends BaseType {
     this.kind = "substitution-stub";
     this.index = index;
   }
+  get entity() {
+    return void 0;
+  }
+  get substitutions() {
+    return Substitutions.empty();
+  }
   get asType() {
     return this;
   }
   equals(other, _considerLocale = false) {
     return other.kind === "substitution-stub" && this.index === other.index;
   }
-  getSubstitutions() {
-    return Substitutions.empty();
-  }
   applySubstitutions(_substitutions) {
     return this;
   }
-  getEntity() {
-    return void 0;
-  }
 };
 
 // source/types/UnionType.ts
@@ -56457,6 +56417,12 @@ var UnionType = class extends BaseType {
     this.unaliasedFlattenedTypes_ = new Cached();
     this.originalTypes = originalTypes;
   }
+  get entity() {
+    return void 0;
+  }
+  get substitutions() {
+    return Substitutions.empty();
+  }
   get unaliasedFlattenedTypes() {
     return this.unaliasedFlattenedTypes_.getOrInsertWith(() => this.unaliasAndFlattenTypes());
   }
@@ -56470,9 +56436,6 @@ var UnionType = class extends BaseType {
       (t1, t2) => t1.equals(t2, considerLocale)
     );
   }
-  getSubstitutions() {
-    return Substitutions.empty();
-  }
   applySubstitutions(substitutions) {
     if (substitutions.size === 0) {
       return this;
@@ -56489,9 +56452,6 @@ var UnionType = class extends BaseType {
     }
     return this.analyzer.typeFactory.getUnionType(types);
   }
-  getEntity() {
-    return void 0;
-  }
   unaliasAndFlattenTypes() {
     const originalTypes = this.originalTypes;
     if (!originalTypes.some((t) => t.kind === "alias")) {
@@ -56516,21 +56476,21 @@ var UnresolvedType = class extends BaseType {
     super(analyzer);
     this.kind = "unresolved";
   }
+  get entity() {
+    return void 0;
+  }
+  get substitutions() {
+    return Substitutions.empty();
+  }
   get asType() {
     return this;
   }
   equals(other, _considerLocale = false) {
     return other.kind === "unresolved";
   }
-  getSubstitutions() {
-    return Substitutions.empty();
-  }
   applySubstitutions(_substitutions) {
     return this;
   }
-  getEntity() {
-    return void 0;
-  }
 };
 
 // source/types/VariantType.ts
@@ -56544,9 +56504,6 @@ var VariantType = class extends BaseType {
   get asType() {
     return this;
   }
-  getSubstitutions() {
-    return this.substitutions;
-  }
   applySubstitutions(substitutions) {
     if (substitutions.size === 0) {
       return this;
@@ -56570,9 +56527,6 @@ var VariantType = class extends BaseType {
     }
     return this.analyzer.typeFactory.getVariantType(this.entity, newSubstitutions);
   }
-  getEntity() {
-    return this.entity;
-  }
   equals(other, considerLocale = false) {
     return this === other || other.kind === "variant" && (considerLocale ? this.entity === other.entity : this.entity.getOriginalEntity() === other.entity.getOriginalEntity()) && this.substitutions.equals(other.substitutions, considerLocale);
   }
@@ -57586,6 +57540,9 @@ var TranslatedPackageStructuredTypeEntity = class {
     this.translation = translation;
     this.name = name;
   }
+  get structuredTypeKind() {
+    return this.originalEntity.structuredTypeKind;
+  }
   get localizationContext() {
     return this.translation.translationPackage.getLocalizationContext();
   }
@@ -57619,9 +57576,6 @@ var TranslatedPackageStructuredTypeEntity = class {
   isAbstract() {
     return this.originalEntity.isAbstract();
   }
-  getStructuredTypeKind() {
-    return this.originalEntity.getStructuredTypeKind();
-  }
   getArity() {
     return this.originalEntity.getArity();
   }
@@ -57656,6 +57610,9 @@ var TranslatedAnonymousStructuredTypeEntity = class {
     this.originalEntity = originalEntity;
     this.translation = translation;
   }
+  get structuredTypeKind() {
+    return this.originalEntity.structuredTypeKind;
+  }
   get localizationContext() {
     return this.translation.translationPackage.getLocalizationContext();
   }
@@ -57693,9 +57650,6 @@ var TranslatedAnonymousStructuredTypeEntity = class {
   isAbstract() {
     return this.originalEntity.isAbstract();
   }
-  getStructuredTypeKind() {
-    return this.originalEntity.getStructuredTypeKind();
-  }
   getArity() {
     return this.originalEntity.getArity();
   }
@@ -57731,6 +57685,9 @@ var TranslatedLocalStructuredTypeEntity = class {
     this.translation = translation;
     this.name = name;
   }
+  get structuredTypeKind() {
+    return this.originalEntity.structuredTypeKind;
+  }
   get localizationContext() {
     return this.translation.translationPackage.getLocalizationContext();
   }
@@ -57771,9 +57728,6 @@ var TranslatedLocalStructuredTypeEntity = class {
   isAbstract() {
     return this.originalEntity.isAbstract();
   }
-  getStructuredTypeKind() {
-    return this.originalEntity.getStructuredTypeKind();
-  }
   getArity() {
     return this.originalEntity.getArity();
   }
@@ -60700,9 +60654,8 @@ var AccessibilityCheck = class {
         }
         let result = this.isTypeDerivedFromOrEquals(context.typeOrExtensionEntity, hiding.baseTypeEntity);
         if (result && !ignoreReceiverType && !entity.isStatic()) {
-          const receiverTypeEntity = receiverType?.getEntity();
-          result = receiverTypeEntity !== void 0 && this.isTypeDerivedFromOrEquals(
-            receiverTypeEntity,
+          result = receiverType?.entity !== void 0 && this.isTypeDerivedFromOrEquals(
+            receiverType.entity,
             context.typeOrExtensionEntity
           );
         }
@@ -60721,13 +60674,13 @@ var AccessibilityCheck = class {
     }
     switch (derived.typeEntityKind) {
       case 1 /* Structured */:
-        return this.isTypeDerivedFromOrEquals(derived.getBaseObjectType().cycleFree?.unalias()?.getEntity(), base) || derived.getBaseAspectTypes().cycleFree.some((t) => this.isTypeDerivedFromOrEquals(t.unalias().getEntity(), base));
+        return this.isTypeDerivedFromOrEquals(derived.getBaseObjectType().cycleFree?.unalias()?.entity, base) || derived.getBaseAspectTypes().cycleFree.some((t) => this.isTypeDerivedFromOrEquals(t.unalias().entity, base));
       case 3 /* Variant */:
-        return this.isTypeDerivedFromOrEquals(derived.getBaseObjectType().cycleFree?.unalias()?.getEntity(), base);
+        return this.isTypeDerivedFromOrEquals(derived.getBaseObjectType().cycleFree?.unalias()?.entity, base);
       case 0 /* Function */:
-        return this.isTypeDerivedFromOrEquals(derived.getBaseObjectType().cycleFree?.unalias()?.getEntity(), base);
+        return this.isTypeDerivedFromOrEquals(derived.getBaseObjectType().cycleFree?.unalias()?.entity, base);
       case 5 /* Reduced */:
-        return this.isTypeDerivedFromOrEquals(derived.getBaseObjectType().cycleFree?.unalias()?.getEntity(), base) || derived.getBaseAspectTypes().cycleFree.some((t) => this.isTypeDerivedFromOrEquals(t.unalias().getEntity(), base));
+        return this.isTypeDerivedFromOrEquals(derived.getBaseObjectType().cycleFree?.unalias()?.entity, base) || derived.getBaseAspectTypes().cycleFree.some((t) => this.isTypeDerivedFromOrEquals(t.unalias().entity, base));
       case 2 /* Parameter */:
       case 4 /* Alias */:
         return false;
@@ -60985,17 +60938,17 @@ var TypeMemberLookupBase = class {
   tryGetTypeLocale(type) {
     switch (type.kind) {
       case "function":
-        return type.getEntity().getLocale();
+        return type.entity.getLocale();
       case "structured":
-        return type.getEntity().getLocale();
+        return type.entity.getLocale();
       case "variant":
-        return type.getEntity().getLocale();
+        return type.entity.getLocale();
       case "alias":
-        return type.getEntity().getLocale();
+        return type.entity.getLocale();
       case "reduced":
-        return type.getEntity().getLocale();
+        return type.entity.getLocale();
       case "parameter":
-        return type.getEntity().getLocale();
+        return type.entity.getLocale();
       case "unresolved":
       case "substitution-stub":
         return void 0;
@@ -61060,7 +61013,7 @@ var TypeMemberLookupBase = class {
     const extendedTypeEntity = entity.getExtendedTypeEntity();
     if (extendedTypeEntity !== void 0) {
       extendedType = this.analyzer.instantiateTypeByIdentitySubstitution(extendedTypeEntity);
-      substitutions = extendedType.getSubstitutions();
+      substitutions = extendedType.substitutions;
     } else {
       extendedType = void 0;
       substitutions = Substitutions.empty();
@@ -61106,25 +61059,25 @@ var TypeMemberLookupBase = class {
   }
   getAllMembersOfStructuredType(type, options, state) {
     const result = this.getAllMembersOfRegularTypeOrExtension(
-      type.getEntity(),
-      type.getSubstitutions(),
+      type.entity,
+      type.substitutions,
       type.getBaseObjectType(),
       type.getBaseAspectTypes(),
       options,
       state
     );
-    if (type.getEntity().getOriginalEntity() === this.analyzer.originalWellKnownDeclarations.object) {
+    if (type.entity.getOriginalEntity() === this.analyzer.originalWellKnownDeclarations.object) {
       state.searchedInStandardObjectType = true;
     }
-    if (type.getStructuredTypeKind() === 2 /* Aspect */) {
+    if (type.structuredTypeKind === 2 /* Aspect */) {
       state.searchedInAspect = true;
     }
     return result;
   }
   getAllMembersOfVariantType(type, options, state) {
     return this.getAllMembersOfRegularTypeOrExtension(
-      type.getEntity(),
-      type.getSubstitutions(),
+      type.entity,
+      type.substitutions,
       type.getBaseType(),
       void 0,
       options,
@@ -61133,8 +61086,8 @@ var TypeMemberLookupBase = class {
   }
   getAllMembersOfFunctionType(type, options, state) {
     return this.getAllMembersOfRegularTypeOrExtension(
-      type.getEntity(),
-      type.getSubstitutions(),
+      type.entity,
+      type.substitutions,
       type.getBaseType(),
       void 0,
       options,
@@ -61142,7 +61095,7 @@ var TypeMemberLookupBase = class {
     );
   }
   getAllMembersOfAliasType(type, options, state) {
-    const result = this.getOwnMembersMatchingHiding(type.getEntity(), type.getSubstitutions(), options);
+    const result = this.getOwnMembersMatchingHiding(type.entity, type.substitutions, options);
     const baseAndExtensionMembers = new Array();
     if ((options & 16 /* NoBaseTypeMembers */) === 0) {
       const aliasedType = type.getAliasedType();
@@ -61151,8 +61104,8 @@ var TypeMemberLookupBase = class {
     }
     if (this.context?.typeExtensionLookup !== void 0 && (options & 4 /* NoTypeExtensionMembers */) === 0) {
       const extensionMembers = this.getMembersOfExtensionsMatchingHiding(
-        type.getEntity(),
-        type.getSubstitutions(),
+        type.entity,
+        type.substitutions,
         options,
         this.context.typeExtensionLookup
       );
@@ -61163,8 +61116,8 @@ var TypeMemberLookupBase = class {
   }
   getAllMembersOfReducedType(type, options, state) {
     return this.getAllMembersOfRegularTypeOrExtension(
-      type.getEntity(),
-      type.getSubstitutions(),
+      type.entity,
+      type.substitutions,
       type.getBaseObjectType(),
       type.getBaseAspectTypes(),
       options,
@@ -61295,7 +61248,7 @@ var TypeMemberLookupByKeyBase = class extends TypeMemberLookupBase {
     const extendedTypeEntity = entity.getExtendedTypeEntity();
     if (extendedTypeEntity !== void 0) {
       extendedType = this.analyzer.instantiateTypeByIdentitySubstitution(extendedTypeEntity);
-      substitutions = extendedType.getSubstitutions();
+      substitutions = extendedType.substitutions;
     } else {
       extendedType = void 0;
       substitutions = Substitutions.empty();
@@ -61343,17 +61296,17 @@ var TypeMemberLookupByKeyBase = class extends TypeMemberLookupBase {
   getMembersOfStructuredTypeByKey(key, type, options, state) {
     const result = this.getMembersOfRegularTypeOrExtensionByKey(
       key,
-      type.getEntity(),
-      type.getSubstitutions(),
+      type.entity,
+      type.substitutions,
       type.getBaseObjectType(),
       type.getBaseAspectTypes(),
       options,
       state
     );
-    if (type.getEntity().getOriginalEntity() === this.analyzer.originalWellKnownDeclarations.object) {
+    if (type.entity.getOriginalEntity() === this.analyzer.originalWellKnownDeclarations.object) {
       state.searchedInStandardObjectType = true;
     }
-    if (type.getStructuredTypeKind() === 2 /* Aspect */) {
+    if (type.structuredTypeKind === 2 /* Aspect */) {
       state.searchedInAspect = true;
     }
     return result;
@@ -61361,8 +61314,8 @@ var TypeMemberLookupByKeyBase = class extends TypeMemberLookupBase {
   getMembersOfVariantTypeByKey(key, type, options, state) {
     return this.getMembersOfRegularTypeOrExtensionByKey(
       key,
-      type.getEntity(),
-      type.getSubstitutions(),
+      type.entity,
+      type.substitutions,
       type.getBaseType(),
       void 0,
       options,
@@ -61372,8 +61325,8 @@ var TypeMemberLookupByKeyBase = class extends TypeMemberLookupBase {
   getMembersOfFunctionTypeByKey(key, type, options, state) {
     return this.getMembersOfRegularTypeOrExtensionByKey(
       key,
-      type.getEntity(),
-      type.getSubstitutions(),
+      type.entity,
+      type.substitutions,
       type.getBaseType(),
       void 0,
       options,
@@ -61381,7 +61334,7 @@ var TypeMemberLookupByKeyBase = class extends TypeMemberLookupBase {
     );
   }
   getMembersOfAliasTypeByKey(key, type, options, state) {
-    const result = this.getOwnMembersByKeyMatchingHiding(key, type.getEntity(), type.getSubstitutions(), options);
+    const result = this.getOwnMembersByKeyMatchingHiding(key, type.entity, type.substitutions, options);
     const baseAndExtensionMembers = new Array();
     if ((options & 16 /* NoBaseTypeMembers */) === 0) {
       const aliasedType = type.getAliasedType();
@@ -61391,8 +61344,8 @@ var TypeMemberLookupByKeyBase = class extends TypeMemberLookupBase {
     if (this.context?.typeExtensionLookup !== void 0 && (options & 4 /* NoTypeExtensionMembers */) === 0) {
       const extensionMembers = this.getMembersOfExtensionsByKeyMatchingHiding(
         key,
-        type.getEntity(),
-        type.getSubstitutions(),
+        type.entity,
+        type.substitutions,
         options,
         this.context.typeExtensionLookup
       );
@@ -61404,8 +61357,8 @@ var TypeMemberLookupByKeyBase = class extends TypeMemberLookupBase {
   getMembersOfReducedTypeByKey(key, type, options, state) {
     return this.getMembersOfRegularTypeOrExtensionByKey(
       key,
-      type.getEntity(),
-      type.getSubstitutions(),
+      type.entity,
+      type.substitutions,
       type.getBaseObjectType(),
       type.getBaseAspectTypes(),
       options,
@@ -61618,19 +61571,19 @@ var ConstructorLookup = class {
     }
   }
   getConstructorsOfStructuredType(type, options) {
-    return this.getConstructorsOfTypeWithOwnMembersOrExtension(type.getEntity(), type, options);
+    return this.getConstructorsOfTypeWithOwnMembersOrExtension(type.entity, type, options);
   }
   getConstructorsOfVariantType(type, options) {
-    return this.getConstructorsOfTypeWithOwnMembersOrExtension(type.getEntity(), type, options);
+    return this.getConstructorsOfTypeWithOwnMembersOrExtension(type.entity, type, options);
   }
   getConstructorsOfFunctionType(type, options) {
-    return this.getConstructorsOfTypeWithOwnMembersOrExtension(type.getEntity(), type, options);
+    return this.getConstructorsOfTypeWithOwnMembersOrExtension(type.entity, type, options);
   }
   getConstructorsOfAliasType(type, options) {
-    let result = this.getOwnConstructors(type.getEntity(), type, options);
+    let result = this.getOwnConstructors(type.entity, type, options);
     if (this.context?.typeExtensionLookup !== void 0 && (options & 4 /* NoTypeExtensionMembers */) === 0) {
       const extensionConstructors = this.getExtensionConstructors(
-        type.getEntity(),
+        type.entity,
         type,
         options,
         this.context.typeExtensionLookup
@@ -61640,11 +61593,11 @@ var ConstructorLookup = class {
     if ((options & 16 /* NoBaseTypeMembers */) === 0) {
       let aliasedType = type.getAliasedType();
       while (aliasedType.kind === "alias") {
-        const constructors2 = this.getOwnConstructors(aliasedType.getEntity(), aliasedType, options);
+        const constructors2 = this.getOwnConstructors(aliasedType.entity, aliasedType, options);
         result = this.mergeConstructors(result, constructors2);
         if (this.context?.typeExtensionLookup !== void 0 && (options & 4 /* NoTypeExtensionMembers */) === 0) {
           const extensionConstructors = this.getExtensionConstructors(
-            aliasedType.getEntity(),
+            aliasedType.entity,
             aliasedType,
             options,
             this.context.typeExtensionLookup
@@ -61659,7 +61612,7 @@ var ConstructorLookup = class {
     return result;
   }
   getConstructorsOfReducedType(type, options) {
-    return this.getConstructorsOfTypeWithOwnMembersOrExtension(type.getEntity(), type, options);
+    return this.getConstructorsOfTypeWithOwnMembersOrExtension(type.entity, type, options);
   }
   getConstructorsOfTypeWithOwnMembersOrExtension(entity, type, options) {
     let result = this.getOwnConstructors(entity, type, options);
@@ -61675,7 +61628,7 @@ var ConstructorLookup = class {
     return result;
   }
   getOwnConstructors(entity, type, options) {
-    let result = entity.getMembers().getConstructors().map((c) => new Method(this.analyzer, c, type.getSubstitutions()));
+    let result = entity.getMembers().getConstructors().map((c) => new Method(this.analyzer, c, type.substitutions));
     if (this.context !== void 0 && this.context.affectsAccessibility()) {
       const ignoreReceiverType = (options & 8 /* CheckAccessibilityIgnoringReceiverType */) !== 0;
       result = result.filter((m) => AccessibilityCheck.isTypeMemberAccessible(
@@ -61688,7 +61641,7 @@ var ConstructorLookup = class {
     return result;
   }
   getExtensionConstructors(entity, type, options, typeExtensionLookup) {
-    let result = typeExtensionLookup.getTypeExtensionsByType(entity).flatMap((e) => e.getMembers().getConstructors().map((c) => new Method(this.analyzer, c, type.getSubstitutions())));
+    let result = typeExtensionLookup.getTypeExtensionsByType(entity).flatMap((e) => e.getMembers().getConstructors().map((c) => new Method(this.analyzer, c, type.substitutions)));
     if (this.context !== void 0 && this.context.affectsAccessibility()) {
       const ignoreReceiverType = (options & 8 /* CheckAccessibilityIgnoringReceiverType */) !== 0;
       result = result.filter((m) => AccessibilityCheck.isTypeMemberAccessible(
@@ -61768,19 +61721,19 @@ var DestructorLookup = class {
     }
   }
   getDestructorsOfStructuredType(type, context, options) {
-    return this.getDestructorsOfTypeWithOwnMembersOrExtension(type.getEntity(), type, context, options);
+    return this.getDestructorsOfTypeWithOwnMembersOrExtension(type.entity, type, context, options);
   }
   getDestructorsOfVariantType(type, context, options) {
-    return this.getDestructorsOfTypeWithOwnMembersOrExtension(type.getEntity(), type, context, options);
+    return this.getDestructorsOfTypeWithOwnMembersOrExtension(type.entity, type, context, options);
   }
   getDestructorsOfFunctionType(type, context, options) {
-    return this.getDestructorsOfTypeWithOwnMembersOrExtension(type.getEntity(), type, context, options);
+    return this.getDestructorsOfTypeWithOwnMembersOrExtension(type.entity, type, context, options);
   }
   getDestructorsOfAliasType(type, context, options) {
-    let result = this.getOwnDestructors(type.getEntity(), type, context, options);
+    let result = this.getOwnDestructors(type.entity, type, context, options);
     if (context?.typeExtensionLookup !== void 0 && (options & 4 /* NoTypeExtensionMembers */) === 0) {
       const extensionDestructors = this.getExtensionDestructors(
-        type.getEntity(),
+        type.entity,
         type,
         context,
         options,
@@ -61794,7 +61747,7 @@ var DestructorLookup = class {
     return result;
   }
   getDestructorsOfReducedType(type, context, options) {
-    return this.getDestructorsOfTypeWithOwnMembersOrExtension(type.getEntity(), type, context, options);
+    return this.getDestructorsOfTypeWithOwnMembersOrExtension(type.entity, type, context, options);
   }
   getDestructorsOfTypeWithOwnMembersOrExtension(entity, type, context, options) {
     let result = this.getOwnDestructors(entity, type, context, options);
@@ -61811,7 +61764,7 @@ var DestructorLookup = class {
     return result;
   }
   getOwnDestructors(entity, type, context, options) {
-    let result = entity.getMembers().getDestructors().map((c) => new Method(this.analyzer, c, type.getSubstitutions()));
+    let result = entity.getMembers().getDestructors().map((c) => new Method(this.analyzer, c, type.substitutions));
     if (context !== void 0 && context.affectsAccessibility()) {
       const ignoreReceiverType = (options & 8 /* CheckAccessibilityIgnoringReceiverType */) !== 0;
       result = result.filter((m) => AccessibilityCheck.isTypeMemberAccessible(
@@ -61824,7 +61777,7 @@ var DestructorLookup = class {
     return result;
   }
   getExtensionDestructors(entity, type, context, options, typeExtensionLookup) {
-    let result = typeExtensionLookup.getTypeExtensionsByType(entity).flatMap((e) => e.getMembers().getDestructors().map((c) => new Method(this.analyzer, c, type.getSubstitutions())));
+    let result = typeExtensionLookup.getTypeExtensionsByType(entity).flatMap((e) => e.getMembers().getDestructors().map((c) => new Method(this.analyzer, c, type.substitutions)));
     if (context !== void 0 && context.affectsAccessibility()) {
       const ignoreReceiverType = (options & 8 /* CheckAccessibilityIgnoringReceiverType */) !== 0;
       result = result.filter((m) => AccessibilityCheck.isTypeMemberAccessible(
@@ -62318,7 +62271,7 @@ var TsPropertyEntity = class extends FieldEntityWithImplicitAccessors {
   }
   markedAbstract() {
     const declaration = this.getDeclaration();
-    return declaration !== void 0 && (ts2.getCombinedModifierFlags(declaration) & ts2.ModifierFlags.Abstract) !== 0 || this.containingType.typeEntityKind === 1 /* Structured */ && this.containingType.getStructuredTypeKind() === 2 /* Aspect */;
+    return declaration !== void 0 && (ts2.getCombinedModifierFlags(declaration) & ts2.ModifierFlags.Abstract) !== 0 || this.containingType.typeEntityKind === 1 /* Structured */ && this.containingType.structuredTypeKind === 2 /* Aspect */;
   }
   isPreservedReducedTypeMember() {
     return void 0;
@@ -62451,7 +62404,7 @@ var TsAccessorEntity = class extends BaseFieldEntity {
   }
   markedAbstract() {
     const declaration = this.getGetAccessorDeclaration();
-    return declaration !== void 0 && (ts2.getCombinedModifierFlags(declaration) & ts2.ModifierFlags.Abstract) !== 0 || this.containingType.typeEntityKind === 1 /* Structured */ && this.containingType.getStructuredTypeKind() === 2 /* Aspect */;
+    return declaration !== void 0 && (ts2.getCombinedModifierFlags(declaration) & ts2.ModifierFlags.Abstract) !== 0 || this.containingType.typeEntityKind === 1 /* Structured */ && this.containingType.structuredTypeKind === 2 /* Aspect */;
   }
   isPreservedReducedTypeMember() {
     return void 0;
@@ -62713,7 +62666,7 @@ var TsMethodEntity = class extends BaseOrdinaryMethodEntity {
     return (ts2.getCombinedModifierFlags(this.declaration) & ts2.ModifierFlags.Override) !== 0;
   }
   markedAbstract() {
-    return (ts2.getCombinedModifierFlags(this.declaration) & ts2.ModifierFlags.Abstract) !== 0 || this.containingType.typeEntityKind === 1 /* Structured */ && this.containingType.getStructuredTypeKind() === 2 /* Aspect */;
+    return (ts2.getCombinedModifierFlags(this.declaration) & ts2.ModifierFlags.Abstract) !== 0 || this.containingType.typeEntityKind === 1 /* Structured */ && this.containingType.structuredTypeKind === 2 /* Aspect */;
   }
   isAsync() {
     return this.tsctx.isSignatureAsync(this.declaration);
@@ -62813,7 +62766,7 @@ var TsIteratorFunctionEntity = class extends BaseOrdinaryMethodEntity {
   }
   markedAbstract() {
     const declaration = this.getFirstDeclaration();
-    return declaration !== void 0 && (ts2.getCombinedModifierFlags(declaration) & ts2.ModifierFlags.Abstract) !== 0 || this.containingType.typeEntityKind === 1 /* Structured */ && this.containingType.getStructuredTypeKind() === 2 /* Aspect */;
+    return declaration !== void 0 && (ts2.getCombinedModifierFlags(declaration) & ts2.ModifierFlags.Abstract) !== 0 || this.containingType.typeEntityKind === 1 /* Structured */ && this.containingType.structuredTypeKind === 2 /* Aspect */;
   }
   isAsync() {
     return false;
@@ -68906,8 +68859,7 @@ var PackageReducedTypeDeclarationEntity = class {
       const baseType = this.analyzer.type.ofTypeSpecifier(baseTypeSpecifier);
       const unaliasedBaseType = baseType.unalias();
       if (unaliasedBaseType.kind === "structured") {
-        const structuredTypeKind = unaliasedBaseType.getStructuredTypeKind();
-        switch (structuredTypeKind) {
+        switch (unaliasedBaseType.structuredTypeKind) {
           case 0 /* Class */: {
             if (declaredBaseObjectType !== void 0) {
               diagnostics.addDiagnostic(this.analyzer.createDiagnostic(
@@ -68948,7 +68900,7 @@ var PackageReducedTypeDeclarationEntity = class {
             break;
           }
           default:
-            Debug.never(structuredTypeKind);
+            Debug.never(unaliasedBaseType.structuredTypeKind);
         }
       } else {
         diagnostics.addDiagnostic(this.analyzer.createDiagnostic(
@@ -69289,6 +69241,9 @@ var PackageStructuredTypeDeclarationEntity = class {
     this.node = node;
     this.data = new SourcePackageStructuredTypeDeclarationData(analyzer, node, this);
   }
+  get structuredTypeKind() {
+    return this.data.structuredTypeKind;
+  }
   getNaming() {
     return this.data.getNaming();
   }
@@ -69313,9 +69268,6 @@ var PackageStructuredTypeDeclarationEntity = class {
   isAbstract() {
     return this.data.isAbstract();
   }
-  getStructuredTypeKind() {
-    return this.data.getStructuredTypeKind();
-  }
   getArity() {
     return this.data.getArity();
   }
@@ -69358,6 +69310,9 @@ var AnonymousStructuredTypeDeclarationEntity = class {
     this.node = node;
     this.data = new SourceAnonymousStructuredTypeDeclarationData(analyzer, node, this);
   }
+  get structuredTypeKind() {
+    return this.data.structuredTypeKind;
+  }
   getNaming() {
     return this.data.getNaming();
   }
@@ -69379,9 +69334,6 @@ var AnonymousStructuredTypeDeclarationEntity = class {
   isAbstract() {
     return false;
   }
-  getStructuredTypeKind() {
-    return this.data.getStructuredTypeKind();
-  }
   getBaseObjectType() {
     return this.data.getBaseObjectType();
   }
@@ -69429,7 +69381,7 @@ var SourceStructuredTypeDeclarationData = class {
     return this.members.getOrInsertWith(() => {
       const members = this.analyzer.getDeclaredTypeMemberEntities(this.memberBlock);
       const isInterfacePackageMember = this.entity.getContainingPackage().getInterfacePackageInfo() !== void 0;
-      if (!(isInterfacePackageMember || this.getStructuredTypeKind() === 2 /* Aspect */)) {
+      if (!(isInterfacePackageMember || this.structuredTypeKind === 2 /* Aspect */)) {
         if (members.find((m) => TypeMemberEntity.isConstructor(m)) === void 0) {
           const fields = members.filter((m) => m.kind === 0 /* Variable */);
           const defaultConstructors = this.analyzer.createDefaultConstructors(this.entity, fields);
@@ -69471,18 +69423,18 @@ var SourceStructuredTypeDeclarationData = class {
       const baseType = this.analyzer.type.ofTypeSpecifier(baseTypeSpecifier);
       const unaliasedBaseType = baseType.unalias();
       if (unaliasedBaseType.kind === "structured") {
-        if (unaliasedBaseType.getStructuredTypeKind() === 0 /* Class */) {
+        if (unaliasedBaseType.structuredTypeKind === 0 /* Class */) {
           if (declaredBaseObjectType !== void 0) {
             diagnostics.addDiagnostic(this.analyzer.createDiagnostic(
               2131 /* TypeCannotHaveMultipleBaseObjectTypes */,
               baseTypeSpecifier
             ));
-          } else if (this.entity.getStructuredTypeKind() === 1 /* Structure */) {
+          } else if (this.entity.structuredTypeKind === 1 /* Structure */) {
             diagnostics.addDiagnostic(this.analyzer.createDiagnostic(
               2136 /* StructureCanHaveOnlyAspectsAsBaseTypes */,
               baseTypeSpecifier
             ));
-          } else if (this.entity.getStructuredTypeKind() === 2 /* Aspect */) {
+          } else if (this.entity.structuredTypeKind === 2 /* Aspect */) {
             diagnostics.addDiagnostic(this.analyzer.createDiagnostic(
               2137 /* AspectTypeCanHaveOnlyAspectsAsBaseTypes */,
               baseTypeSpecifier
@@ -69495,12 +69447,12 @@ var SourceStructuredTypeDeclarationData = class {
           } else {
             declaredBaseObjectType = baseType;
           }
-        } else if (unaliasedBaseType.getStructuredTypeKind() === 1 /* Structure */) {
+        } else if (unaliasedBaseType.structuredTypeKind === 1 /* Structure */) {
           diagnostics.addDiagnostic(this.analyzer.createDiagnostic(
             2133 /* StructureCannotBeUsedAsBaseType */,
             baseTypeSpecifier
           ));
-        } else if (unaliasedBaseType.getStructuredTypeKind() === 2 /* Aspect */) {
+        } else if (unaliasedBaseType.structuredTypeKind === 2 /* Aspect */) {
           if (declaredBaseAspectTypes.some((t) => t.unalias().equals(unaliasedBaseType))) {
             diagnostics.addDiagnostic(this.analyzer.createDiagnostic(
               2134 /* ThisTypeIsAlreadyListedInBaseTypeList */,
@@ -69533,6 +69485,18 @@ var SourcePackageStructuredTypeDeclarationData = class extends SourceStructuredT
     this.entity = entity;
     this.name = analyzer.createNameFromIdentifier(node.name);
   }
+  get structuredTypeKind() {
+    switch (this.node.kind) {
+      case 27 /* PackageClassDeclaration */:
+        return 0 /* Class */;
+      case 28 /* PackageStructureDeclaration */:
+        return 1 /* Structure */;
+      case 29 /* PackageAspectDeclaration */:
+        return 2 /* Aspect */;
+      default:
+        Debug.never(this.node);
+    }
+  }
   get memberBlock() {
     return this.node.memberBlock;
   }
@@ -69575,20 +69539,11 @@ var SourcePackageStructuredTypeDeclarationData = class extends SourceStructuredT
   getSubstitutionApplicationMode() {
     return 0 /* SubstituteOwnSubstitutions */;
   }
-  getStructuredTypeKind() {
-    switch (this.node.kind) {
-      case 27 /* PackageClassDeclaration */:
-        return 0 /* Class */;
-      case 28 /* PackageStructureDeclaration */:
-        return 1 /* Structure */;
-      case 29 /* PackageAspectDeclaration */:
-        return 2 /* Aspect */;
-      default:
-        Debug.never(this.node);
-    }
-  }
 };
 var SourceAnonymousStructuredTypeDeclarationData = class extends SourceStructuredTypeDeclarationData {
+  get structuredTypeKind() {
+    return 0 /* Class */;
+  }
   get memberBlock() {
     return this.node.memberBlock;
   }
@@ -69615,9 +69570,6 @@ var SourceAnonymousStructuredTypeDeclarationData = class extends SourceStructure
   getSubstitutionApplicationMode() {
     return 1 /* SubstituteOwnSubstitutionsAndMerge */;
   }
-  getStructuredTypeKind() {
-    return 0 /* Class */;
-  }
 };
 
 // source/analysis/a/TextIdentity.ts
@@ -70547,6 +70499,9 @@ var TsGlobalClassOrInterfaceEntity = class {
     this.hiding = new Cached();
     this.name = this.tsctx.createName(this.symbol.name, "type");
   }
+  get structuredTypeKind() {
+    return this.isClassOrInterfaceAndVariableMerge() ? 0 /* Class */ : 2 /* Aspect */;
+  }
   getNaming() {
     return new EntityNaming_named(this.getName());
   }
@@ -70602,15 +70557,12 @@ var TsGlobalClassOrInterfaceEntity = class {
     return { kind: 2 /* TypeScript */ };
   }
   markedBasic() {
-    return this.getStructuredTypeKind() === 0 /* Class */ && !this.isAbstract();
+    return this.structuredTypeKind === 0 /* Class */ && !this.isAbstract();
   }
   isAbstract() {
     const decl = this.getDeclaration();
     return decl !== void 0 && (ts4.getCombinedModifierFlags(decl) & ts4.ModifierFlags.Abstract) !== 0;
   }
-  getStructuredTypeKind() {
-    return this.isClassOrInterfaceAndVariableMerge() ? 0 /* Class */ : 2 /* Aspect */;
-  }
   getArity() {
     return this.getTypeParameters().length;
   }
@@ -70621,7 +70573,7 @@ var TsGlobalClassOrInterfaceEntity = class {
         const symbolType = this.tsctx.tsChecker.getDeclaredTypeOfSymbol(this.symbol);
         if (TsUtils.isClassOrInterfaceType(symbolType)) {
           const baseTypes = this.tsctx.tsChecker.getBaseTypes(symbolType);
-          type = Query.from(baseTypes).map((t) => this.tsctx.type.ofTsType(t)).mapAndFilter((t) => t.kind === "structured" && t.getStructuredTypeKind() === 0 /* Class */ ? t : void 0).first();
+          type = Query.from(baseTypes).map((t) => this.tsctx.type.ofTsType(t)).mapAndFilter((t) => t.kind === "structured" && t.structuredTypeKind === 0 /* Class */ ? t : void 0).first();
           if (type === void 0) {
             type = this.tsctx.analyzer.getImplicitBaseTypeForStructuredType(this);
           }
@@ -70636,7 +70588,7 @@ var TsGlobalClassOrInterfaceEntity = class {
       const symbolType = this.tsctx.tsChecker.getDeclaredTypeOfSymbol(this.symbol);
       if (TsUtils.isClassOrInterfaceType(symbolType)) {
         const baseTypes = this.tsctx.tsChecker.getBaseTypes(symbolType);
-        types = Query.from(baseTypes).map((t) => this.tsctx.type.ofTsType(t)).mapAndFilter((t) => t.kind === "structured" && t.getStructuredTypeKind() === 2 /* Aspect */ ? t : void 0).toArray();
+        types = Query.from(baseTypes).map((t) => this.tsctx.type.ofTsType(t)).mapAndFilter((t) => t.kind === "structured" && t.structuredTypeKind === 2 /* Aspect */ ? t : void 0).toArray();
       }
       return new OriginalBaseAspectTypes(types);
     });
@@ -70688,6 +70640,9 @@ var SourceAndTsGlobalClassOrInterfaceMergeEntity = class {
     this.members = new Cached();
     this.sourceData = new SourcePackageStructuredTypeDeclarationData(tsctx.analyzer.dialectA, node, this);
   }
+  get structuredTypeKind() {
+    return this.sourceData.structuredTypeKind;
+  }
   getNaming() {
     return this.sourceData.getNaming();
   }
@@ -70743,9 +70698,6 @@ var SourceAndTsGlobalClassOrInterfaceMergeEntity = class {
   isAbstract() {
     return this.sourceData.isAbstract();
   }
-  getStructuredTypeKind() {
-    return this.sourceData.getStructuredTypeKind();
-  }
   getArity() {
     return this.getTypeParameters().length;
   }
@@ -70792,6 +70744,9 @@ var TsTypeLiteralEntity = class {
     this.baseAspectTypes = new OriginalBaseAspectTypes([]);
     this.members = new Cached();
   }
+  get structuredTypeKind() {
+    return 2 /* Aspect */;
+  }
   getNaming() {
     return new EntityNaming_anonymous();
   }
@@ -70822,9 +70777,6 @@ var TsTypeLiteralEntity = class {
   isAbstract() {
     return false;
   }
-  getStructuredTypeKind() {
-    return 2 /* Aspect */;
-  }
   getArity() {
     return this.getTypeParameters().length;
   }
@@ -70881,6 +70833,9 @@ var TsNamedTypeLiteralEntity = class {
     this.hiding = new Cached();
     this.name = this.tsctx.createName(this.owningNamedSymbol.name, "type");
   }
+  get structuredTypeKind() {
+    return 2 /* Aspect */;
+  }
   getNaming() {
     return new EntityNaming_named(this.getName());
   }
@@ -70920,9 +70875,6 @@ var TsNamedTypeLiteralEntity = class {
   isAbstract() {
     return false;
   }
-  getStructuredTypeKind() {
-    return 2 /* Aspect */;
-  }
   getArity() {
     return this.getTypeParameters().length;
   }
@@ -70973,6 +70925,9 @@ var SourceAndTsNamedTypeLiteralMergeEntity = class {
     this.members = new Cached();
     this.sourceData = new SourcePackageStructuredTypeDeclarationData(tsctx.analyzer.dialectA, node, this);
   }
+  get structuredTypeKind() {
+    return this.sourceData.structuredTypeKind;
+  }
   getNaming() {
     return this.sourceData.getNaming();
   }
@@ -71010,9 +70965,6 @@ var SourceAndTsNamedTypeLiteralMergeEntity = class {
   isAbstract() {
     return this.sourceData.isAbstract();
   }
-  getStructuredTypeKind() {
-    return this.sourceData.getStructuredTypeKind();
-  }
   getArity() {
     return this.getTypeParameters().length;
   }
@@ -71982,7 +71934,7 @@ var TsInteropContext = class {
       );
       Debug.assert(type.kind === "structured");
       const constructor = TypeMemberLookup.ofType(this.analyzer, type).getConstructors(void 0).at(0);
-      Debug.assertNotNull(constructor, `\u0422\u0438\u043F ${type.getEntity().getNaming()} \u0434\u043E\u043B\u0436\u0435\u043D \u0438\u043C\u0435\u0442\u044C \u043A\u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442\u043E\u0440.`);
+      Debug.assertNotNull(constructor, `\u0422\u0438\u043F ${type.entity.getNaming()} \u0434\u043E\u043B\u0436\u0435\u043D \u0438\u043C\u0435\u0442\u044C \u043A\u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442\u043E\u0440.`);
       return new TagType(type, this.wellKnownDeclarations.defaultImport, constructor, /* @__PURE__ */ new Map());
     });
   }
@@ -73321,21 +73273,20 @@ var BaseMemberConflictsValidator = class {
       if (!this.isTypeMemberThatCanConflict(m)) {
         return;
       }
-      const instantiated = this.analyzer.instantiateTypeMember(m, type.getSubstitutions());
+      const instantiated = this.analyzer.instantiateTypeMember(m, type.substitutions);
       this.addOverriddenMembersRecursively(instantiated, overriddenMembers);
     });
     const result = new TypeMemberSet();
     const allBaseTypes = this.analyzer.typeUtils.getBaseAndAliasedTypesRecursively(type);
     for (const baseType of allBaseTypes) {
-      const baseTypeEntity = baseType.getEntity();
-      if (baseTypeEntity === void 0 || !isTypeEntityWithMembers(baseTypeEntity)) {
+      if (baseType.entity === void 0 || !isTypeEntityWithMembers(baseType.entity)) {
         continue;
       }
-      for (const baseTypeMemberEntity of baseTypeEntity.getMembers().getAll()) {
+      for (const baseTypeMemberEntity of baseType.entity.getMembers().getAll()) {
         if (!this.isTypeMemberThatCanConflict(baseTypeMemberEntity)) {
           continue;
         }
-        const baseTypeMember = this.analyzer.instantiateTypeMember(baseTypeMemberEntity, baseType.getSubstitutions());
+        const baseTypeMember = this.analyzer.instantiateTypeMember(baseTypeMemberEntity, baseType.substitutions);
         if (result.add(baseTypeMember)) {
           this.addOverriddenMembersRecursively(baseTypeMember, overriddenMembers);
         }
@@ -73942,7 +73893,7 @@ var InstanceFieldsInitializationValidator = class {
       return;
     }
     const typeEntity = this.analyzer.entity.ofTypeWithMembersDeclaration(this.typeDeclaration);
-    if (typeEntity.typeEntityKind === 4 /* Alias */ || typeEntity.typeEntityKind === 1 /* Structured */ && typeEntity.getStructuredTypeKind() === 2 /* Aspect */) {
+    if (typeEntity.typeEntityKind === 4 /* Alias */ || typeEntity.typeEntityKind === 1 /* Structured */ && typeEntity.structuredTypeKind === 2 /* Aspect */) {
       return;
     }
     const fields = this.getFieldsThatNeedToBeInitializedInConstructor(typeEntity);
@@ -75144,7 +75095,7 @@ var SourceFileAnalyzer = class {
           this.diagnosticAcceptor
         ).validate();
       }
-      if (entity.getStructuredTypeKind() === 1 /* Structure */) {
+      if (entity.structuredTypeKind === 1 /* Structure */) {
         const declarationUsageCountResult = yield this.analyzer.getDeclarationsUsageOfSourceFile(
           this.sourceFile.getSyntaxNode(),
           controller.task
@@ -75237,7 +75188,7 @@ var SourceFileAnalyzer = class {
     return __async(this, null, function* () {
       switch (fieldType.kind) {
         case "structured":
-          if (fieldType.getStructuredTypeKind() === 1 /* Structure */) {
+          if (fieldType.structuredTypeKind === 1 /* Structure */) {
             return yield this.checkStructureIsReferencedByFieldsOfStructure(
               initialType,
               fieldType,
@@ -75300,7 +75251,7 @@ var SourceFileAnalyzer = class {
   }
   checkStructureIsReferencedByFieldsOfStructure(initialType, fieldType, referencedTypes, taskController) {
     return __async(this, null, function* () {
-      const typeHasStoredVariables = fieldType.getEntity().getMembers().getNamedMembersA().some((m) => m.kind === 0 /* Variable */ && !m.isStatic() && !isVariableEntityWithExplicitAccessors(m));
+      const typeHasStoredVariables = fieldType.entity.getMembers().getNamedMembersA().some((m) => m.kind === 0 /* Variable */ && !m.isStatic() && !isVariableEntityWithExplicitAccessors(m));
       if (!typeHasStoredVariables) {
         return false;
       }
@@ -75368,7 +75319,7 @@ var SourceFileAnalyzer = class {
       return;
     }
     const unaliasedBaseType = baseType.unalias();
-    if (unaliasedBaseType.getEntity()?.getOriginalEntity() === this.analyzer.originalWellKnownDeclarations.object) {
+    if (unaliasedBaseType.entity?.getOriginalEntity() === this.analyzer.originalWellKnownDeclarations.object) {
       return;
     }
     const semanticContext = this.analyzer.semanticContext.outermostSemanticContextOfTypeDeclaration(typeDeclaration);
@@ -75398,7 +75349,7 @@ var SourceFileAnalyzer = class {
           continue;
         }
         allBaseTypes ??= this.analyzer.typeUtils.getBaseAndAliasedTypesRecursively(type);
-        const extendedAspect = allBaseTypes.find((t) => t.kind === "structured" && t.getEntity().getOriginalEntity() === unaliasedBaseAspectType.getEntity()?.getOriginalEntity() && !t.getSubstitutions().equals(unaliasedBaseAspectType.getSubstitutions()));
+        const extendedAspect = allBaseTypes.find((t) => t.kind === "structured" && t.entity.getOriginalEntity() === unaliasedBaseAspectType.entity?.getOriginalEntity() && !t.substitutions.equals(unaliasedBaseAspectType.substitutions));
         if (extendedAspect !== void 0) {
           const diagnosticLocation = baseTypeList.baseTypes.first((n) => this.analyzer.type.ofTypeSpecifier(n).equals(baseAspectType)) ?? fallbackDiagnosticLocation;
           this.createAndAddDiagnostic(
@@ -75800,7 +75751,7 @@ var SourceFileAnalyzer = class {
         }
         if (node2.kind === 10 /* NamedTypeSpecifier */) {
           const type = this.analyzer.resolveNamedTypeSpecifier(node2).type;
-          if (type?.kind === "parameter" && notYetDeclaredParameters.has(type.getEntity().getOriginalEntity())) {
+          if (type?.kind === "parameter" && notYetDeclaredParameters.has(type.entity.getOriginalEntity())) {
             this.createAndAddDiagnostic(
               2189 /* TypeParameterDefaultCanReferenceOnlyPreviouslyDeclaredTypeParameters */,
               node2
@@ -75851,7 +75802,7 @@ var SourceFileAnalyzer = class {
   checkNamedTypeSpecifier(node) {
     const resolutionResult = this.analyzer.resolveNamedTypeSpecifier(node);
     if (resolutionResult.type !== void 0) {
-      const entity = resolutionResult.type.getEntity();
+      const entity = resolutionResult.type.entity;
       if (entity !== void 0) {
         const typeArgumentCount = node.typeArgumentClause?.typeArgumentList.typeArguments.count() ?? 0;
         this.analyzer.checkTypeArgumentCount(
@@ -75860,7 +75811,7 @@ var SourceFileAnalyzer = class {
           this.diagnosticAcceptor,
           node.typeArgumentClause ?? node.qualifiedName
         );
-        const substitutions = resolutionResult.type.getSubstitutions();
+        const substitutions = resolutionResult.type.substitutions;
         this.checkTypeArgumentTypesAreAssignableToConstraints(
           entity.getTypeParameters(),
           substitutions,
@@ -76246,7 +76197,7 @@ var SourceFileAnalyzer = class {
       this.analyzer.getTargetTypeOfExpression(node.expression)
     );
     const expressionType = this.analyzer.type.ofExpression(node.expression);
-    if (expressionType.getEntity()?.getOriginalEntity() === this.analyzer.originalWellKnownDeclarations.impossibleCase) {
+    if (expressionType.entity?.getOriginalEntity() === this.analyzer.originalWellKnownDeclarations.impossibleCase) {
       const controlFlowNode = this.analyzer.getControlFlowGraph(this.sourceFile).controlFlowNodesPrecedingErrorStatement.get(node);
       if (controlFlowNode !== void 0 && this.analyzer.reachabilityChecker.isControlFlowNodeReachable(controlFlowNode)) {
         this.createAndAddDiagnostic(2216 /* TheCodeWasExpectedToBeUnreachable */, node);
@@ -76989,7 +76940,7 @@ var SourceFileAnalyzer = class {
   }
   checkAssignmentToObjectExpression(node) {
     const type = this.analyzer.type.ofExpression(node);
-    let canAssignToObject = type.kind === "structured" && type.getStructuredTypeKind() === 1 /* Structure */;
+    let canAssignToObject = type.kind === "structured" && type.structuredTypeKind === 1 /* Structure */;
     if (!canAssignToObject) {
       const semanticContext = this.analyzer.semanticContext.containing(node);
       const containingSubprogram = semanticContext.getContainingSubprogram();
@@ -77616,27 +77567,27 @@ var ReferencedPackagesCollector = class {
   visitType(type) {
     switch (type.kind) {
       case "function":
-        this.visitTypeEntity(type.getEntity(), false);
-        this.visitTypeArguments(type.getSubstitutions());
+        this.visitTypeEntity(type.entity, false);
+        this.visitTypeArguments(type.substitutions);
         break;
       case "structured":
-        this.visitTypeEntity(type.getEntity(), false);
-        this.visitTypeArguments(type.getSubstitutions());
+        this.visitTypeEntity(type.entity, false);
+        this.visitTypeArguments(type.substitutions);
         break;
       case "variant":
-        this.visitTypeEntity(type.getEntity(), false);
-        this.visitTypeArguments(type.getSubstitutions());
+        this.visitTypeEntity(type.entity, false);
+        this.visitTypeArguments(type.substitutions);
         break;
       case "alias":
-        this.visitTypeEntity(type.getEntity(), false);
-        this.visitTypeArguments(type.getSubstitutions());
+        this.visitTypeEntity(type.entity, false);
+        this.visitTypeArguments(type.substitutions);
         break;
       case "reduced":
-        this.visitTypeEntity(type.getEntity(), false);
-        this.visitTypeArguments(type.getSubstitutions());
+        this.visitTypeEntity(type.entity, false);
+        this.visitTypeArguments(type.substitutions);
         break;
       case "parameter":
-        this.visitTypeEntity(type.getEntity(), false);
+        this.visitTypeEntity(type.entity, false);
         break;
       case "union": {
         for (const constituentType of type.originalTypes) {
@@ -77857,10 +77808,8 @@ var ResolvedImplementationPackage = class _ResolvedImplementationPackage {
         return true;
       case 4 /* Alias */:
         return entity.getMembers().getAll().length === 0;
-      case 1 /* Structured */: {
-        const structuredTypeKind = entity.getStructuredTypeKind();
-        return structuredTypeKind === 2 /* Aspect */ && entity.getMembers().getAll().every((m) => TypeMemberEntity.isAbstract(m));
-      }
+      case 1 /* Structured */:
+        return entity.structuredTypeKind === 2 /* Aspect */ && entity.getMembers().getAll().every((m) => TypeMemberEntity.isAbstract(m));
       case 2 /* Parameter */:
       case 3 /* Variant */:
         return false;
@@ -78082,13 +78031,13 @@ var ResolvedImplementationPackage = class _ResolvedImplementationPackage {
       case "function":
       case "alias":
       case "reduced": {
-        const type2Entity = type2.getEntity();
+        const type2Entity = type2.entity;
         if (type2Entity === void 0 || !isTypeEntityWithMembers(type2Entity)) {
           return false;
         }
-        const entity1 = this.analyzer.implementation.ofTypeWithMembers(type1.getEntity(), this.targetPlatform) ?? type1.getEntity();
-        const entity2 = this.analyzer.implementation.ofTypeWithMembers(type2Entity, this.targetPlatform) ?? type2.getEntity();
-        return entity1 === entity2 && this.areEqualSubstitutions(type1.getSubstitutions(), type2.getSubstitutions());
+        const entity1 = this.analyzer.implementation.ofTypeWithMembers(type1.entity, this.targetPlatform) ?? type1.entity;
+        const entity2 = this.analyzer.implementation.ofTypeWithMembers(type2Entity, this.targetPlatform) ?? type2.entity;
+        return entity1 === entity2 && this.areEqualSubstitutions(type1.substitutions, type2.substitutions);
       }
       case "parameter": {
         if (type2.kind !== "parameter") {
@@ -78097,14 +78046,14 @@ var ResolvedImplementationPackage = class _ResolvedImplementationPackage {
         if (type1.isNullExcluded !== type2.isNullExcluded) {
           return false;
         }
-        const containingEntity1 = type1.getEntity().getContainingEntity();
-        const containingEntity = type2.getEntity().getContainingEntity();
+        const containingEntity1 = type1.entity.getContainingEntity();
+        const containingEntity = type2.entity.getContainingEntity();
         let result;
         if (containingEntity1.kind === 1 /* Function */ || containingEntity.kind === 1 /* Function */) {
           result = false;
         } else {
-          const entity1 = this.analyzer.implementation.ofParameterType(type1.getEntity(), this.targetPlatform) ?? type1.getEntity();
-          const entity2 = this.analyzer.implementation.ofParameterType(type2.getEntity(), this.targetPlatform) ?? type2.getEntity();
+          const entity1 = this.analyzer.implementation.ofParameterType(type1.entity, this.targetPlatform) ?? type1.entity;
+          const entity2 = this.analyzer.implementation.ofParameterType(type2.entity, this.targetPlatform) ?? type2.entity;
           result = entity1 === entity2;
         }
         return result;
@@ -78202,7 +78151,7 @@ var TypeMemberImplementationChecker = class {
   }
   check() {
     const { notExplicitlyImplementedAbstractMembers, overriddenMembers } = this.getExplicitImplementationInfo();
-    if (notExplicitlyImplementedAbstractMembers.length === 0 || this.typeEntity.typeEntityKind === 1 /* Structured */ && this.typeEntity.getStructuredTypeKind() === 2 /* Aspect */) {
+    if (notExplicitlyImplementedAbstractMembers.length === 0 || this.typeEntity.typeEntityKind === 1 /* Structured */ && this.typeEntity.structuredTypeKind === 2 /* Aspect */) {
       return new TypeMemberImplementationCheckResult(overriddenMembers, notExplicitlyImplementedAbstractMembers, [], []);
     }
     const notImplementedAbstractMemberIsConsideredError = !TypeEntity.isAbstract(this.typeEntity);
@@ -78335,7 +78284,7 @@ var TypeMemberImplementationChecker = class {
         overriddenMembers.add(overriddenMember);
       }
       if (isAbstractType && TypeMemberEntity.isAbstract(ownMember)) {
-        abstractMembers.add(this.analyzer.instantiateTypeMember(ownMember, type.getSubstitutions()));
+        abstractMembers.add(this.analyzer.instantiateTypeMember(ownMember, type.substitutions));
       }
     }
     let transitivelyBaseAspectTypes;
@@ -78343,20 +78292,20 @@ var TypeMemberImplementationChecker = class {
     const baseTypes = this.analyzer.typeUtils.getBaseOrAliasedTypes(type);
     for (const baseType of baseTypes) {
       const unaliasedBaseType = baseType.unalias();
-      const baseTypeEntity = unaliasedBaseType.getEntity();
+      const baseTypeEntity = unaliasedBaseType.entity;
       if (!(baseTypeEntity !== void 0 && isTypeEntityWithMembers(baseTypeEntity))) {
         continue;
       }
-      if (baseTypeEntity.typeEntityKind === 1 /* Structured */ && baseTypeEntity.getStructuredTypeKind() === 0 /* Class */ && !baseTypeEntity.isAbstract()) {
+      if (baseTypeEntity.typeEntityKind === 1 /* Structured */ && baseTypeEntity.structuredTypeKind === 0 /* Class */ && !baseTypeEntity.isAbstract()) {
         continue;
       }
       const notImplementedAbstractBaseTypeMembers = this.analyzer.getTypeMemberImplementationCheckResult(baseTypeEntity).notImplementedAbstractMembers;
       for (const baseTypeMember of notImplementedAbstractBaseTypeMembers) {
-        const substitutedBaseTypeMember = baseTypeMember.applySubstitutions(unaliasedBaseType.getSubstitutions());
+        const substitutedBaseTypeMember = baseTypeMember.applySubstitutions(unaliasedBaseType.substitutions);
         if (!overriddenMembers.has(substitutedBaseTypeMember)) {
           let isImplicitlyImplementedInBaseType = false;
           const containingEntity = substitutedBaseTypeMember.getEntity().getContainingEntity();
-          if (containingEntity.kind === 2 /* Type */ && containingEntity.typeEntityKind === 1 /* Structured */ && containingEntity.getStructuredTypeKind() === 2 /* Aspect */) {
+          if (containingEntity.kind === 2 /* Type */ && containingEntity.typeEntityKind === 1 /* Structured */ && containingEntity.structuredTypeKind === 2 /* Aspect */) {
             transitivelyBaseAspectTypes ??= this.getTransitivelyBaseAspectTypes(type);
             const containingType = this.analyzer.instantiateTypeWithSubstitutions(
               containingEntity,
@@ -78382,11 +78331,11 @@ var TypeMemberImplementationChecker = class {
     type = type.unalias();
     const result = new TypeMemberSet();
     for (const baseType of this.collectUnaliasedBaseTypesRecursively(type)) {
-      const entity = baseType.getEntity();
+      const entity = baseType.entity;
       if (entity !== void 0 && isTypeEntityWithMembers(entity)) {
         const overriddenMembers = this.analyzer.getTypeMemberImplementationCheckResult(entity).overriddenMembers;
         for (const overriddenMember of overriddenMembers) {
-          const substitutedOverriddenMember = overriddenMember.applySubstitutions(baseType.getSubstitutions());
+          const substitutedOverriddenMember = overriddenMember.applySubstitutions(baseType.substitutions);
           result.add(substitutedOverriddenMember);
         }
       }
@@ -79754,7 +79703,7 @@ var InstanceFieldsInitializationValidator2 = class {
     if (typeEntity.kind === 6 /* TypeExtension */) {
       return;
     }
-    if (typeEntity.typeEntityKind === 4 /* Alias */ || typeEntity.typeEntityKind === 1 /* Structured */ && typeEntity.getStructuredTypeKind() === 2 /* Aspect */) {
+    if (typeEntity.typeEntityKind === 4 /* Alias */ || typeEntity.typeEntityKind === 1 /* Structured */ && typeEntity.structuredTypeKind === 2 /* Aspect */) {
       return;
     }
     const fields = this.getFieldsThatNeedToBeInitializedInConstructor(typeEntity);
@@ -80737,7 +80686,7 @@ var SourceFileAnalyzer2 = class {
               this.diagnosticAcceptor
             ).validate();
           }
-          if (entity.getStructuredTypeKind() === 1 /* Structure */) {
+          if (entity.structuredTypeKind === 1 /* Structure */) {
             const declarationUsageCountResult = yield this.analyzer.getDeclarationsUsageOfSourceFile(
               this.sourceFile.getSyntaxNode(),
               controller.task
@@ -80849,7 +80798,7 @@ var SourceFileAnalyzer2 = class {
     return __async(this, null, function* () {
       switch (fieldType.kind) {
         case "structured":
-          if (fieldType.getStructuredTypeKind() === 1 /* Structure */) {
+          if (fieldType.structuredTypeKind === 1 /* Structure */) {
             return yield this.checkStructureIsReferencedByFieldsOfStructure(
               initialType,
               fieldType,
@@ -80912,7 +80861,7 @@ var SourceFileAnalyzer2 = class {
   }
   checkStructureIsReferencedByFieldsOfStructure(initialType, fieldType, referencedTypes, taskController) {
     return __async(this, null, function* () {
-      const typeHasStoredVariables = fieldType.getEntity().getMembers().getNamedMembersM().some((m) => m.kind === 0 /* Variable */ && !m.isStatic() && !isVariableEntityWithExplicitAccessors(m));
+      const typeHasStoredVariables = fieldType.entity.getMembers().getNamedMembersM().some((m) => m.kind === 0 /* Variable */ && !m.isStatic() && !isVariableEntityWithExplicitAccessors(m));
       if (!typeHasStoredVariables) {
         return false;
       }
@@ -80980,7 +80929,7 @@ var SourceFileAnalyzer2 = class {
       return;
     }
     const unaliasedBaseType = baseType.unalias();
-    if (unaliasedBaseType.getEntity()?.getOriginalEntity() === this.analyzer.originalWellKnownDeclarations.object) {
+    if (unaliasedBaseType.entity?.getOriginalEntity() === this.analyzer.originalWellKnownDeclarations.object) {
       return;
     }
     const semanticContext = this.analyzer.semanticContext.outermostSemanticContextOfTypeOrExtensionDeclaration(typeDeclaration);
@@ -81010,7 +80959,7 @@ var SourceFileAnalyzer2 = class {
           continue;
         }
         allBaseTypes ??= this.analyzer.typeUtils.getBaseAndAliasedTypesRecursively(type);
-        const extendedAspect = allBaseTypes.find((t) => t.kind === "structured" && t.getEntity().getOriginalEntity() === unaliasedBaseAspectType.getEntity()?.getOriginalEntity() && !t.getSubstitutions().equals(unaliasedBaseAspectType.getSubstitutions()));
+        const extendedAspect = allBaseTypes.find((t) => t.kind === "structured" && t.entity.getOriginalEntity() === unaliasedBaseAspectType.entity?.getOriginalEntity() && !t.substitutions.equals(unaliasedBaseAspectType.substitutions));
         if (extendedAspect !== void 0) {
           const diagnosticLocation = baseTypeList.baseTypes.first((n) => this.analyzer.type.ofTypeSpecifier(n).equals(baseAspectType)) ?? fallbackDiagnosticLocation;
           this.createAndAddDiagnostic(
@@ -81392,7 +81341,7 @@ var SourceFileAnalyzer2 = class {
         }
         if (node2.kind === 1069 /* NamedTypeSpecifier */) {
           const type = this.analyzer.resolveNamedTypeSpecifier(node2).type;
-          if (type?.kind === "parameter" && notYetDeclaredParameters.has(type.getEntity().getOriginalEntity())) {
+          if (type?.kind === "parameter" && notYetDeclaredParameters.has(type.entity.getOriginalEntity())) {
             this.createAndAddDiagnostic(
               2189 /* TypeParameterDefaultCanReferenceOnlyPreviouslyDeclaredTypeParameters */,
               node2
@@ -81443,7 +81392,7 @@ var SourceFileAnalyzer2 = class {
   checkNamedTypeSpecifier(node) {
     const resolutionResult = this.analyzer.resolveNamedTypeSpecifier(node);
     if (resolutionResult.type !== void 0) {
-      const entity = resolutionResult.type.getEntity();
+      const entity = resolutionResult.type.entity;
       if (entity !== void 0) {
         const typeArgumentCount = node.typeArgumentClause?.typeArgumentList.typeArguments.count() ?? 0;
         this.analyzer.checkTypeArgumentCount(
@@ -81452,7 +81401,7 @@ var SourceFileAnalyzer2 = class {
           this.diagnosticAcceptor,
           node.typeArgumentClause ?? node.qualifiedName
         );
-        const substitutions = resolutionResult.type.getSubstitutions();
+        const substitutions = resolutionResult.type.substitutions;
         this.checkTypeArgumentTypesAreAssignableToConstraints(
           entity.getTypeParameters(),
           substitutions,
@@ -81892,7 +81841,7 @@ var SourceFileAnalyzer2 = class {
       this.analyzer.getTargetTypeOfExpression(node.expression)
     );
     const expressionType = this.analyzer.type.ofExpression(node.expression);
-    if (expressionType.getEntity()?.getOriginalEntity() === this.analyzer.originalWellKnownDeclarations.impossibleCase) {
+    if (expressionType.entity?.getOriginalEntity() === this.analyzer.originalWellKnownDeclarations.impossibleCase) {
       const controlFlowNode = this.analyzer.getControlFlowGraph(this.sourceFile).controlFlowNodesPrecedingErrorStatement.get(node);
       if (controlFlowNode !== void 0 && this.analyzer.reachabilityChecker.isControlFlowNodeReachable(controlFlowNode)) {
         this.createAndAddDiagnostic(2216 /* TheCodeWasExpectedToBeUnreachable */, node);
@@ -82708,7 +82657,7 @@ var SourceFileAnalyzer2 = class {
   }
   checkAssignmentToObjectExpression(node) {
     const type = this.analyzer.type.ofExpression(node);
-    let canAssignToObject = type.kind === "structured" && type.getStructuredTypeKind() === 1 /* Structure */;
+    let canAssignToObject = type.kind === "structured" && type.structuredTypeKind === 1 /* Structure */;
     if (!canAssignToObject) {
       const semanticContext = this.analyzer.semanticContext.containing(node);
       const containingSubprogram = semanticContext.getContainingSubprogram();
@@ -83094,20 +83043,20 @@ var Analyzer = class {
   ifTypeEnumerableThenElementType(type) {
     let result = void 0;
     const enumerableEntity = this.originalWellKnownDeclarations.enumerable;
-    if (type.getEntity()?.getOriginalEntity() === enumerableEntity) {
+    if (type.entity?.getOriginalEntity() === enumerableEntity) {
       const parameter = enumerableEntity.getTypeParameters()[0];
       Debug.assertNotNull(parameter, "\u0422\u0438\u043F \u0434\u043E\u043B\u0436\u0435\u043D \u0438\u043C\u0435\u0442\u044C \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440 \u0442\u0438\u043F\u0430.");
-      result = type.getSubstitutions().map.get(parameter) ?? this.originalStandardTypes.unresolved;
+      result = type.substitutions.map.get(parameter) ?? this.originalStandardTypes.unresolved;
     }
     return result;
   }
   ifTypeEnumeratorThenElementType(type) {
     let result = void 0;
     const enumeratorEntity = this.originalWellKnownDeclarations.enumerator;
-    if (type.getEntity()?.getOriginalEntity() === enumeratorEntity) {
+    if (type.entity?.getOriginalEntity() === enumeratorEntity) {
       const parameter = enumeratorEntity.getTypeParameters()[0];
       Debug.assertNotNull(parameter, "\u0422\u0438\u043F \u0434\u043E\u043B\u0436\u0435\u043D \u0438\u043C\u0435\u0442\u044C \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440 \u0442\u0438\u043F\u0430.");
-      result = type.getSubstitutions().map.get(parameter) ?? this.originalStandardTypes.unresolved;
+      result = type.substitutions.map.get(parameter) ?? this.originalStandardTypes.unresolved;
     }
     return result;
   }
@@ -83121,7 +83070,7 @@ var Analyzer = class {
   ifTypeArrayOrReadonlyArrayThenElementType(type) {
     let result;
     const { array, readonlyArray } = this.originalWellKnownDeclarations;
-    const entity = type.getEntity()?.getOriginalEntity();
+    const entity = type.entity?.getOriginalEntity();
     if (entity !== void 0 && (entity === array || entity === readonlyArray)) {
       let parameter;
       if (entity === array) {
@@ -83131,17 +83080,17 @@ var Analyzer = class {
         parameter = readonlyArray.getTypeParameters()[0];
         Debug.assertNotNull(parameter, "\u0422\u0438\u043F \u041C\u0430\u0441\u0441\u0438\u0432\u0427\u0438\u0442\u0430\u0435\u043C\u044B\u0439 \u0434\u043E\u043B\u0436\u0435\u043D \u0438\u043C\u0435\u0442\u044C \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440 \u0442\u0438\u043F\u0430.");
       }
-      result = type.getSubstitutions().map.get(parameter) ?? this.originalStandardTypes.unresolved;
+      result = type.substitutions.map.get(parameter) ?? this.originalStandardTypes.unresolved;
     }
     return result;
   }
   ifTypeReferenceThenReferencedType(type) {
     let result;
     const referenceEntity = this.originalWellKnownDeclarations.reference;
-    if (type.kind === "structured" && type.getEntity().getOriginalEntity() === referenceEntity) {
+    if (type.kind === "structured" && type.entity.getOriginalEntity() === referenceEntity) {
       const parameter = referenceEntity.getTypeParameters()[0];
       Debug.assertNotNull(parameter, "\u0422\u0438\u043F \u0421\u0441\u044B\u043B\u043A\u0430 \u0434\u043E\u043B\u0436\u0435\u043D \u0438\u043C\u0435\u0442\u044C \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440 \u0442\u0438\u043F\u0430.");
-      result = type.getSubstitutions().map.get(parameter) ?? this.originalStandardTypes.unresolved;
+      result = type.substitutions.map.get(parameter) ?? this.originalStandardTypes.unresolved;
     }
     return result;
   }
@@ -83228,7 +83177,7 @@ var Analyzer = class {
   }
   getImplicitBaseTypeForStructuredType(entity) {
     let result;
-    const structuredTypeKind = entity.getStructuredTypeKind();
+    const structuredTypeKind = entity.structuredTypeKind;
     switch (structuredTypeKind) {
       case 0 /* Class */: {
         const originalEntity = entity.getOriginalEntity();
@@ -83383,7 +83332,7 @@ var Analyzer = class {
         result = this.typeFactory.getUnionType(typesWithoutNull);
       }
     } else if (type.kind === "parameter" && this.canTypeParameterBeNull(type)) {
-      result = this.typeFactory.getParameterType(type.getEntity(), true);
+      result = this.typeFactory.getParameterType(type.entity, true);
     } else if (type.isNullType) {
       result = this.typeFactory.getUnionType([]);
     } else {
@@ -83483,7 +83432,7 @@ var Analyzer = class {
   }
   isParameterVariadic(entity) {
     const type = this.excludeNullFromType(entity.getType());
-    return type.kind === "alias" && type.getEntity().getOriginalEntity() === this.originalWellKnownDeclarations.parameterArray;
+    return type.kind === "alias" && type.entity.getOriginalEntity() === this.originalWellKnownDeclarations.parameterArray;
   }
   getDefaultTypeParameterConstraint(locale) {
     return this.includeNullToType(this.getLocalizedStandardTypes(locale).object, locale);
@@ -84923,7 +84872,7 @@ var TypeAssignabilityCheck = class {
       return 2 /* Identity */;
     }
     if (target.kind === "parameter") {
-      if (source.kind === "parameter" && source.getEntity() === target.getEntity() && (this.analyzer.canTypeParameterBeNull(target) || !this.analyzer.canTypeParameterBeNull(source))) {
+      if (source.kind === "parameter" && source.entity === target.entity && (this.analyzer.canTypeParameterBeNull(target) || !this.analyzer.canTypeParameterBeNull(source))) {
         return 2 /* Identity */;
       } else {
         return 1 /* NotAssignable */;
@@ -85158,7 +85107,7 @@ var TypeAssignabilityCheck = class {
     let result;
     if (isDerivedFromOrEqualsTo) {
       result = 4 /* DerivedToBase */;
-      if (source.getStructuredTypeKind() === 1 /* Structure */) {
+      if (source.structuredTypeKind === 1 /* Structure */) {
         result |= 32 /* Boxing */;
       }
     } else {
@@ -85276,7 +85225,7 @@ var TypeComparabilityCheck = class {
           return true;
         }
       }
-      return type1.getEntity().getOriginalEntity() === type2.getEntity().getOriginalEntity();
+      return type1.entity.getOriginalEntity() === type2.entity.getOriginalEntity();
     } else if (type1.kind === "parameter") {
       const type1Constraint = type1.constraint;
       if (type1Constraint !== void 0) {
@@ -85543,8 +85492,8 @@ var TypeUtils2 = class {
       return true;
     }
     if (!considerTypeArguments) {
-      const sourceEntity = source.getEntity()?.getOriginalEntity();
-      const targetEntity = target.getEntity()?.getOriginalEntity();
+      const sourceEntity = source.entity?.getOriginalEntity();
+      const targetEntity = target.entity?.getOriginalEntity();
       if (sourceEntity !== void 0 && sourceEntity === targetEntity) {
         return true;
       }
@@ -85582,7 +85531,7 @@ var TypeUtils2 = class {
         if (type2.kind !== type1.kind) {
           return false;
         }
-        if (type1.getEntity().subkind === "anonymous" || type2.getEntity().subkind === "anonymous") {
+        if (type1.entity.subkind === "anonymous" || type2.entity.subkind === "anonymous") {
           let result = type1.isAsync() === type2.isAsync();
           if (result) {
             const ownParameters = type1.getParameters();
@@ -85657,7 +85606,7 @@ var TypeUtils2 = class {
     if (type.kind !== "structured") {
       return false;
     }
-    return Query.any(this.allAspectsOfType(type), (a) => a.getEntity().getOriginalEntity() === aspectEntity.getOriginalEntity());
+    return Query.any(this.allAspectsOfType(type), (a) => a.entity.getOriginalEntity() === aspectEntity.getOriginalEntity());
   }
   collectBaseAndAliasedTypesRecursively(type, result) {
     switch (type.kind) {
@@ -85740,9 +85689,9 @@ var TypeUtils2 = class {
         const baseObjectType = type.getBaseObjectType();
         if (baseObjectType !== void 0) {
           this.addTypeAndCollectAllBaseTypes(baseObjectType, result);
-        } else if (type.getStructuredTypeKind() === 2 /* Aspect */) {
+        } else if (type.structuredTypeKind === 2 /* Aspect */) {
           this.addTypeAndCollectAllBaseTypes(
-            this.analyzer.getLocalizedStandardTypes(type.getEntity().getLocale()).object,
+            this.analyzer.getLocalizedStandardTypes(type.entity.getLocale()).object,
             result
           );
         }
@@ -85758,9 +85707,9 @@ var TypeUtils2 = class {
           this.addTypeAndCollectAllBaseTypes(baseObjectType, result);
         } else {
           const reductionSource = type.getReductionSource().unaliasAndGetReductionSource();
-          if (reductionSource?.kind === "structured" && reductionSource.getStructuredTypeKind() === 2 /* Aspect */) {
+          if (reductionSource?.kind === "structured" && reductionSource.structuredTypeKind === 2 /* Aspect */) {
             this.addTypeAndCollectAllBaseTypes(
-              this.analyzer.getLocalizedStandardTypes(type.getEntity().getLocale()).object,
+              this.analyzer.getLocalizedStandardTypes(type.entity.getLocale()).object,
               result
             );
           }
@@ -92180,6 +92129,9 @@ var PackageStructuredTypeDeclarationEntity2 = class {
     this.node = node;
     this.data = new SourcePackageStructuredTypeDeclarationData2(analyzer, node, this);
   }
+  get structuredTypeKind() {
+    return this.data.structuredTypeKind;
+  }
   getNaming() {
     return this.data.getNaming();
   }
@@ -92204,9 +92156,6 @@ var PackageStructuredTypeDeclarationEntity2 = class {
   isAbstract() {
     return this.data.isAbstract();
   }
-  getStructuredTypeKind() {
-    return this.data.getStructuredTypeKind();
-  }
   getArity() {
     return this.data.getArity();
   }
@@ -92249,6 +92198,9 @@ var LocalStructuredTypeDeclarationEntity = class {
     this.node = node;
     this.data = new SourceLocalStructuredTypeDeclarationData(analyzer, node, this);
   }
+  get structuredTypeKind() {
+    return this.data.structuredTypeKind;
+  }
   getNaming() {
     return this.data.getNaming();
   }
@@ -92270,9 +92222,6 @@ var LocalStructuredTypeDeclarationEntity = class {
   isAbstract() {
     return false;
   }
-  getStructuredTypeKind() {
-    return this.data.getStructuredTypeKind();
-  }
   getBaseObjectType() {
     return this.data.getBaseObjectType();
   }
@@ -92323,7 +92272,7 @@ var SourceStructuredTypeDeclarationData2 = class {
     return this.members.getOrInsertWith(() => {
       const members = this.analyzer.getDeclaredTypeMemberEntities(this.typeNode);
       const isInterfacePackageMember = this.entity.getContainingPackage().getInterfacePackageInfo() !== void 0;
-      if (!(isInterfacePackageMember || this.getStructuredTypeKind() === 2 /* Aspect */)) {
+      if (!(isInterfacePackageMember || this.structuredTypeKind === 2 /* Aspect */)) {
         if (members.find((m) => TypeMemberEntity.isConstructor(m)) === void 0) {
           const fields = members.filter((m) => m.kind === 0 /* Variable */);
           const defaultConstructors = this.analyzer.createDefaultConstructors(this.entity, fields);
@@ -92362,18 +92311,18 @@ var SourceStructuredTypeDeclarationData2 = class {
       const baseType = this.analyzer.type.ofTypeSpecifier(baseTypeSpecifier);
       const unaliasedBaseType = baseType.unalias();
       if (unaliasedBaseType.kind === "structured") {
-        if (unaliasedBaseType.getStructuredTypeKind() === 0 /* Class */) {
+        if (unaliasedBaseType.structuredTypeKind === 0 /* Class */) {
           if (declaredBaseObjectType !== void 0) {
             diagnostics.addDiagnostic(this.analyzer.createDiagnostic(
               2131 /* TypeCannotHaveMultipleBaseObjectTypes */,
               baseTypeSpecifier
             ));
-          } else if (this.entity.getStructuredTypeKind() === 1 /* Structure */) {
+          } else if (this.entity.structuredTypeKind === 1 /* Structure */) {
             diagnostics.addDiagnostic(this.analyzer.createDiagnostic(
               2136 /* StructureCanHaveOnlyAspectsAsBaseTypes */,
               baseTypeSpecifier
             ));
-          } else if (this.entity.getStructuredTypeKind() === 2 /* Aspect */) {
+          } else if (this.entity.structuredTypeKind === 2 /* Aspect */) {
             diagnostics.addDiagnostic(this.analyzer.createDiagnostic(
               2137 /* AspectTypeCanHaveOnlyAspectsAsBaseTypes */,
               baseTypeSpecifier
@@ -92381,12 +92330,12 @@ var SourceStructuredTypeDeclarationData2 = class {
           } else {
             declaredBaseObjectType = baseType;
           }
-        } else if (unaliasedBaseType.getStructuredTypeKind() === 1 /* Structure */) {
+        } else if (unaliasedBaseType.structuredTypeKind === 1 /* Structure */) {
           diagnostics.addDiagnostic(this.analyzer.createDiagnostic(
             2133 /* StructureCannotBeUsedAsBaseType */,
             baseTypeSpecifier
           ));
-        } else if (unaliasedBaseType.getStructuredTypeKind() === 2 /* Aspect */) {
+        } else if (unaliasedBaseType.structuredTypeKind === 2 /* Aspect */) {
           if (declaredBaseAspectTypes.some((t) => t.unalias().equals(unaliasedBaseType))) {
             diagnostics.addDiagnostic(this.analyzer.createDiagnostic(
               2134 /* ThisTypeIsAlreadyListedInBaseTypeList */,
@@ -92413,13 +92362,26 @@ var SourcePackageStructuredTypeDeclarationData2 = class extends SourceStructured
   constructor(analyzer, node, entity) {
     super(analyzer);
     this.typeParameters = new Cached();
-    this.structuredTypeKind = new Cached();
+    this.structuredTypeKind_ = new Cached();
     this.hiding = new Cached();
     this.modifierFlags_ = 2048 /* NotComputed */;
     this.node = node;
     this.entity = entity;
     this.name = analyzer.createNameFromIdentifier(node.name);
   }
+  get structuredTypeKind() {
+    return this.structuredTypeKind_.getOrInsertWith(() => {
+      const tagPlainM = this.analyzer.tags.ofNodeWithTags(this.typeNode).find((it) => it.entity.getOriginalEntity() === this.analyzer.originalWellKnownDeclarations.tagPlainM.getOriginalEntity()) !== void 0;
+      const tagAspectM = this.analyzer.tags.ofNodeWithTags(this.typeNode).find((it) => it.entity.getOriginalEntity() === this.analyzer.originalWellKnownDeclarations.tagAspectM.getOriginalEntity()) !== void 0;
+      if (tagPlainM) {
+        return 1 /* Structure */;
+      }
+      if (tagAspectM) {
+        return 2 /* Aspect */;
+      }
+      return 0 /* Class */;
+    });
+  }
   get typeNode() {
     return this.node;
   }
@@ -92456,21 +92418,11 @@ var SourcePackageStructuredTypeDeclarationData2 = class extends SourceStructured
   getSubstitutionApplicationMode() {
     return 0 /* SubstituteOwnSubstitutions */;
   }
-  getStructuredTypeKind() {
-    return this.structuredTypeKind.getOrInsertWith(() => {
-      const tagPlainM = this.analyzer.tags.ofNodeWithTags(this.typeNode).find((it) => it.entity.getOriginalEntity() === this.analyzer.originalWellKnownDeclarations.tagPlainM.getOriginalEntity()) !== void 0;
-      const tagAspectM = this.analyzer.tags.ofNodeWithTags(this.typeNode).find((it) => it.entity.getOriginalEntity() === this.analyzer.originalWellKnownDeclarations.tagAspectM.getOriginalEntity()) !== void 0;
-      if (tagPlainM) {
-        return 1 /* Structure */;
-      }
-      if (tagAspectM) {
-        return 2 /* Aspect */;
-      }
-      return 0 /* Class */;
-    });
-  }
 };
 var SourceLocalStructuredTypeDeclarationData = class extends SourceStructuredTypeDeclarationData2 {
+  get structuredTypeKind() {
+    return 0 /* Class */;
+  }
   get typeNode() {
     return this.node;
   }
@@ -92495,9 +92447,6 @@ var SourceLocalStructuredTypeDeclarationData = class extends SourceStructuredTyp
   getSubstitutionApplicationMode() {
     return 1 /* SubstituteOwnSubstitutionsAndMerge */;
   }
-  getStructuredTypeKind() {
-    return 0 /* Class */;
-  }
   getName() {
     return this.name;
   }
@@ -93300,7 +93249,7 @@ var Resolver = class {
       case 1 /* Structured */: {
         const baseObjectType = typeEntity.getBaseObjectType();
         let result = baseObjectType.cycleFree;
-        if (result === void 0 && !isForBaseConstructorCall && typeEntity.typeEntityKind === 1 /* Structured */ && typeEntity.getStructuredTypeKind() === 2 /* Aspect */) {
+        if (result === void 0 && !isForBaseConstructorCall && typeEntity.typeEntityKind === 1 /* Structured */ && typeEntity.structuredTypeKind === 2 /* Aspect */) {
           result = this.analyzer.getLocalizedStandardTypes(typeEntity.getLocale()).object;
         }
         return result;
@@ -93474,7 +93423,7 @@ var TypeArgumentInferrer = class {
     }
   }
   inferToParameterType(sourceType, targetType, priority) {
-    const inferenceState = this.inferenceStates.find((s) => s.typeParameter.getOriginalEntity() === targetType.getEntity().getOriginalEntity());
+    const inferenceState = this.inferenceStates.find((s) => s.typeParameter.getOriginalEntity() === targetType.entity.getOriginalEntity());
     if (inferenceState !== void 0) {
       if (sourceType === this.unresolvedType) {
         this.inferenceHasFailed = true;
@@ -93488,18 +93437,18 @@ var TypeArgumentInferrer = class {
     }
   }
   inferToStructuredType(sourceType, targetType, priority) {
-    if (sourceType.getEntity()?.getOriginalEntity() === targetType.getEntity().getOriginalEntity()) {
-      this.inferFromSubstitutions(sourceType.getSubstitutions(), targetType.getSubstitutions(), priority);
+    if (sourceType.entity?.getOriginalEntity() === targetType.entity.getOriginalEntity()) {
+      this.inferFromSubstitutions(sourceType.substitutions, targetType.substitutions, priority);
     } else {
-      const baseType = this.analyzer.typeUtils.getBaseAndAliasedTypesRecursively(sourceType).find((t) => t.getEntity()?.getOriginalEntity() === targetType.getEntity().getOriginalEntity());
+      const baseType = this.analyzer.typeUtils.getBaseAndAliasedTypesRecursively(sourceType).find((t) => t.entity?.getOriginalEntity() === targetType.entity.getOriginalEntity());
       if (baseType !== void 0) {
-        this.inferFromSubstitutions(baseType.getSubstitutions(), targetType.getSubstitutions(), priority);
+        this.inferFromSubstitutions(baseType.substitutions, targetType.substitutions, priority);
       }
     }
   }
   inferToReducedType(sourceType, targetType, priority) {
-    if (sourceType.getEntity()?.getOriginalEntity() === targetType.getEntity().getOriginalEntity()) {
-      this.inferFromSubstitutions(sourceType.getSubstitutions(), targetType.getSubstitutions(), priority);
+    if (sourceType.entity?.getOriginalEntity() === targetType.entity.getOriginalEntity()) {
+      this.inferFromSubstitutions(sourceType.substitutions, targetType.substitutions, priority);
     } else {
       this.inferFromTypes(sourceType, targetType.getReductionSource(), priority);
     }
@@ -93643,30 +93592,30 @@ var TypeArgumentInferrer = class {
   typeContainsTypeParameter(type, typeParameterEntity) {
     switch (type.kind) {
       case "parameter":
-        return type.getEntity().getOriginalEntity() === typeParameterEntity.getOriginalEntity();
+        return type.entity.getOriginalEntity() === typeParameterEntity.getOriginalEntity();
       case "function": {
         return type.getParameters().some((p) => this.typeContainsTypeParameter(p.getType(), typeParameterEntity)) || this.typeContainsTypeParameter(type.getReturnType(), typeParameterEntity);
       }
       case "structured": {
-        const isNamed = isNamedTypeEntity(type.getEntity());
+        const isNamed = isNamedTypeEntity(type.entity);
         if (isNamed) {
-          return this.substitutionsContainTypeParameter(type.getSubstitutions(), typeParameterEntity);
+          return this.substitutionsContainTypeParameter(type.substitutions, typeParameterEntity);
         } else {
           return false;
         }
       }
       case "variant": {
-        const isNamed = isNamedTypeEntity(type.getEntity());
+        const isNamed = isNamedTypeEntity(type.entity);
         if (isNamed) {
-          return this.substitutionsContainTypeParameter(type.getSubstitutions(), typeParameterEntity);
+          return this.substitutionsContainTypeParameter(type.substitutions, typeParameterEntity);
         } else {
           return false;
         }
       }
       case "alias":
-        return this.substitutionsContainTypeParameter(type.getSubstitutions(), typeParameterEntity);
+        return this.substitutionsContainTypeParameter(type.substitutions, typeParameterEntity);
       case "reduced":
-        return this.substitutionsContainTypeParameter(type.getSubstitutions(), typeParameterEntity);
+        return this.substitutionsContainTypeParameter(type.substitutions, typeParameterEntity);
       case "union":
         return type.originalTypes.some((t) => this.typeContainsTypeParameter(t, typeParameterEntity));
       case "intersection":
@@ -94033,7 +93982,7 @@ var OverloadResolver = class {
   }
   functionLiteralCouldBeAssignableToType(type) {
     type = type.unalias();
-    return type.getEntity()?.getOriginalEntity() === this.analyzer.originalWellKnownDeclarations.object || type.getEntity()?.getOriginalEntity() === this.analyzer.originalWellKnownDeclarations.func || type.kind === "function" || type.kind === "union" && type.originalTypes.some((t) => this.functionLiteralCouldBeAssignableToType(t));
+    return type.entity?.getOriginalEntity() === this.analyzer.originalWellKnownDeclarations.object || type.entity?.getOriginalEntity() === this.analyzer.originalWellKnownDeclarations.func || type.kind === "function" || type.kind === "union" && type.originalTypes.some((t) => this.functionLiteralCouldBeAssignableToType(t));
   }
   reportAmbiguousAccessDiagnostic(signatures) {
     if (this.diagnostics !== void 0 && this.nodesForDiagnostic?.access !== void 0) {
@@ -94189,7 +94138,7 @@ var Resolver3 = class {
           ));
         }
         return ResolutionResult.empty;
-      } else if (singleTypeEntity.typeEntityKind === 1 /* Structured */ && singleTypeEntity.getStructuredTypeKind() === 2 /* Aspect */) {
+      } else if (singleTypeEntity.typeEntityKind === 1 /* Structured */ && singleTypeEntity.structuredTypeKind === 2 /* Aspect */) {
         if (diagnostics !== void 0 && diagnosticLocation !== void 0) {
           diagnostics.addDiagnostic(analyzer.createDiagnostic(
             2013 /* CannotCreateInstanceOfAspect */,
@@ -94317,7 +94266,7 @@ var Resolver3 = class {
       case 5 /* Reduced */:
         return true;
       case 1 /* Structured */:
-        return !(entity.getStructuredTypeKind() === 2 /* Aspect */ || entity.isAbstract());
+        return !(entity.structuredTypeKind === 2 /* Aspect */ || entity.isAbstract());
       case 2 /* Parameter */:
         return false;
       default:
@@ -94751,11 +94700,11 @@ var Resolver5 = class {
       case 1 /* Structured */:
       case 3 /* Variant */:
       case 0 /* Function */:
-        return typeEntity.getBaseObjectType().cycleFree?.getEntity();
+        return typeEntity.getBaseObjectType().cycleFree?.entity;
       case 4 /* Alias */:
-        return typeEntity.getAliasedType().cycleFree?.getEntity();
+        return typeEntity.getAliasedType().cycleFree?.entity;
       case 5 /* Reduced */:
-        return typeEntity.getReductionSource().cycleFree?.getEntity();
+        return typeEntity.getReductionSource().cycleFree?.entity;
       default:
         Debug.never(typeEntity);
     }
@@ -94931,7 +94880,7 @@ var DeclarationsUsageCounter = class {
                   this.recordUsage(meaning.packageAlias, void 0);
                   break;
                 case "type-access": {
-                  const entity = meaning.singleSuitableType?.getEntity();
+                  const entity = meaning.singleSuitableType?.entity;
                   if (entity !== void 0) {
                     this.recordUsage(entity, void 0);
                   }
@@ -94969,7 +94918,7 @@ var DeclarationsUsageCounter = class {
                   entity = meaning.suitableOrSingleFunction?.getEntity();
                   break;
                 case "package-type-access":
-                  entity = meaning.singleSuitableType?.getEntity();
+                  entity = meaning.singleSuitableType?.entity;
                   break;
                 case "type-access-at-constructor-call":
                   entity = meaning.callExpressionMeaning.typeEntity;
@@ -95003,7 +94952,7 @@ var DeclarationsUsageCounter = class {
             }
             case 1069 /* NamedTypeSpecifier */: {
               const resolved = this.analyzer.resolveNamedTypeSpecifier(node);
-              const entity = resolved.type?.getEntity();
+              const entity = resolved.type?.entity;
               if (entity !== void 0) {
                 this.recordUsage(entity, void 0);
               }
@@ -95625,7 +95574,7 @@ var FirstStageResolver = class {
       }
     }
     const suitableTypes = suitableTypeEntities.map((c) => this.analyzer.instantiateType(c, typeArguments));
-    if (suitableTypes.length >= 1 && suitableTypes[0].getEntity()?.typeEntityKind === 3 /* Variant */) {
+    if (suitableTypes.length >= 1 && suitableTypes[0].entity?.typeEntityKind === 3 /* Variant */) {
       if (diagnosticsAccumulating !== void 0) {
         for (const diagnostic of diagnosticsAccumulating.items) {
           this.diagnostics?.addDiagnostic(diagnostic);
@@ -97721,9 +97670,9 @@ var ReductionSourceMemberFinder = class _ReductionSourceMemberFinder {
     const typeComparer = (t1, t2) => {
       let result2 = t1.kind === "reduced" && t2.equals(reductionSource) && t1.getReductionSource().equals(reductionSource);
       if (!result2) {
-        result2 = t1.kind === t2.kind && t1.getEntity()?.getOriginalEntity() === t2.getEntity()?.getOriginalEntity() && this.analyzer.typeUtils.compareSubstitutionsWithSimpleTypeComparer(
-          t1.getSubstitutions(),
-          t2.getSubstitutions(),
+        result2 = t1.kind === t2.kind && t1.entity?.getOriginalEntity() === t2.entity?.getOriginalEntity() && this.analyzer.typeUtils.compareSubstitutionsWithSimpleTypeComparer(
+          t1.substitutions,
+          t2.substitutions,
           typeComparer
         );
       }
@@ -100743,20 +100692,20 @@ var Analyzer2 = class extends Analyzer {
       } else {
         const enumerableEntity = this.originalWellKnownDeclarations.enumerable;
         let implementedEnumerableAspect;
-        if (type.getEntity()?.getOriginalEntity() === enumerableEntity) {
+        if (type.entity?.getOriginalEntity() === enumerableEntity) {
           Debug.assert(type.kind === "structured");
           implementedEnumerableAspect = type;
         } else {
-          implementedEnumerableAspect = Query.from(this.typeUtils.allAspectsOfType(type)).first((t) => t.getEntity().getOriginalEntity() === enumerableEntity);
+          implementedEnumerableAspect = Query.from(this.typeUtils.allAspectsOfType(type)).first((t) => t.entity.getOriginalEntity() === enumerableEntity);
         }
         if (implementedEnumerableAspect !== void 0) {
           const parameter = enumerableEntity.getTypeParameters()[0];
           Debug.assertNotNull(parameter, "\u0422\u0438\u043F \u041F\u0435\u0440\u0435\u0431\u0438\u0440\u0430\u0435\u043C\u044B\u0439 \u0434\u043E\u043B\u0436\u0435\u043D \u0438\u043C\u0435\u0442\u044C \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440 \u0442\u0438\u043F\u0430.");
-          const elementType = implementedEnumerableAspect.getSubstitutions().map.get(parameter) ?? this.originalStandardTypes.unresolved;
+          const elementType = implementedEnumerableAspect.substitutions.map.get(parameter) ?? this.originalStandardTypes.unresolved;
           result = new WithDiagnostics_ok(new ExpressionCanBeUsedInForLoopCheckResult(elementType, void 0));
         } else {
           const semanticContext = this.semanticContext.containing(node);
-          const typeLocale = type.getEntity()?.getLocale() ?? node.locale;
+          const typeLocale = type.entity?.getLocale() ?? node.locale;
           const enumeratorMethodName = LocalizationHelperM.localizeHelperPhrase(
             8 /* EnumeratorMethodName */,
             typeLocale
@@ -101542,7 +101491,7 @@ var Analyzer2 = class extends Analyzer {
   }
   createDefaultConstructors(typeEntity, fields) {
     let result;
-    const structuredTypeKind = typeEntity.getStructuredTypeKind();
+    const structuredTypeKind = typeEntity.structuredTypeKind;
     if (structuredTypeKind === 0 /* Class */ || structuredTypeKind === 1 /* Structure */) {
       const baseType = typeEntity.getBaseObjectType().cycleFree;
       const variablesToInitialize = fields.filter((f) => !f.isStatic() && !isVariableEntityWithExplicitAccessors(f)).map((f) => {
@@ -102298,7 +102247,7 @@ var Type14 = class {
     const targetArrayType = this.analyzer.getUnambiguousTargetArrayType(targetType);
     const standardTypes = this.analyzer.getLocalizedStandardTypes(node.locale);
     const elements = node.elementList.expressions.toArray();
-    const arrayTypeEntity = standardTypes.array.getEntity();
+    const arrayTypeEntity = standardTypes.array.entity;
     if (elements.length === 0) {
       if (targetArrayType !== void 0) {
         return targetArrayType;
@@ -107058,7 +107007,7 @@ var TypeArgumentInferrer2 = class {
     }
   }
   inferToParameterType(sourceType, targetType, priority) {
-    const inferenceState = this.inferenceStates.find((s) => s.typeParameter.getOriginalEntity() === targetType.getEntity().getOriginalEntity());
+    const inferenceState = this.inferenceStates.find((s) => s.typeParameter.getOriginalEntity() === targetType.entity.getOriginalEntity());
     if (inferenceState !== void 0) {
       if (sourceType === this.unresolvedType) {
         this.inferenceHasFailed = true;
@@ -107072,18 +107021,18 @@ var TypeArgumentInferrer2 = class {
     }
   }
   inferToStructuredType(sourceType, targetType, priority) {
-    if (sourceType.getEntity()?.getOriginalEntity() === targetType.getEntity().getOriginalEntity()) {
-      this.inferFromSubstitutions(sourceType.getSubstitutions(), targetType.getSubstitutions(), priority);
+    if (sourceType.entity?.getOriginalEntity() === targetType.entity.getOriginalEntity()) {
+      this.inferFromSubstitutions(sourceType.substitutions, targetType.substitutions, priority);
     } else {
-      const baseType = this.analyzer.typeUtils.getBaseAndAliasedTypesRecursively(sourceType).find((t) => t.getEntity()?.getOriginalEntity() === targetType.getEntity().getOriginalEntity());
+      const baseType = this.analyzer.typeUtils.getBaseAndAliasedTypesRecursively(sourceType).find((t) => t.entity?.getOriginalEntity() === targetType.entity.getOriginalEntity());
       if (baseType !== void 0) {
-        this.inferFromSubstitutions(baseType.getSubstitutions(), targetType.getSubstitutions(), priority);
+        this.inferFromSubstitutions(baseType.substitutions, targetType.substitutions, priority);
       }
     }
   }
   inferToReducedType(sourceType, targetType, priority) {
-    if (sourceType.getEntity()?.getOriginalEntity() === targetType.getEntity().getOriginalEntity()) {
-      this.inferFromSubstitutions(sourceType.getSubstitutions(), targetType.getSubstitutions(), priority);
+    if (sourceType.entity?.getOriginalEntity() === targetType.entity.getOriginalEntity()) {
+      this.inferFromSubstitutions(sourceType.substitutions, targetType.substitutions, priority);
     } else {
       this.inferFromTypes(sourceType, targetType.getReductionSource(), priority);
     }
@@ -107230,30 +107179,30 @@ var TypeArgumentInferrer2 = class {
   typeContainsTypeParameter(type, typeParameterEntity) {
     switch (type.kind) {
       case "parameter":
-        return type.getEntity().getOriginalEntity() === typeParameterEntity.getOriginalEntity();
+        return type.entity.getOriginalEntity() === typeParameterEntity.getOriginalEntity();
       case "function": {
         return type.getParameters().some((p) => this.typeContainsTypeParameter(p.getType(), typeParameterEntity)) || this.typeContainsTypeParameter(type.getReturnType(), typeParameterEntity);
       }
       case "structured": {
-        const isNamed = isNamedTypeEntity(type.getEntity());
+        const isNamed = isNamedTypeEntity(type.entity);
         if (isNamed) {
-          return this.substitutionsContainTypeParameter(type.getSubstitutions(), typeParameterEntity);
+          return this.substitutionsContainTypeParameter(type.substitutions, typeParameterEntity);
         } else {
           return false;
         }
       }
       case "variant": {
-        const isNamed = isNamedTypeEntity(type.getEntity());
+        const isNamed = isNamedTypeEntity(type.entity);
         if (isNamed) {
-          return this.substitutionsContainTypeParameter(type.getSubstitutions(), typeParameterEntity);
+          return this.substitutionsContainTypeParameter(type.substitutions, typeParameterEntity);
         } else {
           return false;
         }
       }
       case "alias":
-        return this.substitutionsContainTypeParameter(type.getSubstitutions(), typeParameterEntity);
+        return this.substitutionsContainTypeParameter(type.substitutions, typeParameterEntity);
       case "reduced":
-        return this.substitutionsContainTypeParameter(type.getSubstitutions(), typeParameterEntity);
+        return this.substitutionsContainTypeParameter(type.substitutions, typeParameterEntity);
       case "union":
         return type.originalTypes.some((t) => this.typeContainsTypeParameter(t, typeParameterEntity));
       case "intersection":
@@ -107627,7 +107576,7 @@ var OverloadResolver2 = class {
   }
   functionLiteralCouldBeAssignableToType(type) {
     type = type.unalias();
-    return type.getEntity()?.getOriginalEntity() === this.analyzer.originalWellKnownDeclarations.object || type.getEntity()?.getOriginalEntity() === this.analyzer.originalWellKnownDeclarations.func || type.kind === "function" || type.kind === "union" && type.originalTypes.some((t) => this.functionLiteralCouldBeAssignableToType(t));
+    return type.entity?.getOriginalEntity() === this.analyzer.originalWellKnownDeclarations.object || type.entity?.getOriginalEntity() === this.analyzer.originalWellKnownDeclarations.func || type.kind === "function" || type.kind === "union" && type.originalTypes.some((t) => this.functionLiteralCouldBeAssignableToType(t));
   }
   reportAmbiguousAccessDiagnostic(signatures) {
     if (this.diagnostics !== void 0 && this.nodesForDiagnostic?.access !== void 0) {
@@ -107783,7 +107732,7 @@ var Resolver12 = class {
           ));
         }
         return ResolutionResult4.empty;
-      } else if (singleTypeEntity.typeEntityKind === 1 /* Structured */ && singleTypeEntity.getStructuredTypeKind() === 2 /* Aspect */) {
+      } else if (singleTypeEntity.typeEntityKind === 1 /* Structured */ && singleTypeEntity.structuredTypeKind === 2 /* Aspect */) {
         if (diagnostics !== void 0 && diagnosticLocation !== void 0) {
           diagnostics.addDiagnostic(analyzer.createDiagnostic(
             2013 /* CannotCreateInstanceOfAspect */,
@@ -107911,7 +107860,7 @@ var Resolver12 = class {
       case 5 /* Reduced */:
         return true;
       case 1 /* Structured */:
-        return !(entity.getStructuredTypeKind() === 2 /* Aspect */ || entity.isAbstract());
+        return !(entity.structuredTypeKind === 2 /* Aspect */ || entity.isAbstract());
       case 2 /* Parameter */:
         return false;
       default:
@@ -108030,7 +107979,7 @@ var Resolver13 = class {
       );
       return ResolutionResult5.unresolved();
     }
-    if (targetType.kind === "structured" && targetType.getStructuredTypeKind() === 2 /* Aspect */) {
+    if (targetType.kind === "structured" && targetType.structuredTypeKind === 2 /* Aspect */) {
       this.diagnostics?.addDiagnostic(
         this.analyzer.createDiagnostic(2013 /* CannotCreateInstanceOfAspect */, this.node)
       );
@@ -108245,7 +108194,7 @@ var FirstStageResolver3 = class {
     }
     const overriddenObjectMethod = this.analyzer.entity.ofMethodDeclaration(containingDeclaration).getOverriddenMembers().find((m) => {
       const containingEntity = m.getEntity().getContainingEntity();
-      return containingEntity.kind === 2 /* Type */ && containingEntity.typeEntityKind === 1 /* Structured */ && (containingEntity.getStructuredTypeKind() === 0 /* Class */ || containingEntity.getStructuredTypeKind() === 1 /* Structure */) || containingEntity.kind === 6 /* TypeExtension */;
+      return containingEntity.kind === 2 /* Type */ && containingEntity.typeEntityKind === 1 /* Structured */ && (containingEntity.structuredTypeKind === 0 /* Class */ || containingEntity.structuredTypeKind === 1 /* Structure */) || containingEntity.kind === 6 /* TypeExtension */;
     });
     if (overriddenObjectMethod === void 0) {
       this.diagnostics?.addDiagnostic(
@@ -108288,7 +108237,7 @@ var FirstStageResolver3 = class {
       case 1 /* Structured */: {
         const baseObjectType = typeEntity.getBaseObjectType();
         let result = baseObjectType.cycleFree;
-        if (result === void 0 && !isForBaseConstructorCall && typeEntity.typeEntityKind === 1 /* Structured */ && typeEntity.getStructuredTypeKind() === 2 /* Aspect */) {
+        if (result === void 0 && !isForBaseConstructorCall && typeEntity.typeEntityKind === 1 /* Structured */ && typeEntity.structuredTypeKind === 2 /* Aspect */) {
           result = this.analyzer.getLocalizedStandardTypes(typeEntity.getLocale()).object;
         }
         return result;
@@ -108817,7 +108766,7 @@ var DeclarationsUsageCounter2 = class {
                   this.recordUsage(meaning.packageAlias, void 0);
                   break;
                 case "type-access": {
-                  const entity = meaning.singleSuitableType?.getEntity();
+                  const entity = meaning.singleSuitableType?.entity;
                   if (entity !== void 0) {
                     this.recordUsage(entity, void 0);
                   }
@@ -108852,7 +108801,7 @@ var DeclarationsUsageCounter2 = class {
                   entity = meaning.suitableOrSingleFunction?.getEntity();
                   break;
                 case "package-type-access":
-                  entity = meaning.singleSuitableType?.getEntity();
+                  entity = meaning.singleSuitableType?.entity;
                   break;
                 case "type-access-at-constructor-call":
                   entity = meaning.callExpressionMeaning.typeEntity;
@@ -108886,7 +108835,7 @@ var DeclarationsUsageCounter2 = class {
             }
             case 10 /* NamedTypeSpecifier */: {
               const resolved = this.analyzer.resolveNamedTypeSpecifier(node);
-              const entity = resolved.type?.getEntity();
+              const entity = resolved.type?.entity;
               if (entity !== void 0) {
                 this.recordUsage(entity, void 0);
               }
@@ -111223,9 +111172,9 @@ var ReductionSourceMemberFinder2 = class _ReductionSourceMemberFinder {
     const typeComparer = (t1, t2) => {
       let result2 = t1.kind === "reduced" && t2.equals(reductionSource) && t1.getReductionSource().equals(reductionSource);
       if (!result2) {
-        result2 = t1.kind === t2.kind && t1.getEntity()?.getOriginalEntity() === t2.getEntity()?.getOriginalEntity() && this.analyzer.typeUtils.compareSubstitutionsWithSimpleTypeComparer(
-          t1.getSubstitutions(),
-          t2.getSubstitutions(),
+        result2 = t1.kind === t2.kind && t1.entity?.getOriginalEntity() === t2.entity?.getOriginalEntity() && this.analyzer.typeUtils.compareSubstitutionsWithSimpleTypeComparer(
+          t1.substitutions,
+          t2.substitutions,
           typeComparer
         );
       }
@@ -111832,20 +111781,20 @@ var Analyzer3 = class extends Analyzer {
       } else {
         const enumerableEntity = this.originalWellKnownDeclarations.enumerable;
         let implementedEnumerableAspect;
-        if (type.getEntity()?.getOriginalEntity() === enumerableEntity) {
+        if (type.entity?.getOriginalEntity() === enumerableEntity) {
           Debug.assert(type.kind === "structured");
           implementedEnumerableAspect = type;
         } else {
-          implementedEnumerableAspect = Query.from(this.typeUtils.allAspectsOfType(type)).first((t) => t.getEntity().getOriginalEntity() === enumerableEntity);
+          implementedEnumerableAspect = Query.from(this.typeUtils.allAspectsOfType(type)).first((t) => t.entity.getOriginalEntity() === enumerableEntity);
         }
         if (implementedEnumerableAspect !== void 0) {
           const parameter = enumerableEntity.getTypeParameters()[0];
           Debug.assertNotNull(parameter, "\u0422\u0438\u043F \u041F\u0435\u0440\u0435\u0431\u0438\u0440\u0430\u0435\u043C\u044B\u0439 \u0434\u043E\u043B\u0436\u0435\u043D \u0438\u043C\u0435\u0442\u044C \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440 \u0442\u0438\u043F\u0430.");
-          const elementType = implementedEnumerableAspect.getSubstitutions().map.get(parameter) ?? this.originalStandardTypes.unresolved;
+          const elementType = implementedEnumerableAspect.substitutions.map.get(parameter) ?? this.originalStandardTypes.unresolved;
           result = new WithDiagnostics_ok(new ExpressionCanBeUsedInForLoopCheckResult2(elementType, void 0));
         } else {
           const semanticContext = this.semanticContext.containing(node);
-          const typeLocale = type.getEntity()?.getLocale() ?? node.locale;
+          const typeLocale = type.entity?.getLocale() ?? node.locale;
           const enumeratorMethodName = LocalizationHelperA.localizeHelperPhrase(
             8 /* EnumeratorMethodName */,
             typeLocale
@@ -112706,7 +112655,7 @@ var Analyzer3 = class extends Analyzer {
   }
   createDefaultConstructors(typeEntity, fields) {
     let result;
-    const structuredTypeKind = typeEntity.getStructuredTypeKind();
+    const structuredTypeKind = typeEntity.structuredTypeKind;
     if (structuredTypeKind === 0 /* Class */ || structuredTypeKind === 1 /* Structure */) {
       const baseType = typeEntity.getBaseObjectType().cycleFree;
       const variablesToInitialize = fields.filter((f) => !f.isStatic() && !isVariableEntityWithExplicitAccessors(f)).map((f) => {
@@ -113394,7 +113343,7 @@ var Type15 = class {
     const targetArrayType = this.analyzer.getUnambiguousTargetArrayType(targetType);
     const standardTypes = this.analyzer.getLocalizedStandardTypes(node.locale);
     const elements = node.elementList.expressions.toArray();
-    const arrayTypeEntity = standardTypes.array.getEntity();
+    const arrayTypeEntity = standardTypes.array.entity;
     if (elements.length === 0) {
       if (targetArrayType !== void 0) {
         return targetArrayType;