Skip to content

Commit 8e50cdb

Browse files
JeanMechecrisbeto
JeanMeche
authored and
crisbeto
committed
refactor(compiler-cli): Remove deep imports of compiler-cli in angular/core
migration schematics will pull from `compiler-cli/private/migrations` core tests will pull from `compiler-cli/private/testing`
1 parent 33a872d commit 8e50cdb

File tree

94 files changed

+296
-297
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+296
-297
lines changed

‎packages/compiler-cli/index.ts‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,16 @@ export {OptimizeFor} from './src/ngtsc/typecheck/api';
3535
// needing to use a default import. NodeJS will expose named CJS exports as named ESM exports.
3636
// TODO(devversion): Remove these duplicate exports once devmode&prodmode is combined/ESM.
3737
export {ConsoleLogger, Logger, LogLevel} from './src/ngtsc/logging';
38-
export {NodeJSFileSystem, absoluteFrom, FileSystem, AbsoluteFsPath} from './src/ngtsc/file_system';
38+
export {
39+
NodeJSFileSystem,
40+
absoluteFrom,
41+
FileSystem,
42+
AbsoluteFsPath,
43+
NgtscCompilerHost,
44+
getFileSystem,
45+
setFileSystem,
46+
isLocalRelativePath,
47+
} from './src/ngtsc/file_system';
3948

4049
// Export documentation entities for Angular-internal API doc generation.
4150
export * from './src/ngtsc/docs';

‎packages/compiler-cli/package.json‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,9 @@
2424
"types": "./linker/babel/index.d.ts",
2525
"default": "./bundles/linker/babel/index.js"
2626
},
27-
"./private/localize": {
28-
"types": "./private/localize.d.ts",
29-
"default": "./bundles/private/localize.js"
30-
},
31-
"./private/migrations": {
32-
"types": "./private/migrations.d.ts",
33-
"default": "./bundles/private/migrations.js"
34-
},
35-
"./private/tooling": {
36-
"types": "./private/tooling.d.ts",
37-
"default": "./bundles/private/tooling.js"
27+
"./private/*": {
28+
"types": "./private/*.d.ts",
29+
"default": "./bundles/private/*.js"
3830
}
3931
},
4032
"dependencies": {

‎packages/compiler-cli/private/BUILD.bazel‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ copy_to_bin(
77
srcs = [
88
"localize.ts",
99
"migrations.ts",
10+
"testing.ts",
1011
"tooling.ts",
1112
],
1213
)
@@ -17,15 +18,22 @@ ts_project(
1718
deps = [
1819
"//:node_modules/typescript",
1920
"//packages/compiler-cli/src/ngtsc/annotations",
21+
"//packages/compiler-cli/src/ngtsc/core",
22+
"//packages/compiler-cli/src/ngtsc/diagnostics",
2023
"//packages/compiler-cli/src/ngtsc/file_system",
24+
"//packages/compiler-cli/src/ngtsc/file_system/testing",
2125
"//packages/compiler-cli/src/ngtsc/imports",
2226
"//packages/compiler-cli/src/ngtsc/logging",
27+
"//packages/compiler-cli/src/ngtsc/metadata",
2328
"//packages/compiler-cli/src/ngtsc/partial_evaluator",
2429
"//packages/compiler-cli/src/ngtsc/perf",
2530
"//packages/compiler-cli/src/ngtsc/reflection",
31+
"//packages/compiler-cli/src/ngtsc/shims",
2632
"//packages/compiler-cli/src/ngtsc/sourcemaps",
33+
"//packages/compiler-cli/src/ngtsc/transform",
2734
"//packages/compiler-cli/src/ngtsc/transform/jit",
2835
"//packages/compiler-cli/src/ngtsc/translator",
2936
"//packages/compiler-cli/src/ngtsc/typecheck/api",
37+
"//packages/compiler-cli/src/ngtsc/util",
3038
],
3139
)

‎packages/compiler-cli/private/migrations.ts‎

Lines changed: 50 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,67 @@
1111
* package requires for migration schematics.
1212
*/
1313

14-
export {createForwardRefResolver} from '../src/ngtsc/annotations';
15-
export {AbsoluteFsPath} from '../src/ngtsc/file_system';
16-
export {Reference} from '../src/ngtsc/imports';
14+
export {
15+
createForwardRefResolver,
16+
ExternalTemplateDeclaration,
17+
extractDecoratorQueryMetadata,
18+
extractTemplate,
19+
findAngularDecorator,
20+
getAngularDecorators,
21+
InlineTemplateDeclaration,
22+
queryDecoratorNames,
23+
QueryFunctionName,
24+
ResourceLoader,
25+
unwrapExpression,
26+
parseDecoratorInputTransformFunction,
27+
} from '../src/ngtsc/annotations';
28+
export {
29+
AbsoluteFsPath,
30+
FileSystem,
31+
getFileSystem,
32+
isLocalRelativePath,
33+
NodeJSFileSystem,
34+
} from '../src/ngtsc/file_system';
35+
export {CompilationMode} from '../src/ngtsc/transform';
36+
37+
export {
38+
DiagnosticCategoryLabel,
39+
NgCompiler,
40+
NgCompilerOptions,
41+
UnifiedModulesHost,
42+
} from '../src/ngtsc/core';
43+
export {Reference, ReferenceEmitter, ReferenceEmitKind} from '../src/ngtsc/imports';
44+
export {
45+
DecoratorInputTransform,
46+
DtsMetadataReader,
47+
MetadataReader,
48+
DirectiveMeta,
49+
InputMapping,
50+
} from '../src/ngtsc/metadata';
1751
export {
1852
DynamicValue,
1953
PartialEvaluator,
2054
ResolvedValue,
2155
ResolvedValueMap,
2256
StaticInterpreter,
2357
} from '../src/ngtsc/partial_evaluator';
24-
export {reflectObjectLiteral, TypeScriptReflectionHost} from '../src/ngtsc/reflection';
58+
export {
59+
ClassDeclaration,
60+
Decorator,
61+
ReflectionHost,
62+
reflectObjectLiteral,
63+
TypeScriptReflectionHost,
64+
} from '../src/ngtsc/reflection';
2565
export {
2666
PotentialImport,
2767
PotentialImportKind,
2868
PotentialImportMode,
69+
SymbolKind,
2970
TemplateTypeChecker,
3071
} from '../src/ngtsc/typecheck/api';
72+
73+
export {getRootDirs} from '../src/ngtsc/util/src/typescript';
74+
75+
export {FatalDiagnosticError} from '../src/ngtsc/diagnostics';
76+
export {isShim} from '../src/ngtsc/shims';
3177
export {ImportManager} from '../src/ngtsc/translator';

‎packages/compiler-cli/private/testing.ts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/**
2+
* @license
3+
* Copyright Google LLC All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.dev/license
7+
*/
8+
9+
export {ImportedSymbolsTracker} from '../src/ngtsc/imports';
10+
export {TypeScriptReflectionHost} from '../src/ngtsc/reflection';
11+
export {getInitializerApiJitTransform} from '../src/ngtsc/transform/jit';
12+
13+
export {initMockFileSystem, MockFileSystem} from '../src/ngtsc/file_system/testing';

‎packages/compiler-cli/src/ngtsc/annotations/index.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,14 @@ export {
1818
ResourceLoader,
1919
ResourceLoaderContext,
2020
JitDeclarationRegistry,
21+
unwrapExpression,
2122
} from './common';
2223
export {ComponentDecoratorHandler} from './component';
24+
export {
25+
extractTemplate,
26+
ExternalTemplateDeclaration,
27+
InlineTemplateDeclaration,
28+
} from './component/src/resources';
2329
export {
2430
DirectiveDecoratorHandler,
2531
InitializerApiFunction,
@@ -34,6 +40,8 @@ export {
3440
tryParseSignalInputMapping,
3541
tryParseSignalModelMapping,
3642
tryParseSignalQueryFromInitializer,
43+
extractDecoratorQueryMetadata,
44+
parseDecoratorInputTransformFunction,
3745
} from './directive';
3846
export {NgModuleDecoratorHandler} from './ng_module';
3947
export {InjectableDecoratorHandler} from './src/injectable';

‎packages/compiler-cli/src/ngtsc/core/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@
88

99
export * from './src/compiler';
1010
export {NgCompilerHost} from './src/host';
11+
export {UnifiedModulesHost, NgCompilerOptions, DiagnosticCategoryLabel} from './api';

‎packages/core/BUILD.bazel‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,6 @@ ng_package(
7575
"//integration:__subpackages__",
7676
"//modules/ssr-benchmarks:__subpackages__",
7777
"//packages/bazel/test/ng_package:__pkg__",
78-
"//packages/compiler-cli/src/ngtsc/metadata/test:__subpackages__",
79-
"//packages/compiler-cli/src/ngtsc/typecheck/extended/test:__subpackages__",
80-
"//packages/compiler-cli/src/ngtsc/typecheck/test:__subpackages__",
8178
"//packages/compiler-cli/test:__subpackages__",
8279
"//packages/compiler/test:__pkg__",
8380
"//packages/language-service/test:__pkg__",

‎packages/core/schematics/migrations/application-config-core/BUILD.bazel‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ ts_project(
1414
"//:node_modules/@angular-devkit/schematics",
1515
"//:node_modules/typescript",
1616
"//packages/compiler-cli/private",
17-
"//packages/compiler-cli/src/ngtsc/file_system",
1817
"//packages/core/schematics/utils",
1918
"//packages/core/schematics/utils/tsurge",
2019
"//packages/core/schematics/utils/tsurge/helpers/angular_devkit",

‎packages/core/schematics/migrations/bootstrap-options-migration/BUILD.bazel‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ ts_project(
1717
"//:node_modules/@angular-devkit/schematics",
1818
"//:node_modules/typescript",
1919
"//packages/compiler-cli/private",
20-
"//packages/compiler-cli/src/ngtsc/file_system",
2120
"//packages/core/schematics/utils",
2221
"//packages/core/schematics/utils/tsurge",
2322
"//packages/core/schematics/utils/tsurge/helpers/angular_devkit",
@@ -32,7 +31,6 @@ ts_project(
3231
":bootstrap-options-migration",
3332
"//:node_modules/typescript",
3433
"//packages/compiler-cli",
35-
"//packages/compiler-cli/src/ngtsc/file_system/testing",
3634
"//packages/core/schematics/utils/tsurge",
3735
],
3836
)

0 commit comments

Comments
 (0)