diff --git a/.ng-dev/google-sync-config.json b/.ng-dev/google-sync-config.json index 89d77442a048..bc509a6b47b0 100644 --- a/.ng-dev/google-sync-config.json +++ b/.ng-dev/google-sync-config.json @@ -6,7 +6,7 @@ "packages/bazel/**", "packages/compiler-cli/linker/**", "packages/compiler-cli/src/ngtsc/sourcemaps/**", - "packages/compiler-cli/src/ngtsc/testing/**", + "packages/compiler-cli/src/ngtsc/testing/fake_common/**", "packages/compiler-cli/private/bazel.ts", "packages/compiler-cli/private/localize.ts", "packages/compiler-cli/private/tooling.ts", diff --git a/packages/compiler-cli/BUILD.bazel b/packages/compiler-cli/BUILD.bazel index a70f2e785cc7..6c5c860c4521 100644 --- a/packages/compiler-cli/BUILD.bazel +++ b/packages/compiler-cli/BUILD.bazel @@ -86,9 +86,11 @@ ts_project( "//packages/compiler-cli/src/ngtsc/diagnostics", "//packages/compiler-cli/src/ngtsc/docs", "//packages/compiler-cli/src/ngtsc/file_system", + "//packages/compiler-cli/src/ngtsc/file_system/testing", "//packages/compiler-cli/src/ngtsc/incremental", "//packages/compiler-cli/src/ngtsc/indexer", "//packages/compiler-cli/src/ngtsc/logging", + "//packages/compiler-cli/src/ngtsc/logging/testing", "//packages/compiler-cli/src/ngtsc/perf", "//packages/compiler-cli/src/ngtsc/program_driver", "//packages/compiler-cli/src/ngtsc/reflection", diff --git a/packages/compiler-cli/private/BUILD.bazel b/packages/compiler-cli/private/BUILD.bazel index 2b4a95133096..1073851492fb 100644 --- a/packages/compiler-cli/private/BUILD.bazel +++ b/packages/compiler-cli/private/BUILD.bazel @@ -5,6 +5,8 @@ package(default_visibility = ["//visibility:public"]) copy_to_bin( name = "files", srcs = [ + "docs.ts", + "language_service.ts", "localize.ts", "migrations.ts", "testing.ts", @@ -14,25 +16,33 @@ copy_to_bin( ts_project( name = "private", - srcs = glob(["*.ts"]), + srcs = glob( + ["*.ts"], + ), deps = [ "//:node_modules/typescript", "//packages/compiler-cli/src/ngtsc/annotations", "//packages/compiler-cli/src/ngtsc/core", "//packages/compiler-cli/src/ngtsc/diagnostics", + "//packages/compiler-cli/src/ngtsc/docs", "//packages/compiler-cli/src/ngtsc/file_system", "//packages/compiler-cli/src/ngtsc/file_system/testing", "//packages/compiler-cli/src/ngtsc/imports", + "//packages/compiler-cli/src/ngtsc/incremental", "//packages/compiler-cli/src/ngtsc/logging", + "//packages/compiler-cli/src/ngtsc/logging/testing", "//packages/compiler-cli/src/ngtsc/metadata", "//packages/compiler-cli/src/ngtsc/partial_evaluator", "//packages/compiler-cli/src/ngtsc/perf", + "//packages/compiler-cli/src/ngtsc/program_driver", "//packages/compiler-cli/src/ngtsc/reflection", "//packages/compiler-cli/src/ngtsc/shims", "//packages/compiler-cli/src/ngtsc/sourcemaps", + "//packages/compiler-cli/src/ngtsc/testing", "//packages/compiler-cli/src/ngtsc/transform", "//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", ], diff --git a/packages/compiler-cli/private/docs.ts b/packages/compiler-cli/private/docs.ts new file mode 100644 index 000000000000..17c601dc6f0f --- /dev/null +++ b/packages/compiler-cli/private/docs.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.dev/license + */ + +export type {DocEntry, DocEntryWithSourceInfo, EntryType, EntryCollection} from '../src/ngtsc/docs'; diff --git a/packages/compiler-cli/private/language_service.ts b/packages/compiler-cli/private/language_service.ts new file mode 100644 index 000000000000..ab548fd0c5ae --- /dev/null +++ b/packages/compiler-cli/private/language_service.ts @@ -0,0 +1,72 @@ +/** + * @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.dev/license + */ + +export {getAngularDecorators} from '../src/ngtsc/annotations'; +export { + CompilationTicket, + freshCompilationTicket, + incrementalFromCompilerTicket, + InternalOptions, + LegacyNgcOptions, + NgCompiler, + NgCompilerAdapter, + NgCompilerOptions, + resourceChangeTicket, + TypeCheckingOptions, +} from '../src/ngtsc/core'; +export {Reference} from '../src/ngtsc/imports'; +export {TrackedIncrementalBuildStrategy} from '../src/ngtsc/incremental'; +export { + DirectiveMeta, + isExternalResource, + MetaKind, + PipeMeta, + Resource, +} from '../src/ngtsc/metadata'; +export {PerfPhase} from '../src/ngtsc/perf'; +export {FileUpdate, ProgramDriver} from '../src/ngtsc/program_driver'; +export { + ClassDeclaration, + DeclarationNode, + isNamedClassDeclaration, + ReflectionHost, +} from '../src/ngtsc/reflection'; +export {isShim} from '../src/ngtsc/shims'; +export { + ExpressionIdentifier, + findFirstMatchingNode, + hasExpressionIdentifier, +} from '../src/ngtsc/typecheck'; +export { + CompletionKind, + DirectiveModuleExportDetails, + DirectiveSymbol, + DomBindingSymbol, + ElementSymbol, + InputBindingSymbol, + LetDeclarationSymbol, + OutputBindingSymbol, + PipeSymbol, + PotentialDirective, + PotentialDirectiveModuleSpecifierResolver, + PotentialImportMode, + PotentialPipe, + ReferenceSymbol, + SelectorlessComponentSymbol, + SelectorlessDirectiveSymbol, + Symbol, + SymbolKind, + TcbLocation, + TemplateDeclarationSymbol, + TemplateSymbol, + TemplateTypeChecker, + TsCompletionEntryInfo, + TypeCheckableDirectiveMeta, + VariableSymbol, +} from '../src/ngtsc/typecheck/api'; +export {getRootDirs} from '../src/ngtsc/util/src/typescript'; diff --git a/packages/compiler-cli/private/testing.ts b/packages/compiler-cli/private/testing.ts index d8e8a848acb4..db439a3e165d 100644 --- a/packages/compiler-cli/private/testing.ts +++ b/packages/compiler-cli/private/testing.ts @@ -10,4 +10,13 @@ export {ImportedSymbolsTracker} from '../src/ngtsc/imports'; export {TypeScriptReflectionHost} from '../src/ngtsc/reflection'; export {getInitializerApiJitTransform} from '../src/ngtsc/transform/jit'; -export {initMockFileSystem, MockFileSystem} from '../src/ngtsc/file_system/testing'; +export { + initMockFileSystem, + MockFileSystem, + MockFileSystemNative, + runInEachFileSystem, +} from '../src/ngtsc/file_system/testing'; + +export {MockLogger} from '../src/ngtsc/logging/testing'; +export {loadTestDirectory, loadStandardTestFiles, getCachedSourceFile} from '../src/ngtsc/testing'; +export {NgCompilerOptions} from '../src/ngtsc/core'; diff --git a/packages/compiler-cli/src/ngtsc/core/index.ts b/packages/compiler-cli/src/ngtsc/core/index.ts index ae31d5de6f97..2f8bb37eb317 100644 --- a/packages/compiler-cli/src/ngtsc/core/index.ts +++ b/packages/compiler-cli/src/ngtsc/core/index.ts @@ -6,6 +6,14 @@ * found in the LICENSE file at https://angular.dev/license */ +export { + DiagnosticCategoryLabel, + InternalOptions, + LegacyNgcOptions, + NgCompilerAdapter, + NgCompilerOptions, + TypeCheckingOptions, + UnifiedModulesHost, +} from './api'; export * from './src/compiler'; export {NgCompilerHost} from './src/host'; -export {UnifiedModulesHost, NgCompilerOptions, DiagnosticCategoryLabel} from './api'; diff --git a/packages/compiler-cli/src/ngtsc/testing/BUILD.bazel b/packages/compiler-cli/src/ngtsc/testing/BUILD.bazel index a5c4f4dcf042..dcc963b5c50c 100644 --- a/packages/compiler-cli/src/ngtsc/testing/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/testing/BUILD.bazel @@ -4,7 +4,6 @@ package(default_visibility = ["//visibility:public"]) ts_project( name = "testing", - testonly = True, srcs = glob([ "**/*.ts", ]), diff --git a/packages/compiler-cli/src/ngtsc/typecheck/index.ts b/packages/compiler-cli/src/ngtsc/typecheck/index.ts index d3b6ea8becf8..779aa9673af1 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/index.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/index.ts @@ -11,3 +11,4 @@ export {TypeCheckContextImpl, getTemplateDiagnostics} from './src/context'; export {TypeCheckShimGenerator} from './src/shim'; export {typeCheckFilePath} from './src/type_check_file'; export {createHostElement} from './src/host_bindings'; +export {ExpressionIdentifier, findFirstMatchingNode, hasExpressionIdentifier} from './src/comments'; diff --git a/packages/language-service/src/BUILD.bazel b/packages/language-service/src/BUILD.bazel index 563eb95cef40..85eaec358ee3 100644 --- a/packages/language-service/src/BUILD.bazel +++ b/packages/language-service/src/BUILD.bazel @@ -12,20 +12,7 @@ ts_project( "//:node_modules/typescript", "//packages/compiler", "//packages/compiler-cli", - "//packages/compiler-cli/src/ngtsc/core", - "//packages/compiler-cli/src/ngtsc/core:api", - "//packages/compiler-cli/src/ngtsc/diagnostics", - "//packages/compiler-cli/src/ngtsc/file_system", - "//packages/compiler-cli/src/ngtsc/imports", - "//packages/compiler-cli/src/ngtsc/incremental", - "//packages/compiler-cli/src/ngtsc/metadata", - "//packages/compiler-cli/src/ngtsc/perf", - "//packages/compiler-cli/src/ngtsc/program_driver", - "//packages/compiler-cli/src/ngtsc/reflection", - "//packages/compiler-cli/src/ngtsc/shims", - "//packages/compiler-cli/src/ngtsc/typecheck", - "//packages/compiler-cli/src/ngtsc/typecheck/api", - "//packages/compiler-cli/src/ngtsc/util", + "//packages/compiler-cli/private", "//packages/core/schematics/migrations/signal-migration/src", "//packages/language-service:api", "//packages/language-service/src/refactorings", diff --git a/packages/language-service/src/adapters.ts b/packages/language-service/src/adapters.ts index b1d289b07dd5..fb12b5c6f974 100644 --- a/packages/language-service/src/adapters.ts +++ b/packages/language-service/src/adapters.ts @@ -8,16 +8,18 @@ /** @fileoverview provides adapters for communicating with the ng compiler */ -import {ConfigurationHost} from '@angular/compiler-cli'; -import {NgCompilerAdapter} from '@angular/compiler-cli/src/ngtsc/core/api'; import { AbsoluteFsPath, + ConfigurationHost, FileStats, PathSegment, PathString, -} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {isShim} from '@angular/compiler-cli/src/ngtsc/shims'; -import {getRootDirs} from '@angular/compiler-cli/src/ngtsc/util/src/typescript'; +} from '@angular/compiler-cli'; +import { + getRootDirs, + isShim, + NgCompilerAdapter, +} from '@angular/compiler-cli/private/language_service'; import * as p from 'path'; import ts from 'typescript'; diff --git a/packages/language-service/src/attribute_completions.ts b/packages/language-service/src/attribute_completions.ts index 9b438e27f99a..f772706e91de 100644 --- a/packages/language-service/src/attribute_completions.ts +++ b/packages/language-service/src/attribute_completions.ts @@ -13,7 +13,7 @@ import { TemplateSymbol, TemplateTypeChecker, TypeCheckableDirectiveMeta, -} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; +} from '@angular/compiler-cli/private/language_service'; import ts from 'typescript'; import {DisplayInfoKind, unsafeCastDisplayInfoKindToScriptElementKind} from './utils/display_parts'; diff --git a/packages/language-service/src/codefixes/code_fixes.ts b/packages/language-service/src/codefixes/code_fixes.ts index e08875ad0cac..2b9cfda7a97f 100644 --- a/packages/language-service/src/codefixes/code_fixes.ts +++ b/packages/language-service/src/codefixes/code_fixes.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; +import {NgCompiler} from '@angular/compiler-cli/private/language_service'; import tss from 'typescript'; import {TypeCheckInfo} from '../utils'; diff --git a/packages/language-service/src/codefixes/fix_invalid_banana_in_box.ts b/packages/language-service/src/codefixes/fix_invalid_banana_in_box.ts index 2156fda48f5d..41815a0ef6d1 100644 --- a/packages/language-service/src/codefixes/fix_invalid_banana_in_box.ts +++ b/packages/language-service/src/codefixes/fix_invalid_banana_in_box.ts @@ -7,7 +7,7 @@ */ import {TmplAstBoundEvent} from '@angular/compiler'; -import {ErrorCode, ngErrorCode} from '@angular/compiler-cli/src/ngtsc/diagnostics'; +import {ErrorCode, ngErrorCode} from '@angular/compiler-cli'; import tss from 'typescript'; import {getTargetAtPosition, TargetNodeKind} from '../template_target'; diff --git a/packages/language-service/src/codefixes/fix_missing_import.ts b/packages/language-service/src/codefixes/fix_missing_import.ts index cc76948dc4ef..f34b1e9f52cc 100644 --- a/packages/language-service/src/codefixes/fix_missing_import.ts +++ b/packages/language-service/src/codefixes/fix_missing_import.ts @@ -8,7 +8,7 @@ import {ASTWithName, TmplAstElement} from '@angular/compiler'; import {ErrorCode as NgCompilerErrorCode, ngErrorCode} from '@angular/compiler-cli'; -import {PotentialDirective, PotentialPipe} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; +import {PotentialDirective, PotentialPipe} from '@angular/compiler-cli/private/language_service'; import ts from 'typescript'; import {getTargetAtPosition, TargetNodeKind} from '../template_target'; diff --git a/packages/language-service/src/codefixes/fix_missing_required_inputs.ts b/packages/language-service/src/codefixes/fix_missing_required_inputs.ts index 7ff2aae76c58..02653684c5f1 100644 --- a/packages/language-service/src/codefixes/fix_missing_required_inputs.ts +++ b/packages/language-service/src/codefixes/fix_missing_required_inputs.ts @@ -14,8 +14,8 @@ import { TmplAstTemplate, TmplAstTextAttribute, } from '@angular/compiler'; -import {ErrorCode, ngErrorCode} from '@angular/compiler-cli/src/ngtsc/diagnostics'; -import {TypeCheckableDirectiveMeta} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; +import {ErrorCode, ngErrorCode} from '@angular/compiler-cli'; +import {TypeCheckableDirectiveMeta} from '@angular/compiler-cli/private/language_service'; import ts from 'typescript'; import {getTargetAtPosition, TargetNodeKind} from '../template_target'; diff --git a/packages/language-service/src/codefixes/fix_unused_standalone_imports.ts b/packages/language-service/src/codefixes/fix_unused_standalone_imports.ts index a2d04fb33166..8ef12ec7e9df 100644 --- a/packages/language-service/src/codefixes/fix_unused_standalone_imports.ts +++ b/packages/language-service/src/codefixes/fix_unused_standalone_imports.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {ErrorCode, ngErrorCode} from '@angular/compiler-cli/src/ngtsc/diagnostics'; +import {ErrorCode, ngErrorCode} from '@angular/compiler-cli'; import tss from 'typescript'; import {CodeActionMeta, FixIdForCodeFixesAll} from './utils'; diff --git a/packages/language-service/src/codefixes/utils.ts b/packages/language-service/src/codefixes/utils.ts index 03e9e0ad8aae..53a1ae111a87 100644 --- a/packages/language-service/src/codefixes/utils.ts +++ b/packages/language-service/src/codefixes/utils.ts @@ -7,7 +7,7 @@ */ import {absoluteFrom} from '@angular/compiler-cli'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; +import {NgCompiler} from '@angular/compiler-cli/private/language_service'; import tss from 'typescript'; import {TypeCheckInfo} from '../utils'; diff --git a/packages/language-service/src/compiler_factory.ts b/packages/language-service/src/compiler_factory.ts index 2708ce40cf1b..c7f59988ddb9 100644 --- a/packages/language-service/src/compiler_factory.ts +++ b/packages/language-service/src/compiler_factory.ts @@ -5,18 +5,17 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.dev/license */ - +import {AbsoluteFsPath, resolve} from '@angular/compiler-cli'; import { CompilationTicket, freshCompilationTicket, incrementalFromCompilerTicket, NgCompiler, + NgCompilerOptions, + ProgramDriver, resourceChangeTicket, -} from '@angular/compiler-cli/src/ngtsc/core'; -import {NgCompilerOptions} from '@angular/compiler-cli/src/ngtsc/core/api'; -import {AbsoluteFsPath, resolve} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {TrackedIncrementalBuildStrategy} from '@angular/compiler-cli/src/ngtsc/incremental'; -import {ProgramDriver} from '@angular/compiler-cli/src/ngtsc/program_driver'; + TrackedIncrementalBuildStrategy, +} from '@angular/compiler-cli/private/language_service'; import {LanguageServiceAdapter} from './adapters'; diff --git a/packages/language-service/src/completions.ts b/packages/language-service/src/completions.ts index 07484d013c86..4a1fd43fa5c5 100644 --- a/packages/language-service/src/completions.ts +++ b/packages/language-service/src/completions.ts @@ -33,14 +33,14 @@ import { TmplAstLetDeclaration, TmplAstSwitchBlock, } from '@angular/compiler'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; import { + NgCompiler, CompletionKind, PotentialDirective, SymbolKind, TemplateDeclarationSymbol, TemplateTypeChecker, -} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; +} from '@angular/compiler-cli/private/language_service'; import ts from 'typescript'; import { diff --git a/packages/language-service/src/definitions.ts b/packages/language-service/src/definitions.ts index ebc4442329e4..46f6f198e22d 100644 --- a/packages/language-service/src/definitions.ts +++ b/packages/language-service/src/definitions.ts @@ -15,13 +15,14 @@ import { TmplAstTemplate, TmplAstTextAttribute, } from '@angular/compiler'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; -import {absoluteFrom} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {isExternalResource, Resource} from '@angular/compiler-cli/src/ngtsc/metadata'; +import {absoluteFrom} from '@angular/compiler-cli'; import { DirectiveSymbol, DomBindingSymbol, ElementSymbol, + isExternalResource, + NgCompiler, + Resource, SelectorlessComponentSymbol, SelectorlessDirectiveSymbol, Symbol, @@ -29,23 +30,23 @@ import { TcbLocation, TemplateSymbol, TemplateTypeChecker, -} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; +} from '@angular/compiler-cli/private/language_service'; import ts from 'typescript'; import {convertToTemplateDocumentSpan} from './references_and_rename_utils'; import {getTargetAtPosition, TargetNodeKind} from './template_target'; -import {findTightestNode, getParentClassDeclaration} from './utils/ts_utils'; import { getDirectiveMatchesForAttribute, getDirectiveMatchesForElementTag, - getTypeCheckInfoAtPosition, getTemplateLocationFromTcbLocation, getTextSpanOfNode, + getTypeCheckInfoAtPosition, isDollarEvent, isTypeScriptFile, - TypeCheckInfo, toTextSpan, + TypeCheckInfo, } from './utils'; +import {findTightestNode, getParentClassDeclaration} from './utils/ts_utils'; interface DefinitionMeta { node: AST | TmplAstNode; diff --git a/packages/language-service/src/language_service.ts b/packages/language-service/src/language_service.ts index 7bafe1eabdd8..fb23d50c31e8 100644 --- a/packages/language-service/src/language_service.ts +++ b/packages/language-service/src/language_service.ts @@ -7,14 +7,24 @@ */ import {AST, TmplAstNode} from '@angular/compiler'; -import {CompilerOptions, ConfigurationHost, readConfiguration} from '@angular/compiler-cli'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; -import {ErrorCode, ngErrorCode} from '@angular/compiler-cli/src/ngtsc/diagnostics'; -import {absoluteFrom, AbsoluteFsPath} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {PerfPhase} from '@angular/compiler-cli/src/ngtsc/perf'; -import {FileUpdate, ProgramDriver} from '@angular/compiler-cli/src/ngtsc/program_driver'; -import {isNamedClassDeclaration} from '@angular/compiler-cli/src/ngtsc/reflection'; -import {OptimizeFor} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; +import { + absoluteFrom, + AbsoluteFsPath, + CompilerOptions, + ConfigurationHost, + ErrorCode, + ngErrorCode, + OptimizeFor, + readConfiguration, +} from '@angular/compiler-cli'; +import { + FileUpdate, + isExternalResource, + isNamedClassDeclaration, + NgCompiler, + PerfPhase, + ProgramDriver, +} from '@angular/compiler-cli/private/language_service'; import ts from 'typescript'; import { @@ -33,24 +43,23 @@ import {CompletionBuilder} from './completions'; import {DefinitionBuilder} from './definitions'; import {getOutliningSpans} from './outlining_spans'; import {QuickInfoBuilder} from './quick_info'; +import {ActiveRefactoring, allRefactorings} from './refactorings/refactoring'; import {ReferencesBuilder, RenameBuilder} from './references_and_rename'; import {createLocationKey} from './references_and_rename_utils'; +import {getClassificationsForTemplate, TokenEncodingConsts} from './semantic_tokens'; import {getSignatureHelp} from './signature_help'; import { getTargetAtPosition, getTcbNodesOfTemplateAtPosition, TargetNodeKind, } from './template_target'; +import {getTypeCheckInfoAtPosition, isTypeScriptFile, TypeCheckInfo} from './utils'; import { findTightestNode, getClassDeclFromDecoratorProp, getParentClassDeclaration, getPropertyAssignmentFromValue, } from './utils/ts_utils'; -import {getTypeCheckInfoAtPosition, isTypeScriptFile, TypeCheckInfo} from './utils'; -import {ActiveRefactoring, allRefactorings} from './refactorings/refactoring'; -import {getClassificationsForTemplate, TokenEncodingConsts} from './semantic_tokens'; -import {isExternalResource} from '@angular/compiler-cli/src/ngtsc/metadata'; type LanguageServiceConfig = Omit; diff --git a/packages/language-service/src/outlining_spans.ts b/packages/language-service/src/outlining_spans.ts index 3e3c214334b1..090f1d112bef 100644 --- a/packages/language-service/src/outlining_spans.ts +++ b/packages/language-service/src/outlining_spans.ts @@ -17,9 +17,11 @@ import { TmplAstRecursiveVisitor, tmplAstVisitAll, } from '@angular/compiler'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; -import {isExternalResource} from '@angular/compiler-cli/src/ngtsc/metadata'; -import {isNamedClassDeclaration} from '@angular/compiler-cli/src/ngtsc/reflection'; +import { + NgCompiler, + isExternalResource, + isNamedClassDeclaration, +} from '@angular/compiler-cli/private/language_service'; import ts from 'typescript'; import {getFirstComponentForTemplateFile, isTypeScriptFile, toTextSpan} from './utils'; diff --git a/packages/language-service/src/quick_info.ts b/packages/language-service/src/quick_info.ts index 8a812c5e79b8..a25b2e4caa19 100644 --- a/packages/language-service/src/quick_info.ts +++ b/packages/language-service/src/quick_info.ts @@ -13,8 +13,8 @@ import { TmplAstNode, TmplAstTextAttribute, } from '@angular/compiler'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; import { + NgCompiler, DirectiveSymbol, DomBindingSymbol, ElementSymbol, @@ -29,7 +29,7 @@ import { SymbolKind, TcbLocation, VariableSymbol, -} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; +} from '@angular/compiler-cli/private/language_service'; import ts from 'typescript'; import {DisplayInfoKind, SYMBOL_PUNC, SYMBOL_SPACE, SYMBOL_TEXT} from './utils/display_parts'; diff --git a/packages/language-service/src/refactorings/BUILD.bazel b/packages/language-service/src/refactorings/BUILD.bazel index 1b1b444c0d55..9a268ea48461 100644 --- a/packages/language-service/src/refactorings/BUILD.bazel +++ b/packages/language-service/src/refactorings/BUILD.bazel @@ -9,12 +9,7 @@ ts_project( ]), deps = [ "//:node_modules/typescript", - "//packages/compiler-cli", - "//packages/compiler-cli/src/ngtsc/annotations", - "//packages/compiler-cli/src/ngtsc/core", - "//packages/compiler-cli/src/ngtsc/file_system", - "//packages/compiler-cli/src/ngtsc/metadata", - "//packages/compiler-cli/src/ngtsc/reflection", + "//packages/compiler-cli/private", "//packages/core/schematics/migrations/signal-migration/src", "//packages/core/schematics/migrations/signal-queries-migration:migration", "//packages/core/schematics/utils/tsurge", diff --git a/packages/language-service/src/refactorings/convert_to_signal_input/apply_input_refactoring.ts b/packages/language-service/src/refactorings/convert_to_signal_input/apply_input_refactoring.ts index 21eb62bf6a47..84fe9d3bf3c2 100644 --- a/packages/language-service/src/refactorings/convert_to_signal_input/apply_input_refactoring.ts +++ b/packages/language-service/src/refactorings/convert_to_signal_input/apply_input_refactoring.ts @@ -6,21 +6,20 @@ * found in the LICENSE file at https://angular.dev/license */ -import {CompilerOptions} from '@angular/compiler-cli'; -import {getFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; -import ts from 'typescript'; +import {CompilerOptions, getFileSystem} from '@angular/compiler-cli'; +import {NgCompiler} from '@angular/compiler-cli/private/language_service'; import { + FieldIncompatibilityReason, getMessageForClassIncompatibility, getMessageForFieldIncompatibility, - FieldIncompatibilityReason, KnownInputInfo, MigrationConfig, nonIgnorableFieldIncompatibilities, SignalInputMigration, } from '@angular/core/schematics/migrations/signal-migration/src'; -import {groupReplacementsByFile} from '@angular/core/schematics/utils/tsurge/helpers/group_replacements'; import {getProgramInfoFromBaseInfo} from '@angular/core/schematics/utils/tsurge'; +import {groupReplacementsByFile} from '@angular/core/schematics/utils/tsurge/helpers/group_replacements'; +import ts from 'typescript'; import {ApplyRefactoringProgressFn, ApplyRefactoringResult} from '../../../api'; export async function applySignalInputRefactoring( diff --git a/packages/language-service/src/refactorings/convert_to_signal_input/decorators.ts b/packages/language-service/src/refactorings/convert_to_signal_input/decorators.ts index fffbf7a86a81..2108b7a39009 100644 --- a/packages/language-service/src/refactorings/convert_to_signal_input/decorators.ts +++ b/packages/language-service/src/refactorings/convert_to_signal_input/decorators.ts @@ -6,9 +6,8 @@ * found in the LICENSE file at https://angular.dev/license */ +import {getAngularDecorators, ReflectionHost} from '@angular/compiler-cli/private/language_service'; import ts from 'typescript'; -import {getAngularDecorators} from '@angular/compiler-cli/src/ngtsc/annotations'; -import {ReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection'; import {isDirectiveOrComponent} from '../../utils/decorators'; export function isDecoratorInputClassField( diff --git a/packages/language-service/src/refactorings/convert_to_signal_input/full_class_input_refactoring.ts b/packages/language-service/src/refactorings/convert_to_signal_input/full_class_input_refactoring.ts index 4b426650f27f..ec2e5026467c 100644 --- a/packages/language-service/src/refactorings/convert_to_signal_input/full_class_input_refactoring.ts +++ b/packages/language-service/src/refactorings/convert_to_signal_input/full_class_input_refactoring.ts @@ -7,7 +7,7 @@ */ import {CompilerOptions} from '@angular/compiler-cli'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; +import {NgCompiler} from '@angular/compiler-cli/private/language_service'; import {MigrationConfig} from '@angular/core/schematics/migrations/signal-migration/src'; import {ApplyRefactoringProgressFn, ApplyRefactoringResult} from '../../../api'; import ts from 'typescript'; diff --git a/packages/language-service/src/refactorings/convert_to_signal_input/individual_input_refactoring.ts b/packages/language-service/src/refactorings/convert_to_signal_input/individual_input_refactoring.ts index 44376ef4b474..2452cbd13f1f 100644 --- a/packages/language-service/src/refactorings/convert_to_signal_input/individual_input_refactoring.ts +++ b/packages/language-service/src/refactorings/convert_to_signal_input/individual_input_refactoring.ts @@ -7,7 +7,7 @@ */ import {CompilerOptions} from '@angular/compiler-cli'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; +import {NgCompiler} from '@angular/compiler-cli/private/language_service'; import { isInputContainerNode, MigrationConfig, diff --git a/packages/language-service/src/refactorings/convert_to_signal_queries/apply_query_refactoring.ts b/packages/language-service/src/refactorings/convert_to_signal_queries/apply_query_refactoring.ts index 5d29f5913586..a209add3cf3c 100644 --- a/packages/language-service/src/refactorings/convert_to_signal_queries/apply_query_refactoring.ts +++ b/packages/language-service/src/refactorings/convert_to_signal_queries/apply_query_refactoring.ts @@ -6,23 +6,22 @@ * found in the LICENSE file at https://angular.dev/license */ -import {CompilerOptions} from '@angular/compiler-cli'; -import {getFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; -import ts from 'typescript'; -import {groupReplacementsByFile} from '@angular/core/schematics/utils/tsurge/helpers/group_replacements'; -import {ApplyRefactoringProgressFn, ApplyRefactoringResult} from '../../../api'; +import {CompilerOptions, getFileSystem} from '@angular/compiler-cli'; +import {NgCompiler} from '@angular/compiler-cli/private/language_service'; import { MigrationConfig, SignalQueriesMigration, } from '@angular/core/schematics/migrations/signal-queries-migration'; +import {groupReplacementsByFile} from '@angular/core/schematics/utils/tsurge/helpers/group_replacements'; import assert from 'assert'; -import {projectFile, getProgramInfoFromBaseInfo} from '../../../../core/schematics/utils/tsurge'; +import ts from 'typescript'; import {FieldIncompatibilityReason} from '../../../../core/schematics/migrations/signal-migration/src'; import { isFieldIncompatibility, nonIgnorableFieldIncompatibilities, } from '../../../../core/schematics/migrations/signal-migration/src/passes/problematic_patterns/incompatibility'; +import {getProgramInfoFromBaseInfo, projectFile} from '../../../../core/schematics/utils/tsurge'; +import {ApplyRefactoringProgressFn, ApplyRefactoringResult} from '../../../api'; export async function applySignalQueriesRefactoring( compiler: NgCompiler, diff --git a/packages/language-service/src/refactorings/convert_to_signal_queries/decorators.ts b/packages/language-service/src/refactorings/convert_to_signal_queries/decorators.ts index fbeb890af08d..4a643f63d5a0 100644 --- a/packages/language-service/src/refactorings/convert_to_signal_queries/decorators.ts +++ b/packages/language-service/src/refactorings/convert_to_signal_queries/decorators.ts @@ -7,8 +7,7 @@ */ import ts from 'typescript'; -import {getAngularDecorators} from '@angular/compiler-cli/src/ngtsc/annotations'; -import {ReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection'; +import {getAngularDecorators, ReflectionHost} from '@angular/compiler-cli/private/language_service'; import {isDirectiveOrComponent} from '../../utils/decorators'; export function isDecoratorQueryClassField( diff --git a/packages/language-service/src/refactorings/convert_to_signal_queries/full_class_query_refactoring.ts b/packages/language-service/src/refactorings/convert_to_signal_queries/full_class_query_refactoring.ts index 7fc0958e4749..9fefb62dd8bf 100644 --- a/packages/language-service/src/refactorings/convert_to_signal_queries/full_class_query_refactoring.ts +++ b/packages/language-service/src/refactorings/convert_to_signal_queries/full_class_query_refactoring.ts @@ -7,7 +7,7 @@ */ import {CompilerOptions} from '@angular/compiler-cli'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; +import {NgCompiler} from '@angular/compiler-cli/private/language_service'; import {MigrationConfig} from '@angular/core/schematics/migrations/signal-migration/src'; import {ApplyRefactoringProgressFn, ApplyRefactoringResult} from '../../../api'; import ts from 'typescript'; diff --git a/packages/language-service/src/refactorings/convert_to_signal_queries/individual_query_refactoring.ts b/packages/language-service/src/refactorings/convert_to_signal_queries/individual_query_refactoring.ts index 4af3cbd5276a..2612a2277a1e 100644 --- a/packages/language-service/src/refactorings/convert_to_signal_queries/individual_query_refactoring.ts +++ b/packages/language-service/src/refactorings/convert_to_signal_queries/individual_query_refactoring.ts @@ -7,7 +7,7 @@ */ import {CompilerOptions} from '@angular/compiler-cli'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; +import {NgCompiler} from '@angular/compiler-cli/private/language_service'; import {ApplyRefactoringProgressFn, ApplyRefactoringResult} from '../../../api'; import ts from 'typescript'; import {isTypeScriptFile} from '../../utils'; diff --git a/packages/language-service/src/refactorings/refactoring.ts b/packages/language-service/src/refactorings/refactoring.ts index 737f1f53d7f7..2bdbfb451b44 100644 --- a/packages/language-service/src/refactorings/refactoring.ts +++ b/packages/language-service/src/refactorings/refactoring.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; +import {NgCompiler} from '@angular/compiler-cli/private/language_service'; import ts from 'typescript'; import {ApplyRefactoringProgressFn, ApplyRefactoringResult} from '../../api'; import {CompilerOptions} from '@angular/compiler-cli'; diff --git a/packages/language-service/src/references_and_rename.ts b/packages/language-service/src/references_and_rename.ts index 775f73f0319e..4c753467e860 100644 --- a/packages/language-service/src/references_and_rename.ts +++ b/packages/language-service/src/references_and_rename.ts @@ -6,11 +6,16 @@ * found in the LICENSE file at https://angular.dev/license */ import {AST, TmplAstComponent, TmplAstNode} from '@angular/compiler'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; -import {absoluteFrom} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {MetaKind, PipeMeta, DirectiveMeta} from '@angular/compiler-cli/src/ngtsc/metadata'; -import {PerfPhase} from '@angular/compiler-cli/src/ngtsc/perf'; -import {SymbolKind, TemplateTypeChecker} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; +import { + NgCompiler, + SymbolKind, + TemplateTypeChecker, + PerfPhase, + MetaKind, + PipeMeta, + DirectiveMeta, +} from '@angular/compiler-cli/private/language_service'; +import {absoluteFrom} from '@angular/compiler-cli'; import ts from 'typescript'; import { diff --git a/packages/language-service/src/references_and_rename_utils.ts b/packages/language-service/src/references_and_rename_utils.ts index a683f9411b3a..73ad542fc395 100644 --- a/packages/language-service/src/references_and_rename_utils.ts +++ b/packages/language-service/src/references_and_rename_utils.ts @@ -14,45 +14,44 @@ import { SafePropertyRead, TmplAstBoundAttribute, TmplAstBoundEvent, + TmplAstComponent, + TmplAstDirective, + TmplAstElement, TmplAstLetDeclaration, TmplAstNode, - TmplAstElement, + TmplAstRecursiveVisitor, TmplAstReference, TmplAstTextAttribute, TmplAstVariable, - TmplAstComponent, - TmplAstDirective, - TmplAstRecursiveVisitor, tmplAstVisitAll, } from '@angular/compiler'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; -import {absoluteFrom} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {DirectiveMeta, PipeMeta} from '@angular/compiler-cli/src/ngtsc/metadata'; +import {absoluteFrom} from '@angular/compiler-cli'; import { + DirectiveMeta, DirectiveSymbol, + ExpressionIdentifier, + hasExpressionIdentifier, + NgCompiler, + PipeMeta, SelectorlessComponentSymbol, SelectorlessDirectiveSymbol, Symbol, SymbolKind, TcbLocation, TemplateTypeChecker, -} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; -import { - ExpressionIdentifier, - hasExpressionIdentifier, -} from '@angular/compiler-cli/src/ngtsc/typecheck/src/comments'; +} from '@angular/compiler-cli/private/language_service'; import ts from 'typescript'; import {getTargetAtPosition, TargetNodeKind} from './template_target'; -import {findTightestNode, getParentClassDeclaration} from './utils/ts_utils'; import { getDirectiveMatchesForAttribute, getDirectiveMatchesForElementTag, getTemplateLocationFromTcbLocation, isWithin, - TypeCheckInfo, toTextSpan, + TypeCheckInfo, } from './utils'; +import {findTightestNode, getParentClassDeclaration} from './utils/ts_utils'; /** Represents a location in a file. */ export interface FilePosition { diff --git a/packages/language-service/src/semantic_tokens.ts b/packages/language-service/src/semantic_tokens.ts index 0270a2ac7135..7e3e299b3c72 100644 --- a/packages/language-service/src/semantic_tokens.ts +++ b/packages/language-service/src/semantic_tokens.ts @@ -37,8 +37,7 @@ import { TmplAstDirective, ParseSourceSpan, } from '@angular/compiler'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; -import {PotentialDirective} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; +import {NgCompiler, PotentialDirective} from '@angular/compiler-cli/private/language_service'; import ts from 'typescript'; import {TypeCheckInfo} from './utils'; diff --git a/packages/language-service/src/signature_help.ts b/packages/language-service/src/signature_help.ts index ac3fd3c5de08..8c44c298b820 100644 --- a/packages/language-service/src/signature_help.ts +++ b/packages/language-service/src/signature_help.ts @@ -7,9 +7,8 @@ */ import {Call, SafeCall} from '@angular/compiler'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; -import {getSourceFileOrError} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {SymbolKind} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; +import {NgCompiler, SymbolKind} from '@angular/compiler-cli/private/language_service'; +import {getSourceFileOrError} from '@angular/compiler-cli'; import ts from 'typescript'; import {getTargetAtPosition, TargetNodeKind} from './template_target'; diff --git a/packages/language-service/src/template_target.ts b/packages/language-service/src/template_target.ts index 0300a1d7655a..94be5f29b989 100644 --- a/packages/language-service/src/template_target.ts +++ b/packages/language-service/src/template_target.ts @@ -50,8 +50,7 @@ import { tmplAstVisitAll, TmplAstVisitor, } from '@angular/compiler'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; -import {findFirstMatchingNode} from '@angular/compiler-cli/src/ngtsc/typecheck/src/comments'; +import {NgCompiler, findFirstMatchingNode} from '@angular/compiler-cli/private/language_service'; import tss from 'typescript'; import { diff --git a/packages/language-service/src/utils/BUILD.bazel b/packages/language-service/src/utils/BUILD.bazel index 1c30bd809141..7a45095fe3fe 100644 --- a/packages/language-service/src/utils/BUILD.bazel +++ b/packages/language-service/src/utils/BUILD.bazel @@ -8,11 +8,7 @@ ts_project( deps = [ "//:node_modules/typescript", "//packages/compiler", - "//packages/compiler-cli/src/ngtsc/annotations", - "//packages/compiler-cli/src/ngtsc/core", - "//packages/compiler-cli/src/ngtsc/file_system", - "//packages/compiler-cli/src/ngtsc/metadata", - "//packages/compiler-cli/src/ngtsc/reflection", - "//packages/compiler-cli/src/ngtsc/typecheck/api", + "//packages/compiler-cli", + "//packages/compiler-cli/private", ], ) diff --git a/packages/language-service/src/utils/decorators.ts b/packages/language-service/src/utils/decorators.ts index 9af69d31b1a1..aab8878499c3 100644 --- a/packages/language-service/src/utils/decorators.ts +++ b/packages/language-service/src/utils/decorators.ts @@ -6,9 +6,8 @@ * found in the LICENSE file at https://angular.dev/license */ +import {ReflectionHost, getAngularDecorators} from '@angular/compiler-cli/private/language_service'; import ts from 'typescript'; -import {ReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection'; -import {getAngularDecorators} from '@angular/compiler-cli/src/ngtsc/annotations'; export function isDirectiveOrComponent( node: ts.ClassDeclaration, diff --git a/packages/language-service/src/utils/display_parts.ts b/packages/language-service/src/utils/display_parts.ts index c85698e1c803..90ed4484fe62 100644 --- a/packages/language-service/src/utils/display_parts.ts +++ b/packages/language-service/src/utils/display_parts.ts @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.dev/license */ -import {isNamedClassDeclaration} from '@angular/compiler-cli/src/ngtsc/reflection'; import { + isNamedClassDeclaration, LetDeclarationSymbol, PotentialDirective, ReferenceSymbol, @@ -15,7 +15,7 @@ import { SymbolKind, TcbLocation, VariableSymbol, -} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; +} from '@angular/compiler-cli/private/language_service'; import ts from 'typescript'; // Reverse mappings of enum would generate strings diff --git a/packages/language-service/src/utils/index.ts b/packages/language-service/src/utils/index.ts index 663b4a2ad531..28b285ced616 100644 --- a/packages/language-service/src/utils/index.ts +++ b/packages/language-service/src/utils/index.ts @@ -25,15 +25,14 @@ import { TmplAstTemplate, TmplAstTextAttribute, } from '@angular/compiler'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; import { - absoluteFrom, - absoluteFromSourceFile, - AbsoluteFsPath, -} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {isExternalResource} from '@angular/compiler-cli/src/ngtsc/metadata'; -import {DeclarationNode} from '@angular/compiler-cli/src/ngtsc/reflection'; -import {DirectiveSymbol, TemplateTypeChecker} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; + NgCompiler, + isExternalResource, + DeclarationNode, + DirectiveSymbol, + TemplateTypeChecker, +} from '@angular/compiler-cli/private/language_service'; +import {absoluteFrom, absoluteFromSourceFile, AbsoluteFsPath} from '@angular/compiler-cli'; import ts from 'typescript'; import { diff --git a/packages/language-service/src/utils/ts_utils.ts b/packages/language-service/src/utils/ts_utils.ts index ac5880b19a0f..83c7bdb45f3d 100644 --- a/packages/language-service/src/utils/ts_utils.ts +++ b/packages/language-service/src/utils/ts_utils.ts @@ -5,21 +5,21 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.dev/license */ -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; import { + ClassDeclaration, DirectiveModuleExportDetails, + NgCompiler, PotentialDirective, PotentialDirectiveModuleSpecifierResolver, PotentialImportMode, PotentialPipe, + Reference, TemplateTypeChecker, TsCompletionEntryInfo, -} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; +} from '@angular/compiler-cli/private/language_service'; +import * as path from 'path'; import ts from 'typescript'; import {guessIndentationInSingleLine} from './format'; -import * as path from 'path'; -import {ClassDeclaration} from '@angular/compiler-cli/src/ngtsc/reflection'; -import {Reference} from '@angular/compiler-cli/src/ngtsc/imports'; /** * Return the node that most tightly encompasses the specified `position`. diff --git a/packages/language-service/test/BUILD.bazel b/packages/language-service/test/BUILD.bazel index d3626c633b6a..bef26a0e186c 100644 --- a/packages/language-service/test/BUILD.bazel +++ b/packages/language-service/test/BUILD.bazel @@ -7,12 +7,8 @@ ts_project( deps = [ "//:node_modules/typescript", "//packages/compiler", - "//packages/compiler-cli/src/ngtsc/core:api", - "//packages/compiler-cli/src/ngtsc/diagnostics", - "//packages/compiler-cli/src/ngtsc/file_system", - "//packages/compiler-cli/src/ngtsc/file_system/testing", - "//packages/compiler-cli/src/ngtsc/testing", - "//packages/compiler-cli/src/ngtsc/typecheck/api", + "//packages/compiler-cli", + "//packages/compiler-cli/private", "//packages/language-service/src", "//packages/language-service/src/utils", "//packages/language-service/testing", @@ -24,6 +20,7 @@ jasmine_test( data = [ ":test_lib", "//:node_modules/rxjs", + "//packages/compiler-cli/private", "//packages/compiler-cli/src/ngtsc/testing/fake_common:npm_package", "//packages/core:npm_package", ], diff --git a/packages/language-service/test/code_fixes_spec.ts b/packages/language-service/test/code_fixes_spec.ts index 7837904313ef..0cf667a43c1b 100644 --- a/packages/language-service/test/code_fixes_spec.ts +++ b/packages/language-service/test/code_fixes_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {initMockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +import {initMockFileSystem} from '@angular/compiler-cli/private/testing'; import ts from 'typescript'; import {FixIdForCodeFixesAll} from '../src/codefixes/utils'; diff --git a/packages/language-service/test/compiler_spec.ts b/packages/language-service/test/compiler_spec.ts index 741d0e21456a..ae668d11b56e 100644 --- a/packages/language-service/test/compiler_spec.ts +++ b/packages/language-service/test/compiler_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {initMockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +import {initMockFileSystem} from '@angular/compiler-cli/private/testing'; import {isNgSpecificDiagnostic, LanguageServiceTestEnv} from '../testing'; diff --git a/packages/language-service/test/completions_spec.ts b/packages/language-service/test/completions_spec.ts index 53865a096f27..9113224d258c 100644 --- a/packages/language-service/test/completions_spec.ts +++ b/packages/language-service/test/completions_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {initMockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +import {initMockFileSystem} from '@angular/compiler-cli/private/testing'; import ts from 'typescript'; import { diff --git a/packages/language-service/test/definitions_spec.ts b/packages/language-service/test/definitions_spec.ts index a47a4c930394..acd546662c30 100644 --- a/packages/language-service/test/definitions_spec.ts +++ b/packages/language-service/test/definitions_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {initMockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +import {initMockFileSystem} from '@angular/compiler-cli/private/testing'; import ts from 'typescript'; import { diff --git a/packages/language-service/test/diagnostic_spec.ts b/packages/language-service/test/diagnostic_spec.ts index 2f00018109cf..661a45d2c40f 100644 --- a/packages/language-service/test/diagnostic_spec.ts +++ b/packages/language-service/test/diagnostic_spec.ts @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.dev/license */ -import {ErrorCode, ngErrorCode} from '@angular/compiler-cli/src/ngtsc/diagnostics'; -import {initMockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +import {ErrorCode, ngErrorCode} from '@angular/compiler-cli'; +import {initMockFileSystem} from '@angular/compiler-cli/private/testing'; import ts from 'typescript'; import {createModuleAndProjectWithDeclarations, LanguageServiceTestEnv} from '../testing'; diff --git a/packages/language-service/test/get_outlining_spans_spec.ts b/packages/language-service/test/get_outlining_spans_spec.ts index f44fa6482d8b..1315f9fdc16f 100644 --- a/packages/language-service/test/get_outlining_spans_spec.ts +++ b/packages/language-service/test/get_outlining_spans_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {initMockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +import {initMockFileSystem} from '@angular/compiler-cli/private/testing'; import ts from 'typescript'; import {createModuleAndProjectWithDeclarations, LanguageServiceTestEnv} from '../testing'; diff --git a/packages/language-service/test/get_template_location_for_component_spec.ts b/packages/language-service/test/get_template_location_for_component_spec.ts index e89c04f157ce..9e72d4b0b72f 100644 --- a/packages/language-service/test/get_template_location_for_component_spec.ts +++ b/packages/language-service/test/get_template_location_for_component_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {initMockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +import {initMockFileSystem} from '@angular/compiler-cli/private/testing'; import { assertFileNames, diff --git a/packages/language-service/test/gettcb_spec.ts b/packages/language-service/test/gettcb_spec.ts index 9411178c0c15..239b8cbc5141 100644 --- a/packages/language-service/test/gettcb_spec.ts +++ b/packages/language-service/test/gettcb_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {initMockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +import {initMockFileSystem} from '@angular/compiler-cli/private/testing'; import {createModuleAndProjectWithDeclarations, LanguageServiceTestEnv} from '../testing'; diff --git a/packages/language-service/test/legacy/BUILD.bazel b/packages/language-service/test/legacy/BUILD.bazel index 3be412f4a9da..5c80fee228b0 100644 --- a/packages/language-service/test/legacy/BUILD.bazel +++ b/packages/language-service/test/legacy/BUILD.bazel @@ -7,8 +7,7 @@ ts_project( deps = [ "//:node_modules/typescript", "//packages/compiler", - "//packages/compiler-cli/src/ngtsc/core:api", - "//packages/compiler-cli/src/ngtsc/diagnostics", + "//packages/compiler-cli/private", "//packages/language-service/src", "//packages/language-service/src/utils", ], diff --git a/packages/language-service/test/legacy/language_service_spec.ts b/packages/language-service/test/legacy/language_service_spec.ts index 09e0a6cf145a..682b925b2e21 100644 --- a/packages/language-service/test/legacy/language_service_spec.ts +++ b/packages/language-service/test/legacy/language_service_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {ErrorCode, ngErrorCode} from '@angular/compiler-cli/src/ngtsc/diagnostics'; +import {ErrorCode, ngErrorCode} from '@angular/compiler-cli'; import ts from 'typescript'; import {LanguageService} from '../../src/language_service'; diff --git a/packages/language-service/test/legacy/mock_host.ts b/packages/language-service/test/legacy/mock_host.ts index 2809204eb075..fb8514d14d01 100644 --- a/packages/language-service/test/legacy/mock_host.ts +++ b/packages/language-service/test/legacy/mock_host.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {NgCompilerOptions} from '@angular/compiler-cli/src/ngtsc/core/api'; +import {NgCompilerOptions} from '@angular/compiler-cli/private/testing'; import {join} from 'path'; import ts from 'typescript'; diff --git a/packages/language-service/test/quick_info_spec.ts b/packages/language-service/test/quick_info_spec.ts index fead6e2af1e0..26e14a1a0be7 100644 --- a/packages/language-service/test/quick_info_spec.ts +++ b/packages/language-service/test/quick_info_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {initMockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +import {initMockFileSystem} from '@angular/compiler-cli/private/testing'; import ts from 'typescript'; import {createModuleAndProjectWithDeclarations, LanguageServiceTestEnv, Project} from '../testing'; diff --git a/packages/language-service/test/references_and_rename_spec.ts b/packages/language-service/test/references_and_rename_spec.ts index cfd032a4a930..a2f14752ad54 100644 --- a/packages/language-service/test/references_and_rename_spec.ts +++ b/packages/language-service/test/references_and_rename_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {initMockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +import {initMockFileSystem} from '@angular/compiler-cli/private/testing'; import ts from 'typescript'; import { diff --git a/packages/language-service/test/semantic_tokens_spec.ts b/packages/language-service/test/semantic_tokens_spec.ts index 4557eff31cc7..6217cb237a2f 100644 --- a/packages/language-service/test/semantic_tokens_spec.ts +++ b/packages/language-service/test/semantic_tokens_spec.ts @@ -8,7 +8,7 @@ import ts from 'typescript'; -import {initMockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +import {initMockFileSystem} from '@angular/compiler-cli/private/testing'; import {LanguageServiceTestEnv, OpenBuffer} from '../testing'; import {TokenEncodingConsts, TokenType, TokenModifier} from '../src/semantic_tokens'; diff --git a/packages/language-service/test/signal_input_refactoring_action_spec.ts b/packages/language-service/test/signal_input_refactoring_action_spec.ts index 2c88abe837ff..5ccbaea10b54 100644 --- a/packages/language-service/test/signal_input_refactoring_action_spec.ts +++ b/packages/language-service/test/signal_input_refactoring_action_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {initMockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +import {initMockFileSystem} from '@angular/compiler-cli/private/testing'; import {createModuleAndProjectWithDeclarations, LanguageServiceTestEnv} from '../testing'; diff --git a/packages/language-service/test/signal_queries_refactoring_action_spec.ts b/packages/language-service/test/signal_queries_refactoring_action_spec.ts index 9edcbeef974b..702350e661df 100644 --- a/packages/language-service/test/signal_queries_refactoring_action_spec.ts +++ b/packages/language-service/test/signal_queries_refactoring_action_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {initMockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +import {initMockFileSystem} from '@angular/compiler-cli/private/testing'; import {createModuleAndProjectWithDeclarations, LanguageServiceTestEnv} from '../testing'; diff --git a/packages/language-service/test/signature_help_spec.ts b/packages/language-service/test/signature_help_spec.ts index dd5a49bbc686..648cd3765f58 100644 --- a/packages/language-service/test/signature_help_spec.ts +++ b/packages/language-service/test/signature_help_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {initMockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +import {initMockFileSystem} from '@angular/compiler-cli/private/testing'; import {getText} from '../testing/src/util'; import {LanguageServiceTestEnv, OpenBuffer} from '../testing'; diff --git a/packages/language-service/test/ts_utils_spec.ts b/packages/language-service/test/ts_utils_spec.ts index 0833ab480831..d354b4597c84 100644 --- a/packages/language-service/test/ts_utils_spec.ts +++ b/packages/language-service/test/ts_utils_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {initMockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +import {initMockFileSystem} from '@angular/compiler-cli/private/testing'; import ts from 'typescript'; import { diff --git a/packages/language-service/test/type_definitions_spec.ts b/packages/language-service/test/type_definitions_spec.ts index fcad771eb17c..4fc10454bdb0 100644 --- a/packages/language-service/test/type_definitions_spec.ts +++ b/packages/language-service/test/type_definitions_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {initMockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +import {initMockFileSystem} from '@angular/compiler-cli/private/testing'; import { assertFileNames, diff --git a/packages/language-service/testing/BUILD.bazel b/packages/language-service/testing/BUILD.bazel index 8963298bd493..b6f77379dea1 100644 --- a/packages/language-service/testing/BUILD.bazel +++ b/packages/language-service/testing/BUILD.bazel @@ -9,11 +9,8 @@ ts_project( deps = [ "//:node_modules/typescript", "//packages/compiler", - "//packages/compiler-cli/src/ngtsc/core:api", - "//packages/compiler-cli/src/ngtsc/file_system", - "//packages/compiler-cli/src/ngtsc/file_system/testing", - "//packages/compiler-cli/src/ngtsc/testing", - "//packages/compiler-cli/src/ngtsc/typecheck/api", + "//packages/compiler-cli", + "//packages/compiler-cli/private", "//packages/language-service:api", "//packages/language-service/src", ], diff --git a/packages/language-service/testing/src/env.ts b/packages/language-service/testing/src/env.ts index 620a5f4d90c4..8801d3da0f0a 100644 --- a/packages/language-service/testing/src/env.ts +++ b/packages/language-service/testing/src/env.ts @@ -6,9 +6,8 @@ * found in the LICENSE file at https://angular.dev/license */ -import {getFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {MockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; -import {loadStandardTestFiles} from '@angular/compiler-cli/src/ngtsc/testing'; +import {getFileSystem} from '@angular/compiler-cli'; +import {MockFileSystem, loadStandardTestFiles} from '@angular/compiler-cli/private/testing'; import ts from 'typescript'; import {MockServerHost} from './host'; diff --git a/packages/language-service/testing/src/host.ts b/packages/language-service/testing/src/host.ts index 7dc6a0bcfb47..4d96bb196090 100644 --- a/packages/language-service/testing/src/host.ts +++ b/packages/language-service/testing/src/host.ts @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.dev/license */ -import {absoluteFrom} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {MockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +import {absoluteFrom} from '@angular/compiler-cli'; +import {MockFileSystem} from '@angular/compiler-cli/private/testing'; import ts from 'typescript'; const NOOP_FILE_WATCHER: ts.FileWatcher = { diff --git a/packages/language-service/testing/src/language_service_test_cache.ts b/packages/language-service/testing/src/language_service_test_cache.ts index a783a26d50d4..fcc47532a08b 100644 --- a/packages/language-service/testing/src/language_service_test_cache.ts +++ b/packages/language-service/testing/src/language_service_test_cache.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {getCachedSourceFile} from '@angular/compiler-cli/src/ngtsc/testing'; +import {getCachedSourceFile} from '@angular/compiler-cli/private/testing'; import ts from 'typescript'; interface TsProjectWithInternals { diff --git a/packages/language-service/testing/src/project.ts b/packages/language-service/testing/src/project.ts index 6e28ab6e7d48..56832eb428b2 100644 --- a/packages/language-service/testing/src/project.ts +++ b/packages/language-service/testing/src/project.ts @@ -6,19 +6,20 @@ * found in the LICENSE file at https://angular.dev/license */ -import { - InternalOptions, - LegacyNgcOptions, - TypeCheckingOptions, -} from '@angular/compiler-cli/src/ngtsc/core/api'; import { absoluteFrom, AbsoluteFsPath, FileSystem, getFileSystem, getSourceFileOrError, -} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {OptimizeFor, TemplateTypeChecker} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; + OptimizeFor, +} from '@angular/compiler-cli'; +import { + TemplateTypeChecker, + InternalOptions, + LegacyNgcOptions, + TypeCheckingOptions, +} from '@angular/compiler-cli/private/language_service'; import ts from 'typescript'; import {LanguageService} from '../../src/language_service'; diff --git a/packages/localize/tools/test/BUILD.bazel b/packages/localize/tools/test/BUILD.bazel index ab14bc08f4a6..60f66aa750f5 100644 --- a/packages/localize/tools/test/BUILD.bazel +++ b/packages/localize/tools/test/BUILD.bazel @@ -15,9 +15,6 @@ ts_project( "//packages:types", "//packages/compiler", "//packages/compiler-cli/private", - "//packages/compiler-cli/src/ngtsc/file_system", - "//packages/compiler-cli/src/ngtsc/file_system/testing", - "//packages/compiler-cli/src/ngtsc/logging/testing", "//packages/localize", "//packages/localize/src/utils", "//packages/localize/tools", diff --git a/packages/localize/tools/test/extract/extractor_spec.ts b/packages/localize/tools/test/extract/extractor_spec.ts index e21d0eafb4c3..00ec1dd66180 100644 --- a/packages/localize/tools/test/extract/extractor_spec.ts +++ b/packages/localize/tools/test/extract/extractor_spec.ts @@ -5,8 +5,8 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.dev/license */ -import {absoluteFrom, getFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {MockLogger} from '@angular/compiler-cli/src/ngtsc/logging/testing'; +import {absoluteFrom, getFileSystem} from '@angular/compiler-cli'; +import {MockLogger} from '@angular/compiler-cli/private/testing'; import {MessageExtractor} from '../../src/extract/extraction'; import {runInNativeFileSystem} from '../helpers'; diff --git a/packages/localize/tools/test/extract/integration/BUILD.bazel b/packages/localize/tools/test/extract/integration/BUILD.bazel index d038f3452f28..29d94ee87014 100644 --- a/packages/localize/tools/test/extract/integration/BUILD.bazel +++ b/packages/localize/tools/test/extract/integration/BUILD.bazel @@ -8,11 +8,8 @@ ts_project( ), deps = [ "//packages:types", - "//packages/compiler-cli/src/ngtsc/file_system", - "//packages/compiler-cli/src/ngtsc/file_system/testing", - "//packages/compiler-cli/src/ngtsc/logging", - "//packages/compiler-cli/src/ngtsc/logging/testing", - "//packages/compiler-cli/src/ngtsc/testing", + "//packages/compiler-cli", + "//packages/compiler-cli/private", "//packages/localize/tools", "//packages/localize/tools/test:test_lib", "//packages/localize/tools/test/helpers", diff --git a/packages/localize/tools/test/extract/integration/main_spec.ts b/packages/localize/tools/test/extract/integration/main_spec.ts index 2a642d371c3e..51028aaf5dce 100644 --- a/packages/localize/tools/test/extract/integration/main_spec.ts +++ b/packages/localize/tools/test/extract/integration/main_spec.ts @@ -12,9 +12,8 @@ import { getFileSystem, setFileSystem, InvalidFileSystem, -} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {MockLogger} from '@angular/compiler-cli/src/ngtsc/logging/testing'; -import {loadTestDirectory} from '@angular/compiler-cli/src/ngtsc/testing'; +} from '@angular/compiler-cli'; +import {MockLogger, loadTestDirectory} from '@angular/compiler-cli/private/testing'; import path from 'path'; import url from 'url'; diff --git a/packages/localize/tools/test/extract/source_files/es5_extract_plugin_spec.ts b/packages/localize/tools/test/extract/source_files/es5_extract_plugin_spec.ts index 297aafef7d78..5cb9ef4a3969 100644 --- a/packages/localize/tools/test/extract/source_files/es5_extract_plugin_spec.ts +++ b/packages/localize/tools/test/extract/source_files/es5_extract_plugin_spec.ts @@ -5,12 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.dev/license */ -import { - FileSystem, - getFileSystem, - PathSegment, - relativeFrom, -} from '@angular/compiler-cli/src/ngtsc/file_system'; +import {FileSystem, getFileSystem, PathSegment, relativeFrom} from '@angular/compiler-cli'; import {ɵParsedMessage} from '../../../../private'; import {transformSync} from '@babel/core'; diff --git a/packages/localize/tools/test/extract/translation_files/arb_translation_serializer_spec.ts b/packages/localize/tools/test/extract/translation_files/arb_translation_serializer_spec.ts index ee308f734422..eb360c8323a6 100644 --- a/packages/localize/tools/test/extract/translation_files/arb_translation_serializer_spec.ts +++ b/packages/localize/tools/test/extract/translation_files/arb_translation_serializer_spec.ts @@ -5,12 +5,8 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.dev/license */ -import { - absoluteFrom, - getFileSystem, - PathManipulation, -} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {runInEachFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +import {getFileSystem, PathManipulation} from '@angular/compiler-cli'; +import {runInEachFileSystem} from '@angular/compiler-cli/private/testing'; import {ɵParsedMessage} from '../../../../index'; import {ArbTranslationSerializer} from '../../../src/extract/translation_files/arb_translation_serializer'; diff --git a/packages/localize/tools/test/extract/translation_files/mock_message.ts b/packages/localize/tools/test/extract/translation_files/mock_message.ts index c16261d96e49..19f95113d0b5 100644 --- a/packages/localize/tools/test/extract/translation_files/mock_message.ts +++ b/packages/localize/tools/test/extract/translation_files/mock_message.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.dev/license */ -import {absoluteFrom} from '@angular/compiler-cli/src/ngtsc/file_system'; +import {absoluteFrom} from '@angular/compiler-cli'; import {ɵParsedMessage} from '../../../../index'; import {MessageId, SourceLocation} from '../../../../src/utils'; diff --git a/packages/localize/tools/test/extract/translation_files/xliff1_translation_serializer_spec.ts b/packages/localize/tools/test/extract/translation_files/xliff1_translation_serializer_spec.ts index bc13cbfe1466..ef62cd36d6ae 100644 --- a/packages/localize/tools/test/extract/translation_files/xliff1_translation_serializer_spec.ts +++ b/packages/localize/tools/test/extract/translation_files/xliff1_translation_serializer_spec.ts @@ -5,8 +5,8 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.dev/license */ -import {absoluteFrom} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {runInEachFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +import {absoluteFrom} from '@angular/compiler-cli'; +import {runInEachFileSystem} from '@angular/compiler-cli/private/testing'; import {ɵParsedMessage, ɵSourceLocation} from '../../../../index'; import {FormatOptions} from '../../../src/extract/translation_files/format_options'; diff --git a/packages/localize/tools/test/extract/translation_files/xliff2_translation_serializer_spec.ts b/packages/localize/tools/test/extract/translation_files/xliff2_translation_serializer_spec.ts index 402663858a6f..1d643373e1e1 100644 --- a/packages/localize/tools/test/extract/translation_files/xliff2_translation_serializer_spec.ts +++ b/packages/localize/tools/test/extract/translation_files/xliff2_translation_serializer_spec.ts @@ -5,8 +5,8 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.dev/license */ -import {absoluteFrom} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {runInEachFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +import {absoluteFrom} from '@angular/compiler-cli'; +import {runInEachFileSystem} from '@angular/compiler-cli/private/testing'; import {ɵParsedMessage, ɵSourceLocation} from '../../../../index'; import {FormatOptions} from '../../../src/extract/translation_files/format_options'; diff --git a/packages/localize/tools/test/extract/translation_files/xmb_translation_serializer_spec.ts b/packages/localize/tools/test/extract/translation_files/xmb_translation_serializer_spec.ts index 86dc184eafb7..d8033bf4fe41 100644 --- a/packages/localize/tools/test/extract/translation_files/xmb_translation_serializer_spec.ts +++ b/packages/localize/tools/test/extract/translation_files/xmb_translation_serializer_spec.ts @@ -5,12 +5,8 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.dev/license */ -import { - absoluteFrom, - getFileSystem, - PathManipulation, -} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {runInEachFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +import {absoluteFrom, getFileSystem, PathManipulation} from '@angular/compiler-cli'; +import {runInEachFileSystem} from '@angular/compiler-cli/private/testing'; import {ɵParsedMessage, ɵSourceLocation} from '../../../../index'; import {XmbTranslationSerializer} from '../../../src/extract/translation_files/xmb_translation_serializer'; diff --git a/packages/localize/tools/test/helpers/BUILD.bazel b/packages/localize/tools/test/helpers/BUILD.bazel index c66c581c7cb6..bcb0b5265378 100644 --- a/packages/localize/tools/test/helpers/BUILD.bazel +++ b/packages/localize/tools/test/helpers/BUILD.bazel @@ -8,7 +8,7 @@ ts_project( ), visibility = ["//packages/localize/tools/test:__subpackages__"], deps = [ - "//packages/compiler-cli/src/ngtsc/file_system", - "//packages/compiler-cli/src/ngtsc/file_system/testing", + "//packages/compiler-cli", + "//packages/compiler-cli/private", ], ) diff --git a/packages/localize/tools/test/helpers/index.ts b/packages/localize/tools/test/helpers/index.ts index ab3074980837..301cdd7c5aae 100644 --- a/packages/localize/tools/test/helpers/index.ts +++ b/packages/localize/tools/test/helpers/index.ts @@ -5,8 +5,8 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.dev/license */ -import {setFileSystem, InvalidFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {MockFileSystemNative} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +import {setFileSystem, InvalidFileSystem} from '@angular/compiler-cli'; +import {MockFileSystemNative} from '@angular/compiler-cli/private/testing'; /** * Only run these tests on the "native" file-system. diff --git a/packages/localize/tools/test/migrate/integration/BUILD.bazel b/packages/localize/tools/test/migrate/integration/BUILD.bazel index ae169659a581..17b3b7e1fe77 100644 --- a/packages/localize/tools/test/migrate/integration/BUILD.bazel +++ b/packages/localize/tools/test/migrate/integration/BUILD.bazel @@ -8,11 +8,7 @@ ts_project( ), deps = [ "//packages:types", - "//packages/compiler-cli/src/ngtsc/file_system", - "//packages/compiler-cli/src/ngtsc/file_system/testing", - "//packages/compiler-cli/src/ngtsc/logging", - "//packages/compiler-cli/src/ngtsc/logging/testing", - "//packages/compiler-cli/src/ngtsc/testing", + "//packages/compiler-cli/private", "//packages/localize/tools", "//packages/localize/tools/test:test_lib", "//packages/localize/tools/test/helpers", diff --git a/packages/localize/tools/test/migrate/integration/main_spec.ts b/packages/localize/tools/test/migrate/integration/main_spec.ts index 64101285b476..81e85746bacc 100644 --- a/packages/localize/tools/test/migrate/integration/main_spec.ts +++ b/packages/localize/tools/test/migrate/integration/main_spec.ts @@ -6,14 +6,8 @@ * found in the LICENSE file at https://angular.dev/license */ -import { - absoluteFrom, - AbsoluteFsPath, - FileSystem, - getFileSystem, -} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {MockLogger} from '@angular/compiler-cli/src/ngtsc/logging/testing'; -import {loadTestDirectory} from '@angular/compiler-cli/src/ngtsc/testing'; +import {absoluteFrom, AbsoluteFsPath, FileSystem, getFileSystem} from '@angular/compiler-cli'; +import {MockLogger, loadTestDirectory} from '@angular/compiler-cli/private/testing'; import path from 'path'; import url from 'url'; diff --git a/packages/localize/tools/test/source_file_utils_spec.ts b/packages/localize/tools/test/source_file_utils_spec.ts index 75e56ec33559..e69261f198ef 100644 --- a/packages/localize/tools/test/source_file_utils_spec.ts +++ b/packages/localize/tools/test/source_file_utils_spec.ts @@ -5,11 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.dev/license */ -import { - absoluteFrom, - getFileSystem, - PathManipulation, -} from '@angular/compiler-cli/src/ngtsc/file_system'; +import {absoluteFrom, getFileSystem, PathManipulation} from '@angular/compiler-cli'; import {ɵmakeTemplateObject} from '../../index'; import babel, {NodePath, TransformOptions, template, types as t} from '@babel/core'; import _generate from '@babel/generator'; diff --git a/packages/localize/tools/test/translate/asset_files/asset_file_translation_handler_spec.ts b/packages/localize/tools/test/translate/asset_files/asset_file_translation_handler_spec.ts index 575e443fbfa2..2f27d4ef111e 100644 --- a/packages/localize/tools/test/translate/asset_files/asset_file_translation_handler_spec.ts +++ b/packages/localize/tools/test/translate/asset_files/asset_file_translation_handler_spec.ts @@ -12,8 +12,8 @@ import { getFileSystem, PathSegment, relativeFrom, -} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {runInEachFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +} from '@angular/compiler-cli'; +import {runInEachFileSystem} from '@angular/compiler-cli/private/testing'; import {Diagnostics} from '../../../src/diagnostics'; import {AssetTranslationHandler} from '../../../src/translate/asset_files/asset_translation_handler'; diff --git a/packages/localize/tools/test/translate/integration/BUILD.bazel b/packages/localize/tools/test/translate/integration/BUILD.bazel index f064fd50477a..d8572a971885 100644 --- a/packages/localize/tools/test/translate/integration/BUILD.bazel +++ b/packages/localize/tools/test/translate/integration/BUILD.bazel @@ -8,9 +8,8 @@ ts_project( ), deps = [ "//packages:types", - "//packages/compiler-cli/src/ngtsc/file_system", - "//packages/compiler-cli/src/ngtsc/file_system/testing", - "//packages/compiler-cli/src/ngtsc/testing", + "//packages/compiler-cli", + "//packages/compiler-cli/private", "//packages/localize/tools", "//packages/localize/tools/test/helpers", ], diff --git a/packages/localize/tools/test/translate/integration/main_spec.ts b/packages/localize/tools/test/translate/integration/main_spec.ts index a537e5a21cb8..e658ecc2ee0f 100644 --- a/packages/localize/tools/test/translate/integration/main_spec.ts +++ b/packages/localize/tools/test/translate/integration/main_spec.ts @@ -5,13 +5,8 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.dev/license */ -import { - absoluteFrom, - AbsoluteFsPath, - FileSystem, - getFileSystem, -} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {loadTestDirectory} from '@angular/compiler-cli/src/ngtsc/testing'; +import {absoluteFrom, AbsoluteFsPath, FileSystem, getFileSystem} from '@angular/compiler-cli'; +import {loadTestDirectory} from '@angular/compiler-cli/private/testing'; import path from 'path'; import url from 'url'; diff --git a/packages/localize/tools/test/translate/output_path_spec.ts b/packages/localize/tools/test/translate/output_path_spec.ts index ae334ba714dd..1368ce3b892d 100644 --- a/packages/localize/tools/test/translate/output_path_spec.ts +++ b/packages/localize/tools/test/translate/output_path_spec.ts @@ -5,12 +5,8 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.dev/license */ -import { - absoluteFrom, - getFileSystem, - PathManipulation, -} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {runInEachFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +import {absoluteFrom, getFileSystem, PathManipulation} from '@angular/compiler-cli'; +import {runInEachFileSystem} from '@angular/compiler-cli/private/testing'; import {getOutputPathFn} from '../../src/translate/output_path'; diff --git a/packages/localize/tools/test/translate/source_files/es2015_translate_plugin_spec.ts b/packages/localize/tools/test/translate/source_files/es2015_translate_plugin_spec.ts index 8a88f48ac8f3..a3f6667155d7 100644 --- a/packages/localize/tools/test/translate/source_files/es2015_translate_plugin_spec.ts +++ b/packages/localize/tools/test/translate/source_files/es2015_translate_plugin_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.dev/license */ -import {FileSystem, getFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system'; +import {FileSystem, getFileSystem} from '@angular/compiler-cli'; import {ɵcomputeMsgId, ɵparseTranslation} from '../../../../index'; import {ɵParsedTranslation} from '../../../../private'; import {transformSync} from '@babel/core'; diff --git a/packages/localize/tools/test/translate/source_files/es5_translate_plugin_spec.ts b/packages/localize/tools/test/translate/source_files/es5_translate_plugin_spec.ts index bb32ba82a248..d54bab18a11c 100644 --- a/packages/localize/tools/test/translate/source_files/es5_translate_plugin_spec.ts +++ b/packages/localize/tools/test/translate/source_files/es5_translate_plugin_spec.ts @@ -5,12 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.dev/license */ -import { - FileSystem, - getFileSystem, - PathSegment, - relativeFrom, -} from '@angular/compiler-cli/src/ngtsc/file_system'; +import {FileSystem, getFileSystem, PathSegment, relativeFrom} from '@angular/compiler-cli'; import {ɵcomputeMsgId, ɵparseTranslation} from '../../../../index'; import {ɵParsedTranslation} from '../../../../private'; import {transformSync} from '@babel/core'; diff --git a/packages/localize/tools/test/translate/source_files/source_file_translation_handler_spec.ts b/packages/localize/tools/test/translate/source_files/source_file_translation_handler_spec.ts index f65c7fbcd0a5..15ec514ebd8a 100644 --- a/packages/localize/tools/test/translate/source_files/source_file_translation_handler_spec.ts +++ b/packages/localize/tools/test/translate/source_files/source_file_translation_handler_spec.ts @@ -12,8 +12,8 @@ import { getFileSystem, PathSegment, relativeFrom, -} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {runInEachFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +} from '@angular/compiler-cli'; +import {runInEachFileSystem} from '@angular/compiler-cli/private/testing'; import {Diagnostics} from '../../../src/diagnostics'; import {SourceFileTranslationHandler} from '../../../src/translate/source_files/source_file_translation_handler'; diff --git a/packages/localize/tools/test/translate/translation_files/translation_loader_spec.ts b/packages/localize/tools/test/translate/translation_files/translation_loader_spec.ts index 1908674b1c94..43054639ca65 100644 --- a/packages/localize/tools/test/translate/translation_files/translation_loader_spec.ts +++ b/packages/localize/tools/test/translate/translation_files/translation_loader_spec.ts @@ -5,13 +5,8 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.dev/license */ -import { - absoluteFrom, - AbsoluteFsPath, - FileSystem, - getFileSystem, -} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {runInEachFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +import {absoluteFrom, AbsoluteFsPath, FileSystem, getFileSystem} from '@angular/compiler-cli'; +import {runInEachFileSystem} from '@angular/compiler-cli/private/testing'; import {ɵParsedTranslation, ɵparseTranslation} from '../../../../index'; import {DiagnosticHandlingStrategy, Diagnostics} from '../../../src/diagnostics'; diff --git a/packages/localize/tools/test/translate/translator_spec.ts b/packages/localize/tools/test/translate/translator_spec.ts index 589864ce6a16..7eb59a460175 100644 --- a/packages/localize/tools/test/translate/translator_spec.ts +++ b/packages/localize/tools/test/translate/translator_spec.ts @@ -12,8 +12,8 @@ import { getFileSystem, PathSegment, relativeFrom, -} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {runInEachFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +} from '@angular/compiler-cli'; +import {runInEachFileSystem} from '@angular/compiler-cli/private/testing'; import {Diagnostics as Diagnostics} from '../../src/diagnostics'; import {OutputPathFn} from '../../src/translate/output_path'; diff --git a/packages/tsconfig-build.json b/packages/tsconfig-build.json index ea0e84bc1e46..8fe1f0e8fae4 100644 --- a/packages/tsconfig-build.json +++ b/packages/tsconfig-build.json @@ -36,9 +36,6 @@ "@angular/common/locales/*": ["./common/locales/*"], "@angular/compiler-cli": ["./compiler-cli"], "@angular/compiler-cli/*": ["./compiler-cli/*"], - "@angular/compiler-cli/src/ngtsc/reflection": ["./compiler-cli/src/ngtsc/reflection/index"], - "@angular/compiler-cli/src/ngtsc/metadata": ["./compiler-cli/src/ngtsc/metadata/index"], - "@angular/compiler-cli/private/migrations": ["./compiler-cli/private/migrations"], "@angular/core/schematics/utils/tsurge/*": ["./core/schematics/utils/tsurge/*"] } }, diff --git a/tools/manual_api_docs/BUILD.bazel b/tools/manual_api_docs/BUILD.bazel index f7c95ae8acd9..3a23c985d520 100644 --- a/tools/manual_api_docs/BUILD.bazel +++ b/tools/manual_api_docs/BUILD.bazel @@ -14,7 +14,7 @@ ts_project( tsconfig = ":tsconfig_build", deps = [ "//:node_modules/@types/node", - "//packages/compiler-cli/src/ngtsc/docs", + "//packages/compiler-cli/private", ], ) @@ -32,7 +32,7 @@ ts_project( tsconfig = ":tsconfig_build", deps = [ "//:node_modules/@types/node", - "//packages/compiler-cli/src/ngtsc/docs", + "//packages/compiler-cli/private", ], ) diff --git a/tools/manual_api_docs/generate_block_api_json.mts b/tools/manual_api_docs/generate_block_api_json.mts index 3086578eb70c..750767996077 100644 --- a/tools/manual_api_docs/generate_block_api_json.mts +++ b/tools/manual_api_docs/generate_block_api_json.mts @@ -11,7 +11,7 @@ import type { DocEntryWithSourceInfo, EntryType, EntryCollection, -} from '@angular/compiler-cli/src/ngtsc/docs'; +} from '@angular/compiler-cli/private/docs'; import {readFileSync, writeFileSync} from 'fs'; import {basename, join} from 'path'; diff --git a/tools/manual_api_docs/generate_element_api_json.mts b/tools/manual_api_docs/generate_element_api_json.mts index 73784cb3a0c6..a7bf35bf55ff 100644 --- a/tools/manual_api_docs/generate_element_api_json.mts +++ b/tools/manual_api_docs/generate_element_api_json.mts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import type {DocEntry, EntryCollection, EntryType} from '@angular/compiler-cli/src/ngtsc/docs'; +import type {DocEntry, EntryCollection, EntryType} from '@angular/compiler-cli/private/docs'; import {readFileSync, writeFileSync} from 'fs'; import {basename, join} from 'path';