@angular/cdk 14.0.0-rc.0 → 14.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/esm2020/a11y/a11y-module.mjs +5 -5
- package/esm2020/a11y/aria-describer/aria-describer.mjs +10 -9
- package/esm2020/a11y/focus-monitor/focus-monitor.mjs +7 -7
- package/esm2020/a11y/focus-trap/configurable-focus-trap-factory.mjs +4 -4
- package/esm2020/a11y/focus-trap/focus-trap-manager.mjs +4 -4
- package/esm2020/a11y/focus-trap/focus-trap.mjs +7 -7
- package/esm2020/a11y/high-contrast-mode/high-contrast-mode-detector.mjs +4 -4
- package/esm2020/a11y/input-modality/input-modality-detector.mjs +4 -4
- package/esm2020/a11y/interactivity-checker/interactivity-checker.mjs +4 -4
- package/esm2020/a11y/live-announcer/live-announcer.mjs +7 -7
- package/esm2020/accordion/accordion-item.mjs +4 -4
- package/esm2020/accordion/accordion-module.mjs +5 -5
- package/esm2020/accordion/accordion.mjs +4 -4
- package/esm2020/bidi/bidi-module.mjs +5 -5
- package/esm2020/bidi/dir.mjs +4 -4
- package/esm2020/bidi/directionality.mjs +4 -4
- package/esm2020/clipboard/clipboard-module.mjs +5 -5
- package/esm2020/clipboard/clipboard.mjs +4 -4
- package/esm2020/clipboard/copy-to-clipboard.mjs +4 -4
- package/esm2020/collections/unique-selection-dispatcher.mjs +4 -4
- package/esm2020/dialog/dialog-container.mjs +4 -4
- package/esm2020/dialog/dialog-module.mjs +5 -5
- package/esm2020/dialog/dialog.mjs +4 -4
- package/esm2020/drag-drop/directives/drag-handle.mjs +4 -4
- package/esm2020/drag-drop/directives/drag-placeholder.mjs +4 -4
- package/esm2020/drag-drop/directives/drag-preview.mjs +4 -4
- package/esm2020/drag-drop/directives/drag.mjs +4 -4
- package/esm2020/drag-drop/directives/drop-list-group.mjs +4 -4
- package/esm2020/drag-drop/directives/drop-list.mjs +4 -4
- package/esm2020/drag-drop/drag-drop-module.mjs +5 -5
- package/esm2020/drag-drop/drag-drop-registry.mjs +4 -4
- package/esm2020/drag-drop/drag-drop.mjs +4 -4
- package/esm2020/layout/breakpoints-observer.mjs +4 -4
- package/esm2020/layout/layout-module.mjs +5 -5
- package/esm2020/layout/media-matcher.mjs +4 -4
- package/esm2020/menu/context-menu-trigger.mjs +18 -35
- package/esm2020/menu/menu-aim.mjs +14 -15
- package/esm2020/menu/menu-bar.mjs +8 -34
- package/esm2020/menu/menu-base.mjs +23 -39
- package/esm2020/menu/menu-group.mjs +4 -4
- package/esm2020/menu/menu-item-checkbox.mjs +5 -4
- package/esm2020/menu/menu-item-radio.mjs +11 -54
- package/esm2020/menu/menu-item-selectable.mjs +4 -4
- package/esm2020/menu/menu-item.mjs +22 -52
- package/esm2020/menu/menu-module.mjs +5 -5
- package/esm2020/menu/menu-stack.mjs +4 -4
- package/esm2020/menu/menu-trigger-base.mjs +14 -21
- package/esm2020/menu/menu-trigger.mjs +31 -52
- package/esm2020/menu/menu.mjs +11 -45
- package/esm2020/observers/observe-content.mjs +14 -14
- package/esm2020/overlay/dispatchers/base-overlay-dispatcher.mjs +4 -4
- package/esm2020/overlay/dispatchers/overlay-keyboard-dispatcher.mjs +4 -4
- package/esm2020/overlay/dispatchers/overlay-outside-click-dispatcher.mjs +4 -4
- package/esm2020/overlay/fullscreen-overlay-container.mjs +4 -4
- package/esm2020/overlay/overlay-container.mjs +4 -4
- package/esm2020/overlay/overlay-directives.mjs +7 -7
- package/esm2020/overlay/overlay-module.mjs +5 -5
- package/esm2020/overlay/overlay.mjs +4 -4
- package/esm2020/overlay/position/overlay-position-builder.mjs +4 -4
- package/esm2020/overlay/scroll/scroll-strategy-options.mjs +4 -4
- package/esm2020/platform/platform-module.mjs +5 -5
- package/esm2020/platform/platform.mjs +4 -4
- package/esm2020/portal/portal-directives.mjs +17 -17
- package/esm2020/scrolling/fixed-size-virtual-scroll.mjs +4 -4
- package/esm2020/scrolling/scroll-dispatcher.mjs +4 -4
- package/esm2020/scrolling/scrollable.mjs +4 -4
- package/esm2020/scrolling/scrolling-module.mjs +9 -9
- package/esm2020/scrolling/viewport-ruler.mjs +4 -4
- package/esm2020/scrolling/virtual-for-of.mjs +4 -4
- package/esm2020/scrolling/virtual-scroll-viewport.mjs +4 -4
- package/esm2020/stepper/step-header.mjs +4 -4
- package/esm2020/stepper/step-label.mjs +4 -4
- package/esm2020/stepper/stepper-button.mjs +7 -7
- package/esm2020/stepper/stepper-module.mjs +5 -5
- package/esm2020/stepper/stepper.mjs +7 -7
- package/esm2020/table/cell.mjs +22 -22
- package/esm2020/table/coalesced-style-scheduler.mjs +4 -4
- package/esm2020/table/row.mjs +28 -28
- package/esm2020/table/table-module.mjs +5 -5
- package/esm2020/table/table.mjs +19 -19
- package/esm2020/table/text-column.mjs +4 -4
- package/esm2020/text-field/autofill.mjs +7 -7
- package/esm2020/text-field/autosize.mjs +4 -4
- package/esm2020/text-field/text-field-module.mjs +5 -5
- package/esm2020/tree/nested-node.mjs +4 -4
- package/esm2020/tree/node.mjs +4 -4
- package/esm2020/tree/outlet.mjs +4 -4
- package/esm2020/tree/padding.mjs +4 -4
- package/esm2020/tree/toggle.mjs +4 -4
- package/esm2020/tree/tree-module.mjs +5 -5
- package/esm2020/tree/tree.mjs +7 -7
- package/esm2020/version.mjs +1 -1
- package/fesm2015/a11y.mjs +46 -45
- package/fesm2015/a11y.mjs.map +1 -1
- package/fesm2015/accordion.mjs +10 -10
- package/fesm2015/accordion.mjs.map +1 -1
- package/fesm2015/bidi.mjs +10 -10
- package/fesm2015/bidi.mjs.map +1 -1
- package/fesm2015/cdk.mjs +1 -1
- package/fesm2015/cdk.mjs.map +1 -1
- package/fesm2015/clipboard.mjs +10 -10
- package/fesm2015/clipboard.mjs.map +1 -1
- package/fesm2015/collections.mjs +3 -3
- package/fesm2015/collections.mjs.map +1 -1
- package/fesm2015/dialog.mjs +10 -10
- package/fesm2015/dialog.mjs.map +1 -1
- package/fesm2015/drag-drop.mjs +28 -28
- package/fesm2015/drag-drop.mjs.map +1 -1
- package/fesm2015/layout.mjs +10 -10
- package/fesm2015/layout.mjs.map +1 -1
- package/fesm2015/menu.mjs +248 -423
- package/fesm2015/menu.mjs.map +1 -1
- package/fesm2015/observers.mjs +13 -13
- package/fesm2015/observers.mjs.map +1 -1
- package/fesm2015/overlay.mjs +34 -34
- package/fesm2015/overlay.mjs.map +1 -1
- package/fesm2015/platform.mjs +7 -7
- package/fesm2015/platform.mjs.map +1 -1
- package/fesm2015/portal.mjs +16 -16
- package/fesm2015/portal.mjs.map +1 -1
- package/fesm2015/scrolling.mjs +26 -26
- package/fesm2015/scrolling.mjs.map +1 -1
- package/fesm2015/stepper.mjs +22 -22
- package/fesm2015/stepper.mjs.map +1 -1
- package/fesm2015/table.mjs +76 -76
- package/fesm2015/table.mjs.map +1 -1
- package/fesm2015/text-field.mjs +13 -13
- package/fesm2015/text-field.mjs.map +1 -1
- package/fesm2015/tree.mjs +25 -25
- package/fesm2015/tree.mjs.map +1 -1
- package/fesm2020/a11y.mjs +46 -45
- package/fesm2020/a11y.mjs.map +1 -1
- package/fesm2020/accordion.mjs +10 -10
- package/fesm2020/accordion.mjs.map +1 -1
- package/fesm2020/bidi.mjs +10 -10
- package/fesm2020/bidi.mjs.map +1 -1
- package/fesm2020/cdk.mjs +1 -1
- package/fesm2020/cdk.mjs.map +1 -1
- package/fesm2020/clipboard.mjs +10 -10
- package/fesm2020/clipboard.mjs.map +1 -1
- package/fesm2020/collections.mjs +3 -3
- package/fesm2020/collections.mjs.map +1 -1
- package/fesm2020/dialog.mjs +10 -10
- package/fesm2020/dialog.mjs.map +1 -1
- package/fesm2020/drag-drop.mjs +28 -28
- package/fesm2020/drag-drop.mjs.map +1 -1
- package/fesm2020/layout.mjs +10 -10
- package/fesm2020/layout.mjs.map +1 -1
- package/fesm2020/menu.mjs +238 -404
- package/fesm2020/menu.mjs.map +1 -1
- package/fesm2020/observers.mjs +13 -13
- package/fesm2020/observers.mjs.map +1 -1
- package/fesm2020/overlay.mjs +34 -34
- package/fesm2020/overlay.mjs.map +1 -1
- package/fesm2020/platform.mjs +7 -7
- package/fesm2020/platform.mjs.map +1 -1
- package/fesm2020/portal.mjs +16 -16
- package/fesm2020/portal.mjs.map +1 -1
- package/fesm2020/scrolling.mjs +26 -26
- package/fesm2020/scrolling.mjs.map +1 -1
- package/fesm2020/stepper.mjs +22 -22
- package/fesm2020/stepper.mjs.map +1 -1
- package/fesm2020/table.mjs +76 -76
- package/fesm2020/table.mjs.map +1 -1
- package/fesm2020/text-field.mjs +13 -13
- package/fesm2020/text-field.mjs.map +1 -1
- package/fesm2020/tree.mjs +25 -25
- package/fesm2020/tree.mjs.map +1 -1
- package/menu/index.d.ts +51 -150
- package/overlay/index.d.ts +2 -2
- package/package.json +3 -3
- package/schematics/index.d.ts +2 -1
- package/schematics/index.js +4 -4
- package/schematics/index.mjs +4 -4
- package/schematics/ng-add/index.js +1 -1
- package/schematics/ng-add/index.mjs +1 -1
- package/schematics/ng-generate/drag-drop/schema.json +3 -0
- package/schematics/ng-update/devkit-file-system.js +8 -5
- package/schematics/ng-update/devkit-file-system.mjs +8 -5
- package/schematics/utils/ast/standalone.d.ts +26 -0
- package/schematics/utils/ast/standalone.js +191 -0
- package/schematics/utils/ast/standalone.mjs +191 -0
- package/schematics/utils/ast.js +5 -4
- package/schematics/utils/ast.mjs +5 -4
- package/schematics/utils/build-component.js +4 -4
- package/schematics/utils/build-component.mjs +4 -4
- package/schematics/utils/index.d.ts +1 -0
- package/schematics/utils/index.js +5 -1
- package/schematics/utils/index.mjs +5 -1
- package/schematics/utils/vendored-ast-utils/index.d.ts +0 -70
- package/schematics/utils/vendored-ast-utils/index.js +0 -480
- package/schematics/utils/vendored-ast-utils/index.mjs +0 -480
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright Google LLC All Rights Reserved.
|
|
4
|
+
*
|
|
5
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
+
* found in the LICENSE file at https://angular.io/license
|
|
7
|
+
*/
|
|
8
|
+
import { Tree } from '@angular-devkit/schematics';
|
|
9
|
+
import * as ts from 'typescript';
|
|
10
|
+
/**
|
|
11
|
+
* Checks whether the providers from a module are being imported in a `bootstrapApplication` call.
|
|
12
|
+
* @param tree File tree of the project.
|
|
13
|
+
* @param filePath Path of the file in which to check.
|
|
14
|
+
* @param className Class name of the module to search for.
|
|
15
|
+
*/
|
|
16
|
+
export declare function importsProvidersFrom(tree: Tree, filePath: string, className: string): boolean;
|
|
17
|
+
/**
|
|
18
|
+
* Adds an `importProvidersFrom` call to the `bootstrapApplication` call.
|
|
19
|
+
* @param tree File tree of the project.
|
|
20
|
+
* @param filePath Path to the file that should be updated.
|
|
21
|
+
* @param moduleName Name of the module that should be imported.
|
|
22
|
+
* @param modulePath Path from which to import the module.
|
|
23
|
+
*/
|
|
24
|
+
export declare function addModuleImportToStandaloneBootstrap(tree: Tree, filePath: string, moduleName: string, modulePath: string): void;
|
|
25
|
+
/** Finds the call to `bootstrapApplication` within a file. */
|
|
26
|
+
export declare function findBootstrapApplicationCall(sourceFile: ts.SourceFile): ts.CallExpression | null;
|
|
@@ -0,0 +1,191 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* @license
|
|
4
|
+
* Copyright Google LLC All Rights Reserved.
|
|
5
|
+
*
|
|
6
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
7
|
+
* found in the LICENSE file at https://angular.io/license
|
|
8
|
+
*/
|
|
9
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
+
exports.findBootstrapApplicationCall = exports.addModuleImportToStandaloneBootstrap = exports.importsProvidersFrom = void 0;
|
|
11
|
+
const schematics_1 = require("@angular-devkit/schematics");
|
|
12
|
+
const change_1 = require("@schematics/angular/utility/change");
|
|
13
|
+
const ts = require("typescript");
|
|
14
|
+
const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
|
|
15
|
+
/**
|
|
16
|
+
* Checks whether the providers from a module are being imported in a `bootstrapApplication` call.
|
|
17
|
+
* @param tree File tree of the project.
|
|
18
|
+
* @param filePath Path of the file in which to check.
|
|
19
|
+
* @param className Class name of the module to search for.
|
|
20
|
+
*/
|
|
21
|
+
function importsProvidersFrom(tree, filePath, className) {
|
|
22
|
+
const sourceFile = ts.createSourceFile(filePath, tree.readText(filePath), ts.ScriptTarget.Latest, true);
|
|
23
|
+
const bootstrapCall = findBootstrapApplicationCall(sourceFile);
|
|
24
|
+
const importProvidersFromCall = bootstrapCall ? findImportProvidersFromCall(bootstrapCall) : null;
|
|
25
|
+
return (!!importProvidersFromCall &&
|
|
26
|
+
importProvidersFromCall.arguments.some(arg => ts.isIdentifier(arg) && arg.text === className));
|
|
27
|
+
}
|
|
28
|
+
exports.importsProvidersFrom = importsProvidersFrom;
|
|
29
|
+
/**
|
|
30
|
+
* Adds an `importProvidersFrom` call to the `bootstrapApplication` call.
|
|
31
|
+
* @param tree File tree of the project.
|
|
32
|
+
* @param filePath Path to the file that should be updated.
|
|
33
|
+
* @param moduleName Name of the module that should be imported.
|
|
34
|
+
* @param modulePath Path from which to import the module.
|
|
35
|
+
*/
|
|
36
|
+
function addModuleImportToStandaloneBootstrap(tree, filePath, moduleName, modulePath) {
|
|
37
|
+
const sourceFile = ts.createSourceFile(filePath, tree.readText(filePath), ts.ScriptTarget.Latest, true);
|
|
38
|
+
const bootstrapCall = findBootstrapApplicationCall(sourceFile);
|
|
39
|
+
if (!bootstrapCall) {
|
|
40
|
+
throw new schematics_1.SchematicsException(`Could not find bootstrapApplication call in ${filePath}`);
|
|
41
|
+
}
|
|
42
|
+
const recorder = tree.beginUpdate(filePath);
|
|
43
|
+
const importCall = findImportProvidersFromCall(bootstrapCall);
|
|
44
|
+
const printer = ts.createPrinter();
|
|
45
|
+
const sourceText = sourceFile.getText();
|
|
46
|
+
// Add imports to the module being added and `importProvidersFrom`. We don't
|
|
47
|
+
// have to worry about duplicates, because `insertImport` handles them.
|
|
48
|
+
[
|
|
49
|
+
(0, ast_utils_1.insertImport)(sourceFile, sourceText, moduleName, modulePath),
|
|
50
|
+
(0, ast_utils_1.insertImport)(sourceFile, sourceText, 'importProvidersFrom', '@angular/core'),
|
|
51
|
+
].forEach(change => {
|
|
52
|
+
if (change instanceof change_1.InsertChange) {
|
|
53
|
+
recorder.insertLeft(change.pos, change.toAdd);
|
|
54
|
+
}
|
|
55
|
+
});
|
|
56
|
+
// If there is an `importProvidersFrom` call already, reuse it.
|
|
57
|
+
if (importCall) {
|
|
58
|
+
recorder.insertRight(importCall.arguments[importCall.arguments.length - 1].getEnd(), `, ${moduleName}`);
|
|
59
|
+
}
|
|
60
|
+
else if (bootstrapCall.arguments.length === 1) {
|
|
61
|
+
// Otherwise if there is no options parameter to `bootstrapApplication`,
|
|
62
|
+
// create an object literal with a `providers` array and the import.
|
|
63
|
+
const newCall = ts.factory.updateCallExpression(bootstrapCall, bootstrapCall.expression, bootstrapCall.typeArguments, [
|
|
64
|
+
...bootstrapCall.arguments,
|
|
65
|
+
ts.factory.createObjectLiteralExpression([createProvidersAssignment(moduleName)], true),
|
|
66
|
+
]);
|
|
67
|
+
recorder.remove(bootstrapCall.getStart(), bootstrapCall.getWidth());
|
|
68
|
+
recorder.insertRight(bootstrapCall.getStart(), printer.printNode(ts.EmitHint.Unspecified, newCall, sourceFile));
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
const providersLiteral = findProvidersLiteral(bootstrapCall);
|
|
72
|
+
if (providersLiteral) {
|
|
73
|
+
// If there's a `providers` array, add the import to it.
|
|
74
|
+
const newProvidersLiteral = ts.factory.updateArrayLiteralExpression(providersLiteral, [
|
|
75
|
+
...providersLiteral.elements,
|
|
76
|
+
createImportProvidersFromCall(moduleName),
|
|
77
|
+
]);
|
|
78
|
+
recorder.remove(providersLiteral.getStart(), providersLiteral.getWidth());
|
|
79
|
+
recorder.insertRight(providersLiteral.getStart(), printer.printNode(ts.EmitHint.Unspecified, newProvidersLiteral, sourceFile));
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
// Otherwise add a `providers` array to the existing object literal.
|
|
83
|
+
const optionsLiteral = bootstrapCall.arguments[1];
|
|
84
|
+
const newOptionsLiteral = ts.factory.updateObjectLiteralExpression(optionsLiteral, [
|
|
85
|
+
...optionsLiteral.properties,
|
|
86
|
+
createProvidersAssignment(moduleName),
|
|
87
|
+
]);
|
|
88
|
+
recorder.remove(optionsLiteral.getStart(), optionsLiteral.getWidth());
|
|
89
|
+
recorder.insertRight(optionsLiteral.getStart(), printer.printNode(ts.EmitHint.Unspecified, newOptionsLiteral, sourceFile));
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
tree.commitUpdate(recorder);
|
|
93
|
+
}
|
|
94
|
+
exports.addModuleImportToStandaloneBootstrap = addModuleImportToStandaloneBootstrap;
|
|
95
|
+
/** Finds the call to `bootstrapApplication` within a file. */
|
|
96
|
+
function findBootstrapApplicationCall(sourceFile) {
|
|
97
|
+
const localName = findImportLocalName(sourceFile, 'bootstrapApplication', '@angular/platform-browser');
|
|
98
|
+
return localName ? findCall(sourceFile, localName) : null;
|
|
99
|
+
}
|
|
100
|
+
exports.findBootstrapApplicationCall = findBootstrapApplicationCall;
|
|
101
|
+
/** Find a call to `importProvidersFrom` within a `bootstrapApplication` call. */
|
|
102
|
+
function findImportProvidersFromCall(bootstrapCall) {
|
|
103
|
+
const providersLiteral = findProvidersLiteral(bootstrapCall);
|
|
104
|
+
const importProvidersName = findImportLocalName(bootstrapCall.getSourceFile(), 'importProvidersFrom', '@angular/core');
|
|
105
|
+
if (providersLiteral && importProvidersName) {
|
|
106
|
+
for (const element of providersLiteral.elements) {
|
|
107
|
+
// Look for an array element that calls the `importProvidersFrom` function.
|
|
108
|
+
if (ts.isCallExpression(element) &&
|
|
109
|
+
ts.isIdentifier(element.expression) &&
|
|
110
|
+
element.expression.text === importProvidersName) {
|
|
111
|
+
return element;
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
return null;
|
|
116
|
+
}
|
|
117
|
+
/** Finds the `providers` array literal within a `bootstrapApplication` call. */
|
|
118
|
+
function findProvidersLiteral(bootstrapCall) {
|
|
119
|
+
// The imports have to be in the second argument of
|
|
120
|
+
// the function which has to be an object literal.
|
|
121
|
+
if (bootstrapCall.arguments.length > 1 &&
|
|
122
|
+
ts.isObjectLiteralExpression(bootstrapCall.arguments[1])) {
|
|
123
|
+
for (const prop of bootstrapCall.arguments[1].properties) {
|
|
124
|
+
if (ts.isPropertyAssignment(prop) &&
|
|
125
|
+
ts.isIdentifier(prop.name) &&
|
|
126
|
+
prop.name.text === 'providers' &&
|
|
127
|
+
ts.isArrayLiteralExpression(prop.initializer)) {
|
|
128
|
+
return prop.initializer;
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
return null;
|
|
133
|
+
}
|
|
134
|
+
/**
|
|
135
|
+
* Finds the local name of an imported symbol. Could be the symbol name itself or its alias.
|
|
136
|
+
* @param sourceFile File within which to search for the import.
|
|
137
|
+
* @param name Actual name of the import, not its local alias.
|
|
138
|
+
* @param moduleName Name of the module from which the symbol is imported.
|
|
139
|
+
*/
|
|
140
|
+
function findImportLocalName(sourceFile, name, moduleName) {
|
|
141
|
+
for (const node of sourceFile.statements) {
|
|
142
|
+
// Only look for top-level imports.
|
|
143
|
+
if (!ts.isImportDeclaration(node) ||
|
|
144
|
+
!ts.isStringLiteral(node.moduleSpecifier) ||
|
|
145
|
+
node.moduleSpecifier.text !== moduleName) {
|
|
146
|
+
continue;
|
|
147
|
+
}
|
|
148
|
+
// Filter out imports that don't have the right shape.
|
|
149
|
+
if (!node.importClause ||
|
|
150
|
+
!node.importClause.namedBindings ||
|
|
151
|
+
!ts.isNamedImports(node.importClause.namedBindings)) {
|
|
152
|
+
continue;
|
|
153
|
+
}
|
|
154
|
+
// Look through the elements of the declaration for the specific import.
|
|
155
|
+
for (const element of node.importClause.namedBindings.elements) {
|
|
156
|
+
if ((element.propertyName || element.name).text === name) {
|
|
157
|
+
// The local name is always in `name`.
|
|
158
|
+
return element.name.text;
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
return null;
|
|
163
|
+
}
|
|
164
|
+
/**
|
|
165
|
+
* Finds a call to a function with a specific name.
|
|
166
|
+
* @param rootNode Node from which to start searching.
|
|
167
|
+
* @param name Name of the function to search for.
|
|
168
|
+
*/
|
|
169
|
+
function findCall(rootNode, name) {
|
|
170
|
+
let result = null;
|
|
171
|
+
rootNode.forEachChild(function walk(node) {
|
|
172
|
+
if (ts.isCallExpression(node) &&
|
|
173
|
+
ts.isIdentifier(node.expression) &&
|
|
174
|
+
node.expression.text === name) {
|
|
175
|
+
result = node;
|
|
176
|
+
}
|
|
177
|
+
if (!result) {
|
|
178
|
+
node.forEachChild(walk);
|
|
179
|
+
}
|
|
180
|
+
});
|
|
181
|
+
return result;
|
|
182
|
+
}
|
|
183
|
+
/** Creates an `importProvidersFrom({{moduleName}})` call. */
|
|
184
|
+
function createImportProvidersFromCall(moduleName) {
|
|
185
|
+
return ts.factory.createCallChain(ts.factory.createIdentifier('importProvidersFrom'), undefined, undefined, [ts.factory.createIdentifier(moduleName)]);
|
|
186
|
+
}
|
|
187
|
+
/** Creates a `providers: [importProvidersFrom({{moduleName}})]` property assignment. */
|
|
188
|
+
function createProvidersAssignment(moduleName) {
|
|
189
|
+
return ts.factory.createPropertyAssignment('providers', ts.factory.createArrayLiteralExpression([createImportProvidersFromCall(moduleName)]));
|
|
190
|
+
}
|
|
191
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"standalone.js","sourceRoot":"","sources":["../../../../../../../../src/cdk/schematics/utils/ast/standalone.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC 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 {SchematicsException, Tree} from '@angular-devkit/schematics';\nimport {InsertChange} from '@schematics/angular/utility/change';\nimport * as ts from 'typescript';\nimport {insertImport} from '@schematics/angular/utility/ast-utils';\n\n/**\n * Checks whether the providers from a module are being imported in a `bootstrapApplication` call.\n * @param tree File tree of the project.\n * @param filePath Path of the file in which to check.\n * @param className Class name of the module to search for.\n */\nexport function importsProvidersFrom(tree: Tree, filePath: string, className: string): boolean {\n  const sourceFile = ts.createSourceFile(\n    filePath,\n    tree.readText(filePath),\n    ts.ScriptTarget.Latest,\n    true,\n  );\n\n  const bootstrapCall = findBootstrapApplicationCall(sourceFile);\n  const importProvidersFromCall = bootstrapCall ? findImportProvidersFromCall(bootstrapCall) : null;\n\n  return (\n    !!importProvidersFromCall &&\n    importProvidersFromCall.arguments.some(arg => ts.isIdentifier(arg) && arg.text === className)\n  );\n}\n\n/**\n * Adds an `importProvidersFrom` call to the `bootstrapApplication` call.\n * @param tree File tree of the project.\n * @param filePath Path to the file that should be updated.\n * @param moduleName Name of the module that should be imported.\n * @param modulePath Path from which to import the module.\n */\nexport function addModuleImportToStandaloneBootstrap(\n  tree: Tree,\n  filePath: string,\n  moduleName: string,\n  modulePath: string,\n) {\n  const sourceFile = ts.createSourceFile(\n    filePath,\n    tree.readText(filePath),\n    ts.ScriptTarget.Latest,\n    true,\n  );\n\n  const bootstrapCall = findBootstrapApplicationCall(sourceFile);\n\n  if (!bootstrapCall) {\n    throw new SchematicsException(`Could not find bootstrapApplication call in ${filePath}`);\n  }\n\n  const recorder = tree.beginUpdate(filePath);\n  const importCall = findImportProvidersFromCall(bootstrapCall);\n  const printer = ts.createPrinter();\n  const sourceText = sourceFile.getText();\n\n  // Add imports to the module being added and `importProvidersFrom`. We don't\n  // have to worry about duplicates, because `insertImport` handles them.\n  [\n    insertImport(sourceFile, sourceText, moduleName, modulePath),\n    insertImport(sourceFile, sourceText, 'importProvidersFrom', '@angular/core'),\n  ].forEach(change => {\n    if (change instanceof InsertChange) {\n      recorder.insertLeft(change.pos, change.toAdd);\n    }\n  });\n\n  // If there is an `importProvidersFrom` call already, reuse it.\n  if (importCall) {\n    recorder.insertRight(\n      importCall.arguments[importCall.arguments.length - 1].getEnd(),\n      `, ${moduleName}`,\n    );\n  } else if (bootstrapCall.arguments.length === 1) {\n    // Otherwise if there is no options parameter to `bootstrapApplication`,\n    // create an object literal with a `providers` array and the import.\n    const newCall = ts.factory.updateCallExpression(\n      bootstrapCall,\n      bootstrapCall.expression,\n      bootstrapCall.typeArguments,\n      [\n        ...bootstrapCall.arguments,\n        ts.factory.createObjectLiteralExpression([createProvidersAssignment(moduleName)], true),\n      ],\n    );\n\n    recorder.remove(bootstrapCall.getStart(), bootstrapCall.getWidth());\n    recorder.insertRight(\n      bootstrapCall.getStart(),\n      printer.printNode(ts.EmitHint.Unspecified, newCall, sourceFile),\n    );\n  } else {\n    const providersLiteral = findProvidersLiteral(bootstrapCall);\n\n    if (providersLiteral) {\n      // If there's a `providers` array, add the import to it.\n      const newProvidersLiteral = ts.factory.updateArrayLiteralExpression(providersLiteral, [\n        ...providersLiteral.elements,\n        createImportProvidersFromCall(moduleName),\n      ]);\n      recorder.remove(providersLiteral.getStart(), providersLiteral.getWidth());\n      recorder.insertRight(\n        providersLiteral.getStart(),\n        printer.printNode(ts.EmitHint.Unspecified, newProvidersLiteral, sourceFile),\n      );\n    } else {\n      // Otherwise add a `providers` array to the existing object literal.\n      const optionsLiteral = bootstrapCall.arguments[1] as ts.ObjectLiteralExpression;\n      const newOptionsLiteral = ts.factory.updateObjectLiteralExpression(optionsLiteral, [\n        ...optionsLiteral.properties,\n        createProvidersAssignment(moduleName),\n      ]);\n      recorder.remove(optionsLiteral.getStart(), optionsLiteral.getWidth());\n      recorder.insertRight(\n        optionsLiteral.getStart(),\n        printer.printNode(ts.EmitHint.Unspecified, newOptionsLiteral, sourceFile),\n      );\n    }\n  }\n\n  tree.commitUpdate(recorder);\n}\n\n/** Finds the call to `bootstrapApplication` within a file. */\nexport function findBootstrapApplicationCall(sourceFile: ts.SourceFile): ts.CallExpression | null {\n  const localName = findImportLocalName(\n    sourceFile,\n    'bootstrapApplication',\n    '@angular/platform-browser',\n  );\n\n  return localName ? findCall(sourceFile, localName) : null;\n}\n\n/** Find a call to `importProvidersFrom` within a `bootstrapApplication` call. */\nfunction findImportProvidersFromCall(bootstrapCall: ts.CallExpression): ts.CallExpression | null {\n  const providersLiteral = findProvidersLiteral(bootstrapCall);\n  const importProvidersName = findImportLocalName(\n    bootstrapCall.getSourceFile(),\n    'importProvidersFrom',\n    '@angular/core',\n  );\n\n  if (providersLiteral && importProvidersName) {\n    for (const element of providersLiteral.elements) {\n      // Look for an array element that calls the `importProvidersFrom` function.\n      if (\n        ts.isCallExpression(element) &&\n        ts.isIdentifier(element.expression) &&\n        element.expression.text === importProvidersName\n      ) {\n        return element;\n      }\n    }\n  }\n\n  return null;\n}\n\n/** Finds the `providers` array literal within a `bootstrapApplication` call. */\nfunction findProvidersLiteral(bootstrapCall: ts.CallExpression): ts.ArrayLiteralExpression | null {\n  // The imports have to be in the second argument of\n  // the function which has to be an object literal.\n  if (\n    bootstrapCall.arguments.length > 1 &&\n    ts.isObjectLiteralExpression(bootstrapCall.arguments[1])\n  ) {\n    for (const prop of bootstrapCall.arguments[1].properties) {\n      if (\n        ts.isPropertyAssignment(prop) &&\n        ts.isIdentifier(prop.name) &&\n        prop.name.text === 'providers' &&\n        ts.isArrayLiteralExpression(prop.initializer)\n      ) {\n        return prop.initializer;\n      }\n    }\n  }\n\n  return null;\n}\n\n/**\n * Finds the local name of an imported symbol. Could be the symbol name itself or its alias.\n * @param sourceFile File within which to search for the import.\n * @param name Actual name of the import, not its local alias.\n * @param moduleName Name of the module from which the symbol is imported.\n */\nfunction findImportLocalName(\n  sourceFile: ts.SourceFile,\n  name: string,\n  moduleName: string,\n): string | null {\n  for (const node of sourceFile.statements) {\n    // Only look for top-level imports.\n    if (\n      !ts.isImportDeclaration(node) ||\n      !ts.isStringLiteral(node.moduleSpecifier) ||\n      node.moduleSpecifier.text !== moduleName\n    ) {\n      continue;\n    }\n\n    // Filter out imports that don't have the right shape.\n    if (\n      !node.importClause ||\n      !node.importClause.namedBindings ||\n      !ts.isNamedImports(node.importClause.namedBindings)\n    ) {\n      continue;\n    }\n\n    // Look through the elements of the declaration for the specific import.\n    for (const element of node.importClause.namedBindings.elements) {\n      if ((element.propertyName || element.name).text === name) {\n        // The local name is always in `name`.\n        return element.name.text;\n      }\n    }\n  }\n\n  return null;\n}\n\n/**\n * Finds a call to a function with a specific name.\n * @param rootNode Node from which to start searching.\n * @param name Name of the function to search for.\n */\nfunction findCall(rootNode: ts.Node, name: string): ts.CallExpression | null {\n  let result: ts.CallExpression | null = null;\n\n  rootNode.forEachChild(function walk(node) {\n    if (\n      ts.isCallExpression(node) &&\n      ts.isIdentifier(node.expression) &&\n      node.expression.text === name\n    ) {\n      result = node;\n    }\n\n    if (!result) {\n      node.forEachChild(walk);\n    }\n  });\n\n  return result;\n}\n\n/** Creates an `importProvidersFrom({{moduleName}})` call. */\nfunction createImportProvidersFromCall(moduleName: string): ts.CallExpression {\n  return ts.factory.createCallChain(\n    ts.factory.createIdentifier('importProvidersFrom'),\n    undefined,\n    undefined,\n    [ts.factory.createIdentifier(moduleName)],\n  );\n}\n\n/** Creates a `providers: [importProvidersFrom({{moduleName}})]` property assignment. */\nfunction createProvidersAssignment(moduleName: string): ts.PropertyAssignment {\n  return ts.factory.createPropertyAssignment(\n    'providers',\n    ts.factory.createArrayLiteralExpression([createImportProvidersFromCall(moduleName)]),\n  );\n}\n"]}
|
|
@@ -0,0 +1,191 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* @license
|
|
4
|
+
* Copyright Google LLC All Rights Reserved.
|
|
5
|
+
*
|
|
6
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
7
|
+
* found in the LICENSE file at https://angular.io/license
|
|
8
|
+
*/
|
|
9
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
+
exports.findBootstrapApplicationCall = exports.addModuleImportToStandaloneBootstrap = exports.importsProvidersFrom = void 0;
|
|
11
|
+
const schematics_1 = require("@angular-devkit/schematics");
|
|
12
|
+
const change_1 = require("@schematics/angular/utility/change");
|
|
13
|
+
const ts = require("typescript");
|
|
14
|
+
const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
|
|
15
|
+
/**
|
|
16
|
+
* Checks whether the providers from a module are being imported in a `bootstrapApplication` call.
|
|
17
|
+
* @param tree File tree of the project.
|
|
18
|
+
* @param filePath Path of the file in which to check.
|
|
19
|
+
* @param className Class name of the module to search for.
|
|
20
|
+
*/
|
|
21
|
+
function importsProvidersFrom(tree, filePath, className) {
|
|
22
|
+
const sourceFile = ts.createSourceFile(filePath, tree.readText(filePath), ts.ScriptTarget.Latest, true);
|
|
23
|
+
const bootstrapCall = findBootstrapApplicationCall(sourceFile);
|
|
24
|
+
const importProvidersFromCall = bootstrapCall ? findImportProvidersFromCall(bootstrapCall) : null;
|
|
25
|
+
return (!!importProvidersFromCall &&
|
|
26
|
+
importProvidersFromCall.arguments.some(arg => ts.isIdentifier(arg) && arg.text === className));
|
|
27
|
+
}
|
|
28
|
+
exports.importsProvidersFrom = importsProvidersFrom;
|
|
29
|
+
/**
|
|
30
|
+
* Adds an `importProvidersFrom` call to the `bootstrapApplication` call.
|
|
31
|
+
* @param tree File tree of the project.
|
|
32
|
+
* @param filePath Path to the file that should be updated.
|
|
33
|
+
* @param moduleName Name of the module that should be imported.
|
|
34
|
+
* @param modulePath Path from which to import the module.
|
|
35
|
+
*/
|
|
36
|
+
function addModuleImportToStandaloneBootstrap(tree, filePath, moduleName, modulePath) {
|
|
37
|
+
const sourceFile = ts.createSourceFile(filePath, tree.readText(filePath), ts.ScriptTarget.Latest, true);
|
|
38
|
+
const bootstrapCall = findBootstrapApplicationCall(sourceFile);
|
|
39
|
+
if (!bootstrapCall) {
|
|
40
|
+
throw new schematics_1.SchematicsException(`Could not find bootstrapApplication call in ${filePath}`);
|
|
41
|
+
}
|
|
42
|
+
const recorder = tree.beginUpdate(filePath);
|
|
43
|
+
const importCall = findImportProvidersFromCall(bootstrapCall);
|
|
44
|
+
const printer = ts.createPrinter();
|
|
45
|
+
const sourceText = sourceFile.getText();
|
|
46
|
+
// Add imports to the module being added and `importProvidersFrom`. We don't
|
|
47
|
+
// have to worry about duplicates, because `insertImport` handles them.
|
|
48
|
+
[
|
|
49
|
+
(0, ast_utils_1.insertImport)(sourceFile, sourceText, moduleName, modulePath),
|
|
50
|
+
(0, ast_utils_1.insertImport)(sourceFile, sourceText, 'importProvidersFrom', '@angular/core'),
|
|
51
|
+
].forEach(change => {
|
|
52
|
+
if (change instanceof change_1.InsertChange) {
|
|
53
|
+
recorder.insertLeft(change.pos, change.toAdd);
|
|
54
|
+
}
|
|
55
|
+
});
|
|
56
|
+
// If there is an `importProvidersFrom` call already, reuse it.
|
|
57
|
+
if (importCall) {
|
|
58
|
+
recorder.insertRight(importCall.arguments[importCall.arguments.length - 1].getEnd(), `, ${moduleName}`);
|
|
59
|
+
}
|
|
60
|
+
else if (bootstrapCall.arguments.length === 1) {
|
|
61
|
+
// Otherwise if there is no options parameter to `bootstrapApplication`,
|
|
62
|
+
// create an object literal with a `providers` array and the import.
|
|
63
|
+
const newCall = ts.factory.updateCallExpression(bootstrapCall, bootstrapCall.expression, bootstrapCall.typeArguments, [
|
|
64
|
+
...bootstrapCall.arguments,
|
|
65
|
+
ts.factory.createObjectLiteralExpression([createProvidersAssignment(moduleName)], true),
|
|
66
|
+
]);
|
|
67
|
+
recorder.remove(bootstrapCall.getStart(), bootstrapCall.getWidth());
|
|
68
|
+
recorder.insertRight(bootstrapCall.getStart(), printer.printNode(ts.EmitHint.Unspecified, newCall, sourceFile));
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
const providersLiteral = findProvidersLiteral(bootstrapCall);
|
|
72
|
+
if (providersLiteral) {
|
|
73
|
+
// If there's a `providers` array, add the import to it.
|
|
74
|
+
const newProvidersLiteral = ts.factory.updateArrayLiteralExpression(providersLiteral, [
|
|
75
|
+
...providersLiteral.elements,
|
|
76
|
+
createImportProvidersFromCall(moduleName),
|
|
77
|
+
]);
|
|
78
|
+
recorder.remove(providersLiteral.getStart(), providersLiteral.getWidth());
|
|
79
|
+
recorder.insertRight(providersLiteral.getStart(), printer.printNode(ts.EmitHint.Unspecified, newProvidersLiteral, sourceFile));
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
// Otherwise add a `providers` array to the existing object literal.
|
|
83
|
+
const optionsLiteral = bootstrapCall.arguments[1];
|
|
84
|
+
const newOptionsLiteral = ts.factory.updateObjectLiteralExpression(optionsLiteral, [
|
|
85
|
+
...optionsLiteral.properties,
|
|
86
|
+
createProvidersAssignment(moduleName),
|
|
87
|
+
]);
|
|
88
|
+
recorder.remove(optionsLiteral.getStart(), optionsLiteral.getWidth());
|
|
89
|
+
recorder.insertRight(optionsLiteral.getStart(), printer.printNode(ts.EmitHint.Unspecified, newOptionsLiteral, sourceFile));
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
tree.commitUpdate(recorder);
|
|
93
|
+
}
|
|
94
|
+
exports.addModuleImportToStandaloneBootstrap = addModuleImportToStandaloneBootstrap;
|
|
95
|
+
/** Finds the call to `bootstrapApplication` within a file. */
|
|
96
|
+
function findBootstrapApplicationCall(sourceFile) {
|
|
97
|
+
const localName = findImportLocalName(sourceFile, 'bootstrapApplication', '@angular/platform-browser');
|
|
98
|
+
return localName ? findCall(sourceFile, localName) : null;
|
|
99
|
+
}
|
|
100
|
+
exports.findBootstrapApplicationCall = findBootstrapApplicationCall;
|
|
101
|
+
/** Find a call to `importProvidersFrom` within a `bootstrapApplication` call. */
|
|
102
|
+
function findImportProvidersFromCall(bootstrapCall) {
|
|
103
|
+
const providersLiteral = findProvidersLiteral(bootstrapCall);
|
|
104
|
+
const importProvidersName = findImportLocalName(bootstrapCall.getSourceFile(), 'importProvidersFrom', '@angular/core');
|
|
105
|
+
if (providersLiteral && importProvidersName) {
|
|
106
|
+
for (const element of providersLiteral.elements) {
|
|
107
|
+
// Look for an array element that calls the `importProvidersFrom` function.
|
|
108
|
+
if (ts.isCallExpression(element) &&
|
|
109
|
+
ts.isIdentifier(element.expression) &&
|
|
110
|
+
element.expression.text === importProvidersName) {
|
|
111
|
+
return element;
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
return null;
|
|
116
|
+
}
|
|
117
|
+
/** Finds the `providers` array literal within a `bootstrapApplication` call. */
|
|
118
|
+
function findProvidersLiteral(bootstrapCall) {
|
|
119
|
+
// The imports have to be in the second argument of
|
|
120
|
+
// the function which has to be an object literal.
|
|
121
|
+
if (bootstrapCall.arguments.length > 1 &&
|
|
122
|
+
ts.isObjectLiteralExpression(bootstrapCall.arguments[1])) {
|
|
123
|
+
for (const prop of bootstrapCall.arguments[1].properties) {
|
|
124
|
+
if (ts.isPropertyAssignment(prop) &&
|
|
125
|
+
ts.isIdentifier(prop.name) &&
|
|
126
|
+
prop.name.text === 'providers' &&
|
|
127
|
+
ts.isArrayLiteralExpression(prop.initializer)) {
|
|
128
|
+
return prop.initializer;
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
return null;
|
|
133
|
+
}
|
|
134
|
+
/**
|
|
135
|
+
* Finds the local name of an imported symbol. Could be the symbol name itself or its alias.
|
|
136
|
+
* @param sourceFile File within which to search for the import.
|
|
137
|
+
* @param name Actual name of the import, not its local alias.
|
|
138
|
+
* @param moduleName Name of the module from which the symbol is imported.
|
|
139
|
+
*/
|
|
140
|
+
function findImportLocalName(sourceFile, name, moduleName) {
|
|
141
|
+
for (const node of sourceFile.statements) {
|
|
142
|
+
// Only look for top-level imports.
|
|
143
|
+
if (!ts.isImportDeclaration(node) ||
|
|
144
|
+
!ts.isStringLiteral(node.moduleSpecifier) ||
|
|
145
|
+
node.moduleSpecifier.text !== moduleName) {
|
|
146
|
+
continue;
|
|
147
|
+
}
|
|
148
|
+
// Filter out imports that don't have the right shape.
|
|
149
|
+
if (!node.importClause ||
|
|
150
|
+
!node.importClause.namedBindings ||
|
|
151
|
+
!ts.isNamedImports(node.importClause.namedBindings)) {
|
|
152
|
+
continue;
|
|
153
|
+
}
|
|
154
|
+
// Look through the elements of the declaration for the specific import.
|
|
155
|
+
for (const element of node.importClause.namedBindings.elements) {
|
|
156
|
+
if ((element.propertyName || element.name).text === name) {
|
|
157
|
+
// The local name is always in `name`.
|
|
158
|
+
return element.name.text;
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
return null;
|
|
163
|
+
}
|
|
164
|
+
/**
|
|
165
|
+
* Finds a call to a function with a specific name.
|
|
166
|
+
* @param rootNode Node from which to start searching.
|
|
167
|
+
* @param name Name of the function to search for.
|
|
168
|
+
*/
|
|
169
|
+
function findCall(rootNode, name) {
|
|
170
|
+
let result = null;
|
|
171
|
+
rootNode.forEachChild(function walk(node) {
|
|
172
|
+
if (ts.isCallExpression(node) &&
|
|
173
|
+
ts.isIdentifier(node.expression) &&
|
|
174
|
+
node.expression.text === name) {
|
|
175
|
+
result = node;
|
|
176
|
+
}
|
|
177
|
+
if (!result) {
|
|
178
|
+
node.forEachChild(walk);
|
|
179
|
+
}
|
|
180
|
+
});
|
|
181
|
+
return result;
|
|
182
|
+
}
|
|
183
|
+
/** Creates an `importProvidersFrom({{moduleName}})` call. */
|
|
184
|
+
function createImportProvidersFromCall(moduleName) {
|
|
185
|
+
return ts.factory.createCallChain(ts.factory.createIdentifier('importProvidersFrom'), undefined, undefined, [ts.factory.createIdentifier(moduleName)]);
|
|
186
|
+
}
|
|
187
|
+
/** Creates a `providers: [importProvidersFrom({{moduleName}})]` property assignment. */
|
|
188
|
+
function createProvidersAssignment(moduleName) {
|
|
189
|
+
return ts.factory.createPropertyAssignment('providers', ts.factory.createArrayLiteralExpression([createImportProvidersFromCall(moduleName)]));
|
|
190
|
+
}
|
|
191
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"standalone.js","sourceRoot":"","sources":["../../../../../../../../src/cdk/schematics/utils/ast/standalone.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC 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 {SchematicsException, Tree} from '@angular-devkit/schematics';\nimport {InsertChange} from '@schematics/angular/utility/change';\nimport * as ts from 'typescript';\nimport {insertImport} from '@schematics/angular/utility/ast-utils';\n\n/**\n * Checks whether the providers from a module are being imported in a `bootstrapApplication` call.\n * @param tree File tree of the project.\n * @param filePath Path of the file in which to check.\n * @param className Class name of the module to search for.\n */\nexport function importsProvidersFrom(tree: Tree, filePath: string, className: string): boolean {\n  const sourceFile = ts.createSourceFile(\n    filePath,\n    tree.readText(filePath),\n    ts.ScriptTarget.Latest,\n    true,\n  );\n\n  const bootstrapCall = findBootstrapApplicationCall(sourceFile);\n  const importProvidersFromCall = bootstrapCall ? findImportProvidersFromCall(bootstrapCall) : null;\n\n  return (\n    !!importProvidersFromCall &&\n    importProvidersFromCall.arguments.some(arg => ts.isIdentifier(arg) && arg.text === className)\n  );\n}\n\n/**\n * Adds an `importProvidersFrom` call to the `bootstrapApplication` call.\n * @param tree File tree of the project.\n * @param filePath Path to the file that should be updated.\n * @param moduleName Name of the module that should be imported.\n * @param modulePath Path from which to import the module.\n */\nexport function addModuleImportToStandaloneBootstrap(\n  tree: Tree,\n  filePath: string,\n  moduleName: string,\n  modulePath: string,\n) {\n  const sourceFile = ts.createSourceFile(\n    filePath,\n    tree.readText(filePath),\n    ts.ScriptTarget.Latest,\n    true,\n  );\n\n  const bootstrapCall = findBootstrapApplicationCall(sourceFile);\n\n  if (!bootstrapCall) {\n    throw new SchematicsException(`Could not find bootstrapApplication call in ${filePath}`);\n  }\n\n  const recorder = tree.beginUpdate(filePath);\n  const importCall = findImportProvidersFromCall(bootstrapCall);\n  const printer = ts.createPrinter();\n  const sourceText = sourceFile.getText();\n\n  // Add imports to the module being added and `importProvidersFrom`. We don't\n  // have to worry about duplicates, because `insertImport` handles them.\n  [\n    insertImport(sourceFile, sourceText, moduleName, modulePath),\n    insertImport(sourceFile, sourceText, 'importProvidersFrom', '@angular/core'),\n  ].forEach(change => {\n    if (change instanceof InsertChange) {\n      recorder.insertLeft(change.pos, change.toAdd);\n    }\n  });\n\n  // If there is an `importProvidersFrom` call already, reuse it.\n  if (importCall) {\n    recorder.insertRight(\n      importCall.arguments[importCall.arguments.length - 1].getEnd(),\n      `, ${moduleName}`,\n    );\n  } else if (bootstrapCall.arguments.length === 1) {\n    // Otherwise if there is no options parameter to `bootstrapApplication`,\n    // create an object literal with a `providers` array and the import.\n    const newCall = ts.factory.updateCallExpression(\n      bootstrapCall,\n      bootstrapCall.expression,\n      bootstrapCall.typeArguments,\n      [\n        ...bootstrapCall.arguments,\n        ts.factory.createObjectLiteralExpression([createProvidersAssignment(moduleName)], true),\n      ],\n    );\n\n    recorder.remove(bootstrapCall.getStart(), bootstrapCall.getWidth());\n    recorder.insertRight(\n      bootstrapCall.getStart(),\n      printer.printNode(ts.EmitHint.Unspecified, newCall, sourceFile),\n    );\n  } else {\n    const providersLiteral = findProvidersLiteral(bootstrapCall);\n\n    if (providersLiteral) {\n      // If there's a `providers` array, add the import to it.\n      const newProvidersLiteral = ts.factory.updateArrayLiteralExpression(providersLiteral, [\n        ...providersLiteral.elements,\n        createImportProvidersFromCall(moduleName),\n      ]);\n      recorder.remove(providersLiteral.getStart(), providersLiteral.getWidth());\n      recorder.insertRight(\n        providersLiteral.getStart(),\n        printer.printNode(ts.EmitHint.Unspecified, newProvidersLiteral, sourceFile),\n      );\n    } else {\n      // Otherwise add a `providers` array to the existing object literal.\n      const optionsLiteral = bootstrapCall.arguments[1] as ts.ObjectLiteralExpression;\n      const newOptionsLiteral = ts.factory.updateObjectLiteralExpression(optionsLiteral, [\n        ...optionsLiteral.properties,\n        createProvidersAssignment(moduleName),\n      ]);\n      recorder.remove(optionsLiteral.getStart(), optionsLiteral.getWidth());\n      recorder.insertRight(\n        optionsLiteral.getStart(),\n        printer.printNode(ts.EmitHint.Unspecified, newOptionsLiteral, sourceFile),\n      );\n    }\n  }\n\n  tree.commitUpdate(recorder);\n}\n\n/** Finds the call to `bootstrapApplication` within a file. */\nexport function findBootstrapApplicationCall(sourceFile: ts.SourceFile): ts.CallExpression | null {\n  const localName = findImportLocalName(\n    sourceFile,\n    'bootstrapApplication',\n    '@angular/platform-browser',\n  );\n\n  return localName ? findCall(sourceFile, localName) : null;\n}\n\n/** Find a call to `importProvidersFrom` within a `bootstrapApplication` call. */\nfunction findImportProvidersFromCall(bootstrapCall: ts.CallExpression): ts.CallExpression | null {\n  const providersLiteral = findProvidersLiteral(bootstrapCall);\n  const importProvidersName = findImportLocalName(\n    bootstrapCall.getSourceFile(),\n    'importProvidersFrom',\n    '@angular/core',\n  );\n\n  if (providersLiteral && importProvidersName) {\n    for (const element of providersLiteral.elements) {\n      // Look for an array element that calls the `importProvidersFrom` function.\n      if (\n        ts.isCallExpression(element) &&\n        ts.isIdentifier(element.expression) &&\n        element.expression.text === importProvidersName\n      ) {\n        return element;\n      }\n    }\n  }\n\n  return null;\n}\n\n/** Finds the `providers` array literal within a `bootstrapApplication` call. */\nfunction findProvidersLiteral(bootstrapCall: ts.CallExpression): ts.ArrayLiteralExpression | null {\n  // The imports have to be in the second argument of\n  // the function which has to be an object literal.\n  if (\n    bootstrapCall.arguments.length > 1 &&\n    ts.isObjectLiteralExpression(bootstrapCall.arguments[1])\n  ) {\n    for (const prop of bootstrapCall.arguments[1].properties) {\n      if (\n        ts.isPropertyAssignment(prop) &&\n        ts.isIdentifier(prop.name) &&\n        prop.name.text === 'providers' &&\n        ts.isArrayLiteralExpression(prop.initializer)\n      ) {\n        return prop.initializer;\n      }\n    }\n  }\n\n  return null;\n}\n\n/**\n * Finds the local name of an imported symbol. Could be the symbol name itself or its alias.\n * @param sourceFile File within which to search for the import.\n * @param name Actual name of the import, not its local alias.\n * @param moduleName Name of the module from which the symbol is imported.\n */\nfunction findImportLocalName(\n  sourceFile: ts.SourceFile,\n  name: string,\n  moduleName: string,\n): string | null {\n  for (const node of sourceFile.statements) {\n    // Only look for top-level imports.\n    if (\n      !ts.isImportDeclaration(node) ||\n      !ts.isStringLiteral(node.moduleSpecifier) ||\n      node.moduleSpecifier.text !== moduleName\n    ) {\n      continue;\n    }\n\n    // Filter out imports that don't have the right shape.\n    if (\n      !node.importClause ||\n      !node.importClause.namedBindings ||\n      !ts.isNamedImports(node.importClause.namedBindings)\n    ) {\n      continue;\n    }\n\n    // Look through the elements of the declaration for the specific import.\n    for (const element of node.importClause.namedBindings.elements) {\n      if ((element.propertyName || element.name).text === name) {\n        // The local name is always in `name`.\n        return element.name.text;\n      }\n    }\n  }\n\n  return null;\n}\n\n/**\n * Finds a call to a function with a specific name.\n * @param rootNode Node from which to start searching.\n * @param name Name of the function to search for.\n */\nfunction findCall(rootNode: ts.Node, name: string): ts.CallExpression | null {\n  let result: ts.CallExpression | null = null;\n\n  rootNode.forEachChild(function walk(node) {\n    if (\n      ts.isCallExpression(node) &&\n      ts.isIdentifier(node.expression) &&\n      node.expression.text === name\n    ) {\n      result = node;\n    }\n\n    if (!result) {\n      node.forEachChild(walk);\n    }\n  });\n\n  return result;\n}\n\n/** Creates an `importProvidersFrom({{moduleName}})` call. */\nfunction createImportProvidersFromCall(moduleName: string): ts.CallExpression {\n  return ts.factory.createCallChain(\n    ts.factory.createIdentifier('importProvidersFrom'),\n    undefined,\n    undefined,\n    [ts.factory.createIdentifier(moduleName)],\n  );\n}\n\n/** Creates a `providers: [importProvidersFrom({{moduleName}})]` property assignment. */\nfunction createProvidersAssignment(moduleName: string): ts.PropertyAssignment {\n  return ts.factory.createPropertyAssignment(\n    'providers',\n    ts.factory.createArrayLiteralExpression([createImportProvidersFromCall(moduleName)]),\n  );\n}\n"]}
|
package/schematics/utils/ast.js
CHANGED
|
@@ -12,9 +12,10 @@ const schematics_1 = require("@angular-devkit/schematics");
|
|
|
12
12
|
const change_1 = require("@schematics/angular/utility/change");
|
|
13
13
|
const workspace_1 = require("@schematics/angular/utility/workspace");
|
|
14
14
|
const find_module_1 = require("@schematics/angular/utility/find-module");
|
|
15
|
+
const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
|
|
16
|
+
const ng_ast_utils_1 = require("@schematics/angular/utility/ng-ast-utils");
|
|
15
17
|
const ts = require("typescript");
|
|
16
18
|
const project_main_file_1 = require("./project-main-file");
|
|
17
|
-
const vendored_ast_utils_1 = require("./vendored-ast-utils");
|
|
18
19
|
/** Reads file given path and returns TypeScript source file. */
|
|
19
20
|
function parseSourceFile(host, path) {
|
|
20
21
|
const buffer = host.read(path);
|
|
@@ -26,7 +27,7 @@ function parseSourceFile(host, path) {
|
|
|
26
27
|
exports.parseSourceFile = parseSourceFile;
|
|
27
28
|
/** Import and add module to root app module. */
|
|
28
29
|
function addModuleImportToRootModule(host, moduleName, src, project) {
|
|
29
|
-
const modulePath = (0,
|
|
30
|
+
const modulePath = (0, ng_ast_utils_1.getAppModulePath)(host, (0, project_main_file_1.getProjectMainFile)(project));
|
|
30
31
|
addModuleImportToModule(host, modulePath, moduleName, src);
|
|
31
32
|
}
|
|
32
33
|
exports.addModuleImportToRootModule = addModuleImportToRootModule;
|
|
@@ -42,7 +43,7 @@ function addModuleImportToModule(host, modulePath, moduleName, src) {
|
|
|
42
43
|
if (!moduleSource) {
|
|
43
44
|
throw new schematics_1.SchematicsException(`Module not found: ${modulePath}`);
|
|
44
45
|
}
|
|
45
|
-
const changes = (0,
|
|
46
|
+
const changes = (0, ast_utils_1.addImportToModule)(moduleSource, modulePath, moduleName, src);
|
|
46
47
|
const recorder = host.beginUpdate(modulePath);
|
|
47
48
|
changes.forEach(change => {
|
|
48
49
|
if (change instanceof change_1.InsertChange) {
|
|
@@ -65,4 +66,4 @@ async function findModuleFromOptions(host, options) {
|
|
|
65
66
|
return (0, find_module_1.findModuleFromOptions)(host, options);
|
|
66
67
|
}
|
|
67
68
|
exports.findModuleFromOptions = findModuleFromOptions;
|
|
68
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
69
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vc3JjL2Nkay9zY2hlbWF0aWNzL3V0aWxzL2FzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyREFBcUU7QUFFckUsK0RBQWdFO0FBQ2hFLHFFQUFtRTtBQUNuRSx5RUFBb0c7QUFDcEcscUVBQXdFO0FBQ3hFLDJFQUEwRTtBQUUxRSxpQ0FBaUM7QUFDakMsMkRBQXVEO0FBRXZELGdFQUFnRTtBQUNoRSxTQUFnQixlQUFlLENBQUMsSUFBVSxFQUFFLElBQVk7SUFDdEQsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUMvQixJQUFJLENBQUMsTUFBTSxFQUFFO1FBQ1gsTUFBTSxJQUFJLGdDQUFtQixDQUFDLGlDQUFpQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO0tBQ3hFO0lBQ0QsT0FBTyxFQUFFLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxRQUFRLEVBQUUsRUFBRSxFQUFFLENBQUMsWUFBWSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsQ0FBQztBQUNwRixDQUFDO0FBTkQsMENBTUM7QUFFRCxnREFBZ0Q7QUFDaEQsU0FBZ0IsMkJBQTJCLENBQ3pDLElBQVUsRUFDVixVQUFrQixFQUNsQixHQUFXLEVBQ1gsT0FBMEI7SUFFMUIsTUFBTSxVQUFVLEdBQUcsSUFBQSwrQkFBZ0IsRUFBQyxJQUFJLEVBQUUsSUFBQSxzQ0FBa0IsRUFBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO0lBQ3ZFLHVCQUF1QixDQUFDLElBQUksRUFBRSxVQUFVLEVBQUUsVUFBVSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0FBQzdELENBQUM7QUFSRCxrRUFRQztBQUVEOzs7Ozs7R0FNRztBQUNILFNBQWdCLHVCQUF1QixDQUNyQyxJQUFVLEVBQ1YsVUFBa0IsRUFDbEIsVUFBa0IsRUFDbEIsR0FBVztJQUVYLE1BQU0sWUFBWSxHQUFHLGVBQWUsQ0FBQyxJQUFJLEVBQUUsVUFBVSxDQUFDLENBQUM7SUFFdkQsSUFBSSxDQUFDLFlBQVksRUFBRTtRQUNqQixNQUFNLElBQUksZ0NBQW1CLENBQUMscUJBQXFCLFVBQVUsRUFBRSxDQUFDLENBQUM7S0FDbEU7SUFFRCxNQUFNLE9BQU8sR0FBRyxJQUFBLDZCQUFpQixFQUFDLFlBQVksRUFBRSxVQUFVLEVBQUUsVUFBVSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQzdFLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsVUFBVSxDQUFDLENBQUM7SUFFOUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsRUFBRTtRQUN2QixJQUFJLE1BQU0sWUFBWSxxQkFBWSxFQUFFO1lBQ2xDLFFBQVEsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLEdBQUcsRUFBRSxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUM7U0FDL0M7SUFDSCxDQUFDLENBQUMsQ0FBQztJQUVILElBQUksQ0FBQyxZQUFZLENBQUMsUUFBUSxDQUFDLENBQUM7QUFDOUIsQ0FBQztBQXRCRCwwREFzQkM7QUFFRCxnRkFBZ0Y7QUFDekUsS0FBSyxVQUFVLHFCQUFxQixDQUN6QyxJQUFVLEVBQ1YsT0FBeUI7SUFFekIsTUFBTSxTQUFTLEdBQUcsTUFBTSxJQUFBLHdCQUFZLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFFM0MsSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUU7UUFDcEIsT0FBTyxDQUFDLE9BQU8sR0FBRyxLQUFLLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztLQUM1RDtJQUVELE1BQU0sT0FBTyxHQUFHLFNBQVMsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUUsQ0FBQztJQUV6RCxJQUFJLE9BQU8sQ0FBQyxJQUFJLEtBQUssU0FBUyxFQUFFO1FBQzlCLE9BQU8sQ0FBQyxJQUFJLEdBQUcsSUFBSSxPQUFPLENBQUMsSUFBSSxVQUFVLENBQUM7S0FDM0M7SUFFRCxPQUFPLElBQUEsbUNBQWtCLEVBQUMsSUFBSSxFQUFFLE9BQU8sQ0FBQyxDQUFDO0FBQzNDLENBQUM7QUFqQkQsc0RBaUJDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7U2NoZW1hdGljc0V4Y2VwdGlvbiwgVHJlZX0gZnJvbSAnQGFuZ3VsYXItZGV2a2l0L3NjaGVtYXRpY3MnO1xuaW1wb3J0IHtTY2hlbWEgYXMgQ29tcG9uZW50T3B0aW9uc30gZnJvbSAnQHNjaGVtYXRpY3MvYW5ndWxhci9jb21wb25lbnQvc2NoZW1hJztcbmltcG9ydCB7SW5zZXJ0Q2hhbmdlfSBmcm9tICdAc2NoZW1hdGljcy9hbmd1bGFyL3V0aWxpdHkvY2hhbmdlJztcbmltcG9ydCB7Z2V0V29ya3NwYWNlfSBmcm9tICdAc2NoZW1hdGljcy9hbmd1bGFyL3V0aWxpdHkvd29ya3NwYWNlJztcbmltcG9ydCB7ZmluZE1vZHVsZUZyb21PcHRpb25zIGFzIGludGVybmFsRmluZE1vZHVsZX0gZnJvbSAnQHNjaGVtYXRpY3MvYW5ndWxhci91dGlsaXR5L2ZpbmQtbW9kdWxlJztcbmltcG9ydCB7YWRkSW1wb3J0VG9Nb2R1bGV9IGZyb20gJ0BzY2hlbWF0aWNzL2FuZ3VsYXIvdXRpbGl0eS9hc3QtdXRpbHMnO1xuaW1wb3J0IHtnZXRBcHBNb2R1bGVQYXRofSBmcm9tICdAc2NoZW1hdGljcy9hbmd1bGFyL3V0aWxpdHkvbmctYXN0LXV0aWxzJztcbmltcG9ydCB7UHJvamVjdERlZmluaXRpb259IGZyb20gJ0Bhbmd1bGFyLWRldmtpdC9jb3JlL3NyYy93b3Jrc3BhY2UnO1xuaW1wb3J0ICogYXMgdHMgZnJvbSAndHlwZXNjcmlwdCc7XG5pbXBvcnQge2dldFByb2plY3RNYWluRmlsZX0gZnJvbSAnLi9wcm9qZWN0LW1haW4tZmlsZSc7XG5cbi8qKiBSZWFkcyBmaWxlIGdpdmVuIHBhdGggYW5kIHJldHVybnMgVHlwZVNjcmlwdCBzb3VyY2UgZmlsZS4gKi9cbmV4cG9ydCBmdW5jdGlvbiBwYXJzZVNvdXJjZUZpbGUoaG9zdDogVHJlZSwgcGF0aDogc3RyaW5nKTogdHMuU291cmNlRmlsZSB7XG4gIGNvbnN0IGJ1ZmZlciA9IGhvc3QucmVhZChwYXRoKTtcbiAgaWYgKCFidWZmZXIpIHtcbiAgICB0aHJvdyBuZXcgU2NoZW1hdGljc0V4Y2VwdGlvbihgQ291bGQgbm90IGZpbmQgZmlsZSBmb3IgcGF0aDogJHtwYXRofWApO1xuICB9XG4gIHJldHVybiB0cy5jcmVhdGVTb3VyY2VGaWxlKHBhdGgsIGJ1ZmZlci50b1N0cmluZygpLCB0cy5TY3JpcHRUYXJnZXQuTGF0ZXN0LCB0cnVlKTtcbn1cblxuLyoqIEltcG9ydCBhbmQgYWRkIG1vZHVsZSB0byByb290IGFwcCBtb2R1bGUuICovXG5leHBvcnQgZnVuY3Rpb24gYWRkTW9kdWxlSW1wb3J0VG9Sb290TW9kdWxlKFxuICBob3N0OiBUcmVlLFxuICBtb2R1bGVOYW1lOiBzdHJpbmcsXG4gIHNyYzogc3RyaW5nLFxuICBwcm9qZWN0OiBQcm9qZWN0RGVmaW5pdGlvbixcbikge1xuICBjb25zdCBtb2R1bGVQYXRoID0gZ2V0QXBwTW9kdWxlUGF0aChob3N0LCBnZXRQcm9qZWN0TWFpbkZpbGUocHJvamVjdCkpO1xuICBhZGRNb2R1bGVJbXBvcnRUb01vZHVsZShob3N0LCBtb2R1bGVQYXRoLCBtb2R1bGVOYW1lLCBzcmMpO1xufVxuXG4vKipcbiAqIEltcG9ydCBhbmQgYWRkIG1vZHVsZSB0byBzcGVjaWZpYyBtb2R1bGUgcGF0aC5cbiAqIEBwYXJhbSBob3N0IHRoZSB0cmVlIHdlIGFyZSB1cGRhdGluZ1xuICogQHBhcmFtIG1vZHVsZVBhdGggc3JjIGxvY2F0aW9uIG9mIHRoZSBtb2R1bGUgdG8gaW1wb3J0XG4gKiBAcGFyYW0gbW9kdWxlTmFtZSBuYW1lIG9mIG1vZHVsZSB0byBpbXBvcnRcbiAqIEBwYXJhbSBzcmMgc3JjIGxvY2F0aW9uIHRvIGltcG9ydFxuICovXG5leHBvcnQgZnVuY3Rpb24gYWRkTW9kdWxlSW1wb3J0VG9Nb2R1bGUoXG4gIGhvc3Q6IFRyZWUsXG4gIG1vZHVsZVBhdGg6IHN0cmluZyxcbiAgbW9kdWxlTmFtZTogc3RyaW5nLFxuICBzcmM6IHN0cmluZyxcbikge1xuICBjb25zdCBtb2R1bGVTb3VyY2UgPSBwYXJzZVNvdXJjZUZpbGUoaG9zdCwgbW9kdWxlUGF0aCk7XG5cbiAgaWYgKCFtb2R1bGVTb3VyY2UpIHtcbiAgICB0aHJvdyBuZXcgU2NoZW1hdGljc0V4Y2VwdGlvbihgTW9kdWxlIG5vdCBmb3VuZDogJHttb2R1bGVQYXRofWApO1xuICB9XG5cbiAgY29uc3QgY2hhbmdlcyA9IGFkZEltcG9ydFRvTW9kdWxlKG1vZHVsZVNvdXJjZSwgbW9kdWxlUGF0aCwgbW9kdWxlTmFtZSwgc3JjKTtcbiAgY29uc3QgcmVjb3JkZXIgPSBob3N0LmJlZ2luVXBkYXRlKG1vZHVsZVBhdGgpO1xuXG4gIGNoYW5nZXMuZm9yRWFjaChjaGFuZ2UgPT4ge1xuICAgIGlmIChjaGFuZ2UgaW5zdGFuY2VvZiBJbnNlcnRDaGFuZ2UpIHtcbiAgICAgIHJlY29yZGVyLmluc2VydExlZnQoY2hhbmdlLnBvcywgY2hhbmdlLnRvQWRkKTtcbiAgICB9XG4gIH0pO1xuXG4gIGhvc3QuY29tbWl0VXBkYXRlKHJlY29yZGVyKTtcbn1cblxuLyoqIFdyYXBzIHRoZSBpbnRlcm5hbCBmaW5kIG1vZHVsZSBmcm9tIG9wdGlvbnMgd2l0aCB1bmRlZmluZWQgcGF0aCBoYW5kbGluZyAgKi9cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiBmaW5kTW9kdWxlRnJvbU9wdGlvbnMoXG4gIGhvc3Q6IFRyZWUsXG4gIG9wdGlvbnM6IENvbXBvbmVudE9wdGlvbnMsXG4pOiBQcm9taXNlPHN0cmluZyB8IHVuZGVmaW5lZD4ge1xuICBjb25zdCB3b3Jrc3BhY2UgPSBhd2FpdCBnZXRXb3Jrc3BhY2UoaG9zdCk7XG5cbiAgaWYgKCFvcHRpb25zLnByb2plY3QpIHtcbiAgICBvcHRpb25zLnByb2plY3QgPSBBcnJheS5mcm9tKHdvcmtzcGFjZS5wcm9qZWN0cy5rZXlzKCkpWzBdO1xuICB9XG5cbiAgY29uc3QgcHJvamVjdCA9IHdvcmtzcGFjZS5wcm9qZWN0cy5nZXQob3B0aW9ucy5wcm9qZWN0KSE7XG5cbiAgaWYgKG9wdGlvbnMucGF0aCA9PT0gdW5kZWZpbmVkKSB7XG4gICAgb3B0aW9ucy5wYXRoID0gYC8ke3Byb2plY3Qucm9vdH0vc3JjL2FwcGA7XG4gIH1cblxuICByZXR1cm4gaW50ZXJuYWxGaW5kTW9kdWxlKGhvc3QsIG9wdGlvbnMpO1xufVxuIl19
|
package/schematics/utils/ast.mjs
CHANGED
|
@@ -12,9 +12,10 @@ const schematics_1 = require("@angular-devkit/schematics");
|
|
|
12
12
|
const change_1 = require("@schematics/angular/utility/change");
|
|
13
13
|
const workspace_1 = require("@schematics/angular/utility/workspace");
|
|
14
14
|
const find_module_1 = require("@schematics/angular/utility/find-module");
|
|
15
|
+
const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
|
|
16
|
+
const ng_ast_utils_1 = require("@schematics/angular/utility/ng-ast-utils");
|
|
15
17
|
const ts = require("typescript");
|
|
16
18
|
const project_main_file_1 = require("./project-main-file");
|
|
17
|
-
const vendored_ast_utils_1 = require("./vendored-ast-utils");
|
|
18
19
|
/** Reads file given path and returns TypeScript source file. */
|
|
19
20
|
function parseSourceFile(host, path) {
|
|
20
21
|
const buffer = host.read(path);
|
|
@@ -26,7 +27,7 @@ function parseSourceFile(host, path) {
|
|
|
26
27
|
exports.parseSourceFile = parseSourceFile;
|
|
27
28
|
/** Import and add module to root app module. */
|
|
28
29
|
function addModuleImportToRootModule(host, moduleName, src, project) {
|
|
29
|
-
const modulePath = (0,
|
|
30
|
+
const modulePath = (0, ng_ast_utils_1.getAppModulePath)(host, (0, project_main_file_1.getProjectMainFile)(project));
|
|
30
31
|
addModuleImportToModule(host, modulePath, moduleName, src);
|
|
31
32
|
}
|
|
32
33
|
exports.addModuleImportToRootModule = addModuleImportToRootModule;
|
|
@@ -42,7 +43,7 @@ function addModuleImportToModule(host, modulePath, moduleName, src) {
|
|
|
42
43
|
if (!moduleSource) {
|
|
43
44
|
throw new schematics_1.SchematicsException(`Module not found: ${modulePath}`);
|
|
44
45
|
}
|
|
45
|
-
const changes = (0,
|
|
46
|
+
const changes = (0, ast_utils_1.addImportToModule)(moduleSource, modulePath, moduleName, src);
|
|
46
47
|
const recorder = host.beginUpdate(modulePath);
|
|
47
48
|
changes.forEach(change => {
|
|
48
49
|
if (change instanceof change_1.InsertChange) {
|
|
@@ -65,4 +66,4 @@ async function findModuleFromOptions(host, options) {
|
|
|
65
66
|
return (0, find_module_1.findModuleFromOptions)(host, options);
|
|
66
67
|
}
|
|
67
68
|
exports.findModuleFromOptions = findModuleFromOptions;
|
|
68
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
69
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vc3JjL2Nkay9zY2hlbWF0aWNzL3V0aWxzL2FzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyREFBcUU7QUFFckUsK0RBQWdFO0FBQ2hFLHFFQUFtRTtBQUNuRSx5RUFBb0c7QUFDcEcscUVBQXdFO0FBQ3hFLDJFQUEwRTtBQUUxRSxpQ0FBaUM7QUFDakMsMkRBQXVEO0FBRXZELGdFQUFnRTtBQUNoRSxTQUFnQixlQUFlLENBQUMsSUFBVSxFQUFFLElBQVk7SUFDdEQsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUMvQixJQUFJLENBQUMsTUFBTSxFQUFFO1FBQ1gsTUFBTSxJQUFJLGdDQUFtQixDQUFDLGlDQUFpQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO0tBQ3hFO0lBQ0QsT0FBTyxFQUFFLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxRQUFRLEVBQUUsRUFBRSxFQUFFLENBQUMsWUFBWSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsQ0FBQztBQUNwRixDQUFDO0FBTkQsMENBTUM7QUFFRCxnREFBZ0Q7QUFDaEQsU0FBZ0IsMkJBQTJCLENBQ3pDLElBQVUsRUFDVixVQUFrQixFQUNsQixHQUFXLEVBQ1gsT0FBMEI7SUFFMUIsTUFBTSxVQUFVLEdBQUcsSUFBQSwrQkFBZ0IsRUFBQyxJQUFJLEVBQUUsSUFBQSxzQ0FBa0IsRUFBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO0lBQ3ZFLHVCQUF1QixDQUFDLElBQUksRUFBRSxVQUFVLEVBQUUsVUFBVSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0FBQzdELENBQUM7QUFSRCxrRUFRQztBQUVEOzs7Ozs7R0FNRztBQUNILFNBQWdCLHVCQUF1QixDQUNyQyxJQUFVLEVBQ1YsVUFBa0IsRUFDbEIsVUFBa0IsRUFDbEIsR0FBVztJQUVYLE1BQU0sWUFBWSxHQUFHLGVBQWUsQ0FBQyxJQUFJLEVBQUUsVUFBVSxDQUFDLENBQUM7SUFFdkQsSUFBSSxDQUFDLFlBQVksRUFBRTtRQUNqQixNQUFNLElBQUksZ0NBQW1CLENBQUMscUJBQXFCLFVBQVUsRUFBRSxDQUFDLENBQUM7S0FDbEU7SUFFRCxNQUFNLE9BQU8sR0FBRyxJQUFBLDZCQUFpQixFQUFDLFlBQVksRUFBRSxVQUFVLEVBQUUsVUFBVSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQzdFLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsVUFBVSxDQUFDLENBQUM7SUFFOUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsRUFBRTtRQUN2QixJQUFJLE1BQU0sWUFBWSxxQkFBWSxFQUFFO1lBQ2xDLFFBQVEsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLEdBQUcsRUFBRSxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUM7U0FDL0M7SUFDSCxDQUFDLENBQUMsQ0FBQztJQUVILElBQUksQ0FBQyxZQUFZLENBQUMsUUFBUSxDQUFDLENBQUM7QUFDOUIsQ0FBQztBQXRCRCwwREFzQkM7QUFFRCxnRkFBZ0Y7QUFDekUsS0FBSyxVQUFVLHFCQUFxQixDQUN6QyxJQUFVLEVBQ1YsT0FBeUI7SUFFekIsTUFBTSxTQUFTLEdBQUcsTUFBTSxJQUFBLHdCQUFZLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFFM0MsSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUU7UUFDcEIsT0FBTyxDQUFDLE9BQU8sR0FBRyxLQUFLLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztLQUM1RDtJQUVELE1BQU0sT0FBTyxHQUFHLFNBQVMsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUUsQ0FBQztJQUV6RCxJQUFJLE9BQU8sQ0FBQyxJQUFJLEtBQUssU0FBUyxFQUFFO1FBQzlCLE9BQU8sQ0FBQyxJQUFJLEdBQUcsSUFBSSxPQUFPLENBQUMsSUFBSSxVQUFVLENBQUM7S0FDM0M7SUFFRCxPQUFPLElBQUEsbUNBQWtCLEVBQUMsSUFBSSxFQUFFLE9BQU8sQ0FBQyxDQUFDO0FBQzNDLENBQUM7QUFqQkQsc0RBaUJDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7U2NoZW1hdGljc0V4Y2VwdGlvbiwgVHJlZX0gZnJvbSAnQGFuZ3VsYXItZGV2a2l0L3NjaGVtYXRpY3MnO1xuaW1wb3J0IHtTY2hlbWEgYXMgQ29tcG9uZW50T3B0aW9uc30gZnJvbSAnQHNjaGVtYXRpY3MvYW5ndWxhci9jb21wb25lbnQvc2NoZW1hJztcbmltcG9ydCB7SW5zZXJ0Q2hhbmdlfSBmcm9tICdAc2NoZW1hdGljcy9hbmd1bGFyL3V0aWxpdHkvY2hhbmdlJztcbmltcG9ydCB7Z2V0V29ya3NwYWNlfSBmcm9tICdAc2NoZW1hdGljcy9hbmd1bGFyL3V0aWxpdHkvd29ya3NwYWNlJztcbmltcG9ydCB7ZmluZE1vZHVsZUZyb21PcHRpb25zIGFzIGludGVybmFsRmluZE1vZHVsZX0gZnJvbSAnQHNjaGVtYXRpY3MvYW5ndWxhci91dGlsaXR5L2ZpbmQtbW9kdWxlJztcbmltcG9ydCB7YWRkSW1wb3J0VG9Nb2R1bGV9IGZyb20gJ0BzY2hlbWF0aWNzL2FuZ3VsYXIvdXRpbGl0eS9hc3QtdXRpbHMnO1xuaW1wb3J0IHtnZXRBcHBNb2R1bGVQYXRofSBmcm9tICdAc2NoZW1hdGljcy9hbmd1bGFyL3V0aWxpdHkvbmctYXN0LXV0aWxzJztcbmltcG9ydCB7UHJvamVjdERlZmluaXRpb259IGZyb20gJ0Bhbmd1bGFyLWRldmtpdC9jb3JlL3NyYy93b3Jrc3BhY2UnO1xuaW1wb3J0ICogYXMgdHMgZnJvbSAndHlwZXNjcmlwdCc7XG5pbXBvcnQge2dldFByb2plY3RNYWluRmlsZX0gZnJvbSAnLi9wcm9qZWN0LW1haW4tZmlsZSc7XG5cbi8qKiBSZWFkcyBmaWxlIGdpdmVuIHBhdGggYW5kIHJldHVybnMgVHlwZVNjcmlwdCBzb3VyY2UgZmlsZS4gKi9cbmV4cG9ydCBmdW5jdGlvbiBwYXJzZVNvdXJjZUZpbGUoaG9zdDogVHJlZSwgcGF0aDogc3RyaW5nKTogdHMuU291cmNlRmlsZSB7XG4gIGNvbnN0IGJ1ZmZlciA9IGhvc3QucmVhZChwYXRoKTtcbiAgaWYgKCFidWZmZXIpIHtcbiAgICB0aHJvdyBuZXcgU2NoZW1hdGljc0V4Y2VwdGlvbihgQ291bGQgbm90IGZpbmQgZmlsZSBmb3IgcGF0aDogJHtwYXRofWApO1xuICB9XG4gIHJldHVybiB0cy5jcmVhdGVTb3VyY2VGaWxlKHBhdGgsIGJ1ZmZlci50b1N0cmluZygpLCB0cy5TY3JpcHRUYXJnZXQuTGF0ZXN0LCB0cnVlKTtcbn1cblxuLyoqIEltcG9ydCBhbmQgYWRkIG1vZHVsZSB0byByb290IGFwcCBtb2R1bGUuICovXG5leHBvcnQgZnVuY3Rpb24gYWRkTW9kdWxlSW1wb3J0VG9Sb290TW9kdWxlKFxuICBob3N0OiBUcmVlLFxuICBtb2R1bGVOYW1lOiBzdHJpbmcsXG4gIHNyYzogc3RyaW5nLFxuICBwcm9qZWN0OiBQcm9qZWN0RGVmaW5pdGlvbixcbikge1xuICBjb25zdCBtb2R1bGVQYXRoID0gZ2V0QXBwTW9kdWxlUGF0aChob3N0LCBnZXRQcm9qZWN0TWFpbkZpbGUocHJvamVjdCkpO1xuICBhZGRNb2R1bGVJbXBvcnRUb01vZHVsZShob3N0LCBtb2R1bGVQYXRoLCBtb2R1bGVOYW1lLCBzcmMpO1xufVxuXG4vKipcbiAqIEltcG9ydCBhbmQgYWRkIG1vZHVsZSB0byBzcGVjaWZpYyBtb2R1bGUgcGF0aC5cbiAqIEBwYXJhbSBob3N0IHRoZSB0cmVlIHdlIGFyZSB1cGRhdGluZ1xuICogQHBhcmFtIG1vZHVsZVBhdGggc3JjIGxvY2F0aW9uIG9mIHRoZSBtb2R1bGUgdG8gaW1wb3J0XG4gKiBAcGFyYW0gbW9kdWxlTmFtZSBuYW1lIG9mIG1vZHVsZSB0byBpbXBvcnRcbiAqIEBwYXJhbSBzcmMgc3JjIGxvY2F0aW9uIHRvIGltcG9ydFxuICovXG5leHBvcnQgZnVuY3Rpb24gYWRkTW9kdWxlSW1wb3J0VG9Nb2R1bGUoXG4gIGhvc3Q6IFRyZWUsXG4gIG1vZHVsZVBhdGg6IHN0cmluZyxcbiAgbW9kdWxlTmFtZTogc3RyaW5nLFxuICBzcmM6IHN0cmluZyxcbikge1xuICBjb25zdCBtb2R1bGVTb3VyY2UgPSBwYXJzZVNvdXJjZUZpbGUoaG9zdCwgbW9kdWxlUGF0aCk7XG5cbiAgaWYgKCFtb2R1bGVTb3VyY2UpIHtcbiAgICB0aHJvdyBuZXcgU2NoZW1hdGljc0V4Y2VwdGlvbihgTW9kdWxlIG5vdCBmb3VuZDogJHttb2R1bGVQYXRofWApO1xuICB9XG5cbiAgY29uc3QgY2hhbmdlcyA9IGFkZEltcG9ydFRvTW9kdWxlKG1vZHVsZVNvdXJjZSwgbW9kdWxlUGF0aCwgbW9kdWxlTmFtZSwgc3JjKTtcbiAgY29uc3QgcmVjb3JkZXIgPSBob3N0LmJlZ2luVXBkYXRlKG1vZHVsZVBhdGgpO1xuXG4gIGNoYW5nZXMuZm9yRWFjaChjaGFuZ2UgPT4ge1xuICAgIGlmIChjaGFuZ2UgaW5zdGFuY2VvZiBJbnNlcnRDaGFuZ2UpIHtcbiAgICAgIHJlY29yZGVyLmluc2VydExlZnQoY2hhbmdlLnBvcywgY2hhbmdlLnRvQWRkKTtcbiAgICB9XG4gIH0pO1xuXG4gIGhvc3QuY29tbWl0VXBkYXRlKHJlY29yZGVyKTtcbn1cblxuLyoqIFdyYXBzIHRoZSBpbnRlcm5hbCBmaW5kIG1vZHVsZSBmcm9tIG9wdGlvbnMgd2l0aCB1bmRlZmluZWQgcGF0aCBoYW5kbGluZyAgKi9cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiBmaW5kTW9kdWxlRnJvbU9wdGlvbnMoXG4gIGhvc3Q6IFRyZWUsXG4gIG9wdGlvbnM6IENvbXBvbmVudE9wdGlvbnMsXG4pOiBQcm9taXNlPHN0cmluZyB8IHVuZGVmaW5lZD4ge1xuICBjb25zdCB3b3Jrc3BhY2UgPSBhd2FpdCBnZXRXb3Jrc3BhY2UoaG9zdCk7XG5cbiAgaWYgKCFvcHRpb25zLnByb2plY3QpIHtcbiAgICBvcHRpb25zLnByb2plY3QgPSBBcnJheS5mcm9tKHdvcmtzcGFjZS5wcm9qZWN0cy5rZXlzKCkpWzBdO1xuICB9XG5cbiAgY29uc3QgcHJvamVjdCA9IHdvcmtzcGFjZS5wcm9qZWN0cy5nZXQob3B0aW9ucy5wcm9qZWN0KSE7XG5cbiAgaWYgKG9wdGlvbnMucGF0aCA9PT0gdW5kZWZpbmVkKSB7XG4gICAgb3B0aW9ucy5wYXRoID0gYC8ke3Byb2plY3Qucm9vdH0vc3JjL2FwcGA7XG4gIH1cblxuICByZXR1cm4gaW50ZXJuYWxGaW5kTW9kdWxlKGhvc3QsIG9wdGlvbnMpO1xufVxuIl19
|