@artel/artc 0.9.26047-pre-release → 0.9.26048-pre-release

package/build/Cli.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import {
   CommandLineCompiler
-} from "./chunk-CQ7C3WWI.js";
-import "./chunk-UZ2KX7BW.js";
+} from "./chunk-467TFDOD.js";
+import "./chunk-J3BXLO7R.js";
 import {
   __async
-} from "./chunk-LBLLWKHX.js";
+} from "./chunk-NT4OVN2D.js";
 
 // source/Cli.ts
 function main() {

package/build/api/Api.js

@@ -1,6 +1,6 @@
 import {
   Compiler
-} from "../chunk-UZ2KX7BW.js";
+} from "../chunk-J3BXLO7R.js";
 import {
   AccessKind,
   AccessedFunction_entity,
@@ -311,7 +311,7 @@ import {
   withoutQuotes,
   withoutTemplateQuotes,
   yieldTask
-} from "../chunk-LBLLWKHX.js";
+} from "../chunk-NT4OVN2D.js";
 export {
   AccessKind,
   AccessedFunction_entity,

package/build/api/ApiNodeJS.js

@@ -6,9 +6,9 @@ import {
   PhysicalFileSystem,
   PhysicalTypeScriptLibrariesProvider,
   PrintingDiagnosticAcceptor
-} from "../chunk-CQ7C3WWI.js";
-import "../chunk-UZ2KX7BW.js";
-import "../chunk-LBLLWKHX.js";
+} from "../chunk-467TFDOD.js";
+import "../chunk-J3BXLO7R.js";
+import "../chunk-NT4OVN2D.js";
 export {
   CommandLineCompiler,
   FileSystemUri,

package/build/api/ApiServices.js

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

package/build/{chunk-CQ7C3WWI.js → chunk-467TFDOD.js}

@@ -1,6 +1,6 @@
 import {
   Compiler
-} from "./chunk-UZ2KX7BW.js";
+} from "./chunk-J3BXLO7R.js";
 import {
   ArtelVersion,
   Cached,
@@ -16,7 +16,7 @@ import {
   __async,
   performanceMeasurementStageNames,
   performanceMeasurementStages
-} from "./chunk-LBLLWKHX.js";
+} from "./chunk-NT4OVN2D.js";
 
 // source/executor/FileSystemUri.ts
 import { platform } from "os";

package/build/{chunk-UZ2KX7BW.js → chunk-J3BXLO7R.js}

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

package/build/{chunk-LBLLWKHX.js → chunk-NT4OVN2D.js}

@@ -782,7 +782,7 @@ var UniqueWithComparatorQuery = class extends Query {
 };
 
 // source/common/Constants.ts
-var ArtelVersion = true ? "0.9.26047-pre-release" : "";
+var ArtelVersion = true ? "0.9.26048-pre-release" : "";
 var ArtelSourceFileExtensions = [".\u0430\u0440\u0442", ".\u0430\u0440\u0442\u0435\u043B\u044C", ".art", ".artel", ".\u0430\u0440\u0442\u043C", ".\u0430\u0440\u0442\u0435\u043B\u044C\u043C", ".artm", ".artelm"];
 var ArtelSourceFileExtensionSet = new Set(ArtelSourceFileExtensions);
 var ArtelSourceAndConfigurationFileExtensionSet = new Set(ArtelSourceFileExtensionSet).add(".json");
@@ -39558,9 +39558,6 @@ function isNodeM(node) {
   return node instanceof BaseNode2;
 }
 
-// source/emitter/Emitter.ts
-import { CodeGenerator } from "@babel/generator";
-
 // source/emitter/EmitPhaseName.ts
 var EmitPhaseName = class {
   static ofMainFunction(locale) {
@@ -48977,6 +48974,10 @@ var UsagesLowering = class _UsagesLowering extends ExecutableCodeLowering {
     Debug.assertNotNull(enumeratorMethod);
     node.options.addExplicitCallOfEnumeratorMethodIfRequired = false;
     const iteratorField = this.ctx.symbolIteratorField;
+    const computedNameInfo = enumeratorMethod.entity.details.hasComputedName;
+    if (computedNameInfo !== void 0 && computedNameInfo.symbolDeclarationSegments.length === 1 && computedNameInfo.symbolDeclarationSegments[0] === iteratorField) {
+      return;
+    }
     const key = staticFieldGetAccess(iteratorField);
     const enumeratorMethodCall = instanceMethodCallExpression(
       node.enumeratedExpression,
@@ -50520,7 +50521,6 @@ var IrBuilderA = class {
     if (info.baseConstructor !== void 0) {
       const args = info.orderedParametersForBaseConstructor.map((v) => variableGetAccess(this.entityMap.getVariableEntity(v.parameter)));
       const baseConstructorEntity = info.baseConstructor.entity;
-      const containingType = baseConstructorEntity.getContainingType();
       const baseConstructorCall = baseConstructorCallExpression(
         this.entityMap.getNamedFunctionEntity(baseConstructorEntity),
         args
@@ -51469,7 +51469,7 @@ var IrBuilderA = class {
       }
       case "static-field-access": {
         const typeEntity = this.getEntityFromType(meaning.type);
-        const typeAccess = typeAccessExpression(typeEntity);
+        const typeAccess = typeAccessExpression(typeEntity, this.getSourceLocation(expression.expression));
         const originalEntity = meaning.field.entity;
         const entity = this.entityMap.getVariableEntity(originalEntity);
         const access = this.convertVariableAccess(meaning.access, originalEntity);
@@ -51489,7 +51489,7 @@ var IrBuilderA = class {
           return textLiteral("No suitable functions.");
         }
         const typeEntity = this.getEntityFromType(meaning.type);
-        const typeAccess = typeAccessExpression(typeEntity);
+        const typeAccess = typeAccessExpression(typeEntity, this.getSourceLocation(expression.expression));
         const isCallee = this.expressionIsCallee(expression);
         const entity = this.entityMap.getNamedFunctionEntity(method.entity);
         const returnType = this.entityMap.getType(method.getReturnType());
@@ -51728,7 +51728,7 @@ var IrBuilderA = class {
         const originalEntity = meaning.variable.entity;
         let receiver;
         if (originalEntity.subkind === "field") {
-          receiver = this.createExplicitReceiver(originalEntity);
+          receiver = this.createExplicitReceiver(originalEntity, this.getSourceLocation(expression));
         }
         const entity = this.entityMap.getVariableEntity(originalEntity);
         const access = this.convertVariableAccess(meaning.access, originalEntity);
@@ -51754,7 +51754,7 @@ var IrBuilderA = class {
         const originalEntity = suitableFunction.entity;
         let receiver;
         if (originalEntity.subkind === "method") {
-          receiver = this.createExplicitReceiver(originalEntity);
+          receiver = this.createExplicitReceiver(originalEntity, this.getSourceLocation(expression));
         }
         const isCallee = this.expressionIsCallee(expression);
         const entity = this.entityMap.getNamedFunctionEntity(originalEntity);
@@ -51775,15 +51775,15 @@ var IrBuilderA = class {
         Debug.never(meaning);
     }
   }
-  createExplicitReceiver(entity) {
+  createExplicitReceiver(entity, sourceLocation) {
     let result;
     if (entity.isStatic()) {
       const typeOrExtensionEntity = this.entityMap.getTypeEntity(entity.getContainingType());
-      result = typeAccessExpression(typeOrExtensionEntity);
+      result = typeAccessExpression(typeOrExtensionEntity, sourceLocation);
     } else {
       const typeEntity = entity.getContainingType();
       const type = this.entityMap.getType(this.analyzer.instantiateTypeByIdentitySubstitution(typeEntity));
-      result = thisExpression(type);
+      result = thisExpression(type, sourceLocation);
     }
     return result;
   }
@@ -53679,7 +53679,7 @@ var IrBuilderM = class {
         const originalEntity = meaning.variable.entity;
         let receiver;
         if (originalEntity.subkind === "field") {
-          receiver = this.createExplicitReceiver(originalEntity);
+          receiver = this.createExplicitReceiver(originalEntity, this.getSourceLocation(expression));
         }
         const entity = this.entityMap.getVariableEntity(originalEntity);
         const access = this.convertVariableAccess(meaning.access, originalEntity);
@@ -53705,7 +53705,7 @@ var IrBuilderM = class {
         const originalEntity = suitableFunction.entity;
         let receiver;
         if (originalEntity.subkind === "method") {
-          receiver = this.createExplicitReceiver(originalEntity);
+          receiver = this.createExplicitReceiver(originalEntity, this.getSourceLocation(expression));
         }
         const isCallee = this.expressionIsCallee(expression);
         const entity = this.entityMap.getNamedFunctionEntity(originalEntity);
@@ -53724,23 +53724,16 @@ var IrBuilderM = class {
       }
       case "variant-value-access": {
         const originalEntity = meaning.field.entity;
-        let receiver;
-        if (originalEntity.subkind === "field") {
-          receiver = this.createExplicitReceiver(originalEntity);
-        }
+        const receiver = this.createExplicitReceiver(originalEntity, this.getSourceLocation(expression));
         const entity = this.entityMap.getVariableEntity(originalEntity);
         const access = this.convertVariableAccess(meaning.access, originalEntity);
         const type = this.entityMap.getType(meaning.field.getType());
-        return receiver !== void 0 ? fieldAccessExpression(
+        return fieldAccessExpression(
           receiver,
           false,
           accessedVariable(entity, type),
           access,
           this.getSourceLocation(expression)
-        ) : variableAccessExpression(
-          accessedVariable(entity, type),
-          access,
-          this.getSourceLocation(expression)
         );
       }
       case "package-alias-access":
@@ -53754,15 +53747,15 @@ var IrBuilderM = class {
         Debug.never(meaning);
     }
   }
-  createExplicitReceiver(entity) {
+  createExplicitReceiver(entity, sourceLocation) {
     let result;
     if (entity.isStatic()) {
       const typeOrExtensionEntity = this.entityMap.getTypeEntity(entity.getContainingType());
-      result = typeAccessExpression(typeOrExtensionEntity);
+      result = typeAccessExpression(typeOrExtensionEntity, sourceLocation);
     } else {
       const typeEntity = entity.getContainingType();
       const type = this.entityMap.getType(this.analyzer.instantiateTypeByIdentitySubstitution(typeEntity));
-      result = thisExpression(type);
+      result = thisExpression(type, sourceLocation);
     }
     return result;
   }
@@ -54017,10 +54010,12 @@ var IrBuilderM = class {
 
 // source/emitter/IrToJs.ts
 import { transformFromAstAsync } from "@babel/core";
+import generate from "@babel/generator";
 import * as parser from "@babel/parser";
 import decoratorsPlugin from "@babel/plugin-proposal-decorators";
 import classPropertiesPlugin from "@babel/plugin-transform-class-properties";
 import * as js from "@babel/types";
+import { addMapping, GenMapping, toEncodedMap } from "@jridgewell/gen-mapping";
 var _IrToJs = class _IrToJs {
   constructor(options) {
     // Used by debugStack decorator.
@@ -54033,9 +54028,28 @@ var _IrToJs = class _IrToJs {
   static {
     this.customImportFunctionName = "_artelImport";
   }
-  convert(pkg2) {
+  static {
+    this.notMappedLocationFileName = "stub";
+  }
+  generate(pkg2) {
     return __async(this, null, function* () {
-      return this.convertPackage(pkg2);
+      const file2 = yield this.convertPackage(pkg2);
+      const generatorOptions = {
+        jsescOption: {
+          minimal: true,
+          indent: "  "
+        },
+        sourceMaps: this.attachSourceLocation
+      };
+      const generated = generate(file2, generatorOptions);
+      let map;
+      if (this.attachSourceLocation && generated.map !== null && generated.rawMappings !== void 0) {
+        map = this.removeStubMappingsFromSourceMap(generated.map, generated.rawMappings);
+      }
+      return {
+        code: generated.code,
+        map
+      };
     });
   }
   convertPackage(pkg2) {
@@ -54060,7 +54074,7 @@ var _IrToJs = class _IrToJs {
       let result = js.file(js.program(statements));
       this.addNodeLocation(result, pkg2);
       if (this.usesDecorators) {
-        const transformationResult = yield transformFromAstAsync(result, void 0, {
+        const transformationResult = yield transformFromAstAsync(result, "", {
           plugins: [
             [decoratorsPlugin, { legacy: true }],
             [classPropertiesPlugin, { loose: true }]
@@ -54519,7 +54533,7 @@ var _IrToJs = class _IrToJs {
     const callee = this.convertExpression(expression.expression);
     const args = this.convertArguments(expression.args);
     const optional = expression.isOptionalAccess;
-    let result = js.optionalCallExpression(callee, args, optional);
+    let result = optional || this.isOptionalChain(callee) ? js.optionalCallExpression(callee, args, optional) : js.callExpression(callee, args);
     if (expression.isAsyncFunctionCall) {
       result = js.awaitExpression(result);
     }
@@ -54543,17 +54557,17 @@ var _IrToJs = class _IrToJs {
     Debug.assertNotNull(argument2, "\u0412\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u0435 \u0438\u043D\u0434\u0435\u043A\u0441\u043D\u043E\u0433\u043E \u0434\u043E\u0441\u0442\u0443\u043F\u0430 \u0434\u043E\u043B\u0436\u043D\u043E \u0438\u043C\u0435\u0442\u044C \u043E\u0434\u0438\u043D \u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442.");
     const property = this.convertExpressionOrJsSpreadElement(argument2);
     Debug.assert(!js.isSpreadElement(property), "\u0418\u043D\u0434\u0435\u043A\u0441 \u044D\u043B\u0435\u043C\u0435\u043D\u0442\u0430 \u043C\u0430\u0441\u0441\u0438\u0432\u0430 \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u044F\u0432\u043B\u044F\u0442\u044C\u0441\u044F \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u0438\u0435\u043C \u044D\u043B\u0435\u043C\u0435\u043D\u0442\u043E\u0432.");
-    const result = js.optionalMemberExpression(object, property, true, expression.isOptionalAccess);
+    const result = expression.isOptionalAccess || this.isOptionalChain(object) ? js.optionalMemberExpression(object, property, true, expression.isOptionalAccess) : js.memberExpression(object, property, true);
     this.addNodeLocation(result, expression);
     return result;
   }
   convertIntegerLiteral(expression) {
-    const result = js.numericLiteral(expression.value);
+    const result = js.valueToNode(expression.value);
     this.addNodeLocation(result, expression);
     return result;
   }
   convertNumericLiteral(expression) {
-    const result = js.numericLiteral(expression.value);
+    const result = js.valueToNode(expression.value);
     this.addNodeLocation(result, expression);
     return result;
   }
@@ -54635,7 +54649,7 @@ var _IrToJs = class _IrToJs {
     return result;
   }
   convertBaseExpression(expression) {
-    const result = js.super();
+    const result = js.identifier("super");
     this.addNodeLocation(result, expression);
     return result;
   }
@@ -54737,7 +54751,7 @@ var _IrToJs = class _IrToJs {
       computed = !js.isValidIdentifier(name);
       property = computed ? js.stringLiteral(name) : js.identifier(name);
     }
-    const result = js.optionalMemberExpression(object, property, computed, expression.isOptionalAccess);
+    const result = expression.isOptionalAccess || this.isOptionalChain(object) ? js.optionalMemberExpression(object, property, computed, expression.isOptionalAccess) : js.memberExpression(object, property, computed);
     this.addNodeLocation(result, expression);
     return result;
   }
@@ -54753,7 +54767,7 @@ var _IrToJs = class _IrToJs {
       computed = !js.isValidIdentifier(name);
       property = computed ? js.stringLiteral(name) : js.identifier(name);
     }
-    const result = js.optionalMemberExpression(object, property, computed, expression.isOptionalAccess);
+    const result = expression.isOptionalAccess || this.isOptionalChain(object) ? js.optionalMemberExpression(object, property, computed, expression.isOptionalAccess) : js.memberExpression(object, property, computed);
     this.addNodeLocation(result, expression);
     return result;
   }
@@ -54824,7 +54838,7 @@ var _IrToJs = class _IrToJs {
   convertJsIndexedAccessExpression(expression) {
     const object = this.convertExpression(expression.expression);
     const property = this.convertExpression(expression.argument);
-    const result = js.optionalMemberExpression(object, property, true, expression.isOptionalAccess);
+    const result = expression.isOptionalAccess || this.isOptionalChain(object) ? js.optionalMemberExpression(object, property, true, expression.isOptionalAccess) : js.memberExpression(object, property, true);
     this.addNodeLocation(result, expression);
     return result;
   }
@@ -54875,7 +54889,7 @@ var _IrToJs = class _IrToJs {
     const name = expression.name;
     const computed = !js.isValidIdentifier(name);
     const property = computed ? js.stringLiteral(name) : js.identifier(name);
-    const result = js.optionalMemberExpression(object, property, computed, expression.isOptionalAccess);
+    const result = expression.isOptionalAccess || this.isOptionalChain(object) ? js.optionalMemberExpression(object, property, computed, expression.isOptionalAccess) : js.memberExpression(object, property, computed);
     this.addNodeLocation(result, expression);
     return result;
   }
@@ -55243,14 +55257,23 @@ var _IrToJs = class _IrToJs {
     return result;
   }
   addNodeLocation(jsNode, irNode) {
-    if (this.attachSourceLocation && irNode.sourceLocation !== void 0) {
-      const sourceLocation = irNode.sourceLocation;
-      jsNode.loc = {
-        start: { line: sourceLocation.start.line + 1, column: sourceLocation.start.character, index: 0 },
-        end: { line: sourceLocation.end.line + 1, column: sourceLocation.end.character, index: 0 },
-        filename: sourceLocation.sourceFileUri.toString(),
-        identifierName: void 0
-      };
+    if (this.attachSourceLocation) {
+      if (irNode.sourceLocation !== void 0) {
+        const sourceLocation = irNode.sourceLocation;
+        jsNode.loc = {
+          start: { line: sourceLocation.start.line + 1, column: sourceLocation.start.character, index: 0 },
+          end: { line: sourceLocation.end.line + 1, column: sourceLocation.end.character, index: 0 },
+          filename: sourceLocation.sourceFileUri.toString(),
+          identifierName: void 0
+        };
+      } else {
+        jsNode.loc = {
+          start: { line: 0, column: 0, index: 0 },
+          end: { line: 0, column: 0, index: 0 },
+          filename: _IrToJs.notMappedLocationFileName,
+          identifierName: void 0
+        };
+      }
     }
   }
   getEntityName(entity) {
@@ -55277,6 +55300,21 @@ var _IrToJs = class _IrToJs {
   isLValue(node) {
     return js.isLVal(node) || js.isOptionalMemberExpression(node);
   }
+  isOptionalChain(expression) {
+    return js.isOptionalMemberExpression(expression) || js.isOptionalCallExpression(expression) || js.isOptionalIndexedAccessType(expression);
+  }
+  removeStubMappingsFromSourceMap(map, rawMappings) {
+    const genMapping = new GenMapping({
+      file: map.file,
+      sourceRoot: map.sourceRoot
+    });
+    for (const mapping of rawMappings) {
+      if (mapping.source !== _IrToJs.notMappedLocationFileName) {
+        addMapping(genMapping, mapping);
+      }
+    }
+    return toEncodedMap(genMapping);
+  }
 };
 __decorateClass([
   debugStack()
@@ -55720,15 +55758,8 @@ var Emitter = class _Emitter {
         attachSourceLocation: this.options?.sourceMap !== void 0,
         entityNameOverrides: nameOverrides
       };
-      const file2 = yield new IrToJs(config).convert(pkg2);
-      const generatorOptions = {
-        jsescOption: {
-          minimal: true,
-          indent: "  "
-        },
-        sourceMaps: this.options?.sourceMap !== void 0
-      };
-      return new CodeGenerator(file2, generatorOptions).generate();
+      const irToJs = new IrToJs(config);
+      return yield irToJs.generate(pkg2);
     });
   }
   generateCodeAndSourceMaps(pkg2) {
@@ -55736,8 +55767,8 @@ var Emitter = class _Emitter {
       const generated = yield this.generateCode(pkg2.ir, pkg2.entityNameOverrides);
       let code = generated.code;
       let linkedSourceMaps;
-      if (generated.map !== null) {
-        this.prepareSourceMap(pkg2.outputUri, generated);
+      if (generated.map !== void 0) {
+        this.prepareSourceMap(pkg2.outputUri, generated.map);
         const sourceMapJson = JSON.stringify(generated.map);
         const sourceMapMode = this.options?.sourceMap?.mode ?? "linked" /* Linked */;
         if (sourceMapMode === "inline" /* Inline */) {
@@ -55757,29 +55788,33 @@ var Emitter = class _Emitter {
       return { code, linkedSourceMaps };
     });
   }
-  prepareSourceMap(outputPackageUri, generatorResult) {
-    const map = generatorResult.map;
-    if (map !== null && map.sources.length > 0) {
+  prepareSourceMap(outputPackageUri, map) {
+    if (map.sources.length > 0) {
       const useAbsolutePaths = this.options?.sourceMap?.useAbsolutePaths ?? false;
       const includeSourcesContent = this.options?.sourceMap?.includeSourcesContent ?? false;
-      if (map.sourcesContent?.length !== map.sources.length) {
-        map.sourcesContent = new Array(map.sources.length);
-      }
+      const sources = Array.from(map.sources);
+      const sourceContents = includeSourcesContent ? new Array(map.sources.length).fill(null) : void 0;
       for (let i = 0, n = map.sources.length; i < n; i++) {
         const sourceUriString = map.sources[i];
-        const sourceUri = Uri.fromString(sourceUriString);
-        if (useAbsolutePaths) {
-          map.sources[i] = sourceUri.segments.join("/");
-        } else {
-          map.sources[i] = getImportPath(outputPackageUri, sourceUri);
-        }
-        if (includeSourcesContent) {
-          const content = this.ectx.analyzer.compilation.getSourceFileByUri(sourceUri)?.getSourceText();
-          if (content !== void 0) {
-            map.sourcesContent[i] = content;
+        if (sourceUriString !== null) {
+          const sourceUri = Uri.fromString(sourceUriString);
+          if (useAbsolutePaths) {
+            sources[i] = sourceUri.segments.join("/");
+          } else {
+            sources[i] = getImportPath(outputPackageUri, sourceUri);
+          }
+          if (sourceContents !== void 0) {
+            const content = this.ectx.analyzer.compilation.getSourceFileByUri(sourceUri)?.getSourceText();
+            if (content !== void 0) {
+              sourceContents[i] = content;
+            }
           }
         }
       }
+      map.sources = sources;
+      if (sourceContents !== void 0) {
+        map.sourcesContent = sourceContents;
+      }
     }
   }
 };
@@ -102631,12 +102666,12 @@ var Analyzer2 = class extends Analyzer {
       } else {
         const enumerableEntity = this.originalWellKnownDeclarationsA.enumerable;
         let implementedEnumerableAspect;
-        if (type.unalias().entity?.originalEntity === enumerableEntity) {
-          const unaliasedType = type.unalias();
+        const unaliasedType = type.unaliasAndGetExtendedType();
+        if (unaliasedType.entity?.originalEntity === enumerableEntity) {
           Debug.assert(unaliasedType.kind === "structured");
           implementedEnumerableAspect = unaliasedType;
         } else {
-          implementedEnumerableAspect = Query.from(this.typeUtils.allAspectsOfType(type)).first((t) => t.unalias().entity?.originalEntity === enumerableEntity);
+          implementedEnumerableAspect = Query.from(this.typeUtils.allAspectsOfType(unaliasedType)).first((t) => t.unalias().entity?.originalEntity === enumerableEntity);
         }
         if (implementedEnumerableAspect !== void 0) {
           const parameter = enumerableEntity.getTypeParameters()[0];
@@ -113115,12 +113150,12 @@ var Analyzer3 = class extends Analyzer {
       } else {
         const enumerableEntity = this.originalWellKnownDeclarationsA.enumerable;
         let implementedEnumerableAspect;
-        if (type.unalias().entity?.originalEntity === enumerableEntity) {
-          const unaliasedType = type.unalias();
+        const unaliasedType = type.unaliasAndGetExtendedType();
+        if (unaliasedType.entity?.originalEntity === enumerableEntity) {
           Debug.assert(unaliasedType.kind === "structured");
           implementedEnumerableAspect = unaliasedType;
         } else {
-          implementedEnumerableAspect = Query.from(this.typeUtils.allAspectsOfType(type)).first((t) => t.unalias().entity?.originalEntity === enumerableEntity);
+          implementedEnumerableAspect = Query.from(this.typeUtils.allAspectsOfType(unaliasedType)).first((t) => t.unalias().entity?.originalEntity === enumerableEntity);
         }
         if (implementedEnumerableAspect !== void 0) {
           const parameter = enumerableEntity.getTypeParameters()[0];

package/build/types/emitter/IrToJs.d.ts

@@ -1,4 +1,4 @@
-import * as js from '@babel/types';
+import { EncodedSourceMap } from '@jridgewell/gen-mapping';
 import { DebugStack } from './DebugStack.js';
 import { Entity } from './Entities.js';
 import * as ir from './ir/index.js';
@@ -23,15 +23,20 @@ export declare namespace ImportEmitMode {
         readonly emitOnlyCustomImport: boolean;
     }
 }
+export interface IrToJsResult {
+    code: string;
+    map: EncodedSourceMap | undefined;
+}
 export declare class IrToJs {
     static readonly customImportFunctionName = "_artelImport";
+    static readonly notMappedLocationFileName = "stub";
     protected readonly debugStack: DebugStack;
     private readonly importMode;
     private readonly entityNameOverrides;
     private readonly attachSourceLocation;
     private usesDecorators;
     constructor(options?: IrToJsOptions);
-    convert(pkg: ir.Package): Promise<js.File>;
+    generate(pkg: ir.Package): Promise<IrToJsResult>;
     private convertPackage;
     private convertPackageMemberDeclaration;
     private convertEsModuleImportDirectiveStatement;
@@ -123,4 +128,6 @@ export declare class IrToJs {
     private getEntityName;
     private convertArrayWithErrorBoundary;
     private isLValue;
+    private isOptionalChain;
+    private removeStubMappingsFromSourceMap;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@artel/artc",
-  "version": "0.9.26047-pre-release",
+  "version": "0.9.26048-pre-release",
   "description": "Артель Компилятор | Artel Compiler",
   "author": "Nezaboodka Team <contact@nezaboodka.com>",
   "license": "Apache-2.0",
@@ -36,19 +36,24 @@
     }
   },
   "dependencies": {
-    "@babel/core": "7.27.3",
-    "@babel/generator": "7.27.3",
-    "@babel/parser": "7.27.3",
-    "@babel/plugin-proposal-decorators": "7.28.0",
-    "@babel/plugin-transform-class-properties": "7.27.1",
-    "@babel/types": "7.27.3",
+    "@babel/core": "8.0.1",
+    "@babel/generator": "8.0.0",
+    "@babel/parser": "8.0.4",
+    "@babel/plugin-proposal-decorators": "8.0.2",
+    "@babel/plugin-transform-class-properties": "8.0.1",
+    "@babel/types": "8.0.4",
+    "@jridgewell/gen-mapping": "0.3.13",
+    "@swc/core": "1.11.8",
+    "@swc/jest": "0.2.37",
+    "@types/jest": "29.5.14",
     "@vscode/l10n": "0.0.18",
+    "jest": "29.7.0",
     "jsonc-parser": "3.3.1",
     "reactronic": "^0.96.26029",
     "typescript": "5.9.3",
     "vscode-json-languageservice": "5.4.2",
-    "vscode-languageserver": "10.1.0",
     "vscode-languageserver-textdocument": "1.0.12",
+    "vscode-languageserver": "10.1.0",
     "vscode-uri": "3.0.8"
   },
   "devDependencies": {