@o3r/schematics 8.2.0-alpha.8 → 8.2.0-alpha.80
Sign up to get free protection for your applications and to get access to all the features.
- package/LICENSE +26 -26
- package/README.md +9 -197
- package/package.json +7 -4
- package/src/rule-factories/index.d.ts +2 -0
- package/src/rule-factories/index.d.ts.map +1 -1
- package/src/rule-factories/index.js +2 -0
- package/src/rule-factories/index.js.map +1 -1
- package/src/rule-factories/ng-add/index.d.ts.map +1 -1
- package/src/rule-factories/ng-add/index.js +5 -2
- package/src/rule-factories/ng-add/index.js.map +1 -1
- package/src/rule-factories/update-imports/index.d.ts +5 -0
- package/src/rule-factories/update-imports/index.d.ts.map +1 -0
- package/src/rule-factories/update-imports/index.js +8 -0
- package/src/rule-factories/update-imports/index.js.map +1 -0
- package/src/rule-factories/update-imports/list-of-vars.d.ts +15 -0
- package/src/rule-factories/update-imports/list-of-vars.d.ts.map +1 -0
- package/src/rule-factories/update-imports/list-of-vars.js +44 -0
- package/src/rule-factories/update-imports/list-of-vars.js.map +1 -0
- package/src/rule-factories/update-imports/update-imports-with-scope.d.ts +12 -0
- package/src/rule-factories/update-imports/update-imports-with-scope.d.ts.map +1 -0
- package/src/rule-factories/update-imports/update-imports-with-scope.js +34 -0
- package/src/rule-factories/update-imports/update-imports-with-scope.js.map +1 -0
- package/src/rule-factories/update-imports/update-ts-imports.d.ts +11 -0
- package/src/rule-factories/update-imports/update-ts-imports.d.ts.map +1 -0
- package/src/rule-factories/update-imports/update-ts-imports.js +32 -0
- package/src/rule-factories/update-imports/update-ts-imports.js.map +1 -0
- package/src/rule-factories/update-imports/v7-to-v8-map-object.d.ts +8 -0
- package/src/rule-factories/update-imports/v7-to-v8-map-object.d.ts.map +1 -0
- package/src/rule-factories/update-imports/v7-to-v8-map-object.js +2049 -0
- package/src/rule-factories/update-imports/v7-to-v8-map-object.js.map +1 -0
- package/src/rule-factories/vscode-extensions/index.d.ts +8 -0
- package/src/rule-factories/vscode-extensions/index.d.ts.map +1 -0
- package/src/rule-factories/vscode-extensions/index.js +26 -0
- package/src/rule-factories/vscode-extensions/index.js.map +1 -0
- package/src/utility/gitignore.js +1 -1
- package/src/utility/gitignore.js.map +1 -1
- package/src/utility/index.d.ts +1 -0
- package/src/utility/index.d.ts.map +1 -1
- package/src/utility/index.js +1 -0
- package/src/utility/index.js.map +1 -1
- package/src/utility/loaders.d.ts +10 -3
- package/src/utility/loaders.d.ts.map +1 -1
- package/src/utility/loaders.js +18 -5
- package/src/utility/loaders.js.map +1 -1
- package/src/utility/modules.d.ts +51 -1
- package/src/utility/modules.d.ts.map +1 -1
- package/src/utility/modules.js +101 -1
- package/src/utility/modules.js.map +1 -1
- package/src/utility/routes.d.ts +2 -1
- package/src/utility/routes.d.ts.map +1 -1
- package/src/utility/routes.js +3 -2
- package/src/utility/routes.js.map +1 -1
- package/src/utility/template-property.helper.js +1 -1
- package/src/utility/template-property.helper.js.map +1 -1
- package/src/utility/update-imports.d.ts +25 -0
- package/src/utility/update-imports.d.ts.map +1 -0
- package/src/utility/update-imports.js +86 -0
- package/src/utility/update-imports.js.map +1 -0
@@ -0,0 +1,86 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.updateImportsInFile = void 0;
|
4
|
+
const ts = require("typescript");
|
5
|
+
const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
|
6
|
+
/**
|
7
|
+
* Update the imports of a given file according to replace mapping
|
8
|
+
*
|
9
|
+
* @param logger Logger to report messages
|
10
|
+
* @param tree File System tree
|
11
|
+
* @param sourceFile Source file to analyze
|
12
|
+
* @param importsRegexp Regexp of the imports to replace
|
13
|
+
* @param renamePackagesRegexp Regexp of the packages to replace
|
14
|
+
* @param mapImports Map of the import to replace
|
15
|
+
* @param renamedPackages Map of the import package to replace
|
16
|
+
*/
|
17
|
+
function updateImportsInFile(logger, tree, sourceFile, importsRegexp, renamePackagesRegexp, mapImports = {}, renamedPackages = {}) {
|
18
|
+
const oldImportedSymbolsPerPackage = {};
|
19
|
+
const unResolvedImports = [];
|
20
|
+
const importNodes = [];
|
21
|
+
// First we look for all imports lines targeting an Otter package for which we know a mapping
|
22
|
+
(0, ast_utils_1.findNodes)(sourceFile, ts.SyntaxKind.ImportDeclaration).map((nodeImp) => {
|
23
|
+
const imp = nodeImp;
|
24
|
+
const importFrom = imp.moduleSpecifier.getText().replace(/['"]/g, '');
|
25
|
+
const renamePackageMatch = importFrom.match(renamePackagesRegexp);
|
26
|
+
const otterPackage = renamePackageMatch ? renamePackageMatch[0] : importFrom.match(importsRegexp)?.[0];
|
27
|
+
// If the import matched an Otter package
|
28
|
+
if (otterPackage) {
|
29
|
+
if (!oldImportedSymbolsPerPackage[otterPackage]) {
|
30
|
+
oldImportedSymbolsPerPackage[otterPackage] = [];
|
31
|
+
}
|
32
|
+
// We store the import line to be able to remove it afterwards
|
33
|
+
importNodes.push(imp);
|
34
|
+
// We retrieve all the symbols listed in the import statement
|
35
|
+
const namedImport = imp.importClause && imp.importClause.getChildAt(0);
|
36
|
+
const imports = namedImport && ts.isNamedImports(namedImport) ?
|
37
|
+
namedImport.elements.map((element) => ({ symbol: element.getText(), location: importFrom })) :
|
38
|
+
[];
|
39
|
+
// And associate them to the Otter package
|
40
|
+
oldImportedSymbolsPerPackage[otterPackage].push(...imports);
|
41
|
+
}
|
42
|
+
});
|
43
|
+
// If did not capture any interesting import line, do nothing
|
44
|
+
if (importNodes.length === 0) {
|
45
|
+
return 0;
|
46
|
+
}
|
47
|
+
// Iterate over the imports and look into the renamed packages and into the map to see the import new module
|
48
|
+
// If no mapping is found, we keep the original import location
|
49
|
+
const resolvedImports = Object.entries(oldImportedSymbolsPerPackage).reduce((acc, [oldPackageName, importsFromOldPackage]) => {
|
50
|
+
importsFromOldPackage.forEach((importSymbol) => {
|
51
|
+
let newPackageNameImport;
|
52
|
+
if (Object.keys(renamedPackages).indexOf(oldPackageName) > 0) {
|
53
|
+
newPackageNameImport = importSymbol.location.replace(oldPackageName, renamedPackages[oldPackageName]);
|
54
|
+
}
|
55
|
+
else {
|
56
|
+
newPackageNameImport = mapImports[oldPackageName]?.[importSymbol.symbol]?.newPackage;
|
57
|
+
}
|
58
|
+
const importFrom = newPackageNameImport || importSymbol.location;
|
59
|
+
if (!newPackageNameImport) {
|
60
|
+
unResolvedImports.push(importSymbol);
|
61
|
+
}
|
62
|
+
if (!acc[importFrom]) {
|
63
|
+
acc[importFrom] = [];
|
64
|
+
}
|
65
|
+
const newNameForExportedValue = mapImports[oldPackageName]?.[importSymbol.symbol]?.newValue;
|
66
|
+
acc[importFrom].push(newNameForExportedValue || importSymbol.symbol);
|
67
|
+
});
|
68
|
+
return acc;
|
69
|
+
}, {});
|
70
|
+
// Remove captured imports
|
71
|
+
const fileWithoutImports = tree.read(sourceFile.fileName).toString()
|
72
|
+
.replace(new RegExp(`(${importNodes.map((node) => node.getText()).join('|')})[\\n\\r]*`, 'g'), '');
|
73
|
+
// Add the computed imports at the top of the file
|
74
|
+
const fileWithNewImports = Object.entries(resolvedImports)
|
75
|
+
.map(([importFrom, imports]) => `import {${imports.join(', ')}} from '${importFrom}';`)
|
76
|
+
.join('\n') + '\n' + fileWithoutImports;
|
77
|
+
tree.overwrite(sourceFile.fileName, fileWithNewImports);
|
78
|
+
// Log details about imports for which we could not find an associated sub-entry
|
79
|
+
if (unResolvedImports.length > 0) {
|
80
|
+
logger.warn(`Some imports in file ${sourceFile.fileName} could not be resolved:`);
|
81
|
+
unResolvedImports.forEach((unResolvedImport) => logger.warn(` |-- symbol "${unResolvedImport.symbol}" from module "${unResolvedImport.location}"`));
|
82
|
+
}
|
83
|
+
return unResolvedImports.length;
|
84
|
+
}
|
85
|
+
exports.updateImportsInFile = updateImportsInFile;
|
86
|
+
//# sourceMappingURL=update-imports.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"update-imports.js","sourceRoot":"","sources":["../../../src/utility/update-imports.ts"],"names":[],"mappings":"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"}
|