@energycap/components 0.39.9-schematics.20240307-1411 → 0.39.9-schematics.20240307-1726
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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@energycap/components",
|
|
3
|
-
"version": "0.39.9-schematics.20240307-
|
|
3
|
+
"version": "0.39.9-schematics.20240307-1726",
|
|
4
4
|
"schematics": "./schematics/collection.json",
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"tslib": "^2.0.0"
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
"@angular/router": ">=15.2.0",
|
|
13
13
|
"@angular/cdk": ">=15.2.0",
|
|
14
14
|
"@ngx-translate/core": "^14.0.0",
|
|
15
|
-
"popper.js": "
|
|
15
|
+
"popper.js": "^1.14.7",
|
|
16
16
|
"lodash": "^4.17.21",
|
|
17
17
|
"moment": "^2.29.0",
|
|
18
18
|
"ngx-clipboard": "^12.0.0"
|
|
@@ -11,10 +11,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.rxjs7Upgrade = void 0;
|
|
13
13
|
const core_1 = require("@angular-devkit/core");
|
|
14
|
+
const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
|
|
15
|
+
const change_1 = require("@schematics/angular/utility/change");
|
|
14
16
|
const workspace_1 = require("@schematics/angular/utility/workspace");
|
|
15
|
-
const ts = require("typescript");
|
|
16
17
|
const path_1 = require("path");
|
|
17
|
-
|
|
18
|
+
const ts = require("typescript");
|
|
18
19
|
function rxjs7Upgrade() {
|
|
19
20
|
return (tree) => __awaiter(this, void 0, void 0, function* () {
|
|
20
21
|
const workspaceHost = createWorkspaceHost(tree);
|
|
@@ -25,19 +26,39 @@ function rxjs7Upgrade() {
|
|
|
25
26
|
const basePath = process.cwd().replace(/\\/g, '/');
|
|
26
27
|
tsConfigPaths.forEach(tsConfigPath => {
|
|
27
28
|
const program = createTsProgram(tree, tsConfigPath, basePath);
|
|
28
|
-
const printer = ts.createPrinter();
|
|
29
29
|
const checker = program.getTypeChecker();
|
|
30
|
-
// const migratedFiles = new Map<string, string>();
|
|
31
|
-
const transformer = getTransformer(checker);
|
|
32
30
|
for (const sourceFile of program.getSourceFiles()) {
|
|
33
31
|
// Skip declaration files and external library files
|
|
34
32
|
if (sourceFile.isDeclarationFile || program.isSourceFileFromExternalLibrary(sourceFile)) {
|
|
35
33
|
continue;
|
|
36
34
|
}
|
|
37
|
-
const
|
|
38
|
-
const
|
|
39
|
-
|
|
40
|
-
|
|
35
|
+
const observables = ['Observable', 'Subject', 'BehaviorSubject', 'ReplaySubject', 'AsyncSubject'];
|
|
36
|
+
const toPromiseCalls = (0, ast_utils_1.findNodes)(sourceFile, ts.isCallExpression, undefined, true).filter(node => {
|
|
37
|
+
if (ts.isPropertyAccessExpression(node.expression) && node.expression.name.text === 'toPromise') {
|
|
38
|
+
const symbol = checker.getTypeAtLocation(node.expression.expression).symbol;
|
|
39
|
+
return symbol && observables.includes(symbol.name);
|
|
40
|
+
}
|
|
41
|
+
return false;
|
|
42
|
+
});
|
|
43
|
+
if (toPromiseCalls.length) {
|
|
44
|
+
const fileToEdit = (0, path_1.relative)(basePath, sourceFile.fileName);
|
|
45
|
+
const recorder = tree.beginUpdate(fileToEdit);
|
|
46
|
+
const changes = [];
|
|
47
|
+
const printer = ts.createPrinter();
|
|
48
|
+
// Add import for lastValueFrom
|
|
49
|
+
changes.push((0, ast_utils_1.insertImport)(sourceFile, fileToEdit, 'lastValueFrom', 'rxjs'));
|
|
50
|
+
// Replace toPromise calls with lastValueFrom
|
|
51
|
+
toPromiseCalls.forEach(node => {
|
|
52
|
+
if (ts.isPropertyAccessExpression(node.expression)) {
|
|
53
|
+
const newCallExpression = ts.factory.createCallExpression(ts.factory.createIdentifier('lastValueFrom'), undefined, [node.expression.expression]);
|
|
54
|
+
const newNodeText = printer.printNode(ts.EmitHint.Unspecified, newCallExpression, sourceFile);
|
|
55
|
+
const change = new change_1.ReplaceChange(fileToEdit, node.getStart(), node.getText(), newNodeText);
|
|
56
|
+
changes.push(change);
|
|
57
|
+
}
|
|
58
|
+
});
|
|
59
|
+
(0, change_1.applyToUpdateRecorder)(recorder, changes);
|
|
60
|
+
tree.commitUpdate(recorder);
|
|
61
|
+
}
|
|
41
62
|
}
|
|
42
63
|
});
|
|
43
64
|
});
|
|
@@ -85,7 +106,7 @@ function getTsConfigPaths(workspace, tree) {
|
|
|
85
106
|
}
|
|
86
107
|
}
|
|
87
108
|
}
|
|
88
|
-
return [...buildPaths];
|
|
109
|
+
return [...buildPaths, ...testPaths];
|
|
89
110
|
}
|
|
90
111
|
function createTsProgram(tree, tsConfigPath, basePath) {
|
|
91
112
|
tsConfigPath = (0, path_1.resolve)(basePath, tsConfigPath);
|
|
@@ -116,21 +137,4 @@ function createTsCompilerHost(tree, options, basePath) {
|
|
|
116
137
|
};
|
|
117
138
|
return host;
|
|
118
139
|
}
|
|
119
|
-
function getTransformer(checker) {
|
|
120
|
-
return (context) => {
|
|
121
|
-
const visit = (node) => {
|
|
122
|
-
// Check if this is a call expression where the expression is a property access expression with the name 'toPromise'
|
|
123
|
-
if (ts.isCallExpression(node) && ts.isPropertyAccessExpression(node.expression) && node.expression.name.text === 'toPromise') {
|
|
124
|
-
// Get the type of the object on which 'toPromise' is being called
|
|
125
|
-
const symbol = checker.getTypeAtLocation(node.expression.expression).symbol;
|
|
126
|
-
if (symbol && ['Observable', 'Subject', 'BehaviorSubject', 'ReplaySubject', 'AsyncSubject'].includes(symbol.name)) {
|
|
127
|
-
// Replace the node with a call expression where the expression is an identifier with the name 'lastValueFrom'
|
|
128
|
-
return ts.factory.createCallExpression(ts.factory.createIdentifier('lastValueFrom'), undefined, [node.expression.expression]);
|
|
129
|
-
}
|
|
130
|
-
}
|
|
131
|
-
return ts.visitEachChild(node, visit, context);
|
|
132
|
-
};
|
|
133
|
-
return (sourceFile) => ts.visitNode(sourceFile, visit);
|
|
134
|
-
};
|
|
135
|
-
}
|
|
136
140
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../projects/components/schematics/ng-generate/rxjs-7-upgrade/index.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../projects/components/schematics/ng-generate/rxjs-7-upgrade/index.ts"],"names":[],"mappings":"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"}
|