@artel/artc 0.6.26023 → 0.6.26025

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

@@ -281,8 +281,8 @@ declare class TypeAssignabilityCheck {
     /**
      * @example
      * ```artel
-     * перем а = операция(п: Текст): Объект { }
-     * перем б = операция(п: Объект): Текст { }
+     * перем а = функция(п: Текст): Объект { }
+     * перем б = функция(п: Объект): Текст { }
      *
      * а = б // Корректно
      * б = а // Ошибка

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

@@ -5,29 +5,29 @@ export declare const specialNameKeys: {
     readonly objectParameter: "-объект";
     readonly constructor: "-создание";
     readonly destructor: "-уничтожение";
-    readonly plusOperator: "+";
-    readonly unaryPlusOperator: "+у";
-    readonly binaryPlusOperator: "+б";
-    readonly minusOperator: "-";
-    readonly unaryMinusOperator: "-у";
-    readonly binaryMinusOperator: "-б";
+    readonly plusOperator: "-плюс";
+    readonly unaryPlusOperator: "-плюс-одноместный";
+    readonly binaryPlusOperator: "-плюс-двухместный";
+    readonly minusOperator: "-минус";
+    readonly unaryMinusOperator: "-минус-одноместный";
+    readonly binaryMinusOperator: "-минус-двухместный";
     readonly notOperator: "-не";
-    readonly multiplyOperator: "*";
-    readonly divideOperator: "/";
-    readonly moduloOperator: "%";
-    readonly lessThanOperator: "<";
-    readonly greaterThanOperator: ">";
-    readonly lessThanOrEqualOperator: "<=";
-    readonly greaterThanOrEqualOperator: ">=";
+    readonly multiplyOperator: "-умножение";
+    readonly divideOperator: "-деление";
+    readonly moduloOperator: "-остаток";
+    readonly lessThanOperator: "-меньше";
+    readonly greaterThanOperator: "-больше";
+    readonly lessThanOrEqualOperator: "-меньше-или-равно";
+    readonly greaterThanOrEqualOperator: "-больше-или-равно";
     readonly orOperator: "-или";
     readonly andOperator: "-и";
     readonly xorOperator: "-искл";
-    readonly bitwiseAndOperator: "&";
-    readonly bitwiseOrOperator: "|";
-    readonly bitwiseXorOperator: "||";
-    readonly leftShiftOperator: "<<";
-    readonly signedRightShiftOperator: ">>";
-    readonly unsignedRightShiftOperator: ">>>";
+    readonly bitwiseAndOperator: "-побитовое-и";
+    readonly bitwiseOrOperator: "-побитовое-или";
+    readonly bitwiseXorOperator: "-побитовое-искл";
+    readonly leftShiftOperator: "-сдвиг-влево";
+    readonly signedRightShiftOperator: "-сдвиг-вправо";
+    readonly unsignedRightShiftOperator: "-сдвиг-вправо-нулями";
 };
 export declare const specialNames: { readonly [K in keyof typeof specialNameKeys]: Name; };
 export declare const specialNameBySyntacticalOperatorKind: {

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

@@ -13,6 +13,7 @@ export interface WellKnownDeclarations {
     readonly integer: StructuredTypeEntity;
     readonly text: StructuredTypeEntity;
     readonly textTemplate: StructuredTypeEntity;
+    readonly localizableTextTemplate: StructuredTypeEntity;
     readonly char: StructuredTypeEntity;
     readonly yesNo: StructuredTypeEntity;
     readonly nullEntity: StructuredTypeEntity;
@@ -47,6 +48,7 @@ export declare class LocalizedWellKnownDeclarations implements WellKnownDeclarat
     private integer_;
     private text_;
     private textTemplate_;
+    private localizableTextTemplate_;
     private char_;
     private yesNo_;
     private null_;
@@ -78,6 +80,7 @@ export declare class LocalizedWellKnownDeclarations implements WellKnownDeclarat
     get integer(): StructuredTypeEntity;
     get text(): StructuredTypeEntity;
     get textTemplate(): StructuredTypeEntity;
+    get localizableTextTemplate(): StructuredTypeEntity;
     get char(): StructuredTypeEntity;
     get yesNo(): StructuredTypeEntity;
     get nullEntity(): StructuredTypeEntity;

package/build/types/analysis/a/Analyzer.d.ts

@@ -257,6 +257,7 @@ declare class Type {
     private ofDereferenceExpression;
     private ofConditionalExpression;
     private ofTextLiteral;
+    private ofLocalizableTextLiteral;
     /**
      * По умолчанию литерал шаблона текста имеет тип Текст.
      *
@@ -266,6 +267,15 @@ declare class Type {
      *   и не содержащий тип Текст.
      */
     private ofTextTemplateLiteral;
+    /**
+     * По умолчанию литерал шаблона текста имеет тип Текст.
+     *
+     * Литерал переводимого шаблона текста имеет тип ШаблонТекстаПереводимый в следующих случаях:
+     * - если он присваивается в переменную, имеющую тип ШаблонТекстаПереводимый;
+     * - если он присваивается в переменную, имеющую союзный тип, содержащий тип ШаблонТекстаПереводимый
+     *   и не содержащий тип Текст.
+     */
+    private ofLocalizableTextTemplateLiteral;
     private ofIdentifierExpression;
     private ofTokenExpression;
     private ofKeywordExpression;

package/build/types/analysis/a/TextIdentity.d.ts

@@ -1,9 +1,6 @@
-import { TextKey } from '../../entities/index.js';
 import * as tree from '../../tree/a/index.js';
 export declare class TextIdentity {
-    static keyFromTextFragments(fragments: readonly string[]): TextKey;
-    static keyFromTextToken(token: tree.Token<tree.TokenKind.TextLiteral>): TextKey;
-    static keyFromLocalizableTextLiteral(node: tree.LocalizableTextLiteral): TextKey;
-    static keyFromLocalizableTextTemplateLiteral(node: tree.LocalizableTextTemplateLiteral): TextKey;
-    static keyFromTextTranslationSource(node: tree.TextTranslationSource): TextKey;
+    static keyFromLocalizableTextLiteral(node: tree.LocalizableTextLiteral): string;
+    static keyFromLocalizableTextTemplateLiteral(node: tree.LocalizableTextTemplateLiteral): string;
+    static keyFromTextTranslationSource(node: tree.TextTranslationSource): string;
 }

package/build/types/analysis/a/semantic-context/SemanticContextBase.d.ts

@@ -1,5 +1,5 @@
 import { Name } from '../../../common/index.js';
-import { AnonymousFunctionEntity, FunctionEntity, FunctionTypeEntity, GetterEntity, MethodEntity, NamedFunctionEntity, PackageEntity, ParameterEntity, SetterEntity, TextKey, TextTranslationEntity, TypeEntity, TypeEntityWithMembers, TypeExtensionEntity } from '../../../entities/index.js';
+import { AnonymousFunctionEntity, FunctionEntity, FunctionTypeEntity, GetterEntity, MethodEntity, NamedFunctionEntity, PackageEntity, ParameterEntity, SetterEntity, TextTranslationEntity, TypeEntity, TypeEntityWithMembers, TypeExtensionEntity } from '../../../entities/index.js';
 import { SourceFileA } from '../../../project/SourceFile.js';
 import * as tree from '../../../tree/a/index.js';
 import * as types from '../../../types/index.js';
@@ -34,7 +34,7 @@ export declare abstract class SemanticContextBase implements TypeExtensionLookup
     getNamedDeclarations(noInstanceMembers?: boolean): readonly NamedDeclaration[];
     getNamedDeclarationsByName(name: Name, noInstanceMembers?: boolean): NamedDeclarationLookupResult;
     getTypeExtensionsByType(type: TypeEntity): readonly TypeExtensionEntity[];
-    getTextTranslationEntityByTextKey(key: TextKey): readonly TextTranslationEntity[];
+    getTextTranslationEntityByTextKey(key: string): readonly TextTranslationEntity[];
     private semanticContexts;
     private getSourceFileContext;
 }

package/build/types/analysis/a/semantic-context/SourceFileSemanticContext.d.ts

@@ -1,6 +1,6 @@
 import { Name } from '../../../common/index.js';
 import { DiagnosticAcceptor } from '../../../diagnostic/Diagnostic.js';
-import { PackageEntity, TextKey, TextTranslationEntity, TypeEntity, TypeExtensionEntity } from '../../../entities/index.js';
+import { PackageEntity, TextTranslationEntity, TypeEntity, TypeExtensionEntity } from '../../../entities/index.js';
 import { SourceFileA } from '../../../project/SourceFile.js';
 import * as tree from '../../../tree/a/index.js';
 import { DiagnosticArgumentFactory } from '../../DiagnosticArgumentFactory.js';
@@ -45,7 +45,7 @@ export declare class SourceFileSemanticContext extends SemanticContextBase {
     getOwnNamedDeclarations(initialContext: SemanticContext, _noInstanceMembers: boolean, _lookupState: SemanticContextLookupState): NamedDeclaration[];
     getOwnNamedDeclarationsByName(name: Name, initialContext: SemanticContext, _noInstanceMembers: boolean, lookupResult: NamedDeclarationLookupResult): void;
     getOwnTypeExtensionsByType(type: TypeEntity, initialContext: SemanticContext): TypeExtensionEntity[];
-    getTextTranslationEntityByTextKey(key: TextKey): readonly TextTranslationEntity[];
+    getTextTranslationEntityByTextKey(key: string): readonly TextTranslationEntity[];
     validateNameConflicts(diagnostics: DiagnosticAcceptor): void;
     private convertPackageMemberToNamedDeclaration;
     private convertPackageAliasToTypeOrContainerWithTypes;

package/build/types/common/Name.d.ts

@@ -13,46 +13,31 @@ export declare const enum NameFlags {
      */
     RequiresQuotes = 4,
     /**
-     * Имя с обратным апострофом для избежания конфликта между параметром метода и свойством объекта,
-     * например: имя\`, 'имя с пробелами'\`.
+     * Имя является специальным и начинается со знака '-': '-объект', '-создание', '-плюс'.
      */
-    ConflictResolvingParameterName = 8,
-    /**
-     * Имя с двойным обратным апострофом для избежания конфликта между вычисляемым свойством и скрытой
-     * хранимой переменной объекта, например: длина\`\`, 'имя с пробелами'\`\`.
-     */
-    BackingVariableName = 16,
+    SpecialName = 8,
     /**
      * Конвертировать имя в формат kebab case при формировании исходного имени.
      */
-    PreferKebabCase = 32
+    PreferKebabCase = 16
 }
 export declare class Name implements Displayable {
-    static readonly objectParameterNameKey = "-object";
     /**
-     * Исходное имя без одиночных кавычек и без символов '\`' в конце.
+     * Исходное имя без одиночных кавычек и без символов апострофа ` в конце.
      */
     readonly unescapedOriginalWithoutQuotes: string;
     /**
-     * Флаги, указывающие на наличии у имени символов '\`', одиночных кавычек и их смысл.
+     * Флаги, указывающие на наличии у имени символов апострофа и одиночных кавычек.
      */
     readonly flags: NameFlags;
     /**
-     * Ключ, используемый для сравнения имён на эквивалентность без учёта флагов, а также для генерации кода.
+     * Ключ, используемый для сравнения имён на эквивалентность.
      * Получается из исходного имени путём:
-     * 1. удаления символов символов '\`' из конца имени и удаления одиночных кавычек из остатка;
-     * 2. удаления символов '-' и замены первых следующих за ними букв на заглавные.
-     */
-    readonly keyWithoutBackQuotes: string;
-    /**
-     * Ключ, используемый для сравнения имён на эквивалентность с учётом флагов. Получается из
-     * `keyWithoutBackQuotes` путём добавления символов '\`' `meaningfulBackQuoteCount` число раз.
-     */
-    get key(): string;
-    /**
-     * Количество значащих символов '`', соответствующих флагам.
+     * 1. удаления одиночных кавычек для имён, которые являются обычными именами;
+     * 2. удаления символов '-' и замены первых следующих за ними букв на заглавные;
+     * Апострофы в конце сохраняются.
      */
-    get meaningfulBackQuoteCount(): number;
+    readonly key: string;
     /**
      * Исходное имя, при необходимости взятое в одиночные кавычки и содержащее обратные кавычки согласно флагам.
      */
@@ -61,13 +46,12 @@ export declare class Name implements Displayable {
      * @param unescapedOriginalWithoutQuotes Исходное имя без апострофов, одиночных кавычек и экранирования.
      * @param flags Флаги имени (`NameFlags`). `NameFlags.None` по умолчанию.
      */
-    constructor(unescapedOriginalWithoutQuotes: string, flags?: NameFlags, specialKey?: string);
-    toConflictResolvingParameterName(): Name;
+    constructor(unescapedOriginalWithoutQuotes: string, flags?: NameFlags);
     toBackingVariableName(): Name;
-    considerEqual(other: Name, considerBackQuotes?: boolean): boolean;
+    considerEqual(other: Name): boolean;
     toString(): string;
-    getPreferredUnescapedOriginal(flags: NameFlags): string;
+    getPreferredUnescapedOriginal(requiresQuotes?: boolean): string;
     getDisplayText(): string;
-    static parse(original: string, initialFlags?: NameFlags, specialKey?: string): Name;
+    static parse(original: string, initialFlags?: NameFlags): Name;
     private static toUnescapedOriginal;
 }

package/build/types/diagnostic/DiagnosticCode.d.ts

@@ -27,15 +27,11 @@ export declare enum DiagnosticCode {
     ModifierListExpected = 1120,
     RunKeywordCreationKeywordOrModifierListExpected = 1121,
     HidingLevelExpected = 1122,
-    ParameterNameCanContainOnlyOneBackQuote = 1123,
-    FieldNameCanContainOnlyTwoBackQuote = 1124,
-    BackQuotesCanOnlyBeUsedInParameterAndFieldNames = 1125,
-    NameThatMatchesKeywordMustBeEnclosedInSingleQuotes = 1126,
-    TagNameExpected = 1127,
-    TypeMemberTranslationExpected = 1128,
-    TranslationExpected = 1129,
-    TranslatedTextTemplateOrTranslationFunctionBlockExpected = 1130,
-    TranslatedTextCannotBeginOrEndWithTilde = 1131,
+    TagNameExpected = 1123,
+    TypeMemberTranslationExpected = 1124,
+    TranslationExpected = 1125,
+    TranslatedTextTemplateOrTranslationFunctionBlockExpected = 1126,
+    TranslatedTextCannotBeginOrEndWithTilde = 1127,
     TypeCannotBeUsedAsValue = 2000,
     PackageNameCannotBeUsedAsValue = 2001,
     PackageAliasCannotBeUsedAsValue = 2002,

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

@@ -68,6 +68,7 @@ declare class StandardTypes {
     private array_;
     private func_;
     private textTemplate_;
+    private localizableTextTemplate_;
     private reference_;
     get nullType(): Type;
     get yesNo(): Type;
@@ -80,6 +81,7 @@ declare class StandardTypes {
     get array(): Type;
     get func(): Type;
     get textTemplate(): Type;
+    get localizableTextTemplate(): Type;
     get reference(): Type;
     constructor(analyzer: Analyzer, entityMap: EntityMap);
 }

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

@@ -89,10 +89,10 @@ export declare function switchStatement(matchExpression: ir.Expression, caseClau
 export declare function caseClause(expressions: readonly ir.Expression[], body: ir.BlockStatement, sourceLocation?: ir.SourceLocation): ir.CaseClause;
 export declare function ternaryExpression(condition: ir.Expression, firstExpression: ir.Expression, secondExpression: ir.Expression, sourceLocation?: ir.SourceLocation): ir.TernaryExpression;
 export declare function textLiteral(value: string, sourceLocation?: ir.SourceLocation): ir.TextLiteral;
-export declare function localizableTextLiteral(value: string, code: number | undefined, sourceLocation?: ir.SourceLocation): ir.LocalizableTextLiteral;
+export declare function localizableTextLiteral(value: string, key: string | undefined, sourceLocation?: ir.SourceLocation): ir.LocalizableTextLiteral;
 export declare function textWithEntityName(entity: NamedEntity, sourceLocation?: ir.SourceLocation): ir.TextWithEntityName;
 export declare function textTemplateLiteral(textFragments: readonly string[], expressions: readonly ir.Expression[], sourceLocation?: ir.SourceLocation): ir.TextTemplateLiteral;
-export declare function localizableTextTemplateLiteral(textFragments: readonly string[], expressions: readonly ir.Expression[], code: number | undefined, sourceLocation?: ir.SourceLocation): ir.LocalizableTextTemplateLiteral;
+export declare function localizableTextTemplateLiteral(textFragments: readonly string[], expressions: readonly ir.Expression[], key: string | undefined, sourceLocation?: ir.SourceLocation): ir.LocalizableTextTemplateLiteral;
 export declare function thisExpression(type: Type, sourceLocation?: ir.SourceLocation): ir.ThisExpression;
 export declare function typeAccessExpression(entity: TypeOrExtensionEntity, sourceLocation?: ir.SourceLocation): ir.TypeAccessExpression;
 export declare function constructorDeclaration(entity: FunctionEntity, parameters: readonly ir.ParameterDeclaration[], body: ir.BlockStatement, sourceLocation?: ir.SourceLocation): ir.ConstructorDeclaration;
@@ -115,7 +115,7 @@ export declare function fieldSetterDeclaration(entity: FunctionEntity, body: ir.
 export declare function parameterDeclaration(entity: VariableEntity, defaultValue: ir.Expression | undefined, isRest: boolean, sourceLocation?: ir.SourceLocation): ir.ParameterDeclaration;
 export declare function whileStatement(label: string | undefined, condition: ir.Expression, body: ir.BlockStatement, sourceLocation?: ir.SourceLocation): ir.WhileStatement;
 export declare function yieldStatement(expression: ir.Expression, sourceLocation?: ir.SourceLocation): ir.YieldStatement;
-export declare function textTranslationDeclaration(key: string | number, sourceTextTemplate: ir.TranslationTextTemplate | undefined, translatedTextOrFunctionBlock: ir.TextLiteral | ir.BlockStatement, sourceLocation?: ir.SourceLocation): ir.TextTranslationDeclaration;
+export declare function textTranslationDeclaration(key: string, sourceTextTemplate: ir.TranslationTextTemplate | undefined, translatedTextOrFunctionBlock: ir.TextLiteral | ir.BlockStatement, sourceLocation?: ir.SourceLocation): ir.TextTranslationDeclaration;
 export declare function translationTextTemplate(fragments: readonly string[], parameters: readonly VariableEntity[], sourceLocation?: ir.SourceLocation): ir.TranslationTextTemplate;
 export declare function constructorCallExpression(ectx: EmitterContext, constructor: FunctionEntity, args: readonly ir.Expression[] | ir.Arguments, sourceLocation?: ir.SourceLocation): ir.ConstructorCallExpression;
 export declare function constructorCallExpressionWithResultType(constructor: FunctionEntity, args: readonly ir.Expression[] | ir.Arguments, type: Type, sourceLocation?: ir.SourceLocation): ir.ConstructorCallExpression;

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

@@ -70,7 +70,6 @@ export declare class TextTemplateEmitOptions {
     private flags;
     constructor(flags?: TextTemplateEmitOptionsFlags);
     constructor(createTextTemplateInstance: boolean);
-    static default(): TextTemplateEmitOptions;
     get createTextTemplateInstance(): boolean;
     set createTextTemplateInstance(value: boolean);
     setCreateTextTemplateInstance(value: boolean): this;

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

@@ -712,15 +712,19 @@ export declare class TextLiteral {
     value: string;
     sourceLocation?: SourceLocation | undefined;
     readonly kind = NodeKind.TextLiteral;
+    options: TextTemplateEmitOptions;
     constructor(value: string, sourceLocation?: SourceLocation | undefined);
+    withOptions(options: TextTemplateEmitOptions): this;
     clone(): TextLiteral;
 }
 export declare class LocalizableTextLiteral {
     value: string;
-    code: number | undefined;
+    key: string | undefined;
     sourceLocation?: SourceLocation | undefined;
     readonly kind = NodeKind.LocalizableTextLiteral;
-    constructor(value: string, code: number | undefined, sourceLocation?: SourceLocation | undefined);
+    options: TextTemplateEmitOptions;
+    constructor(value: string, key: string | undefined, sourceLocation?: SourceLocation | undefined);
+    withOptions(options: TextTemplateEmitOptions): this;
     clone(): LocalizableTextLiteral;
 }
 /**
@@ -748,11 +752,11 @@ export declare class TextTemplateLiteral {
 export declare class LocalizableTextTemplateLiteral {
     textFragments: readonly string[];
     expressions: readonly Expression[];
-    code: number | undefined;
+    key: string | undefined;
     sourceLocation?: SourceLocation | undefined;
     readonly kind = NodeKind.LocalizableTextTemplateLiteral;
     options: TextTemplateEmitOptions;
-    constructor(textFragments: readonly string[], expressions: readonly Expression[], code: number | undefined, sourceLocation?: SourceLocation | undefined);
+    constructor(textFragments: readonly string[], expressions: readonly Expression[], key: string | undefined, sourceLocation?: SourceLocation | undefined);
     withOptions(options: TextTemplateEmitOptions): this;
     clone(): LocalizableTextTemplateLiteral;
 }
@@ -976,12 +980,12 @@ export declare class YieldStatement {
     clone(): YieldStatement;
 }
 export declare class TextTranslationDeclaration {
-    key: string | number;
+    key: string;
     sourceTextTemplate: TranslationTextTemplate | undefined;
     translatedTextOrFunctionBlock: TextLiteral | BlockStatement;
     sourceLocation?: SourceLocation | undefined;
     readonly kind = NodeKind.TextTranslationDeclaration;
-    constructor(key: string | number, sourceTextTemplate: TranslationTextTemplate | undefined, translatedTextOrFunctionBlock: TextLiteral | BlockStatement, sourceLocation?: SourceLocation | undefined);
+    constructor(key: string, sourceTextTemplate: TranslationTextTemplate | undefined, translatedTextOrFunctionBlock: TextLiteral | BlockStatement, sourceLocation?: SourceLocation | undefined);
     clone(): TextTranslationDeclaration;
 }
 export declare class TranslationTextTemplate {

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

@@ -5,10 +5,10 @@ export declare class EntityNaming_named {
     readonly kind = "named";
     constructor(value: Name);
     toString(): string;
-    considerEqual(other: EntityNaming, considerBackQuotes: boolean): boolean;
+    considerEqual(other: EntityNaming): boolean;
 }
 export declare class EntityNaming_anonymous {
     readonly kind = "anonymous";
     toString(): string;
-    considerEqual(other: EntityNaming, _considerBackQuotes: boolean): boolean;
+    considerEqual(other: EntityNaming): boolean;
 }

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

@@ -1,5 +1,5 @@
 import { Name } from '../common/index.js';
-import { NamedPackageMemberEntity, TextKey, TextTranslationEntity, TypeEntity, TypeExtensionEntity } from './index.js';
+import { NamedPackageMemberEntity, TextTranslationEntity, TypeEntity, TypeExtensionEntity } from './index.js';
 export declare class PackageEntityMembers {
     private readonly namedMembers;
     private readonly typeExtensions;
@@ -9,13 +9,13 @@ export declare class PackageEntityMembers {
     private readonly membersByNameKey_;
     private readonly textTranslationsByTextKey_;
     private get membersByNameKey();
-    get textTranslationsByTextKey(): ReadonlyMap<TextKey, readonly TextTranslationEntity[]>;
+    get textTranslationsByTextKey(): ReadonlyMap<string, readonly TextTranslationEntity[]>;
     constructor(namedMembers: readonly NamedPackageMemberEntity[], typeExtensions: readonly TypeExtensionEntity[], textTranslations: readonly TextTranslationEntity[]);
     getNamedMembers(): readonly NamedPackageMemberEntity[];
     getNamedMembersByName(name: Name): readonly NamedPackageMemberEntity[];
     getTypeExtensions(): readonly TypeExtensionEntity[];
     getTypeExtensionsByType(type: TypeEntity): readonly TypeExtensionEntity[];
     getTextTranslations(): readonly TextTranslationEntity[];
-    getTextTranslationsByTextKey(key: TextKey): readonly TextTranslationEntity[];
+    getTextTranslationsByTextKey(key: string): readonly TextTranslationEntity[];
     getNamedMembersAndTypeExtensions(): Iterable<NamedPackageMemberEntity | TypeExtensionEntity>;
 }

package/build/types/entities/interfaces/TextTranslationEntity.d.ts

@@ -4,7 +4,7 @@ import { DefinitionKind, EntityHidingLevel, EntityKind, ParameterEntity } from '
 export interface TextTranslationEntity extends IEntity {
     readonly kind: EntityKind.TextTranslation;
     isTextTemplate(): boolean;
-    getKey(): TextKey;
+    getKey(): string;
     getText(): string;
     getTextFragments(): readonly string[];
     getComment(): string | undefined;
@@ -13,7 +13,6 @@ export interface TextTranslationEntity extends IEntity {
     isHidden(): EntityHidingLevel | undefined;
     getOriginalEntity(): TextTranslationEntity;
 }
-export type TextKey = string | number;
 export type TextTranslationEntityDefinition = {
     kind: DefinitionKind.Source;
     node: treeA.TextTranslationSource;

package/build/types/entities/source/a/SourceTextTranslationEntity.d.ts

@@ -1,7 +1,7 @@
 import { Analyzer } from '../../../analysis/a/Analyzer.js';
 import { PackageDialect, PackageLocale } from '../../../common/index.js';
 import * as tree from '../../../tree/a/index.js';
-import { EntityHidingLevel, EntityKind, PackageEntity, ParameterEntity, Tag, TextKey, TextTranslationEntity, TextTranslationEntityDefinition, Translation } from '../../index.js';
+import { EntityHidingLevel, EntityKind, PackageEntity, ParameterEntity, Tag, TextTranslationEntity, TextTranslationEntityDefinition, Translation } from '../../index.js';
 export declare class TextTranslationDeclarationEntity implements TextTranslationEntity {
     private readonly analyzer;
     private readonly node;
@@ -13,7 +13,7 @@ export declare class TextTranslationDeclarationEntity implements TextTranslation
     private readonly comment;
     constructor(analyzer: Analyzer, node: tree.TextTranslationSource);
     isTextTemplate(): boolean;
-    getKey(): TextKey;
+    getKey(): string;
     getText(): string;
     getTextFragments(): readonly string[];
     getParameters(): readonly ParameterEntity[];

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

@@ -1209,14 +1209,14 @@ export declare class LocalizableTextTemplateLiteral extends BaseExpressionNode {
     readonly children: readonly [
         TextTemplateHead,
         TextTemplateSpanList,
-        Token<TokenKind.IntegerLiteral> | undefined
+        Token<TokenKind.TextLiteral> | undefined
     ];
     get parent(): ExpressionParent;
     get head(): TextTemplateHead;
     get spanList(): TextTemplateSpanList;
-    get code(): Token<TokenKind.IntegerLiteral> | undefined;
+    get key(): Token<TokenKind.TextLiteral> | undefined;
     protected get thisAsNode(): Expression;
-    constructor(head: TextTemplateHead, spanList: TextTemplateSpanList, code: Token<TokenKind.IntegerLiteral> | undefined, rangeWithTrivia: Range | undefined);
+    constructor(head: TextTemplateHead, spanList: TextTemplateSpanList, key: Token<TokenKind.TextLiteral> | undefined, rangeWithTrivia: Range | undefined);
 }
 export type TextTemplateSpanListParent = TextTemplateLiteral | LocalizableTextTemplateLiteral;
 export declare class TextTemplateSpanList extends BaseNode {
@@ -1267,13 +1267,13 @@ export declare class LocalizableTextLiteral extends BaseExpressionNode {
     readonly kind = NodeKind.LocalizableTextLiteral;
     readonly children: readonly [
         Token<TokenKind.TextLiteral>,
-        Token<TokenKind.IntegerLiteral> | undefined
+        Token<TokenKind.TextLiteral> | undefined
     ];
     get parent(): ExpressionParent;
     get text(): Token<TokenKind.TextLiteral>;
-    get code(): Token<TokenKind.IntegerLiteral> | undefined;
+    get key(): Token<TokenKind.TextLiteral> | undefined;
     protected get thisAsNode(): Expression;
-    constructor(text: Token<TokenKind.TextLiteral>, code: Token<TokenKind.IntegerLiteral> | undefined, rangeWithTrivia: Range | undefined);
+    constructor(text: Token<TokenKind.TextLiteral>, key: Token<TokenKind.TextLiteral> | undefined, rangeWithTrivia: Range | undefined);
 }
 export declare class KeywordExpression extends BaseExpressionNode {
     readonly kind = NodeKind.KeywordExpression;
@@ -2051,27 +2051,27 @@ export declare class TranslationTextLiteral extends BaseNode {
     readonly kind = NodeKind.TranslationTextLiteral;
     readonly children: readonly [
         Token<TokenKind.TextLiteral>,
-        Token<TokenKind.IntegerLiteral> | undefined
+        Token<TokenKind.TextLiteral> | undefined
     ];
     get parent(): TranslationTextParent;
     get text(): Token<TokenKind.TextLiteral>;
-    get code(): Token<TokenKind.IntegerLiteral> | undefined;
+    get key(): Token<TokenKind.TextLiteral> | undefined;
     protected get thisAsNode(): Node;
-    constructor(text: Token<TokenKind.TextLiteral>, code: Token<TokenKind.IntegerLiteral> | undefined, rangeWithTrivia: Range | undefined);
+    constructor(text: Token<TokenKind.TextLiteral>, key: Token<TokenKind.TextLiteral> | undefined, rangeWithTrivia: Range | undefined);
 }
 export declare class TranslationTextTemplate extends BaseNode {
     readonly kind = NodeKind.TranslationTextTemplate;
     readonly children: readonly [
         TextTemplateHead,
         TranslationTextTemplateSpanList,
-        Token<TokenKind.IntegerLiteral> | undefined
+        Token<TokenKind.TextLiteral> | undefined
     ];
     get parent(): TranslationTextParent;
     get head(): TextTemplateHead;
     get spanList(): TranslationTextTemplateSpanList;
-    get code(): Token<TokenKind.IntegerLiteral> | undefined;
+    get key(): Token<TokenKind.TextLiteral> | undefined;
     protected get thisAsNode(): Node;
-    constructor(head: TextTemplateHead, spanList: TranslationTextTemplateSpanList, code: Token<TokenKind.IntegerLiteral> | undefined, rangeWithTrivia: Range | undefined);
+    constructor(head: TextTemplateHead, spanList: TranslationTextTemplateSpanList, key: Token<TokenKind.TextLiteral> | undefined, rangeWithTrivia: Range | undefined);
 }
 export declare class TranslationTextTemplateSpanList extends BaseNode {
     readonly kind = NodeKind.TranslationTextTemplateSpanList;

package/build/types/tree/a/TokenFlags.d.ts

@@ -5,12 +5,10 @@ export declare const enum TokenFlags {
     QuotedName = 4,// 'имя', 'имя с пробелами', '+'
     RequiresQuotes = 8,// 'имя с пробелами', '+'
     EscapedKeyword = 16,// 'выполнить'
-    HasBackQuotes = 32,// имя с любым количеством апострофов: имя`, имя```
-    ConflictResolvingParameterName = 64,// имя с одним апострофом: имя`, выполнить`
-    BackingVariableName = 128,// имя с двумя апострофами: имя``, выполнить``
-    SingleCharText = 256,// текст из одного символа: "а", "\/", "ю000А"
-    StartsWithTilde = 512,// переводимый текст: ~"текст", ~"текст{
-    EndsWithTilde = 1024,// переводимый текст: "текст"~, }текст"~
-    ObjectParameterName = 2048,// имя особого параметра "объект"
-    LocalizableText = 1536
+    HasBackQuotes = 32,// имя с любым количеством апострофов: имя`, имя``, имя```
+    SingleCharText = 64,// текст из одного символа: "а", "\/", "ю000А"
+    StartsWithTilde = 128,// переводимый текст: ~"текст", ~"текст{
+    EndsWithTilde = 256,// переводимый текст: "текст"~, }текст"~
+    ObjectParameterName = 512,// имя особого параметра "объект"
+    LocalizableText = 384
 }

package/build/types/types/StandardTypes.d.ts

@@ -11,6 +11,7 @@ export declare class StandardTypes {
     private integer_;
     private text_;
     private textTemplate_;
+    private localizableTextTemplate_;
     private char_;
     private unresolved_;
     private yesNo_;
@@ -30,6 +31,7 @@ export declare class StandardTypes {
     get integer(): StructuredType;
     get text(): StructuredType;
     get textTemplate(): StructuredType;
+    get localizableTextTemplate(): StructuredType;
     get char(): StructuredType;
     get unresolved(): UnresolvedType;
     get yesNo(): StructuredType;

package/build/types/types/TypeFactory.d.ts

@@ -14,7 +14,7 @@ export declare class TypeFactory {
     readonly analyzer: Analyzer;
     constructor(analyzer: Analyzer);
     getStructuredType(entity: StructuredTypeEntity, substitutions: Substitutions): StructuredType;
-    getParameterType(entity: TypeParameterEntity, excludeNone: boolean): ParameterType;
+    getParameterType(entity: TypeParameterEntity, excludeNull: boolean): ParameterType;
     getVariantType(entity: VariantTypeEntity, substitutions: Substitutions): VariantType;
     getFunctionType(entity: FunctionTypeEntity, substitutions: Substitutions): FunctionType;
     getAliasType(entity: AliasTypeEntity, substitutions: Substitutions): AliasType;

package/package.json

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