typescript 5.2.0-dev.20230623 → 5.2.0-dev.20230625

package/lib/lib.decorators.d.ts

@@ -35,6 +35,11 @@ type DecoratorContext =
     | ClassMemberDecoratorContext
     ;
 
+type DecoratorMetadataObject = Record<PropertyKey, unknown> & object;
+
+type DecoratorMetadata =
+    typeof globalThis extends { Symbol: { readonly metadata: symbol } } ? DecoratorMetadataObject : DecoratorMetadataObject | undefined;
+
 /**
  * Context provided to a class decorator.
  * @template Class The type of the decorated class associated with this context.
@@ -66,6 +71,8 @@ interface ClassDecoratorContext<
      * ```
      */
     addInitializer(initializer: (this: Class) => void): void;
+
+    readonly metadata: DecoratorMetadata;
 }
 
 /**
@@ -130,6 +137,8 @@ interface ClassMethodDecoratorContext<
      * ```
      */
     addInitializer(initializer: (this: This) => void): void;
+
+    readonly metadata: DecoratorMetadata;
 }
 
 /**
@@ -175,6 +184,8 @@ interface ClassGetterDecoratorContext<
      * decorating a non-`static` element).
      */
     addInitializer(initializer: (this: This) => void): void;
+
+    readonly metadata: DecoratorMetadata;
 }
 
 /**
@@ -220,6 +231,8 @@ interface ClassSetterDecoratorContext<
      * decorating a non-`static` element).
      */
     addInitializer(initializer: (this: This) => void): void;
+
+    readonly metadata: DecoratorMetadata;
 }
 
 /**
@@ -274,6 +287,8 @@ interface ClassAccessorDecoratorContext<
      * decorating a non-`static` element).
      */
     addInitializer(initializer: (this: This) => void): void;
+
+    readonly metadata: DecoratorMetadata;
 }
 
 /**
@@ -369,4 +384,6 @@ interface ClassFieldDecoratorContext<
      * decorating a non-`static` element).
      */
     addInitializer(initializer: (this: This) => void): void;
+
+    readonly metadata: DecoratorMetadata;
 }

package/lib/lib.esnext.d.ts

@@ -18,4 +18,5 @@ and limitations under the License.
 
 /// <reference lib="es2023" />
 /// <reference lib="esnext.intl" />
+/// <reference lib="esnext.decorators" />
 /// <reference lib="esnext.disposable" />

package/lib/lib.esnext.decorators.d.ts

@@ -0,0 +1,28 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+
+/// <reference no-default-lib="true"/>
+
+/// <reference lib="es2015.symbol" />
+/// <reference lib="decorators" />
+
+interface SymbolConstructor {
+    readonly metadata: unique symbol;
+}
+
+interface Function {
+    [Symbol.metadata]: DecoratorMetadata | null;
+}

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-dev.20230623`;
+var version = `${versionMajorMinor}.0-dev.20230625`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -5792,6 +5792,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."),
@@ -12915,6 +12916,10 @@ function getContainingClassStaticBlock(node) {
 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) {
@@ -22988,10 +22993,12 @@ function createEmitHelperFactory(context) {
     );
   }
   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);
@@ -23095,13 +23102,15 @@ function createEmitHelperFactory(context) {
     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);
@@ -33677,6 +33686,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"]
 ];
@@ -66032,7 +66042,7 @@ function createTypeChecker(host) {
         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;
         }
@@ -69043,7 +69053,7 @@ function createTypeChecker(host) {
     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);
@@ -69179,16 +69189,22 @@ function createTypeChecker(host) {
         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 */) {
           error(node, Diagnostics.Private_accessor_was_defined_without_a_getter);
         }
@@ -89776,9 +89792,12 @@ function transformClassFields(context) {
         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;
     }
@@ -91941,6 +91960,7 @@ function transformESDecorators(context) {
     );
   }
   function createClassInfo(node) {
+    const metadataReference = factory2.createUniqueName("_metadata", 16 /* Optimistic */ | 32 /* FileLevel */);
     let instanceExtraInitializersName;
     let staticExtraInitializersName;
     let hasStaticInitializers = false;
@@ -91979,6 +91999,7 @@ function transformESDecorators(context) {
     }
     return {
       class: node,
+      metadataReference,
       instanceExtraInitializersName,
       staticExtraInitializersName,
       hasStaticInitializers,
@@ -91986,16 +92007,6 @@ function transformESDecorators(context) {
       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(
@@ -92039,29 +92050,26 @@ function transformESDecorators(context) {
         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;
@@ -92167,7 +92175,7 @@ function transformESDecorators(context) {
         factory2.createNull(),
         classDescriptorAssignment,
         classInfo2.classDecoratorsName,
-        { kind: "class", name: classNameReference },
+        { kind: "class", name: classNameReference, metadata: classInfo2.metadataReference },
         factory2.createNull(),
         classInfo2.classExtraInitializersName
       );
@@ -92179,6 +92187,7 @@ function transformESDecorators(context) {
       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);
@@ -92557,7 +92566,8 @@ function transformESDecorators(context) {
           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)) {
@@ -93347,6 +93357,60 @@ function transformESDecorators(context) {
       ])
     );
   }
+  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()
+    );
+  }
 }
 
 // src/compiler/transformers/es2017.ts
@@ -115131,6 +115195,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
 ]);