From 7f550ea0c800fe3eff3a80669ebb51ef1aedb427 Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Mon, 8 Jul 2024 12:50:38 +0000 Subject: [PATCH] refactor(compiler-cli): move JIT transforms into `ngtsc` (#56892) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit moves the JIT transforms into the ngtsc folder. They existed outside of ngtsc mostly as an historic artifact— and now with compiler relying on them even more deeply, it makes sense to move them into `ngtsc/transform`. PR Close #56892 --- packages/compiler-cli/BUILD.bazel | 2 +- packages/compiler-cli/index.ts | 2 +- packages/compiler-cli/private/BUILD.bazel | 2 +- packages/compiler-cli/private/tooling.ts | 2 +- .../compiler-cli/src/ngtsc/core/BUILD.bazel | 2 +- .../src/ngtsc/core/src/compiler.ts | 2 +- .../transform/jit}/BUILD.bazel | 2 +- .../src/ngtsc/transform/jit/index.ts | 13 +++++++++ .../src}/downlevel_decorators_transform.ts | 4 +-- .../transform/jit/src}/index.ts | 4 +-- .../input_function.ts | 2 +- .../model_function.ts | 4 +-- .../output_function.ts | 2 +- .../query_functions.ts | 2 +- .../initializer_api_transforms/transform.ts | 10 +++---- .../transform_api.ts | 6 ++--- .../src/ngtsc/transform/jit/test/BUILD.bazel | 27 +++++++++++++++++++ .../downlevel_decorators_transform_spec.ts | 6 ++--- .../test/initializer_api_transforms_spec.ts | 11 +++----- .../signal_queries_metadata_transform_spec.ts | 11 +++----- packages/compiler-cli/test/BUILD.bazel | 27 +------------------ .../test/acceptance/authoring/BUILD.bazel | 2 +- .../authoring/authoring_test_compiler.ts | 2 +- 23 files changed, 78 insertions(+), 69 deletions(-) rename packages/compiler-cli/src/{transformers/jit_transforms => ngtsc/transform/jit}/BUILD.bazel (95%) create mode 100644 packages/compiler-cli/src/ngtsc/transform/jit/index.ts rename packages/compiler-cli/src/{transformers/jit_transforms => ngtsc/transform/jit/src}/downlevel_decorators_transform.ts (99%) rename packages/compiler-cli/src/{transformers/jit_transforms => ngtsc/transform/jit/src}/index.ts (95%) rename packages/compiler-cli/src/{transformers/jit_transforms => ngtsc/transform/jit/src}/initializer_api_transforms/input_function.ts (99%) rename packages/compiler-cli/src/{transformers/jit_transforms => ngtsc/transform/jit/src}/initializer_api_transforms/model_function.ts (97%) rename packages/compiler-cli/src/{transformers/jit_transforms => ngtsc/transform/jit/src}/initializer_api_transforms/output_function.ts (98%) rename packages/compiler-cli/src/{transformers/jit_transforms => ngtsc/transform/jit/src}/initializer_api_transforms/query_functions.ts (98%) rename packages/compiler-cli/src/{transformers/jit_transforms => ngtsc/transform/jit/src}/initializer_api_transforms/transform.ts (92%) rename packages/compiler-cli/src/{transformers/jit_transforms => ngtsc/transform/jit/src}/initializer_api_transforms/transform_api.ts (91%) create mode 100644 packages/compiler-cli/src/ngtsc/transform/jit/test/BUILD.bazel rename packages/compiler-cli/{ => src/ngtsc/transform/jit}/test/downlevel_decorators_transform_spec.ts (99%) rename packages/compiler-cli/{ => src/ngtsc/transform/jit}/test/initializer_api_transforms_spec.ts (98%) rename packages/compiler-cli/{ => src/ngtsc/transform/jit}/test/signal_queries_metadata_transform_spec.ts (96%) diff --git a/packages/compiler-cli/BUILD.bazel b/packages/compiler-cli/BUILD.bazel index a4556d039c5..f5d3511f48c 100644 --- a/packages/compiler-cli/BUILD.bazel +++ b/packages/compiler-cli/BUILD.bazel @@ -84,11 +84,11 @@ ts_library( "//packages/compiler-cli/src/ngtsc/program_driver", "//packages/compiler-cli/src/ngtsc/reflection", "//packages/compiler-cli/src/ngtsc/shims", + "//packages/compiler-cli/src/ngtsc/transform/jit", "//packages/compiler-cli/src/ngtsc/translator", "//packages/compiler-cli/src/ngtsc/typecheck", "//packages/compiler-cli/src/ngtsc/typecheck/api", "//packages/compiler-cli/src/ngtsc/util", - "//packages/compiler-cli/src/transformers/jit_transforms", "@npm//@bazel/concatjs", "@npm//@types/node", "@npm//@types/yargs", diff --git a/packages/compiler-cli/index.ts b/packages/compiler-cli/index.ts index 5e026bef8b1..fe80a0185ce 100644 --- a/packages/compiler-cli/index.ts +++ b/packages/compiler-cli/index.ts @@ -9,7 +9,7 @@ import {NodeJSFileSystem, setFileSystem} from './src/ngtsc/file_system'; export {VERSION} from './src/version'; -export * from './src/transformers/jit_transforms'; +export * from './src/ngtsc/transform/jit'; export * from './src/transformers/api'; export * from './src/transformers/entry_points'; diff --git a/packages/compiler-cli/private/BUILD.bazel b/packages/compiler-cli/private/BUILD.bazel index af0098fb252..feaf378c495 100644 --- a/packages/compiler-cli/private/BUILD.bazel +++ b/packages/compiler-cli/private/BUILD.bazel @@ -14,8 +14,8 @@ ts_library( "//packages/compiler-cli/src/ngtsc/perf", "//packages/compiler-cli/src/ngtsc/reflection", "//packages/compiler-cli/src/ngtsc/sourcemaps", + "//packages/compiler-cli/src/ngtsc/transform/jit", "//packages/compiler-cli/src/ngtsc/typecheck/api", - "//packages/compiler-cli/src/transformers/jit_transforms", "@npm//typescript", ], ) diff --git a/packages/compiler-cli/private/tooling.ts b/packages/compiler-cli/private/tooling.ts index cf689b57500..0427670666d 100644 --- a/packages/compiler-cli/private/tooling.ts +++ b/packages/compiler-cli/private/tooling.ts @@ -15,7 +15,7 @@ import ts from 'typescript'; -import {angularJitApplicationTransform} from '../src/transformers/jit_transforms/index'; +import {angularJitApplicationTransform} from '../src/ngtsc/transform/jit/index'; /** * Known values for global variables in `@angular/core` that Terser should set using diff --git a/packages/compiler-cli/src/ngtsc/core/BUILD.bazel b/packages/compiler-cli/src/ngtsc/core/BUILD.bazel index b5e23d57e17..756baa008d5 100644 --- a/packages/compiler-cli/src/ngtsc/core/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/core/BUILD.bazel @@ -34,6 +34,7 @@ ts_library( "//packages/compiler-cli/src/ngtsc/shims", "//packages/compiler-cli/src/ngtsc/shims:api", "//packages/compiler-cli/src/ngtsc/transform", + "//packages/compiler-cli/src/ngtsc/transform/jit", "//packages/compiler-cli/src/ngtsc/typecheck", "//packages/compiler-cli/src/ngtsc/typecheck/api", "//packages/compiler-cli/src/ngtsc/typecheck/diagnostics", @@ -44,7 +45,6 @@ ts_library( "//packages/compiler-cli/src/ngtsc/util", "//packages/compiler-cli/src/ngtsc/validation", "//packages/compiler-cli/src/ngtsc/xi18n", - "//packages/compiler-cli/src/transformers/jit_transforms", "@npm//@types/semver", "@npm//semver", "@npm//typescript", diff --git a/packages/compiler-cli/src/ngtsc/core/src/compiler.ts b/packages/compiler-cli/src/ngtsc/core/src/compiler.ts index 6c8dbf75587..20d03cd6041 100644 --- a/packages/compiler-cli/src/ngtsc/core/src/compiler.ts +++ b/packages/compiler-cli/src/ngtsc/core/src/compiler.ts @@ -124,7 +124,7 @@ import {DiagnosticCategoryLabel, NgCompilerAdapter, NgCompilerOptions} from '../ import {coreHasSymbol} from './core_version'; import {coreVersionSupportsFeature} from './feature_detection'; -import {angularJitApplicationTransform} from '@angular/compiler-cli/src/transformers/jit_transforms'; +import {angularJitApplicationTransform} from '../../transform/jit'; /** * State information about a compilation which is only generated once some data is requested from diff --git a/packages/compiler-cli/src/transformers/jit_transforms/BUILD.bazel b/packages/compiler-cli/src/ngtsc/transform/jit/BUILD.bazel similarity index 95% rename from packages/compiler-cli/src/transformers/jit_transforms/BUILD.bazel rename to packages/compiler-cli/src/ngtsc/transform/jit/BUILD.bazel index f17548207f4..8eaf55c2bc0 100644 --- a/packages/compiler-cli/src/transformers/jit_transforms/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/transform/jit/BUILD.bazel @@ -3,7 +3,7 @@ load("//tools:defaults.bzl", "ts_library") package(default_visibility = ["//visibility:public"]) ts_library( - name = "jit_transforms", + name = "jit", srcs = glob(["**/*.ts"]), deps = [ "//packages/compiler", diff --git a/packages/compiler-cli/src/ngtsc/transform/jit/index.ts b/packages/compiler-cli/src/ngtsc/transform/jit/index.ts new file mode 100644 index 00000000000..1e6455ed02b --- /dev/null +++ b/packages/compiler-cli/src/ngtsc/transform/jit/index.ts @@ -0,0 +1,13 @@ +/** + * @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 { + angularJitApplicationTransform, + getDownlevelDecoratorsTransform, + getInitializerApiJitTransform, +} from './src/index'; diff --git a/packages/compiler-cli/src/transformers/jit_transforms/downlevel_decorators_transform.ts b/packages/compiler-cli/src/ngtsc/transform/jit/src/downlevel_decorators_transform.ts similarity index 99% rename from packages/compiler-cli/src/transformers/jit_transforms/downlevel_decorators_transform.ts rename to packages/compiler-cli/src/ngtsc/transform/jit/src/downlevel_decorators_transform.ts index a7d4d2e2fc3..a09c2179f76 100644 --- a/packages/compiler-cli/src/transformers/jit_transforms/downlevel_decorators_transform.ts +++ b/packages/compiler-cli/src/ngtsc/transform/jit/src/downlevel_decorators_transform.ts @@ -8,8 +8,8 @@ import ts from 'typescript'; -import {isAliasImportDeclaration, loadIsReferencedAliasDeclarationPatch} from '../../ngtsc/imports'; -import {Decorator, ReflectionHost} from '../../ngtsc/reflection'; +import {isAliasImportDeclaration, loadIsReferencedAliasDeclarationPatch} from '../../../imports'; +import {Decorator, ReflectionHost} from '../../../reflection'; /** * Whether a given decorator should be treated as an Angular decorator. diff --git a/packages/compiler-cli/src/transformers/jit_transforms/index.ts b/packages/compiler-cli/src/ngtsc/transform/jit/src/index.ts similarity index 95% rename from packages/compiler-cli/src/transformers/jit_transforms/index.ts rename to packages/compiler-cli/src/ngtsc/transform/jit/src/index.ts index 20a173a5d88..c9d845829e2 100644 --- a/packages/compiler-cli/src/transformers/jit_transforms/index.ts +++ b/packages/compiler-cli/src/ngtsc/transform/jit/src/index.ts @@ -8,8 +8,8 @@ import ts from 'typescript'; -import {ImportedSymbolsTracker} from '../../ngtsc/imports'; -import {TypeScriptReflectionHost} from '../../ngtsc/reflection'; +import {ImportedSymbolsTracker} from '../../../imports'; +import {TypeScriptReflectionHost} from '../../../reflection'; import {getDownlevelDecoratorsTransform} from './downlevel_decorators_transform'; import {getInitializerApiJitTransform} from './initializer_api_transforms/transform'; diff --git a/packages/compiler-cli/src/transformers/jit_transforms/initializer_api_transforms/input_function.ts b/packages/compiler-cli/src/ngtsc/transform/jit/src/initializer_api_transforms/input_function.ts similarity index 99% rename from packages/compiler-cli/src/transformers/jit_transforms/initializer_api_transforms/input_function.ts rename to packages/compiler-cli/src/ngtsc/transform/jit/src/initializer_api_transforms/input_function.ts index 3b829aec216..574037f4f71 100644 --- a/packages/compiler-cli/src/transformers/jit_transforms/initializer_api_transforms/input_function.ts +++ b/packages/compiler-cli/src/ngtsc/transform/jit/src/initializer_api_transforms/input_function.ts @@ -9,7 +9,7 @@ import {core} from '@angular/compiler'; import ts from 'typescript'; -import {isAngularDecorator, tryParseSignalInputMapping} from '../../../ngtsc/annotations'; +import {isAngularDecorator, tryParseSignalInputMapping} from '../../../../annotations'; import { castAsAny, diff --git a/packages/compiler-cli/src/transformers/jit_transforms/initializer_api_transforms/model_function.ts b/packages/compiler-cli/src/ngtsc/transform/jit/src/initializer_api_transforms/model_function.ts similarity index 97% rename from packages/compiler-cli/src/transformers/jit_transforms/initializer_api_transforms/model_function.ts rename to packages/compiler-cli/src/ngtsc/transform/jit/src/initializer_api_transforms/model_function.ts index aa23b92e40a..fa6ce9f5c44 100644 --- a/packages/compiler-cli/src/transformers/jit_transforms/initializer_api_transforms/model_function.ts +++ b/packages/compiler-cli/src/ngtsc/transform/jit/src/initializer_api_transforms/model_function.ts @@ -9,8 +9,8 @@ import {Decorator} from '@angular/compiler-cli/src/ngtsc/reflection'; import ts from 'typescript'; -import {isAngularDecorator, tryParseSignalModelMapping} from '../../../ngtsc/annotations'; -import {ImportManager} from '../../../ngtsc/translator'; +import {isAngularDecorator, tryParseSignalModelMapping} from '../../../../annotations'; +import {ImportManager} from '../../../../translator'; import {createSyntheticAngularCoreDecoratorAccess, PropertyTransform} from './transform_api'; diff --git a/packages/compiler-cli/src/transformers/jit_transforms/initializer_api_transforms/output_function.ts b/packages/compiler-cli/src/ngtsc/transform/jit/src/initializer_api_transforms/output_function.ts similarity index 98% rename from packages/compiler-cli/src/transformers/jit_transforms/initializer_api_transforms/output_function.ts rename to packages/compiler-cli/src/ngtsc/transform/jit/src/initializer_api_transforms/output_function.ts index 77c0ccb01a9..f6f500ec35b 100644 --- a/packages/compiler-cli/src/transformers/jit_transforms/initializer_api_transforms/output_function.ts +++ b/packages/compiler-cli/src/ngtsc/transform/jit/src/initializer_api_transforms/output_function.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {isAngularDecorator, tryParseInitializerBasedOutput} from '../../../ngtsc/annotations'; +import {isAngularDecorator, tryParseInitializerBasedOutput} from '../../../../annotations'; import {createSyntheticAngularCoreDecoratorAccess, PropertyTransform} from './transform_api'; diff --git a/packages/compiler-cli/src/transformers/jit_transforms/initializer_api_transforms/query_functions.ts b/packages/compiler-cli/src/ngtsc/transform/jit/src/initializer_api_transforms/query_functions.ts similarity index 98% rename from packages/compiler-cli/src/transformers/jit_transforms/initializer_api_transforms/query_functions.ts rename to packages/compiler-cli/src/ngtsc/transform/jit/src/initializer_api_transforms/query_functions.ts index 5efe94b2962..b08c4b33636 100644 --- a/packages/compiler-cli/src/transformers/jit_transforms/initializer_api_transforms/query_functions.ts +++ b/packages/compiler-cli/src/ngtsc/transform/jit/src/initializer_api_transforms/query_functions.ts @@ -11,7 +11,7 @@ import { queryDecoratorNames, QueryFunctionName, tryParseSignalQueryFromInitializer, -} from '../../../ngtsc/annotations'; +} from '../../../../annotations'; import { castAsAny, diff --git a/packages/compiler-cli/src/transformers/jit_transforms/initializer_api_transforms/transform.ts b/packages/compiler-cli/src/ngtsc/transform/jit/src/initializer_api_transforms/transform.ts similarity index 92% rename from packages/compiler-cli/src/transformers/jit_transforms/initializer_api_transforms/transform.ts rename to packages/compiler-cli/src/ngtsc/transform/jit/src/initializer_api_transforms/transform.ts index e9d1cde98e2..032bb1177e0 100644 --- a/packages/compiler-cli/src/transformers/jit_transforms/initializer_api_transforms/transform.ts +++ b/packages/compiler-cli/src/ngtsc/transform/jit/src/initializer_api_transforms/transform.ts @@ -6,13 +6,13 @@ * found in the LICENSE file at https://angular.io/license */ -import {reflectClassMember} from '@angular/compiler-cli/src/ngtsc/reflection/src/typescript'; import ts from 'typescript'; -import {isAngularDecorator} from '../../../ngtsc/annotations'; -import {ImportedSymbolsTracker} from '../../../ngtsc/imports'; -import {ReflectionHost} from '../../../ngtsc/reflection'; -import {ImportManager} from '../../../ngtsc/translator'; +import {isAngularDecorator} from '../../../../annotations'; +import {ImportedSymbolsTracker} from '../../../../imports'; +import {ReflectionHost} from '../../../../reflection'; +import {reflectClassMember} from '../../../../reflection/src/typescript'; +import {ImportManager} from '../../../../translator'; import {signalInputsTransform} from './input_function'; import {signalModelTransform} from './model_function'; diff --git a/packages/compiler-cli/src/transformers/jit_transforms/initializer_api_transforms/transform_api.ts b/packages/compiler-cli/src/ngtsc/transform/jit/src/initializer_api_transforms/transform_api.ts similarity index 91% rename from packages/compiler-cli/src/transformers/jit_transforms/initializer_api_transforms/transform_api.ts rename to packages/compiler-cli/src/ngtsc/transform/jit/src/initializer_api_transforms/transform_api.ts index 6f108d6b6c6..83b7564a85c 100644 --- a/packages/compiler-cli/src/transformers/jit_transforms/initializer_api_transforms/transform_api.ts +++ b/packages/compiler-cli/src/ngtsc/transform/jit/src/initializer_api_transforms/transform_api.ts @@ -8,9 +8,9 @@ import ts from 'typescript'; -import {ImportedSymbolsTracker} from '../../../ngtsc/imports'; -import {ClassMember, Decorator, ReflectionHost} from '../../../ngtsc/reflection'; -import {ImportManager} from '../../../ngtsc/translator'; +import {ImportedSymbolsTracker} from '../../../../imports'; +import {ClassMember, Decorator, ReflectionHost} from '../../../../reflection'; +import {ImportManager} from '../../../../translator'; /** Function that can be used to transform class properties. */ export type PropertyTransform = ( diff --git a/packages/compiler-cli/src/ngtsc/transform/jit/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/transform/jit/test/BUILD.bazel new file mode 100644 index 00000000000..b90082c6e00 --- /dev/null +++ b/packages/compiler-cli/src/ngtsc/transform/jit/test/BUILD.bazel @@ -0,0 +1,27 @@ +load("//tools:defaults.bzl", "jasmine_node_test", "ts_library") + +ts_library( + name = "test_lib", + testonly = True, + srcs = [ + "downlevel_decorators_transform_spec.ts", + "initializer_api_transforms_spec.ts", + "signal_queries_metadata_transform_spec.ts", + ], + deps = [ + "//packages/compiler-cli/src/ngtsc/imports", + "//packages/compiler-cli/src/ngtsc/partial_evaluator", + "//packages/compiler-cli/src/ngtsc/reflection", + "//packages/compiler-cli/src/ngtsc/transform/jit", + "//packages/compiler-cli/test:test_utils", + "@npm//typescript", + ], +) + +jasmine_node_test( + name = "test", + bootstrap = ["//tools/testing:node"], + deps = [ + ":test_lib", + ], +) diff --git a/packages/compiler-cli/test/downlevel_decorators_transform_spec.ts b/packages/compiler-cli/src/ngtsc/transform/jit/test/downlevel_decorators_transform_spec.ts similarity index 99% rename from packages/compiler-cli/test/downlevel_decorators_transform_spec.ts rename to packages/compiler-cli/src/ngtsc/transform/jit/test/downlevel_decorators_transform_spec.ts index 582d09986ca..674ca4f3f41 100644 --- a/packages/compiler-cli/test/downlevel_decorators_transform_spec.ts +++ b/packages/compiler-cli/src/ngtsc/transform/jit/test/downlevel_decorators_transform_spec.ts @@ -8,10 +8,10 @@ import ts from 'typescript'; -import {TypeScriptReflectionHost} from '../src/ngtsc/reflection'; -import {getDownlevelDecoratorsTransform} from '../src/transformers/jit_transforms/index'; +import {TypeScriptReflectionHost} from '../../../reflection'; +import {getDownlevelDecoratorsTransform} from '../index'; -import {MockAotContext, MockCompilerHost} from './mocks'; +import {MockAotContext, MockCompilerHost} from '../../../../../test/mocks'; const TEST_FILE_INPUT = '/test.ts'; const TEST_FILE_OUTPUT = `/test.js`; diff --git a/packages/compiler-cli/test/initializer_api_transforms_spec.ts b/packages/compiler-cli/src/ngtsc/transform/jit/test/initializer_api_transforms_spec.ts similarity index 98% rename from packages/compiler-cli/test/initializer_api_transforms_spec.ts rename to packages/compiler-cli/src/ngtsc/transform/jit/test/initializer_api_transforms_spec.ts index 001d2395ba9..661da20ee82 100644 --- a/packages/compiler-cli/test/initializer_api_transforms_spec.ts +++ b/packages/compiler-cli/src/ngtsc/transform/jit/test/initializer_api_transforms_spec.ts @@ -8,14 +8,11 @@ import ts from 'typescript'; -import {ImportedSymbolsTracker} from '../src/ngtsc/imports'; -import {TypeScriptReflectionHost} from '../src/ngtsc/reflection'; -import { - getDownlevelDecoratorsTransform, - getInitializerApiJitTransform, -} from '../src/transformers/jit_transforms'; +import {ImportedSymbolsTracker} from '../../../imports'; +import {TypeScriptReflectionHost} from '../../../reflection'; +import {getDownlevelDecoratorsTransform, getInitializerApiJitTransform} from '../index'; -import {MockAotContext, MockCompilerHost} from './mocks'; +import {MockAotContext, MockCompilerHost} from '../../../../../test/mocks'; const TEST_FILE_INPUT = '/test.ts'; const TEST_FILE_OUTPUT = `/test.js`; diff --git a/packages/compiler-cli/test/signal_queries_metadata_transform_spec.ts b/packages/compiler-cli/src/ngtsc/transform/jit/test/signal_queries_metadata_transform_spec.ts similarity index 96% rename from packages/compiler-cli/test/signal_queries_metadata_transform_spec.ts rename to packages/compiler-cli/src/ngtsc/transform/jit/test/signal_queries_metadata_transform_spec.ts index 48f66e246d8..b562eb7b269 100644 --- a/packages/compiler-cli/test/signal_queries_metadata_transform_spec.ts +++ b/packages/compiler-cli/src/ngtsc/transform/jit/test/signal_queries_metadata_transform_spec.ts @@ -8,14 +8,11 @@ import ts from 'typescript'; -import {ImportedSymbolsTracker} from '../src/ngtsc/imports'; -import {TypeScriptReflectionHost} from '../src/ngtsc/reflection'; -import { - getDownlevelDecoratorsTransform, - getInitializerApiJitTransform, -} from '../src/transformers/jit_transforms'; +import {ImportedSymbolsTracker} from '../../../imports'; +import {TypeScriptReflectionHost} from '../../../reflection'; +import {getDownlevelDecoratorsTransform, getInitializerApiJitTransform} from '../index'; -import {MockAotContext, MockCompilerHost} from './mocks'; +import {MockAotContext, MockCompilerHost} from '../../../../../test/mocks'; const TEST_FILE_INPUT = '/test.ts'; const TEST_FILE_OUTPUT = `/test.js`; diff --git a/packages/compiler-cli/test/BUILD.bazel b/packages/compiler-cli/test/BUILD.bazel index cd0e19b318e..0b0ee1df2e1 100644 --- a/packages/compiler-cli/test/BUILD.bazel +++ b/packages/compiler-cli/test/BUILD.bazel @@ -11,6 +11,7 @@ ts_library( ], visibility = [ ":__subpackages__", + "//packages/compiler-cli/src/ngtsc/transform/jit/test:__pkg__", "//packages/language-service/test:__subpackages__", ], deps = [ @@ -52,32 +53,6 @@ jasmine_node_test( ], ) -ts_library( - name = "jit_transforms_test_lib", - testonly = True, - srcs = [ - "downlevel_decorators_transform_spec.ts", - "initializer_api_transforms_spec.ts", - "signal_queries_metadata_transform_spec.ts", - ], - deps = [ - ":test_utils", - "//packages/compiler-cli/src/ngtsc/imports", - "//packages/compiler-cli/src/ngtsc/partial_evaluator", - "//packages/compiler-cli/src/ngtsc/reflection", - "//packages/compiler-cli/src/transformers/jit_transforms", - "@npm//typescript", - ], -) - -jasmine_node_test( - name = "jit_transforms_test", - bootstrap = ["//tools/testing:node"], - deps = [ - ":jit_transforms_test_lib", - ], -) - # perform_watch_spec ts_library( name = "perform_watch_lib", diff --git a/packages/core/test/acceptance/authoring/BUILD.bazel b/packages/core/test/acceptance/authoring/BUILD.bazel index 002f28a0c76..8a00e263817 100644 --- a/packages/core/test/acceptance/authoring/BUILD.bazel +++ b/packages/core/test/acceptance/authoring/BUILD.bazel @@ -24,7 +24,7 @@ ts_library( "//packages/compiler-cli/src/ngtsc/imports", "//packages/compiler-cli/src/ngtsc/partial_evaluator", "//packages/compiler-cli/src/ngtsc/reflection", - "//packages/compiler-cli/src/transformers/jit_transforms", + "//packages/compiler-cli/src/ngtsc/transform/jit", "@npm//typescript", ], ) diff --git a/packages/core/test/acceptance/authoring/authoring_test_compiler.ts b/packages/core/test/acceptance/authoring/authoring_test_compiler.ts index a365f4cbd1b..86cad5e29b0 100644 --- a/packages/core/test/acceptance/authoring/authoring_test_compiler.ts +++ b/packages/core/test/acceptance/authoring/authoring_test_compiler.ts @@ -8,7 +8,7 @@ import {ImportedSymbolsTracker} from '@angular/compiler-cli/src/ngtsc/imports'; import {TypeScriptReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection'; -import {getInitializerApiJitTransform} from '@angular/compiler-cli/src/transformers/jit_transforms'; +import {getInitializerApiJitTransform} from '@angular/compiler-cli/src/ngtsc/transform/jit'; import fs from 'fs'; import path from 'path'; import ts from 'typescript';