nx 15.3.0 → 15.3.2
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/CHANGELOG.md +1 -1
- package/package.json +4 -4
- package/src/core/graph/main.js +1 -1
- package/src/executors/run-commands/schema.json +8 -1
- package/src/lock-file/lock-file.d.ts +18 -3
- package/src/lock-file/lock-file.js +59 -11
- package/src/lock-file/lock-file.js.map +1 -1
- package/src/lock-file/npm.d.ts +2 -1
- package/src/lock-file/npm.js +117 -50
- package/src/lock-file/npm.js.map +1 -1
- package/src/lock-file/pnpm.d.ts +2 -1
- package/src/lock-file/pnpm.js +51 -22
- package/src/lock-file/pnpm.js.map +1 -1
- package/src/lock-file/utils/hashing.d.ts +7 -1
- package/src/lock-file/utils/hashing.js +8 -5
- package/src/lock-file/utils/hashing.js.map +1 -1
- package/src/lock-file/utils/lock-file-type.d.ts +1 -0
- package/src/lock-file/utils/mapping.d.ts +16 -8
- package/src/lock-file/utils/mapping.js +13 -4
- package/src/lock-file/utils/mapping.js.map +1 -1
- package/src/lock-file/utils/pruning.d.ts +13 -0
- package/src/lock-file/utils/pruning.js +50 -0
- package/src/lock-file/utils/pruning.js.map +1 -0
- package/src/lock-file/yarn.d.ts +2 -1
- package/src/lock-file/yarn.js +49 -27
- package/src/lock-file/yarn.js.map +1 -1
- package/src/tasks-runner/create-task-graph.js +6 -0
- package/src/tasks-runner/create-task-graph.js.map +1 -1
- package/src/tasks-runner/utils.js +11 -6
- package/src/tasks-runner/utils.js.map +1 -1
- package/src/utils/object-sort.js +4 -5
- package/src/utils/object-sort.js.map +1 -1
- package/src/utils/package-json.d.ts +1 -0
- package/src/utils/package-json.js.map +1 -1
- package/src/utils/params.d.ts +5 -3
- package/src/utils/params.js +47 -7
- package/src/utils/params.js.map +1 -1
- package/src/lock-file/utils/sorting.d.ts +0 -6
- package/src/lock-file/utils/sorting.js +0 -25
- package/src/lock-file/utils/sorting.js.map +0 -1
package/src/lock-file/yarn.js
CHANGED
|
@@ -4,9 +4,9 @@ exports.pruneYarnLockFile = exports.transitiveDependencyYarnLookup = exports.str
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const parsers_1 = require("@yarnpkg/parsers");
|
|
6
6
|
const lockfile_1 = require("@yarnpkg/lockfile");
|
|
7
|
-
const sorting_1 = require("./utils/sorting");
|
|
8
7
|
const mapping_1 = require("./utils/mapping");
|
|
9
8
|
const hashing_1 = require("./utils/hashing");
|
|
9
|
+
const object_sort_1 = require("../utils/object-sort");
|
|
10
10
|
const BERRY_LOCK_FILE_DISCLAIMER = `# This file was generated by Nx. Do not edit this file directly\n# Manual changes might be lost - proceed with caution!\n\n`;
|
|
11
11
|
/**
|
|
12
12
|
* Parses `yarn.lock` syml file and maps to {@link LockFileData}
|
|
@@ -17,8 +17,8 @@ const BERRY_LOCK_FILE_DISCLAIMER = `# This file was generated by Nx. Do not edit
|
|
|
17
17
|
function parseYarnLockFile(lockFile) {
|
|
18
18
|
const _a = (0, parsers_1.parseSyml)(lockFile), { __metadata } = _a, dependencies = tslib_1.__rest(_a, ["__metadata"]);
|
|
19
19
|
// Yarn Berry has workspace packages includes, so we need to extract those to metadata
|
|
20
|
-
const [mappedPackages, workspacePackages] = mapPackages(dependencies);
|
|
21
20
|
const isBerry = !!__metadata;
|
|
21
|
+
const [mappedPackages, workspacePackages] = mapPackages(dependencies, isBerry);
|
|
22
22
|
const hash = (0, hashing_1.hashString)(lockFile);
|
|
23
23
|
if (isBerry) {
|
|
24
24
|
return {
|
|
@@ -35,8 +35,27 @@ function parseYarnLockFile(lockFile) {
|
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
37
|
exports.parseYarnLockFile = parseYarnLockFile;
|
|
38
|
+
function extendVersionProperty(key, value, isBerry) {
|
|
39
|
+
if (isBerry) {
|
|
40
|
+
const packageName = key.slice(0, key.lastIndexOf('@'));
|
|
41
|
+
if (value.resolution !== `${packageName}@npm:${value.version}`) {
|
|
42
|
+
return {
|
|
43
|
+
version: value.resolution.slice(packageName.length + 1),
|
|
44
|
+
actualVersion: value.version,
|
|
45
|
+
};
|
|
46
|
+
}
|
|
47
|
+
return;
|
|
48
|
+
}
|
|
49
|
+
if (value.integrity) {
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
return {
|
|
53
|
+
version: key.slice(key.lastIndexOf('@') + 1),
|
|
54
|
+
actualVersion: value.version,
|
|
55
|
+
};
|
|
56
|
+
}
|
|
38
57
|
// map original yarn packages to the LockFileData structure
|
|
39
|
-
function mapPackages(packages) {
|
|
58
|
+
function mapPackages(packages, isBerry) {
|
|
40
59
|
const mappedPackages = {};
|
|
41
60
|
const workspacePackages = {};
|
|
42
61
|
Object.entries(packages).forEach(([keyExpr, value]) => {
|
|
@@ -48,11 +67,16 @@ function mapPackages(packages) {
|
|
|
48
67
|
else {
|
|
49
68
|
// key might be "@nrwl/somedep@1.2.3, @nrwl/somedep@^1.0.0..."
|
|
50
69
|
const keys = keyExpr.split(', ');
|
|
51
|
-
|
|
70
|
+
let packageName = keys[0].slice(0, keys[0].indexOf('@', 1));
|
|
71
|
+
if (isBerry &&
|
|
72
|
+
keys[0].startsWith(`${packageName}@patch:${packageName}`)) {
|
|
73
|
+
// handle Berry's patch format as a separate package
|
|
74
|
+
packageName = `${packageName}@patch:${packageName}`;
|
|
75
|
+
}
|
|
52
76
|
const newKey = `${packageName}@${value.version}`;
|
|
53
77
|
mappedPackages[packageName] = mappedPackages[packageName] || {};
|
|
54
78
|
if (!mappedPackages[packageName][newKey]) {
|
|
55
|
-
mappedPackages[packageName][newKey] = Object.assign(Object.assign({}, value), { packageMeta: keys });
|
|
79
|
+
mappedPackages[packageName][newKey] = Object.assign(Object.assign(Object.assign({}, value), extendVersionProperty(keys[0], value, isBerry)), { packageMeta: keys });
|
|
56
80
|
}
|
|
57
81
|
else {
|
|
58
82
|
mappedPackages[packageName][newKey].packageMeta.push(...keys);
|
|
@@ -114,7 +138,10 @@ function unmapPackages(dependencies, isBerry = false) {
|
|
|
114
138
|
const packages = {};
|
|
115
139
|
Object.values(dependencies).forEach((packageVersions) => {
|
|
116
140
|
Object.values(packageVersions).forEach((value) => {
|
|
117
|
-
const { packageMeta, rootVersion } = value, rest = tslib_1.__rest(value, ["packageMeta", "rootVersion"]);
|
|
141
|
+
const { packageMeta, rootVersion, actualVersion } = value, rest = tslib_1.__rest(value, ["packageMeta", "rootVersion", "actualVersion"]);
|
|
142
|
+
if (actualVersion) {
|
|
143
|
+
rest.version = actualVersion;
|
|
144
|
+
}
|
|
118
145
|
if (isBerry) {
|
|
119
146
|
// berry's `stringifySyml` does not combine packages
|
|
120
147
|
// we have to do it manually
|
|
@@ -144,26 +171,27 @@ exports.transitiveDependencyYarnLookup = transitiveDependencyYarnLookup;
|
|
|
144
171
|
* @param lockFileData
|
|
145
172
|
* @returns
|
|
146
173
|
*/
|
|
147
|
-
function pruneYarnLockFile(lockFileData,
|
|
174
|
+
function pruneYarnLockFile(lockFileData, normalizedPackageJson) {
|
|
148
175
|
var _a;
|
|
149
176
|
const isBerry = !!((_a = lockFileData.lockFileMetadata) === null || _a === void 0 ? void 0 : _a.__metadata);
|
|
150
|
-
const prunedDependencies = pruneDependencies(lockFileData.dependencies,
|
|
177
|
+
const prunedDependencies = pruneDependencies(lockFileData.dependencies, normalizedPackageJson);
|
|
178
|
+
const hash = (0, hashing_1.generatePrunnedHash)(lockFileData.hash, normalizedPackageJson);
|
|
151
179
|
let prunedLockFileData;
|
|
152
180
|
if (isBerry) {
|
|
153
181
|
const { __metadata, workspacePackages } = lockFileData.lockFileMetadata;
|
|
154
182
|
prunedLockFileData = {
|
|
155
183
|
lockFileMetadata: {
|
|
156
184
|
__metadata,
|
|
157
|
-
workspacePackages: pruneWorkspacePackages(workspacePackages, prunedDependencies,
|
|
185
|
+
workspacePackages: pruneWorkspacePackages(workspacePackages, prunedDependencies, normalizedPackageJson),
|
|
158
186
|
},
|
|
159
187
|
dependencies: prunedDependencies,
|
|
160
|
-
hash
|
|
188
|
+
hash,
|
|
161
189
|
};
|
|
162
190
|
}
|
|
163
191
|
else {
|
|
164
192
|
prunedLockFileData = {
|
|
165
193
|
dependencies: prunedDependencies,
|
|
166
|
-
hash
|
|
194
|
+
hash,
|
|
167
195
|
};
|
|
168
196
|
}
|
|
169
197
|
prunedLockFileData.hash = (0, hashing_1.hashString)(JSON.stringify(prunedLockFileData));
|
|
@@ -171,9 +199,9 @@ function pruneYarnLockFile(lockFileData, packages, projectName) {
|
|
|
171
199
|
}
|
|
172
200
|
exports.pruneYarnLockFile = pruneYarnLockFile;
|
|
173
201
|
// iterate over packages to collect the affected tree of dependencies
|
|
174
|
-
function pruneDependencies(dependencies,
|
|
202
|
+
function pruneDependencies(dependencies, normalizedPackageJson) {
|
|
175
203
|
const result = {};
|
|
176
|
-
|
|
204
|
+
Object.keys(Object.assign(Object.assign(Object.assign({}, normalizedPackageJson.dependencies), normalizedPackageJson.devDependencies), normalizedPackageJson.peerDependencies)).forEach((packageName) => {
|
|
177
205
|
if (dependencies[packageName]) {
|
|
178
206
|
const [key, value] = Object.entries(dependencies[packageName]).find(([, v]) => v.rootVersion);
|
|
179
207
|
result[packageName] = result[packageName] || {};
|
|
@@ -220,30 +248,24 @@ function pruneTransitiveDependencies(dependencies, prunedDeps, value) {
|
|
|
220
248
|
});
|
|
221
249
|
}
|
|
222
250
|
// prune dependencies of workspace packages from the lockFileMeta
|
|
223
|
-
function pruneWorkspacePackages(workspacePackages, prunedDependencies,
|
|
251
|
+
function pruneWorkspacePackages(workspacePackages, prunedDependencies, normalizedPackageJson) {
|
|
224
252
|
var _a;
|
|
225
253
|
const result = {};
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
workspaceProjKey =
|
|
229
|
-
Object.keys(workspacePackages).find((key) => key.startsWith(`${projectName}@workspace:`)) || `${projectName}@workspace:^`;
|
|
230
|
-
}
|
|
231
|
-
else {
|
|
232
|
-
workspaceProjKey = Object.keys(workspacePackages).find((key) => key.indexOf('@workspace:.') !== -1);
|
|
233
|
-
}
|
|
254
|
+
const name = normalizedPackageJson.name;
|
|
255
|
+
const workspaceProjKey = Object.keys(workspacePackages).find((key) => key.startsWith(`${name}@workspace:`)) || `${name}@workspace:^`;
|
|
234
256
|
if (workspaceProjKey) {
|
|
235
|
-
const prunedWorkspaceDependencies = pruneWorkspacePackageDependencies(((_a = workspacePackages[workspaceProjKey]) === null || _a === void 0 ? void 0 : _a.dependencies) || {},
|
|
257
|
+
const prunedWorkspaceDependencies = pruneWorkspacePackageDependencies(((_a = workspacePackages[workspaceProjKey]) === null || _a === void 0 ? void 0 : _a.dependencies) || {}, normalizedPackageJson, prunedDependencies);
|
|
236
258
|
result[workspaceProjKey] = {
|
|
237
|
-
version: '0.0.0-use.local
|
|
259
|
+
version: `${normalizedPackageJson.version || '0.0.0'}-use.local`,
|
|
238
260
|
resolution: workspaceProjKey,
|
|
239
261
|
languageName: 'unknown',
|
|
240
262
|
linkType: 'soft',
|
|
241
|
-
dependencies: (0,
|
|
263
|
+
dependencies: (0, object_sort_1.sortObjectByKeys)(prunedWorkspaceDependencies),
|
|
242
264
|
};
|
|
243
265
|
}
|
|
244
266
|
return result;
|
|
245
267
|
}
|
|
246
|
-
function pruneWorkspacePackageDependencies(dependencies,
|
|
268
|
+
function pruneWorkspacePackageDependencies(dependencies, normalizedPackageJson, prunedDependencies) {
|
|
247
269
|
const result = {};
|
|
248
270
|
Object.entries(dependencies).forEach(([packageName, packageVersion]) => {
|
|
249
271
|
if (isPackageVersionMatch(prunedDependencies[packageName], packageName, packageVersion)) {
|
|
@@ -251,7 +273,7 @@ function pruneWorkspacePackageDependencies(dependencies, packages, prunedDepende
|
|
|
251
273
|
}
|
|
252
274
|
});
|
|
253
275
|
// add all missing deps to root workspace package
|
|
254
|
-
|
|
276
|
+
Object.keys(Object.assign(Object.assign(Object.assign({}, normalizedPackageJson.dependencies), normalizedPackageJson.devDependencies), normalizedPackageJson.peerDependencies)).forEach((p) => {
|
|
255
277
|
if (!result[p]) {
|
|
256
278
|
// extract first version expression from package's structure
|
|
257
279
|
const metaVersion = Object.values(prunedDependencies[p])[0]
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../../../packages/nx/src/lock-file/yarn.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../../../packages/nx/src/lock-file/yarn.ts"],"names":[],"mappings":"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"}
|
|
@@ -94,6 +94,12 @@ class ProcessTasks {
|
|
|
94
94
|
}
|
|
95
95
|
}
|
|
96
96
|
createTask(id, project, target, resolvedConfiguration, overrides) {
|
|
97
|
+
if (!project.data.targets[target]) {
|
|
98
|
+
throw new Error(`Cannot find configuration for task ${project.name}:${target}`);
|
|
99
|
+
}
|
|
100
|
+
if (!project.data.targets[target].executor) {
|
|
101
|
+
throw new Error(`Target "${project.name}:${target}" does not have an executor configured`);
|
|
102
|
+
}
|
|
97
103
|
const qualifiedTarget = {
|
|
98
104
|
project: project.name,
|
|
99
105
|
target,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-task-graph.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/create-task-graph.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"create-task-graph.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/create-task-graph.ts"],"names":[],"mappings":"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"}
|
|
@@ -143,9 +143,17 @@ function getOutputsForTargetAndConfiguration(task, node) {
|
|
|
143
143
|
}
|
|
144
144
|
exports.getOutputsForTargetAndConfiguration = getOutputsForTargetAndConfiguration;
|
|
145
145
|
function interpolate(template, data) {
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
146
|
+
if (template.includes('{workspaceRoot}', 1)) {
|
|
147
|
+
throw new Error(`Output '${template}' is invalid. {workspaceRoot} can only be used at the beginning of the expression.`);
|
|
148
|
+
}
|
|
149
|
+
if (data.projectRoot == '.' && template.includes('{projectRoot}', 1)) {
|
|
150
|
+
throw new Error(`Output '${template}' is invalid. When {projectRoot} is '.', it can only be used at the beginning of the expression.`);
|
|
151
|
+
}
|
|
152
|
+
let res = template.replace('{workspaceRoot}/', '');
|
|
153
|
+
if (data.projectRoot == '.') {
|
|
154
|
+
res = template.replace('{projectRoot}/', '');
|
|
155
|
+
}
|
|
156
|
+
return res.replace(/{([\s\S]+?)}/g, (match) => {
|
|
149
157
|
let value = data;
|
|
150
158
|
let path = match.slice(1, -1).trim().split('.');
|
|
151
159
|
for (let idx = 0; idx < path.length; idx++) {
|
|
@@ -165,9 +173,6 @@ function getExecutorNameForTask(task, nxJson, projectGraph) {
|
|
|
165
173
|
project.targets = (0, project_graph_utils_1.mergeNpmScriptsWithTargets)(projectRoot, project.targets);
|
|
166
174
|
}
|
|
167
175
|
project.targets = (0, nx_plugin_1.mergePluginTargetsWithNxTargets)(project.root, project.targets, (0, nx_plugin_1.loadNxPlugins)(nxJson.plugins));
|
|
168
|
-
if (!project.targets[task.target.target]) {
|
|
169
|
-
throw new Error(`Cannot find configuration for task ${task.target.project}:${task.target.target}`);
|
|
170
|
-
}
|
|
171
176
|
return project.targets[task.target.target].executor;
|
|
172
177
|
}
|
|
173
178
|
exports.getExecutorNameForTask = getExecutorNameForTask;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/utils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/utils.ts"],"names":[],"mappings":"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"}
|
package/src/utils/object-sort.js
CHANGED
|
@@ -2,11 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.sortObjectByKeys = void 0;
|
|
4
4
|
function sortObjectByKeys(originalObject) {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
}, {});
|
|
5
|
+
const keys = Object.keys(originalObject).sort();
|
|
6
|
+
const sortedObject = {};
|
|
7
|
+
keys.forEach((key) => (sortedObject[key] = originalObject[key]));
|
|
8
|
+
return sortedObject;
|
|
10
9
|
}
|
|
11
10
|
exports.sortObjectByKeys = sortObjectByKeys;
|
|
12
11
|
//# sourceMappingURL=object-sort.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"object-sort.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/object-sort.ts"],"names":[],"mappings":";;;AAAA,SAAgB,gBAAgB,CAAC,cAAsB;IACrD,
|
|
1
|
+
{"version":3,"file":"object-sort.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/object-sort.ts"],"names":[],"mappings":";;;AAAA,SAAgB,gBAAgB,CAAC,cAAsB;IACrD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI,EAAE,CAAC;IAEhD,MAAM,YAAY,GAAG,EAAE,CAAC;IACxB,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAEjE,OAAO,YAAY,CAAC;AACtB,CAAC;AAPD,4CAOC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-json.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/package-json.ts"],"names":[],"mappings":";;;AAAA,2BAAgC;AAChC,+BAAqC;AAKrC,2CAA2C;AAC3C,qDAAiD;
|
|
1
|
+
{"version":3,"file":"package-json.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/package-json.ts"],"names":[],"mappings":"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"}
|
package/src/utils/params.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ declare type PropertyDescription = {
|
|
|
4
4
|
type?: string | string[];
|
|
5
5
|
required?: string[];
|
|
6
6
|
enum?: string[];
|
|
7
|
-
properties?:
|
|
7
|
+
properties?: Properties;
|
|
8
8
|
oneOf?: PropertyDescription[];
|
|
9
9
|
anyOf?: PropertyDescription[];
|
|
10
10
|
allOf?: PropertyDescription[];
|
|
@@ -50,6 +50,8 @@ declare type Properties = {
|
|
|
50
50
|
export declare type Schema = {
|
|
51
51
|
properties: Properties;
|
|
52
52
|
required?: string[];
|
|
53
|
+
anyOf?: Partial<Schema>[];
|
|
54
|
+
oneOf?: Partial<Schema>[];
|
|
53
55
|
description?: string;
|
|
54
56
|
definitions?: Properties;
|
|
55
57
|
additionalProperties?: boolean;
|
|
@@ -94,8 +96,8 @@ export declare function validateOptsAgainstSchema(opts: {
|
|
|
94
96
|
[k: string]: any;
|
|
95
97
|
}, schema: Schema): void;
|
|
96
98
|
export declare function validateObject(opts: {
|
|
97
|
-
[
|
|
98
|
-
},
|
|
99
|
+
[p: string]: any;
|
|
100
|
+
}, schema: Schema | PropertyDescription, definitions: Properties): void;
|
|
99
101
|
export declare function setDefaults(opts: {
|
|
100
102
|
[k: string]: any;
|
|
101
103
|
}, schema: Schema): {
|
package/src/utils/params.js
CHANGED
|
@@ -143,18 +143,57 @@ class SchemaError {
|
|
|
143
143
|
}
|
|
144
144
|
exports.SchemaError = SchemaError;
|
|
145
145
|
function validateOptsAgainstSchema(opts, schema) {
|
|
146
|
-
validateObject(opts, schema
|
|
146
|
+
validateObject(opts, schema, schema.definitions || {});
|
|
147
147
|
}
|
|
148
148
|
exports.validateOptsAgainstSchema = validateOptsAgainstSchema;
|
|
149
|
-
function validateObject(opts,
|
|
150
|
-
|
|
149
|
+
function validateObject(opts, schema, definitions) {
|
|
150
|
+
var _a;
|
|
151
|
+
if (schema.anyOf) {
|
|
152
|
+
const errors = [];
|
|
153
|
+
for (const s of schema.anyOf) {
|
|
154
|
+
try {
|
|
155
|
+
validateObject(opts, s, definitions);
|
|
156
|
+
}
|
|
157
|
+
catch (e) {
|
|
158
|
+
errors.push(e);
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
if (errors.length > 0) {
|
|
162
|
+
throw new Error(`Options did not match schema. Please fix any of the following errors:\n${errors
|
|
163
|
+
.map((e) => ' - ' + e.message)
|
|
164
|
+
.join('\n')}`);
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
if (schema.oneOf) {
|
|
168
|
+
for (const s of schema.oneOf) {
|
|
169
|
+
const errors = [];
|
|
170
|
+
for (const s of schema.oneOf) {
|
|
171
|
+
try {
|
|
172
|
+
validateObject(opts, s, definitions);
|
|
173
|
+
}
|
|
174
|
+
catch (e) {
|
|
175
|
+
errors.push(e);
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
if (errors.length === schema.oneOf.length) {
|
|
179
|
+
throw new Error(`Options did not match schema. Please fix 1 of the following errors:\n${errors
|
|
180
|
+
.map((e) => ' - ' + e.message)
|
|
181
|
+
.join('\n')}`);
|
|
182
|
+
}
|
|
183
|
+
if (errors.length < schema.oneOf.length - 1) {
|
|
184
|
+
// TODO: This error could be better.
|
|
185
|
+
throw new Error(`Options did not match schema.`);
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
((_a = schema.required) !== null && _a !== void 0 ? _a : []).forEach((p) => {
|
|
151
190
|
if (opts[p] === undefined) {
|
|
152
191
|
throw new SchemaError(`Required property '${p}' is missing`);
|
|
153
192
|
}
|
|
154
193
|
});
|
|
155
|
-
if (additionalProperties === false) {
|
|
194
|
+
if (schema.additionalProperties === false) {
|
|
156
195
|
Object.keys(opts).find((p) => {
|
|
157
|
-
if (Object.keys(properties).indexOf(p) === -1) {
|
|
196
|
+
if (Object.keys(schema.properties).indexOf(p) === -1) {
|
|
158
197
|
if (p === '_') {
|
|
159
198
|
throw new SchemaError(`Schema does not support positional arguments. Argument '${opts[p]}' found`);
|
|
160
199
|
}
|
|
@@ -165,7 +204,8 @@ function validateObject(opts, properties, required, additionalProperties, defini
|
|
|
165
204
|
});
|
|
166
205
|
}
|
|
167
206
|
Object.keys(opts).forEach((p) => {
|
|
168
|
-
|
|
207
|
+
var _a;
|
|
208
|
+
validateProperty(p, opts[p], ((_a = schema.properties) !== null && _a !== void 0 ? _a : {})[p], definitions);
|
|
169
209
|
});
|
|
170
210
|
}
|
|
171
211
|
exports.validateObject = validateObject;
|
|
@@ -291,7 +331,7 @@ function validateProperty(propName, value, schema, definitions) {
|
|
|
291
331
|
else {
|
|
292
332
|
if (schema.type !== 'object')
|
|
293
333
|
throwInvalidSchema(propName, schema);
|
|
294
|
-
validateObject(value, schema
|
|
334
|
+
validateObject(value, schema, definitions);
|
|
295
335
|
}
|
|
296
336
|
}
|
|
297
337
|
/**
|
package/src/utils/params.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"params.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/params.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"params.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/params.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Simple sort function to ensure keys are ordered alphabetically
|
|
3
|
-
* @param obj
|
|
4
|
-
* @returns
|
|
5
|
-
*/
|
|
6
|
-
export declare function sortObject<T = string>(obj: Record<string, T>, valueTransformator?: (value: T) => any, descending?: boolean, sortFunction?: (a: string, b: string) => number): Record<string, T> | undefined;
|