typescript 5.2.0-dev.20230623 → 5.2.0-dev.20230624

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-dev.20230623`;
+      version = `${versionMajorMinor}.0-dev.20230624`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -7096,6 +7096,7 @@ ${lanes.join("\n")}
         A_return_statement_can_only_be_used_within_a_function_body: diag(1108, 1 /* Error */, "A_return_statement_can_only_be_used_within_a_function_body_1108", "A 'return' statement can only be used within a function body."),
         Expression_expected: diag(1109, 1 /* Error */, "Expression_expected_1109", "Expression expected."),
         Type_expected: diag(1110, 1 /* Error */, "Type_expected_1110", "Type expected."),
+        Private_field_0_must_be_declared_in_an_enclosing_class: diag(1111, 1 /* Error */, "Private_field_0_must_be_declared_in_an_enclosing_class_1111", "Private field '{0}' must be declared in an enclosing class."),
         A_default_clause_cannot_appear_more_than_once_in_a_switch_statement: diag(1113, 1 /* Error */, "A_default_clause_cannot_appear_more_than_once_in_a_switch_statement_1113", "A 'default' clause cannot appear more than once in a 'switch' statement."),
         Duplicate_label_0: diag(1114, 1 /* Error */, "Duplicate_label_0_1114", "Duplicate label '{0}'."),
         A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement: diag(1115, 1 /* Error */, "A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement_1115", "A 'continue' statement can only jump to a label of an enclosing iteration statement."),
@@ -14530,6 +14531,10 @@ ${lanes.join("\n")}
   function getContainingFunctionOrClassStaticBlock(node) {
     return findAncestor(node.parent, isFunctionLikeOrClassStaticBlockDeclaration);
   }
+  function getContainingClassExcludingClassDecorators(node) {
+    const decorator = findAncestor(node.parent, (n) => isClassLike(n) ? "quit" : isDecorator(n));
+    return decorator && isClassLike(decorator.parent) ? getContainingClass(decorator.parent) : getContainingClass(decorator ?? node);
+  }
   function getThisContainer(node, includeArrowFunctions, includeClassComputedPropertyName) {
     Debug.assert(node.kind !== 312 /* SourceFile */);
     while (true) {
@@ -25082,10 +25087,12 @@ ${lanes.join("\n")}
       );
     }
     function createESDecorateClassContextObject(contextIn) {
-      return factory2.createObjectLiteralExpression([
+      const properties = [
         factory2.createPropertyAssignment(factory2.createIdentifier("kind"), factory2.createStringLiteral("class")),
-        factory2.createPropertyAssignment(factory2.createIdentifier("name"), contextIn.name)
-      ]);
+        factory2.createPropertyAssignment(factory2.createIdentifier("name"), contextIn.name),
+        factory2.createPropertyAssignment(factory2.createIdentifier("metadata"), contextIn.metadata)
+      ];
+      return factory2.createObjectLiteralExpression(properties);
     }
     function createESDecorateClassElementAccessGetMethod(elementName) {
       const accessor = elementName.computed ? factory2.createElementAccessExpression(factory2.createIdentifier("obj"), elementName.name) : factory2.createPropertyAccessExpression(factory2.createIdentifier("obj"), elementName.name);
@@ -25189,13 +25196,15 @@ ${lanes.join("\n")}
       return factory2.createObjectLiteralExpression(properties);
     }
     function createESDecorateClassElementContextObject(contextIn) {
-      return factory2.createObjectLiteralExpression([
+      const properties = [
         factory2.createPropertyAssignment(factory2.createIdentifier("kind"), factory2.createStringLiteral(contextIn.kind)),
         factory2.createPropertyAssignment(factory2.createIdentifier("name"), contextIn.name.computed ? contextIn.name.name : factory2.createStringLiteralFromNode(contextIn.name.name)),
         factory2.createPropertyAssignment(factory2.createIdentifier("static"), contextIn.static ? factory2.createTrue() : factory2.createFalse()),
         factory2.createPropertyAssignment(factory2.createIdentifier("private"), contextIn.private ? factory2.createTrue() : factory2.createFalse()),
-        factory2.createPropertyAssignment(factory2.createIdentifier("access"), createESDecorateClassElementAccessObject(contextIn.name, contextIn.access))
-      ]);
+        factory2.createPropertyAssignment(factory2.createIdentifier("access"), createESDecorateClassElementAccessObject(contextIn.name, contextIn.access)),
+        factory2.createPropertyAssignment(factory2.createIdentifier("metadata"), contextIn.metadata)
+      ];
+      return factory2.createObjectLiteralExpression(properties);
     }
     function createESDecorateContextObject(contextIn) {
       return contextIn.kind === "class" ? createESDecorateClassContextObject(contextIn) : createESDecorateClassElementContextObject(contextIn);
@@ -37557,6 +37566,7 @@ ${lanes.join("\n")}
         ["esnext.string", "lib.es2022.string.d.ts"],
         ["esnext.promise", "lib.es2021.promise.d.ts"],
         ["esnext.weakref", "lib.es2021.weakref.d.ts"],
+        ["esnext.decorators", "lib.esnext.decorators.d.ts"],
         ["decorators", "lib.decorators.d.ts"],
         ["decorators.legacy", "lib.decorators.legacy.d.ts"]
       ];
@@ -68475,7 +68485,7 @@ ${lanes.join("\n")}
           location = location.parent;
         }
         if (isExpressionNode(location) && (!isAssignmentTarget(location) || isWriteAccess(location))) {
-          const type = getTypeOfExpression(location);
+          const type = removeOptionalTypeMarker(getTypeOfExpression(location));
           if (getExportSymbolOfValueSymbolIfExported(getNodeLinks(location).resolvedSymbol) === symbol) {
             return type;
           }
@@ -71486,7 +71496,7 @@ ${lanes.join("\n")}
       return isCallOrNewExpression(node.parent) && node.parent.expression === node;
     }
     function lookupSymbolForPrivateIdentifierDeclaration(propName, location) {
-      for (let containingClass = getContainingClass(location); !!containingClass; containingClass = getContainingClass(containingClass)) {
+      for (let containingClass = getContainingClassExcludingClassDecorators(location); !!containingClass; containingClass = getContainingClass(containingClass)) {
         const { symbol } = containingClass;
         const name = getSymbolNameForPrivateIdentifier(symbol, propName);
         const prop = symbol.members && symbol.members.get(name) || symbol.exports && symbol.exports.get(name);
@@ -71622,16 +71632,22 @@ ${lanes.join("\n")}
           if (lexicallyScopedSymbol) {
             return isErrorType(apparentType) ? errorType : apparentType;
           }
-          if (!getContainingClass(right)) {
+          if (getContainingClassExcludingClassDecorators(right) === void 0) {
             grammarErrorOnNode(right, Diagnostics.Private_identifiers_are_not_allowed_outside_class_bodies);
             return anyType;
           }
         }
-        prop = lexicallyScopedSymbol ? getPrivateIdentifierPropertyOfType(leftType, lexicallyScopedSymbol) : void 0;
-        if (!prop && checkPrivateIdentifierPropertyAccess(leftType, right, lexicallyScopedSymbol)) {
-          return errorType;
+        prop = lexicallyScopedSymbol && getPrivateIdentifierPropertyOfType(leftType, lexicallyScopedSymbol);
+        if (prop === void 0) {
+          if (checkPrivateIdentifierPropertyAccess(leftType, right, lexicallyScopedSymbol)) {
+            return errorType;
+          }
+          const containingClass = getContainingClassExcludingClassDecorators(right);
+          if (containingClass && isPlainJsFile(getSourceFileOfNode(containingClass), compilerOptions.checkJs)) {
+            grammarErrorOnNode(right, Diagnostics.Private_field_0_must_be_declared_in_an_enclosing_class, idText(right));
+          }
         } else {
-          const isSetonlyAccessor = prop && prop.flags & 65536 /* SetAccessor */ && !(prop.flags & 32768 /* GetAccessor */);
+          const isSetonlyAccessor = prop.flags & 65536 /* SetAccessor */ && !(prop.flags & 32768 /* GetAccessor */);
           if (isSetonlyAccessor && assignmentKind !== 1 /* Definite */) {
             error2(node, Diagnostics.Private_accessor_was_defined_without_a_getter);
           }
@@ -92579,9 +92595,12 @@ ${lanes.join("\n")}
           return getClassLexicalEnvironment().classConstructor = node.emitNode.classThis;
         }
         const classCheckFlags = resolver.getNodeCheckFlags(node);
-        const isClassWithConstructorReference2 = classCheckFlags & 1048576 /* ClassWithConstructorReference */;
         const requiresBlockScopedVar = classCheckFlags & 32768 /* BlockScopedBindingInLoop */;
-        const temp2 = factory2.createTempVariable(requiresBlockScopedVar ? addBlockScopedVariable : hoistVariableDeclaration, !!isClassWithConstructorReference2);
+        const temp2 = factory2.createTempVariable(
+          requiresBlockScopedVar ? addBlockScopedVariable : hoistVariableDeclaration,
+          /*reservedInNestedScopes*/
+          true
+        );
         getClassLexicalEnvironment().classConstructor = factory2.cloneNode(temp2);
         return temp2;
       }
@@ -94762,6 +94781,7 @@ ${lanes.join("\n")}
       );
     }
     function createClassInfo(node) {
+      const metadataReference = factory2.createUniqueName("_metadata", 16 /* Optimistic */ | 32 /* FileLevel */);
       let instanceExtraInitializersName;
       let staticExtraInitializersName;
       let hasStaticInitializers = false;
@@ -94800,6 +94820,7 @@ ${lanes.join("\n")}
       }
       return {
         class: node,
+        metadataReference,
         instanceExtraInitializersName,
         staticExtraInitializersName,
         hasStaticInitializers,
@@ -94807,16 +94828,6 @@ ${lanes.join("\n")}
         hasStaticPrivateClassElements
       };
     }
-    function containsLexicalSuperInStaticInitializer(node) {
-      for (const member of node.members) {
-        if (isClassStaticBlockDeclaration(member) || isPropertyDeclaration(member) && hasStaticModifier(member)) {
-          if (member.transformFlags & 134217728 /* ContainsLexicalSuper */) {
-            return true;
-          }
-        }
-      }
-      return false;
-    }
     function transformClassLike(node) {
       startLexicalEnvironment();
       if (!classHasDeclaredOrExplicitlyAssignedName(node) && classOrConstructorParameterIsDecorated(
@@ -94860,29 +94871,26 @@ ${lanes.join("\n")}
           shouldTransformPrivateStaticElementsInFile = true;
         }
       }
-      if (classDecorators && containsLexicalSuperInStaticInitializer(node)) {
-        const extendsClause = getHeritageClause(node.heritageClauses, 96 /* ExtendsKeyword */);
-        const extendsElement = extendsClause && firstOrUndefined(extendsClause.types);
-        const extendsExpression = extendsElement && visitNode(extendsElement.expression, visitor, isExpression);
-        if (extendsExpression) {
-          classInfo2.classSuper = factory2.createUniqueName("_classSuper", 16 /* Optimistic */ | 32 /* FileLevel */);
-          const unwrapped = skipOuterExpressions(extendsExpression);
-          const safeExtendsExpression = isClassExpression(unwrapped) && !unwrapped.name || isFunctionExpression(unwrapped) && !unwrapped.name || isArrowFunction(unwrapped) ? factory2.createComma(factory2.createNumericLiteral(0), extendsExpression) : extendsExpression;
-          classDefinitionStatements.push(createLet(classInfo2.classSuper, safeExtendsExpression));
-          const updatedExtendsElement = factory2.updateExpressionWithTypeArguments(
-            extendsElement,
-            classInfo2.classSuper,
-            /*typeArguments*/
-            void 0
-          );
-          const updatedExtendsClause = factory2.updateHeritageClause(extendsClause, [updatedExtendsElement]);
-          heritageClauses = factory2.createNodeArray([updatedExtendsClause]);
-        }
-      } else {
-        heritageClauses = visitNodes2(node.heritageClauses, visitor, isHeritageClause);
+      const extendsClause = getHeritageClause(node.heritageClauses, 96 /* ExtendsKeyword */);
+      const extendsElement = extendsClause && firstOrUndefined(extendsClause.types);
+      const extendsExpression = extendsElement && visitNode(extendsElement.expression, visitor, isExpression);
+      if (extendsExpression) {
+        classInfo2.classSuper = factory2.createUniqueName("_classSuper", 16 /* Optimistic */ | 32 /* FileLevel */);
+        const unwrapped = skipOuterExpressions(extendsExpression);
+        const safeExtendsExpression = isClassExpression(unwrapped) && !unwrapped.name || isFunctionExpression(unwrapped) && !unwrapped.name || isArrowFunction(unwrapped) ? factory2.createComma(factory2.createNumericLiteral(0), extendsExpression) : extendsExpression;
+        classDefinitionStatements.push(createLet(classInfo2.classSuper, safeExtendsExpression));
+        const updatedExtendsElement = factory2.updateExpressionWithTypeArguments(
+          extendsElement,
+          classInfo2.classSuper,
+          /*typeArguments*/
+          void 0
+        );
+        const updatedExtendsClause = factory2.updateHeritageClause(extendsClause, [updatedExtendsElement]);
+        heritageClauses = factory2.createNodeArray([updatedExtendsClause]);
       }
       const renamedClassThis = classInfo2.classThis ?? factory2.createThis();
       enterClass(classInfo2);
+      leadingBlockStatements = append(leadingBlockStatements, createMetadata(classInfo2.metadataReference, classInfo2.classSuper));
       let members = visitNodes2(node.members, classElementVisitor, isClassElement);
       if (pendingExpressions) {
         let outerThis;
@@ -94988,7 +94996,7 @@ ${lanes.join("\n")}
           factory2.createNull(),
           classDescriptorAssignment,
           classInfo2.classDecoratorsName,
-          { kind: "class", name: classNameReference },
+          { kind: "class", name: classNameReference, metadata: classInfo2.metadataReference },
           factory2.createNull(),
           classInfo2.classExtraInitializersName
         );
@@ -95000,6 +95008,7 @@ ${lanes.join("\n")}
         const classReferenceAssignment = factory2.createAssignment(classReference, classThisAssignment);
         leadingBlockStatements.push(factory2.createExpressionStatement(classReferenceAssignment));
       }
+      leadingBlockStatements.push(createSymbolMetadata(renamedClassThis, classInfo2.metadataReference));
       if (classInfo2.staticExtraInitializersName) {
         const runStaticInitializersHelper = emitHelpers().createRunInitializersHelper(renamedClassThis, classInfo2.staticExtraInitializersName);
         const runStaticInitializersStatement = factory2.createExpressionStatement(runStaticInitializersHelper);
@@ -95378,7 +95387,8 @@ ${lanes.join("\n")}
             get: isPropertyDeclaration(member) || isGetAccessorDeclaration(member) || isMethodDeclaration(member),
             // 3. If _kind_ is ~field~, ~accessor~, or ~setter~, then ...
             set: isPropertyDeclaration(member) || isSetAccessorDeclaration(member)
-          }
+          },
+          metadata: classInfo2.metadataReference
         };
         const extraInitializers = isStatic(member) ? classInfo2.staticExtraInitializersName ?? (classInfo2.staticExtraInitializersName = factory2.createUniqueName("_staticExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */)) : classInfo2.instanceExtraInitializersName ?? (classInfo2.instanceExtraInitializersName = factory2.createUniqueName("_instanceExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */));
         if (isMethodOrAccessor(member)) {
@@ -96168,6 +96178,60 @@ ${lanes.join("\n")}
         ])
       );
     }
+    function createMetadata(name, classSuper2) {
+      const varDecl = factory2.createVariableDeclaration(
+        name,
+        /*exclamationToken*/
+        void 0,
+        /*type*/
+        void 0,
+        factory2.createConditionalExpression(
+          factory2.createLogicalAnd(
+            factory2.createTypeCheck(factory2.createIdentifier("Symbol"), "function"),
+            factory2.createPropertyAccessExpression(factory2.createIdentifier("Symbol"), "metadata")
+          ),
+          factory2.createToken(58 /* QuestionToken */),
+          factory2.createCallExpression(
+            factory2.createPropertyAccessExpression(factory2.createIdentifier("Object"), "create"),
+            /*typeArguments*/
+            void 0,
+            [classSuper2 ? createSymbolMetadataReference(classSuper2) : factory2.createNull()]
+          ),
+          factory2.createToken(59 /* ColonToken */),
+          factory2.createVoidZero()
+        )
+      );
+      return factory2.createVariableStatement(
+        /*modifiers*/
+        void 0,
+        factory2.createVariableDeclarationList([varDecl], 2 /* Const */)
+      );
+    }
+    function createSymbolMetadata(target, value) {
+      const defineProperty = factory2.createObjectDefinePropertyCall(
+        target,
+        factory2.createPropertyAccessExpression(factory2.createIdentifier("Symbol"), "metadata"),
+        factory2.createPropertyDescriptor(
+          { configurable: true, writable: true, enumerable: true, value },
+          /*singleLine*/
+          true
+        )
+      );
+      return setEmitFlags(
+        factory2.createIfStatement(value, factory2.createExpressionStatement(defineProperty)),
+        1 /* SingleLine */
+      );
+    }
+    function createSymbolMetadataReference(classSuper2) {
+      return factory2.createBinaryExpression(
+        factory2.createElementAccessExpression(
+          classSuper2,
+          factory2.createPropertyAccessExpression(factory2.createIdentifier("Symbol"), "metadata")
+        ),
+        61 /* QuestionQuestionToken */,
+        factory2.createNull()
+      );
+    }
   }
   var init_esDecorators = __esm({
     "src/compiler/transformers/esDecorators.ts"() {
@@ -121425,6 +121489,7 @@ ${lanes.join("\n")}
         Diagnostics.Class_constructor_may_not_be_an_accessor.code,
         Diagnostics.await_expressions_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules.code,
         Diagnostics.await_using_statements_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules.code,
+        Diagnostics.Private_field_0_must_be_declared_in_an_enclosing_class.code,
         // Type errors
         Diagnostics.This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value.code
       ]);
@@ -171919,6 +171984,7 @@ ${options.prefix}` : "\n" : options.prefix
     getContainerFlags: () => getContainerFlags,
     getContainerNode: () => getContainerNode,
     getContainingClass: () => getContainingClass,
+    getContainingClassExcludingClassDecorators: () => getContainingClassExcludingClassDecorators,
     getContainingClassStaticBlock: () => getContainingClassStaticBlock,
     getContainingFunction: () => getContainingFunction,
     getContainingFunctionDeclaration: () => getContainingFunctionDeclaration,

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-dev.20230623`;
+var version = `${versionMajorMinor}.0-dev.20230624`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -5166,6 +5166,7 @@ var Diagnostics = {
   A_return_statement_can_only_be_used_within_a_function_body: diag(1108, 1 /* Error */, "A_return_statement_can_only_be_used_within_a_function_body_1108", "A 'return' statement can only be used within a function body."),
   Expression_expected: diag(1109, 1 /* Error */, "Expression_expected_1109", "Expression expected."),
   Type_expected: diag(1110, 1 /* Error */, "Type_expected_1110", "Type expected."),
+  Private_field_0_must_be_declared_in_an_enclosing_class: diag(1111, 1 /* Error */, "Private_field_0_must_be_declared_in_an_enclosing_class_1111", "Private field '{0}' must be declared in an enclosing class."),
   A_default_clause_cannot_appear_more_than_once_in_a_switch_statement: diag(1113, 1 /* Error */, "A_default_clause_cannot_appear_more_than_once_in_a_switch_statement_1113", "A 'default' clause cannot appear more than once in a 'switch' statement."),
   Duplicate_label_0: diag(1114, 1 /* Error */, "Duplicate_label_0_1114", "Duplicate label '{0}'."),
   A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement: diag(1115, 1 /* Error */, "A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement_1115", "A 'continue' statement can only jump to a label of an enclosing iteration statement."),
@@ -25584,6 +25585,7 @@ var libEntries = [
   ["esnext.string", "lib.es2022.string.d.ts"],
   ["esnext.promise", "lib.es2021.promise.d.ts"],
   ["esnext.weakref", "lib.es2021.weakref.d.ts"],
+  ["esnext.decorators", "lib.esnext.decorators.d.ts"],
   ["decorators", "lib.decorators.d.ts"],
   ["decorators.legacy", "lib.decorators.legacy.d.ts"]
 ];
@@ -30820,6 +30822,7 @@ var plainJSErrors = /* @__PURE__ */ new Set([
   Diagnostics.Class_constructor_may_not_be_an_accessor.code,
   Diagnostics.await_expressions_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules.code,
   Diagnostics.await_using_statements_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules.code,
+  Diagnostics.Private_field_0_must_be_declared_in_an_enclosing_class.code,
   // Type errors
   Diagnostics.This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value.code
 ]);

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.2.0-dev.20230623",
+    "version": "5.2.0-dev.20230624",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -114,5 +114,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "f7e4f809acaea6b1b247ed05b2b7873d4546ab9e"
+    "gitHead": "4b0fd40aafa50720163e5699ff7d5a14eaa74118"
 }