@angular/compiler-cli 9.0.0-rc.6 → 9.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/ngcc/src/analysis/decoration_analyzer.d.ts +13 -26
- package/ngcc/src/analysis/decoration_analyzer.js +100 -134
- package/ngcc/src/analysis/migration_host.d.ts +5 -16
- package/ngcc/src/analysis/migration_host.js +20 -91
- package/ngcc/src/analysis/module_with_providers_analyzer.js +2 -2
- package/ngcc/src/analysis/ngcc_trait_compiler.d.ts +42 -0
- package/ngcc/src/analysis/ngcc_trait_compiler.js +107 -0
- package/ngcc/src/analysis/private_declarations_analyzer.d.ts +0 -1
- package/ngcc/src/analysis/private_declarations_analyzer.js +4 -35
- package/ngcc/src/analysis/types.d.ts +6 -21
- package/ngcc/src/analysis/types.js +1 -1
- package/ngcc/src/analysis/util.d.ts +2 -5
- package/ngcc/src/analysis/util.js +11 -94
- package/ngcc/src/dependencies/commonjs_dependency_host.d.ts +1 -1
- package/ngcc/src/dependencies/commonjs_dependency_host.js +90 -39
- package/ngcc/src/dependencies/dependency_host.d.ts +7 -5
- package/ngcc/src/dependencies/dependency_host.js +12 -10
- package/ngcc/src/dependencies/dependency_resolver.d.ts +2 -1
- package/ngcc/src/dependencies/dependency_resolver.js +9 -4
- package/ngcc/src/dependencies/dts_dependency_host.d.ts +21 -0
- package/ngcc/src/dependencies/dts_dependency_host.js +34 -0
- package/ngcc/src/dependencies/esm_dependency_host.d.ts +8 -1
- package/ngcc/src/dependencies/esm_dependency_host.js +30 -22
- package/ngcc/src/dependencies/module_resolver.d.ts +1 -1
- package/ngcc/src/dependencies/module_resolver.js +1 -1
- package/ngcc/src/dependencies/umd_dependency_host.d.ts +1 -1
- package/ngcc/src/dependencies/umd_dependency_host.js +3 -3
- package/ngcc/src/entry_point_finder/targeted_entry_point_finder.d.ts +2 -0
- package/ngcc/src/entry_point_finder/targeted_entry_point_finder.js +49 -9
- package/ngcc/src/execution/cluster/executor.d.ts +3 -1
- package/ngcc/src/execution/cluster/executor.js +12 -7
- package/ngcc/src/execution/cluster/package_json_updater.js +3 -2
- package/ngcc/src/execution/cluster/worker.d.ts +3 -1
- package/ngcc/src/execution/cluster/worker.js +10 -7
- package/ngcc/src/execution/lock_file.d.ts +43 -0
- package/ngcc/src/execution/lock_file.js +129 -0
- package/ngcc/src/execution/single_process_executor.d.ts +3 -1
- package/ngcc/src/execution/single_process_executor.js +18 -15
- package/ngcc/src/execution/task_selection/base_task_queue.d.ts +1 -1
- package/ngcc/src/host/commonjs_host.d.ts +6 -18
- package/ngcc/src/host/commonjs_host.js +45 -81
- package/ngcc/src/host/commonjs_umd_utils.d.ts +73 -0
- package/ngcc/src/host/commonjs_umd_utils.js +109 -0
- package/ngcc/src/host/esm2015_host.d.ts +46 -14
- package/ngcc/src/host/esm2015_host.js +182 -55
- package/ngcc/src/host/esm5_host.js +3 -1
- package/ngcc/src/host/umd_host.d.ts +12 -5
- package/ngcc/src/host/umd_host.js +144 -92
- package/ngcc/src/main.js +65 -122
- package/ngcc/src/migrations/migration.d.ts +1 -0
- package/ngcc/src/migrations/migration.js +1 -1
- package/ngcc/src/packages/build_marker.d.ts +17 -8
- package/ngcc/src/packages/build_marker.js +61 -32
- package/ngcc/src/packages/entry_point_bundle.js +2 -2
- package/ngcc/src/packages/transformer.js +5 -6
- package/ngcc/src/rendering/commonjs_rendering_formatter.js +9 -5
- package/ngcc/src/rendering/dts_renderer.js +8 -5
- package/ngcc/src/rendering/esm_rendering_formatter.js +17 -5
- package/ngcc/src/rendering/renderer.js +4 -4
- package/ngcc/src/rendering/umd_rendering_formatter.d.ts +18 -1
- package/ngcc/src/rendering/umd_rendering_formatter.js +69 -16
- package/ngcc/src/utils.d.ts +14 -0
- package/ngcc/src/utils.js +29 -1
- package/ngcc/src/writing/cleaning/cleaning_strategies.d.ts +45 -0
- package/ngcc/src/writing/cleaning/cleaning_strategies.js +77 -0
- package/ngcc/src/writing/cleaning/package_cleaner.d.ts +39 -0
- package/ngcc/src/writing/cleaning/package_cleaner.js +125 -0
- package/ngcc/src/writing/cleaning/utils.d.ts +16 -0
- package/ngcc/src/writing/cleaning/utils.js +29 -0
- package/ngcc/src/writing/in_place_file_writer.d.ts +1 -0
- package/ngcc/src/writing/in_place_file_writer.js +3 -2
- package/ngcc/src/writing/new_entry_point_file_writer.d.ts +2 -0
- package/ngcc/src/writing/new_entry_point_file_writer.js +5 -4
- package/ngcc/src/writing/package_json_updater.d.ts +24 -10
- package/ngcc/src/writing/package_json_updater.js +53 -10
- package/package.json +6 -5
- package/src/main.d.ts +2 -2
- package/src/metadata/symbols.d.ts +1 -1
- package/src/ngtsc/annotations/src/component.d.ts +58 -20
- package/src/ngtsc/annotations/src/component.js +149 -97
- package/src/ngtsc/annotations/src/diagnostics.d.ts +23 -0
- package/src/ngtsc/annotations/src/diagnostics.js +123 -0
- package/src/ngtsc/annotations/src/directive.d.ts +19 -8
- package/src/ngtsc/annotations/src/directive.js +41 -18
- package/src/ngtsc/annotations/src/injectable.d.ts +8 -4
- package/src/ngtsc/annotations/src/injectable.js +7 -3
- package/src/ngtsc/annotations/src/ng_module.d.ts +22 -7
- package/src/ngtsc/annotations/src/ng_module.js +115 -52
- package/src/ngtsc/annotations/src/pipe.d.ts +12 -6
- package/src/ngtsc/annotations/src/pipe.js +22 -5
- package/src/ngtsc/annotations/src/util.d.ts +22 -0
- package/src/ngtsc/annotations/src/util.js +92 -3
- package/src/ngtsc/core/api.d.ts +368 -0
- package/src/ngtsc/core/api.js +20 -0
- package/src/ngtsc/core/index.d.ts +10 -0
- package/src/ngtsc/core/index.js +24 -0
- package/src/ngtsc/core/src/compiler.d.ts +120 -0
- package/src/ngtsc/core/src/compiler.js +769 -0
- package/src/ngtsc/core/src/host.d.ts +85 -0
- package/src/ngtsc/core/src/host.js +208 -0
- package/src/ngtsc/cycles/src/imports.js +2 -2
- package/src/ngtsc/diagnostics/index.d.ts +1 -1
- package/src/ngtsc/diagnostics/index.js +5 -5
- package/src/ngtsc/diagnostics/src/error.d.ts +1 -1
- package/src/ngtsc/diagnostics/src/error.js +1 -1
- package/src/ngtsc/diagnostics/src/{code.d.ts → error_code.d.ts} +27 -4
- package/src/ngtsc/diagnostics/src/error_code.js +128 -0
- package/src/ngtsc/file_system/src/cached_file_system.d.ts +3 -1
- package/src/ngtsc/file_system/src/cached_file_system.js +48 -4
- package/src/ngtsc/file_system/src/invalid_file_system.d.ts +3 -1
- package/src/ngtsc/file_system/src/invalid_file_system.js +4 -2
- package/src/ngtsc/file_system/src/node_js_file_system.d.ts +3 -1
- package/src/ngtsc/file_system/src/node_js_file_system.js +8 -4
- package/src/ngtsc/file_system/src/types.d.ts +3 -1
- package/src/ngtsc/file_system/src/types.js +1 -1
- package/src/ngtsc/imports/index.d.ts +3 -3
- package/src/ngtsc/imports/index.js +4 -4
- package/src/ngtsc/imports/src/alias.d.ts +12 -11
- package/src/ngtsc/imports/src/alias.js +21 -16
- package/src/ngtsc/imports/src/emitter.d.ts +40 -19
- package/src/ngtsc/imports/src/emitter.js +54 -26
- package/src/ngtsc/imports/src/references.d.ts +30 -8
- package/src/ngtsc/imports/src/references.js +41 -6
- package/src/ngtsc/imports/src/resolver.d.ts +3 -6
- package/src/ngtsc/imports/src/resolver.js +5 -4
- package/src/ngtsc/incremental/api.d.ts +51 -0
- package/src/ngtsc/incremental/api.js +20 -0
- package/src/ngtsc/incremental/index.d.ts +1 -0
- package/src/ngtsc/incremental/index.js +4 -2
- package/src/ngtsc/incremental/src/dependency_tracking.d.ts +56 -0
- package/src/ngtsc/incremental/src/dependency_tracking.js +186 -0
- package/src/ngtsc/incremental/src/noop.d.ts +10 -0
- package/src/ngtsc/incremental/src/noop.js +23 -0
- package/src/ngtsc/incremental/src/state.d.ts +8 -14
- package/src/ngtsc/incremental/src/state.js +83 -80
- package/src/ngtsc/indexer/index.d.ts +1 -0
- package/src/ngtsc/indexer/index.js +4 -2
- package/src/ngtsc/metadata/index.d.ts +1 -1
- package/src/ngtsc/metadata/index.js +2 -1
- package/src/ngtsc/metadata/src/api.d.ts +8 -0
- package/src/ngtsc/metadata/src/api.js +1 -1
- package/src/ngtsc/metadata/src/dts.js +2 -1
- package/src/ngtsc/metadata/src/registry.d.ts +12 -1
- package/src/ngtsc/metadata/src/registry.js +22 -2
- package/src/ngtsc/metadata/src/util.d.ts +2 -0
- package/src/ngtsc/metadata/src/util.js +10 -1
- package/src/ngtsc/modulewithproviders/src/scanner.js +2 -2
- package/src/ngtsc/partial_evaluator/index.d.ts +1 -1
- package/src/ngtsc/partial_evaluator/index.js +1 -1
- package/src/ngtsc/partial_evaluator/src/builtin.d.ts +7 -6
- package/src/ngtsc/partial_evaluator/src/builtin.js +54 -9
- package/src/ngtsc/partial_evaluator/src/interface.d.ts +3 -9
- package/src/ngtsc/partial_evaluator/src/interface.js +4 -3
- package/src/ngtsc/partial_evaluator/src/interpreter.d.ts +4 -3
- package/src/ngtsc/partial_evaluator/src/interpreter.js +11 -7
- package/src/ngtsc/partial_evaluator/src/known_declaration.d.ts +19 -0
- package/src/ngtsc/partial_evaluator/src/known_declaration.js +38 -0
- package/src/ngtsc/partial_evaluator/src/result.d.ts +1 -1
- package/src/ngtsc/partial_evaluator/src/result.js +1 -1
- package/src/ngtsc/partial_evaluator/src/ts_helpers.d.ts +1 -1
- package/src/ngtsc/partial_evaluator/src/ts_helpers.js +13 -3
- package/src/ngtsc/program.d.ts +46 -57
- package/src/ngtsc/program.js +68 -574
- package/src/ngtsc/reflection/src/host.d.ts +19 -2
- package/src/ngtsc/reflection/src/host.js +17 -3
- package/src/ngtsc/reflection/src/typescript.js +11 -7
- package/src/ngtsc/resource/index.d.ts +9 -0
- package/src/ngtsc/resource/index.js +22 -0
- package/src/ngtsc/{resource_loader.d.ts → resource/src/loader.d.ts} +4 -4
- package/src/ngtsc/resource/src/loader.js +193 -0
- package/src/ngtsc/routing/src/route.js +2 -2
- package/src/ngtsc/scope/index.d.ts +1 -1
- package/src/ngtsc/scope/index.js +1 -1
- package/src/ngtsc/scope/src/component_scope.d.ts +2 -2
- package/src/ngtsc/scope/src/component_scope.js +1 -1
- package/src/ngtsc/scope/src/dependency.js +10 -8
- package/src/ngtsc/scope/src/local.d.ts +31 -4
- package/src/ngtsc/scope/src/local.js +83 -15
- package/src/ngtsc/shims/index.d.ts +2 -1
- package/src/ngtsc/shims/index.js +4 -5
- package/src/ngtsc/shims/src/api.d.ts +25 -0
- package/src/ngtsc/shims/src/api.js +13 -0
- package/src/ngtsc/shims/src/factory_generator.d.ts +2 -2
- package/src/ngtsc/shims/src/factory_generator.js +1 -1
- package/src/ngtsc/shims/src/factory_tracker.d.ts +24 -0
- package/src/ngtsc/shims/src/factory_tracker.js +47 -0
- package/src/ngtsc/shims/src/summary_generator.d.ts +1 -1
- package/src/ngtsc/shims/src/summary_generator.js +1 -1
- package/src/ngtsc/shims/src/typecheck_shim.d.ts +1 -1
- package/src/ngtsc/shims/src/typecheck_shim.js +1 -1
- package/src/ngtsc/synthetic_files_compiler_host.d.ts +1 -1
- package/src/ngtsc/transform/index.d.ts +3 -1
- package/src/ngtsc/transform/index.js +8 -3
- package/src/ngtsc/transform/src/alias.d.ts +1 -1
- package/src/ngtsc/transform/src/alias.js +1 -1
- package/src/ngtsc/transform/src/api.d.ts +52 -17
- package/src/ngtsc/transform/src/api.js +1 -1
- package/src/ngtsc/transform/src/compilation.d.ts +68 -47
- package/src/ngtsc/transform/src/compilation.js +498 -313
- package/src/ngtsc/transform/src/declaration.d.ts +1 -1
- package/src/ngtsc/transform/src/declaration.js +6 -1
- package/src/ngtsc/transform/src/trait.d.ts +169 -0
- package/src/ngtsc/transform/src/trait.js +114 -0
- package/src/ngtsc/transform/src/transform.d.ts +2 -2
- package/src/ngtsc/transform/src/transform.js +4 -4
- package/src/ngtsc/translator/src/translator.d.ts +11 -9
- package/src/ngtsc/translator/src/translator.js +51 -18
- package/src/ngtsc/typecheck/index.d.ts +1 -0
- package/src/ngtsc/typecheck/index.js +4 -2
- package/src/ngtsc/typecheck/src/api.d.ts +12 -1
- package/src/ngtsc/typecheck/src/api.js +1 -1
- package/src/ngtsc/typecheck/src/context.d.ts +3 -2
- package/src/ngtsc/typecheck/src/context.js +10 -8
- package/src/ngtsc/typecheck/src/diagnostics.d.ts +30 -31
- package/src/ngtsc/typecheck/src/diagnostics.js +108 -70
- package/src/ngtsc/typecheck/src/dom.d.ts +6 -5
- package/src/ngtsc/typecheck/src/dom.js +3 -3
- package/src/ngtsc/typecheck/src/environment.d.ts +5 -3
- package/src/ngtsc/typecheck/src/environment.js +20 -8
- package/src/ngtsc/typecheck/src/expression.d.ts +2 -3
- package/src/ngtsc/typecheck/src/expression.js +26 -23
- package/src/ngtsc/typecheck/src/host.d.ts +1 -0
- package/src/ngtsc/typecheck/src/host.js +4 -1
- package/src/ngtsc/typecheck/src/oob.d.ts +11 -11
- package/src/ngtsc/typecheck/src/oob.js +15 -4
- package/src/ngtsc/typecheck/src/source.d.ts +9 -9
- package/src/ngtsc/typecheck/src/source.js +15 -15
- package/src/ngtsc/typecheck/src/template_semantics.d.ts +22 -0
- package/src/ngtsc/typecheck/src/template_semantics.js +51 -0
- package/src/ngtsc/typecheck/src/ts_util.js +36 -1
- package/src/ngtsc/typecheck/src/type_check_block.d.ts +3 -3
- package/src/ngtsc/typecheck/src/type_check_block.js +70 -43
- package/src/ngtsc/typecheck/src/type_check_file.d.ts +2 -2
- package/src/ngtsc/typecheck/src/type_check_file.js +3 -3
- package/src/ngtsc/typecheck/src/type_constructor.d.ts +4 -4
- package/src/ngtsc/typecheck/src/type_constructor.js +15 -10
- package/src/ngtsc/typecheck/src/type_emitter.d.ts +72 -0
- package/src/ngtsc/typecheck/src/type_emitter.js +150 -0
- package/src/ngtsc/typecheck/src/type_parameter_emitter.d.ts +31 -0
- package/src/ngtsc/typecheck/src/type_parameter_emitter.js +96 -0
- package/src/ngtsc/util/src/typescript.d.ts +7 -1
- package/src/ngtsc/util/src/typescript.js +15 -5
- package/src/perform_watch.js +6 -5
- package/src/transformers/api.d.ts +3 -204
- package/src/transformers/api.js +1 -1
- package/src/transformers/compiler_host.js +2 -2
- package/src/transformers/program.js +1 -1
- package/src/typescript_support.js +2 -2
- package/src/version.js +1 -1
- package/src/ngtsc/diagnostics/src/code.js +0 -101
- package/src/ngtsc/resource_loader.js +0 -193
- package/src/ngtsc/shims/src/host.d.ts +0 -46
- package/src/ngtsc/shims/src/host.js +0 -82
- package/src/ngtsc/util/src/resource_recorder.d.ts +0 -18
- package/src/ngtsc/util/src/resource_recorder.js +0 -20
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright Google Inc. All Rights Reserved.
|
|
4
|
+
*
|
|
5
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
+
* found in the LICENSE file at https://angular.io/license
|
|
7
|
+
*/
|
|
8
|
+
/// <amd-module name="@angular/compiler-cli/src/ngtsc/annotations/src/diagnostics" />
|
|
9
|
+
import * as ts from 'typescript';
|
|
10
|
+
import { Reference } from '../../imports';
|
|
11
|
+
import { InjectableClassRegistry, MetadataReader } from '../../metadata';
|
|
12
|
+
import { PartialEvaluator } from '../../partial_evaluator';
|
|
13
|
+
import { ClassDeclaration, ReflectionHost } from '../../reflection';
|
|
14
|
+
import { LocalModuleScopeRegistry } from '../../scope';
|
|
15
|
+
/**
|
|
16
|
+
* Gets the diagnostics for a set of provider classes.
|
|
17
|
+
* @param providerClasses Classes that should be checked.
|
|
18
|
+
* @param providersDeclaration Node that declares the providers array.
|
|
19
|
+
* @param registry Registry that keeps track of the registered injectable classes.
|
|
20
|
+
*/
|
|
21
|
+
export declare function getProviderDiagnostics(providerClasses: Set<Reference<ClassDeclaration>>, providersDeclaration: ts.Expression, registry: InjectableClassRegistry): ts.Diagnostic[];
|
|
22
|
+
export declare function getDirectiveDiagnostics(node: ClassDeclaration, reader: MetadataReader, evaluator: PartialEvaluator, reflector: ReflectionHost, scopeRegistry: LocalModuleScopeRegistry, kind: string): ts.Diagnostic[] | null;
|
|
23
|
+
export declare function checkInheritanceOfDirective(node: ClassDeclaration, reader: MetadataReader, reflector: ReflectionHost, evaluator: PartialEvaluator): ts.Diagnostic | null;
|
|
@@ -0,0 +1,123 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright Google Inc. All Rights Reserved.
|
|
4
|
+
*
|
|
5
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
+
* found in the LICENSE file at https://angular.io/license
|
|
7
|
+
*/
|
|
8
|
+
(function (factory) {
|
|
9
|
+
if (typeof module === "object" && typeof module.exports === "object") {
|
|
10
|
+
var v = factory(require, exports);
|
|
11
|
+
if (v !== undefined) module.exports = v;
|
|
12
|
+
}
|
|
13
|
+
else if (typeof define === "function" && define.amd) {
|
|
14
|
+
define("@angular/compiler-cli/src/ngtsc/annotations/src/diagnostics", ["require", "exports", "tslib", "@angular/compiler-cli/src/ngtsc/diagnostics", "@angular/compiler-cli/src/ngtsc/imports", "@angular/compiler-cli/src/ngtsc/annotations/src/util"], factory);
|
|
15
|
+
}
|
|
16
|
+
})(function (require, exports) {
|
|
17
|
+
"use strict";
|
|
18
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
19
|
+
var tslib_1 = require("tslib");
|
|
20
|
+
var diagnostics_1 = require("@angular/compiler-cli/src/ngtsc/diagnostics");
|
|
21
|
+
var imports_1 = require("@angular/compiler-cli/src/ngtsc/imports");
|
|
22
|
+
var util_1 = require("@angular/compiler-cli/src/ngtsc/annotations/src/util");
|
|
23
|
+
/**
|
|
24
|
+
* Gets the diagnostics for a set of provider classes.
|
|
25
|
+
* @param providerClasses Classes that should be checked.
|
|
26
|
+
* @param providersDeclaration Node that declares the providers array.
|
|
27
|
+
* @param registry Registry that keeps track of the registered injectable classes.
|
|
28
|
+
*/
|
|
29
|
+
function getProviderDiagnostics(providerClasses, providersDeclaration, registry) {
|
|
30
|
+
var e_1, _a;
|
|
31
|
+
var diagnostics = [];
|
|
32
|
+
try {
|
|
33
|
+
for (var providerClasses_1 = tslib_1.__values(providerClasses), providerClasses_1_1 = providerClasses_1.next(); !providerClasses_1_1.done; providerClasses_1_1 = providerClasses_1.next()) {
|
|
34
|
+
var provider = providerClasses_1_1.value;
|
|
35
|
+
if (registry.isInjectable(provider.node)) {
|
|
36
|
+
continue;
|
|
37
|
+
}
|
|
38
|
+
var contextNode = provider.getOriginForDiagnostics(providersDeclaration);
|
|
39
|
+
diagnostics.push(diagnostics_1.makeDiagnostic(diagnostics_1.ErrorCode.UNDECORATED_PROVIDER, contextNode, "The class '" + provider.node.name.text + "' cannot be created via dependency injection, as it does not have an Angular decorator. This will result in an error at runtime.\n\nEither add the @Injectable() decorator to '" + provider.node.name.text + "', or configure a different provider (such as a provider with 'useFactory').\n", [{ node: provider.node, messageText: "'" + provider.node.name.text + "' is declared here." }]));
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
43
|
+
finally {
|
|
44
|
+
try {
|
|
45
|
+
if (providerClasses_1_1 && !providerClasses_1_1.done && (_a = providerClasses_1.return)) _a.call(providerClasses_1);
|
|
46
|
+
}
|
|
47
|
+
finally { if (e_1) throw e_1.error; }
|
|
48
|
+
}
|
|
49
|
+
return diagnostics;
|
|
50
|
+
}
|
|
51
|
+
exports.getProviderDiagnostics = getProviderDiagnostics;
|
|
52
|
+
function getDirectiveDiagnostics(node, reader, evaluator, reflector, scopeRegistry, kind) {
|
|
53
|
+
var diagnostics = [];
|
|
54
|
+
var addDiagnostics = function (more) {
|
|
55
|
+
if (more === null) {
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
else if (diagnostics === null) {
|
|
59
|
+
diagnostics = Array.isArray(more) ? more : [more];
|
|
60
|
+
}
|
|
61
|
+
else if (Array.isArray(more)) {
|
|
62
|
+
diagnostics.push.apply(diagnostics, tslib_1.__spread(more));
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
diagnostics.push(more);
|
|
66
|
+
}
|
|
67
|
+
};
|
|
68
|
+
var duplicateDeclarations = scopeRegistry.getDuplicateDeclarations(node);
|
|
69
|
+
if (duplicateDeclarations !== null) {
|
|
70
|
+
addDiagnostics(util_1.makeDuplicateDeclarationError(node, duplicateDeclarations, kind));
|
|
71
|
+
}
|
|
72
|
+
addDiagnostics(checkInheritanceOfDirective(node, reader, reflector, evaluator));
|
|
73
|
+
return diagnostics;
|
|
74
|
+
}
|
|
75
|
+
exports.getDirectiveDiagnostics = getDirectiveDiagnostics;
|
|
76
|
+
function checkInheritanceOfDirective(node, reader, reflector, evaluator) {
|
|
77
|
+
if (!reflector.isClass(node) || reflector.getConstructorParameters(node) !== null) {
|
|
78
|
+
// We should skip nodes that aren't classes. If a constructor exists, then no base class
|
|
79
|
+
// definition is required on the runtime side - it's legal to inherit from any class.
|
|
80
|
+
return null;
|
|
81
|
+
}
|
|
82
|
+
// The extends clause is an expression which can be as dynamic as the user wants. Try to
|
|
83
|
+
// evaluate it, but fall back on ignoring the clause if it can't be understood. This is a View
|
|
84
|
+
// Engine compatibility hack: View Engine ignores 'extends' expressions that it cannot understand.
|
|
85
|
+
var baseClass = util_1.readBaseClass(node, reflector, evaluator);
|
|
86
|
+
while (baseClass !== null) {
|
|
87
|
+
if (baseClass === 'dynamic') {
|
|
88
|
+
return null;
|
|
89
|
+
}
|
|
90
|
+
// We can skip the base class if it has metadata.
|
|
91
|
+
var baseClassMeta = reader.getDirectiveMetadata(baseClass);
|
|
92
|
+
if (baseClassMeta !== null) {
|
|
93
|
+
return null;
|
|
94
|
+
}
|
|
95
|
+
// If the base class has a blank constructor we can skip it since it can't be using DI.
|
|
96
|
+
var baseClassConstructorParams = reflector.getConstructorParameters(baseClass.node);
|
|
97
|
+
var newParentClass = util_1.readBaseClass(baseClass.node, reflector, evaluator);
|
|
98
|
+
if (baseClassConstructorParams !== null && baseClassConstructorParams.length > 0) {
|
|
99
|
+
// This class has a non-trivial constructor, that's an error!
|
|
100
|
+
return getInheritedUndecoratedCtorDiagnostic(node, baseClass, reader);
|
|
101
|
+
}
|
|
102
|
+
else if (baseClassConstructorParams !== null || newParentClass === null) {
|
|
103
|
+
// This class has a trivial constructor, or no constructor + is the
|
|
104
|
+
// top of the inheritance chain, so it's okay.
|
|
105
|
+
return null;
|
|
106
|
+
}
|
|
107
|
+
// Go up the chain and continue
|
|
108
|
+
baseClass = newParentClass;
|
|
109
|
+
}
|
|
110
|
+
return null;
|
|
111
|
+
}
|
|
112
|
+
exports.checkInheritanceOfDirective = checkInheritanceOfDirective;
|
|
113
|
+
function getInheritedUndecoratedCtorDiagnostic(node, baseClass, reader) {
|
|
114
|
+
var subclassMeta = reader.getDirectiveMetadata(new imports_1.Reference(node));
|
|
115
|
+
var dirOrComp = subclassMeta.isComponent ? 'Component' : 'Directive';
|
|
116
|
+
var baseClassName = baseClass.debugName;
|
|
117
|
+
return diagnostics_1.makeDiagnostic(diagnostics_1.ErrorCode.DIRECTIVE_INHERITS_UNDECORATED_CTOR, node.name, "The " + dirOrComp.toLowerCase() + " " + node.name.text + " inherits its constructor from " + baseClassName + ", " +
|
|
118
|
+
"but the latter does not have an Angular decorator of its own. Dependency injection will not be able to " +
|
|
119
|
+
("resolve the parameters of " + baseClassName + "'s constructor. Either add a @Directive decorator ") +
|
|
120
|
+
("to " + baseClassName + ", or add an explicit constructor to " + node.name.text + "."));
|
|
121
|
+
}
|
|
122
|
+
});
|
|
123
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"diagnostics.js","sourceRoot":"","sources":["../../../../../../../../../packages/compiler-cli/src/ngtsc/annotations/src/diagnostics.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google Inc. All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport * as ts from 'typescript';\n\nimport {ErrorCode, makeDiagnostic} from '../../diagnostics';\nimport {Reference} from '../../imports';\nimport {InjectableClassRegistry, MetadataReader} from '../../metadata';\nimport {PartialEvaluator} from '../../partial_evaluator';\nimport {ClassDeclaration, ReflectionHost} from '../../reflection';\nimport {LocalModuleScopeRegistry} from '../../scope';\n\nimport {makeDuplicateDeclarationError, readBaseClass} from './util';\n\n/**\n * Gets the diagnostics for a set of provider classes.\n * @param providerClasses Classes that should be checked.\n * @param providersDeclaration Node that declares the providers array.\n * @param registry Registry that keeps track of the registered injectable classes.\n */\nexport function getProviderDiagnostics(\n    providerClasses: Set<Reference<ClassDeclaration>>, providersDeclaration: ts.Expression,\n    registry: InjectableClassRegistry): ts.Diagnostic[] {\n  const diagnostics: ts.Diagnostic[] = [];\n\n  for (const provider of providerClasses) {\n    if (registry.isInjectable(provider.node)) {\n      continue;\n    }\n\n    const contextNode = provider.getOriginForDiagnostics(providersDeclaration);\n    diagnostics.push(makeDiagnostic(\n        ErrorCode.UNDECORATED_PROVIDER, contextNode,\n        `The class '${provider.node.name.text}' cannot be created via dependency injection, as it does not have an Angular decorator. This will result in an error at runtime.\n\nEither add the @Injectable() decorator to '${provider.node.name.text}', or configure a different provider (such as a provider with 'useFactory').\n`,\n        [{node: provider.node, messageText: `'${provider.node.name.text}' is declared here.`}]));\n  }\n\n  return diagnostics;\n}\n\nexport function getDirectiveDiagnostics(\n    node: ClassDeclaration, reader: MetadataReader, evaluator: PartialEvaluator,\n    reflector: ReflectionHost, scopeRegistry: LocalModuleScopeRegistry,\n    kind: string): ts.Diagnostic[]|null {\n  let diagnostics: ts.Diagnostic[]|null = [];\n\n  const addDiagnostics = (more: ts.Diagnostic | ts.Diagnostic[] | null) => {\n    if (more === null) {\n      return;\n    } else if (diagnostics === null) {\n      diagnostics = Array.isArray(more) ? more : [more];\n    } else if (Array.isArray(more)) {\n      diagnostics.push(...more);\n    } else {\n      diagnostics.push(more);\n    }\n  };\n\n  const duplicateDeclarations = scopeRegistry.getDuplicateDeclarations(node);\n\n  if (duplicateDeclarations !== null) {\n    addDiagnostics(makeDuplicateDeclarationError(node, duplicateDeclarations, kind));\n  }\n\n  addDiagnostics(checkInheritanceOfDirective(node, reader, reflector, evaluator));\n  return diagnostics;\n}\n\nexport function checkInheritanceOfDirective(\n    node: ClassDeclaration, reader: MetadataReader, reflector: ReflectionHost,\n    evaluator: PartialEvaluator): ts.Diagnostic|null {\n  if (!reflector.isClass(node) || reflector.getConstructorParameters(node) !== null) {\n    // We should skip nodes that aren't classes. If a constructor exists, then no base class\n    // definition is required on the runtime side - it's legal to inherit from any class.\n    return null;\n  }\n\n  // The extends clause is an expression which can be as dynamic as the user wants. Try to\n  // evaluate it, but fall back on ignoring the clause if it can't be understood. This is a View\n  // Engine compatibility hack: View Engine ignores 'extends' expressions that it cannot understand.\n  let baseClass = readBaseClass(node, reflector, evaluator);\n\n  while (baseClass !== null) {\n    if (baseClass === 'dynamic') {\n      return null;\n    }\n\n    // We can skip the base class if it has metadata.\n    const baseClassMeta = reader.getDirectiveMetadata(baseClass);\n    if (baseClassMeta !== null) {\n      return null;\n    }\n\n    // If the base class has a blank constructor we can skip it since it can't be using DI.\n    const baseClassConstructorParams = reflector.getConstructorParameters(baseClass.node);\n    const newParentClass = readBaseClass(baseClass.node, reflector, evaluator);\n\n    if (baseClassConstructorParams !== null && baseClassConstructorParams.length > 0) {\n      // This class has a non-trivial constructor, that's an error!\n      return getInheritedUndecoratedCtorDiagnostic(node, baseClass, reader);\n    } else if (baseClassConstructorParams !== null || newParentClass === null) {\n      // This class has a trivial constructor, or no constructor + is the\n      // top of the inheritance chain, so it's okay.\n      return null;\n    }\n\n    // Go up the chain and continue\n    baseClass = newParentClass;\n  }\n\n  return null;\n}\n\nfunction getInheritedUndecoratedCtorDiagnostic(\n    node: ClassDeclaration, baseClass: Reference, reader: MetadataReader) {\n  const subclassMeta = reader.getDirectiveMetadata(new Reference(node)) !;\n  const dirOrComp = subclassMeta.isComponent ? 'Component' : 'Directive';\n  const baseClassName = baseClass.debugName;\n\n  return makeDiagnostic(\n      ErrorCode.DIRECTIVE_INHERITS_UNDECORATED_CTOR, node.name,\n      `The ${dirOrComp.toLowerCase()} ${node.name.text} inherits its constructor from ${baseClassName}, ` +\n          `but the latter does not have an Angular decorator of its own. Dependency injection will not be able to ` +\n          `resolve the parameters of ${baseClassName}'s constructor. Either add a @Directive decorator ` +\n          `to ${baseClassName}, or add an explicit constructor to ${node.name.text}.`);\n}\n"]}
|
|
@@ -8,27 +8,38 @@
|
|
|
8
8
|
/// <amd-module name="@angular/compiler-cli/src/ngtsc/annotations/src/directive" />
|
|
9
9
|
import { ConstantPool, ParsedHostBindings, R3DirectiveMetadata, R3QueryMetadata, Statement } from '@angular/compiler';
|
|
10
10
|
import * as ts from 'typescript';
|
|
11
|
-
import { DefaultImportRecorder } from '../../imports';
|
|
12
|
-
import { MetadataRegistry } from '../../metadata';
|
|
11
|
+
import { DefaultImportRecorder, Reference } from '../../imports';
|
|
12
|
+
import { InjectableClassRegistry, MetadataReader, MetadataRegistry } from '../../metadata';
|
|
13
|
+
import { extractDirectiveGuards } from '../../metadata/src/util';
|
|
13
14
|
import { PartialEvaluator } from '../../partial_evaluator';
|
|
14
15
|
import { ClassDeclaration, ClassMember, Decorator, ReflectionHost } from '../../reflection';
|
|
15
|
-
import {
|
|
16
|
+
import { LocalModuleScopeRegistry } from '../../scope';
|
|
17
|
+
import { AnalysisOutput, CompileResult, DecoratorHandler, DetectResult, HandlerFlags, HandlerPrecedence, ResolveResult } from '../../transform';
|
|
16
18
|
export interface DirectiveHandlerData {
|
|
19
|
+
baseClass: Reference<ClassDeclaration> | 'dynamic' | null;
|
|
20
|
+
guards: ReturnType<typeof extractDirectiveGuards>;
|
|
17
21
|
meta: R3DirectiveMetadata;
|
|
18
22
|
metadataStmt: Statement | null;
|
|
23
|
+
providersRequiringFactory: Set<Reference<ClassDeclaration>> | null;
|
|
19
24
|
}
|
|
20
|
-
export declare class DirectiveDecoratorHandler implements DecoratorHandler<
|
|
25
|
+
export declare class DirectiveDecoratorHandler implements DecoratorHandler<Decorator | null, DirectiveHandlerData, unknown> {
|
|
21
26
|
private reflector;
|
|
22
27
|
private evaluator;
|
|
23
28
|
private metaRegistry;
|
|
29
|
+
private scopeRegistry;
|
|
30
|
+
private metaReader;
|
|
24
31
|
private defaultImportRecorder;
|
|
32
|
+
private injectableRegistry;
|
|
25
33
|
private isCore;
|
|
26
34
|
private annotateForClosureCompiler;
|
|
27
|
-
constructor(reflector: ReflectionHost, evaluator: PartialEvaluator, metaRegistry: MetadataRegistry, defaultImportRecorder: DefaultImportRecorder, isCore: boolean, annotateForClosureCompiler: boolean);
|
|
35
|
+
constructor(reflector: ReflectionHost, evaluator: PartialEvaluator, metaRegistry: MetadataRegistry, scopeRegistry: LocalModuleScopeRegistry, metaReader: MetadataReader, defaultImportRecorder: DefaultImportRecorder, injectableRegistry: InjectableClassRegistry, isCore: boolean, annotateForClosureCompiler: boolean);
|
|
28
36
|
readonly precedence = HandlerPrecedence.PRIMARY;
|
|
37
|
+
readonly name: string;
|
|
29
38
|
detect(node: ClassDeclaration, decorators: Decorator[] | null): DetectResult<Decorator | null> | undefined;
|
|
30
|
-
analyze(node: ClassDeclaration, decorator: Decorator | null
|
|
31
|
-
|
|
39
|
+
analyze(node: ClassDeclaration, decorator: Readonly<Decorator | null>, flags?: HandlerFlags): AnalysisOutput<DirectiveHandlerData>;
|
|
40
|
+
register(node: ClassDeclaration, analysis: Readonly<DirectiveHandlerData>): void;
|
|
41
|
+
resolve(node: ClassDeclaration, analysis: DirectiveHandlerData): ResolveResult<unknown>;
|
|
42
|
+
compile(node: ClassDeclaration, analysis: Readonly<DirectiveHandlerData>, resolution: Readonly<unknown>, pool: ConstantPool): CompileResult[];
|
|
32
43
|
}
|
|
33
44
|
/**
|
|
34
45
|
* Helper function to extract metadata from a `Directive` or `Component`. `Directive`s without a
|
|
@@ -36,7 +47,7 @@ export declare class DirectiveDecoratorHandler implements DecoratorHandler<Direc
|
|
|
36
47
|
* appear in the declarations of an `NgModule` and additional verification is done when processing
|
|
37
48
|
* the module.
|
|
38
49
|
*/
|
|
39
|
-
export declare function extractDirectiveMetadata(clazz: ClassDeclaration, decorator: Decorator | null
|
|
50
|
+
export declare function extractDirectiveMetadata(clazz: ClassDeclaration, decorator: Readonly<Decorator | null>, reflector: ReflectionHost, evaluator: PartialEvaluator, defaultImportRecorder: DefaultImportRecorder, isCore: boolean, flags: HandlerFlags, annotateForClosureCompiler: boolean, defaultSelector?: string | null): {
|
|
40
51
|
decorator: Map<string, ts.Expression>;
|
|
41
52
|
metadata: R3DirectiveMetadata;
|
|
42
53
|
} | undefined;
|