@artel/artc 0.6.26028 → 0.6.26030

package/build/Cli.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import {
   CommandLineCompiler
-} from "./chunk-G5UKABEH.js";
-import "./chunk-SYVSMJJH.js";
+} from "./chunk-54PBDJ2W.js";
+import "./chunk-HHCWDLSE.js";
 import {
   __async
-} from "./chunk-SPNTJ746.js";
+} from "./chunk-VD3HHVCM.js";
 
 // source/Cli.ts
 function main() {

package/build/api/Api.js

@@ -1,6 +1,6 @@
 import {
   Compiler
-} from "../chunk-SYVSMJJH.js";
+} from "../chunk-HHCWDLSE.js";
 import {
   AccessKind,
   AccessedFunction_entity,
@@ -310,7 +310,7 @@ import {
   withoutQuotes,
   withoutTemplateQuotes,
   yieldTask
-} from "../chunk-SPNTJ746.js";
+} from "../chunk-VD3HHVCM.js";
 export {
   AccessKind,
   AccessedFunction_entity,

package/build/api/ApiNodeJS.js

@@ -6,9 +6,9 @@ import {
   PhysicalFileSystem,
   PhysicalTypeScriptLibrariesProvider,
   PrintingDiagnosticAcceptor
-} from "../chunk-G5UKABEH.js";
-import "../chunk-SYVSMJJH.js";
-import "../chunk-SPNTJ746.js";
+} from "../chunk-54PBDJ2W.js";
+import "../chunk-HHCWDLSE.js";
+import "../chunk-VD3HHVCM.js";
 export {
   CommandLineCompiler,
   FileSystemUri,

package/build/api/ApiServices.js

@@ -107,7 +107,7 @@ import {
   sortModifiers,
   traverseTreeAsync,
   yieldTask
-} from "../chunk-SPNTJ746.js";
+} from "../chunk-VD3HHVCM.js";
 
 // source/services/common/Types.ts
 import * as ls from "vscode-languageserver";

package/build/{chunk-G5UKABEH.js → chunk-54PBDJ2W.js}

@@ -1,6 +1,6 @@
 import {
   Compiler
-} from "./chunk-SYVSMJJH.js";
+} from "./chunk-HHCWDLSE.js";
 import {
   ArtelVersion,
   Cached,
@@ -16,7 +16,7 @@ import {
   __async,
   performanceMeasurementStageNames,
   performanceMeasurementStages
-} from "./chunk-SPNTJ746.js";
+} from "./chunk-VD3HHVCM.js";
 
 // source/executor/FileSystemUri.ts
 import { platform } from "os";

package/build/{chunk-SYVSMJJH.js → chunk-HHCWDLSE.js}

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

package/build/{chunk-SPNTJ746.js → chunk-VD3HHVCM.js}

@@ -764,7 +764,7 @@ var UniqueWithComparatorQuery = class extends Query {
 };
 
 // source/common/Constants.ts
-var ArtelVersion = true ? "0.6.26028" : "";
+var ArtelVersion = true ? "0.6.26030" : "";
 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");
@@ -26797,6 +26797,7 @@ var FunctionEntityDetails = class {
     this.isJavaScriptIteratorMethod = false;
     this.hasObjectParameter = false;
     this.isSetter = false;
+    this.nameSource = void 0;
   }
 };
 var VariableEntityDetails = class {
@@ -26811,6 +26812,7 @@ var VariableEntityDetails = class {
     this.isStatic = false;
     this.isConst = false;
     this.isObjectParameter = false;
+    this.nameSource = void 0;
   }
 };
 var TypeOrExtensionEntityDetails = class {
@@ -26825,6 +26827,7 @@ var TypeOrExtensionEntityDetails = class {
      */
     this.areOwnComputedNamesOfMembersResolved = false;
     this.implicitlyImplementedAbstractMembersByImplementingMember = /* @__PURE__ */ new Map();
+    this.nameSource = void 0;
   }
 };
 var PackageEntityDetails = class {
@@ -28102,10 +28105,11 @@ var FunctionLiteral2 = class _FunctionLiteral {
   }
 };
 var JsFunctionLiteral = class _JsFunctionLiteral {
-  constructor(parameters, body, isAsync, returnType, sourceLocation) {
+  constructor(parameters, body, isAsync, isGenerator, returnType, sourceLocation) {
     this.parameters = parameters;
     this.body = body;
     this.isAsync = isAsync;
+    this.isGenerator = isGenerator;
     this.returnType = returnType;
     this.sourceLocation = sourceLocation;
     this.kind = 39 /* JsFunctionLiteral */;
@@ -28115,6 +28119,7 @@ var JsFunctionLiteral = class _JsFunctionLiteral {
       this.parameters.map((p) => p.clone()),
       this.body.clone(),
       this.isAsync,
+      this.isGenerator,
       this.returnType,
       this.sourceLocation
     );
@@ -30564,8 +30569,8 @@ function functionAccessExpression(func, isCallee, sourceLocation) {
 function functionLiteral(parameters, body, isAsync, returnType, sourceLocation) {
   return new FunctionLiteral2(parameters, body, isAsync, returnType, sourceLocation);
 }
-function jsFunctionLiteral(parameters, body, isAsync, returnType, sourceLocation) {
-  return new JsFunctionLiteral(parameters, body, isAsync, returnType, sourceLocation);
+function jsFunctionLiteral(parameters, body, isAsync, isGenerator, returnType, sourceLocation) {
+  return new JsFunctionLiteral(parameters, body, isAsync, isGenerator, returnType, sourceLocation);
 }
 function nestedFunctionDeclarationStatement(entity, parameters, body, isAsync, isGenerator, sourceLocation) {
   const declaration = new NestedFunctionDeclaration2(entity, parameters, body, isAsync, isGenerator, sourceLocation);
@@ -31080,6 +31085,9 @@ var Transformer = class {
   get transformedDeclaration() {
     return this.transformedDeclaration_;
   }
+  get transformedTypeDeclaration() {
+    return this.transformedTypeDeclaration_;
+  }
   transformChildren(node) {
     switch (node.kind) {
       case 0 /* AsExpression */:
@@ -31825,13 +31833,16 @@ var Transformer = class {
   }
   transformPackageTypeDeclarationChildren(declaration) {
     const saveTransformedDeclaration = this.transformedDeclaration_;
+    const saveTransformedTypeDeclaration = this.transformedTypeDeclaration_;
     this.transformedDeclaration_ = declaration;
+    this.transformedTypeDeclaration_ = declaration;
     declaration.decorators = declaration.decorators.map((d) => this.transformDecorator(d));
     declaration.members = this.transformArrayWithErrorBoundary(
       declaration.members,
       (m) => this.transformTypeMemberDeclaration(m)
     );
     this.transformedDeclaration_ = saveTransformedDeclaration;
+    this.transformedTypeDeclaration_ = saveTransformedTypeDeclaration;
   }
   transformTypeMemberDeclaration(declaration) {
     let result;
@@ -32026,9 +32037,12 @@ var Transformer = class {
   }
   transformPackageVariantTypeDeclarationChildren(declaration) {
     const saveTransformedDeclaration = this.transformedDeclaration_;
+    const saveTransformedTypeDeclaration = this.transformedTypeDeclaration_;
     this.transformedDeclaration_ = declaration;
+    this.transformedTypeDeclaration_ = declaration;
     declaration.variants = declaration.variants.map((v) => this.transformVariantValueDeclaration(v));
     this.transformedDeclaration_ = saveTransformedDeclaration;
+    this.transformedTypeDeclaration_ = saveTransformedTypeDeclaration;
   }
   transformVariantValueDeclaration(node) {
     let action;
@@ -33076,6 +33090,15 @@ var GeneralLoweringContext = class {
   createJsFunctionCallMethodAccess(object, isOptionalChaining) {
     return jsPropertyAccessExpression(object, isOptionalChaining, "call", this.ectx.standardTypes.func);
   }
+  createBindMethodCall(object, isOptionalChaining, argument2) {
+    const bindMethodAccess = jsPropertyAccessExpression(
+      object,
+      isOptionalChaining,
+      "bind",
+      this.ectx.standardTypes.func
+    );
+    return callExpression(bindMethodAccess, false, [argument2], false, this.ectx.standardTypes.object, false);
+  }
   createKeyForComputedNameWithSymbolKey(symbolDeclaration) {
     return symbolDeclaration.ifTypeMemberThenContainingType !== void 0 ? staticFieldGetAccess(symbolDeclaration) : variableGetAccess(symbolDeclaration);
   }
@@ -35637,9 +35660,19 @@ var UsagesLowering = class _UsagesLowering extends ExecutableCodeLowering {
         this.objectParameterLowering.tryRemoveObjectParameterFromNestedFunction(node);
         return preserveNode();
       },
+      transformNestedFunctionDeclarationStatement: (node) => {
+        if (transformer.transformedTypeDeclaration !== void 0 && !node.declaration.entity.details.hasObjectParameter) {
+          return replaceStatement(this.bindThisToNestedFunctionDeclaration(node));
+        }
+        return preserveStatement();
+      },
       transformFunctionJsObjectLiteralProperty: (node) => {
         this.objectParameterLowering.tryRemoveObjectParameterFromFunctionJsObjectLiteralProperty(node);
         return preserveNode();
+      },
+      transformBlockStatement: (node) => {
+        this.moveNestedFunctionsToTheBeginningOfTheBlock(node);
+        return preserveStatement();
       }
     });
     transformer.transformPackage(this.pkg.ir);
@@ -35858,6 +35891,40 @@ var UsagesLowering = class _UsagesLowering extends ExecutableCodeLowering {
     const { expression, tempVariables } = this.replaceCompoundAssignmentWithSimpleAssignment(node);
     return replaceExpression(expression, tempVariables);
   }
+  moveNestedFunctionsToTheBeginningOfTheBlock(node) {
+    const statements = node.statements;
+    if (!statements.some((s) => s.kind === 33 /* NestedFunctionDeclarationStatement */)) {
+      return;
+    }
+    node.statements = [
+      ...statements.filter((s) => s.kind === 33 /* NestedFunctionDeclarationStatement */),
+      ...statements.filter((s) => s.kind !== 33 /* NestedFunctionDeclarationStatement */)
+    ];
+  }
+  bindThisToNestedFunctionDeclaration(node) {
+    const declaration = node.declaration;
+    const jsFunctionLiteral2 = jsFunctionLiteral(
+      declaration.parameters,
+      declaration.body,
+      declaration.isAsync,
+      declaration.isGenerator,
+      declaration.entity.returnType,
+      declaration.sourceLocation
+    );
+    const bindCall = this.ctx.createBindMethodCall(
+      jsFunctionLiteral2,
+      false,
+      thisExpression(this.ctx.ectx.standardTypes.object)
+    );
+    const localVariableEntity2 = localVariableEntity(
+      declaration.entity.name,
+      this.ctx.ectx.standardTypes.func,
+      this.packageEntity,
+      true
+    );
+    declaration.entity.details.nameSource = localVariableEntity2;
+    return localVariableDeclarationStatement(localVariableEntity2, bindCall, node.sourceLocation);
+  }
 };
 var OperatorsUsageLowering = class extends ExecutableCodeLowering {
   tryLowerPrefixUnaryExpression(node) {
@@ -36420,6 +36487,7 @@ var ObjectParameterLowering = class extends ExecutableCodeLowering {
         node.parameters.slice(1),
         node.body,
         node.isAsync,
+        false,
         node.returnType,
         node.sourceLocation
       );
@@ -39284,7 +39352,8 @@ var _IrToJs = class _IrToJs {
     const parameters = this.convertParameters(expression.parameters);
     const body = this.convertBlockStatement(expression.body);
     const async = expression.isAsync;
-    const result = js.functionExpression(void 0, parameters, body, false, async);
+    const generator = expression.isGenerator;
+    const result = js.functionExpression(void 0, parameters, body, generator, async);
     this.addNodeLocation(result, expression);
     return result;
   }
@@ -39945,7 +40014,11 @@ var _IrToJs = class _IrToJs {
     }
   }
   getEntityName(entity) {
-    return this.entityNameOverrides?.get(entity) ?? entity.name;
+    let namedEntity = entity;
+    while (namedEntity.details.nameSource !== void 0) {
+      namedEntity = namedEntity.details.nameSource;
+    }
+    return this.entityNameOverrides?.get(namedEntity) ?? namedEntity.name;
   }
   convertArrayWithErrorBoundary(array, convert) {
     const result = new Array();

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

@@ -38,6 +38,7 @@ export declare class FunctionEntityDetails implements TypeMemberEntityDetails {
     hasObjectParameter: boolean;
     variableOwningAccessor: VariableEntity | undefined;
     isSetter: boolean;
+    nameSource: NamedEntity | undefined;
 }
 export interface ComputedNameInfo {
     /**
@@ -76,6 +77,7 @@ export declare class VariableEntityDetails implements TypeMemberEntityDetails {
     isStatic: boolean;
     isConst: boolean;
     isObjectParameter: boolean;
+    nameSource: NamedEntity | undefined;
 }
 export interface ProxiedFieldInfo {
     readonly tagType: TypeOrExtensionEntity;
@@ -118,6 +120,7 @@ export declare class TypeOrExtensionEntityDetails {
      */
     areOwnComputedNamesOfMembersResolved: boolean;
     implicitlyImplementedAbstractMembersByImplementingMember: ReadonlyMap<TypeMemberEntity, readonly TypeMemberEntity[]>;
+    nameSource: NamedEntity | undefined;
 }
 export declare enum TypeOrExtensionEntityKind {
     StructuredType = 0,

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

@@ -73,7 +73,7 @@ export declare function loopStatement(label: string | undefined, body: ir.BlockS
 export declare function measureLiteral(sourceLocation?: ir.SourceLocation): ir.MeasureLiteral;
 export declare function functionAccessExpression(func: ir.AccessedFunction, isCallee: boolean, sourceLocation?: ir.SourceLocation): ir.FunctionAccessExpression;
 export declare function functionLiteral(parameters: readonly ir.ParameterDeclaration[], body: ir.BlockStatement, isAsync: boolean, returnType: Type, sourceLocation?: ir.SourceLocation): ir.FunctionLiteral;
-export declare function jsFunctionLiteral(parameters: readonly ir.ParameterDeclaration[], body: ir.BlockStatement, isAsync: boolean, returnType: Type, sourceLocation?: ir.SourceLocation): ir.JsFunctionLiteral;
+export declare function jsFunctionLiteral(parameters: readonly ir.ParameterDeclaration[], body: ir.BlockStatement, isAsync: boolean, isGenerator: boolean, returnType: Type, sourceLocation?: ir.SourceLocation): ir.JsFunctionLiteral;
 export declare function nestedFunctionDeclaration(entity: FunctionEntity, parameters: readonly ir.ParameterDeclaration[], body: ir.BlockStatement, isAsync: boolean, isGenerator: boolean, sourceLocation?: ir.SourceLocation): ir.NestedFunctionDeclaration;
 export declare function nestedFunctionDeclarationStatement(entity: FunctionEntity, parameters: readonly ir.ParameterDeclaration[], body: ir.BlockStatement, isAsync: boolean, isGenerator: boolean, sourceLocation?: ir.SourceLocation): ir.NestedFunctionDeclarationStatement;
 export declare function nestedFunctionDeclarationStatementWithDeclaration(declaration: ir.NestedFunctionDeclaration, sourceLocation?: ir.SourceLocation): ir.NestedFunctionDeclarationStatement;

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

@@ -6,7 +6,9 @@ export declare class Transformer {
     protected readonly debugStack: DebugStack;
     private hoistedLocalVariables;
     private transformedDeclaration_;
+    private transformedTypeDeclaration_;
     get transformedDeclaration(): ir.Declaration | undefined;
+    get transformedTypeDeclaration(): ir.PackageTypeDeclaration | ir.PackageVariantTypeDeclaration | undefined;
     constructor(config: TransformationConfig);
     transformChildren(node: ir.Node): void;
     transformPackage(pkg: ir.Package): void;

package/build/types/emitter/ir/Nodes.d.ts

@@ -551,10 +551,11 @@ export declare class JsFunctionLiteral {
     parameters: readonly ParameterDeclaration[];
     body: BlockStatement;
     isAsync: boolean;
+    isGenerator: boolean;
     returnType: Type;
     sourceLocation?: SourceLocation | undefined;
     readonly kind = NodeKind.JsFunctionLiteral;
-    constructor(parameters: readonly ParameterDeclaration[], body: BlockStatement, isAsync: boolean, returnType: Type, sourceLocation?: SourceLocation | undefined);
+    constructor(parameters: readonly ParameterDeclaration[], body: BlockStatement, isAsync: boolean, isGenerator: boolean, returnType: Type, sourceLocation?: SourceLocation | undefined);
     clone(): JsFunctionLiteral;
 }
 export declare class Modifiers {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@artel/artc",
-  "version": "0.6.26028",
+  "version": "0.6.26030",
   "description": "Артель Компилятор | Artel Compiler",
   "author": "Nezaboodka Team <contact@nezaboodka.com>",
   "license": "Apache-2.0",
@@ -44,7 +44,7 @@
     "@babel/types": "7.27.3",
     "@vscode/l10n": "0.0.18",
     "jsonc-parser": "3.3.1",
-    "reactronic": "^0.96.26024",
+    "reactronic": "^0.96.26025",
     "typescript": "5.9.3",
     "vscode-json-languageservice": "5.4.2",
     "vscode-languageserver": "9.0.1",