refactor(compiler-cli): expose tooling code through private entry-point (angular#43431)

devversion · dylhunn · commit fe2a8de1b5bb · 2021-10-01T18:28:46.000Z
Similar to the other private entry-points we have added for localize, bazel or the migrations, we should expose the tooling code through a dedicated private export. This will make the compiler-cli exports more consistent and it will become easier for the CLI to export necessary code. PR Close angular#43431
diff --git a/.pullapprove.yml b/.pullapprove.yml
@@ -1028,7 +1028,7 @@ groups:
       - *can-be-global-docs-approved
       - >
         contains_any_globs(files, [
-          'packages/compiler-cli/src/tooling.ts',
+          'packages/compiler-cli/private/tooling.ts',
           'packages/localize/tools/index.ts'
         ])
     reviewers:
diff --git a/packages/compiler-cli/BUILD.bazel b/packages/compiler-cli/BUILD.bazel
@@ -35,6 +35,7 @@ esbuild(
         "//packages/compiler-cli/private:bazel.ts",
         "//packages/compiler-cli/private:localize.ts",
         "//packages/compiler-cli/private:migrations.ts",
+        "//packages/compiler-cli/private:tooling.ts",
         "//packages/compiler-cli/ngcc:src/locking/lock_file_with_child_process/ngcc_lock_unlocker.ts",
         "//packages/compiler-cli/ngcc:src/execution/cluster/ngcc_cluster_worker.ts",
     ],
@@ -89,6 +90,7 @@ ts_library(
     deps = [
         ":import_meta_url_types",
         "//packages/compiler",
+        "//packages/compiler-cli/private",
         "//packages/compiler-cli/src/ngtsc/core",
         "//packages/compiler-cli/src/ngtsc/core:api",
         "//packages/compiler-cli/src/ngtsc/diagnostics",
@@ -103,6 +105,7 @@ ts_library(
         "//packages/compiler-cli/src/ngtsc/translator",
         "//packages/compiler-cli/src/ngtsc/typecheck",
         "//packages/compiler-cli/src/ngtsc/typecheck/api",
+        "//packages/compiler-cli/src/transformers/downlevel_decorators_transform",
         "@npm//@bazel/typescript",
         "@npm//@types/minimist",
         "@npm//@types/node",
diff --git a/packages/compiler-cli/index.ts b/packages/compiler-cli/index.ts
@@ -23,9 +23,8 @@ export {CompilerOptions as AngularCompilerOptions} from './src/transformers/api'
 export {ngToTsDiagnostic} from './src/transformers/util';
 
 // Internal exports needed for packages relying on the compiler-cli.
-// TODO: Consider moving into `@angular/compiler-cli/private`. This would
-// help with a consistent pattern for cross package imports for Angular.
-export * from './src/tooling';
+// TODO: Remove this when the CLI has switched to the private entry-point.
+export * from './private/tooling';
 
 // Exposed as they are needed for relying on the `linker`.
 export * from './src/ngtsc/logging';
diff --git a/packages/compiler-cli/package.json b/packages/compiler-cli/package.json
@@ -41,6 +41,10 @@
       "types": "./private/migrations.d.ts",
       "default": "./bundles/private/migrations.js"
     },
+    "./private/tooling": {
+      "types": "./private/tooling.d.ts",
+      "default": "./bundles/private/tooling.js"
+    },
     "./ngcc/src/execution/cluster/ngcc_cluster_worker": {
       "default": "./bundles/ngcc/src/execution/cluster/ngcc_cluster_worker.js"
     },
diff --git a/packages/compiler-cli/private/BUILD.bazel b/packages/compiler-cli/private/BUILD.bazel
@@ -14,5 +14,7 @@ ts_library(
         "//packages/compiler-cli/src/ngtsc/perf",
         "//packages/compiler-cli/src/ngtsc/reflection",
         "//packages/compiler-cli/src/ngtsc/sourcemaps",
+        "//packages/compiler-cli/src/transformers/downlevel_decorators_transform",
+        "@npm//typescript",
     ],
 )
diff --git a/packages/compiler-cli/private/tooling.ts b/packages/compiler-cli/private/tooling.ts
@@ -15,8 +15,8 @@
 
 import ts from 'typescript';
 
-import {TypeScriptReflectionHost} from './ngtsc/reflection';
-import {getDownlevelDecoratorsTransform} from './transformers/downlevel_decorators_transform';
+import {TypeScriptReflectionHost} from '../src/ngtsc/reflection';
+import {getDownlevelDecoratorsTransform} from '../src/transformers/downlevel_decorators_transform/index';
 
 /**
  * Known values for global variables in `@angular/core` that Terser should set using
diff --git a/packages/compiler-cli/src/transformers/downlevel_decorators_transform/BUILD.bazel b/packages/compiler-cli/src/transformers/downlevel_decorators_transform/BUILD.bazel
@@ -0,0 +1,12 @@
+load("//tools:defaults.bzl", "ts_library")
+
+package(default_visibility = ["//visibility:public"])
+
+ts_library(
+    name = "downlevel_decorators_transform",
+    srcs = glob(["*.ts"]),
+    deps = [
+        "//packages/compiler-cli/src/ngtsc/reflection",
+        "@npm//typescript",
+    ],
+)
diff --git a/packages/compiler-cli/src/transformers/downlevel_decorators_transform/downlevel_decorators_transform.ts b/packages/compiler-cli/src/transformers/downlevel_decorators_transform/downlevel_decorators_transform.ts
@@ -7,7 +7,7 @@
  */
 
 import ts from 'typescript';
-import {Decorator, ReflectionHost} from '../ngtsc/reflection';
+import {Decorator, ReflectionHost} from '../../ngtsc/reflection';
 import {isAliasImportDeclaration, loadIsReferencedAliasDeclarationPatch} from './patch_alias_reference_resolution';
 
 /**
diff --git a/packages/compiler-cli/src/transformers/downlevel_decorators_transform/index.ts b/packages/compiler-cli/src/transformers/downlevel_decorators_transform/index.ts
@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+export {getDownlevelDecoratorsTransform} from './downlevel_decorators_transform';
diff --git a/packages/compiler-cli/src/transformers/downlevel_decorators_transform/patch_alias_reference_resolution.ts b/packages/compiler-cli/src/transformers/downlevel_decorators_transform/patch_alias_reference_resolution.ts
diff --git a/packages/compiler-cli/src/transformers/program.ts b/packages/compiler-cli/src/transformers/program.ts
@@ -21,7 +21,7 @@ import {verifySupportedTypeScriptVersion} from '../typescript_support';
 
 import {CompilerHost, CompilerOptions, CustomTransformers, DEFAULT_ERROR_CODE, Diagnostic, DiagnosticMessageChain, EmitFlags, LazyRoute, LibrarySummary, Program, SOURCE, TsEmitCallback, TsMergeEmitResultsCallback} from './api';
 import {CodeGenerator, getOriginalReferences, TsCompilerAotCompilerTypeCheckHostAdapter} from './compiler_host';
-import {getDownlevelDecoratorsTransform} from './downlevel_decorators_transform';
+import {getDownlevelDecoratorsTransform} from './downlevel_decorators_transform/index';
 import {i18nExtract} from './i18n';
 import {getInlineResourcesTransformFactory, InlineResourcesMetadataTransformer} from './inline_resources';
 import {getExpressionLoweringTransformFactory, LowerMetadataTransform} from './lower_expressions';
diff --git a/packages/compiler-cli/test/transformers/BUILD.bazel b/packages/compiler-cli/test/transformers/BUILD.bazel
@@ -9,6 +9,7 @@ ts_library(
         "//packages/compiler",
         "//packages/compiler-cli",
         "//packages/compiler-cli/src/ngtsc/reflection",
+        "//packages/compiler-cli/src/transformers/downlevel_decorators_transform",
         "//packages/compiler-cli/test:test_utils",
         "//packages/compiler/test:test_utils",
         "//packages/core",
diff --git a/packages/compiler-cli/test/transformers/downlevel_decorators_transform_spec.ts b/packages/compiler-cli/test/transformers/downlevel_decorators_transform_spec.ts
@@ -9,7 +9,7 @@
 import ts from 'typescript';
 
 import {TypeScriptReflectionHost} from '../../src/ngtsc/reflection';
-import {getDownlevelDecoratorsTransform} from '../../src/transformers/downlevel_decorators_transform';
+import {getDownlevelDecoratorsTransform} from '../../src/transformers/downlevel_decorators_transform/index';
 import {MockAotContext, MockCompilerHost} from '../mocks';
 
 const TEST_FILE_INPUT = '/test.ts';

Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,7 @@ ts_library(`
`14`	`14`	`"//packages/compiler-cli/src/ngtsc/perf",`
`15`	`15`	`"//packages/compiler-cli/src/ngtsc/reflection",`
`16`	`16`	`"//packages/compiler-cli/src/ngtsc/sourcemaps",`
	`17`	`+ "//packages/compiler-cli/src/transformers/downlevel_decorators_transform",`
	`18`	`+ "@npm//typescript",`
`17`	`19`	`],`
`18`	`20`	`)`