@artel/artc 0.6.25249 → 0.6.25250

package/build/{chunk-G4UMALLG.js → chunk-DJEEXP7U.js}

@@ -620,7 +620,7 @@ var UniqueWithComparatorQuery = class extends Query {
 };
 
 // source/common/Constants.ts
-var ArtelVersion = true ? "0.6.25249" : "";
+var ArtelVersion = true ? "0.6.25250" : "";
 var ArtelSourceFileExtensions = [".\u0430\u0440\u0442", ".\u0430\u0440\u0442\u0435\u043B\u044C", ".art", ".artel"];
 var ArtelSourceFileExtensionSet = new Set(ArtelSourceFileExtensions);
 var ArtelSourceAndConfigurationFileExtensionSet = new Set(ArtelSourceFileExtensionSet).add(".json");
@@ -1186,10 +1186,14 @@ __export(green_exports, {
   SwitchStatement: () => SwitchStatement2,
   Tag: () => Tag2,
   TagList: () => TagList2,
+  TextTemplateDeclaration: () => TextTemplateDeclaration2,
+  TextTemplateDeclarationSpan: () => TextTemplateDeclarationSpan2,
+  TextTemplateDeclarationSpanList: () => TextTemplateDeclarationSpanList2,
   TextTemplateLiteral: () => TextTemplateLiteral2,
+  TextTemplateParameterDeclaration: () => TextTemplateParameterDeclaration2,
   TextTemplateSpan: () => TextTemplateSpan2,
   TextTemplateSpanList: () => TextTemplateSpanList2,
-  TextTranslation: () => TextTranslation2,
+  TextTranslationDeclaration: () => TextTranslationDeclaration2,
   Token: () => Token6,
   TokenExpression: () => TokenExpression2,
   TokenFlags: () => TokenFlags2,
@@ -1197,10 +1201,6 @@ __export(green_exports, {
   TopLevelTranslationList: () => TopLevelTranslationList2,
   TranslationParameterClause: () => TranslationParameterClause2,
   TranslationParameterList: () => TranslationParameterList2,
-  TranslationTextTemplate: () => TranslationTextTemplate2,
-  TranslationTextTemplateParameterDeclaration: () => TranslationTextTemplateParameterDeclaration2,
-  TranslationTextTemplateSpan: () => TranslationTextTemplateSpan2,
-  TranslationTextTemplateSpanList: () => TranslationTextTemplateSpanList2,
   TranslationTypeParameterClause: () => TranslationTypeParameterClause2,
   TranslationTypeParameterList: () => TranslationTypeParameterList2,
   TranslationsDeclaration: () => TranslationsDeclaration2,
@@ -1294,7 +1294,7 @@ var KeywordKind = /* @__PURE__ */ ((KeywordKind5) => {
   KeywordKind5[KeywordKind5["Reference"] = 54] = "Reference";
   KeywordKind5[KeywordKind5["Translations"] = 55] = "Translations";
   KeywordKind5[KeywordKind5["Base"] = 56] = "Base";
-  KeywordKind5[KeywordKind5["None"] = 57] = "None";
+  KeywordKind5[KeywordKind5["Null"] = 57] = "Null";
   KeywordKind5[KeywordKind5["Get"] = 58] = "Get";
   KeywordKind5[KeywordKind5["Set"] = 59] = "Set";
   return KeywordKind5;
@@ -1442,11 +1442,11 @@ var NodeKind = /* @__PURE__ */ ((NodeKind3) => {
   NodeKind3[NodeKind3["FieldOrVariantTranslation"] = 137] = "FieldOrVariantTranslation";
   NodeKind3[NodeKind3["TypeMemberTranslationList"] = 138] = "TypeMemberTranslationList";
   NodeKind3[NodeKind3["TypeTranslation"] = 139] = "TypeTranslation";
-  NodeKind3[NodeKind3["TextTranslation"] = 140] = "TextTranslation";
-  NodeKind3[NodeKind3["TranslationTextTemplate"] = 141] = "TranslationTextTemplate";
-  NodeKind3[NodeKind3["TranslationTextTemplateSpanList"] = 142] = "TranslationTextTemplateSpanList";
-  NodeKind3[NodeKind3["TranslationTextTemplateSpan"] = 143] = "TranslationTextTemplateSpan";
-  NodeKind3[NodeKind3["TranslationTextTemplateParameterDeclaration"] = 144] = "TranslationTextTemplateParameterDeclaration";
+  NodeKind3[NodeKind3["TextTranslationDeclaration"] = 140] = "TextTranslationDeclaration";
+  NodeKind3[NodeKind3["TextTemplateDeclaration"] = 141] = "TextTemplateDeclaration";
+  NodeKind3[NodeKind3["TextTemplateDeclarationSpanList"] = 142] = "TextTemplateDeclarationSpanList";
+  NodeKind3[NodeKind3["TextTemplateDeclarationSpan"] = 143] = "TextTemplateDeclarationSpan";
+  NodeKind3[NodeKind3["TextTemplateParameterDeclaration"] = 144] = "TextTemplateParameterDeclaration";
   NodeKind3[NodeKind3["VariantDeclaration"] = 145] = "VariantDeclaration";
   NodeKind3[NodeKind3["TypeParameterDeclaration"] = 146] = "TypeParameterDeclaration";
   NodeKind3[NodeKind3["ParameterDeclaration"] = 147] = "ParameterDeclaration";
@@ -1846,10 +1846,14 @@ __export(tree_exports, {
   SwitchStatement: () => SwitchStatement,
   Tag: () => Tag,
   TagList: () => TagList,
+  TextTemplateDeclaration: () => TextTemplateDeclaration,
+  TextTemplateDeclarationSpan: () => TextTemplateDeclarationSpan,
+  TextTemplateDeclarationSpanList: () => TextTemplateDeclarationSpanList,
   TextTemplateLiteral: () => TextTemplateLiteral,
+  TextTemplateParameterDeclaration: () => TextTemplateParameterDeclaration,
   TextTemplateSpan: () => TextTemplateSpan,
   TextTemplateSpanList: () => TextTemplateSpanList,
-  TextTranslation: () => TextTranslation,
+  TextTranslationDeclaration: () => TextTranslationDeclaration,
   Token: () => Token4,
   TokenExpression: () => TokenExpression,
   TokenFlags: () => TokenFlags2,
@@ -1857,10 +1861,6 @@ __export(tree_exports, {
   TopLevelTranslationList: () => TopLevelTranslationList,
   TranslationParameterClause: () => TranslationParameterClause,
   TranslationParameterList: () => TranslationParameterList,
-  TranslationTextTemplate: () => TranslationTextTemplate,
-  TranslationTextTemplateParameterDeclaration: () => TranslationTextTemplateParameterDeclaration,
-  TranslationTextTemplateSpan: () => TranslationTextTemplateSpan,
-  TranslationTextTemplateSpanList: () => TranslationTextTemplateSpanList,
   TranslationTypeParameterClause: () => TranslationTypeParameterClause,
   TranslationTypeParameterList: () => TranslationTypeParameterList,
   TranslationsDeclaration: () => TranslationsDeclaration,
@@ -2095,7 +2095,7 @@ var englishKeywords = new Lazy(() => [
   { keyword: "loop", kind: 26 /* Loop */, dialects: [1 /* ArtelA */, 2 /* ArtelM */] },
   { keyword: "no", kind: 53 /* No */, dialects: [1 /* ArtelA */, 2 /* ArtelM */] },
   { keyword: "not", kind: 43 /* Not */, dialects: [1 /* ArtelA */, 2 /* ArtelM */] },
-  { keyword: "none", kind: 57 /* None */, dialects: [1 /* ArtelA */, 2 /* ArtelM */] },
+  { keyword: "null", kind: 57 /* Null */, dialects: [1 /* ArtelA */, 2 /* ArtelM */] },
   { keyword: "object", kind: 4 /* Object */, dialects: [1 /* ArtelA */, 2 /* ArtelM */] },
   { keyword: "operation", kind: 12 /* Function */, dialects: [2 /* ArtelM */] },
   { keyword: "or", kind: 23 /* Or */, dialects: [1 /* ArtelA */, 2 /* ArtelM */] },
@@ -2168,7 +2168,7 @@ var russianKeywords = new Lazy(() => [
   { keyword: "\u043F\u043E\u043F\u044B\u0442\u043A\u0430", kind: 8 /* Try */, dialects: [1 /* ArtelA */, 2 /* ArtelM */] },
   { keyword: "\u043F\u0440\u0435\u0440\u0432\u0430\u0442\u044C \u0446\u0438\u043A\u043B", kind: 33 /* BreakLoop */, dialects: [1 /* ArtelA */, 2 /* ArtelM */] },
   { keyword: "\u043F\u0440\u043E\u0441\u0442\u043E\u0439 \u043E\u0431\u044A\u0435\u043A\u0442", kind: 5 /* PlainObject */, dialects: [1 /* ArtelA */, 2 /* ArtelM */] },
-  { keyword: "\u043F\u0443\u0441\u0442\u043E", kind: 57 /* None */, dialects: [1 /* ArtelA */, 2 /* ArtelM */] },
+  { keyword: "\u043F\u0443\u0441\u0442\u043E", kind: 57 /* Null */, dialects: [1 /* ArtelA */, 2 /* ArtelM */] },
   { keyword: "\u043F\u0443\u0441\u0442\u044C", kind: 1 /* Let */, dialects: [1 /* ArtelA */, 2 /* ArtelM */] },
   { keyword: "\u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0439 \u0446\u0438\u043A\u043B", kind: 34 /* ContinueLoop */, dialects: [1 /* ArtelA */, 2 /* ArtelM */] },
   { keyword: "\u0441\u043E\u0437\u0434\u0430\u043D\u0438\u0435", kind: 31 /* Creation */, dialects: [1 /* ArtelA */, 2 /* ArtelM */] },
@@ -4077,7 +4077,7 @@ var TreeQuery = class {
           return analyzer.entity.ofDereferencedVariableSetterDeclaration(parent);
         case 51 /* OperatorDeclaration */:
           return analyzer.entity.ofOperatorDeclaration(parent);
-        case 144 /* TranslationTextTemplateParameterDeclaration */:
+        case 144 /* TextTemplateParameterDeclaration */:
           return analyzer.entity.ofTranslationTextTemplateParameterDeclaration(parent);
         default:
           Debug.typeIsAssignableTo();
@@ -8474,10 +8474,10 @@ var TypeTranslation = class extends BaseNode {
     ];
   }
 };
-var TextTranslation = class extends BaseNode {
+var TextTranslationDeclaration = class extends BaseNode {
   constructor(green, rangeStart, parent) {
     super(green, rangeStart, parent);
-    this.kind = 140 /* TextTranslation */;
+    this.kind = 140 /* TextTranslationDeclaration */;
   }
   get children() {
     return this._children ??= this.createChildren();
@@ -8502,10 +8502,10 @@ var TextTranslation = class extends BaseNode {
     ];
   }
 };
-var TranslationTextTemplate = class extends BaseNode {
+var TextTemplateDeclaration = class extends BaseNode {
   constructor(green, rangeStart, parent) {
     super(green, rangeStart, parent);
-    this.kind = 141 /* TranslationTextTemplate */;
+    this.kind = 141 /* TextTemplateDeclaration */;
   }
   get children() {
     return this._children ??= this.createChildren();
@@ -8526,10 +8526,10 @@ var TranslationTextTemplate = class extends BaseNode {
     ];
   }
 };
-var TranslationTextTemplateSpanList = class extends BaseNode {
+var TextTemplateDeclarationSpanList = class extends BaseNode {
   constructor(green, rangeStart, parent) {
     super(green, rangeStart, parent);
-    this.kind = 142 /* TranslationTextTemplateSpanList */;
+    this.kind = 142 /* TextTemplateDeclarationSpanList */;
   }
   get children() {
     return this._children ??= this.createChildren();
@@ -8544,10 +8544,10 @@ var TranslationTextTemplateSpanList = class extends BaseNode {
     return this.green.spans.map((e, i) => e.toRed(childRangeStart(this, i), this));
   }
 };
-var TranslationTextTemplateSpan = class extends BaseNode {
+var TextTemplateDeclarationSpan = class extends BaseNode {
   constructor(green, rangeStart, parent) {
     super(green, rangeStart, parent);
-    this.kind = 143 /* TranslationTextTemplateSpan */;
+    this.kind = 143 /* TextTemplateDeclarationSpan */;
   }
   get children() {
     return this._children ??= this.createChildren();
@@ -8568,10 +8568,10 @@ var TranslationTextTemplateSpan = class extends BaseNode {
     ];
   }
 };
-var TranslationTextTemplateParameterDeclaration = class extends BaseNode {
+var TextTemplateParameterDeclaration = class extends BaseNode {
   constructor(green, rangeStart, parent) {
     super(green, rangeStart, parent);
-    this.kind = 144 /* TranslationTextTemplateParameterDeclaration */;
+    this.kind = 144 /* TextTemplateParameterDeclaration */;
   }
   get children() {
     return this._children ??= this.createChildren();
@@ -12206,10 +12206,10 @@ var TypeTranslation2 = class extends BaseNode2 {
     return new TypeTranslation(this, rangeStart, parent);
   }
 };
-var TextTranslation2 = class extends BaseNode2 {
+var TextTranslationDeclaration2 = class extends BaseNode2 {
   constructor(sourceText, minusGreaterThanToken, translatedTextOrTranslationFunction) {
     super();
-    this.kind = 140 /* TextTranslation */;
+    this.kind = 140 /* TextTranslationDeclaration */;
     this.children = [sourceText, minusGreaterThanToken, translatedTextOrTranslationFunction];
   }
   get sourceText() {
@@ -12225,13 +12225,13 @@ var TextTranslation2 = class extends BaseNode2 {
     return this;
   }
   toRed(rangeStart, parent) {
-    return new TextTranslation(this, rangeStart, parent);
+    return new TextTranslationDeclaration(this, rangeStart, parent);
   }
 };
-var TranslationTextTemplate2 = class extends BaseNode2 {
+var TextTemplateDeclaration2 = class extends BaseNode2 {
   constructor(head, spanList) {
     super();
-    this.kind = 141 /* TranslationTextTemplate */;
+    this.kind = 141 /* TextTemplateDeclaration */;
     this.children = [head, spanList];
   }
   get head() {
@@ -12244,13 +12244,13 @@ var TranslationTextTemplate2 = class extends BaseNode2 {
     return this;
   }
   toRed(rangeStart, parent) {
-    return new TranslationTextTemplate(this, rangeStart, parent);
+    return new TextTemplateDeclaration(this, rangeStart, parent);
   }
 };
-var TranslationTextTemplateSpanList2 = class extends BaseNode2 {
+var TextTemplateDeclarationSpanList2 = class extends BaseNode2 {
   constructor(spans) {
     super();
-    this.kind = 142 /* TranslationTextTemplateSpanList */;
+    this.kind = 142 /* TextTemplateDeclarationSpanList */;
     this.children = spans;
   }
   get spans() {
@@ -12260,13 +12260,13 @@ var TranslationTextTemplateSpanList2 = class extends BaseNode2 {
     return this;
   }
   toRed(rangeStart, parent) {
-    return new TranslationTextTemplateSpanList(this, rangeStart, parent);
+    return new TextTemplateDeclarationSpanList(this, rangeStart, parent);
   }
 };
-var TranslationTextTemplateSpan2 = class extends BaseNode2 {
+var TextTemplateDeclarationSpan2 = class extends BaseNode2 {
   constructor(parameter, text) {
     super();
-    this.kind = 143 /* TranslationTextTemplateSpan */;
+    this.kind = 143 /* TextTemplateDeclarationSpan */;
     this.children = [parameter, text];
   }
   get parameter() {
@@ -12279,13 +12279,13 @@ var TranslationTextTemplateSpan2 = class extends BaseNode2 {
     return this;
   }
   toRed(rangeStart, parent) {
-    return new TranslationTextTemplateSpan(this, rangeStart, parent);
+    return new TextTemplateDeclarationSpan(this, rangeStart, parent);
   }
 };
-var TranslationTextTemplateParameterDeclaration2 = class extends BaseNode2 {
+var TextTemplateParameterDeclaration2 = class extends BaseNode2 {
   constructor(name, typeAnnotation) {
     super();
-    this.kind = 144 /* TranslationTextTemplateParameterDeclaration */;
+    this.kind = 144 /* TextTemplateParameterDeclaration */;
     this.children = [name, typeAnnotation];
   }
   get name() {
@@ -12298,7 +12298,7 @@ var TranslationTextTemplateParameterDeclaration2 = class extends BaseNode2 {
     return this;
   }
   toRed(rangeStart, parent) {
-    return new TranslationTextTemplateParameterDeclaration(this, rangeStart, parent);
+    return new TextTemplateParameterDeclaration(this, rangeStart, parent);
   }
 };
 var VariantDeclaration2 = class extends BaseNode2 {
@@ -12877,7 +12877,7 @@ var DiagnosticCode = /* @__PURE__ */ ((DiagnosticCode2) => {
   DiagnosticCode2[DiagnosticCode2["TagNotFound"] = 284] = "TagNotFound";
   DiagnosticCode2[DiagnosticCode2["TypeOrFunctionNameExpected"] = 285] = "TypeOrFunctionNameExpected";
   DiagnosticCode2[DiagnosticCode2["PackageNameOrAliasExpected"] = 286] = "PackageNameOrAliasExpected";
-  DiagnosticCode2[DiagnosticCode2["ExpressionCanBeNone"] = 287] = "ExpressionCanBeNone";
+  DiagnosticCode2[DiagnosticCode2["ExpressionCanBeNull"] = 287] = "ExpressionCanBeNull";
   DiagnosticCode2[DiagnosticCode2["TargetVariableExpressionInTheAssignmentStatementCannotContainQuestionOperator"] = 288] = "TargetVariableExpressionInTheAssignmentStatementCannotContainQuestionOperator";
   DiagnosticCode2[DiagnosticCode2["UnreachableCode"] = 289] = "UnreachableCode";
   DiagnosticCode2[DiagnosticCode2["RecursionOccurredWhileCalculatingTheTypeOfTheExpression"] = 290] = "RecursionOccurredWhileCalculatingTheTypeOfTheExpression";
@@ -13134,8 +13134,8 @@ var englishErrorMessages = {
   [284 /* TagNotFound */]: "Tag not found.",
   [285 /* TypeOrFunctionNameExpected */]: "Type or function name expected.",
   [286 /* PackageNameOrAliasExpected */]: "Package name or alias expected.",
-  [287 /* ExpressionCanBeNone */]: "Expression can be none.",
-  [288 /* TargetVariableExpressionInTheAssignmentStatementCannotContainQuestionOperator */]: "Target variable expression in the assignment statement cannot contain '?' operator used to check for 'none' value.",
+  [287 /* ExpressionCanBeNull */]: "Expression can be null.",
+  [288 /* TargetVariableExpressionInTheAssignmentStatementCannotContainQuestionOperator */]: "Target variable expression in the assignment statement cannot contain '?' operator used to check for 'null' value.",
   [289 /* UnreachableCode */]: "Unreachable code.",
   [290 /* RecursionOccurredWhileCalculatingTheTypeOfTheExpression */]: "Recursion occurred while calculating the type of the expression. To fix this error, specify the type of the variable explicitly.",
   [291 /* RecursionOccurredWhileInferringTheTypeOfTheVariable */]: "Recursion occurred while inferring the type of the variable. To fix this error, specify the type of the variable explicitly.",
@@ -13344,7 +13344,7 @@ var russianErrorMessages = {
   [284 /* TagNotFound */]: "\u0422\u0435\u0433 \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D.",
   [285 /* TypeOrFunctionNameExpected */]: "\u041E\u0436\u0438\u0434\u0430\u043B\u043E\u0441\u044C \u0438\u043C\u044F \u0442\u0438\u043F\u0430 \u0438\u043B\u0438 \u0444\u0443\u043D\u043A\u0446\u0438\u0438.",
   [286 /* PackageNameOrAliasExpected */]: "\u041E\u0436\u0438\u0434\u0430\u043B\u043E\u0441\u044C \u0438\u043C\u044F \u0438\u043B\u0438 \u043F\u0441\u0435\u0432\u0434\u043E\u043D\u0438\u043C \u043F\u0430\u043A\u0435\u0442\u0430.",
-  [287 /* ExpressionCanBeNone */]: "\u0412\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u0435 \u043C\u043E\u0436\u0435\u0442 \u0441\u043E\u0434\u0435\u0440\u0436\u0430\u0442\u044C \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 '\u043F\u0443\u0441\u0442\u043E'.",
+  [287 /* ExpressionCanBeNull */]: "\u0412\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u0435 \u043C\u043E\u0436\u0435\u0442 \u0441\u043E\u0434\u0435\u0440\u0436\u0430\u0442\u044C \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 '\u043F\u0443\u0441\u0442\u043E'.",
   [288 /* TargetVariableExpressionInTheAssignmentStatementCannotContainQuestionOperator */]: "\u0412\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u0435 \u0446\u0435\u043B\u0435\u0432\u043E\u0439 \u043F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u043E\u0439 \u0432 \u043A\u043E\u043C\u0430\u043D\u0434\u0435 \u043F\u0440\u0438\u0441\u0432\u0430\u0438\u0432\u0430\u043D\u0438\u044F \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0441\u043E\u0434\u0435\u0440\u0436\u0430\u0442\u044C \u0437\u043D\u0430\u043A \u043E\u043F\u0435\u0440\u0430\u0446\u0438\u0438 '?' \u0434\u043B\u044F \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438 \u043D\u0430 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 '\u043F\u0443\u0441\u0442\u043E'.",
   [289 /* UnreachableCode */]: "\u041D\u0435\u0434\u043E\u0441\u0442\u0438\u0436\u0438\u043C\u044B\u0439 \u043A\u043E\u0434.",
   [290 /* RecursionOccurredWhileCalculatingTheTypeOfTheExpression */]: "\u041F\u0440\u0438 \u0432\u044B\u0447\u0438\u0441\u043B\u0435\u043D\u0438\u0438 \u0442\u0438\u043F\u0430 \u0432\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u044F \u043F\u0440\u043E\u0438\u0437\u043E\u0448\u043B\u0430 \u0440\u0435\u043A\u0443\u0440\u0441\u0438\u044F. \u0427\u0442\u043E\u0431\u044B \u0438\u0441\u043F\u0440\u0430\u0432\u0438\u0442\u044C \u044D\u0442\u0443 \u043E\u0448\u0438\u0431\u043A\u0443, \u0434\u043E\u0431\u0430\u0432\u044C\u0442\u0435 \u044F\u0432\u043D\u043E\u0435 \u0443\u043A\u0430\u0437\u0430\u043D\u0438\u0435 \u0442\u0438\u043F\u0430 \u043F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u043E\u0439.",
@@ -13713,7 +13713,7 @@ var DisplayService = class {
     const returnType = type.getReturnType();
     let returnTypeAnnotationColon = "";
     let returnTypeText = "";
-    if (this._analyzer === void 0 || !returnType.equals(this._analyzer.originalStandardTypes.none)) {
+    if (this._analyzer === void 0 || !returnType.equals(this._analyzer.originalStandardTypes.nullType)) {
       returnTypeAnnotationColon = ": ";
       returnTypeText = this.displayType(returnType);
     }
@@ -13787,7 +13787,7 @@ var DisplayService = class {
     const returnType = func.getReturnType();
     let returnTypeAnnotationColon = "";
     let returnTypeText = "";
-    if (this._analyzer === void 0 || !returnType.equals(this._analyzer.originalStandardTypes.none)) {
+    if (this._analyzer === void 0 || !returnType.equals(this._analyzer.originalStandardTypes.nullType)) {
       returnTypeAnnotationColon = ": ";
       returnTypeText = this.displayType(returnType);
     }
@@ -13826,7 +13826,7 @@ var DisplayService = class {
     const returnType = operator.getReturnType();
     let returnTypeAnnotationColon = "";
     let returnTypeText = "";
-    if (this._analyzer === void 0 || !returnType.equals(this._analyzer.originalStandardTypes.none)) {
+    if (this._analyzer === void 0 || !returnType.equals(this._analyzer.originalStandardTypes.nullType)) {
       returnTypeAnnotationColon = ": ";
       returnTypeText = this.displayType(returnType);
     }
@@ -13957,7 +13957,7 @@ var DisplayService = class {
         const functionKeyword = this.displayKeyword(12 /* Function */);
         const valueParametersText = `(${type.value.getValueParameters().map((p) => this.displayValueParameterDeclaration(p)).join(", ")})`;
         const returnType = type.value.getReturnType();
-        const returnTypeText = this._analyzer === void 0 || !returnType.equals(this._analyzer.originalStandardTypes.none) ? `: ${this.displayType(returnType)}` : "";
+        const returnTypeText = this._analyzer === void 0 || !returnType.equals(this._analyzer.originalStandardTypes.nullType) ? `: ${this.displayType(returnType)}` : "";
         typeBody = `${asyncKeyword}${functionKeyword}${valueParametersText}${returnTypeText}`;
         break;
       }
@@ -14289,7 +14289,7 @@ var DisplayService = class {
       const valueParametersText = type.getValueParameters().map((p) => this.displayValueParameterDeclaration(p, lessDetailsTypeDisplayOptions)).join(", ");
       let returnTypeText = "";
       const returnType = type.getReturnType();
-      if (this._analyzer === void 0 || !returnType.equals(this._analyzer.originalStandardTypes.none)) {
+      if (this._analyzer === void 0 || !returnType.equals(this._analyzer.originalStandardTypes.nullType)) {
         returnTypeText += `: ${this.displayTypeInternal(returnType, lessDetailsTypeDisplayOptions)}`;
       }
       if (namedTypeEntity !== void 0) {
@@ -14301,7 +14301,7 @@ var DisplayService = class {
   }
   displayParameterTypeUsage(type) {
     const name = this.displayEntityNameText(type.getEntity());
-    const nonNullableText = type.isNoneExcluded() ? "!" : "";
+    const nonNullableText = type.isNullExcluded() ? "!" : "";
     return `${name}${nonNullableText}`;
   }
   displayAliasTypeUsage(type, options) {
@@ -14385,12 +14385,12 @@ var DisplayService = class {
   }
   displayUnionOrIntersectionTypeTypes(types, isUnion) {
     if (this._analyzer !== void 0 && isUnion && types.length === 2) {
-      let noneTypeIndex = -1;
+      let nullTypeIndex = -1;
       if (this._analyzer !== void 0) {
-        noneTypeIndex = types.findIndex((t) => t.equals(this._analyzer.originalStandardTypes.none));
+        nullTypeIndex = types.findIndex((t) => t.equals(this._analyzer.originalStandardTypes.nullType));
       }
-      if (noneTypeIndex >= 0) {
-        const type = noneTypeIndex === 0 ? types[1] : types[0];
+      if (nullTypeIndex >= 0) {
+        const type = nullTypeIndex === 0 ? types[1] : types[0];
         const options = {
           displayFullVersionOfNamedFunctionType: true,
           unionAndAliasTypeDisplayKind: 1 /* OnlyOriginalType */,
@@ -15432,8 +15432,8 @@ var ParameterTypeUsage_type = class {
   getEntity() {
     return this.type.getEntity();
   }
-  isNoneExcluded() {
-    return this.type.isNoneExcluded;
+  isNullExcluded() {
+    return this.type.isNullExcluded;
   }
 };
 var ParameterTypeUsage_entity = class {
@@ -15444,7 +15444,7 @@ var ParameterTypeUsage_entity = class {
   getEntity() {
     return this.entity;
   }
-  isNoneExcluded() {
+  isNullExcluded() {
     return false;
   }
 };
@@ -19598,9 +19598,9 @@ var ExpressionParser = class {
     return result;
   }
   parseExpression(isFollowedByStatementBlock) {
-    return this.parseNoneCoalescingExpression(isFollowedByStatementBlock);
+    return this.parseNullCoalescingExpression(isFollowedByStatementBlock);
   }
-  parseNoneCoalescingExpression(isFollowedByStatementBlock) {
+  parseNullCoalescingExpression(isFollowedByStatementBlock) {
     const expressionStart = this.parser.tokenOrKeywordStartPosition();
     let result = this.parseDisjunctiveExpression(isFollowedByStatementBlock);
     while (this.parser.currentTokenOrKeyword.isToken(51 /* QuestionQuestion */)) {
@@ -19883,7 +19883,7 @@ var ExpressionParser = class {
           break;
         case 52 /* Yes */:
         case 53 /* No */:
-        case 57 /* None */:
+        case 57 /* Null */:
         case 4 /* Object */:
         case 56 /* Base */:
         case 54 /* Reference */:
@@ -19936,7 +19936,7 @@ var ExpressionParser = class {
           break;
         case 52 /* Yes */:
         case 53 /* No */:
-        case 57 /* None */: {
+        case 57 /* Null */: {
           const expressionStart = this.parser.tokenOrKeywordStartPosition();
           const keyword = this.parser.parseTokenOrKeyword().asKeyword();
           const expression = new KeywordExpression2(keyword);
@@ -20083,35 +20083,6 @@ var ExpressionParser = class {
     }
     return result;
   }
-  parseTranslationTextTemplate() {
-    const literalStart = this.parser.tokenOrKeywordStartPosition();
-    const head = this.parser.parseExpectedToken(7 /* TextTemplateHead */);
-    const spanListStart = this.parser.tokenOrKeywordStartPosition();
-    const spans = new Array();
-    if (!head.isMissing) {
-      let span;
-      do {
-        const spanStart = this.parser.tokenOrKeywordStartPosition();
-        const parameter = this.parseTranslationTextTemplateParameter();
-        const text = this.parseTextTemplatePartOrTail();
-        span = this.parser.intern(new TranslationTextTemplateSpan2(parameter, text), spanStart);
-        spans.push(span);
-      } while (span.text.tokenKind === 8 /* TextTemplatePart */);
-    }
-    const spanList = this.parser.intern(new TranslationTextTemplateSpanList2(spans), spanListStart);
-    const result = new TranslationTextTemplate2(head, spanList);
-    return this.parser.intern(result, literalStart);
-  }
-  parseTranslationTextTemplateParameter() {
-    const parameterStart = this.parser.tokenOrKeywordStartPosition();
-    const name = this.parser.parseIdentifier(4 /* Other */);
-    let typeAnnotation;
-    if (this.parser.typeAnnotationParser.isStartOfTypeAnnotation()) {
-      typeAnnotation = this.parser.typeAnnotationParser.parseTypeAnnotation();
-    }
-    const result = new TranslationTextTemplateParameterDeclaration2(name, typeAnnotation);
-    return this.parser.intern(result, parameterStart);
-  }
   parseFunctionBlockLiteral() {
     const functionBlockLiteralStart = this.parser.tokenOrKeywordStartPosition();
     const block = this.parser.statementParser.parseFunctionBlock();
@@ -21169,7 +21140,7 @@ var TranslationsDeclarationParser = class {
           return () => this.parsePackageVariableTranslation();
         case 6 /* TextLiteral */:
         case 7 /* TextTemplateHead */:
-          return () => this.parseTextTranslation();
+          return () => this.parseTextTranslationDeclaration();
       }
     } else {
       switch (this.parser.currentTokenOrKeyword.keywordKind) {
@@ -21386,13 +21357,13 @@ var TranslationsDeclarationParser = class {
     );
     return this.parser.intern(result, translationStart);
   }
-  parseTextTranslation() {
+  parseTextTranslationDeclaration() {
     const translationStart = this.parser.tokenOrKeywordStartPosition();
     let sourceText;
     if (this.parser.currentTokenOrKeyword.isToken(6 /* TextLiteral */)) {
       sourceText = this.parser.parseExpectedToken(6 /* TextLiteral */);
     } else {
-      sourceText = this.parser.expressionParser.parseTranslationTextTemplate();
+      sourceText = this.parseTextTemplateDeclaration();
     }
     const minusGreaterThanToken = this.parser.parseExpectedToken(43 /* MinusGreaterThan */);
     let translatedTextOrTranslationFunction;
@@ -21420,13 +21391,42 @@ var TranslationsDeclarationParser = class {
         133 /* TranslatedTextTemplateOrTranslationFunctionBlockExpected */
       );
     }
-    const result = new TextTranslation2(
+    const result = new TextTranslationDeclaration2(
       sourceText,
       minusGreaterThanToken,
       translatedTextOrTranslationFunction
     );
     return this.parser.intern(result, translationStart);
   }
+  parseTextTemplateDeclaration() {
+    const literalStart = this.parser.tokenOrKeywordStartPosition();
+    const head = this.parser.parseExpectedToken(7 /* TextTemplateHead */);
+    const spanListStart = this.parser.tokenOrKeywordStartPosition();
+    const spans = new Array();
+    if (!head.isMissing) {
+      let span;
+      do {
+        const spanStart = this.parser.tokenOrKeywordStartPosition();
+        const parameter = this.parseTextTemplateParameterDeclaration();
+        const text = this.parser.expressionParser.parseTextTemplatePartOrTail();
+        span = this.parser.intern(new TextTemplateDeclarationSpan2(parameter, text), spanStart);
+        spans.push(span);
+      } while (span.text.tokenKind === 8 /* TextTemplatePart */);
+    }
+    const spanList = this.parser.intern(new TextTemplateDeclarationSpanList2(spans), spanListStart);
+    const result = new TextTemplateDeclaration2(head, spanList);
+    return this.parser.intern(result, literalStart);
+  }
+  parseTextTemplateParameterDeclaration() {
+    const parameterStart = this.parser.tokenOrKeywordStartPosition();
+    const name = this.parser.parseIdentifier(4 /* Other */);
+    let typeAnnotation;
+    if (this.parser.typeAnnotationParser.isStartOfTypeAnnotation()) {
+      typeAnnotation = this.parser.typeAnnotationParser.parseTypeAnnotation();
+    }
+    const result = new TextTemplateParameterDeclaration2(name, typeAnnotation);
+    return this.parser.intern(result, parameterStart);
+  }
 };
 var TypeSpecifierParser = class {
   constructor(parser2) {
@@ -23007,6 +23007,44 @@ var TypeMemberLookupBase = class {
     }
     return result;
   }
+  tryGetTypeLocale(type) {
+    switch (type.kind) {
+      case "function":
+        return type.getEntity().getLocalization().locale;
+      case "structured":
+        return type.getEntity().getLocalization().locale;
+      case "variant":
+        return type.getEntity().getLocalization().locale;
+      case "alias":
+        return type.getEntity().getLocalization().locale;
+      case "parameter":
+        return type.getEntity().getLocalization().locale;
+      case "unresolved":
+        return void 0;
+      case "union":
+      case "intersection": {
+        const constituentTypes = type.originalTypes;
+        if (constituentTypes.length === 0) {
+          return void 0;
+        }
+        let firstTypeLocale;
+        for (let i = 0; i < constituentTypes.length; i++) {
+          if (i === 0) {
+            firstTypeLocale = this.tryGetTypeLocale(constituentTypes[i]);
+            if (firstTypeLocale === void 0) {
+              break;
+            }
+          } else if (this.tryGetTypeLocale(constituentTypes[i]) !== firstTypeLocale) {
+            firstTypeLocale = void 0;
+            break;
+          }
+        }
+        return firstTypeLocale;
+      }
+      default:
+        Debug.never(type);
+    }
+  }
   getAllMembersOfTypeOrExtension(typeOrExtension, options, hidingMatcher, typeExtensionLookup) {
     switch (typeOrExtension.kind) {
       case "type":
@@ -23022,8 +23060,9 @@ var TypeMemberLookupBase = class {
     const state = new TypeMemberLookupState();
     let result = this.getAllMembersOfType(type, options, state, hidingMatcher, typeExtensionLookup);
     if (state.searchedInAspect && !state.searchedInStandardObjectType) {
+      const locale = this.tryGetTypeLocale(type) ?? this._contextLocale;
       const objectTypeMembers = this.getAllMembersOfType(
-        this._analyzer.getLocalizedStandardTypes(this._contextLocale).refObject,
+        this._analyzer.getLocalizedStandardTypes(locale).refObject,
         options,
         state,
         hidingMatcher,
@@ -23285,9 +23324,10 @@ var TypeMemberLookupByKeyBase = class extends TypeMemberLookupBase {
     const state = new TypeMemberLookupState();
     let result = this.getMembersOfTypeByKey(key, type, options, state, hidingMatcher, typeExtensionLookup);
     if (state.searchedInAspect && !state.searchedInStandardObjectType) {
+      const locale = this.tryGetTypeLocale(type) ?? this._contextLocale;
       const objectTypeMembers = this.getMembersOfTypeByKey(
         key,
-        this._analyzer.getLocalizedStandardTypes(this._contextLocale).refObject,
+        this._analyzer.getLocalizedStandardTypes(locale).refObject,
         options,
         state,
         hidingMatcher,
@@ -24442,6 +24482,9 @@ var TsGlobalClassOrInterfaceEntity = class {
         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.isRefObject() ? t : void 0).first();
+          if (type === void 0) {
+            type = this._tsctx.analyzer.getImplicitBaseTypeForStructuredType(this);
+          }
         }
       }
       return new OriginalBaseObjectType(type);
@@ -24605,7 +24648,7 @@ var TsTypeLiteralEntity = class {
     this.kind = 2 /* Type */;
     this.typeEntityKind = 1 /* Structured */;
     this.subkind = "anonymous";
-    this._baseObjectType = new OriginalBaseObjectType(void 0);
+    this._baseObjectType = new Cached();
     this._baseAspectTypes = new OriginalBaseAspectTypes([]);
     this._members = new Cached();
   }
@@ -24652,7 +24695,7 @@ var TsTypeLiteralEntity = class {
     return this.getTypeParameters().length;
   }
   getBaseObjectType() {
-    return this._baseObjectType;
+    return this._baseObjectType.getOrInsertWith(() => new OriginalBaseObjectType(this._tsctx.analyzer.getImplicitBaseTypeForStructuredType(this)));
   }
   getBaseAspectTypes() {
     return this._baseAspectTypes;
@@ -24695,7 +24738,7 @@ var TsNamedTypeLiteralEntity = class {
     this.typeEntityKind = 1 /* Structured */;
     this.subkind = "package";
     this._typeParameters = new Cached();
-    this._baseObjectType = new OriginalBaseObjectType(void 0);
+    this._baseObjectType = new Cached();
     this._baseAspectTypes = new OriginalBaseAspectTypes([]);
     this._members = new Cached();
   }
@@ -24753,7 +24796,7 @@ var TsNamedTypeLiteralEntity = class {
     return this.getTypeParameters().length;
   }
   getBaseObjectType() {
-    return this._baseObjectType;
+    return this._baseObjectType.getOrInsertWith(() => new OriginalBaseObjectType(this._tsctx.analyzer.getImplicitBaseTypeForStructuredType(this)));
   }
   getBaseAspectTypes() {
     return this._baseAspectTypes;
@@ -25290,7 +25333,6 @@ var TsIteratorFunctionEntity = class {
     this.kind = 1 /* Function */;
     this.subkind = "method";
     this._returnType = new Cached();
-    this._overriddenMembers = new Cached();
   }
   getName() {
     const locale = this.getLocalization().locale;
@@ -25366,17 +25408,7 @@ var TsIteratorFunctionEntity = class {
     return 0 /* SubstituteOwnSubstitutions */;
   }
   getOverriddenMembers() {
-    return this._overriddenMembers.getOrInsertWith(() => {
-      const elementType = Query.from(this.getReturnType().getSubstitutions().getTypes()).first() ?? this._tsctx.analyzer.originalStandardTypes.unresolved;
-      const wellKnownDeclarations = this._tsctx.analyzer.getLocalizedWellKnownDeclarations(this.getLocalization().locale);
-      const substitutions = new Substitutions(
-        this._tsctx.analyzer,
-        wellKnownDeclarations.enumerable.getTypeParameters(),
-        [elementType]
-      );
-      const method = new Method(this._tsctx.analyzer, wellKnownDeclarations.enumeratorMethod, substitutions);
-      return [method];
-    });
+    return [];
   }
   getLocalization() {
     return Localization.Original.ofEntity(this);
@@ -27254,8 +27286,8 @@ var NodeTypeUtils = class {
         return false;
     }
   }
-  static isNoneLiteral(node) {
-    return node.kind === 83 /* KeywordExpression */ && node.keyword.keywordKind === 57 /* None */;
+  static isNullLiteral(node) {
+    return node.kind === 83 /* KeywordExpression */ && node.keyword.keywordKind === 57 /* Null */;
   }
   static isSubprogramDeclarationOrLiteral(node) {
     switch (node.kind) {
@@ -28566,7 +28598,7 @@ var TranslationTextTemplateParameterDeclarationEntity = class {
     if (node.typeAnnotation !== void 0) {
       return this._analyzer.type.ofTypeSpecifier(node.typeAnnotation.typeSpecifier);
     }
-    return this._analyzer.includeNoneToType(
+    return this._analyzer.includeNullToType(
       this._analyzer.originalStandardTypes.refObject,
       this.getLocalization().locale
     );
@@ -29455,8 +29487,8 @@ var TypeContext = class {
   get checker() {
     return this._tsctx.tsChecker;
   }
-  get refObjectOrNone() {
-    return this.analyzer.includeNoneToType(this._tsctx.standardTypes.refObject, 0 /* En */);
+  get refObjectOrNull() {
+    return this.analyzer.includeNullToType(this._tsctx.standardTypes.refObject, 0 /* En */);
   }
   get esSymbolType() {
     return this._esSymbolType.getOrInsertWith(() => {
@@ -29475,7 +29507,7 @@ var TypeContext = class {
   }
   ofTypeNode(node) {
     if (node === void 0) {
-      return this.refObjectOrNone;
+      return this.refObjectOrNull;
     }
     const type = this.checker.getTypeFromTypeNode(node);
     return this.ofTsType(type);
@@ -29500,19 +29532,19 @@ var TypeContext = class {
       return this._tsctx.standardTypes.yesNo;
     }
     if ((type.flags & ts5.TypeFlags.Undefined) !== 0) {
-      return this._tsctx.standardTypes.none;
+      return this._tsctx.standardTypes.nullType;
     }
     if ((type.flags & ts5.TypeFlags.Null) !== 0) {
-      return this._tsctx.standardTypes.none;
+      return this._tsctx.standardTypes.nullType;
     }
     if ((type.flags & ts5.TypeFlags.Void) !== 0) {
-      return this._tsctx.standardTypes.none;
+      return this._tsctx.standardTypes.nullType;
     }
     if ((type.flags & ts5.TypeFlags.Any) !== 0) {
-      return this.refObjectOrNone;
+      return this.refObjectOrNull;
     }
     if ((type.flags & ts5.TypeFlags.Unknown) !== 0) {
-      return this.refObjectOrNone;
+      return this.refObjectOrNull;
     }
     if ((type.flags & ts5.TypeFlags.Never) !== 0) {
       return this._tsctx.standardTypes.unresolved;
@@ -29521,7 +29553,7 @@ var TypeContext = class {
       return this._tsctx.standardTypes.refObject;
     }
     if ((type.flags & ts5.TypeFlags.ESSymbolLike) !== 0) {
-      return this.esSymbolType ?? this.refObjectOrNone;
+      return this.esSymbolType ?? this.refObjectOrNull;
     }
     if ((type.flags & ts5.TypeFlags.Object) !== 0) {
       return this.ofObjectType(type);
@@ -29535,7 +29567,7 @@ var TypeContext = class {
     if ((type.flags & ts5.TypeFlags.TypeParameter) !== 0) {
       return this.ofTypeParameter(type);
     }
-    return this.refObjectOrNone;
+    return this.refObjectOrNull;
   }
   getUnderlyingTypeOfEnum(symbol) {
     const declaredEnumType = this._tsctx.tsChecker.getDeclaredTypeOfSymbol(symbol);
@@ -29586,7 +29618,7 @@ var TypeContext = class {
         return this.createTypeFromEntity(entity);
       }
     }
-    return this.refObjectOrNone;
+    return this.refObjectOrNull;
   }
   ofEnumLiteralType(type) {
     if (type.symbol?.parent !== void 0) {
@@ -29595,7 +29627,7 @@ var TypeContext = class {
         return this.createTypeFromEntity(entity);
       }
     }
-    return this.refObjectOrNone;
+    return this.refObjectOrNull;
   }
   ofTypeAlias(type, aliasSymbol) {
     const entity = this.getEntityOfTypeSymbol(aliasSymbol);
@@ -29606,7 +29638,7 @@ var TypeContext = class {
       }
       return this.createTypeFromEntity(entity, typeArguments);
     }
-    return this.refObjectOrNone;
+    return this.refObjectOrNull;
   }
   ofObjectType(type) {
     if (type.symbol !== void 0 && TsUtils.isTypeReference(type)) {
@@ -29645,7 +29677,7 @@ var TypeContext = class {
         return this.createTypeFromEntity(entity, typeArguments);
       }
     }
-    return this.refObjectOrNone;
+    return this.refObjectOrNull;
   }
   ofUnionType(type) {
     const constituentTypes = type.types.map((t) => this.ofTsType(t));
@@ -29662,7 +29694,7 @@ var TypeContext = class {
         return this.analyzer.typeFactory.getParameterType(entity, false);
       }
     }
-    return this.refObjectOrNone;
+    return this.refObjectOrNull;
   }
   createTypeArguments(type) {
     if (type.typeArguments === void 0) {
@@ -33311,7 +33343,7 @@ var EntityLocalizationContext = class {
       case "parameter":
         return this._analyzer.typeFactory.getParameterType(
           this.getLocalizedTypeParameterEntity(type.getEntity()),
-          type.isNoneExcluded
+          type.isNullExcluded
         );
       case "unresolved":
         return type;
@@ -34171,7 +34203,7 @@ var AnalyzedTranslationPackage2 = class {
           }
           case 134 /* PackageImportTranslation */:
             break;
-          case 140 /* TextTranslation */:
+          case 140 /* TextTranslationDeclaration */:
             break;
           default:
             Debug.never(translation);
@@ -35200,14 +35232,14 @@ var OverloadResolver = class {
     return void 0;
   }
   chooseBetterTargetType(targetTypeA, typeWhenTargetTypeIsA, targetTypeB, typeWhenTargetTypeIsB) {
-    const isTargetTypeANullable = this._analyzer.isNoneAssignableToType(targetTypeA);
-    targetTypeA = this._analyzer.excludeNoneFromType(targetTypeA);
-    const isTypeWhenTargetTypeIsANullable = this._analyzer.isNoneAssignableToType(typeWhenTargetTypeIsA);
-    typeWhenTargetTypeIsA = this._analyzer.excludeNoneFromType(typeWhenTargetTypeIsA);
-    const isTargetTypeBNullable = this._analyzer.isNoneAssignableToType(targetTypeB);
-    targetTypeB = this._analyzer.excludeNoneFromType(targetTypeB);
-    const isTypeWhenTargetTypeIsBNullable = this._analyzer.isNoneAssignableToType(typeWhenTargetTypeIsB);
-    typeWhenTargetTypeIsB = this._analyzer.excludeNoneFromType(typeWhenTargetTypeIsB);
+    const isTargetTypeANullable = this._analyzer.isNullAssignableToType(targetTypeA);
+    targetTypeA = this._analyzer.excludeNullFromType(targetTypeA);
+    const isTypeWhenTargetTypeIsANullable = this._analyzer.isNullAssignableToType(typeWhenTargetTypeIsA);
+    typeWhenTargetTypeIsA = this._analyzer.excludeNullFromType(typeWhenTargetTypeIsA);
+    const isTargetTypeBNullable = this._analyzer.isNullAssignableToType(targetTypeB);
+    targetTypeB = this._analyzer.excludeNullFromType(targetTypeB);
+    const isTypeWhenTargetTypeIsBNullable = this._analyzer.isNullAssignableToType(typeWhenTargetTypeIsB);
+    typeWhenTargetTypeIsB = this._analyzer.excludeNullFromType(typeWhenTargetTypeIsB);
     let result;
     if (typeWhenTargetTypeIsA.equals(targetTypeA) && !typeWhenTargetTypeIsB.equals(targetTypeB)) {
       result = 1 /* TypeAIsBetter */;
@@ -35235,8 +35267,8 @@ var OverloadResolver = class {
   }
   getDistanceBetweenTypesInHierarchy(baseType, derivedType) {
     let result;
-    baseType = this._analyzer.excludeNoneFromType(baseType);
-    derivedType = this._analyzer.excludeNoneFromType(derivedType);
+    baseType = this._analyzer.excludeNullFromType(baseType);
+    derivedType = this._analyzer.excludeNullFromType(derivedType);
     if (baseType.kind === "structured" && derivedType.kind === "structured") {
       if (derivedType.equals(baseType)) {
         result = 0;
@@ -35338,7 +35370,7 @@ var Resolver2 = class {
         this._analyzer.createNodeDiagnostic(230 /* CannotDetermineTargetTypeToCallTheConstructor */, this._node)
       ]);
     }
-    targetType = this._analyzer.excludeNoneFromType(targetType);
+    targetType = this._analyzer.excludeNullFromType(targetType);
     if (targetType.kind === "unresolved") {
       return new Meaning_unresolved([
         this._analyzer.createNodeDiagnostic(214 /* CannotCreateInstanceOfUnresolvedType */, this._node)
@@ -35641,7 +35673,7 @@ var Resolver4 = class {
       }
     }
     {
-      let type2 = this._analyzer.excludeNoneFromType(this._analyzer.type.ofExpression(this.callee));
+      let type2 = this._analyzer.excludeNullFromType(this._analyzer.type.ofExpression(this.callee));
       type2 = unaliasType(type2);
       if (type2.kind === "function") {
         return new Meaning_objectFunctionCall(type2);
@@ -35726,17 +35758,17 @@ var Resolver4 = class {
   getTypeFromMeaning(meaning) {
     switch (meaning.kind) {
       case "function-call":
-        return this._analyzer.includeNoneToTypeIfExpressionValidOutermostOptionalChaining(
+        return this._analyzer.includeNullToTypeIfExpressionValidOutermostOptionalChaining(
           meaning.func.getReturnType(),
           this._node
         );
       case "operator-call":
-        return this._analyzer.includeNoneToTypeIfExpressionValidOutermostOptionalChaining(
+        return this._analyzer.includeNullToTypeIfExpressionValidOutermostOptionalChaining(
           meaning.operator.getReturnType(),
           this._node
         );
       case "object-function-call":
-        return this._analyzer.includeNoneToTypeIfExpressionValidOutermostOptionalChaining(
+        return this._analyzer.includeNullToTypeIfExpressionValidOutermostOptionalChaining(
           meaning.type.getReturnType(),
           this._node
         );
@@ -35919,7 +35951,7 @@ var Resolver5 = class {
   }
   resolve() {
     let receiverType = this._analyzer.type.ofExpression(this._node.expression);
-    receiverType = this._analyzer.excludeNoneFromType(receiverType);
+    receiverType = this._analyzer.excludeNullFromType(receiverType);
     if (receiverType.kind === "unresolved") {
       return new Meaning_unresolved4(void 0);
     }
@@ -36644,7 +36676,7 @@ var Resolver8 = class {
   }
   resolve() {
     let receiverType = this._analyzer.type.ofExpression(this._node.expression);
-    receiverType = this._analyzer.excludeNoneFromType(receiverType);
+    receiverType = this._analyzer.excludeNullFromType(receiverType);
     if (receiverType.kind === "unresolved") {
       return new ResolutionResult2(new Meaning_unresolved6());
     }
@@ -37046,7 +37078,7 @@ var Resolver9 = class {
     return new AccessedFunction_typeMember(method);
   }
   resolveInstanceMemberAccessMeaning(type) {
-    type = this._analyzer.excludeNoneFromType(type);
+    type = this._analyzer.excludeNullFromType(type);
     if (type.kind === "unresolved") {
       return new ResolutionResult3(new Meaning_unresolved7());
     }
@@ -39085,7 +39117,7 @@ var PackageAndStaticVariablesInitializationValidator = class {
   getVariablesThatNeedToBeInitializedInConstructor(packageEntity) {
     const result = new Array();
     for (const member of packageEntity.getMembers().getNamedMembers()) {
-      if (member.kind === 0 /* Variable */ && !member.isConstant() && !isComputedVariableEntity(member) && !this._analyzer.isNoneAssignableToType(member.getType())) {
+      if (member.kind === 0 /* Variable */ && !member.isConstant() && !isComputedVariableEntity(member) && !this._analyzer.isNullAssignableToType(member.getType())) {
         const definition = member.getDefinition();
         let variableEntity;
         if (definition.kind === 0 /* Source */) {
@@ -39097,7 +39129,7 @@ var PackageAndStaticVariablesInitializationValidator = class {
             variableEntity = member;
           }
         }
-        if (variableEntity !== void 0 && !variableEntity.isConstant() && !this._analyzer.isNoneAssignableToType(variableEntity.getType())) {
+        if (variableEntity !== void 0 && !variableEntity.isConstant() && !this._analyzer.isNullAssignableToType(variableEntity.getType())) {
           result.push(variableEntity);
         }
       } else if (member.kind === 2 /* Type */) {
@@ -39108,7 +39140,7 @@ var PackageAndStaticVariablesInitializationValidator = class {
   }
   collectStaticFieldsThatNeedToBeInitializedInConstructor(typeEntity, result) {
     for (const member of typeEntity.getMembers().getNamedMembers()) {
-      if (member.kind === 0 /* Variable */ && member.isStatic() && !member.isConstant() && !isComputedVariableEntity(member) && !this._analyzer.isNoneAssignableToType(member.getType())) {
+      if (member.kind === 0 /* Variable */ && member.isStatic() && !member.isConstant() && !isComputedVariableEntity(member) && !this._analyzer.isNullAssignableToType(member.getType())) {
         const definition = member.getDefinition();
         if (definition.kind === 0 /* Source */) {
           if (definition.value.kind === "single" && definition.value.node.kind === 52 /* FieldDeclaration */ && definition.value.node.initializer === void 0) {
@@ -40082,9 +40114,9 @@ var TypeNarrower = class {
         const right = unwrapParenthesizedExpressions(node.syntaxNode.right);
         const operator = node.syntaxNode.operator;
         if (operator.kind === 0 /* Token */ && (operator.tokenKind === 30 /* EqualsEquals */ || operator.tokenKind === 33 /* ExclamationEquals */)) {
-          if (this.isSameReferenceAsNarrowedExpression(left) && NodeTypeUtils.isNoneLiteral(right) || this.isSameReferenceAsNarrowedExpression(right) && NodeTypeUtils.isNoneLiteral(left)) {
+          if (this.isSameReferenceAsNarrowedExpression(left) && NodeTypeUtils.isNullLiteral(right) || this.isSameReferenceAsNarrowedExpression(right) && NodeTypeUtils.isNullLiteral(left)) {
             const isEqual = node.isTrue ? operator.tokenKind === 30 /* EqualsEquals */ : !(operator.tokenKind === 30 /* EqualsEquals */);
-            return this.getTypeAtComparisonWithNone(typeAtPredecessor, isEqual);
+            return this.getTypeAtComparisonWithNull(typeAtPredecessor, isEqual);
           }
         }
         return typeAtPredecessor;
@@ -40143,18 +40175,18 @@ var TypeNarrower = class {
     if (this._initialType.kind === "union" && rightType.kind !== "union") {
       const constituentTypes = this._initialType.originalTypes.filter((t) => this._analyzer.isTypeAssignableTo(rightType, t));
       result = this._analyzer.typeFactory.getUnionType(constituentTypes);
-    } else if (!this._analyzer.isNoneAssignableToType(rightType)) {
-      result = this._analyzer.excludeNoneFromType(this._initialType);
+    } else if (!this._analyzer.isNullAssignableToType(rightType)) {
+      result = this._analyzer.excludeNullFromType(this._initialType);
     } else {
       result = this._initialType;
     }
     return result;
   }
-  getTypeAtComparisonWithNone(type, isEqual) {
+  getTypeAtComparisonWithNull(type, isEqual) {
     if (isEqual) {
-      return this._analyzer.includeNoneToType(type, this.locale);
+      return this._analyzer.includeNullToType(type, this.locale);
     } else {
-      return this._analyzer.excludeNoneFromType(type);
+      return this._analyzer.excludeNullFromType(type);
     }
   }
   getTypeAtIsExpression(typeAtPredecessor, node, isTrue) {
@@ -40173,8 +40205,8 @@ var TypeNarrower = class {
     if ((typeAssignabilityFlags & 16 /* ImplicitConversion */) !== 0) {
       return this.getTypeAtAssignmentWithImplicitConversion(rightType);
     }
-    if (rightType.equals(this._analyzer.originalStandardTypes.none)) {
-      return isDeclaration ? this._initialType : this._analyzer.includeNoneToType(this.getTypeAtControlFlowNode(predecessor), this.locale);
+    if (rightType.equals(this._analyzer.originalStandardTypes.nullType)) {
+      return isDeclaration ? this._initialType : this._analyzer.includeNullToType(this.getTypeAtControlFlowNode(predecessor), this.locale);
     }
     return rightType;
   }
@@ -40279,7 +40311,7 @@ var UserDefinableBinaryOperatorResolver = class {
     const semanticContext = this._analyzer.semanticContext.containing(this._left);
     const hidingMatcher = semanticContext.getHidingMatcher();
     const typeExtensionLookup = semanticContext;
-    const nonNullableLeftType = this._analyzer.excludeNoneFromType(this.leftType);
+    const nonNullableLeftType = this._analyzer.excludeNullFromType(this.leftType);
     const leftTypeMemberLookup = TypeMemberLookup.ofType(
       this._analyzer,
       nonNullableLeftType,
@@ -40409,7 +40441,7 @@ var UserDefinableUnaryOperatorResolver = class {
     const operandType = this._analyzer.type.ofExpression(this._node.operand);
     const semanticContext = this._analyzer.semanticContext.containing(this._node.operand);
     const hidingMatcher = semanticContext.getHidingMatcher();
-    const nonNullableOperandType = this._analyzer.excludeNoneFromType(operandType);
+    const nonNullableOperandType = this._analyzer.excludeNullFromType(operandType);
     const typeMemberLookup = TypeMemberLookup.ofType(
       this._analyzer,
       nonNullableOperandType,
@@ -41883,8 +41915,8 @@ var SemanticContextBuilder = class {
             }
           }
           break;
-        case 140 /* TextTranslation */:
-          if (cursor.sourceText.kind === 141 /* TranslationTextTemplate */) {
+        case 140 /* TextTranslationDeclaration */:
+          if (cursor.sourceText.kind === 141 /* TextTemplateDeclaration */) {
             return this.ofTranslationTextTemplate(cursor.sourceText);
           }
           break;
@@ -42953,7 +42985,7 @@ var Analyzer12 = class {
     this.typeUtils = new TypeUtils(this);
     this.conflictsCheck = new ConflictsCheck(this);
     const systemPackageName = PackageName3.parse("\u0410\u0440\u0442\u0435\u043B\u044C");
-    const systemPackage = this.getPackageEntityByName(systemPackageName);
+    const systemPackage = this.getOriginalPackageEntityByName(systemPackageName);
     if (systemPackage === void 0) {
       throw new WellKnownDeclarationsLoadError(new Diagnostic(DiagnosticData.withCode(
         405 /* StandardPackage0NotFound */,
@@ -43014,9 +43046,8 @@ var Analyzer12 = class {
             );
             result = new WithDiagnostics_error(diagnostic);
           } else {
-            const returnType = member.getReturnType();
-            const elementType = this.ifTypeEnumeratorThenItemType(returnType);
-            if (elementType !== void 0) {
+            const elementType = this.ifTypeEnumeratorThenItemType(member.getReturnType());
+            if (member.getValueParameters().length === 0 && elementType !== void 0) {
               result = new WithDiagnostics_ok(new ExpressionCanBeUsedInForLoopCheckResult(elementType, member));
             } else {
               const diagnosticArgumentFactory = semanticContext.getDiagnosticArgumentFactory();
@@ -43034,6 +43065,23 @@ var Analyzer12 = class {
     }
     return result;
   }
+  isEnumeratorMethodSignature(entity) {
+    const name = LocalizationHelper.localizeHelperPhrase(
+      8 /* EnumeratorMethodName */,
+      entity.getLocalization().locale
+    );
+    if (!entity.getName().considerEqual(new Name(name))) {
+      return false;
+    }
+    if (entity.getValueParameters().length !== 0) {
+      return false;
+    }
+    const elementType = this.ifTypeEnumeratorThenItemType(entity.getReturnType());
+    if (elementType === void 0) {
+      return false;
+    }
+    return true;
+  }
   ifTypeEnumerableThenItemType(type) {
     let result = void 0;
     const enumerableEntity = this.originalWellKnownDeclarations.enumerable;
@@ -43363,7 +43411,7 @@ var Analyzer12 = class {
       case 78 /* DereferenceExpression */: {
         if (node.expression.kind === 62 /* AssumptionExpression */) {
           const type = this.type.ofExpression(node.expression.expression);
-          if (this.canTypeBeNone(type)) {
+          if (this.canTypeBeNull(type)) {
             return true;
           } else {
             return this.isExpressionValidOptionalChaining(node.expression.expression);
@@ -43416,10 +43464,10 @@ var Analyzer12 = class {
     }
     return result;
   }
-  includeNoneToTypeIfExpressionValidOutermostOptionalChaining(type, node) {
+  includeNullToTypeIfExpressionValidOutermostOptionalChaining(type, node) {
     let result = type;
     if (this.isExpressionValidOutermostOptionalChaining(node)) {
-      result = this.includeNoneToType(type, TreeQuery.fromNode(node).locale(this));
+      result = this.includeNullToType(type, TreeQuery.fromNode(node).locale(this));
     }
     return result;
   }
@@ -43770,38 +43818,38 @@ var Analyzer12 = class {
   }
   /**
    * Преобразует тип таким образом, чтобы он не мог содержать значение `пусто`.
-   * После преобразования метод `canTypeBeNone` вернёт `true` для полученного типа.
+   * После преобразования метод `canTypeBeNull` вернёт `true` для полученного типа.
    * @example
    * - Число         -> Число
    * - Число | Пусто -> Число
-   * - Т: Объект?    -> Т: Объект? (с флагом isNoneExcluded === true)
+   * - Т: Объект?    -> Т: Объект? (с флагом isNullExcluded === true)
    * - Т: Объект     -> Т: Объект (без изменения)
    */
-  excludeNoneFromType(type) {
-    if (!this.canTypeBeNone(type)) {
+  excludeNullFromType(type) {
+    if (!this.canTypeBeNull(type)) {
       return type;
     }
     type = unaliasType(type);
     if (type.kind === "union") {
-      const typesWithoutNone = new Array();
+      const typesWithoutNull = new Array();
       for (const composingType of type.originalTypes) {
-        const typeWithoutNone = this.excludeNoneFromType(composingType);
-        if (!typeWithoutNone.equals(this.originalStandardTypes.none)) {
-          typesWithoutNone.push(typeWithoutNone);
+        const typeWithoutNull = this.excludeNullFromType(composingType);
+        if (!typeWithoutNull.equals(this.originalStandardTypes.nullType)) {
+          typesWithoutNull.push(typeWithoutNull);
         }
       }
-      if (typesWithoutNone.length === 0) {
+      if (typesWithoutNull.length === 0) {
         return type;
-      } else if (typesWithoutNone.length === 1) {
-        return typesWithoutNone[0];
+      } else if (typesWithoutNull.length === 1) {
+        return typesWithoutNull[0];
       } else {
-        return this.typeFactory.getUnionType(typesWithoutNone);
+        return this.typeFactory.getUnionType(typesWithoutNull);
       }
     }
-    if (type.kind === "parameter" && this.canTypeParameterBeNone(type)) {
+    if (type.kind === "parameter" && this.canTypeParameterBeNull(type)) {
       return this.typeFactory.getParameterType(type.getEntity(), true);
     }
-    if (type.equals(this.originalStandardTypes.none)) {
+    if (type.equals(this.originalStandardTypes.nullType)) {
       return type;
     }
     return type;
@@ -43814,21 +43862,21 @@ var Analyzer12 = class {
    * - Т: Объект?    -> да
    * - Т: Объект     -> нет
    */
-  canTypeBeNone(type) {
+  canTypeBeNull(type) {
     type = unaliasType(type);
     if (type.kind === "union") {
-      return type.unaliasedFlattenedTypes.some((t) => t.equals(this.originalStandardTypes.none) || t.kind === "parameter" && this.canTypeParameterBeNone(t));
+      return type.unaliasedFlattenedTypes.some((t) => t.equals(this.originalStandardTypes.nullType) || t.kind === "parameter" && this.canTypeParameterBeNull(t));
     }
     if (type.kind === "parameter") {
-      return this.canTypeParameterBeNone(type);
+      return this.canTypeParameterBeNull(type);
     }
-    if (type.equals(this.originalStandardTypes.none)) {
+    if (type.equals(this.originalStandardTypes.nullType)) {
       return true;
     }
     return false;
   }
-  canTypeParameterBeNone(type) {
-    return type.constraint === void 0 || this.canTypeBeNone(type.constraint);
+  canTypeParameterBeNull(type) {
+    return type.constraint === void 0 || this.canTypeBeNull(type.constraint);
   }
   /**
    * Делает тип `Пусто` совместимым с данным типом.
@@ -43838,22 +43886,22 @@ var Analyzer12 = class {
    * @example
    * - Число         -> Число | Пусто
    * - Число | Пусто -> Число | Пусто
-   * - Т: Объект?    -> (Т: Объект?) | Пусто (см. метод isNoneAssignableToType)
+   * - Т: Объект?    -> (Т: Объект?) | Пусто (см. метод isNullAssignableToType)
    * - Т: Объект     -> (Т: Объект) | Пусто
    */
-  includeNoneToType(type, locale) {
-    if (this.isNoneAssignableToType(type)) {
+  includeNullToType(type, locale) {
+    if (this.isNullAssignableToType(type)) {
       return type;
     }
-    const noneType = this.getLocalizedStandardTypes(locale).none;
-    let typesWithNone;
+    const nullType = this.getLocalizedStandardTypes(locale).nullType;
+    let typesWithNull;
     if (type.kind === "union") {
-      typesWithNone = Array.from(type.originalTypes);
-      typesWithNone.push(noneType);
+      typesWithNull = Array.from(type.originalTypes);
+      typesWithNull.push(nullType);
     } else {
-      typesWithNone = [type, noneType];
+      typesWithNull = [type, nullType];
     }
-    return this.typeFactory.getUnionType(typesWithNone);
+    return this.typeFactory.getUnionType(typesWithNull);
   }
   /**
    * Отвечает на вопрос "Совместим ли тип `Пусто` с данным типом?" (Можно ли присвоить `пусто` в переменную с данным типом?).
@@ -43862,12 +43910,12 @@ var Analyzer12 = class {
    * - Число | Пусто -> да
    * - Т: Объект?    -> нет, поскольку в качестве конкретного типа, заменяющего параметр, может быть использован тип, исключающий `пусто`.
    */
-  isNoneAssignableToType(type) {
+  isNullAssignableToType(type) {
     type = unaliasType(type);
     if (type.kind === "union") {
-      return type.unaliasedFlattenedTypes.find((t) => t.equals(this.originalStandardTypes.none)) !== void 0;
+      return type.unaliasedFlattenedTypes.find((t) => t.equals(this.originalStandardTypes.nullType)) !== void 0;
     }
-    if (type.equals(this.originalStandardTypes.none)) {
+    if (type.equals(this.originalStandardTypes.nullType)) {
       return true;
     }
     return false;
@@ -43885,11 +43933,11 @@ var Analyzer12 = class {
     }
   }
   isValueParameterVariadic(entity) {
-    const type = this.excludeNoneFromType(entity.getType());
+    const type = this.excludeNullFromType(entity.getType());
     return type.kind === "alias" && type.getEntity().getOriginalEntity() === this.originalWellKnownDeclarations.parameterArray;
   }
   getDefaultTypeParameterConstraint(locale) {
-    return this.includeNoneToType(this.getLocalizedStandardTypes(locale).refObject, locale);
+    return this.includeNullToType(this.getLocalizedStandardTypes(locale).refObject, locale);
   }
   getSignatureTypeOfFunctionEntity(entity) {
     let result = this._functionEntitySignatureTypes.get(entity);
@@ -44573,7 +44621,7 @@ var Analyzer12 = class {
     }
     const functionContext = this.semanticContext.ofFunctionBlock(node);
     const returnType = functionContext.getContainingSubprogram()?.getReturnType();
-    if (returnType === void 0 || returnType.equals(this.originalStandardTypes.none)) {
+    if (returnType === void 0 || returnType.equals(this.originalStandardTypes.nullType)) {
       if (node.expressionOrStatementList.kind === 68 /* CallExpression */) {
         return false;
       }
@@ -44804,7 +44852,7 @@ var WellKnownDeclarationsLoader = class {
       textTemplate: this.findPackageType(systemPackage, new Name("\u0428\u0430\u0431\u043B\u043E\u043D\u0422\u0435\u043A\u0441\u0442\u0430"), 0, 1 /* Structured */),
       char: this.findPackageType(systemPackage, new Name("\u0421\u0438\u043C\u0432\u043E\u043B"), 0, 1 /* Structured */),
       yesNo: this.findPackageType(systemPackage, new Name("\u0414\u0430\u041D\u0435\u0442"), 0, 1 /* Structured */),
-      none: this.findPackageType(systemPackage, new Name("\u041F\u0443\u0441\u0442\u043E"), 0, 1 /* Structured */),
+      nullEntity: this.findPackageType(systemPackage, new Name("\u041F\u0443\u0441\u0442\u043E"), 0, 1 /* Structured */),
       enumerable,
       enumerator: this.findPackageType(systemPackage, new Name("\u041F\u0435\u0440\u0435\u0431\u043E\u0440"), 1, 1 /* Structured */),
       enumeratorMethod: this.findMethodDeclaration(enumerable, new Name("\u043F\u0435\u0440\u0435\u0431\u043E\u0440")),
@@ -45061,11 +45109,11 @@ var Type = class {
   }
   ofAssertionExpression(node) {
     const type = this.ofExpression(node.expression);
-    return this._analyzer.excludeNoneFromType(type);
+    return this._analyzer.excludeNullFromType(type);
   }
   ofAssumptionExpression(node) {
     const type = this.ofExpression(node.expression);
-    return this._analyzer.excludeNoneFromType(type);
+    return this._analyzer.excludeNullFromType(type);
   }
   ofAsExpression(node) {
     return this._analyzer.type.ofTypeSpecifier(node.typeSpecifier);
@@ -45084,7 +45132,7 @@ var Type = class {
         return this._analyzer.originalStandardTypes.unresolved;
       }
       case "question-question": {
-        const leftType = this._analyzer.excludeNoneFromType(this.ofExpression(node.left, targetTypeHint));
+        const leftType = this._analyzer.excludeNullFromType(this.ofExpression(node.left, targetTypeHint));
         const rightType = this.ofExpression(node.right, targetTypeHint);
         return this._analyzer.typeFactory.getUnionType([leftType, rightType], true);
       }
@@ -45114,7 +45162,7 @@ var Type = class {
     switch (meaning.kind) {
       case "resolved":
         if (meaning.singleSuitableIndexer !== void 0) {
-          return this._analyzer.includeNoneToTypeIfExpressionValidOutermostOptionalChaining(
+          return this._analyzer.includeNullToTypeIfExpressionValidOutermostOptionalChaining(
             meaning.singleSuitableIndexer.getType(),
             node
           );
@@ -45162,7 +45210,7 @@ var Type = class {
         return result;
       }
       case "instance-field-access": {
-        const declaredType = this._analyzer.includeNoneToTypeIfExpressionValidOutermostOptionalChaining(
+        const declaredType = this._analyzer.includeNullToTypeIfExpressionValidOutermostOptionalChaining(
           meaning.field.getType(),
           node
         );
@@ -45181,7 +45229,7 @@ var Type = class {
         return this._analyzer.originalStandardTypes.unresolved;
       case "instance-method-access":
         if (meaning.singleSuitableFunction !== void 0) {
-          return this._analyzer.includeNoneToTypeIfExpressionValidOutermostOptionalChaining(
+          return this._analyzer.includeNullToTypeIfExpressionValidOutermostOptionalChaining(
             this.ofAccessedFunction(meaning.singleSuitableFunction),
             node
           );
@@ -45232,7 +45280,7 @@ var Type = class {
     if (meaning.kind === "unresolved") {
       return this._analyzer.originalStandardTypes.unresolved;
     }
-    return this._analyzer.includeNoneToTypeIfExpressionValidOutermostOptionalChaining(meaning.operator.getType(), node);
+    return this._analyzer.includeNullToTypeIfExpressionValidOutermostOptionalChaining(meaning.operator.getType(), node);
   }
   ofConditionalExpression(node, targetTypeHint) {
     const firstExpressionType = this.ofExpression(node.firstExpression, targetTypeHint);
@@ -45240,7 +45288,7 @@ var Type = class {
     if (node.secondExpression !== void 0) {
       secondExpressionType = this.ofExpression(node.secondExpression, targetTypeHint);
     } else {
-      secondExpressionType = this._analyzer.getLocalizedStandardTypes(TreeQuery.fromNode(node).locale(this._analyzer)).none;
+      secondExpressionType = this._analyzer.getLocalizedStandardTypes(TreeQuery.fromNode(node).locale(this._analyzer)).nullType;
     }
     return this._analyzer.typeFactory.getUnionType([firstExpressionType, secondExpressionType], true);
   }
@@ -45329,8 +45377,8 @@ var Type = class {
       case 52 /* Yes */:
       case 53 /* No */:
         return standardTypes.yesNo;
-      case 57 /* None */:
-        return standardTypes.none;
+      case 57 /* Null */:
+        return standardTypes.nullType;
       default:
         Debug.never(node.keyword);
     }
@@ -45402,7 +45450,7 @@ var Type = class {
     return this.ofTypeSpecifier(node.typeSpecifier);
   }
   ofNullableTypeSpecifier(node) {
-    return this._analyzer.includeNoneToType(
+    return this._analyzer.includeNullToType(
       this.ofTypeSpecifier(node.typeSpecifier),
       TreeQuery.fromNode(node).locale(this._analyzer)
     );
@@ -45432,7 +45480,7 @@ var Type = class {
     const containingPackage = TreeQuery.fromNode(node).packageEntity(this._analyzer);
     const entity = new UnfinishedIntrinsicAnonymousFunctionTypeEntity(
       this._analyzer,
-      this._analyzer.getLocalizedStandardTypes(TreeQuery.fromNode(node).locale(this._analyzer)).none,
+      this._analyzer.getLocalizedStandardTypes(TreeQuery.fromNode(node).locale(this._analyzer)).nullType,
       false,
       1 /* SubstituteOwnSubstitutionsAndMerge */,
       containingPackage,
@@ -45507,7 +45555,7 @@ var Type = class {
     if (node.returnTypeAnnotation !== void 0) {
       returnType = this._analyzer.type.ofTypeSpecifier(node.returnTypeAnnotation.typeSpecifier);
     } else {
-      returnType = this._analyzer.getLocalizedStandardTypes(TreeQuery.fromNode(node).locale(this._analyzer)).none;
+      returnType = this._analyzer.getLocalizedStandardTypes(TreeQuery.fromNode(node).locale(this._analyzer)).nullType;
     }
     const containingPackage = TreeQuery.fromNode(node).packageEntity(this._analyzer);
     const unfinishedEntity = new UnfinishedIntrinsicAnonymousFunctionTypeEntity(
@@ -45640,7 +45688,7 @@ var TargetType = class {
         return this.getTargetTypeOfChildOfElseIfClause(node.parent, node);
       case 92 /* FunctionBlock */:
         return this.getTargetTypeOfChildOfFunctionBlock(node.parent, node);
-      case 140 /* TextTranslation */:
+      case 140 /* TextTranslationDeclaration */:
         return this.getTargetTypeOfChildOfTextTemplateLiteralTranslation(node.parent, node);
       default:
         Debug.never(node.parent);
@@ -45689,7 +45737,7 @@ var TargetType = class {
       case "question-question": {
         const targetType = this.ofExpression(parent);
         if (targetType !== void 0 && child === parent.left) {
-          return this._analyzer.includeNoneToType(targetType, TreeQuery.fromNode(child).locale(this._analyzer));
+          return this._analyzer.includeNullToType(targetType, TreeQuery.fromNode(child).locale(this._analyzer));
         }
         return targetType;
       }
@@ -45889,12 +45937,12 @@ var TargetType = class {
           )
         )
       );
-      if (node.sourceText.kind === 141 /* TranslationTextTemplate */) {
+      if (node.sourceText.kind === 141 /* TextTemplateDeclaration */) {
         const templateSpans = node.sourceText.spanList.spans;
         for (let i = 0; i < templateSpans.length; i++) {
           const span = templateSpans[i];
           const parameter = span.parameter;
-          if (parameter.kind === 144 /* TranslationTextTemplateParameterDeclaration */) {
+          if (parameter.kind === 144 /* TextTemplateParameterDeclaration */) {
             const parameterEntity = this._analyzer.entity.ofTranslationTextTemplateParameterDeclaration(parameter);
             const name = parameterEntity.getName();
             const parameterType = parameterEntity.getType();
@@ -46945,7 +46993,7 @@ var OverriddenMember = class {
       case "constructor":
         return member.getConstructedType();
       case "destructor":
-        return this._analyzer.getLocalizedStandardTypes(member.getEntity().getLocalization().locale).none;
+        return this._analyzer.getLocalizedStandardTypes(member.getEntity().getLocalization().locale).nullType;
       default:
         Debug.never(member);
     }
@@ -47552,7 +47600,7 @@ var LinkedMultiPlatformPackage = class {
         if (type2.kind !== "parameter") {
           return false;
         }
-        if (type1.isNoneExcluded !== type2.isNoneExcluded) {
+        if (type1.isNullExcluded !== type2.isNullExcluded) {
           return false;
         }
         const containingEntity1 = type1.getEntity().getContainingEntity();
@@ -47825,7 +47873,7 @@ var TypeAssignabilityCheck = class {
       return 2 /* Identity */;
     }
     if (target.kind === "parameter") {
-      if (source.kind === "parameter" && source.getEntity() === target.getEntity() && (this._analyzer.canTypeParameterBeNone(target) || !this._analyzer.canTypeParameterBeNone(source))) {
+      if (source.kind === "parameter" && source.getEntity() === target.getEntity() && (this._analyzer.canTypeParameterBeNull(target) || !this._analyzer.canTypeParameterBeNull(source))) {
         return 2 /* Identity */;
       } else {
         return 1 /* NotAssignable */;
@@ -47893,10 +47941,10 @@ var TypeAssignabilityCheck = class {
       }
       return result;
     }
-    if (source.equals(this._analyzer.originalStandardTypes.none) || target.equals(this._analyzer.originalStandardTypes.none)) {
+    if (source.equals(this._analyzer.originalStandardTypes.nullType) || target.equals(this._analyzer.originalStandardTypes.nullType)) {
       return source.equals(target) ? 2 /* Identity */ : 1 /* NotAssignable */;
     }
-    if (!this._analyzer.canTypeBeNone(source) && target.equals(this._analyzer.originalStandardTypes.refObject)) {
+    if (!this._analyzer.canTypeBeNull(source) && target.equals(this._analyzer.originalStandardTypes.refObject)) {
       return 4 /* DerivedToBase */;
     }
     if (source.equals(this._analyzer.originalStandardTypes.integer) && target.equals(this._analyzer.originalStandardTypes.number)) {
@@ -48211,7 +48259,7 @@ var TypeUtils = class {
     if (constituentTypes.length === 0) {
       return [];
     }
-    if (this._analyzer.canTypeBeNone(unionType)) {
+    if (this._analyzer.canTypeBeNull(unionType)) {
       return [];
     }
     const result = this.getBaseTypesForCommonTypesSearch(constituentTypes[0]);
@@ -48939,7 +48987,7 @@ var InstanceFieldsInitializationValidator = class {
   getFieldsThatNeedToBeInitializedInConstructor(typeEntity) {
     const result = new Array();
     for (const member of typeEntity.getMembers().getNamedMembers()) {
-      if (member.kind === 0 /* Variable */ && !member.isConstant() && !member.isStatic() && !TypeMemberEntity.isAbstract(member) && !isComputedVariableEntity(member) && !this._analyzer.isNoneAssignableToType(member.getType())) {
+      if (member.kind === 0 /* Variable */ && !member.isConstant() && !member.isStatic() && !TypeMemberEntity.isAbstract(member) && !isComputedVariableEntity(member) && !this._analyzer.isNullAssignableToType(member.getType())) {
         const definition = member.getDefinition();
         if (definition.kind === 0 /* Source */) {
           if (definition.value.kind === "single" && definition.value.node.kind === 52 /* FieldDeclaration */ && definition.value.node.initializer === void 0) {
@@ -49414,8 +49462,8 @@ var DiagnosticCollector = class _DiagnosticCollector {
       case 134 /* PackageImportTranslation */: {
         break;
       }
-      case 140 /* TextTranslation */: {
-        if (node.sourceText.kind === 141 /* TranslationTextTemplate */) {
+      case 140 /* TextTranslationDeclaration */: {
+        if (node.sourceText.kind === 141 /* TextTemplateDeclaration */) {
           const semanticContext = this._analyzer.semanticContext.ofTranslationTextTemplate(node.sourceText);
           semanticContext.validateNameConflicts(this._diagnosticAcceptor);
         }
@@ -49902,8 +49950,8 @@ var DiagnosticCollector = class _DiagnosticCollector {
     switch (meaning.kind) {
       case "resolved": {
         const receiverType = this._analyzer.type.ofExpression(node.expression);
-        if (this._analyzer.canTypeBeNone(receiverType)) {
-          this.addDiagnostic(this._analyzer.createNodeDiagnostic(287 /* ExpressionCanBeNone */, node.expression));
+        if (this._analyzer.canTypeBeNull(receiverType)) {
+          this.addDiagnostic(this._analyzer.createNodeDiagnostic(287 /* ExpressionCanBeNull */, node.expression));
         }
         const entity = meaning.operator.getEntity();
         if (this.isReceiverBaseAutoVariableAccess(node.expression) && TypeMemberEntity.isAbstract(entity)) {
@@ -49934,8 +49982,8 @@ var DiagnosticCollector = class _DiagnosticCollector {
     }
     if (meaning.kind !== "unresolved") {
       const receiverType = this._analyzer.type.ofExpression(node.expression);
-      if (this._analyzer.canTypeBeNone(receiverType)) {
-        this.addDiagnostic(this._analyzer.createNodeDiagnostic(287 /* ExpressionCanBeNone */, node.expression));
+      if (this._analyzer.canTypeBeNull(receiverType)) {
+        this.addDiagnostic(this._analyzer.createNodeDiagnostic(287 /* ExpressionCanBeNull */, node.expression));
       }
       const entity = meaning.singleSuitableIndexer?.getEntity();
       if (entity !== void 0 && this.isReceiverBaseAutoVariableAccess(node.expression) && TypeMemberEntity.isAbstract(entity)) {
@@ -49987,8 +50035,8 @@ var DiagnosticCollector = class _DiagnosticCollector {
     }
     if (meaning.kind === "object-function-call") {
       const calleeType = this._analyzer.type.ofExpression(node.expression);
-      if (this._analyzer.canTypeBeNone(calleeType)) {
-        this.addDiagnostic(this._analyzer.createNodeDiagnostic(287 /* ExpressionCanBeNone */, node.expression));
+      if (this._analyzer.canTypeBeNull(calleeType)) {
+        this.addDiagnostic(this._analyzer.createNodeDiagnostic(287 /* ExpressionCanBeNull */, node.expression));
       }
     }
   }
@@ -50349,7 +50397,7 @@ var DiagnosticCollector = class _DiagnosticCollector {
         256 /* OnlySubprogramsWithReturnTypeCanReturnValue */,
         node.returnKeyword
       ));
-    } else if (returnType !== void 0 && node.expression === void 0 && !returnType.equals(this._analyzer.originalStandardTypes.none)) {
+    } else if (returnType !== void 0 && node.expression === void 0 && !returnType.equals(this._analyzer.originalStandardTypes.nullType)) {
       this.addDiagnostic(this._analyzer.createNodeDiagnostic(
         263 /* SubprogramMustReturnValue */,
         node.returnKeyword
@@ -50676,8 +50724,8 @@ var DiagnosticCollector = class _DiagnosticCollector {
     }
     if (meaning.kind === "instance-field-access" || meaning.kind === "instance-method-access" || meaning.kind === "operator-access") {
       const receiverType = this._analyzer.type.ofExpression(node.expression);
-      if (this._analyzer.canTypeBeNone(receiverType)) {
-        this.addDiagnostic(this._analyzer.createNodeDiagnostic(287 /* ExpressionCanBeNone */, node.expression));
+      if (this._analyzer.canTypeBeNull(receiverType)) {
+        this.addDiagnostic(this._analyzer.createNodeDiagnostic(287 /* ExpressionCanBeNull */, node.expression));
       }
     }
   }
@@ -51052,13 +51100,13 @@ var DiagnosticCollector = class _DiagnosticCollector {
         this.addDiagnostic(this._analyzer.createNodeDiagnostic(
           269 /* Expected0TypeArguments */,
           nodeForDiagnostics,
-          [typeParameterCount.toString()]
+          [typeParameterCount]
         ));
       } else {
         this.addDiagnostic(this._analyzer.createNodeDiagnostic(
           270 /* ExpectedFrom0To1TypeArguments */,
           nodeForDiagnostics,
-          [requiredTypeParameterCount.toString(), typeParameterCount.toString()]
+          [requiredTypeParameterCount, typeParameterCount]
         ));
       }
       return false;
@@ -51129,7 +51177,7 @@ var DiagnosticCollector = class _DiagnosticCollector {
     }
   }
   checkAllCodePathsReturnOrResultVariableIsAssigned(node, nodeForDiagnostic, returnType, resultLocalVariable) {
-    if (node.block === void 0 || node.block.openBraceToken.isMissing && node.block.closeBraceToken.isMissing || node.block.expressionOrStatementList.kind !== 90 /* StatementList */ || returnType.equals(this._analyzer.originalStandardTypes.none)) {
+    if (node.block === void 0 || node.block.openBraceToken.isMissing && node.block.closeBraceToken.isMissing || node.block.expressionOrStatementList.kind !== 90 /* StatementList */ || returnType.equals(this._analyzer.originalStandardTypes.nullType)) {
       return;
     }
     const controlFlowNodeEndingSubprogram = this._analyzer.getControlFlowGraph(this._sourceFile).controlFlowNodesEndingSubprogram.get(node);
@@ -51163,68 +51211,71 @@ var DiagnosticCollector = class _DiagnosticCollector {
       ));
       reportedSomeDiagnostics ||= true;
     }
-    for (const shadowedMember of overriddenAndShadowedMembers.shadowedMembers) {
-      const container = shadowedMember.value.getEntity().getContainer();
-      if (container.kind === "type-extension") {
-        continue;
-      }
-      switch (shadowedMember.shadowReason) {
-        case 0 /* BaseMemberHasDifferentKind */: {
-          this.addDiagnostic(this._analyzer.createNodeDiagnostic(
-            335 /* DeclarationConflictsWithBaseTypeMember0 */,
-            nodeForDiagnostic,
-            [this._diagnosticArgumentFactory.createDisplayableTypeMember(shadowedMember.value)]
-          ));
-          break;
+    const container = entity.getContainer();
+    if (!(container.kind === "type" && container.typeEntity.typeEntityKind === 4 /* Alias */)) {
+      for (const shadowedMember of overriddenAndShadowedMembers.shadowedMembers) {
+        const container2 = shadowedMember.value.getEntity().getContainer();
+        if (container2.kind === "type-extension") {
+          continue;
         }
-        case 1 /* BaseMemberCannotBeOverridden */: {
-          if (entity.isOverride()) {
+        switch (shadowedMember.shadowReason) {
+          case 0 /* BaseMemberHasDifferentKind */: {
             this.addDiagnostic(this._analyzer.createNodeDiagnostic(
-              337 /* DeclarationConflictsWithBaseTypeMember0ThisMemberCannotBeOverridden */,
+              335 /* DeclarationConflictsWithBaseTypeMember0 */,
               nodeForDiagnostic,
               [this._diagnosticArgumentFactory.createDisplayableTypeMember(shadowedMember.value)]
             ));
-          } else {
+            break;
+          }
+          case 1 /* BaseMemberCannotBeOverridden */: {
+            if (entity.isOverride()) {
+              this.addDiagnostic(this._analyzer.createNodeDiagnostic(
+                337 /* DeclarationConflictsWithBaseTypeMember0ThisMemberCannotBeOverridden */,
+                nodeForDiagnostic,
+                [this._diagnosticArgumentFactory.createDisplayableTypeMember(shadowedMember.value)]
+              ));
+            } else {
+              this.addDiagnostic(this._analyzer.createNodeDiagnostic(
+                335 /* DeclarationConflictsWithBaseTypeMember0 */,
+                nodeForDiagnostic,
+                [this._diagnosticArgumentFactory.createDisplayableTypeMember(shadowedMember.value)]
+              ));
+            }
+            break;
+          }
+          case 2 /* NoOverrideModifier */: {
             this.addDiagnostic(this._analyzer.createNodeDiagnostic(
-              335 /* DeclarationConflictsWithBaseTypeMember0 */,
+              336 /* DeclarationConflictsWithBaseTypeMember0AddOverrideModifier */,
               nodeForDiagnostic,
               [this._diagnosticArgumentFactory.createDisplayableTypeMember(shadowedMember.value)]
             ));
+            break;
           }
-          break;
-        }
-        case 2 /* NoOverrideModifier */: {
-          this.addDiagnostic(this._analyzer.createNodeDiagnostic(
-            336 /* DeclarationConflictsWithBaseTypeMember0AddOverrideModifier */,
-            nodeForDiagnostic,
-            [this._diagnosticArgumentFactory.createDisplayableTypeMember(shadowedMember.value)]
-          ));
-          break;
-        }
-        case 4 /* TypeOrReturnTypeMismatch */: {
-          const diagnosticCode = entity.kind === 0 /* Variable */ ? 338 /* DeclarationConflictsWithBaseTypeMember0ToOverrideTypeMustBeAssignableTo1 */ : 339 /* DeclarationConflictsWithBaseTypeMember0ToOverrideReturnTypeMustBeAssignableTo1 */;
-          const type = this._analyzer.overriddenMember.getMemberTypeOrReturnType(shadowedMember.value);
-          this.addDiagnostic(this._analyzer.createNodeDiagnostic(
-            diagnosticCode,
-            nodeForDiagnostic,
-            [
-              this._diagnosticArgumentFactory.createDisplayableTypeMember(shadowedMember.value),
-              this._diagnosticArgumentFactory.createDisplayableType(type)
-            ]
-          ));
-          break;
+          case 4 /* TypeOrReturnTypeMismatch */: {
+            const diagnosticCode = entity.kind === 0 /* Variable */ ? 338 /* DeclarationConflictsWithBaseTypeMember0ToOverrideTypeMustBeAssignableTo1 */ : 339 /* DeclarationConflictsWithBaseTypeMember0ToOverrideReturnTypeMustBeAssignableTo1 */;
+            const type = this._analyzer.overriddenMember.getMemberTypeOrReturnType(shadowedMember.value);
+            this.addDiagnostic(this._analyzer.createNodeDiagnostic(
+              diagnosticCode,
+              nodeForDiagnostic,
+              [
+                this._diagnosticArgumentFactory.createDisplayableTypeMember(shadowedMember.value),
+                this._diagnosticArgumentFactory.createDisplayableType(type)
+              ]
+            ));
+            break;
+          }
+          case 3 /* NoOverrideModifierAndTypeOrReturnTypeMismatch */:
+            this.addDiagnostic(this._analyzer.createNodeDiagnostic(
+              335 /* DeclarationConflictsWithBaseTypeMember0 */,
+              nodeForDiagnostic,
+              [this._diagnosticArgumentFactory.createDisplayableTypeMember(shadowedMember.value)]
+            ));
+            break;
+          default:
+            Debug.never(shadowedMember.shadowReason);
         }
-        case 3 /* NoOverrideModifierAndTypeOrReturnTypeMismatch */:
-          this.addDiagnostic(this._analyzer.createNodeDiagnostic(
-            335 /* DeclarationConflictsWithBaseTypeMember0 */,
-            nodeForDiagnostic,
-            [this._diagnosticArgumentFactory.createDisplayableTypeMember(shadowedMember.value)]
-          ));
-          break;
-        default:
-          Debug.never(shadowedMember.shadowReason);
+        reportedSomeDiagnostics ||= true;
       }
-      reportedSomeDiagnostics ||= true;
     }
     if (!reportedSomeDiagnostics) {
       for (const overriddenMember of overriddenAndShadowedMembers.overriddenMembers) {
@@ -51514,11 +51565,11 @@ var LocalizedWellKnownDeclarations = class {
     }
     return this._yesNo;
   }
-  get none() {
-    if (this._none === void 0) {
-      this._none = this.getLocalizedStructuredType(this._analyzer.originalWellKnownDeclarations.none);
+  get nullEntity() {
+    if (this._null === void 0) {
+      this._null = this.getLocalizedStructuredType(this._analyzer.originalWellKnownDeclarations.nullEntity);
     }
-    return this._none;
+    return this._null;
   }
   get enumerable() {
     if (this._enumerable === void 0) {
@@ -51919,7 +51970,7 @@ var DefaultConstructorEntity = class {
       const orderedParametersForBaseConstructor = this.createOrderedParametersForBaseConstructor();
       const parametersForOwnFieldsInitialization = this._variablesToInitialize.length > 0 ? [] : void 0;
       const parametersForOwnVariables = this._variablesToInitialize.map((v) => {
-        const isOptionalParameter = v.hasInitializer || this._analyzer.isNoneAssignableToType(v.entity.getType());
+        const isOptionalParameter = v.hasInitializer || this._analyzer.isNullAssignableToType(v.entity.getType());
         const parameter = new IntrinsicParameterVariableEntity(
           v.entity.getName(),
           v.entity.getType(),
@@ -52181,7 +52232,7 @@ var PackageFunctionDeclarationEntity = class {
     );
   }
   getReturnType() {
-    return this._returnType.getOrInsertWith(() => this._node.returnTypeAnnotation !== void 0 ? this._analyzer.type.ofTypeSpecifier(this._node.returnTypeAnnotation.typeSpecifier) : this._analyzer.getLocalizedStandardTypes(this.getLocalization().locale).none);
+    return this._returnType.getOrInsertWith(() => this._node.returnTypeAnnotation !== void 0 ? this._analyzer.type.ofTypeSpecifier(this._node.returnTypeAnnotation.typeSpecifier) : this._analyzer.getLocalizedStandardTypes(this.getLocalization().locale).nullType);
   }
   getDefinition() {
     return { kind: 0 /* Source */, node: this._node };
@@ -52242,7 +52293,7 @@ var MethodDeclarationEntity = class {
     );
   }
   getReturnType() {
-    return this._returnType.getOrInsertWith(() => this._node.returnTypeAnnotation !== void 0 ? this._analyzer.type.ofTypeSpecifier(this._node.returnTypeAnnotation.typeSpecifier) : this._analyzer.getLocalizedStandardTypes(this.getLocalization().locale).none);
+    return this._returnType.getOrInsertWith(() => this._node.returnTypeAnnotation !== void 0 ? this._analyzer.type.ofTypeSpecifier(this._node.returnTypeAnnotation.typeSpecifier) : this._analyzer.getLocalizedStandardTypes(this.getLocalization().locale).nullType);
   }
   getDefinition() {
     return { kind: 0 /* Source */, node: this._node };
@@ -52323,7 +52374,7 @@ var NestedFunctionDeclarationEntity = class {
     );
   }
   getReturnType() {
-    return this._returnType.getOrInsertWith(() => this._node.returnTypeAnnotation !== void 0 ? this._analyzer.type.ofTypeSpecifier(this._node.returnTypeAnnotation.typeSpecifier) : this._analyzer.getLocalizedStandardTypes(this.getLocalization().locale).none);
+    return this._returnType.getOrInsertWith(() => this._node.returnTypeAnnotation !== void 0 ? this._analyzer.type.ofTypeSpecifier(this._node.returnTypeAnnotation.typeSpecifier) : this._analyzer.getLocalizedStandardTypes(this.getLocalization().locale).nullType);
   }
   getDefinition() {
     return { kind: 0 /* Source */, node: this._node };
@@ -52535,7 +52586,7 @@ var PackageFunctionTypeDeclarationEntity = class {
     );
   }
   getReturnType() {
-    return this._returnType.getOrInsertWith(() => this._node.body.returnTypeAnnotation !== void 0 ? this._analyzer.type.ofTypeSpecifier(this._node.body.returnTypeAnnotation.typeSpecifier) : this._analyzer.getLocalizedStandardTypes(this.getLocalization().locale).none);
+    return this._returnType.getOrInsertWith(() => this._node.body.returnTypeAnnotation !== void 0 ? this._analyzer.type.ofTypeSpecifier(this._node.body.returnTypeAnnotation.typeSpecifier) : this._analyzer.getLocalizedStandardTypes(this.getLocalization().locale).nullType);
   }
   getMembers() {
     return this._members.getOrInsertWith(() => {
@@ -52602,7 +52653,7 @@ var AnonymousFunctionTypeDeclarationEntity = class {
     );
   }
   getReturnType() {
-    return this._returnType.getOrInsertWith(() => this._node.body.returnTypeAnnotation !== void 0 ? this._analyzer.type.ofTypeSpecifier(this._node.body.returnTypeAnnotation.typeSpecifier) : this._analyzer.getLocalizedStandardTypes(this.getLocalization().locale).none);
+    return this._returnType.getOrInsertWith(() => this._node.body.returnTypeAnnotation !== void 0 ? this._analyzer.type.ofTypeSpecifier(this._node.body.returnTypeAnnotation.typeSpecifier) : this._analyzer.getLocalizedStandardTypes(this.getLocalization().locale).nullType);
   }
   getMembers() {
     return this._members.getOrInsertWith(() => {
@@ -53227,7 +53278,7 @@ var OperatorDeclarationEntity = class {
     return this._valueParameters.getOrInsertWith(() => this._node.parameterClause.parameterList.parameters.map((p) => this._analyzer.entity.ofParameterDeclaration(p)).toArray());
   }
   getReturnType() {
-    return this._returnType.getOrInsertWith(() => this._node.returnTypeAnnotation !== void 0 ? this._analyzer.type.ofTypeSpecifier(this._node.returnTypeAnnotation.typeSpecifier) : this._analyzer.getLocalizedStandardTypes(this.getLocalization().locale).none);
+    return this._returnType.getOrInsertWith(() => this._node.returnTypeAnnotation !== void 0 ? this._analyzer.type.ofTypeSpecifier(this._node.returnTypeAnnotation.typeSpecifier) : this._analyzer.getLocalizedStandardTypes(this.getLocalization().locale).nullType);
   }
   getDefinition() {
     return { kind: 0 /* Source */, node: this._node };
@@ -54473,21 +54524,21 @@ var FunctionType = class {
 
 // source/types/ParameterType.ts
 var ParameterType = class {
-  constructor(_analyzer, _entity, isNoneExcluded) {
+  constructor(_analyzer, _entity, isNullExcluded) {
     this._analyzer = _analyzer;
     this._entity = _entity;
-    this.isNoneExcluded = isNoneExcluded;
+    this.isNullExcluded = isNullExcluded;
     this.kind = "parameter";
     this._constraint = new Cached();
   }
   /**
-   * Ограничение параметра типа с учётом флага {@link isNoneExcluded}.
+   * Ограничение параметра типа с учётом флага {@link isNullExcluded}.
    */
   get constraint() {
     return this._constraint.getOrInsertWith(() => {
       let result = this._entity.getConstraint().cycleFree;
-      if (result !== void 0 && this.isNoneExcluded) {
-        result = this._analyzer.excludeNoneFromType(result);
+      if (result !== void 0 && this.isNullExcluded) {
+        result = this._analyzer.excludeNullFromType(result);
       }
       return result;
     });
@@ -54505,7 +54556,7 @@ var ParameterType = class {
     return map.get(this._entity.getOriginalEntity()) ?? this;
   }
   equals(other) {
-    return this === other || other.kind === "parameter" && this._entity.getOriginalEntity() === other.getEntity().getOriginalEntity() && this.isNoneExcluded === other.isNoneExcluded;
+    return this === other || other.kind === "parameter" && this._entity.getOriginalEntity() === other.getEntity().getOriginalEntity() && this.isNullExcluded === other.isNullExcluded;
   }
   getBaseObjectTypeOrAliasedType() {
     return void 0;
@@ -54583,12 +54634,12 @@ var StandardTypes = class {
     }
     return this._yesNo;
   }
-  get none() {
-    if (this._none === void 0) {
-      const entity = this._wellKnownDeclarations.none;
-      this._none = this._analyzer.typeFactory.getStructuredType(entity, Substitutions.empty(this._analyzer));
+  get nullType() {
+    if (this._null === void 0) {
+      const entity = this._wellKnownDeclarations.nullEntity;
+      this._null = this._analyzer.typeFactory.getStructuredType(entity, Substitutions.empty(this._analyzer));
     }
-    return this._none;
+    return this._null;
   }
   get measure() {
     if (this._measure === void 0) {
@@ -55660,6 +55711,7 @@ var FunctionEntityDetails = class {
     this.isAbstract = false;
     this.isStatic = false;
     this.originalFunctionEntityKind = 0 /* RegularFunction */;
+    this.isJavaScriptIteratorMethod = false;
   }
 };
 var VariableEntityDetails = class {
@@ -56929,13 +56981,13 @@ var NestedFunctionDeclarationStatement3 = class _NestedFunctionDeclarationStatem
     return new _NestedFunctionDeclarationStatement(this.declaration.clone(), this.sourceLocation);
   }
 };
-var NoneLiteral = class _NoneLiteral {
+var NullLiteral = class _NullLiteral {
   constructor(sourceLocation) {
     this.sourceLocation = sourceLocation;
-    this.kind = 16 /* NoneLiteral */;
+    this.kind = 16 /* NullLiteral */;
   }
   clone() {
-    return new _NoneLiteral(this.sourceLocation);
+    return new _NullLiteral(this.sourceLocation);
   }
 };
 var NumericLiteral = class _NumericLiteral {
@@ -57654,6 +57706,36 @@ var YieldStatement3 = class _YieldStatement {
     return new _YieldStatement(this.expression.clone(), this.sourceLocation);
   }
 };
+var TextTranslationDeclaration3 = class _TextTranslationDeclaration {
+  constructor(key, sourceTextTemplate, translatedText, translationFunction, sourceLocation) {
+    this.key = key;
+    this.sourceTextTemplate = sourceTextTemplate;
+    this.translatedText = translatedText;
+    this.translationFunction = translationFunction;
+    this.sourceLocation = sourceLocation;
+    this.kind = 99 /* TextTranslationDeclaration */;
+  }
+  clone() {
+    return new _TextTranslationDeclaration(
+      this.key,
+      this.sourceTextTemplate?.clone(),
+      this.translatedText,
+      this.translationFunction?.clone(),
+      this.sourceLocation
+    );
+  }
+};
+var TextTemplateDeclaration3 = class _TextTemplateDeclaration {
+  constructor(fragments, parameters, sourceLocation) {
+    this.fragments = fragments;
+    this.parameters = parameters;
+    this.sourceLocation = sourceLocation;
+    this.kind = 100 /* TextTemplateDeclaration */;
+  }
+  clone() {
+    return new _TextTemplateDeclaration(this.fragments, this.parameters, this.sourceLocation);
+  }
+};
 
 // source/emitter/ir/SourceLocation.ts
 var SourceLocation = class {
@@ -57778,8 +57860,8 @@ var TypeUtils2 = class {
         return expression.returnType;
       case 11 /* CharLiteral */:
         return this._ectx.standardTypes.char;
-      case 16 /* NoneLiteral */:
-        return this._ectx.standardTypes.none;
+      case 16 /* NullLiteral */:
+        return this._ectx.standardTypes.nullType;
       case 30 /* IndexedAccessExpression */:
         return this.getTypeOfComputedAccess(expression.access);
       case 31 /* IntegerLiteral */:
@@ -57789,13 +57871,13 @@ var TypeUtils2 = class {
       case 37 /* NumericLiteral */:
         return this._ectx.standardTypes.number;
       case 39 /* FunctionLiteral */:
-        return this._ectx.standardTypes.none;
+        return this._ectx.standardTypes.nullType;
       case 40 /* PrefixUnaryExpression */:
-        return this._ectx.standardTypes.none;
+        return this._ectx.standardTypes.nullType;
       case 41 /* MeasureLiteral */:
-        return this._ectx.standardTypes.none;
+        return this._ectx.standardTypes.nullType;
       case 42 /* ReferenceExpression */:
-        return this._ectx.standardTypes.none;
+        return this._ectx.standardTypes.nullType;
       case 46 /* TextLiteral */:
         return this._ectx.standardTypes.text;
       case 96 /* TextWithEntityName */:
@@ -57807,7 +57889,7 @@ var TypeUtils2 = class {
       case 58 /* ThisExpression */:
         return expression.type;
       case 90 /* BaseExpression */:
-        return this._ectx.standardTypes.none;
+        return this._ectx.standardTypes.nullType;
       case 63 /* ArrayLiteral */:
         return this._ectx.standardTypes.array;
       case 64 /* TypeAccessExpression */:
@@ -57830,7 +57912,7 @@ var TypeUtils2 = class {
         if (expression.expressions.length > 0) {
           return this.ofExpression(expression.expressions[expression.expressions.length - 1]);
         }
-        return this._ectx.standardTypes.none;
+        return this._ectx.standardTypes.nullType;
       case 75 /* BaseConstructorCallExpression */:
         return this._ectx.standardTypes.func;
       case 91 /* OwnConstructorCallExpression */:
@@ -57848,7 +57930,7 @@ var TypeUtils2 = class {
       case 87 /* JsInstanceOfExpression */:
         return this._ectx.standardTypes.yesNo;
       case 88 /* JsIdentifierExpression */:
-        return this._ectx.standardTypes.none;
+        return this._ectx.standardTypes.nullType;
       case 89 /* DereferenceExpression */:
         return this.getTypeOfComputedAccess(expression.access);
       default:
@@ -57873,8 +57955,8 @@ var StandardTypes2 = class {
     this._analyzer = _analyzer;
     this._entityMap = _entityMap;
   }
-  get none() {
-    return this._none ??= this._entityMap.getType(this._analyzer.originalStandardTypes.none);
+  get nullType() {
+    return this._null ??= this._entityMap.getType(this._analyzer.originalStandardTypes.nullType);
   }
   get yesNo() {
     return this._yesNo ??= this._entityMap.getType(this._analyzer.originalStandardTypes.yesNo);
@@ -58011,6 +58093,9 @@ var EntityMap = class _EntityMap {
               result.details.ifBasicAliasTypeMethodThenRealMethod = this.getFunctionEntity(realBasicMethod);
             }
           }
+          if (result.containingPackage.details.isJavaScriptPackage !== void 0 && this._analyzer.isEnumeratorMethodSignature(entity)) {
+            result.details.isJavaScriptIteratorMethod = true;
+          }
         }
       }
     }
@@ -58157,7 +58242,7 @@ var EntityMap = class _EntityMap {
       } else {
         result = new MappedFunctionEntity(entity, 1 /* GetterOrSetter */);
         this._functions.set(entity, result);
-        result.returnType = this.getType(this._analyzer.originalStandardTypes.none);
+        result.returnType = this.getType(this._analyzer.originalStandardTypes.nullType);
         result.containingPackage = this.getContainingPackageAndAccumulateIfMember(entity, result);
         const owningEntity = entity.getOwningEntity();
         switch (owningEntity.kind) {
@@ -58428,12 +58513,19 @@ var EntityMap = class _EntityMap {
         return new UnionOrIntersectionType(type.originalTypes.map((t) => this.getType(t)), false);
       }
       case "unresolved": {
-        return this.getType(this._analyzer.originalStandardTypes.none);
+        return this.getType(this._analyzer.originalStandardTypes.nullType);
       }
       default:
         Debug.never(type);
     }
   }
+  enumerateAllPackageEntities() {
+    const result = new Set(this._packages.values());
+    for (const entity of this._linkedPackages.values()) {
+      result.add(entity);
+    }
+    return result;
+  }
   getPackageEntityInternal(entity, link) {
     entity = entity.getOriginalEntity();
     link &&= this._analyzer.linkedEntity.entityCanBeLinked(entity);
@@ -58957,6 +59049,9 @@ var Transformer = class {
       case 27 /* PackageVariableSetterDeclaration */:
         result = this.config.transformPackageVariableSetterDeclaration?.(declaration);
         break;
+      case 99 /* TextTranslationDeclaration */:
+        result = this.config.transformTextTranslationDeclaration?.(declaration);
+        break;
       default:
         Debug.never(declaration);
     }
@@ -58991,6 +59086,9 @@ var Transformer = class {
         case 27 /* PackageVariableSetterDeclaration */:
           this.transformPackageVariableSetterDeclarationChildren(declaration2);
           break;
+        case 99 /* TextTranslationDeclaration */:
+          this.transformTextTranslationDeclarationChildren(declaration2);
+          break;
         default:
           Debug.never(declaration2);
       }
@@ -59596,8 +59694,8 @@ var Transformer = class {
         case 11 /* CharLiteral */:
           result = this.config.transformCharLiteral?.(transformedExpression);
           break;
-        case 16 /* NoneLiteral */:
-          result = this.config.transformNoneLiteral?.(transformedExpression);
+        case 16 /* NullLiteral */:
+          result = this.config.transformNullLiteral?.(transformedExpression);
           break;
         case 30 /* IndexedAccessExpression */:
           result = this.config.transformIndexedAccessExpression?.(transformedExpression);
@@ -59738,8 +59836,8 @@ var Transformer = class {
         case 11 /* CharLiteral */:
           this.transformCharLiteralChildren(transformedExpression);
           break;
-        case 16 /* NoneLiteral */:
-          this.transformNoneLiteralChildren(transformedExpression);
+        case 16 /* NullLiteral */:
+          this.transformNullLiteralChildren(transformedExpression);
           break;
         case 30 /* IndexedAccessExpression */:
           this.transformIndexedAccessExpressionChildren(transformedExpression);
@@ -59886,7 +59984,7 @@ var Transformer = class {
   }
   transformCharLiteralChildren(_expression) {
   }
-  transformNoneLiteralChildren(_expression) {
+  transformNullLiteralChildren(_expression) {
   }
   transformIndexedAccessExpressionChildren(expression) {
     expression.expression = this.transformExpression(expression.expression);
@@ -60063,6 +60161,14 @@ var Transformer = class {
     }
     return transformedNode;
   }
+  transformTextTranslationDeclarationChildren(declaration) {
+    const saveTransformedDeclaration = this._transformedDeclaration;
+    this._transformedDeclaration = declaration;
+    if (declaration.translationFunction !== void 0) {
+      this.transformFunctionLiteralChildren(declaration.translationFunction);
+    }
+    this._transformedDeclaration = saveTransformedDeclaration;
+  }
   transformStatementsAndAddHoistedLocalVariables(statements) {
     const saveHoistedLocalVariables = this._hoistedLocalVariables;
     this._hoistedLocalVariables = [];
@@ -60216,7 +60322,7 @@ var GeneralLowering = class {
       affectsDeclaration: true,
       affectsDerivedMembers: true
     };
-    MiscLowering.resolveComputedNames(state);
+    MiscLowering.resolveComputedNames(this._ectx, state);
     UsagesLowering.lowerAllPackages(loweringContext, state);
   }
 };
@@ -60433,7 +60539,7 @@ var GeneralLoweringContext = class {
       if (a !== void 0) {
         return a;
       }
-      return new NoneLiteral(void 0);
+      return new NullLiteral(void 0);
     });
     let isLastArgumentSpreading = isArgumentForLastParameterPassed;
     if (isLastArgumentSpreading) {
@@ -60490,7 +60596,7 @@ var GeneralLoweringContext = class {
       false,
       new OrderedArguments([object, keyExpression, descriptorArgument], false),
       false,
-      this.ectx.standardTypes.none,
+      this.ectx.standardTypes.nullType,
       void 0
     );
   }
@@ -60618,7 +60724,7 @@ var GeneralLoweringContext = class {
       const isEmptyExpression = new BinaryExpression3(
         tempVariableAssignment ?? tempVariableAccess,
         5 /* Equals */,
-        new NoneLiteral(void 0),
+        new NullLiteral(void 0),
         this.ectx.standardTypes.yesNo,
         void 0,
         void 0
@@ -60626,7 +60732,7 @@ var GeneralLoweringContext = class {
       const memberAccessType = this.ectx.type.ofExpression(substitutionMemberAccess);
       result = new TernaryExpression(
         isEmptyExpression,
-        new NoneLiteral(void 0),
+        new NullLiteral(void 0),
         substitutionMemberAccess,
         memberAccessType,
         void 0
@@ -60849,7 +60955,7 @@ var ImplicitImplementationLowering = class {
       1 /* GetterOrSetter */,
       targetFieldEntity.name,
       [parameterEntity],
-      this._ctx.ectx.standardTypes.none,
+      this._ctx.ectx.standardTypes.nullType,
       targetFieldEntity.containingPackage
     );
     const variableAccess = FieldAccessExpression.set(
@@ -60879,15 +60985,17 @@ var CompoundDeclarationsAndOperatorsLowering = class {
   lower(state) {
     for (const pkg of state.packages) {
       const memberEntities = new Set(pkg.entity.members);
-      pkg.ir.declarations = pkg.ir.declarations.map((d) => {
+      const declarations = [];
+      pkg.ir.declarations.forEach((d) => {
         if (d.kind === 24 /* PackageTypeDeclaration */) {
           this.lowerPackageTypeDeclaration(d);
-          return d;
+          declarations.push(d);
         } else if (d.kind === 26 /* PackageVariableGetterDeclaration */) {
           memberEntities.delete(d.variableEntity);
           memberEntities.add(d.entity);
           d.entity.functionEntityKind = 0 /* RegularFunction */;
-          return new PackageFunctionDeclaration3(new Modifiers(), [], d.body, d.entity, false, d.sourceLocation);
+          d = new PackageFunctionDeclaration3(new Modifiers(), [], d.body, d.entity, false, d.sourceLocation);
+          declarations.push(d);
         } else if (d.kind === 27 /* PackageVariableSetterDeclaration */) {
           memberEntities.delete(d.variableEntity);
           memberEntities.add(d.entity);
@@ -60898,7 +61006,7 @@ var CompoundDeclarationsAndOperatorsLowering = class {
             false,
             void 0
           )];
-          return new PackageFunctionDeclaration3(
+          d = new PackageFunctionDeclaration3(
             new Modifiers(),
             valueParameters,
             d.body,
@@ -60906,10 +61014,13 @@ var CompoundDeclarationsAndOperatorsLowering = class {
             false,
             d.sourceLocation
           );
+          declarations.push(d);
+        } else if (d.kind === 99 /* TextTranslationDeclaration */) {
         } else {
-          return d;
+          declarations.push(d);
         }
       });
+      pkg.ir.declarations = declarations;
       pkg.entity.members = Array.from(memberEntities);
     }
   }
@@ -61318,7 +61429,7 @@ var AspectsLowering = class {
       1 /* GetterOrSetter */,
       targetVariableEntity.name,
       [parameterEntity],
-      this._ctx.ectx.standardTypes.none,
+      this._ctx.ectx.standardTypes.nullType,
       targetVariableEntity.containingPackage
     );
     const variableAccess = FieldAccessExpression.set(
@@ -61817,7 +61928,7 @@ var AliasTypeAndExtensionMembersAccessLowering = class extends ExecutableCodeLow
       setter,
       receiver,
       args,
-      this._ctx.ectx.standardTypes.none
+      this._ctx.ectx.standardTypes.nullType
     );
     return new ExpressionStatement3(callExpression2, left.sourceLocation);
   }
@@ -61848,7 +61959,7 @@ var AliasTypeAndExtensionMembersAccessLowering = class extends ExecutableCodeLow
       setter,
       receiverTempAssignment ?? receiverTempAccess,
       args,
-      this._ctx.ectx.standardTypes.none
+      this._ctx.ectx.standardTypes.nullType
     );
     const statement = new ExpressionStatement3(callExpression2, left.sourceLocation);
     return { statement, tempVariables };
@@ -62047,7 +62158,7 @@ var OverloadedConstructorsLowering = class {
       const isEmptyCheck = new BinaryExpression3(
         VariableAccessExpression.get(parameter.entity),
         5 /* Equals */,
-        new NoneLiteral(void 0),
+        new NullLiteral(void 0),
         this._ctx.ectx.standardTypes.yesNo,
         void 0,
         void 0
@@ -62243,13 +62354,24 @@ var MiscLowering = class {
       }
     }
   }
-  static resolveComputedNames(state) {
+  static resolveComputedNames(ectx, state) {
+    const sourcePackageEntities = /* @__PURE__ */ new Set();
     for (const pkg of state.packages) {
       for (const packageMember of pkg.entity.members) {
         if (packageMember.kind === "type-or-extension") {
           this.resolveComputedNamesOfTypeMembers(packageMember);
         }
       }
+      sourcePackageEntities.add(pkg.entity);
+    }
+    for (const packageEntity of ectx.entityMap.enumerateAllPackageEntities()) {
+      if (!sourcePackageEntities.has(packageEntity)) {
+        for (const packageMember of packageEntity.members) {
+          if (packageMember.kind === "type-or-extension") {
+            this.resolveComputedNamesOfTypeMembers(packageMember);
+          }
+        }
+      }
     }
   }
   static resolveComputedNamesOfTypeMembers(type) {
@@ -62721,15 +62843,15 @@ var FunctionObjectLowering = class _FunctionObjectLowering extends ExecutableCod
     }
     let resultExpression;
     if (this._ctx.isOptionalChaining(node)) {
-      const noneCheck = new BinaryExpression3(
+      const nullCheck = new BinaryExpression3(
         receiverTempGetAccess,
         5 /* Equals */,
-        new NoneLiteral(void 0),
+        new NullLiteral(void 0),
         this._ctx.ectx.standardTypes.yesNo,
         void 0,
         void 0
       );
-      const firstExpression = new NoneLiteral(void 0);
+      const firstExpression = new NullLiteral(void 0);
       const expressions = new Array();
       if (boundMethodTempAssignment !== void 0) {
         expressions.push(boundMethodTempAssignment);
@@ -62740,7 +62862,7 @@ var FunctionObjectLowering = class _FunctionObjectLowering extends ExecutableCod
       expressions.push(boundMethodTempGetAccess);
       const secondExpression = new CommaExpression(expressions, void 0);
       const ternaryExpression = new TernaryExpression(
-        noneCheck,
+        nullCheck,
         firstExpression,
         secondExpression,
         this._ctx.ectx.type.ofExpression(node),
@@ -62862,6 +62984,9 @@ var UsagesLowering = class _UsagesLowering extends ExecutableCodeLowering {
         return preserveExpression();
       },
       transformMethodAccessExpression: (node) => {
+        if (node.method.entity.details.isJavaScriptIteratorMethod && node.ifComputedThenKey === void 0) {
+          node.ifComputedThenKey = this._ctx.createKeyForComputedNameWithSymbolKey(this._ctx.iteratorSymbolField);
+        }
         const result = this._functionObjectLowering.tryLowerMethodAccessExpression(node);
         if (result !== void 0) {
           return result;
@@ -63556,7 +63681,7 @@ var ProxiedVariableAccessLowering = class extends ExecutableCodeLowering {
       }).toString();
       result = new TextLiteral(locationText, void 0);
     } else {
-      result = new NoneLiteral(void 0);
+      result = new NullLiteral(void 0);
     }
     return result;
   }
@@ -63679,14 +63804,14 @@ var ReferenceExpressionLowering = class extends ExecutableCodeLowering {
       void 0,
       void 0
     );
-    return this.createSingleStatementFunctionLiteral([valueParameter], assignment, this._ctx.ectx.standardTypes.none);
+    return this.createSingleStatementFunctionLiteral([valueParameter], assignment, this._ctx.ectx.standardTypes.nullType);
   }
   createSingleStatementFunctionLiteral(parameters, statement, returnType) {
     const functionBody = new BlockStatement([statement], void 0);
     return new FunctionLiteral3(parameters, functionBody, false, returnType, void 0);
   }
   createReference(reader, writer, sourceLocation) {
-    const args = new OrderedArguments([reader, writer ?? new NoneLiteral(void 0)], false);
+    const args = new OrderedArguments([reader, writer ?? new NullLiteral(void 0)], false);
     const typeAccess = new TypeAccessExpression(this._ctx.referenceType, void 0);
     return new ConstructorCallExpression(
       this._ctx.referenceConstructor,
@@ -63758,7 +63883,7 @@ var VariableInitializersLowering = class {
           0 /* RegularFunction */,
           EmitPhaseName.ofPackageConstructor(pkg.entity.locale),
           [],
-          this._ctx.ectx.standardTypes.none,
+          this._ctx.ectx.standardTypes.nullType,
           pkg.entity
         );
         entity.details.isPackageConstructor = true;
@@ -63861,7 +63986,7 @@ var IsExpressionLowering = class extends ExecutableCodeLowering {
     if (type.equals(this._ctx.ectx.standardTypes.text)) {
       return { expression: this.createTypeOfCheck(expression.expression, "string", expression.sourceLocation) };
     }
-    if (type.equals(this._ctx.ectx.standardTypes.none)) {
+    if (type.equals(this._ctx.ectx.standardTypes.nullType)) {
       return { expression: this.createTypeOfCheck(expression.expression, "undefined", expression.sourceLocation) };
     }
     if (type.equals(this._ctx.ectx.standardTypes.func)) {
@@ -63893,7 +64018,7 @@ var IsExpressionLowering = class extends ExecutableCodeLowering {
     return { expression: new BooleanLiteral(false, void 0) };
   }
   canCheckType(type) {
-    if (type.equals(this._ctx.ectx.standardTypes.integer) || type.equals(this._ctx.ectx.standardTypes.number) || type.equals(this._ctx.ectx.standardTypes.yesNo) || type.equals(this._ctx.ectx.standardTypes.text) || type.equals(this._ctx.ectx.standardTypes.none) || type.equals(this._ctx.ectx.standardTypes.func)) {
+    if (type.equals(this._ctx.ectx.standardTypes.integer) || type.equals(this._ctx.ectx.standardTypes.number) || type.equals(this._ctx.ectx.standardTypes.yesNo) || type.equals(this._ctx.ectx.standardTypes.text) || type.equals(this._ctx.ectx.standardTypes.nullType) || type.equals(this._ctx.ectx.standardTypes.func)) {
       return true;
     }
     type = this._ctx.ectx.unaliasType(type);
@@ -64082,13 +64207,13 @@ var IrBuilder = class {
   }
   build() {
     Debug.assert(this._typesCreatedFromAnonymousTypes.length === 0);
-    const sourceFileMembers = this._analyzer.getSourceFileMembers(this._sourceFile.getSyntaxNode());
-    const declarations = this.buildPackageMemberDeclarationList(
-      this._sourceFile.getSyntaxNode().declarationList,
-      sourceFileMembers
-    );
+    const sourceFileNode = this._sourceFile.getSyntaxNode();
+    const sourceFileMembers = this._analyzer.getSourceFileMembers(sourceFileNode);
+    const declarations = this.buildPackageMemberDeclarationList(sourceFileNode.declarationList, sourceFileMembers);
     declarations.push(...this._typesCreatedFromAnonymousTypes);
     this._typesCreatedFromAnonymousTypes.length = 0;
+    const translations = this.buildTextTranslationDeclarationList(sourceFileNode.declarationList);
+    declarations.push(...translations);
     return declarations;
   }
   buildPackageMemberDeclarationList(declarationList, sourceFileMembers) {
@@ -64096,8 +64221,9 @@ var IrBuilder = class {
     const packageConstructorsAndEntryPoints = new Array();
     for (const declaration of flattenPackageMemberDeclarationList(declarationList)) {
       switch (declaration.kind) {
-        case 122 /* TranslationsDeclaration */:
-          continue;
+        case 122 /* TranslationsDeclaration */: {
+          break;
+        }
         case 20 /* PackageAliasTypeDeclaration */: {
           const irDeclaration = this.buildPackageAliasTypeDeclaration(declaration);
           if (irDeclaration !== void 0) {
@@ -64125,7 +64251,7 @@ var IrBuilder = class {
           break;
         }
         case 26 /* PackageFunctionTypeDeclaration */:
-          continue;
+          break;
         case 31 /* PackageStructuredTypeDeclaration */: {
           const irDeclaration = this.buildPackageStructuredTypeDeclaration(declaration);
           if (irDeclaration !== void 0) {
@@ -64190,7 +64316,7 @@ var IrBuilder = class {
       0 /* RegularFunction */,
       EmitPhaseName.ofPackageConstructor(containingPackage.locale),
       [],
-      this._entityMap.getType(this._analyzer.originalStandardTypes.none),
+      this._entityMap.getType(this._analyzer.originalStandardTypes.nullType),
       containingPackage
     );
     entity.details.isAsync = this._analyzer.checkBlockInvokesAsyncMethods(declaration.block);
@@ -64365,7 +64491,7 @@ var IrBuilder = class {
       0 /* RegularFunction */,
       EmitPhaseName.ofPackageRunFunction(containingPackage.locale),
       [],
-      this._entityMap.getType(this._analyzer.originalStandardTypes.none),
+      this._entityMap.getType(this._analyzer.originalStandardTypes.nullType),
       containingPackage
     );
     entity.details.isAsync = this._analyzer.checkBlockInvokesAsyncMethods(declaration.block);
@@ -64675,7 +64801,7 @@ var IrBuilder = class {
   createDefaultStructuredTypeConstructor(entity, info) {
     const valueParameters = entity.getValueParameters().map((p) => {
       const entity2 = this._entityMap.getVariableEntity(p);
-      const defaultValue = p.subkind === "parameter" && p.isOptional() ? new NoneLiteral(void 0) : void 0;
+      const defaultValue = p.subkind === "parameter" && p.isOptional() ? new NullLiteral(void 0) : void 0;
       return new ValueParameterDeclaration(entity2, defaultValue, false, void 0);
     });
     const statements = [];
@@ -64718,8 +64844,8 @@ var IrBuilder = class {
             const notEmptyCheck = new BinaryExpression3(
               parameterAccess.clone(),
               6 /* NotEquals */,
-              new NoneLiteral(void 0),
-              this._entityMap.getType(this._analyzer.originalStandardTypes.none),
+              new NullLiteral(void 0),
+              this._entityMap.getType(this._analyzer.originalStandardTypes.nullType),
               void 0,
               void 0
             );
@@ -65191,9 +65317,6 @@ var IrBuilder = class {
       case 64 /* BinaryExpression */:
         result = this.buildBinaryExpression(expression);
         break;
-      case 66 /* FunctionBlockLiteral */:
-        result = this.buildFunctionBlockLiteral(expression);
-        break;
       case 68 /* CallExpression */:
         result = this.buildCallExpression(expression);
         break;
@@ -65213,6 +65336,9 @@ var IrBuilder = class {
       case 65 /* FunctionLiteral */:
         result = this.buildFunctionLiteral(expression);
         break;
+      case 66 /* FunctionBlockLiteral */:
+        result = this.buildFunctionBlockLiteral(expression);
+        break;
       case 73 /* ParenthesizedExpression */:
         result = this.buildParenthesizedExpression(expression);
         break;
@@ -65268,7 +65394,7 @@ var IrBuilder = class {
       }
       let targetType = this._analyzer.getTargetTypeOfExpression(expression);
       if (targetType !== void 0) {
-        targetType = unaliasType(this._analyzer.excludeNoneFromType(targetType));
+        targetType = unaliasType(this._analyzer.excludeNullFromType(targetType));
       }
       if (targetType !== void 0) {
         const expressionType = this._analyzer.type.ofExpression(expression);
@@ -65448,22 +65574,6 @@ var IrBuilder = class {
     }
     return new BinaryExpression3(left, operatorKind, right, type, operator, this.getSourceLocation(expression));
   }
-  buildFunctionBlockLiteral(expression) {
-    const valueParameters = this._analyzer.getFunctionBlockLiteralValueParameters(expression).map((p) => new ValueParameterDeclaration(
-      this._entityMap.getVariableEntity(p),
-      void 0,
-      false,
-      void 0
-    ));
-    const body = this.buildFunctionBlockOfFunction(
-      expression.block,
-      this._analyzer.resultLocalVariableEntity.ofFunctionBlockLiteral(expression)
-    );
-    const type = this._analyzer.type.ofFunctionBlockLiteral(expression);
-    const isAsync = type.isAsync();
-    const returnType = this._entityMap.getType(type.getReturnType());
-    return new FunctionLiteral3(valueParameters, body, isAsync, returnType, this.getSourceLocation(expression));
-  }
   buildCallExpression(expression) {
     const meaning = this._analyzer.getCallExpressionMeaning(expression);
     switch (meaning.kind) {
@@ -65682,6 +65792,22 @@ var IrBuilder = class {
     this.buildAndSaveTypeIfIsAnonymousTypeSpecifier(expression.returnTypeAnnotation?.typeSpecifier);
     return new FunctionLiteral3(valueParameters, body, isAsync, returnType, this.getSourceLocation(expression));
   }
+  buildFunctionBlockLiteral(expression) {
+    const valueParameters = this._analyzer.getFunctionBlockLiteralValueParameters(expression).map((p) => new ValueParameterDeclaration(
+      this._entityMap.getVariableEntity(p),
+      void 0,
+      false,
+      void 0
+    ));
+    const body = this.buildFunctionBlockOfFunction(
+      expression.block,
+      this._analyzer.resultLocalVariableEntity.ofFunctionBlockLiteral(expression)
+    );
+    const type = this._analyzer.type.ofFunctionBlockLiteral(expression);
+    const isAsync = type.isAsync();
+    const returnType = this._entityMap.getType(type.getReturnType());
+    return new FunctionLiteral3(valueParameters, body, isAsync, returnType, this.getSourceLocation(expression));
+  }
   buildParenthesizedExpression(expression) {
     return this.buildExpression(expression.expression);
   }
@@ -65878,7 +66004,7 @@ var IrBuilder = class {
         Debug.assertNotNull(originalSetter);
         const setAccessor = new AccessedFunction5(
           this._entityMap.getSetterEntity(originalSetter),
-          this._entityMap.getType(this._analyzer.originalStandardTypes.none)
+          this._entityMap.getType(this._analyzer.originalStandardTypes.nullType)
         );
         return { kind: 1 /* Set */, setAccessor };
       }
@@ -65889,7 +66015,7 @@ var IrBuilder = class {
         Debug.assertNotNull(originalSetter);
         const getAccessor = new AccessedFunction5(
           this._entityMap.getGetterEntity(originalGetter),
-          this._entityMap.getType(this._analyzer.originalStandardTypes.none)
+          this._entityMap.getType(this._analyzer.originalStandardTypes.nullType)
         );
         const setAccessor = new AccessedFunction5(
           this._entityMap.getSetterEntity(originalSetter),
@@ -65917,7 +66043,7 @@ var IrBuilder = class {
         Debug.assertNotNull(originalSetter);
         const setAccessor = new AccessedFunction5(
           this._entityMap.getSetterEntity(originalSetter),
-          this._entityMap.getType(this._analyzer.originalStandardTypes.none)
+          this._entityMap.getType(this._analyzer.originalStandardTypes.nullType)
         );
         return { kind: 1 /* Set */, setAccessor };
       }
@@ -65928,7 +66054,7 @@ var IrBuilder = class {
         Debug.assertNotNull(originalSetter);
         const getAccessor = new AccessedFunction5(
           this._entityMap.getGetterEntity(originalGetter),
-          this._entityMap.getType(this._analyzer.originalStandardTypes.none)
+          this._entityMap.getType(this._analyzer.originalStandardTypes.nullType)
         );
         const setAccessor = new AccessedFunction5(
           this._entityMap.getSetterEntity(originalSetter),
@@ -65950,7 +66076,7 @@ var IrBuilder = class {
     if (expression.secondExpression !== void 0) {
       secondExpression = this.buildExpression(expression.secondExpression);
     } else {
-      secondExpression = new NoneLiteral(void 0);
+      secondExpression = new NullLiteral(void 0);
     }
     const type = this._entityMap.getType(this._analyzer.type.ofExpression(expression));
     return new TernaryExpression(
@@ -65996,8 +66122,8 @@ var IrBuilder = class {
         return new BooleanLiteral(true, this.getSourceLocation(expression));
       case 53 /* No */:
         return new BooleanLiteral(false, this.getSourceLocation(expression));
-      case 57 /* None */:
-        return new NoneLiteral(this.getSourceLocation(expression));
+      case 57 /* Null */:
+        return new NullLiteral(this.getSourceLocation(expression));
       default:
         Debug.never(expression.keyword);
     }
@@ -66327,6 +66453,70 @@ var IrBuilder = class {
   generateLoopLabel() {
     return `lb${this._id++}`;
   }
+  buildTextTranslationDeclarationList(declarationList) {
+    const result = [];
+    for (const group of declarationList.elements) {
+      if (group.kind === 122 /* TranslationsDeclaration */) {
+        for (const element of group.translationList.elements) {
+          if (element.kind === 140 /* TextTranslationDeclaration */) {
+            const declaration = this.buildTextTranslationDeclaration(element);
+            result.push(declaration);
+          }
+        }
+      }
+    }
+    return result;
+  }
+  buildTextTranslationDeclaration(translation) {
+    let sourceText;
+    if (translation.sourceText.kind === 0 /* Token */ && translation.sourceText.tokenKind === 6 /* TextLiteral */) {
+      sourceText = unescapeText(withoutQuotes(translation.sourceText.value));
+    }
+    let translatedText;
+    if (translation.translatedTextOrTranslationFunction.kind === 0 /* Token */ && translation.translatedTextOrTranslationFunction.tokenKind === 6 /* TextLiteral */) {
+      translatedText = unescapeText(withoutQuotes(translation.translatedTextOrTranslationFunction.value));
+    }
+    if (sourceText !== void 0 && translatedText !== void 0) {
+      return new TextTranslationDeclaration3(
+        sourceText,
+        void 0,
+        translatedText,
+        void 0,
+        this.getSourceLocation(translation)
+      );
+    }
+    const textTemplateDeclaration = this.createTextTemplateDeclaration(translation.sourceText);
+    let translationFunction;
+    if (translation.translatedTextOrTranslationFunction.kind === 65 /* FunctionLiteral */) {
+      translationFunction = this.buildFunctionLiteral(translation.translatedTextOrTranslationFunction);
+    } else if (translation.translatedTextOrTranslationFunction.kind === 66 /* FunctionBlockLiteral */) {
+      translationFunction = this.buildFunctionBlockLiteral(translation.translatedTextOrTranslationFunction);
+    } else {
+    }
+    return new TextTranslationDeclaration3(
+      textTemplateDeclaration.fragments.join("_"),
+      textTemplateDeclaration,
+      void 0,
+      translationFunction,
+      this.getSourceLocation(translation)
+    );
+  }
+  createTextTemplateDeclaration(sourceText) {
+    const fragments = [];
+    const parameters = [];
+    if (sourceText.kind === 141 /* TextTemplateDeclaration */) {
+      fragments.push(unescapeText(withoutTemplateQuotes(sourceText.head.value)));
+      sourceText.spanList.spans.forEach((e) => {
+        fragments.push(unescapeText(withoutTemplateQuotes(e.text.value)));
+        const originalEntity = this._analyzer.entity.ofTranslationTextTemplateParameterDeclaration(e.parameter);
+        const entity = this._entityMap.getVariableEntity(originalEntity);
+        parameters.push(entity);
+      });
+    } else {
+      fragments.push(unescapeText(withoutQuotes(sourceText.value)));
+    }
+    return new TextTemplateDeclaration3(fragments, parameters, this.getSourceLocation(sourceText));
+  }
   getSourceLocation(node) {
     const range = node.rangeWithoutTrivia;
     const start = this._sourceFile.getPositionAt(range.start);
@@ -66382,6 +66572,7 @@ var _IrToJs = class _IrToJs {
         return this.convertPackageVariantTypeDeclaration(declaration);
       case 26 /* PackageVariableGetterDeclaration */:
       case 27 /* PackageVariableSetterDeclaration */:
+      case 99 /* TextTranslationDeclaration */:
         throw new EmitterError("Unexpected declaration.", declaration);
       default:
         Debug.never(declaration);
@@ -66715,8 +66906,8 @@ var _IrToJs = class _IrToJs {
         return this.convertCallExpression(expression);
       case 11 /* CharLiteral */:
         return this.convertCharLiteral(expression);
-      case 16 /* NoneLiteral */:
-        return this.convertNoneLiteral(expression);
+      case 16 /* NullLiteral */:
+        return this.convertNullLiteral(expression);
       case 30 /* IndexedAccessExpression */:
         return this.convertIndexedAccessExpression(expression);
       case 31 /* IntegerLiteral */:
@@ -66827,7 +67018,7 @@ var _IrToJs = class _IrToJs {
     this.addNodeLocation(result, expression);
     return result;
   }
-  convertNoneLiteral(expression) {
+  convertNullLiteral(expression) {
     const result = js.identifier("undefined");
     this.addNodeLocation(result, expression);
     return result;
@@ -67561,7 +67752,7 @@ __decorateClass([
 ], _IrToJs.prototype, "convertCharLiteral", 1);
 __decorateClass([
   debugStack()
-], _IrToJs.prototype, "convertNoneLiteral", 1);
+], _IrToJs.prototype, "convertNullLiteral", 1);
 __decorateClass([
   debugStack()
 ], _IrToJs.prototype, "convertIndexedAccessExpression", 1);
@@ -67833,7 +68024,13 @@ var Emitter = class _Emitter {
     }).flatMap((d) => d);
     const irPackage = new Package([], declarationsOfSourceFiles, [], void 0);
     const entity = this._entityMap.getPackageEntity(this._analyzer.entity.ofPackage(pkg));
-    entity.members = Array.from(new Set(Array.from(entity.members).concat(irPackage.declarations.map((d) => d.entity))));
+    const entities = [];
+    irPackage.declarations.forEach((d) => {
+      if (d.kind !== 99 /* TextTranslationDeclaration */) {
+        entities.push(d.entity);
+      }
+    });
+    entity.members = Array.from(new Set(Array.from(entity.members).concat(entities)));
     return new EmitterPackage(irPackage, entity);
   }
   enumerateEmittingSourcePackages() {
@@ -67856,7 +68053,7 @@ var Emitter = class _Emitter {
         false,
         new OrderedArguments([], false),
         o.modifiers.isAsync(),
-        this._ectx.standardTypes.none,
+        this._ectx.standardTypes.nullType,
         void 0
       );
       return new ExpressionStatement3(expression, void 0);
@@ -67868,7 +68065,7 @@ var Emitter = class _Emitter {
       0 /* RegularFunction */,
       mainFunctionName,
       [],
-      this._ectx.standardTypes.none,
+      this._ectx.standardTypes.nullType,
       containingPackage
     );
     entity.details.isAsync = isAsyncFunction;
@@ -67942,6 +68139,7 @@ var Emitter = class _Emitter {
             break;
           case 26 /* PackageVariableGetterDeclaration */:
           case 27 /* PackageVariableSetterDeclaration */:
+          case 99 /* TextTranslationDeclaration */:
             break;
           default:
             Debug.never(declaration);
@@ -68102,6 +68300,7 @@ var PackageMembersSorter = class {
           break;
         case 26 /* PackageVariableGetterDeclaration */:
         case 27 /* PackageVariableSetterDeclaration */:
+        case 99 /* TextTranslationDeclaration */:
           otherDeclarations.push(declaration);
           break;
         default:
@@ -68143,7 +68342,9 @@ var DeclarationRenamer = class _DeclarationRenamer {
   makePackageMemberNamesUnique(pkg, reservedPackageLevelNames) {
     const names = new Set(reservedPackageLevelNames);
     for (const declaration of pkg.declarations) {
-      this.makeEntityNameUniqueAndAccumulate(declaration.entity, names);
+      if (declaration.kind !== 99 /* TextTranslationDeclaration */) {
+        this.makeEntityNameUniqueAndAccumulate(declaration.entity, names);
+      }
     }
     this.renameDeclarationsInTopLevelStatements(pkg.leadingStatements, names);
     this.renameDeclarationsInTopLevelStatements(pkg.trailingStatements, names);
@@ -68168,6 +68369,7 @@ var DeclarationRenamer = class _DeclarationRenamer {
           break;
         case 26 /* PackageVariableGetterDeclaration */:
         case 27 /* PackageVariableSetterDeclaration */:
+        case 99 /* TextTranslationDeclaration */:
           break;
         default:
           Debug.never(declaration);