Addressed code review.

Signed-off-by: Titian Cernicova-Dragomir <[email protected]>

Author: dragomirtitian

src/compiler/transformer.ts

@@ -4,13 +4,11 @@ import {
     Bundle,
     chainBundle,
     CompilerOptions,
-    CoreEmitResolver,
     createEmitHelperFactory,
     CustomTransformer,
     CustomTransformerFactory,
     CustomTransformers,
     Debug,
-    Diagnostic,
     DiagnosticWithLocation,
     disposeEmitNodes,
     EmitFlags,
@@ -32,7 +30,6 @@ import {
     getUseDefineForClassFields,
     Identifier,
     isBundle,
-    IsolatedTransformationContext,
     isSourceFile,
     LexicalEnvironmentFlags,
     map,
@@ -42,7 +39,6 @@ import {
     NodeFactory,
     NodeFlags,
     noop,
-    notImplemented,
     NullTransformationContext,
     returnUndefined,
     ScriptTarget,
@@ -668,51 +664,22 @@ export function transformNodes<T extends Node>(resolver: EmitResolver | undefine
         }
     }
 }
+
 /** @internal */
-export function createTransformationContext(kind: TransformationContextKind.NullContext): NullTransformationContext;
-/** @internal */
-export function createTransformationContext(
-    kind: TransformationContextKind.IsolatedContext,
-    options: CompilerOptions,
-    diagnostics: Diagnostic[],
-    resolver: CoreEmitResolver,
-): IsolatedTransformationContext;
-export function createTransformationContext(
-    kind: TransformationContextKind.IsolatedContext | TransformationContextKind.NullContext,
-    options: CompilerOptions = {},
-    diagnostics?: Diagnostic[],
-    resolver?: EmitResolver | CoreEmitResolver,
-    host?: EmitHost,
-): NullTransformationContext | IsolatedTransformationContext | TransformationContext {
-    return {
-        kind,
-        factory: factory, // eslint-disable-line object-shorthand
-        getCompilerOptions: () => options,
-        getEmitResolver: !resolver ? notImplemented : () => resolver,
-        getEmitHost: !host ? notImplemented : () => host,
-        getEmitHelperFactory: notImplemented,
-        startLexicalEnvironment: noop,
-        resumeLexicalEnvironment: noop,
-        suspendLexicalEnvironment: noop,
-        endLexicalEnvironment: returnUndefined,
-        setLexicalEnvironmentFlags: noop,
-        getLexicalEnvironmentFlags: () => 0,
-        hoistVariableDeclaration: noop,
-        hoistFunctionDeclaration: noop,
-        addInitializationStatement: noop,
-        startBlockScope: noop,
-        endBlockScope: returnUndefined,
-        addBlockScopedVariable: noop,
-        requestEmitHelper: noop,
-        readEmitHelpers: notImplemented,
-        enableSubstitution: noop,
-        enableEmitNotification: noop,
-        isSubstitutionEnabled: notImplemented,
-        isEmitNotificationEnabled: notImplemented,
-        onSubstituteNode: noEmitSubstitution,
-        onEmitNode: noEmitNotification,
-        addDiagnostic: !diagnostics ? noop : (diag: Diagnostic) => diagnostics.push(diag),
-    };
-}
-/** @internal */
-export const nullTransformationContext: NullTransformationContext = createTransformationContext(TransformationContextKind.NullContext);
+export const nullTransformationContext: NullTransformationContext = {
+    kind: TransformationContextKind.NullContext,
+    factory: factory, // eslint-disable-line object-shorthand
+    getCompilerOptions: () => ({}),
+    startLexicalEnvironment: noop,
+    resumeLexicalEnvironment: noop,
+    suspendLexicalEnvironment: noop,
+    endLexicalEnvironment: returnUndefined,
+    setLexicalEnvironmentFlags: noop,
+    getLexicalEnvironmentFlags: () => 0,
+    hoistVariableDeclaration: noop,
+    hoistFunctionDeclaration: noop,
+    addInitializationStatement: noop,
+    startBlockScope: noop,
+    endBlockScope: returnUndefined,
+    addBlockScopedVariable: noop,
+};

src/compiler/transformers/declarations/transpileDeclaration.ts

@@ -7,7 +7,6 @@ import {
     createPrinter,
     createSourceMapGenerator,
     createTextWriter,
-    createTransformationContext,
     Debug,
     Diagnostic,
     EmitHost,
@@ -20,8 +19,10 @@ import {
     getRelativePathToDirectoryOrUrl,
     getRootLength,
     getSourceFilePathInNewDir,
+    IsolatedTransformationContext,
     normalizePath,
     normalizeSlashes,
+    nullTransformationContext,
     PrinterOptions,
     SourceFile,
     SourceMapGenerator,
@@ -47,7 +48,13 @@ export function transpileDeclaration(sourceFile: SourceFile, transpileOptions: T
     };
     const emitResolver = createEmitDeclarationResolver(sourceFile);
     const diagnostics: Diagnostic[] = [];
-    const transformationContext = createTransformationContext(TransformationContextKind.IsolatedContext, compilerOptions, diagnostics, emitResolver);
+    const transformationContext: IsolatedTransformationContext = {
+        ...nullTransformationContext,
+        kind: TransformationContextKind.IsolatedContext,
+        getCompilerOptions: () => compilerOptions,
+        addDiagnostic: diag => diagnostics.push(diag),
+        getEmitResolver: () => emitResolver,
+    };
     const transformer = transformDeclarations(transformationContext);
     const result = transformer(sourceFile);
 

tests/baselines/reference/api/typescript.d.ts

@@ -8436,6 +8436,11 @@ declare namespace ts {
          */
         replacePropertyName<T extends AccessorDeclaration | MethodDeclaration | MethodSignature | PropertyDeclaration | PropertySignature | PropertyAssignment>(node: T, name: T["name"]): T;
     }
+    enum TransformationContextKind {
+        FullContext = 0,
+        IsolatedContext = 1,
+        NullContext = 2,
+    }
     interface CoreTransformationContext {
         readonly factory: NodeFactory;
         /** Gets the compiler options supplied to the transformer. */
@@ -8454,6 +8459,7 @@ declare namespace ts {
         hoistVariableDeclaration(node: Identifier): void;
     }
     interface TransformationContext extends CoreTransformationContext {
+        kind: TransformationContextKind.FullContext;
         /** Records a request for a non-scoped emit helper in the current context. */
         requestEmitHelper(helper: EmitHelper): void;
         /** Gets and resets the requested non-scoped emit helpers. */

tests/baselines/reference/isolated-declarations/auto-fixed/diff/symbolDeclarationEmit12.d.ts.diff

@@ -5,28 +5,30 @@
 ===================================================================
 --- TSC	declarations
 +++ DTE	declarations
-@@ -5,8 +5,9 @@
+@@ -5,33 +5,40 @@
      interface I {
      }
      export class C {
          [Symbol.iterator]: I;
 +        [Symbol.toPrimitive](x: I): invalid;
          [Symbol.isConcatSpreadable](): I;
-         get [Symbol.toPrimitive](): I;
+-        get [Symbol.toPrimitive](): I;
++        get [Symbol.toPrimitive](): invalid;
          set [Symbol.toPrimitive](x: I);
      }
-@@ -14,18 +15,21 @@
+     export {};
  }
  //# sourceMappingURL=symbolDeclarationEmit12.d.ts.map
  /// [Errors] ////
 
 +symbolDeclarationEmit12.ts(5,9): error TS9007: Declaration emit for this file requires type resolution. An explicit type annotation may unblock declaration emit.
  symbolDeclarationEmit12.ts(9,13): error TS2300: Duplicate identifier '[Symbol.toPrimitive]'.
++symbolDeclarationEmit12.ts(9,13): error TS9007: Declaration emit for this file requires type resolution. An explicit type annotation may unblock declaration emit.
  symbolDeclarationEmit12.ts(10,13): error TS2300: Duplicate identifier '[Symbol.toPrimitive]'.
 
 
 -==== symbolDeclarationEmit12.ts (2 errors) ====
-+==== symbolDeclarationEmit12.ts (3 errors) ====
++==== symbolDeclarationEmit12.ts (4 errors) ====
      module M {
          interface I { }
          export class C {
@@ -37,4 +39,12 @@
              [Symbol.isConcatSpreadable](): I {
                  return undefined
              }
-             get [Symbol.toPrimitive](): I { return undefined; }
+             get [Symbol.toPrimitive]() { return undefined; }
+                 ~~~~~~~~~~~~~~~~~~~~
+ !!! error TS2300: Duplicate identifier '[Symbol.toPrimitive]'.
++                ~~~~~~~~~~~~~~~~~~~~
++!!! error TS9007: Declaration emit for this file requires type resolution. An explicit type annotation may unblock declaration emit.
+             set [Symbol.toPrimitive](x: I) { }
+                 ~~~~~~~~~~~~~~~~~~~~
+ !!! error TS2300: Duplicate identifier '[Symbol.toPrimitive]'.
+         }

tests/baselines/reference/isolated-declarations/auto-fixed/dte/symbolDeclarationEmit12.d.ts

@@ -9,7 +9,7 @@ module M {
         [Symbol.isConcatSpreadable](): I {
             return undefined
         }
-        get [Symbol.toPrimitive](): I { return undefined; }
+        get [Symbol.toPrimitive]() { return undefined; }
         set [Symbol.toPrimitive](x: I) { }
     }
 }
@@ -26,7 +26,7 @@ declare namespace M {
         [Symbol.iterator]: I;
         [Symbol.toPrimitive](x: I): invalid;
         [Symbol.isConcatSpreadable](): I;
-        get [Symbol.toPrimitive](): I;
+        get [Symbol.toPrimitive](): invalid;
         set [Symbol.toPrimitive](x: I);
     }
     export {};
@@ -36,10 +36,11 @@ declare namespace M {
 
 symbolDeclarationEmit12.ts(5,9): error TS9007: Declaration emit for this file requires type resolution. An explicit type annotation may unblock declaration emit.
 symbolDeclarationEmit12.ts(9,13): error TS2300: Duplicate identifier '[Symbol.toPrimitive]'.
+symbolDeclarationEmit12.ts(9,13): error TS9007: Declaration emit for this file requires type resolution. An explicit type annotation may unblock declaration emit.
 symbolDeclarationEmit12.ts(10,13): error TS2300: Duplicate identifier '[Symbol.toPrimitive]'.
 
 
-==== symbolDeclarationEmit12.ts (3 errors) ====
+==== symbolDeclarationEmit12.ts (4 errors) ====
     module M {
         interface I { }
         export class C {
@@ -50,9 +51,11 @@ symbolDeclarationEmit12.ts(10,13): error TS2300: Duplicate identifier '[Symbol.t
             [Symbol.isConcatSpreadable](): I {
                 return undefined
             }
-            get [Symbol.toPrimitive](): I { return undefined; }
+            get [Symbol.toPrimitive]() { return undefined; }
                 ~~~~~~~~~~~~~~~~~~~~
 !!! error TS2300: Duplicate identifier '[Symbol.toPrimitive]'.
+                ~~~~~~~~~~~~~~~~~~~~
+!!! error TS9007: Declaration emit for this file requires type resolution. An explicit type annotation may unblock declaration emit.
             set [Symbol.toPrimitive](x: I) { }
                 ~~~~~~~~~~~~~~~~~~~~
 !!! error TS2300: Duplicate identifier '[Symbol.toPrimitive]'.

tests/baselines/reference/isolated-declarations/auto-fixed/tsc/symbolDeclarationEmit12.d.ts

@@ -9,7 +9,7 @@ module M {
         [Symbol.isConcatSpreadable](): I {
             return undefined
         }
-        get [Symbol.toPrimitive](): I { return undefined; }
+        get [Symbol.toPrimitive]() { return undefined; }
         set [Symbol.toPrimitive](x: I) { }
     }
 }
@@ -46,7 +46,7 @@ symbolDeclarationEmit12.ts(10,13): error TS2300: Duplicate identifier '[Symbol.t
             [Symbol.isConcatSpreadable](): I {
                 return undefined
             }
-            get [Symbol.toPrimitive](): I { return undefined; }
+            get [Symbol.toPrimitive]() { return undefined; }
                 ~~~~~~~~~~~~~~~~~~~~
 !!! error TS2300: Duplicate identifier '[Symbol.toPrimitive]'.
             set [Symbol.toPrimitive](x: I) { }