@lerna-lite/core 4.4.0 → 4.5.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/dist/models/interfaces.d.ts +1 -0
- package/dist/package.js +3 -8
- package/dist/package.js.map +1 -1
- package/dist/project/project.js +24 -35
- package/dist/project/project.js.map +1 -1
- package/dist/utils/collect-updates/lib/make-diff-predicate.js +38 -9
- package/dist/utils/collect-updates/lib/make-diff-predicate.js.map +1 -1
- package/dist/utils/query-graph.d.ts +1 -1
- package/dist/utils/query-graph.js +2 -2
- package/dist/utils/query-graph.js.map +1 -1
- package/dist/utils/run-topologically.d.ts +1 -1
- package/dist/utils/run-topologically.js +2 -2
- package/dist/utils/run-topologically.js.map +1 -1
- package/package.json +3 -4
|
@@ -116,6 +116,7 @@ export interface QueryGraphConfig {
|
|
|
116
116
|
localDependencies?: 'auto' | 'force' | 'explicit';
|
|
117
117
|
rejectCycles?: boolean;
|
|
118
118
|
premajorVersionBump?: 'default' | 'force-patch';
|
|
119
|
+
npmClient?: NpmClient;
|
|
119
120
|
}
|
|
120
121
|
export interface TopologicalConfig extends QueryGraphConfig {
|
|
121
122
|
concurrency?: number;
|
package/dist/package.js
CHANGED
|
@@ -215,14 +215,9 @@ export class Package {
|
|
|
215
215
|
depCollection[depName] = `${rangePrefix || ''}${depVersion}`;
|
|
216
216
|
}
|
|
217
217
|
if (updatedByCommand === 'publish') {
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
else if (workspaceSpec === 'workspace:~') {
|
|
222
|
-
depCollection[depName] = `~${depVersion}`;
|
|
223
|
-
}
|
|
224
|
-
else if (workspaceSpec === 'workspace:^') {
|
|
225
|
-
depCollection[depName] = `^${depVersion}`;
|
|
218
|
+
const [_, wspecPrefix, wspecSemver] = workspaceSpec.match(/^workspace:([*~^])?(.*)$/) || [];
|
|
219
|
+
if (wspecPrefix && !wspecSemver) {
|
|
220
|
+
depCollection[depName] = wspecPrefix === '*' ? depVersion : `${wspecPrefix}${depVersion}`;
|
|
226
221
|
}
|
|
227
222
|
}
|
|
228
223
|
else {
|
package/dist/package.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package.js","sourceRoot":"","sources":["../src/package.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"package.js","sourceRoot":"","sources":["../src/package.ts"],"names":[],"mappings":"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"}
|
package/dist/project/project.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { writeFileSync } from 'node:fs';
|
|
2
2
|
import { basename, dirname, join, normalize, resolve as pathResolve } from 'node:path';
|
|
3
3
|
import { log } from '@lerna-lite/npmlog';
|
|
4
|
-
import { cosmiconfigSync, defaultLoaders } from 'cosmiconfig';
|
|
5
4
|
import dedent from 'dedent';
|
|
6
5
|
import globParent from 'glob-parent';
|
|
7
6
|
import JSON5 from 'json5';
|
|
7
|
+
import { lilconfigSync } from 'lilconfig';
|
|
8
8
|
import { loadJsonFile, loadJsonFileSync } from 'load-json-file';
|
|
9
9
|
import pMap from 'p-map';
|
|
10
10
|
import { globSync } from 'tinyglobby';
|
|
@@ -16,50 +16,39 @@ import { applyExtends } from './lib/apply-extends.js';
|
|
|
16
16
|
import { makeFileFinder, makeSyncFileFinder } from './lib/make-file-finder.js';
|
|
17
17
|
export class Project {
|
|
18
18
|
constructor(cwd) {
|
|
19
|
-
let
|
|
19
|
+
let loaded;
|
|
20
20
|
try {
|
|
21
|
-
explorer =
|
|
21
|
+
const explorer = lilconfigSync('lerna', {
|
|
22
|
+
searchPlaces: ['package.json', 'lerna.json', 'lerna.jsonc', 'lerna.json5'],
|
|
22
23
|
loaders: {
|
|
23
|
-
|
|
24
|
-
'.
|
|
25
|
-
'.
|
|
26
|
-
'.json5': this.json5Loader,
|
|
27
|
-
},
|
|
28
|
-
searchPlaces: ['lerna.json', 'lerna.jsonc', 'lerna.json5', 'package.json'],
|
|
29
|
-
searchStrategy: 'global',
|
|
30
|
-
transform(obj) {
|
|
31
|
-
if (!obj) {
|
|
32
|
-
return {
|
|
33
|
-
config: {},
|
|
34
|
-
configNotFound: true,
|
|
35
|
-
filepath: pathResolve(cwd || '.', 'lerna.json'),
|
|
36
|
-
};
|
|
37
|
-
}
|
|
38
|
-
obj.config = applyExtends(obj.config, dirname(obj.filepath));
|
|
39
|
-
return obj;
|
|
24
|
+
'.json': this.json5Loader.bind(this),
|
|
25
|
+
'.jsonc': this.json5Loader.bind(this),
|
|
26
|
+
'.json5': this.json5Loader.bind(this),
|
|
40
27
|
},
|
|
41
28
|
});
|
|
29
|
+
loaded = explorer.search(cwd);
|
|
42
30
|
}
|
|
43
31
|
catch (err) {
|
|
44
|
-
if (err.name === 'JSONError') {
|
|
45
|
-
throw new ValidationError(
|
|
32
|
+
if (err.name === 'JSONError' || err.name === 'SyntaxError') {
|
|
33
|
+
throw new ValidationError('JSONError', err.message);
|
|
46
34
|
}
|
|
47
35
|
throw err;
|
|
48
36
|
}
|
|
49
|
-
let loaded;
|
|
50
|
-
|
|
51
|
-
|
|
37
|
+
let configObj = loaded?.config;
|
|
38
|
+
let configNotFound = !loaded;
|
|
39
|
+
const filepath = loaded?.filepath ?? pathResolve(cwd || '.', 'lerna.json');
|
|
40
|
+
if (configObj) {
|
|
41
|
+
configObj = applyExtends(configObj, dirname(filepath));
|
|
42
|
+
configNotFound = false;
|
|
52
43
|
}
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
}
|
|
57
|
-
throw err;
|
|
44
|
+
else {
|
|
45
|
+
configObj = {};
|
|
46
|
+
configNotFound = true;
|
|
58
47
|
}
|
|
59
|
-
this.config =
|
|
60
|
-
this.configNotFound =
|
|
61
|
-
this.rootConfigLocation =
|
|
62
|
-
this.rootPath = dirname(
|
|
48
|
+
this.config = configObj;
|
|
49
|
+
this.configNotFound = configNotFound;
|
|
50
|
+
this.rootConfigLocation = filepath;
|
|
51
|
+
this.rootPath = dirname(filepath);
|
|
63
52
|
log.verbose('rootPath', this.rootPath);
|
|
64
53
|
}
|
|
65
54
|
static getPackages(cwd) {
|
|
@@ -159,7 +148,7 @@ export class Project {
|
|
|
159
148
|
}
|
|
160
149
|
json5Loader(filepath, content) {
|
|
161
150
|
if (!/.*lerna\.json[c|5]?$/gi.test(filepath)) {
|
|
162
|
-
return
|
|
151
|
+
return JSON.parse(content);
|
|
163
152
|
}
|
|
164
153
|
return looselyJsonParse(content, filepath);
|
|
165
154
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../src/project/project.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,WAAW,CAAC;AAEvF,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AACzC,OAAO,
|
|
1
|
+
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../src/project/project.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,40 @@
|
|
|
1
1
|
import { existsSync, readFileSync } from 'node:fs';
|
|
2
|
-
import { dirname, join, relative } from 'node:path';
|
|
2
|
+
import { basename, dirname, join, relative } from 'node:path';
|
|
3
3
|
import { log } from '@lerna-lite/npmlog';
|
|
4
|
-
import { filter as minimatchFilter } from 'minimatch';
|
|
5
4
|
import slash from 'slash';
|
|
6
5
|
import { globSync } from 'tinyglobby';
|
|
6
|
+
import zeptomatch from 'zeptomatch';
|
|
7
7
|
import { execSync } from '../../../child-process.js';
|
|
8
8
|
import { diffCatalogs, extractCatalogConfigFromPkg, extractCatalogConfigFromYaml, } from '../../catalog-utils.js';
|
|
9
|
+
function matchGlobstar(pattern, filePath) {
|
|
10
|
+
const patternParts = pattern.split('**/');
|
|
11
|
+
const filePathParts = filePath.split('/');
|
|
12
|
+
function matchPattern(patternParts, filePathParts) {
|
|
13
|
+
if (patternParts.length === 0) {
|
|
14
|
+
return true;
|
|
15
|
+
}
|
|
16
|
+
if (patternParts.length > filePathParts.length) {
|
|
17
|
+
return false;
|
|
18
|
+
}
|
|
19
|
+
const patternPart = patternParts[0];
|
|
20
|
+
const filePathPart = filePathParts[0];
|
|
21
|
+
if (patternPart === '') {
|
|
22
|
+
return matchPattern(patternParts.slice(1), filePathParts);
|
|
23
|
+
}
|
|
24
|
+
if (zeptomatch(patternPart, filePathPart)) {
|
|
25
|
+
return matchPattern(patternParts.slice(1), filePathParts.slice(1));
|
|
26
|
+
}
|
|
27
|
+
return matchPattern(patternParts, filePathParts.slice(1));
|
|
28
|
+
}
|
|
29
|
+
return matchPattern(patternParts, filePathParts);
|
|
30
|
+
}
|
|
9
31
|
export function makeDiffPredicate(committish, execOpts, ignorePatterns = [], changedCatalogDeps = [], diffOpts) {
|
|
10
|
-
const ignoreFilters = new Set(ignorePatterns.map((p) =>
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
32
|
+
const ignoreFilters = new Set(ignorePatterns.map((p) => (str) => {
|
|
33
|
+
if (p.includes('**/')) {
|
|
34
|
+
return !matchGlobstar(p, str);
|
|
35
|
+
}
|
|
36
|
+
return !zeptomatch(p, basename(str));
|
|
37
|
+
}));
|
|
14
38
|
if (ignoreFilters.size) {
|
|
15
39
|
log.info('ignoring diff in paths matching', ignorePatterns.join(' '));
|
|
16
40
|
}
|
|
@@ -25,9 +49,14 @@ export function makeDiffPredicate(committish, execOpts, ignorePatterns = [], cha
|
|
|
25
49
|
log.silly('found diff in', diff);
|
|
26
50
|
let changedFiles = diff.split('\n');
|
|
27
51
|
if (ignoreFilters.size) {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
52
|
+
changedFiles = changedFiles.filter((file) => {
|
|
53
|
+
for (const ignored of ignoreFilters) {
|
|
54
|
+
if (!ignored(file)) {
|
|
55
|
+
return false;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
return true;
|
|
59
|
+
});
|
|
31
60
|
}
|
|
32
61
|
hasDiff = changedFiles.length > 0;
|
|
33
62
|
if (hasDiff) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"make-diff-predicate.js","sourceRoot":"","sources":["../../../../src/utils/collect-updates/lib/make-diff-predicate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"make-diff-predicate.js","sourceRoot":"","sources":["../../../../src/utils/collect-updates/lib/make-diff-predicate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE9D,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AACzC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,UAAU,MAAM,YAAY,CAAC;AAEpC,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAGrD,OAAO,EAEL,YAAY,EACZ,2BAA2B,EAC3B,4BAA4B,GAC7B,MAAM,wBAAwB,CAAC;AAUhC,SAAS,aAAa,CAAC,OAAe,EAAE,QAAgB;IACtD,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC1C,MAAM,aAAa,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE1C,SAAS,YAAY,CAAC,YAAsB,EAAE,aAAuB;QACnE,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9B,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,YAAY,CAAC,MAAM,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC;YAC/C,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,WAAW,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QACpC,MAAM,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QAEtC,IAAI,WAAW,KAAK,EAAE,EAAE,CAAC;YACvB,OAAO,YAAY,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,UAAU,CAAC,WAAW,EAAE,YAAY,CAAC,EAAE,CAAC;YAC1C,OAAO,YAAY,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACrE,CAAC;QAED,OAAO,YAAY,CAAC,YAAY,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO,YAAY,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;AACnD,CAAC;AAUD,MAAM,UAAU,iBAAiB,CAC/B,UAAkB,EAClB,QAAkB,EAClB,iBAA2B,EAAE,EAC7B,qBAA+B,EAAE,EACjC,QAA8C;IAE9C,MAAM,aAAa,GAAG,IAAI,GAAG,CAC3B,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,EAAE;QAChC,IAAI,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACtB,OAAO,CAAC,aAAa,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAChC,CAAC;QACD,OAAO,CAAC,UAAU,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IACvC,CAAC,CAAC,CACH,CAAC;IAEF,IAAI,aAAa,CAAC,IAAI,EAAE,CAAC;QACvB,GAAG,CAAC,IAAI,CAAC,iCAAiC,EAAE,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,OAAO,SAAS,2BAA2B,CAAC,IAAsB;QAChE,IAAI,OAAO,GAAG,IAAI,CAAC;QACnB,MAAM,IAAI,GAAG,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAExE,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC;YAChB,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,qBAAqB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAChD,OAAO,GAAG,KAAK,CAAC;QAClB,CAAC;QAED,IAAI,OAAO,EAAE,CAAC;YACZ,GAAG,CAAC,KAAK,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;YACjC,IAAI,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAEpC,IAAI,aAAa,CAAC,IAAI,EAAE,CAAC;gBACvB,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;oBAC1C,KAAK,MAAM,OAAO,IAAI,aAAa,EAAE,CAAC;wBACpC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;4BACnB,OAAO,KAAK,CAAC;wBACf,CAAC;oBACH,CAAC;oBACD,OAAO,IAAI,CAAC;gBACd,CAAC,CAAC,CAAC;YACL,CAAC;YAED,OAAO,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC;YAElC,IAAI,OAAO,EAAE,CAAC;gBACZ,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YACvD,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,uCAAuC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACtE,CAAC;QACH,CAAC;QAGD,IACE,CAAC,OAAO;YACR,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBAC9F,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAC/F,CAAC;YACD,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,kDAAkD,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7E,OAAO,GAAG,IAAI,CAAC;QACjB,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;AACJ,CAAC;AAOD,SAAS,WAAW,CAAC,UAAkB,EAAE,QAAgB,EAAE,QAAkB,EAAE,QAA8C;IAC3H,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC;IACjD,MAAM,iBAAiB,GAAG,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC;IAElE,IAAI,iBAAiB,EAAE,CAAC;QAEtB,IAAI,sBAAsB,GAAa,EAAE,CAAC;QAG1C,IAAI,QAAQ,EAAE,sBAAsB,EAAE,CAAC;YACrC,sBAAsB,GAAG,QAAQ,CAAC,mBAAmB,EAAE;gBACrD,GAAG,EAAE,iBAAiB;gBACtB,eAAe,EAAE,KAAK;gBACtB,MAAM,EAAE,CAAC,oBAAoB,CAAC;aAC/B,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC9D,CAAC;QAGD,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,iBAAiB,EAAE,GAAG,sBAAsB,CAAC,CAAC;IAChE,CAAC;IAED,GAAG,CAAC,KAAK,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;IAC9C,OAAO,QAAQ,CAAC,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;AACzC,CAAC;AAOD,MAAM,UAAU,oBAAoB,CAAC,OAAe,EAAE,SAAoB;IACxE,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAC1B,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,qBAAqB,CAAC,CAAC;QAClD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;QAE3C,IAAI,UAAU,GAAkB,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;QAC9D,IAAI,UAAU,GAAkB,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;QAE9D,IAAI,SAAS,KAAK,MAAM,IAAI,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAEjD,MAAM,WAAW,GAAG,QAAQ,CAAC,YAAY,OAAO,sBAAsB,CAAC,CAAC;YACxE,MAAM,WAAW,GAAG,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YACnD,UAAU,GAAG,4BAA4B,CAAC,WAAW,CAAC,CAAC;YACvD,UAAU,GAAG,4BAA4B,CAAC,WAAW,CAAC,CAAC;QACzD,CAAC;aAAM,IAAI,SAAS,KAAK,KAAK,IAAI,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAEvD,MAAM,WAAW,GAAG,QAAQ,CAAC,YAAY,OAAO,eAAe,CAAC,CAAC;YACjE,MAAM,WAAW,GAAG,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YACnD,UAAU,GAAG,2BAA2B,CAAC,WAAW,CAAC,CAAC;YACtD,UAAU,GAAG,2BAA2B,CAAC,WAAW,CAAC,CAAC;QACxD,CAAC;aAAM,CAAC;YAEN,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;IAC1D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC"}
|
|
@@ -6,7 +6,7 @@ export declare class QueryGraph {
|
|
|
6
6
|
graph: PackageGraph;
|
|
7
7
|
cycles: Set<any>;
|
|
8
8
|
static toposort(packages: Package[], options?: QueryGraphConfig): Package[];
|
|
9
|
-
constructor(packages: Package[], { graphType, localDependencies, rejectCycles }?: QueryGraphConfig);
|
|
9
|
+
constructor(packages: Package[], { graphType, localDependencies, rejectCycles, npmClient }?: QueryGraphConfig);
|
|
10
10
|
_getNextLeaf(): PackageGraphNode[];
|
|
11
11
|
_getNextCycle(): any;
|
|
12
12
|
getAvailablePackages(): PackageGraphNode[];
|
|
@@ -13,8 +13,8 @@ export class QueryGraph {
|
|
|
13
13
|
}
|
|
14
14
|
return result;
|
|
15
15
|
}
|
|
16
|
-
constructor(packages, { graphType = 'allDependencies', localDependencies = 'auto', rejectCycles } = {}) {
|
|
17
|
-
this.graph = new PackageGraph(packages, graphType, localDependencies);
|
|
16
|
+
constructor(packages, { graphType = 'allDependencies', localDependencies = 'auto', rejectCycles, npmClient } = {}) {
|
|
17
|
+
this.graph = new PackageGraph(packages, graphType, localDependencies, npmClient);
|
|
18
18
|
this.cycles = this.graph.collapseCycles(rejectCycles);
|
|
19
19
|
}
|
|
20
20
|
_getNextLeaf() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-graph.js","sourceRoot":"","sources":["../../src/utils/query-graph.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAKjE,MAAM,OAAO,UAAU;IAYrB,MAAM,CAAC,QAAQ,CAAC,QAAmB,EAAE,OAA0B;QAC7D,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAChD,MAAM,MAAM,GAAc,EAAE,CAAC;QAE7B,IAAI,KAAK,GAAG,KAAK,CAAC,oBAAoB,EAAE,CAAC;QAEzC,OAAO,KAAK,CAAC,MAAM,EAAE,CAAC;YACpB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBAGzB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACtB,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACzB,CAAC;YAED,KAAK,GAAG,KAAK,CAAC,oBAAoB,EAAE,CAAC;QACvC,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAMD,YACE,QAAmB,EACnB,EAAE,SAAS,GAAG,iBAAiB,EAAE,iBAAiB,GAAG,MAAM,EAAE,YAAY,KAAK,EAAsB;
|
|
1
|
+
{"version":3,"file":"query-graph.js","sourceRoot":"","sources":["../../src/utils/query-graph.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAKjE,MAAM,OAAO,UAAU;IAYrB,MAAM,CAAC,QAAQ,CAAC,QAAmB,EAAE,OAA0B;QAC7D,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAChD,MAAM,MAAM,GAAc,EAAE,CAAC;QAE7B,IAAI,KAAK,GAAG,KAAK,CAAC,oBAAoB,EAAE,CAAC;QAEzC,OAAO,KAAK,CAAC,MAAM,EAAE,CAAC;YACpB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBAGzB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACtB,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACzB,CAAC;YAED,KAAK,GAAG,KAAK,CAAC,oBAAoB,EAAE,CAAC;QACvC,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAMD,YACE,QAAmB,EACnB,EAAE,SAAS,GAAG,iBAAiB,EAAE,iBAAiB,GAAG,MAAM,EAAE,YAAY,EAAE,SAAS,KAAK,EAAsB;QAG/G,IAAI,CAAC,KAAK,GAAG,IAAI,YAAY,CAAC,QAAQ,EAAE,SAA+C,EAAE,iBAAiB,EAAE,SAAS,CAAC,CAAC;QAGvH,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;IACxD,CAAC;IAED,YAAY;QACV,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;IAC7F,CAAC;IAED,aAAa;QACX,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,iBAAiB,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;QAElG,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAE1B,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC;IACzB,CAAC;IAED,oBAAoB;QAElB,MAAM,iBAAiB,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAE9C,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACjC,OAAO,iBAAiB,CAAC;QAC3B,CAAC;QAED,OAAO,IAAI,CAAC,aAAa,EAAE,CAAC;IAC9B,CAAC;IAKD,WAAW,CAAC,IAAY;QACtB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAKD,UAAU,CAAC,aAA+B;QACxC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAEjC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChC,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;CACF"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { TopologicalConfig } from '../models/interfaces.js';
|
|
2
2
|
import type { Package } from '../package.js';
|
|
3
|
-
export declare function runTopologically<T = any>(packages: Package[], runner: (pkg: Package) => Promise<T>, { concurrency, graphType, rejectCycles }?: TopologicalConfig): Promise<unknown>;
|
|
3
|
+
export declare function runTopologically<T = any>(packages: Package[], runner: (pkg: Package) => Promise<T>, { concurrency, graphType, rejectCycles, npmClient }?: TopologicalConfig): Promise<unknown>;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import PQueue from 'p-queue';
|
|
2
2
|
import { QueryGraph } from './query-graph.js';
|
|
3
|
-
export function runTopologically(packages, runner, { concurrency, graphType, rejectCycles } = {}) {
|
|
3
|
+
export function runTopologically(packages, runner, { concurrency, graphType, rejectCycles, npmClient = 'npm' } = {}) {
|
|
4
4
|
const queue = new PQueue({ concurrency });
|
|
5
|
-
const graph = new QueryGraph(packages, { graphType, rejectCycles });
|
|
5
|
+
const graph = new QueryGraph(packages, { graphType, rejectCycles, npmClient });
|
|
6
6
|
return new Promise((resolve, reject) => {
|
|
7
7
|
const returnValues = [];
|
|
8
8
|
const queueNextAvailablePackages = () => graph.getAvailablePackages().forEach(({ pkg, name }) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-topologically.js","sourceRoot":"","sources":["../../src/utils/run-topologically.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,SAAS,CAAC;AAK7B,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAW9C,MAAM,UAAU,gBAAgB,CAC9B,QAAmB,EACnB,MAAoC,EACpC,EAAE,WAAW,EAAE,SAAS,EAAE,YAAY,KAAK,EAAuB;
|
|
1
|
+
{"version":3,"file":"run-topologically.js","sourceRoot":"","sources":["../../src/utils/run-topologically.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,SAAS,CAAC;AAK7B,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAW9C,MAAM,UAAU,gBAAgB,CAC9B,QAAmB,EACnB,MAAoC,EACpC,EAAE,WAAW,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,GAAG,KAAK,KAAK,EAAuB;IAErF,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;IAC1C,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC,CAAC;IAE/E,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,YAAY,GAAU,EAAE,CAAC;QAE/B,MAAM,0BAA0B,GAAG,GAAG,EAAE,CACtC,KAAK,CAAC,oBAAoB,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE;YACrD,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YAExB,KAAK;iBACF,GAAG,CAAC,GAAG,EAAE,CACR,MAAM,CAAC,GAAG,CAAC;iBACR,IAAI,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBAC9C,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,GAAkC,CAAC,CAAC;iBAChE,IAAI,CAAC,GAAG,EAAE,CAAC,0BAA0B,EAAE,CAAC,CAC5C;iBACA,KAAK,CAAC,MAAM,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;QAEL,0BAA0B,EAAE,CAAC;QAE7B,OAAO,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lerna-lite/core",
|
|
3
3
|
"description": "Lerna-Lite core implementation module",
|
|
4
|
-
"version": "4.
|
|
4
|
+
"version": "4.5.0",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
7
7
|
},
|
|
@@ -37,14 +37,13 @@
|
|
|
37
37
|
"ci-info": "^4.2.0",
|
|
38
38
|
"clone-deep": "^4.0.1",
|
|
39
39
|
"config-chain": "^1.1.13",
|
|
40
|
-
"cosmiconfig": "^9.0.0",
|
|
41
40
|
"dedent": "^1.6.0",
|
|
42
41
|
"execa": "^9.6.0",
|
|
43
42
|
"fs-extra": "^11.3.0",
|
|
44
43
|
"glob-parent": "^6.0.2",
|
|
45
44
|
"json5": "^2.2.3",
|
|
45
|
+
"lilconfig": "^3.1.3",
|
|
46
46
|
"load-json-file": "^7.0.1",
|
|
47
|
-
"minimatch": "^10.0.3",
|
|
48
47
|
"multimatch": "^7.0.0",
|
|
49
48
|
"npm-package-arg": "^12.0.2",
|
|
50
49
|
"p-map": "^7.0.3",
|
|
@@ -64,5 +63,5 @@
|
|
|
64
63
|
"type": "ko_fi",
|
|
65
64
|
"url": "https://ko-fi.com/ghiscoding"
|
|
66
65
|
},
|
|
67
|
-
"gitHead": "
|
|
66
|
+
"gitHead": "975dd643a61ad9618cd482db8cd44822430b249e"
|
|
68
67
|
}
|