diff --git a/packages/compiler-cli/BUILD.bazel b/packages/compiler-cli/BUILD.bazel index 8ad378025a1..a5838b7bc8d 100644 --- a/packages/compiler-cli/BUILD.bazel +++ b/packages/compiler-cli/BUILD.bazel @@ -82,14 +82,17 @@ ts_project( "//:node_modules/typescript", "//packages/compiler", "//packages/compiler-cli/private", + "//packages/compiler-cli/src/ngtsc/annotations", "//packages/compiler-cli/src/ngtsc/core", "//packages/compiler-cli/src/ngtsc/core:api", "//packages/compiler-cli/src/ngtsc/diagnostics", "//packages/compiler-cli/src/ngtsc/docs", "//packages/compiler-cli/src/ngtsc/file_system", + "//packages/compiler-cli/src/ngtsc/imports", "//packages/compiler-cli/src/ngtsc/incremental", "//packages/compiler-cli/src/ngtsc/indexer", "//packages/compiler-cli/src/ngtsc/logging", + "//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", diff --git a/packages/compiler-cli/index.ts b/packages/compiler-cli/index.ts index aa2b4da3534..781ccc0e1b0 100644 --- a/packages/compiler-cli/index.ts +++ b/packages/compiler-cli/index.ts @@ -33,6 +33,40 @@ export {NgTscPlugin, PluginCompilerHost} from './src/ngtsc/tsc_plugin'; export {NgtscProgram} from './src/ngtsc/program'; export {OptimizeFor} from './src/ngtsc/typecheck/api'; +// Explicit exports for language service +export {getAngularDecorators} from './src/ngtsc/annotations'; +export { + NgCompiler, + type NgCompilerOptions, + type CompilationTicket, + freshCompilationTicket, + incrementalFromCompilerTicket, + resourceChangeTicket, +} from './src/ngtsc/core'; +export {type NgCompilerAdapter} from './src/ngtsc/core/api'; +export {Reference} from './src/ngtsc/imports'; +export { + type DirectiveMeta, + type InputMapping, + isExternalResource, + MetaKind, + type PipeMeta, + type Resource, +} from './src/ngtsc/metadata'; +export { + type DeclarationNode, + isNamedClassDeclaration, + type ReflectionHost, + type ClassDeclaration, +} from './src/ngtsc/reflection'; +export {isFatalDiagnosticError} from './src/ngtsc/diagnostics'; +export {PerfPhase} from './src/ngtsc/perf'; +export {type FileUpdate, type ProgramDriver} from './src/ngtsc/program_driver'; +export {TrackedIncrementalBuildStrategy} from './src/ngtsc/incremental'; +export {isShim} from './src/ngtsc/shims'; +export {getRootDirs} from './src/ngtsc/util/src/typescript'; +export * from './src/ngtsc/typecheck/api'; + // **Note**: Explicit named exports to make this file work with CJS/ESM interop without // needing to use a default import. NodeJS will expose named CJS exports as named ESM exports. // TODO(devversion): Remove these duplicate exports once devmode&prodmode is combined/ESM. @@ -40,8 +74,14 @@ export {ConsoleLogger, Logger, LogLevel} from './src/ngtsc/logging'; export { NodeJSFileSystem, absoluteFrom, - FileSystem, - AbsoluteFsPath, + absoluteFromSourceFile, + resolve, + type FileStats, + type PathSegment, + type PathString, + getSourceFileOrError, + type FileSystem, + type AbsoluteFsPath, NgtscCompilerHost, getFileSystem, setFileSystem, diff --git a/packages/language-service/src/adapters.ts b/packages/language-service/src/adapters.ts index 3f59d24a1d4..b88c5d78121 100644 --- a/packages/language-service/src/adapters.ts +++ b/packages/language-service/src/adapters.ts @@ -8,16 +8,17 @@ /** @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, + NgCompilerAdapter, 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'; + getRootDirs, + isShim, +} from '@angular/compiler-cli'; + 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 3888b609aaa..b402b18c99c 100644 --- a/packages/language-service/src/attribute_completions.ts +++ b/packages/language-service/src/attribute_completions.ts @@ -19,7 +19,7 @@ import { TemplateSymbol, TemplateTypeChecker, TypeCheckableDirectiveMeta, -} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; +} from '@angular/compiler-cli'; 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 b3ceb13f20d..086ed273bf1 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'; import type ts 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 d3333a4a964..a30b0e46ec2 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 type ts 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 778ab3219b4..09d34712732 100644 --- a/packages/language-service/src/codefixes/fix_missing_import.ts +++ b/packages/language-service/src/codefixes/fix_missing_import.ts @@ -7,8 +7,13 @@ */ 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 { + ErrorCode as NgCompilerErrorCode, + ngErrorCode, + PotentialDirective, + PotentialPipe, +} from '@angular/compiler-cli'; + import type 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 c244ccd07f7..588dafc87ee 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,13 @@ 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, + InputMapping, + ngErrorCode, + TypeCheckableDirectiveMeta, +} from '@angular/compiler-cli'; + import ts from 'typescript'; import {getTargetAtPosition, TargetNodeKind} from '../template_target'; @@ -168,7 +173,7 @@ function getBoundAttributes( if (inputs !== null) { boundInputs.push({ attribute: attr, - inputs: inputs.map((input) => ({ + inputs: inputs.map((input: InputMapping) => ({ fieldName: input.classPropertyName, required: input.required, })), 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 4e31d990029..69cd0ee2e2c 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 d7d435de4e5..35c1e3179e4 100644 --- a/packages/language-service/src/codefixes/utils.ts +++ b/packages/language-service/src/codefixes/utils.ts @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.dev/license */ -import {absoluteFrom} from '@angular/compiler-cli'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; +import {NgCompiler, absoluteFrom} from '@angular/compiler-cli'; + import type ts 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 2708ce40cf1..08fc94e0e35 100644 --- a/packages/language-service/src/compiler_factory.ts +++ b/packages/language-service/src/compiler_factory.ts @@ -7,16 +7,17 @@ */ import { + AbsoluteFsPath, CompilationTicket, + NgCompiler, + NgCompilerOptions, + ProgramDriver, + TrackedIncrementalBuildStrategy, freshCompilationTicket, incrementalFromCompilerTicket, - NgCompiler, + resolve, 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'; +} from '@angular/compiler-cli'; import {LanguageServiceAdapter} from './adapters'; diff --git a/packages/language-service/src/completions.ts b/packages/language-service/src/completions.ts index 534c80defd9..2d8a4a4f23e 100644 --- a/packages/language-service/src/completions.ts +++ b/packages/language-service/src/completions.ts @@ -14,34 +14,36 @@ import { EmptyExpr, ImplicitReceiver, LiteralPrimitive, - ParsedEventType, ParseSourceSpan, + ParsedEventType, PropertyRead, SafePropertyRead, + ThisReceiver, TmplAstBoundAttribute, TmplAstBoundEvent, TmplAstBoundEvent as BoundEvent, TmplAstElement, + TmplAstLetDeclaration, TmplAstNode, TmplAstReference, + TmplAstSwitchBlock, TmplAstSwitchBlock as SwitchBlock, TmplAstTemplate, TmplAstText, TmplAstTextAttribute, TmplAstTextAttribute as TextAttribute, TmplAstVariable, - TmplAstLetDeclaration, - TmplAstSwitchBlock, - ThisReceiver, } from '@angular/compiler'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; import { CompletionKind, + NgCompiler, PotentialDirective, + PotentialPipe, SymbolKind, TemplateDeclarationSymbol, TemplateTypeChecker, -} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; +} from '@angular/compiler-cli'; + import ts from 'typescript'; import { @@ -1395,7 +1397,7 @@ export class CompletionBuilder { ): ts.WithMetadata | undefined { const pipes = this.templateTypeChecker .getPotentialPipes(this.component) - .filter((p) => p.isInScope); + .filter((p: PotentialPipe) => p.isInScope); if (pipes === null) { return undefined; } diff --git a/packages/language-service/src/definitions.ts b/packages/language-service/src/definitions.ts index 2dfa321741a..e8993b4b052 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, DirectiveSymbol, DomBindingSymbol, ElementSymbol, + isExternalResource, + NgCompiler, + Resource, SelectorlessComponentSymbol, SelectorlessDirectiveSymbol, Symbol, @@ -29,7 +30,8 @@ import { TcbLocation, TemplateSymbol, TemplateTypeChecker, -} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; +} from '@angular/compiler-cli'; + import ts from 'typescript'; import {convertToTemplateDocumentSpan} from './references_and_rename_utils'; diff --git a/packages/language-service/src/document_symbols.ts b/packages/language-service/src/document_symbols.ts index 3f604d11abd..4ffa36e35c2 100644 --- a/packages/language-service/src/document_symbols.ts +++ b/packages/language-service/src/document_symbols.ts @@ -38,9 +38,8 @@ import { TmplAstViewportDeferredTrigger, 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 {isExternalResource, isNamedClassDeclaration, NgCompiler} from '@angular/compiler-cli'; + import ts from 'typescript'; import {AngularSymbolKind, DocumentSymbolsOptions, TemplateDocumentSymbol} from '../api'; diff --git a/packages/language-service/src/inlay_hints.ts b/packages/language-service/src/inlay_hints.ts index 442983564ab..02a8d8f7f6e 100644 --- a/packages/language-service/src/inlay_hints.ts +++ b/packages/language-service/src/inlay_hints.ts @@ -17,9 +17,10 @@ import { LiteralArray, LiteralMap, LiteralPrimitive, - SafeCall, ParsedEventType, PropertyRead, + RecursiveAstVisitor, + SafeCall, SpreadElement, TemplateLiteral, TmplAstBoundAttribute, @@ -31,29 +32,29 @@ import { TmplAstIfBlockBranch, TmplAstLetDeclaration, TmplAstNode, + TmplAstRecursiveVisitor, + TmplAstReference, TmplAstSwitchBlock, TmplAstTextAttribute, TmplAstVariable, - TmplAstReference, - tmplAstVisitAll, - RecursiveAstVisitor, - TmplAstRecursiveVisitor, Unary, + tmplAstVisitAll, } from '@angular/compiler'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; import { - SymbolKind, - VariableSymbol, - PipeSymbol, - OutputBindingSymbol, - InputBindingSymbol, - LetDeclarationSymbol, - ReferenceSymbol, DomBindingSymbol, ElementSymbol, ExpressionSymbol, -} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; -import {TemplateTypeChecker} from '@angular/compiler-cli/src/ngtsc/typecheck/api/checker'; + InputBindingSymbol, + LetDeclarationSymbol, + NgCompiler, + OutputBindingSymbol, + PipeSymbol, + ReferenceSymbol, + SymbolKind, + TemplateTypeChecker, + VariableSymbol, +} from '@angular/compiler-cli'; + import {findFirstMatchingNode} from '@angular/compiler-cli/private/hybrid_analysis'; import ts from 'typescript'; diff --git a/packages/language-service/src/language_service.ts b/packages/language-service/src/language_service.ts index 62224e9a335..d70ed45cd61 100644 --- a/packages/language-service/src/language_service.ts +++ b/packages/language-service/src/language_service.ts @@ -7,20 +7,23 @@ */ import {AST, TmplAstNode} from '@angular/compiler'; -import {CompilerOptions, ConfigurationHost, readConfiguration} from '@angular/compiler-cli'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; import { + AbsoluteFsPath, + absoluteFrom, + CompilerOptions, + ConfigurationHost, ErrorCode, + FileUpdate, + isExternalResource, isFatalDiagnosticError, + isNamedClassDeclaration, 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 ts from 'typescript'; - + NgCompiler, + OptimizeFor, + PerfPhase, + ProgramDriver, + readConfiguration, +} from '@angular/compiler-cli'; import { AngularInlayHint, ApplyRefactoringProgressFn, @@ -33,7 +36,8 @@ import { PluginConfig, } from '../api'; -import {isExternalResource} from '@angular/compiler-cli/src/ngtsc/metadata'; +import ts from 'typescript'; + import {LanguageServiceAdapter, LSParseConfigHost} from './adapters'; import {ALL_CODE_FIXES_METAS, CodeFixes} from './codefixes'; import {CompilerFactory} from './compiler_factory'; @@ -455,7 +459,7 @@ export class LanguageService { } const classDeclarations: ts.ClassDeclaration[] = []; - sf.forEachChild((node) => { + sf.forEachChild((node: ts.Node) => { if (ts.isClassDeclaration(node)) { classDeclarations.push(node); } @@ -691,7 +695,7 @@ export class LanguageService { (compiler) => { const components = compiler.getComponentsWithTemplateFile(fileName); const componentDeclarationLocations: ts.DocumentSpan[] = Array.from( - components.values(), + components.values() as IterableIterator, ).map((c) => { let contextSpan: ts.TextSpan | undefined = undefined; let textSpan: ts.TextSpan; diff --git a/packages/language-service/src/linked_editing_range.ts b/packages/language-service/src/linked_editing_range.ts index d9c54f46f42..e9cf2f1e83f 100644 --- a/packages/language-service/src/linked_editing_range.ts +++ b/packages/language-service/src/linked_editing_range.ts @@ -7,7 +7,7 @@ */ import {TmplAstElement} from '@angular/compiler'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; +import {NgCompiler} from '@angular/compiler-cli'; import tss from 'typescript'; import {LinkedEditingRanges} from '../api'; diff --git a/packages/language-service/src/outlining_spans.ts b/packages/language-service/src/outlining_spans.ts index dc2ed155523..b478567a828 100644 --- a/packages/language-service/src/outlining_spans.ts +++ b/packages/language-service/src/outlining_spans.ts @@ -18,9 +18,8 @@ import { TmplAstSwitchBlockCase, 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 {isExternalResource, isNamedClassDeclaration, NgCompiler} from '@angular/compiler-cli'; + 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 f506e9487ab..27d9f555076 100644 --- a/packages/language-service/src/quick_info.ts +++ b/packages/language-service/src/quick_info.ts @@ -13,13 +13,13 @@ import { TmplAstNode, TmplAstTextAttribute, } from '@angular/compiler'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; import { DirectiveSymbol, DomBindingSymbol, ElementSymbol, InputBindingSymbol, LetDeclarationSymbol, + NgCompiler, OutputBindingSymbol, PipeSymbol, ReferenceSymbol, @@ -29,7 +29,8 @@ import { SymbolKind, TcbLocation, VariableSymbol, -} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; +} from '@angular/compiler-cli'; + import ts from 'typescript'; import {DisplayInfoKind, SYMBOL_PUNC, SYMBOL_SPACE, SYMBOL_TEXT} from './utils/display_parts'; 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 df0fcb8b9ef..38bb94fd79c 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,9 +6,8 @@ * 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 {CompilerOptions, NgCompiler, getFileSystem} from '@angular/compiler-cli'; + import type ts from 'typescript'; import { getMessageForClassIncompatibility, 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 a22bce865c1..741f74f1671 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 @@ -7,8 +7,8 @@ */ import type ts from 'typescript'; -import {getAngularDecorators} from '@angular/compiler-cli/src/ngtsc/annotations'; -import {ReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection'; +import {ReflectionHost, getAngularDecorators} from '@angular/compiler-cli'; + 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 4b426650f27..b5d3a9fc0b5 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 @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.dev/license */ -import {CompilerOptions} from '@angular/compiler-cli'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; +import {CompilerOptions, NgCompiler} from '@angular/compiler-cli'; + 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 44376ef4b47..7bb497fa3f1 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 @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.dev/license */ -import {CompilerOptions} from '@angular/compiler-cli'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; +import {CompilerOptions, NgCompiler} from '@angular/compiler-cli'; + 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 5d29f591358..03b559f2d65 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,9 +6,8 @@ * 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 {CompilerOptions, NgCompiler, getFileSystem} from '@angular/compiler-cli'; + import ts from 'typescript'; import {groupReplacementsByFile} from '@angular/core/schematics/utils/tsurge/helpers/group_replacements'; import {ApplyRefactoringProgressFn, ApplyRefactoringResult} from '../../../api'; 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 d780c461dcc..3b378a2f123 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,8 @@ */ import type ts from 'typescript'; -import {getAngularDecorators} from '@angular/compiler-cli/src/ngtsc/annotations'; -import {ReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection'; +import {ReflectionHost, getAngularDecorators} from '@angular/compiler-cli'; + 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 7fc0958e474..a08af47b020 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 @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.dev/license */ -import {CompilerOptions} from '@angular/compiler-cli'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; +import {CompilerOptions, NgCompiler} from '@angular/compiler-cli'; + 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 4af3cbd5276..43d11de152c 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 @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.dev/license */ -import {CompilerOptions} from '@angular/compiler-cli'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; +import {CompilerOptions, NgCompiler} from '@angular/compiler-cli'; + 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 41baa8cb66c..0a0f688f894 100644 --- a/packages/language-service/src/refactorings/refactoring.ts +++ b/packages/language-service/src/refactorings/refactoring.ts @@ -6,10 +6,10 @@ * found in the LICENSE file at https://angular.dev/license */ -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; -import type ts from 'typescript'; import {ApplyRefactoringProgressFn, ApplyRefactoringResult} from '../../api'; -import {CompilerOptions} from '@angular/compiler-cli'; +import {CompilerOptions, NgCompiler} from '@angular/compiler-cli'; +import type ts from 'typescript'; + import { ConvertFieldToSignalInputBestEffortRefactoring, ConvertFieldToSignalInputRefactoring, diff --git a/packages/language-service/src/references_and_rename.ts b/packages/language-service/src/references_and_rename.ts index cab85064d5d..c58c12c01e2 100644 --- a/packages/language-service/src/references_and_rename.ts +++ b/packages/language-service/src/references_and_rename.ts @@ -6,11 +6,17 @@ * 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 { + absoluteFrom, + DirectiveMeta, + MetaKind, + NgCompiler, + PerfPhase, + PipeMeta, + SymbolKind, + TemplateTypeChecker, +} 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 a2c7964fa4b..4b7003cf346 100644 --- a/packages/language-service/src/references_and_rename_utils.ts +++ b/packages/language-service/src/references_and_rename_utils.ts @@ -14,29 +14,31 @@ 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, + DirectiveMeta, DirectiveSymbol, + NgCompiler, + PipeMeta, SelectorlessComponentSymbol, SelectorlessDirectiveSymbol, Symbol, SymbolKind, TcbLocation, TemplateTypeChecker, -} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; +} from '@angular/compiler-cli'; + import { ExpressionIdentifier, hasExpressionIdentifier, diff --git a/packages/language-service/src/semantic_tokens.ts b/packages/language-service/src/semantic_tokens.ts index d590682f5ce..ee474f86754 100644 --- a/packages/language-service/src/semantic_tokens.ts +++ b/packages/language-service/src/semantic_tokens.ts @@ -39,8 +39,8 @@ import { TmplAstVariable, TmplAstVisitor, } 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'; + 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 ac3fd3c5de0..5f74163e024 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, 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 84dd684becf..f4fffd8eb6f 100644 --- a/packages/language-service/src/template_target.ts +++ b/packages/language-service/src/template_target.ts @@ -53,7 +53,7 @@ import { tmplAstVisitAll, TmplAstVisitor, } from '@angular/compiler'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; +import {NgCompiler} from '@angular/compiler-cli'; import {findFirstMatchingNode} from '@angular/compiler-cli/private/hybrid_analysis'; import tss from 'typescript'; diff --git a/packages/language-service/src/utils/BUILD.bazel b/packages/language-service/src/utils/BUILD.bazel index 1c30bd80914..b12b7253719 100644 --- a/packages/language-service/src/utils/BUILD.bazel +++ b/packages/language-service/src/utils/BUILD.bazel @@ -8,11 +8,6 @@ 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", ], ) diff --git a/packages/language-service/src/utils/decorators.ts b/packages/language-service/src/utils/decorators.ts index e7de3d88c6b..7cfcb8f2d1d 100644 --- a/packages/language-service/src/utils/decorators.ts +++ b/packages/language-service/src/utils/decorators.ts @@ -7,8 +7,7 @@ */ import type ts from 'typescript'; -import {ReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection'; -import {getAngularDecorators} from '@angular/compiler-cli/src/ngtsc/annotations'; +import {ReflectionHost, getAngularDecorators} from '@angular/compiler-cli'; 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 817bf3e9f37..1df406dc7b0 100644 --- a/packages/language-service/src/utils/display_parts.ts +++ b/packages/language-service/src/utils/display_parts.ts @@ -6,7 +6,6 @@ * found in the LICENSE file at https://angular.dev/license */ -import {isNamedClassDeclaration} from '@angular/compiler-cli/src/ngtsc/reflection'; import { LetDeclarationSymbol, PotentialDirective, @@ -16,7 +15,9 @@ import { TcbLocation, TemplateTypeChecker, VariableSymbol, -} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; + isNamedClassDeclaration, +} from '@angular/compiler-cli'; + 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 0fcc3c89ed0..5c1e65b678a 100644 --- a/packages/language-service/src/utils/index.ts +++ b/packages/language-service/src/utils/index.ts @@ -24,15 +24,16 @@ import { TmplAstTemplate, TmplAstTextAttribute, } from '@angular/compiler'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; import { + AbsoluteFsPath, + DeclarationNode, + DirectiveSymbol, + isExternalResource, + NgCompiler, + TemplateTypeChecker, 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'; +} 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 9ce40ef0e14..cb9052ab102 100644 --- a/packages/language-service/src/utils/ts_utils.ts +++ b/packages/language-service/src/utils/ts_utils.ts @@ -5,22 +5,23 @@ * 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 {guessIndentationInSingleLine} from './format'; +import * as path from 'path'; import { + ClassDeclaration, DirectiveModuleExportDetails, + NgCompiler, PotentialDirective, PotentialDirectiveModuleSpecifierResolver, PotentialImportMode, PotentialPipe, + Reference, + SymbolReference, TemplateTypeChecker, TsCompletionEntryInfo, - SymbolReference, -} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; +} from '@angular/compiler-cli'; + 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`.