Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit bf11f86

Browse files
JeanMecheJeanMeche
committed
refactor(compiler-cli): remove deep imports from compiler-cli
Accessed symbols are grouped into dedicated `private` entries
1 parent 8e50cdb commit bf11f86

File tree

96 files changed

+318
-287
lines changed

Some content is hidden

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

96 files changed

+318
-287
lines changed

‎packages/compiler-cli/BUILD.bazel‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,11 @@ ts_project(
8686
"//packages/compiler-cli/src/ngtsc/diagnostics",
8787
"//packages/compiler-cli/src/ngtsc/docs",
8888
"//packages/compiler-cli/src/ngtsc/file_system",
89+
"//packages/compiler-cli/src/ngtsc/file_system/testing",
8990
"//packages/compiler-cli/src/ngtsc/incremental",
9091
"//packages/compiler-cli/src/ngtsc/indexer",
9192
"//packages/compiler-cli/src/ngtsc/logging",
93+
"//packages/compiler-cli/src/ngtsc/logging/testing",
9294
"//packages/compiler-cli/src/ngtsc/perf",
9395
"//packages/compiler-cli/src/ngtsc/program_driver",
9496
"//packages/compiler-cli/src/ngtsc/reflection",

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ package(default_visibility = ["//visibility:public"])
55
copy_to_bin(
66
name = "files",
77
srcs = [
8+
"docs.ts",
9+
"language_service.ts",
810
"localize.ts",
911
"migrations.ts",
1012
"testing.ts",
@@ -14,25 +16,33 @@ copy_to_bin(
1416

1517
ts_project(
1618
name = "private",
17-
srcs = glob(["*.ts"]),
19+
srcs = glob(
20+
["*.ts"],
21+
),
1822
deps = [
1923
"//:node_modules/typescript",
2024
"//packages/compiler-cli/src/ngtsc/annotations",
2125
"//packages/compiler-cli/src/ngtsc/core",
2226
"//packages/compiler-cli/src/ngtsc/diagnostics",
27+
"//packages/compiler-cli/src/ngtsc/docs",
2328
"//packages/compiler-cli/src/ngtsc/file_system",
2429
"//packages/compiler-cli/src/ngtsc/file_system/testing",
2530
"//packages/compiler-cli/src/ngtsc/imports",
31+
"//packages/compiler-cli/src/ngtsc/incremental",
2632
"//packages/compiler-cli/src/ngtsc/logging",
33+
"//packages/compiler-cli/src/ngtsc/logging/testing",
2734
"//packages/compiler-cli/src/ngtsc/metadata",
2835
"//packages/compiler-cli/src/ngtsc/partial_evaluator",
2936
"//packages/compiler-cli/src/ngtsc/perf",
37+
"//packages/compiler-cli/src/ngtsc/program_driver",
3038
"//packages/compiler-cli/src/ngtsc/reflection",
3139
"//packages/compiler-cli/src/ngtsc/shims",
3240
"//packages/compiler-cli/src/ngtsc/sourcemaps",
41+
"//packages/compiler-cli/src/ngtsc/testing",
3342
"//packages/compiler-cli/src/ngtsc/transform",
3443
"//packages/compiler-cli/src/ngtsc/transform/jit",
3544
"//packages/compiler-cli/src/ngtsc/translator",
45+
"//packages/compiler-cli/src/ngtsc/typecheck",
3646
"//packages/compiler-cli/src/ngtsc/typecheck/api",
3747
"//packages/compiler-cli/src/ngtsc/util",
3848
],

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
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 type {DocEntry, DocEntryWithSourceInfo, EntryType, EntryCollection} from '../src/ngtsc/docs';

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

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
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 {getAngularDecorators} from '../src/ngtsc/annotations';
10+
export {
11+
CompilationTicket,
12+
freshCompilationTicket,
13+
incrementalFromCompilerTicket,
14+
InternalOptions,
15+
LegacyNgcOptions,
16+
NgCompiler,
17+
NgCompilerAdapter,
18+
NgCompilerOptions,
19+
resourceChangeTicket,
20+
TypeCheckingOptions,
21+
} from '../src/ngtsc/core';
22+
export {Reference} from '../src/ngtsc/imports';
23+
export {TrackedIncrementalBuildStrategy} from '../src/ngtsc/incremental';
24+
export {
25+
DirectiveMeta,
26+
isExternalResource,
27+
MetaKind,
28+
PipeMeta,
29+
Resource,
30+
} from '../src/ngtsc/metadata';
31+
export {PerfPhase} from '../src/ngtsc/perf';
32+
export {FileUpdate, ProgramDriver} from '../src/ngtsc/program_driver';
33+
export {
34+
ClassDeclaration,
35+
DeclarationNode,
36+
isNamedClassDeclaration,
37+
ReflectionHost,
38+
} from '../src/ngtsc/reflection';
39+
export {isShim} from '../src/ngtsc/shims';
40+
export {
41+
ExpressionIdentifier,
42+
findFirstMatchingNode,
43+
hasExpressionIdentifier,
44+
} from '../src/ngtsc/typecheck';
45+
export {
46+
CompletionKind,
47+
DirectiveModuleExportDetails,
48+
DirectiveSymbol,
49+
DomBindingSymbol,
50+
ElementSymbol,
51+
InputBindingSymbol,
52+
LetDeclarationSymbol,
53+
OutputBindingSymbol,
54+
PipeSymbol,
55+
PotentialDirective,
56+
PotentialDirectiveModuleSpecifierResolver,
57+
PotentialImportMode,
58+
PotentialPipe,
59+
ReferenceSymbol,
60+
SelectorlessComponentSymbol,
61+
SelectorlessDirectiveSymbol,
62+
Symbol,
63+
SymbolKind,
64+
TcbLocation,
65+
TemplateDeclarationSymbol,
66+
TemplateSymbol,
67+
TemplateTypeChecker,
68+
TsCompletionEntryInfo,
69+
TypeCheckableDirectiveMeta,
70+
VariableSymbol,
71+
} from '../src/ngtsc/typecheck/api';
72+
export {getRootDirs} from '../src/ngtsc/util/src/typescript';

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,13 @@ export {ImportedSymbolsTracker} from '../src/ngtsc/imports';
1010
export {TypeScriptReflectionHost} from '../src/ngtsc/reflection';
1111
export {getInitializerApiJitTransform} from '../src/ngtsc/transform/jit';
1212

13-
export {initMockFileSystem, MockFileSystem} from '../src/ngtsc/file_system/testing';
13+
export {
14+
initMockFileSystem,
15+
MockFileSystem,
16+
MockFileSystemNative,
17+
runInEachFileSystem,
18+
} from '../src/ngtsc/file_system/testing';
19+
20+
export {MockLogger} from '../src/ngtsc/logging/testing';
21+
export {loadTestDirectory, loadStandardTestFiles, getCachedSourceFile} from '../src/ngtsc/testing';
22+
export {NgCompilerOptions} from '../src/ngtsc/core';

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@
66
* found in the LICENSE file at https://angular.dev/license
77
*/
88

9+
export {
10+
DiagnosticCategoryLabel,
11+
InternalOptions,
12+
LegacyNgcOptions,
13+
NgCompilerAdapter,
14+
NgCompilerOptions,
15+
TypeCheckingOptions,
16+
UnifiedModulesHost,
17+
} from './api';
918
export * from './src/compiler';
1019
export {NgCompilerHost} from './src/host';
11-
export {UnifiedModulesHost, NgCompilerOptions, DiagnosticCategoryLabel} from './api';

‎packages/compiler-cli/src/ngtsc/testing/BUILD.bazel‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ package(default_visibility = ["//visibility:public"])
44

55
ts_project(
66
name = "testing",
7-
testonly = True,
87
srcs = glob([
98
"**/*.ts",
109
]),

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ export {TypeCheckContextImpl, getTemplateDiagnostics} from './src/context';
1111
export {TypeCheckShimGenerator} from './src/shim';
1212
export {typeCheckFilePath} from './src/type_check_file';
1313
export {createHostElement} from './src/host_bindings';
14+
export {ExpressionIdentifier, findFirstMatchingNode, hasExpressionIdentifier} from './src/comments';

‎packages/language-service/src/BUILD.bazel‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,7 @@ ts_project(
1212
"//:node_modules/typescript",
1313
"//packages/compiler",
1414
"//packages/compiler-cli",
15-
"//packages/compiler-cli/src/ngtsc/core",
16-
"//packages/compiler-cli/src/ngtsc/core:api",
17-
"//packages/compiler-cli/src/ngtsc/diagnostics",
18-
"//packages/compiler-cli/src/ngtsc/file_system",
19-
"//packages/compiler-cli/src/ngtsc/imports",
20-
"//packages/compiler-cli/src/ngtsc/incremental",
21-
"//packages/compiler-cli/src/ngtsc/metadata",
22-
"//packages/compiler-cli/src/ngtsc/perf",
23-
"//packages/compiler-cli/src/ngtsc/program_driver",
24-
"//packages/compiler-cli/src/ngtsc/reflection",
25-
"//packages/compiler-cli/src/ngtsc/shims",
26-
"//packages/compiler-cli/src/ngtsc/typecheck",
27-
"//packages/compiler-cli/src/ngtsc/typecheck/api",
28-
"//packages/compiler-cli/src/ngtsc/util",
15+
"//packages/compiler-cli/private",
2916
"//packages/core/schematics/migrations/signal-migration/src",
3017
"//packages/language-service:api",
3118
"//packages/language-service/src/refactorings",

‎packages/language-service/src/adapters.ts‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,18 @@
88

99
/** @fileoverview provides adapters for communicating with the ng compiler */
1010

11-
import {ConfigurationHost} from '@angular/compiler-cli';
12-
import {NgCompilerAdapter} from '@angular/compiler-cli/src/ngtsc/core/api';
1311
import {
1412
AbsoluteFsPath,
13+
ConfigurationHost,
1514
FileStats,
1615
PathSegment,
1716
PathString,
18-
} from '@angular/compiler-cli/src/ngtsc/file_system';
19-
import {isShim} from '@angular/compiler-cli/src/ngtsc/shims';
20-
import {getRootDirs} from '@angular/compiler-cli/src/ngtsc/util/src/typescript';
17+
} from '@angular/compiler-cli';
18+
import {
19+
getRootDirs,
20+
isShim,
21+
NgCompilerAdapter,
22+
} from '@angular/compiler-cli/private/language_service';
2123
import * as p from 'path';
2224
import ts from 'typescript';
2325

0 commit comments

Comments
 (0)