@nrwl/workspace 15.7.1 → 15.8.0-beta.1
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/index.d.ts +1 -1
- package/index.js +2 -2
- package/index.js.map +1 -1
- package/migrations.json +1 -1
- package/package.json +30 -32
- package/src/generators/{new/files-integrated-repo → library/files/root}/tsconfig.base.json +0 -0
- package/src/generators/library/library.js +21 -10
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library/schema.d.ts +1 -1
- package/src/generators/move/lib/update-imports.js +25 -26
- package/src/generators/move/lib/update-imports.js.map +1 -1
- package/src/generators/new/schema.json +1 -1
- package/src/generators/preset/schema.json +1 -1
- package/src/generators/remove/lib/update-jest-config.js +9 -5
- package/src/generators/remove/lib/update-jest-config.js.map +1 -1
- package/src/generators/remove/lib/update-tsconfig.js +2 -2
- package/src/generators/remove/lib/update-tsconfig.js.map +1 -1
- package/src/generators/utils/insert-import.js +9 -5
- package/src/generators/utils/insert-import.js.map +1 -1
- package/src/generators/utils/insert-statement.js +7 -3
- package/src/generators/utils/insert-statement.js.map +1 -1
- package/src/utilities/ast-utils.d.ts +1 -1
- package/src/utilities/ast-utils.js +28 -13
- package/src/utilities/ast-utils.js.map +1 -1
- package/src/utilities/buildable-libs-utils.d.ts +1 -1
- package/src/utilities/buildable-libs-utils.js +7 -3
- package/src/utilities/buildable-libs-utils.js.map +1 -1
- package/src/utilities/ts-config.d.ts +6 -0
- package/src/utilities/ts-config.js +44 -0
- package/src/utilities/ts-config.js.map +1 -0
- package/src/utilities/typescript/compilation.d.ts +1 -1
- package/src/utilities/typescript/compilation.js +19 -13
- package/src/utilities/typescript/compilation.js.map +1 -1
- package/src/utilities/typescript/get-source-nodes.d.ts +1 -1
- package/src/utilities/typescript.d.ts +0 -7
- package/src/utilities/typescript.js +3 -41
- package/src/utilities/typescript.js.map +1 -1
- package/src/utils/ast-utils.d.ts +1 -1
- package/src/utils/ast-utils.js +28 -13
- package/src/utils/ast-utils.js.map +1 -1
- package/src/utils/rules/to-js.js +8 -4
- package/src/utils/rules/to-js.js.map +1 -1
- package/src/utils/create-ts-config.d.ts +0 -17
- package/src/utils/create-ts-config.js +0 -48
- package/src/utils/create-ts-config.js.map +0 -1
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.findClass = exports.addMethod = exports.addParameterToConstructor = exports.replaceNodeValue = exports.getImport = exports.addGlobal = exports.insertImport = exports.removeChange = exports.replaceChange = exports.insertChange = void 0;
|
|
4
|
-
const ts = require("typescript");
|
|
5
4
|
const typescript_1 = require("./typescript");
|
|
6
5
|
const typescript_2 = require("nx/src/utils/typescript");
|
|
6
|
+
let tsModule;
|
|
7
7
|
function nodesByPosition(first, second) {
|
|
8
8
|
return first.getStart() - second.getStart();
|
|
9
9
|
}
|
|
@@ -46,14 +46,17 @@ function removeChange(host, sourceFile, filePath, removePosition, contentToRemov
|
|
|
46
46
|
}
|
|
47
47
|
exports.removeChange = removeChange;
|
|
48
48
|
function insertImport(host, source, fileToEdit, symbolName, fileName, isDefault = false) {
|
|
49
|
+
if (!tsModule) {
|
|
50
|
+
tsModule = require('typescript');
|
|
51
|
+
}
|
|
49
52
|
const rootNode = source;
|
|
50
|
-
const allImports = (0, typescript_2.findNodes)(rootNode,
|
|
53
|
+
const allImports = (0, typescript_2.findNodes)(rootNode, tsModule.SyntaxKind.ImportDeclaration);
|
|
51
54
|
// get nodes that map to import statements from the file fileName
|
|
52
55
|
const relevantImports = allImports.filter((node) => {
|
|
53
56
|
// StringLiteral of the ImportDeclaration is the import file (fileName in this case).
|
|
54
57
|
const importFiles = node
|
|
55
58
|
.getChildren()
|
|
56
|
-
.filter((child) => child.kind ===
|
|
59
|
+
.filter((child) => child.kind === tsModule.SyntaxKind.StringLiteral)
|
|
57
60
|
.map((n) => n.text);
|
|
58
61
|
return importFiles.filter((file) => file === fileName).length === 1;
|
|
59
62
|
});
|
|
@@ -62,8 +65,8 @@ function insertImport(host, source, fileToEdit, symbolName, fileName, isDefault
|
|
|
62
65
|
// imports from import file
|
|
63
66
|
const imports = [];
|
|
64
67
|
relevantImports.forEach((n) => {
|
|
65
|
-
Array.prototype.push.apply(imports, (0, typescript_2.findNodes)(n,
|
|
66
|
-
if ((0, typescript_2.findNodes)(n,
|
|
68
|
+
Array.prototype.push.apply(imports, (0, typescript_2.findNodes)(n, tsModule.SyntaxKind.Identifier));
|
|
69
|
+
if ((0, typescript_2.findNodes)(n, tsModule.SyntaxKind.AsteriskToken).length > 0) {
|
|
67
70
|
importsAsterisk = true;
|
|
68
71
|
}
|
|
69
72
|
});
|
|
@@ -74,14 +77,14 @@ function insertImport(host, source, fileToEdit, symbolName, fileName, isDefault
|
|
|
74
77
|
const importTextNodes = imports.filter((n) => n.text === symbolName);
|
|
75
78
|
// insert import if it's not there
|
|
76
79
|
if (importTextNodes.length === 0) {
|
|
77
|
-
const fallbackPos = (0, typescript_2.findNodes)(relevantImports[0],
|
|
78
|
-
(0, typescript_2.findNodes)(relevantImports[0],
|
|
80
|
+
const fallbackPos = (0, typescript_2.findNodes)(relevantImports[0], tsModule.SyntaxKind.CloseBraceToken)[0].getStart() ||
|
|
81
|
+
(0, typescript_2.findNodes)(relevantImports[0], tsModule.SyntaxKind.FromKeyword)[0].getStart();
|
|
79
82
|
return insertAfterLastOccurrence(host, source, imports, `, ${symbolName}`, fileToEdit, fallbackPos);
|
|
80
83
|
}
|
|
81
84
|
return source;
|
|
82
85
|
}
|
|
83
86
|
// no such import declaration exists
|
|
84
|
-
const useStrict = (0, typescript_2.findNodes)(rootNode,
|
|
87
|
+
const useStrict = (0, typescript_2.findNodes)(rootNode, tsModule.SyntaxKind.StringLiteral).filter((n) => n.text === 'use strict');
|
|
85
88
|
let fallbackPos = 0;
|
|
86
89
|
if (useStrict.length > 0) {
|
|
87
90
|
fallbackPos = useStrict[0].end;
|
|
@@ -93,7 +96,7 @@ function insertImport(host, source, fileToEdit, symbolName, fileName, isDefault
|
|
|
93
96
|
const separator = insertAtBeginning ? '' : ';\n';
|
|
94
97
|
const toInsert = `${separator}import ${open}${symbolName}${close}` +
|
|
95
98
|
` from '${fileName}'${insertAtBeginning ? ';\n' : ''}`;
|
|
96
|
-
return insertAfterLastOccurrence(host, source, allImports, toInsert, fileToEdit, fallbackPos,
|
|
99
|
+
return insertAfterLastOccurrence(host, source, allImports, toInsert, fileToEdit, fallbackPos, tsModule.SyntaxKind.StringLiteral);
|
|
97
100
|
}
|
|
98
101
|
exports.insertImport = insertImport;
|
|
99
102
|
function insertAfterLastOccurrence(host, sourceFile, nodes, toInsert, pathToFile, fallbackPos, syntaxKind) {
|
|
@@ -112,7 +115,10 @@ function insertAfterLastOccurrence(host, sourceFile, nodes, toInsert, pathToFile
|
|
|
112
115
|
return insertChange(host, sourceFile, pathToFile, lastItemPosition, toInsert);
|
|
113
116
|
}
|
|
114
117
|
function addGlobal(host, source, modulePath, statement) {
|
|
115
|
-
|
|
118
|
+
if (!tsModule) {
|
|
119
|
+
tsModule = require('typescript');
|
|
120
|
+
}
|
|
121
|
+
const allImports = (0, typescript_2.findNodes)(source, tsModule.SyntaxKind.ImportDeclaration);
|
|
116
122
|
if (allImports.length > 0) {
|
|
117
123
|
const lastImport = allImports[allImports.length - 1];
|
|
118
124
|
return insertChange(host, source, modulePath, lastImport.end + 1, `\n${statement}\n`);
|
|
@@ -123,7 +129,10 @@ function addGlobal(host, source, modulePath, statement) {
|
|
|
123
129
|
}
|
|
124
130
|
exports.addGlobal = addGlobal;
|
|
125
131
|
function getImport(source, predicate) {
|
|
126
|
-
|
|
132
|
+
if (!tsModule) {
|
|
133
|
+
tsModule = require('typescript');
|
|
134
|
+
}
|
|
135
|
+
const allImports = (0, typescript_2.findNodes)(source, tsModule.SyntaxKind.ImportDeclaration);
|
|
127
136
|
const matching = allImports.filter((i) => predicate(i.moduleSpecifier.getText()));
|
|
128
137
|
return matching.map((i) => {
|
|
129
138
|
const moduleSpec = i.moduleSpecifier
|
|
@@ -144,8 +153,11 @@ function replaceNodeValue(host, sourceFile, modulePath, node, content) {
|
|
|
144
153
|
}
|
|
145
154
|
exports.replaceNodeValue = replaceNodeValue;
|
|
146
155
|
function addParameterToConstructor(tree, source, modulePath, opts) {
|
|
156
|
+
if (!tsModule) {
|
|
157
|
+
tsModule = require('typescript');
|
|
158
|
+
}
|
|
147
159
|
const clazz = findClass(source, opts.className);
|
|
148
|
-
const constructor = clazz.members.filter((m) => m.kind ===
|
|
160
|
+
const constructor = clazz.members.filter((m) => m.kind === tsModule.SyntaxKind.Constructor)[0];
|
|
149
161
|
if (constructor) {
|
|
150
162
|
throw new Error('Should be tested'); // TODO: check this
|
|
151
163
|
}
|
|
@@ -170,8 +182,11 @@ ${opts.methodHeader} {}
|
|
|
170
182
|
}
|
|
171
183
|
exports.addMethod = addMethod;
|
|
172
184
|
function findClass(source, className, silent = false) {
|
|
185
|
+
if (!tsModule) {
|
|
186
|
+
tsModule = require('typescript');
|
|
187
|
+
}
|
|
173
188
|
const nodes = (0, typescript_1.getSourceNodes)(source);
|
|
174
|
-
const clazz = nodes.filter((n) => n.kind ===
|
|
189
|
+
const clazz = nodes.filter((n) => n.kind === tsModule.SyntaxKind.ClassDeclaration &&
|
|
175
190
|
n.name.text === className)[0];
|
|
176
191
|
if (!clazz && !silent) {
|
|
177
192
|
throw new Error(`Cannot find class '${className}'.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/ast-utils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/ast-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { ProjectGraph, ProjectGraphProjectNode } from '@nrwl/devkit';
|
|
2
2
|
import { ProjectGraphExternalNode } from '@nrwl/devkit';
|
|
3
|
-
import * as ts from 'typescript';
|
|
3
|
+
import type * as ts from 'typescript';
|
|
4
4
|
export declare type DependentBuildableProjectNode = {
|
|
5
5
|
name: string;
|
|
6
6
|
outputs: string[];
|
|
@@ -4,10 +4,10 @@ exports.updateBuildableProjectPackageJsonDependencies = exports.updatePaths = ex
|
|
|
4
4
|
const path_1 = require("path");
|
|
5
5
|
const fileutils_1 = require("./fileutils");
|
|
6
6
|
const devkit_1 = require("@nrwl/devkit");
|
|
7
|
-
const ts = require("typescript");
|
|
8
7
|
const fs_1 = require("fs");
|
|
9
8
|
const output_1 = require("./output");
|
|
10
9
|
const operators_1 = require("nx/src/project-graph/operators");
|
|
10
|
+
let tsModule;
|
|
11
11
|
function isBuildable(target, node) {
|
|
12
12
|
return (node.data.targets &&
|
|
13
13
|
node.data.targets[target] &&
|
|
@@ -69,6 +69,7 @@ function calculateProjectDependencies(projGraph, root, projectName, targetName,
|
|
|
69
69
|
return project;
|
|
70
70
|
})
|
|
71
71
|
.filter((x) => !!x);
|
|
72
|
+
dependencies.sort((a, b) => (a.name > b.name ? 1 : b.name > a.name ? -1 : 0));
|
|
72
73
|
return {
|
|
73
74
|
target,
|
|
74
75
|
dependencies,
|
|
@@ -120,11 +121,14 @@ function computeCompilerOptionsPaths(tsConfig, dependencies) {
|
|
|
120
121
|
exports.computeCompilerOptionsPaths = computeCompilerOptionsPaths;
|
|
121
122
|
function readPaths(tsConfig) {
|
|
122
123
|
var _a;
|
|
124
|
+
if (!tsModule) {
|
|
125
|
+
tsModule = require('typescript');
|
|
126
|
+
}
|
|
123
127
|
try {
|
|
124
128
|
let config;
|
|
125
129
|
if (typeof tsConfig === 'string') {
|
|
126
|
-
const configFile =
|
|
127
|
-
config =
|
|
130
|
+
const configFile = tsModule.readConfigFile(tsConfig, tsModule.sys.readFile);
|
|
131
|
+
config = tsModule.parseJsonConfigFileContent(configFile.config, tsModule.sys, (0, path_1.dirname)(tsConfig));
|
|
128
132
|
}
|
|
129
133
|
else {
|
|
130
134
|
config = tsConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildable-libs-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/buildable-libs-utils.ts"],"names":[],"mappings":";;;AAAA,+BAA+C;AAC/C,2CAA0D;AAE1D,yCAMsB;
|
|
1
|
+
{"version":3,"file":"buildable-libs-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/buildable-libs-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { Tree } from '@nrwl/devkit';
|
|
2
|
+
export declare function readTsConfig(tsConfigPath: string): import("typescript").ParsedCommandLine;
|
|
3
|
+
export declare function getRootTsConfigPathInTree(tree: Tree): string | null;
|
|
4
|
+
export declare function getRelativePathToRootTsConfig(tree: Tree, targetPath: string): string;
|
|
5
|
+
export declare function getRootTsConfigFileName(): string | null;
|
|
6
|
+
export declare function getRootTsConfigPath(): string | null;
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getRootTsConfigPath = exports.getRootTsConfigFileName = exports.getRelativePathToRootTsConfig = exports.getRootTsConfigPathInTree = exports.readTsConfig = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const fs_1 = require("fs");
|
|
6
|
+
const path_1 = require("path");
|
|
7
|
+
let tsModule;
|
|
8
|
+
function readTsConfig(tsConfigPath) {
|
|
9
|
+
if (!tsModule) {
|
|
10
|
+
tsModule = require('typescript');
|
|
11
|
+
}
|
|
12
|
+
const readResult = tsModule.readConfigFile(tsConfigPath, tsModule.sys.readFile);
|
|
13
|
+
return tsModule.parseJsonConfigFileContent(readResult.config, tsModule.sys, (0, path_1.dirname)(tsConfigPath));
|
|
14
|
+
}
|
|
15
|
+
exports.readTsConfig = readTsConfig;
|
|
16
|
+
function getRootTsConfigPathInTree(tree) {
|
|
17
|
+
for (const path of ['tsconfig.base.json', 'tsconfig.json']) {
|
|
18
|
+
if (tree.exists(path)) {
|
|
19
|
+
return path;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
return 'tsconfig.base.json';
|
|
23
|
+
}
|
|
24
|
+
exports.getRootTsConfigPathInTree = getRootTsConfigPathInTree;
|
|
25
|
+
function getRelativePathToRootTsConfig(tree, targetPath) {
|
|
26
|
+
return (0, devkit_1.offsetFromRoot)(targetPath) + getRootTsConfigPathInTree(tree);
|
|
27
|
+
}
|
|
28
|
+
exports.getRelativePathToRootTsConfig = getRelativePathToRootTsConfig;
|
|
29
|
+
function getRootTsConfigFileName() {
|
|
30
|
+
for (const tsConfigName of ['tsconfig.base.json', 'tsconfig.json']) {
|
|
31
|
+
const tsConfigPath = (0, path_1.join)(devkit_1.workspaceRoot, tsConfigName);
|
|
32
|
+
if ((0, fs_1.existsSync)(tsConfigPath)) {
|
|
33
|
+
return tsConfigName;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
return null;
|
|
37
|
+
}
|
|
38
|
+
exports.getRootTsConfigFileName = getRootTsConfigFileName;
|
|
39
|
+
function getRootTsConfigPath() {
|
|
40
|
+
const tsConfigFileName = getRootTsConfigFileName();
|
|
41
|
+
return tsConfigFileName ? (0, path_1.join)(devkit_1.workspaceRoot, tsConfigFileName) : null;
|
|
42
|
+
}
|
|
43
|
+
exports.getRootTsConfigPath = getRootTsConfigPath;
|
|
44
|
+
//# sourceMappingURL=ts-config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ts-config.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/ts-config.ts"],"names":[],"mappings":";;;AAAA,yCAAmE;AACnE,2BAAgC;AAChC,+BAAqC;AAErC,IAAI,QAAqC,CAAC;AAE1C,SAAgB,YAAY,CAAC,YAAoB;IAC/C,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;KAClC;IACD,MAAM,UAAU,GAAG,QAAQ,CAAC,cAAc,CACxC,YAAY,EACZ,QAAQ,CAAC,GAAG,CAAC,QAAQ,CACtB,CAAC;IACF,OAAO,QAAQ,CAAC,0BAA0B,CACxC,UAAU,CAAC,MAAM,EACjB,QAAQ,CAAC,GAAG,EACZ,IAAA,cAAO,EAAC,YAAY,CAAC,CACtB,CAAC;AACJ,CAAC;AAbD,oCAaC;AAED,SAAgB,yBAAyB,CAAC,IAAU;IAClD,KAAK,MAAM,IAAI,IAAI,CAAC,oBAAoB,EAAE,eAAe,CAAC,EAAE;QAC1D,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YACrB,OAAO,IAAI,CAAC;SACb;KACF;IAED,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AARD,8DAQC;AAED,SAAgB,6BAA6B,CAC3C,IAAU,EACV,UAAkB;IAElB,OAAO,IAAA,uBAAc,EAAC,UAAU,CAAC,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAC;AACtE,CAAC;AALD,sEAKC;AAED,SAAgB,uBAAuB;IACrC,KAAK,MAAM,YAAY,IAAI,CAAC,oBAAoB,EAAE,eAAe,CAAC,EAAE;QAClE,MAAM,YAAY,GAAG,IAAA,WAAI,EAAC,sBAAa,EAAE,YAAY,CAAC,CAAC;QACvD,IAAI,IAAA,eAAU,EAAC,YAAY,CAAC,EAAE;YAC5B,OAAO,YAAY,CAAC;SACrB;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AATD,0DASC;AAED,SAAgB,mBAAmB;IACjC,MAAM,gBAAgB,GAAG,uBAAuB,EAAE,CAAC;IAEnD,OAAO,gBAAgB,CAAC,CAAC,CAAC,IAAA,WAAI,EAAC,sBAAa,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACzE,CAAC;AAJD,kDAIC"}
|
|
@@ -3,25 +3,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.compileTypeScriptWatcher = exports.compileTypeScript = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const
|
|
7
|
-
const
|
|
8
|
-
|
|
6
|
+
const fs_1 = require("fs");
|
|
7
|
+
const ts_config_1 = require("../ts-config");
|
|
8
|
+
let tsModule;
|
|
9
9
|
function compileTypeScript(options) {
|
|
10
10
|
const normalizedOptions = normalizeOptions(options);
|
|
11
11
|
const tsConfig = getNormalizedTsConfig(normalizedOptions);
|
|
12
12
|
if (normalizedOptions.deleteOutputPath) {
|
|
13
|
-
(0,
|
|
13
|
+
(0, fs_1.rmSync)(normalizedOptions.outputPath, { recursive: true, force: true });
|
|
14
14
|
}
|
|
15
15
|
return createProgram(tsConfig, normalizedOptions);
|
|
16
16
|
}
|
|
17
17
|
exports.compileTypeScript = compileTypeScript;
|
|
18
18
|
function compileTypeScriptWatcher(options, callback) {
|
|
19
|
+
if (!tsModule) {
|
|
20
|
+
tsModule = require('typescript');
|
|
21
|
+
}
|
|
19
22
|
const normalizedOptions = normalizeOptions(options);
|
|
20
23
|
const tsConfig = getNormalizedTsConfig(normalizedOptions);
|
|
21
24
|
if (normalizedOptions.deleteOutputPath) {
|
|
22
|
-
(0,
|
|
25
|
+
(0, fs_1.rmSync)(normalizedOptions.outputPath, { recursive: true, force: true });
|
|
23
26
|
}
|
|
24
|
-
const host =
|
|
27
|
+
const host = tsModule.createWatchCompilerHost(tsConfig.fileNames, tsConfig.options, tsModule.sys);
|
|
25
28
|
const originalAfterProgramCreate = host.afterProgramCreate;
|
|
26
29
|
host.afterProgramCreate = (builderProgram) => {
|
|
27
30
|
const originalProgramEmit = builderProgram.emit;
|
|
@@ -39,7 +42,7 @@ function compileTypeScriptWatcher(options, callback) {
|
|
|
39
42
|
originalOnWatchStatusChange === null || originalOnWatchStatusChange === void 0 ? void 0 : originalOnWatchStatusChange(a, b, c, d);
|
|
40
43
|
yield (callback === null || callback === void 0 ? void 0 : callback(a, b, c, d));
|
|
41
44
|
});
|
|
42
|
-
return
|
|
45
|
+
return tsModule.createWatchProgram(host);
|
|
43
46
|
}
|
|
44
47
|
exports.compileTypeScriptWatcher = compileTypeScriptWatcher;
|
|
45
48
|
function mergeCustomTransformers(originalCustomTransformers, consumerCustomTransformers) {
|
|
@@ -74,7 +77,7 @@ function mergeCustomTransformers(originalCustomTransformers, consumerCustomTrans
|
|
|
74
77
|
return mergedCustomTransformers;
|
|
75
78
|
}
|
|
76
79
|
function getNormalizedTsConfig(options) {
|
|
77
|
-
const tsConfig = (0,
|
|
80
|
+
const tsConfig = (0, ts_config_1.readTsConfig)(options.tsConfig);
|
|
78
81
|
tsConfig.options.outDir = options.outputPath;
|
|
79
82
|
tsConfig.options.noEmitOnError = true;
|
|
80
83
|
tsConfig.options.rootDir = options.rootDir;
|
|
@@ -84,8 +87,11 @@ function getNormalizedTsConfig(options) {
|
|
|
84
87
|
return tsConfig;
|
|
85
88
|
}
|
|
86
89
|
function createProgram(tsconfig, { projectName, getCustomTransformers }) {
|
|
87
|
-
|
|
88
|
-
|
|
90
|
+
if (!tsModule) {
|
|
91
|
+
tsModule = require('typescript');
|
|
92
|
+
}
|
|
93
|
+
const host = tsModule.createCompilerHost(tsconfig.options);
|
|
94
|
+
const program = tsModule.createProgram({
|
|
89
95
|
rootNames: tsconfig.fileNames,
|
|
90
96
|
options: tsconfig.options,
|
|
91
97
|
host,
|
|
@@ -93,9 +99,9 @@ function createProgram(tsconfig, { projectName, getCustomTransformers }) {
|
|
|
93
99
|
devkit_1.logger.info(`Compiling TypeScript files for project "${projectName}"...`);
|
|
94
100
|
const results = program.emit(undefined, undefined, undefined, undefined, getCustomTransformers === null || getCustomTransformers === void 0 ? void 0 : getCustomTransformers(program));
|
|
95
101
|
if (results.emitSkipped) {
|
|
96
|
-
const diagnostics =
|
|
97
|
-
getCurrentDirectory: () =>
|
|
98
|
-
getNewLine: () =>
|
|
102
|
+
const diagnostics = tsModule.formatDiagnosticsWithColorAndContext(results.diagnostics, {
|
|
103
|
+
getCurrentDirectory: () => tsModule.sys.getCurrentDirectory(),
|
|
104
|
+
getNewLine: () => tsModule.sys.newLine,
|
|
99
105
|
getCanonicalFileName: (name) => name,
|
|
100
106
|
});
|
|
101
107
|
devkit_1.logger.error(diagnostics);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compilation.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/typescript/compilation.ts"],"names":[],"mappings":";;;;AAAA,yCAAyD;AACzD,
|
|
1
|
+
{"version":3,"file":"compilation.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/typescript/compilation.ts"],"names":[],"mappings":";;;;AAAA,yCAAyD;AACzD,2BAA4B;AAG5B,4CAA4C;AAE5C,IAAI,QAAqC,CAAC;AAoB1C,SAAgB,iBAAiB,CAAC,OAAqC;IAGrE,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACpD,MAAM,QAAQ,GAAG,qBAAqB,CAAC,iBAAiB,CAAC,CAAC;IAE1D,IAAI,iBAAiB,CAAC,gBAAgB,EAAE;QACtC,IAAA,WAAM,EAAC,iBAAiB,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;KACxE;IAED,OAAO,aAAa,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;AACpD,CAAC;AAXD,8CAWC;AAED,SAAgB,wBAAwB,CACtC,OAAqC,EACrC,QAKyB;IAEzB,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;KAClC;IACD,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACpD,MAAM,QAAQ,GAAG,qBAAqB,CAAC,iBAAiB,CAAC,CAAC;IAE1D,IAAI,iBAAiB,CAAC,gBAAgB,EAAE;QACtC,IAAA,WAAM,EAAC,iBAAiB,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;KACxE;IAED,MAAM,IAAI,GAAG,QAAQ,CAAC,uBAAuB,CAC3C,QAAQ,CAAC,SAAS,EAClB,QAAQ,CAAC,OAAO,EAChB,QAAQ,CAAC,GAAG,CACb,CAAC;IAEF,MAAM,0BAA0B,GAAG,IAAI,CAAC,kBAAkB,CAAC;IAC3D,IAAI,CAAC,kBAAkB,GAAG,CAAC,cAAc,EAAE,EAAE;QAC3C,MAAM,mBAAmB,GAAG,cAAc,CAAC,IAAI,CAAC;QAChD,cAAc,CAAC,IAAI,GAAG,CACpB,gBAAgB,EAChB,SAAS,EACT,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,EAAE;;YACF,MAAM,0BAA0B,GAAG,MAAA,OAAO,CAAC,qBAAqB,wDAC9D,cAAc,CAAC,UAAU,EAAE,CAC5B,CAAC;YAEF,MAAM,wBAAwB,GAAG,uBAAuB,CACtD,kBAAkB,EAClB,0BAA0B,CAC3B,CAAC;YAEF,OAAO,mBAAmB,CACxB,gBAAgB,EAChB,SAAS,EACT,iBAAiB,EACjB,gBAAgB,EAChB,wBAAwB,CACzB,CAAC;QACJ,CAAC,CAAC;QAEF,IAAI,0BAA0B;YAAE,0BAA0B,CAAC,cAAc,CAAC,CAAC;IAC7E,CAAC,CAAC;IAEF,MAAM,2BAA2B,GAAG,IAAI,CAAC,mBAAmB,CAAC;IAC7D,IAAI,CAAC,mBAAmB,GAAG,CAAO,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;QAC9C,2BAA2B,aAA3B,2BAA2B,uBAA3B,2BAA2B,CAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC1C,MAAM,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA,CAAC;IAC/B,CAAC,CAAA,CAAC;IAEF,OAAO,QAAQ,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;AAC3C,CAAC;AA/DD,4DA+DC;AAED,SAAS,uBAAuB,CAC9B,0BAA0D,EAC1D,0BAA0D;IAE1D,IAAI,CAAC,0BAA0B;QAAE,OAAO,0BAA0B,CAAC;IAEnE,MAAM,wBAAwB,GAAuB,EAAE,CAAC;IACxD,IAAI,0BAA0B,CAAC,MAAM,EAAE;QACrC,wBAAwB,CAAC,MAAM,GAAG,CAAA,0BAA0B,aAA1B,0BAA0B,uBAA1B,0BAA0B,CAAE,MAAM;YAClE,CAAC,CAAC;gBACE,GAAG,0BAA0B,CAAC,MAAM;gBACpC,GAAG,0BAA0B,CAAC,MAAM;aACrC;YACH,CAAC,CAAC,0BAA0B,CAAC,MAAM,CAAC;KACvC;IAED,IAAI,0BAA0B,CAAC,KAAK,EAAE;QACpC,wBAAwB,CAAC,KAAK,GAAG,CAAA,0BAA0B,aAA1B,0BAA0B,uBAA1B,0BAA0B,CAAE,KAAK;YAChE,CAAC,CAAC;gBACE,GAAG,0BAA0B,CAAC,KAAK;gBACnC,GAAG,0BAA0B,CAAC,KAAK;aACpC;YACH,CAAC,CAAC,0BAA0B,CAAC,KAAK,CAAC;KACtC;IAED,IAAI,0BAA0B,CAAC,iBAAiB,EAAE;QAChD,wBAAwB,CAAC,iBAAiB;YACxC,CAAA,0BAA0B,aAA1B,0BAA0B,uBAA1B,0BAA0B,CAAE,iBAAiB;gBAC3C,CAAC,CAAC;oBACE,GAAG,0BAA0B,CAAC,iBAAiB;oBAC/C,GAAG,0BAA0B,CAAC,iBAAiB;iBAChD;gBACH,CAAC,CAAC,0BAA0B,CAAC,iBAAiB,CAAC;KACpD;IAED,OAAO,wBAAwB,CAAC;AAClC,CAAC;AAED,SAAS,qBAAqB,CAAC,OAAqC;IAClE,MAAM,QAAQ,GAAG,IAAA,wBAAY,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAChD,QAAQ,CAAC,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAC7C,QAAQ,CAAC,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IACtC,QAAQ,CAAC,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAC3C,IAAI,QAAQ,CAAC,OAAO,CAAC,WAAW,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,eAAe,EAAE;QACrE,QAAQ,CAAC,OAAO,CAAC,eAAe,GAAG,IAAA,0BAAiB,EAClD,OAAO,CAAC,UAAU,EAClB,sBAAsB,CACvB,CAAC;KACH;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,aAAa,CACpB,QAA8B,EAC9B,EAAE,WAAW,EAAE,qBAAqB,EAAgC;IAEpE,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;KAClC;IACD,MAAM,IAAI,GAAG,QAAQ,CAAC,kBAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC3D,MAAM,OAAO,GAAG,QAAQ,CAAC,aAAa,CAAC;QACrC,SAAS,EAAE,QAAQ,CAAC,SAAS;QAC7B,OAAO,EAAE,QAAQ,CAAC,OAAO;QACzB,IAAI;KACL,CAAC,CAAC;IACH,eAAM,CAAC,IAAI,CAAC,2CAA2C,WAAW,MAAM,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAC1B,SAAS,EACT,SAAS,EACT,SAAS,EACT,SAAS,EACT,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAG,OAAO,CAAC,CACjC,CAAC;IACF,IAAI,OAAO,CAAC,WAAW,EAAE;QACvB,MAAM,WAAW,GAAG,QAAQ,CAAC,oCAAoC,CAC/D,OAAO,CAAC,WAAW,EACnB;YACE,mBAAmB,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,mBAAmB,EAAE;YAC7D,UAAU,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO;YACtC,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI;SACrC,CACF,CAAC;QACF,eAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAC1B,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;KAC3B;SAAM;QACL,eAAM,CAAC,IAAI,CACT,gDAAgD,WAAW,IAAI,CAChE,CAAC;QACF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;KAC1B;AACH,CAAC;AAED,SAAS,gBAAgB,CACvB,OAAqC;;IAErC,uCACK,OAAO,KACV,gBAAgB,EAAE,MAAA,OAAO,CAAC,gBAAgB,mCAAI,IAAI,EAClD,OAAO,EAAE,MAAA,OAAO,CAAC,OAAO,mCAAI,OAAO,CAAC,WAAW,IAC/C;AACJ,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import * as ts from 'typescript';
|
|
1
|
+
import type * as ts from 'typescript';
|
|
2
2
|
export declare function getSourceNodes(sourceFile: ts.SourceFile): ts.Node[];
|
|
@@ -1,10 +1,7 @@
|
|
|
1
|
-
import { Tree } from '@nrwl/devkit';
|
|
2
|
-
import type * as ts from 'typescript';
|
|
3
1
|
export { compileTypeScript } from './typescript/compilation';
|
|
4
2
|
export type { TypeScriptCompilationOptions } from './typescript/compilation';
|
|
5
3
|
export { findNodes } from './typescript/find-nodes';
|
|
6
4
|
export { getSourceNodes } from './typescript/get-source-nodes';
|
|
7
|
-
export declare function readTsConfig(tsConfigPath: string): ts.ParsedCommandLine;
|
|
8
5
|
/**
|
|
9
6
|
* Find a module based on it's import
|
|
10
7
|
*
|
|
@@ -13,7 +10,3 @@ export declare function readTsConfig(tsConfigPath: string): ts.ParsedCommandLine
|
|
|
13
10
|
* @param tsConfigPath
|
|
14
11
|
*/
|
|
15
12
|
export declare function resolveModuleByImport(importExpr: string, filePath: string, tsConfigPath: string): string;
|
|
16
|
-
export declare function getRootTsConfigPathInTree(tree: Tree): string | null;
|
|
17
|
-
export declare function getRelativePathToRootTsConfig(tree: Tree, targetPath: string): string;
|
|
18
|
-
export declare function getRootTsConfigFileName(): string | null;
|
|
19
|
-
export declare function getRootTsConfigPath(): string | null;
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.resolveModuleByImport = exports.getSourceNodes = exports.findNodes = exports.compileTypeScript = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const devkit_2 = require("@nrwl/devkit");
|
|
6
|
-
const fs_1 = require("fs");
|
|
7
5
|
const path_1 = require("path");
|
|
8
6
|
var compilation_1 = require("./typescript/compilation");
|
|
9
7
|
Object.defineProperty(exports, "compileTypeScript", { enumerable: true, get: function () { return compilation_1.compileTypeScript; } });
|
|
@@ -11,16 +9,8 @@ var find_nodes_1 = require("./typescript/find-nodes"); // TODO(v16): remove this
|
|
|
11
9
|
Object.defineProperty(exports, "findNodes", { enumerable: true, get: function () { return find_nodes_1.findNodes; } });
|
|
12
10
|
var get_source_nodes_1 = require("./typescript/get-source-nodes");
|
|
13
11
|
Object.defineProperty(exports, "getSourceNodes", { enumerable: true, get: function () { return get_source_nodes_1.getSourceNodes; } });
|
|
14
|
-
const normalizedAppRoot =
|
|
12
|
+
const normalizedAppRoot = devkit_1.workspaceRoot.replace(/\\/g, '/');
|
|
15
13
|
let tsModule;
|
|
16
|
-
function readTsConfig(tsConfigPath) {
|
|
17
|
-
if (!tsModule) {
|
|
18
|
-
tsModule = require('typescript');
|
|
19
|
-
}
|
|
20
|
-
const readResult = tsModule.readConfigFile(tsConfigPath, tsModule.sys.readFile);
|
|
21
|
-
return tsModule.parseJsonConfigFileContent(readResult.config, tsModule.sys, (0, path_1.dirname)(tsConfigPath));
|
|
22
|
-
}
|
|
23
|
-
exports.readTsConfig = readTsConfig;
|
|
24
14
|
function readTsConfigOptions(tsConfigPath) {
|
|
25
15
|
if (!tsModule) {
|
|
26
16
|
tsModule = require('typescript');
|
|
@@ -57,35 +47,7 @@ exports.resolveModuleByImport = resolveModuleByImport;
|
|
|
57
47
|
function getCompilerHost(tsConfigPath) {
|
|
58
48
|
const options = readTsConfigOptions(tsConfigPath);
|
|
59
49
|
const host = tsModule.createCompilerHost(options, true);
|
|
60
|
-
const moduleResolutionCache = tsModule.createModuleResolutionCache(
|
|
50
|
+
const moduleResolutionCache = tsModule.createModuleResolutionCache(devkit_1.workspaceRoot, host.getCanonicalFileName);
|
|
61
51
|
return { options, host, moduleResolutionCache };
|
|
62
52
|
}
|
|
63
|
-
function getRootTsConfigPathInTree(tree) {
|
|
64
|
-
for (const path of ['tsconfig.base.json', 'tsconfig.json']) {
|
|
65
|
-
if (tree.exists(path)) {
|
|
66
|
-
return path;
|
|
67
|
-
}
|
|
68
|
-
}
|
|
69
|
-
return 'tsconfig.base.json';
|
|
70
|
-
}
|
|
71
|
-
exports.getRootTsConfigPathInTree = getRootTsConfigPathInTree;
|
|
72
|
-
function getRelativePathToRootTsConfig(tree, targetPath) {
|
|
73
|
-
return (0, devkit_1.offsetFromRoot)(targetPath) + getRootTsConfigPathInTree(tree);
|
|
74
|
-
}
|
|
75
|
-
exports.getRelativePathToRootTsConfig = getRelativePathToRootTsConfig;
|
|
76
|
-
function getRootTsConfigFileName() {
|
|
77
|
-
for (const tsConfigName of ['tsconfig.base.json', 'tsconfig.json']) {
|
|
78
|
-
const tsConfigPath = (0, path_1.join)(devkit_2.workspaceRoot, tsConfigName);
|
|
79
|
-
if ((0, fs_1.existsSync)(tsConfigPath)) {
|
|
80
|
-
return tsConfigName;
|
|
81
|
-
}
|
|
82
|
-
}
|
|
83
|
-
return null;
|
|
84
|
-
}
|
|
85
|
-
exports.getRootTsConfigFileName = getRootTsConfigFileName;
|
|
86
|
-
function getRootTsConfigPath() {
|
|
87
|
-
const tsConfigFileName = getRootTsConfigFileName();
|
|
88
|
-
return tsConfigFileName ? (0, path_1.join)(devkit_2.workspaceRoot, tsConfigFileName) : null;
|
|
89
|
-
}
|
|
90
|
-
exports.getRootTsConfigPath = getRootTsConfigPath;
|
|
91
53
|
//# sourceMappingURL=typescript.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/typescript.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/typescript.ts"],"names":[],"mappings":";;;AAAA,yCAA6C;AAC7C,+BAA+B;AAE/B,wDAA6D;AAApD,gHAAA,iBAAiB,OAAA;AAE1B,sDAAoD,CAAC,yBAAyB;AAArE,uGAAA,SAAS,OAAA;AAClB,kEAA+D;AAAtD,kHAAA,cAAc,OAAA;AAEvB,MAAM,iBAAiB,GAAG,sBAAa,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AAE5D,IAAI,QAAqC,CAAC;AAE1C,SAAS,mBAAmB,CAAC,YAAoB;IAC/C,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;KAClC;IAED,MAAM,UAAU,GAAG,QAAQ,CAAC,cAAc,CACxC,YAAY,EACZ,QAAQ,CAAC,GAAG,CAAC,QAAQ,CACtB,CAAC;IAEF,8DAA8D;IAC9D,MAAM,IAAI,GAAgC;QACxC,aAAa,EAAE,GAAG,EAAE,CAAC,EAAE;QACvB,QAAQ,EAAE,GAAG,EAAE,CAAC,EAAE;QAClB,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,UAAU;KACpC,CAAC;IAEF,OAAO,QAAQ,CAAC,0BAA0B,CACxC,UAAU,CAAC,MAAM,EACjB,IAA0B,EAC1B,IAAA,cAAO,EAAC,YAAY,CAAC,CACtB,CAAC,OAAO,CAAC;AACZ,CAAC;AAED,IAAI,YAIH,CAAC;AAEF;;;;;;GAMG;AACH,SAAgB,qBAAqB,CACnC,UAAkB,EAClB,QAAgB,EAChB,YAAoB;IAEpB,YAAY,GAAG,YAAY,IAAI,eAAe,CAAC,YAAY,CAAC,CAAC;IAC7D,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,qBAAqB,EAAE,GAAG,YAAY,CAAC;IAE9D,MAAM,EAAE,cAAc,EAAE,GAAG,QAAQ,CAAC,iBAAiB,CACnD,UAAU,EACV,QAAQ,EACR,OAAO,EACP,IAAI,EACJ,qBAAqB,CACtB,CAAC;IAEF,IAAI,CAAC,cAAc,EAAE;QACnB,OAAO;KACR;SAAM;QACL,OAAO,cAAc,CAAC,gBAAgB,CAAC,OAAO,CAAC,GAAG,iBAAiB,GAAG,EAAE,EAAE,CAAC,CAAC;KAC7E;AACH,CAAC;AArBD,sDAqBC;AAED,SAAS,eAAe,CAAC,YAAoB;IAC3C,MAAM,OAAO,GAAG,mBAAmB,CAAC,YAAY,CAAC,CAAC;IAClD,MAAM,IAAI,GAAG,QAAQ,CAAC,kBAAkB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACxD,MAAM,qBAAqB,GAAG,QAAQ,CAAC,2BAA2B,CAChE,sBAAa,EACb,IAAI,CAAC,oBAAoB,CAC1B,CAAC;IACF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,qBAAqB,EAAE,CAAC;AAClD,CAAC"}
|
package/src/utils/ast-utils.d.ts
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* found in the LICENSE file at https://angular.io/license
|
|
7
7
|
*/
|
|
8
8
|
import type { Rule, SchematicContext, Source, Tree } from '@angular-devkit/schematics';
|
|
9
|
-
import * as ts from 'typescript';
|
|
9
|
+
import type * as ts from 'typescript';
|
|
10
10
|
import type { Path } from '@angular-devkit/core';
|
|
11
11
|
import type { NxJsonConfiguration } from '@nrwl/devkit';
|
|
12
12
|
export declare function sortObjectByKeys(obj: unknown): {};
|