@lerna-lite/core 1.11.2 → 1.12.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.
Files changed (43) hide show
  1. package/dist/child-process.d.ts +5 -5
  2. package/dist/child-process.js +15 -12
  3. package/dist/child-process.js.map +1 -1
  4. package/dist/command.d.ts +1 -1
  5. package/dist/command.js +7 -2
  6. package/dist/command.js.map +1 -1
  7. package/dist/conventional-commits/get-github-commits.d.ts +0 -9
  8. package/dist/conventional-commits/get-github-commits.js +4 -19
  9. package/dist/conventional-commits/get-github-commits.js.map +1 -1
  10. package/dist/git-clients/GitLabClient.d.ts +2 -2
  11. package/dist/git-clients/GitLabClient.js.map +1 -1
  12. package/dist/git-clients/github-client.js +3 -5
  13. package/dist/git-clients/github-client.js.map +1 -1
  14. package/dist/models/command-options.d.ts +19 -4
  15. package/dist/models/interfaces.d.ts +25 -8
  16. package/dist/package-graph/package-graph.d.ts +2 -2
  17. package/dist/package-graph/package-graph.js +8 -11
  18. package/dist/package-graph/package-graph.js.map +1 -1
  19. package/dist/package.d.ts +1 -2
  20. package/dist/package.js +95 -76
  21. package/dist/package.js.map +1 -1
  22. package/dist/utils/check-working-tree.d.ts +2 -2
  23. package/dist/utils/check-working-tree.js +5 -5
  24. package/dist/utils/check-working-tree.js.map +1 -1
  25. package/dist/utils/collect-uncommitted.d.ts +2 -2
  26. package/dist/utils/collect-uncommitted.js +4 -4
  27. package/dist/utils/collect-uncommitted.js.map +1 -1
  28. package/dist/utils/collect-updates/collect-updates.d.ts +1 -1
  29. package/dist/utils/collect-updates/collect-updates.js +2 -2
  30. package/dist/utils/collect-updates/collect-updates.js.map +1 -1
  31. package/dist/utils/describe-ref.d.ts +2 -2
  32. package/dist/utils/describe-ref.js +4 -4
  33. package/dist/utils/describe-ref.js.map +1 -1
  34. package/dist/utils/index.d.ts +1 -0
  35. package/dist/utils/index.js +1 -0
  36. package/dist/utils/index.js.map +1 -1
  37. package/dist/utils/object-utils.d.ts +16 -0
  38. package/dist/utils/object-utils.js +46 -0
  39. package/dist/utils/object-utils.js.map +1 -0
  40. package/dist/utils/pulse-till-done.d.ts +1 -1
  41. package/dist/utils/pulse-till-done.js.map +1 -1
  42. package/dist/utils/query-graph.js.map +1 -1
  43. package/package.json +12 -52
package/dist/package.d.ts CHANGED
@@ -101,11 +101,10 @@ export declare class Package {
101
101
  * @param {Boolean} [workspaceStrictMatch] - are we using `workspace:` protocol strict match?
102
102
  * @param {String} [updatedByCommand] - which command called this update?
103
103
  */
104
- updateLocalDependency(resolved: NpaResolveResult, depVersion: string, savePrefix: string, workspaceStrictMatch?: boolean, updatedByCommand?: CommandType): void;
104
+ updateLocalDependency(resolved: NpaResolveResult, depVersion: string, savePrefix: string, allowPeerDependenciesUpdate?: boolean, workspaceStrictMatch?: boolean, updatedByCommand?: CommandType): void;
105
105
  /**
106
106
  * Retrieve the dependencies collection which contain the dependency name provided, we'll search in all type of dependencies/devDependencies/...
107
107
  * @param {String} depName - dependency name
108
- * @param {Boolean} [includePeerDepsFallback] - should we include peerDependencies as fallback?
109
108
  * @returns {Array<String>} - array of dependencies that contains the dependency name provided
110
109
  */
111
110
  private retrievePackageDependencies;
package/dist/package.js CHANGED
@@ -214,22 +214,29 @@ class Package {
214
214
  * @param {Object} resolved npa metadata
215
215
  */
216
216
  removeDependencyWorkspaceProtocolPrefix(pkgName, resolved) {
217
- var _a;
217
+ var _a, _b;
218
218
  const depName = resolved.name;
219
- const depCollection = this.retrievePackageDependencies(depName, true);
220
- const workspaceTarget = (_a = resolved === null || resolved === void 0 ? void 0 : resolved.workspaceTarget) !== null && _a !== void 0 ? _a : '';
221
- if (depCollection &&
222
- (resolved.registry || resolved.type === 'directory') &&
223
- /^(workspace:)+(.*)$/.test(workspaceTarget)) {
224
- if (workspaceTarget) {
225
- if (resolved.fetchSpec === 'latest') {
226
- npmlog_1.default.error(`publish`, [
227
- `Your package named "${pkgName}" has external dependencies not handled by Lerna-Lite and without workspace version suffix, `,
228
- `we recommend using defined versions with workspace protocol. `,
229
- `Your dependency is currently being published with "${depName}": "${resolved.fetchSpec}".`,
230
- ].join(''));
219
+ const workspaceSpec = (_a = resolved === null || resolved === void 0 ? void 0 : resolved.workspaceSpec) !== null && _a !== void 0 ? _a : '';
220
+ const localDependencies = this.retrievePackageDependencies(depName);
221
+ const inspectDependencies = [localDependencies];
222
+ // package could be found in both a local dependencies and peerDependencies, so we need to include it when found
223
+ if ((_b = this.peerDependencies) === null || _b === void 0 ? void 0 : _b[depName]) {
224
+ inspectDependencies.push(this.peerDependencies);
225
+ }
226
+ for (const depCollection of inspectDependencies) {
227
+ if (depCollection &&
228
+ (resolved.registry || resolved.type === 'directory') &&
229
+ /^(workspace:)+(.*)$/.test(workspaceSpec)) {
230
+ if (workspaceSpec) {
231
+ if (resolved.fetchSpec === 'latest') {
232
+ npmlog_1.default.error(`publish`, [
233
+ `Your package named "${pkgName}" has external dependencies not handled by Lerna-Lite and without workspace version suffix, `,
234
+ `we recommend using defined versions with workspace protocol. `,
235
+ `Your dependency is currently being published with "${depName}": "${resolved.fetchSpec}".`,
236
+ ].join(''));
237
+ }
238
+ depCollection[depName] = resolved.fetchSpec;
231
239
  }
232
- depCollection[depName] = resolved.fetchSpec;
233
240
  }
234
241
  }
235
242
  }
@@ -241,76 +248,92 @@ class Package {
241
248
  * @param {Boolean} [workspaceStrictMatch] - are we using `workspace:` protocol strict match?
242
249
  * @param {String} [updatedByCommand] - which command called this update?
243
250
  */
244
- updateLocalDependency(resolved, depVersion, savePrefix, workspaceStrictMatch = true, updatedByCommand) {
245
- var _a;
251
+ updateLocalDependency(resolved, depVersion, savePrefix, allowPeerDependenciesUpdate = false, workspaceStrictMatch = true, updatedByCommand) {
252
+ var _a, _b;
246
253
  const depName = resolved.name;
247
- const depCollection = this.retrievePackageDependencies(depName);
248
- if (depCollection && (resolved.registry || resolved.type === 'directory')) {
249
- // a version (1.2.3) OR range (^1.2.3) OR directory (file:../foo-pkg)
250
- depCollection[depName] = `${savePrefix}${depVersion}`;
251
- // when using explicit `workspace:` protocol
252
- if (resolved.explicitWorkspace) {
253
- const workspaceTarget = (_a = resolved === null || resolved === void 0 ? void 0 : resolved.workspaceTarget) !== null && _a !== void 0 ? _a : '';
254
- const [_, _wsTxt, operatorPrefix, rangePrefix] = workspaceTarget.match(/^(workspace:)?([<>=]{0,2})?([*^~])?(.*)$/) || [];
255
- if (operatorPrefix) {
256
- // with workspace it might include an operator, if so use it like "workspace:>=1.2.3"
257
- depCollection[depName] = `${operatorPrefix}${depVersion}`;
258
- }
259
- else if (workspaceStrictMatch) {
260
- // with workspace in strict mode we might have empty range prefix like "workspace:1.2.3"
261
- depCollection[depName] = `${rangePrefix || ''}${depVersion}`;
262
- }
263
- if (updatedByCommand === 'publish') {
264
- // when publishing, workspace protocol will be transformed to semver range
265
- // e.g.: considering version is `1.2.3` and we have `workspace:*` it will be converted to "^1.2.3" or to "1.2.3" with strict match range enabled
266
- if (workspaceStrictMatch) {
267
- if (workspaceTarget === 'workspace:*') {
268
- depCollection[depName] = depVersion; // (*) exact range, "1.5.0"
269
- }
270
- else if (workspaceTarget === 'workspace:~') {
271
- depCollection[depName] = `~${depVersion}`; // (~) patch range, "~1.5.0"
272
- }
273
- else if (workspaceTarget === 'workspace:^') {
274
- depCollection[depName] = `^${depVersion}`; // (^) minor range, "^1.5.0"
254
+ const localDependencies = this.retrievePackageDependencies(depName);
255
+ const updatingDependencies = [localDependencies];
256
+ // when we have peer dependencies, we might need to perform certain things
257
+ if ((_a = this.peerDependencies) === null || _a === void 0 ? void 0 : _a[depName]) {
258
+ // when user allows peer bump and is a regular semver version, we'll push it to the array of dependencies to potentially bump
259
+ // however we won't when the semver has a range with operator, ie this would bump ("^2.0.0") but these would not (">=2.0.0" or "workspace:<2.0.0" or "workspace:*")
260
+ // prettier-ignore
261
+ if (allowPeerDependenciesUpdate && /^(workspace:)?[~^]?[\d\.]+([\-]+[\w\.\-\+]+)*$/i.test(this.peerDependencies[depName] || '')) {
262
+ updatingDependencies.push(this.peerDependencies);
263
+ }
264
+ // when peer bump is disabled, we could end up with peerDependencies not being reviewed
265
+ // and some might still have the `workspace:` prefix so make sure to remove any of these prefixes
266
+ else if (updatedByCommand === 'publish' && this.peerDependencies[depName].startsWith('workspace:')) {
267
+ this.peerDependencies[depName] = this.peerDependencies[depName].replace('workspace:', '');
268
+ }
269
+ }
270
+ for (const depCollection of updatingDependencies) {
271
+ if (depCollection && (resolved.registry || resolved.type === 'directory')) {
272
+ // a version (1.2.3) OR range (^1.2.3) OR directory (file:../foo-pkg)
273
+ depCollection[depName] = `${savePrefix}${depVersion}`;
274
+ // when using explicit `workspace:` protocol
275
+ if (resolved.workspaceSpec) {
276
+ const workspaceSpec = (_b = resolved === null || resolved === void 0 ? void 0 : resolved.workspaceSpec) !== null && _b !== void 0 ? _b : '';
277
+ const [_, _wsTxt, operatorPrefix, rangePrefix, semver] = workspaceSpec.match(/^(workspace:)?([<>=]{0,2})?([*|~|^])?(.*)$/) || [];
278
+ if (operatorPrefix) {
279
+ // package with range operator should never be bumped, we'll use same version range but without prefix "workspace:>=1.2.3" will assign ">=1.2.3"
280
+ depCollection[depName] = `${operatorPrefix}${rangePrefix || ''}${semver}`;
281
+ }
282
+ else if (workspaceStrictMatch) {
283
+ // with workspace in strict mode we might have empty range prefix like "workspace:1.2.3"
284
+ depCollection[depName] = `${rangePrefix || ''}${depVersion}`;
285
+ }
286
+ if (updatedByCommand === 'publish') {
287
+ // when publishing, workspace protocol will be transformed to semver range
288
+ // e.g.: considering version is `1.2.3` and we have `workspace:*` it will be converted to "^1.2.3" or to "1.2.3" with strict match range enabled
289
+ if (workspaceStrictMatch) {
290
+ if (workspaceSpec === 'workspace:*') {
291
+ depCollection[depName] = depVersion; // (*) exact range, "1.5.0"
292
+ }
293
+ else if (workspaceSpec === 'workspace:~') {
294
+ depCollection[depName] = `~${depVersion}`; // (~) patch range, "~1.5.0"
295
+ }
296
+ else if (workspaceSpec === 'workspace:^') {
297
+ depCollection[depName] = `^${depVersion}`; // (^) minor range, "^1.5.0"
298
+ }
275
299
  }
300
+ // anything else will fall under what Lerna previously found to be the version,
301
+ // typically by this line: depCollection[depName] = `${savePrefix}${depVersion}`;
302
+ }
303
+ else {
304
+ // when versioning we'll only bump workspace protocol that have semver range like `workspace:^1.2.3`
305
+ // any other workspace will remain the same in `package.json` file, for example `workspace:^`
306
+ // keep target workspace or bump when it's a workspace semver range (like `workspace:^1.2.3`)
307
+ depCollection[depName] = /^workspace:[*|~|^]{1}$/.test(workspaceSpec)
308
+ ? resolved.workspaceSpec // target like `workspace:^` => `workspace:^` (remains untouched in package.json)
309
+ : `workspace:${depCollection[depName]}`; // range like `workspace:^1.2.3` => `workspace:^1.3.3` (bump minor example)
276
310
  }
277
- // anything else will fall under what Lerna previously found to be the version,
278
- // typically by this line: depCollection[depName] = `${savePrefix}${depVersion}`;
279
- }
280
- else {
281
- // when versioning we'll only bump workspace protocol that have semver range like `workspace:^1.2.3`
282
- // any other workspace will remain the same in `package.json` file, for example `workspace:^`
283
- // keep target workspace or bump when it's a workspace semver range (like `workspace:^1.2.3`)
284
- depCollection[depName] = /^workspace:[*^~]{1}$/.test(workspaceTarget)
285
- ? resolved.workspaceTarget // target like `workspace:^` => `workspace:^` (remains untouched in package.json)
286
- : `workspace:${depCollection[depName]}`; // range like `workspace:^1.2.3` => `workspace:^1.3.3` (bump minor example)
287
311
  }
288
312
  }
289
- }
290
- else if (resolved.gitCommittish) {
291
- // a git url with matching committish (#v1.2.3 or #1.2.3)
292
- const [tagPrefix] = /^\D*/.exec(resolved.gitCommittish);
293
- // update committish
294
- const { hosted } = resolved; // take that, lint!
295
- hosted.committish = `${tagPrefix}${depVersion}`;
296
- // always serialize the full url (identical to previous resolved.saveSpec)
297
- depCollection[depName] = hosted.toString({ noGitPlus: false, noCommittish: false });
298
- }
299
- else if (resolved.gitRange) {
300
- // a git url with matching gitRange (#semver:^1.2.3)
301
- const { hosted } = resolved; // take that, lint!
302
- hosted.committish = `semver:${savePrefix}${depVersion}`;
303
- // always serialize the full url (identical to previous resolved.saveSpec)
304
- depCollection[depName] = hosted.toString({ noGitPlus: false, noCommittish: false });
313
+ else if (resolved.gitCommittish) {
314
+ // a git url with matching committish (#v1.2.3 or #1.2.3)
315
+ const [tagPrefix] = /^\D*/.exec(resolved.gitCommittish);
316
+ // update committish
317
+ const { hosted } = resolved; // take that, lint!
318
+ hosted.committish = `${tagPrefix}${depVersion}`;
319
+ // always serialize the full url (identical to previous resolved.saveSpec)
320
+ depCollection[depName] = hosted.toString({ noGitPlus: false, noCommittish: false });
321
+ }
322
+ else if (resolved.gitRange) {
323
+ // a git url with matching gitRange (#semver:^1.2.3)
324
+ const { hosted } = resolved; // take that, lint!
325
+ hosted.committish = `semver:${savePrefix}${depVersion}`;
326
+ // always serialize the full url (identical to previous resolved.saveSpec)
327
+ depCollection[depName] = hosted.toString({ noGitPlus: false, noCommittish: false });
328
+ }
305
329
  }
306
330
  }
307
331
  /**
308
332
  * Retrieve the dependencies collection which contain the dependency name provided, we'll search in all type of dependencies/devDependencies/...
309
333
  * @param {String} depName - dependency name
310
- * @param {Boolean} [includePeerDepsFallback] - should we include peerDependencies as fallback?
311
334
  * @returns {Array<String>} - array of dependencies that contains the dependency name provided
312
335
  */
313
- retrievePackageDependencies(depName, includePeerDepsFallback = false) {
336
+ retrievePackageDependencies(depName) {
314
337
  // first, try runtime dependencies
315
338
  let depCollection = this.dependencies;
316
339
  // try optionalDependencies if that didn't work
@@ -321,10 +344,6 @@ class Package {
321
344
  if (!depCollection || !depCollection[depName]) {
322
345
  depCollection = this.devDependencies;
323
346
  }
324
- // fall back to peerDependencies (when enabled)
325
- if (includePeerDepsFallback && (!depCollection || !depCollection[depName])) {
326
- depCollection = this.peerDependencies;
327
- }
328
347
  return depCollection;
329
348
  }
330
349
  }
@@ -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":";;;;;;AAAA,oEAA0C;AAC1C,sEAAkC;AAClC,oDAA4B;AAC5B,gDAAwB;AACxB,0DAAiC;AAIjC,uCAAuC;AACvC,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;AAE1B,iBAAiB;AACjB,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AACrC,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AACrC,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AACrC,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;AACnC,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AAErC;;GAEG;AACH,SAAS,WAAW,CAAC,EAAE,IAAI,EAAE,KAAK,EAAc;IAC9C,OAAO,KAAK,CAAC,CAAC,CAAC,IAAK,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAC1D,CAAC;AAED,8EAA8E;AAC9E,SAAS,WAAW,CAAC,IAAS;IAC5B,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QAC3C,MAAM,GAAG,GAAQ,IAAI,CAAC,GAAG,CAAC,CAAC;QAE3B,wBAAwB;QACxB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACtB,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,KAAK,EAAE,CAAC;SACxB;aAAM,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YACzC,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;SACnC;aAAM;YACL,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;SAChB;QAED,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AAED;;;GAGG;AACH,MAAa,OAAO;IA6BlB;;;;OAIG;IACH,YAAY,GAAgB,EAAE,QAAgB,EAAE,QAAQ,GAAG,QAAQ;;QAjCnE,QAAG,GAAG,EAAE,CAAC;QAET,gBAAW,GAAG,EAAE,CAAC;QACjB,sBAAiB,GAAG,IAAI,GAAG,EAAe,CAAC;QA+BzC,iDAAiD;QACjD,MAAM,QAAQ,GAAG,yBAAG,CAAC,OAAO,CAAC,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,mCAAI,EAAE,EAAE,QAAQ,cAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QAErG,IAAI,CAAC,IAAI,GAAG,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,mCAAI,EAAE,CAAC;QAC5B,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;QAEhB,oFAAoF;QACpF,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QAExE,IAAI,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC;QAC3B,IAAI,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC;QAC3B,IAAI,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC;QAC3B,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;IACtC,CAAC;IA1CD;;;;;OAKG;IACH,MAAM,CAAC,IAAI,CAAC,GAAmC,EAAE,GAAG,GAAG,GAAG;QACxD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YAC3B,MAAM,QAAQ,GAAG,cAAI,CAAC,OAAO,CAAC,cAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,cAAc,CAAC,CAAC,CAAC,cAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YAC/F,MAAM,QAAQ,GAAG,wBAAY,CAAC,IAAI,CAAc,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC;YAErF,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;SACxC;QAED,wEAAwE;QACxE,IAAI,kBAAkB,IAAI,GAAG,EAAE;YAC7B,OAAO,GAAG,CAAC;SACZ;QAED,8BAA8B;QAC9B,OAAO,IAAI,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC/B,CAAC;IAuBD,mBAAmB;IACnB,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC;IACzB,CAAC;IAED,IAAI,OAAO;QACT,OAAO,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC;IACzB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC;IACzB,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxB,CAAC;IAED,IAAI,GAAG;QACL,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;QACtB,OAAO,OAAO,GAAG,CAAC,GAAG,KAAK,QAAQ;YAChC,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,QAAiC,CAAW,CAAC,EAAE,GAAG,CAAC,GAAG,EAAE;YAC9E,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,WAAW;QACb,OAAO,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;IAC1D,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;IAClD,CAAC;IAED,IAAI,mBAAmB;QACrB,OAAO,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;IAClD,CAAC;IAED,kDAAkD;IAClD,IAAI,gBAAgB;QAClB,iDAAiD;QACjD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YAAY;IACZ,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;IAC3B,CAAC;IAED,IAAI,OAAO,CAAC,OAAe;QACzB,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,GAAG,OAAO,CAAC;IAC9B,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC;IAC9B,CAAC;IAED,IAAI,UAAU,CAAC,UAA6C;QAC1D,IAAI,CAAC,GAAG,CAAC,CAAC,UAAU,GAAG,UAAU,CAAC;IACpC,CAAC;IAED,IAAI,QAAQ;QACV,0CAA0C;QAC1C,IAAI,IAAI,CAAC,SAAS,CAAC,EAAE;YACnB,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC;SACxB;QAED,mDAAmD;QACnD,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,aAAa,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,aAAa,CAAC,SAAS,EAAE;YAChE,OAAO,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;SACpE;QAED,0BAA0B;QAC1B,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,IAAI,QAAQ,CAAC,YAAoB;QAC/B,IAAI,CAAC,SAAS,CAAC,GAAG,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IAC3D,CAAC;IAED,qBAAqB;IACrB,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC;IAChC,CAAC;IAED,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,eAAe,CAAC;IACnC,CAAC;IAED,IAAI,oBAAoB;QACtB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,oBAAoB,CAAC;IACxC,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,gBAAgB,CAAC;IACpC,CAAC;IAED,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;IAED;;;;;OAKG;IACH,GAAG,CAA8B,GAAW;QAC1C,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC;IAED;;;;;;OAMG;IACH,GAAG,CAAC,GAAW,EAAE,GAAmC;QAClD,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;QAErB,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACH,MAAM;QACJ,OAAO,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAChC,CAAC;IAED;;OAEG;IACH,OAAO;QACL,OAAO,IAAA,wBAAY,EAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YACtD,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;YAEhB,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACH,SAAS;QACP,OAAO,IAAA,mBAAQ,EAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IACrE,CAAC;IAED;;;;OAIG;IACH,uCAAuC,CAAC,OAAe,EAAE,QAA0B;;QACjF,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAc,CAAC;QACxC,MAAM,aAAa,GAAG,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,aAAa,mCAAI,EAAE,CAAC;QACpD,MAAM,iBAAiB,GAAG,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC;QACpE,MAAM,mBAAmB,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAEhD,gHAAgH;QAChH,IAAI,MAAA,IAAI,CAAC,gBAAgB,0CAAG,OAAO,CAAC,EAAE;YACpC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;SACjD;QAED,KAAK,MAAM,aAAa,IAAI,mBAAmB,EAAE;YAC/C,IACE,aAAa;gBACb,CAAC,QAAQ,CAAC,QAAQ,IAAI,QAAQ,CAAC,IAAI,KAAK,WAAW,CAAC;gBACpD,qBAAqB,CAAC,IAAI,CAAC,aAAa,CAAC,EACzC;gBACA,IAAI,aAAa,EAAE;oBACjB,IAAI,QAAQ,CAAC,SAAS,KAAK,QAAQ,EAAE;wBACnC,gBAAM,CAAC,KAAK,CACV,SAAS,EACT;4BACE,uBAAuB,OAAO,8FAA8F;4BAC5H,+DAA+D;4BAC/D,sDAAsD,OAAO,OAAO,QAAQ,CAAC,SAAS,IAAI;yBAC3F,CAAC,IAAI,CAAC,EAAE,CAAC,CACX,CAAC;qBACH;oBACD,aAAa,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC,SAAmB,CAAC;iBACvD;aACF;SACF;IACH,CAAC;IAED;;;;;;;OAOG;IACH,qBAAqB,CACnB,QAA0B,EAC1B,UAAkB,EAClB,UAAkB,EAClB,2BAA2B,GAAG,KAAK,EACnC,oBAAoB,GAAG,IAAI,EAC3B,gBAA8B;;QAE9B,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAc,CAAC;QACxC,MAAM,iBAAiB,GAAG,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC;QACpE,MAAM,oBAAoB,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAEjD,0EAA0E;QAC1E,IAAI,MAAA,IAAI,CAAC,gBAAgB,0CAAG,OAAO,CAAC,EAAE;YACpC,6HAA6H;YAC7H,mKAAmK;YACnK,kBAAkB;YAClB,IAAI,2BAA2B,IAAI,iDAAiD,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE;gBAC/H,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;aAClD;YACD,uFAAuF;YACvF,iGAAiG;iBAC5F,IAAI,gBAAgB,KAAK,SAAS,IAAI,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;gBAClG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;aAC3F;SACF;QAED,KAAK,MAAM,aAAa,IAAI,oBAAoB,EAAE;YAChD,IAAI,aAAa,IAAI,CAAC,QAAQ,CAAC,QAAQ,IAAI,QAAQ,CAAC,IAAI,KAAK,WAAW,CAAC,EAAE;gBACzE,qEAAqE;gBACrE,aAAa,CAAC,OAAO,CAAC,GAAG,GAAG,UAAU,GAAG,UAAU,EAAE,CAAC;gBAEtD,4CAA4C;gBAC5C,IAAI,QAAQ,CAAC,aAAa,EAAE;oBAC1B,MAAM,aAAa,GAAG,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,aAAa,mCAAI,EAAE,CAAC;oBACpD,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,CAAC,GACpD,aAAa,CAAC,KAAK,CAAC,4CAA4C,CAAC,IAAI,EAAE,CAAC;oBAE1E,IAAI,cAAc,EAAE;wBAClB,gJAAgJ;wBAChJ,aAAa,CAAC,OAAO,CAAC,GAAG,GAAG,cAAc,GAAG,WAAW,IAAI,EAAE,GAAG,MAAM,EAAE,CAAC;qBAC3E;yBAAM,IAAI,oBAAoB,EAAE;wBAC/B,wFAAwF;wBACxF,aAAa,CAAC,OAAO,CAAC,GAAG,GAAG,WAAW,IAAI,EAAE,GAAG,UAAU,EAAE,CAAC;qBAC9D;oBAED,IAAI,gBAAgB,KAAK,SAAS,EAAE;wBAClC,0EAA0E;wBAC1E,gJAAgJ;wBAChJ,IAAI,oBAAoB,EAAE;4BACxB,IAAI,aAAa,KAAK,aAAa,EAAE;gCACnC,aAAa,CAAC,OAAO,CAAC,GAAG,UAAU,CAAC,CAAC,2BAA2B;6BACjE;iCAAM,IAAI,aAAa,KAAK,aAAa,EAAE;gCAC1C,aAAa,CAAC,OAAO,CAAC,GAAG,IAAI,UAAU,EAAE,CAAC,CAAC,4BAA4B;6BACxE;iCAAM,IAAI,aAAa,KAAK,aAAa,EAAE;gCAC1C,aAAa,CAAC,OAAO,CAAC,GAAG,IAAI,UAAU,EAAE,CAAC,CAAC,4BAA4B;6BACxE;yBACF;wBACD,+EAA+E;wBAC/E,iFAAiF;qBAClF;yBAAM;wBACL,oGAAoG;wBACpG,6FAA6F;wBAC7F,6FAA6F;wBAC7F,aAAa,CAAC,OAAO,CAAC,GAAG,wBAAwB,CAAC,IAAI,CAAC,aAAa,CAAC;4BACnE,CAAC,CAAE,QAAQ,CAAC,aAAwB,CAAC,iFAAiF;4BACtH,CAAC,CAAC,aAAa,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,2EAA2E;qBACvH;iBACF;aACF;iBAAM,IAAI,QAAQ,CAAC,aAAa,EAAE;gBACjC,yDAAyD;gBACzD,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAoB,CAAC;gBAE3E,oBAAoB;gBACpB,MAAM,EAAE,MAAM,EAAE,GAAG,QAAe,CAAC,CAAC,mBAAmB;gBACvD,MAAM,CAAC,UAAU,GAAG,GAAG,SAAS,GAAG,UAAU,EAAE,CAAC;gBAEhD,0EAA0E;gBAC1E,aAAa,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC;aACrF;iBAAM,IAAI,QAAQ,CAAC,QAAQ,EAAE;gBAC5B,oDAAoD;gBACpD,MAAM,EAAE,MAAM,EAAE,GAAG,QAAe,CAAC,CAAC,mBAAmB;gBACvD,MAAM,CAAC,UAAU,GAAG,UAAU,UAAU,GAAG,UAAU,EAAE,CAAC;gBAExD,0EAA0E;gBAC1E,aAAa,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC;aACrF;SACF;IACH,CAAC;IAED;;;;OAIG;IACK,2BAA2B,CAAC,OAAe;QACjD,kCAAkC;QAClC,IAAI,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC;QAEtC,+CAA+C;QAC/C,IAAI,CAAC,aAAa,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE;YAC7C,aAAa,GAAG,IAAI,CAAC,oBAAoB,CAAC;SAC3C;QAED,+BAA+B;QAC/B,IAAI,CAAC,aAAa,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE;YAC7C,aAAa,GAAG,IAAI,CAAC,eAAe,CAAC;SACtC;QAED,OAAO,aAAa,CAAC;IACvB,CAAC;CACF;AAzWD,0BAyWC"}
@@ -1,9 +1,9 @@
1
1
  import { UncommittedConfig } from './collect-uncommitted';
2
- export declare function checkWorkingTree({ cwd }?: UncommittedConfig, gitDryRun?: boolean): Promise<any>;
2
+ export declare function checkWorkingTree({ cwd }?: UncommittedConfig, dryRun?: boolean): Promise<any>;
3
3
  export declare function throwIfReleased({ refCount }: {
4
4
  refCount: number | string;
5
5
  }): void;
6
- export declare function mkThrowIfUncommitted(options?: Partial<UncommittedConfig>, gitDryRun?: boolean): ({ isDirty }: {
6
+ export declare function mkThrowIfUncommitted(options?: Partial<UncommittedConfig>, dryRun?: boolean): ({ isDirty }: {
7
7
  isDirty: any;
8
8
  }) => Promise<never> | undefined;
9
9
  export declare function throwIfUncommitted(): void;
@@ -4,15 +4,15 @@ exports.throwIfUncommitted = exports.mkThrowIfUncommitted = exports.throwIfRelea
4
4
  const collect_uncommitted_1 = require("./collect-uncommitted");
5
5
  const describe_ref_1 = require("./describe-ref");
6
6
  const validation_error_1 = require("../validation-error");
7
- function checkWorkingTree({ cwd } = {}, gitDryRun = false) {
7
+ function checkWorkingTree({ cwd } = {}, dryRun = false) {
8
8
  let chain = Promise.resolve();
9
- chain = chain.then(() => (0, describe_ref_1.describeRef)({ cwd }, undefined, gitDryRun));
9
+ chain = chain.then(() => (0, describe_ref_1.describeRef)({ cwd }, undefined, dryRun));
10
10
  // wrap each test separately to allow all applicable errors to be reported
11
11
  const tests = [
12
12
  // prevent duplicate versioning
13
13
  chain.then(throwIfReleased),
14
14
  // prevent publish of uncommitted changes
15
- chain.then(mkThrowIfUncommitted({ cwd }, gitDryRun)),
15
+ chain.then(mkThrowIfUncommitted({ cwd }, dryRun)),
16
16
  ];
17
17
  // passes through result of describeRef() to aid composability
18
18
  return chain.then((result) => Promise.all(tests).then(() => result));
@@ -25,10 +25,10 @@ function throwIfReleased({ refCount }) {
25
25
  }
26
26
  exports.throwIfReleased = throwIfReleased;
27
27
  const EUNCOMMIT_MSG = 'Working tree has uncommitted changes, please commit or remove the following changes before continuing:\n';
28
- function mkThrowIfUncommitted(options = {}, gitDryRun = false) {
28
+ function mkThrowIfUncommitted(options = {}, dryRun = false) {
29
29
  return function ({ isDirty }) {
30
30
  if (isDirty) {
31
- return (0, collect_uncommitted_1.collectUncommitted)(options, gitDryRun).then((uncommitted) => {
31
+ return (0, collect_uncommitted_1.collectUncommitted)(options, dryRun).then((uncommitted) => {
32
32
  throw new validation_error_1.ValidationError('EUNCOMMIT', `${EUNCOMMIT_MSG}${uncommitted.join('\n')}`);
33
33
  });
34
34
  }
@@ -1 +1 @@
1
- {"version":3,"file":"check-working-tree.js","sourceRoot":"","sources":["../../src/utils/check-working-tree.ts"],"names":[],"mappings":";;;AAAA,+DAA8E;AAC9E,iDAA6C;AAC7C,0DAAsD;AAEtD,SAAgB,gBAAgB,CAAC,EAAE,GAAG,KAAK,EAAuB,EAAE,SAAS,GAAG,KAAK;IACnF,IAAI,KAAK,GAAiB,OAAO,CAAC,OAAO,EAAE,CAAC;IAE5C,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAA,0BAAW,EAAC,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;IAErE,0EAA0E;IAC1E,MAAM,KAAK,GAAG;QACZ,+BAA+B;QAC/B,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC;QAC3B,yCAAyC;QACzC,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,GAAG,EAAE,EAAE,SAAS,CAAQ,CAAC;KAC5D,CAAC;IAEF,8DAA8D;IAC9D,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;AACvE,CAAC;AAfD,4CAeC;AAED,SAAgB,eAAe,CAAC,EAAE,QAAQ,EAAiC;IACzE,IAAI,QAAQ,KAAK,GAAG,EAAE;QACpB,MAAM,IAAI,kCAAe,CACvB,WAAW,EACX,0FAA0F,CAC3F,CAAC;KACH;AACH,CAAC;AAPD,0CAOC;AAED,MAAM,aAAa,GACjB,0GAA0G,CAAC;AAE7G,SAAgB,oBAAoB,CAAC,UAAsC,EAAE,EAAE,SAAS,GAAG,KAAK;IAC9F,OAAO,UAAU,EAAE,OAAO,EAAE;QAC1B,IAAI,OAAO,EAAE;YACX,OAAO,IAAA,wCAAkB,EAAC,OAA4B,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE;gBACtF,MAAM,IAAI,kCAAe,CAAC,WAAW,EAAE,GAAG,aAAa,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACtF,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,CAAC;AACJ,CAAC;AARD,oDAQC;AAED,SAAgB,kBAAkB;IAChC,oBAAoB,EAAE,CAAC;AACzB,CAAC;AAFD,gDAEC"}
1
+ {"version":3,"file":"check-working-tree.js","sourceRoot":"","sources":["../../src/utils/check-working-tree.ts"],"names":[],"mappings":";;;AAAA,+DAA8E;AAC9E,iDAA6C;AAC7C,0DAAsD;AAEtD,SAAgB,gBAAgB,CAAC,EAAE,GAAG,KAAK,EAAuB,EAAE,MAAM,GAAG,KAAK;IAChF,IAAI,KAAK,GAAiB,OAAO,CAAC,OAAO,EAAE,CAAC;IAE5C,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAA,0BAAW,EAAC,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;IAElE,0EAA0E;IAC1E,MAAM,KAAK,GAAG;QACZ,+BAA+B;QAC/B,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC;QAC3B,yCAAyC;QACzC,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,GAAG,EAAE,EAAE,MAAM,CAAQ,CAAC;KACzD,CAAC;IAEF,8DAA8D;IAC9D,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;AACvE,CAAC;AAfD,4CAeC;AAED,SAAgB,eAAe,CAAC,EAAE,QAAQ,EAAiC;IACzE,IAAI,QAAQ,KAAK,GAAG,EAAE;QACpB,MAAM,IAAI,kCAAe,CACvB,WAAW,EACX,0FAA0F,CAC3F,CAAC;KACH;AACH,CAAC;AAPD,0CAOC;AAED,MAAM,aAAa,GACjB,0GAA0G,CAAC;AAE7G,SAAgB,oBAAoB,CAAC,UAAsC,EAAE,EAAE,MAAM,GAAG,KAAK;IAC3F,OAAO,UAAU,EAAE,OAAO,EAAE;QAC1B,IAAI,OAAO,EAAE;YACX,OAAO,IAAA,wCAAkB,EAAC,OAA4B,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE;gBACnF,MAAM,IAAI,kCAAe,CAAC,WAAW,EAAE,GAAG,aAAa,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACtF,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,CAAC;AACJ,CAAC;AARD,oDAQC;AAED,SAAgB,kBAAkB;IAChC,oBAAoB,EAAE,CAAC;AACzB,CAAC;AAFD,gDAEC"}
@@ -8,10 +8,10 @@ export interface UncommittedConfig {
8
8
  * @param {UncommittedConfig} options
9
9
  * @returns {Promise<string[]>} A list of uncommitted files
10
10
  */
11
- export declare function collectUncommitted({ cwd, log }: UncommittedConfig, gitDryRun?: boolean): Promise<string[]>;
11
+ export declare function collectUncommitted({ cwd, log }: UncommittedConfig, dryRun?: boolean): Promise<string[]>;
12
12
  /**
13
13
  * Report uncommitted files. (sync)
14
14
  * @param {UncommittedConfig} options
15
15
  * @returns {string[]} A list of uncommitted files
16
16
  */
17
- export declare function collectUncommittedSync({ cwd, log }: UncommittedConfig, gitDryRun?: boolean): string[];
17
+ export declare function collectUncommittedSync({ cwd, log }: UncommittedConfig, dryRun?: boolean): string[];
@@ -21,9 +21,9 @@ const transformOutput = o(filterEmpty, o(splitOnNewLine, colorizeStats));
21
21
  * @param {UncommittedConfig} options
22
22
  * @returns {Promise<string[]>} A list of uncommitted files
23
23
  */
24
- function collectUncommitted({ cwd, log = npmlog_1.default }, gitDryRun = false) {
24
+ function collectUncommitted({ cwd, log = npmlog_1.default }, dryRun = false) {
25
25
  log.silly('collect-uncommitted', 'git status --porcelain (async)');
26
- return (0, child_process_1.exec)('git', ['status', '--porcelain'], { cwd }, gitDryRun).then(({ stdout }) => transformOutput(stdout));
26
+ return (0, child_process_1.exec)('git', ['status', '--porcelain'], { cwd }, dryRun).then(({ stdout }) => transformOutput(stdout));
27
27
  }
28
28
  exports.collectUncommitted = collectUncommitted;
29
29
  /**
@@ -31,9 +31,9 @@ exports.collectUncommitted = collectUncommitted;
31
31
  * @param {UncommittedConfig} options
32
32
  * @returns {string[]} A list of uncommitted files
33
33
  */
34
- function collectUncommittedSync({ cwd, log = npmlog_1.default }, gitDryRun = false) {
34
+ function collectUncommittedSync({ cwd, log = npmlog_1.default }, dryRun = false) {
35
35
  log.silly('collect-uncommitted', 'git status --porcelain (sync)');
36
- const stdout = (0, child_process_1.execSync)('git', ['status', '--porcelain'], { cwd }, gitDryRun);
36
+ const stdout = (0, child_process_1.execSync)('git', ['status', '--porcelain'], { cwd }, dryRun);
37
37
  return transformOutput(stdout);
38
38
  }
39
39
  exports.collectUncommittedSync = collectUncommittedSync;
@@ -1 +1 @@
1
- {"version":3,"file":"collect-uncommitted.js","sourceRoot":"","sources":["../../src/utils/collect-uncommitted.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,oDAA4B;AAE5B,oDAAkD;AAOlD,MAAM,aAAa,GAAG,CAAC,QAAoC,EAAE,EAAE,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC5G,MAAM,IAAI,GAAG,aAAa,CAAC,eAAK,CAAC,GAAG,CAAC,CAAC;AACtC,MAAM,MAAM,GAAG,aAAa,CAAC,eAAK,CAAC,KAAK,CAAC,CAAC;AAC1C,MAAM,aAAa,GAAG,CAAC,KAAa,EAAE,EAAE,CACtC,KAAK,CAAC,OAAO,CAAC,sBAAsB,EAAE,aAAa,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAC5F,MAAM,aAAa,GAAG,CAAC,CAAC,EAAE,UAAmB,EAAE,QAAiB,EAAE,EAAE,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;AAC9G,MAAM,cAAc,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AACxD,MAAM,WAAW,GAAG,CAAC,KAAe,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC7E,MAAM,CAAC,GAAG,CAAC,CAAM,EAAE,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC7C,MAAM,eAAe,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC,CAAC;AAEzE;;;;GAIG;AACH,SAAgB,kBAAkB,CAAC,EAAE,GAAG,EAAE,GAAG,GAAG,gBAAM,EAAqB,EAAE,SAAS,GAAG,KAAK;IAC5F,GAAG,CAAC,KAAK,CAAC,qBAAqB,EAAE,gCAAgC,CAAC,CAAC;IAEnE,OAAO,IAAA,oBAAI,EAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;AAClH,CAAC;AAJD,gDAIC;AAED;;;;GAIG;AACH,SAAgB,sBAAsB,CAAC,EAAE,GAAG,EAAE,GAAG,GAAG,gBAAM,EAAqB,EAAE,SAAS,GAAG,KAAK;IAChG,GAAG,CAAC,KAAK,CAAC,qBAAqB,EAAE,+BAA+B,CAAC,CAAC;IAElE,MAAM,MAAM,GAAG,IAAA,wBAAQ,EAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,SAAS,CAAC,CAAC;IAC9E,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC;AACjC,CAAC;AALD,wDAKC"}
1
+ {"version":3,"file":"collect-uncommitted.js","sourceRoot":"","sources":["../../src/utils/collect-uncommitted.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,oDAA4B;AAE5B,oDAAkD;AAOlD,MAAM,aAAa,GAAG,CAAC,QAAoC,EAAE,EAAE,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC5G,MAAM,IAAI,GAAG,aAAa,CAAC,eAAK,CAAC,GAAG,CAAC,CAAC;AACtC,MAAM,MAAM,GAAG,aAAa,CAAC,eAAK,CAAC,KAAK,CAAC,CAAC;AAC1C,MAAM,aAAa,GAAG,CAAC,KAAa,EAAE,EAAE,CACtC,KAAK,CAAC,OAAO,CAAC,sBAAsB,EAAE,aAAa,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAC5F,MAAM,aAAa,GAAG,CAAC,CAAC,EAAE,UAAmB,EAAE,QAAiB,EAAE,EAAE,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;AAC9G,MAAM,cAAc,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AACxD,MAAM,WAAW,GAAG,CAAC,KAAe,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC7E,MAAM,CAAC,GAAG,CAAC,CAAM,EAAE,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC7C,MAAM,eAAe,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC,CAAC;AAEzE;;;;GAIG;AACH,SAAgB,kBAAkB,CAAC,EAAE,GAAG,EAAE,GAAG,GAAG,gBAAM,EAAqB,EAAE,MAAM,GAAG,KAAK;IACzF,GAAG,CAAC,KAAK,CAAC,qBAAqB,EAAE,gCAAgC,CAAC,CAAC;IAEnE,OAAO,IAAA,oBAAI,EAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;AAC/G,CAAC;AAJD,gDAIC;AAED;;;;GAIG;AACH,SAAgB,sBAAsB,CAAC,EAAE,GAAG,EAAE,GAAG,GAAG,gBAAM,EAAqB,EAAE,MAAM,GAAG,KAAK;IAC7F,GAAG,CAAC,KAAK,CAAC,qBAAqB,EAAE,+BAA+B,CAAC,CAAC;IAElE,MAAM,MAAM,GAAG,IAAA,wBAAQ,EAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;IAC3E,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC;AACjC,CAAC;AALD,wDAKC"}
@@ -8,4 +8,4 @@ import { PackageGraph } from '../../package-graph';
8
8
  * @param {import("@lerna/child-process").ExecOpts} execOpts
9
9
  * @param {UpdateCollectorOptions} commandOptions
10
10
  */
11
- export declare function collectUpdates(filteredPackages: Package[], packageGraph: PackageGraph, execOpts: ExecOpts, commandOptions: UpdateCollectorOptions, gitDryRun?: boolean): import("../../package-graph").PackageGraphNode[];
11
+ export declare function collectUpdates(filteredPackages: Package[], packageGraph: PackageGraph, execOpts: ExecOpts, commandOptions: UpdateCollectorOptions, dryRun?: boolean): import("../../package-graph").PackageGraphNode[];
@@ -17,7 +17,7 @@ const make_diff_predicate_1 = require("./lib/make-diff-predicate");
17
17
  * @param {import("@lerna/child-process").ExecOpts} execOpts
18
18
  * @param {UpdateCollectorOptions} commandOptions
19
19
  */
20
- function collectUpdates(filteredPackages, packageGraph, execOpts, commandOptions, gitDryRun = false) {
20
+ function collectUpdates(filteredPackages, packageGraph, execOpts, commandOptions, dryRun = false) {
21
21
  const { forcePublish, conventionalCommits, conventionalGraduate, excludeDependents, isIndependent } = commandOptions;
22
22
  // If --conventional-commits and --conventional-graduate are both set, ignore --force-publish
23
23
  const useConventionalGraduate = conventionalCommits && conventionalGraduate;
@@ -35,7 +35,7 @@ function collectUpdates(filteredPackages, packageGraph, execOpts, commandOptions
35
35
  describeOptions.match = tagPattern;
36
36
  }
37
37
  // describe the last annotated tag in the current branch
38
- const { sha, refCount, lastTagName } = (0, describe_ref_1.describeRefSync)(describeOptions, commandOptions.includeMergedTags, gitDryRun);
38
+ const { sha, refCount, lastTagName } = (0, describe_ref_1.describeRefSync)(describeOptions, commandOptions.includeMergedTags, dryRun);
39
39
  // TODO: warn about dirty tree?
40
40
  if (refCount === '0' && forced.size === 0 && !committish) {
41
41
  // no commits since previous release
@@ -1 +1 @@
1
- {"version":3,"file":"collect-updates.js","sourceRoot":"","sources":["../../../src/utils/collect-updates/collect-updates.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAyB;AAKzB,kDAAkD;AAClD,6DAAyD;AACzD,2EAAqE;AACrE,6CAAyC;AACzC,mEAA8D;AAE9D;;;;;;GAMG;AACH,SAAgB,cAAc,CAC5B,gBAA2B,EAC3B,YAA0B,EAC1B,QAAkB,EAClB,cAAsC,EACtC,SAAS,GAAG,KAAK;IAEjB,MAAM,EAAE,YAAY,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,aAAa,EAAE,GAAG,cAAc,CAAC;IAErH,6FAA6F;IAC7F,MAAM,uBAAuB,GAAG,mBAAmB,IAAI,oBAAoB,CAAC;IAC5E,MAAM,MAAM,GAAG,IAAA,8CAAoB,EACjC,uBAAuB,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAE,YAAmC,CACtF,CAAC;IAEF,MAAM,QAAQ,GACZ,gBAAgB,CAAC,MAAM,KAAK,YAAY,CAAC,IAAI;QAC3C,CAAC,CAAC,YAAY;QACd,CAAC,CAAC,IAAI,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAElF,IAAI,UAAU,GAAG,cAAc,CAAC,KAAK,CAAC;IACtC,MAAM,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IAE9C,IAAI,IAAA,kBAAO,EAAC,QAAQ,EAAE,UAAU,CAAC,EAAE;QACjC,MAAM,eAAe,GAAuB;YAC1C,GAAG,QAAQ;SACZ,CAAC;QAEF,IAAI,aAAa,EAAE;YACjB,eAAe,CAAC,KAAK,GAAG,UAAU,CAAC;SACpC;QAED,wDAAwD;QACxD,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,IAAA,8BAAe,EACpD,eAAe,EACf,cAAc,CAAC,iBAAiB,EAChC,SAAS,CACV,CAAC;QACF,+BAA+B;QAE/B,IAAI,QAAQ,KAAK,GAAG,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE;YACxD,oCAAoC;YACpC,gBAAG,CAAC,MAAM,CAAC,EAAE,EAAE,8DAA8D,CAAC,CAAC;YAE/E,OAAO,EAAE,CAAC;SACX;QAED,IAAI,cAAc,CAAC,MAAM,EAAE;YACzB,qFAAqF;YACrF,+FAA+F;YAC/F,UAAU,GAAG,GAAG,GAAG,MAAM,GAAG,EAAE,CAAC;SAChC;aAAM,IAAI,CAAC,UAAU,EAAE;YACtB,4EAA4E;YAC5E,UAAU,GAAG,WAAW,CAAC;SAC1B;KACF;IAED,IAAI,MAAM,CAAC,IAAI,EAAE;QACf,oFAAoF;QACpF,gBAAG,CAAC,IAAI,CACN,uBAAuB,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,eAAe,EACnE,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAC1E,CAAC;KACH;IAED,IAAI,uBAAuB,EAAE;QAC3B,iDAAiD;QACjD,IAAI,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACnB,gBAAG,CAAC,IAAI,CAAC,EAAE,EAAE,qCAAqC,CAAC,CAAC;SACrD;aAAM;YACL,gBAAG,CAAC,IAAI,CAAC,EAAE,EAAE,iCAAiC,CAAC,CAAC;SACjD;KACF;SAAM,IAAI,CAAC,UAAU,IAAI,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QACzC,4BAA4B;QAC5B,gBAAG,CAAC,IAAI,CAAC,EAAE,EAAE,+BAA+B,CAAC,CAAC;QAE9C,OAAO,IAAA,kCAAe,EAAC,QAAQ,EAAE;YAC/B,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAG,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC;YACjD,iBAAiB;SAClB,CAAC,CAAC;KACJ;IAED,gBAAG,CAAC,IAAI,CAAC,EAAE,EAAE,sCAAsC,UAAU,EAAE,CAAC,CAAC;IAEjE,MAAM,OAAO,GAAG,IAAA,uCAAiB,EAAC,UAAoB,EAAE,QAAQ,EAAE,cAAc,CAAC,aAAyB,CAAC,CAAC;IAC5G,MAAM,SAAS,GACb,CAAC,cAAc,CAAC,IAAI,IAAI,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;QAC3D,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK;QACb,CAAC,CAAC,6DAA6D;YAC7D,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC;IAClC,MAAM,QAAQ,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAC9B,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAEhG,OAAO,IAAA,kCAAe,EAAC,QAAQ,EAAE;QAC/B,WAAW,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC;QACrF,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAG,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC;QACjD,iBAAiB;KAClB,CAAC,CAAC;AACL,CAAC;AAlGD,wCAkGC"}
1
+ {"version":3,"file":"collect-updates.js","sourceRoot":"","sources":["../../../src/utils/collect-updates/collect-updates.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAyB;AAKzB,kDAAkD;AAClD,6DAAyD;AACzD,2EAAqE;AACrE,6CAAyC;AACzC,mEAA8D;AAE9D;;;;;;GAMG;AACH,SAAgB,cAAc,CAC5B,gBAA2B,EAC3B,YAA0B,EAC1B,QAAkB,EAClB,cAAsC,EACtC,MAAM,GAAG,KAAK;IAEd,MAAM,EAAE,YAAY,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,aAAa,EAAE,GAAG,cAAc,CAAC;IAErH,6FAA6F;IAC7F,MAAM,uBAAuB,GAAG,mBAAmB,IAAI,oBAAoB,CAAC;IAC5E,MAAM,MAAM,GAAG,IAAA,8CAAoB,EACjC,uBAAuB,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAE,YAAmC,CACtF,CAAC;IAEF,MAAM,QAAQ,GACZ,gBAAgB,CAAC,MAAM,KAAK,YAAY,CAAC,IAAI;QAC3C,CAAC,CAAC,YAAY;QACd,CAAC,CAAC,IAAI,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAElF,IAAI,UAAU,GAAG,cAAc,CAAC,KAAK,CAAC;IACtC,MAAM,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IAE9C,IAAI,IAAA,kBAAO,EAAC,QAAQ,EAAE,UAAU,CAAC,EAAE;QACjC,MAAM,eAAe,GAAuB;YAC1C,GAAG,QAAQ;SACZ,CAAC;QAEF,IAAI,aAAa,EAAE;YACjB,eAAe,CAAC,KAAK,GAAG,UAAU,CAAC;SACpC;QAED,wDAAwD;QACxD,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,IAAA,8BAAe,EAAC,eAAe,EAAE,cAAc,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;QAClH,+BAA+B;QAE/B,IAAI,QAAQ,KAAK,GAAG,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE;YACxD,oCAAoC;YACpC,gBAAG,CAAC,MAAM,CAAC,EAAE,EAAE,8DAA8D,CAAC,CAAC;YAE/E,OAAO,EAAE,CAAC;SACX;QAED,IAAI,cAAc,CAAC,MAAM,EAAE;YACzB,qFAAqF;YACrF,+FAA+F;YAC/F,UAAU,GAAG,GAAG,GAAG,MAAM,GAAG,EAAE,CAAC;SAChC;aAAM,IAAI,CAAC,UAAU,EAAE;YACtB,4EAA4E;YAC5E,UAAU,GAAG,WAAW,CAAC;SAC1B;KACF;IAED,IAAI,MAAM,CAAC,IAAI,EAAE;QACf,oFAAoF;QACpF,gBAAG,CAAC,IAAI,CACN,uBAAuB,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,eAAe,EACnE,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAC1E,CAAC;KACH;IAED,IAAI,uBAAuB,EAAE;QAC3B,iDAAiD;QACjD,IAAI,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACnB,gBAAG,CAAC,IAAI,CAAC,EAAE,EAAE,qCAAqC,CAAC,CAAC;SACrD;aAAM;YACL,gBAAG,CAAC,IAAI,CAAC,EAAE,EAAE,iCAAiC,CAAC,CAAC;SACjD;KACF;SAAM,IAAI,CAAC,UAAU,IAAI,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QACzC,4BAA4B;QAC5B,gBAAG,CAAC,IAAI,CAAC,EAAE,EAAE,+BAA+B,CAAC,CAAC;QAE9C,OAAO,IAAA,kCAAe,EAAC,QAAQ,EAAE;YAC/B,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAG,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC;YACjD,iBAAiB;SAClB,CAAC,CAAC;KACJ;IAED,gBAAG,CAAC,IAAI,CAAC,EAAE,EAAE,sCAAsC,UAAU,EAAE,CAAC,CAAC;IAEjE,MAAM,OAAO,GAAG,IAAA,uCAAiB,EAAC,UAAoB,EAAE,QAAQ,EAAE,cAAc,CAAC,aAAyB,CAAC,CAAC;IAC5G,MAAM,SAAS,GACb,CAAC,cAAc,CAAC,IAAI,IAAI,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;QAC3D,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK;QACb,CAAC,CAAC,6DAA6D;YAC7D,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC;IAClC,MAAM,QAAQ,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAC9B,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAEhG,OAAO,IAAA,kCAAe,EAAC,QAAQ,EAAE;QAC/B,WAAW,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC;QACrF,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAG,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC;QACjD,iBAAiB;KAClB,CAAC,CAAC;AACL,CAAC;AA9FD,wCA8FC"}
@@ -4,10 +4,10 @@ import { DescribeRefDetailedResult, DescribeRefFallbackResult, DescribeRefOption
4
4
  * @param {boolean} [includeMergedTags]
5
5
  * @returns {Promise<DescribeRefFallbackResult|DescribeRefDetailedResult>}
6
6
  */
7
- declare function describeRef(options?: DescribeRefOptions, includeMergedTags?: boolean, gitDryRun?: boolean): Promise<DescribeRefFallbackResult | DescribeRefDetailedResult>;
7
+ declare function describeRef(options?: DescribeRefOptions, includeMergedTags?: boolean, dryRun?: boolean): Promise<DescribeRefFallbackResult | DescribeRefDetailedResult>;
8
8
  /**
9
9
  * @param {DescribeRefOptions} [options]
10
10
  * @param {boolean} [includeMergedTags]
11
11
  */
12
- declare function describeRefSync(options?: DescribeRefOptions, includeMergedTags?: boolean, gitDryRun?: boolean): DescribeRefFallbackResult | DescribeRefDetailedResult;
12
+ declare function describeRefSync(options?: DescribeRefOptions, includeMergedTags?: boolean, dryRun?: boolean): DescribeRefFallbackResult | DescribeRefDetailedResult;
13
13
  export { describeRef, describeRefSync };
@@ -37,8 +37,8 @@ function getArgs(options, includeMergedTags) {
37
37
  * @param {boolean} [includeMergedTags]
38
38
  * @returns {Promise<DescribeRefFallbackResult|DescribeRefDetailedResult>}
39
39
  */
40
- function describeRef(options = {}, includeMergedTags, gitDryRun = false) {
41
- const promise = (0, child_process_1.exec)('git', getArgs(options, includeMergedTags), options, gitDryRun);
40
+ function describeRef(options = {}, includeMergedTags, dryRun = false) {
41
+ const promise = (0, child_process_1.exec)('git', getArgs(options, includeMergedTags), options, dryRun);
42
42
  return promise.then(({ stdout } = { stdout: '' }) => {
43
43
  const result = parse(stdout, options.cwd);
44
44
  if (options === null || options === void 0 ? void 0 : options.match) {
@@ -55,8 +55,8 @@ exports.describeRef = describeRef;
55
55
  * @param {DescribeRefOptions} [options]
56
56
  * @param {boolean} [includeMergedTags]
57
57
  */
58
- function describeRefSync(options = {}, includeMergedTags, gitDryRun = false) {
59
- const stdout = (0, child_process_1.execSync)('git', getArgs(options, includeMergedTags), options, gitDryRun);
58
+ function describeRefSync(options = {}, includeMergedTags, dryRun = false) {
59
+ const stdout = (0, child_process_1.execSync)('git', getArgs(options, includeMergedTags), options, dryRun);
60
60
  const result = parse(stdout, options.cwd);
61
61
  if (options === null || options === void 0 ? void 0 : options.match) {
62
62
  npmlog_1.default.verbose('git-describe.sync', '%j => %j', options === null || options === void 0 ? void 0 : options.match, stdout);
@@ -1 +1 @@
1
- {"version":3,"file":"describe-ref.js","sourceRoot":"","sources":["../../src/utils/describe-ref.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"describe-ref.js","sourceRoot":"","sources":["../../src/utils/describe-ref.ts"],"names":[],"mappings":"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"}
@@ -8,6 +8,7 @@ export * from './env-replace';
8
8
  export * from './find-prefix';
9
9
  export * from './log-package-error';
10
10
  export * from './npm-conf';
11
+ export * from './object-utils';
11
12
  export * from './output';
12
13
  export * from './parse-field';
13
14
  export * from './prerelease-id-from-version';
@@ -25,6 +25,7 @@ __exportStar(require("./env-replace"), exports);
25
25
  __exportStar(require("./find-prefix"), exports);
26
26
  __exportStar(require("./log-package-error"), exports);
27
27
  __exportStar(require("./npm-conf"), exports);
28
+ __exportStar(require("./object-utils"), exports);
28
29
  __exportStar(require("./output"), exports);
29
30
  __exportStar(require("./parse-field"), exports);
30
31
  __exportStar(require("./prerelease-id-from-version"), exports);
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,uDAAqC;AACrC,gDAA8B;AAC9B,wDAAsC;AACtC,yCAAyC;AACzC,6CAA2B;AAC3B,iDAA+B;AAC/B,gDAA8B;AAC9B,gDAA8B;AAC9B,sDAAoC;AACpC,6CAA2B;AAC3B,2CAAyB;AACzB,gDAA8B;AAC9B,+DAA6C;AAC7C,oDAAkC;AAClC,gDAA8B;AAC9B,kDAAgC;AAChC,sDAAoC;AACpC,+CAA6B;AAC7B,0CAAwB;AACxB,oDAAkC;AAClC,mDAAiC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,uDAAqC;AACrC,gDAA8B;AAC9B,wDAAsC;AACtC,yCAAyC;AACzC,6CAA2B;AAC3B,iDAA+B;AAC/B,gDAA8B;AAC9B,gDAA8B;AAC9B,sDAAoC;AACpC,6CAA2B;AAC3B,iDAA+B;AAC/B,2CAAyB;AACzB,gDAA8B;AAC9B,+DAA6C;AAC7C,oDAAkC;AAClC,gDAA8B;AAC9B,kDAAgC;AAChC,sDAAoC;AACpC,+CAA6B;AAC7B,0CAAwB;AACxB,oDAAkC;AAClC,mDAAiC"}
@@ -0,0 +1,16 @@
1
+ /**
2
+ * From a dot (.) notation path, find and delete a property within an object if found given a complex object path
3
+ * @param {Object} object - object to search from
4
+ * @param {String} path - complex object path to find descendant property from, must be a string with dot (.) notation
5
+ * @param {String} [sourceName] - source name of which object name to delete the field from.
6
+ */
7
+ export declare function deleteComplexObjectProp(object: any, path: string, sourceName?: string): any;
8
+ /**
9
+ * From a dot (.) notation path, find and return a property within an object given a complex object path
10
+ * Note that the object path does should not include the parent itself
11
+ * for example if we want to get `address.zip` from `user` object, we would call `getComplexObjectValue(user, 'address.zip')`
12
+ * @param object - object to search from
13
+ * @param path - complex object path to find descendant property from, must be a string with dot (.) notation
14
+ * @returns outputValue - the object property value found if any
15
+ */
16
+ export declare function getComplexObjectValue<T>(object: any, path: string): T;
@@ -0,0 +1,46 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.getComplexObjectValue = exports.deleteComplexObjectProp = void 0;
7
+ const npmlog_1 = __importDefault(require("npmlog"));
8
+ /**
9
+ * From a dot (.) notation path, find and delete a property within an object if found given a complex object path
10
+ * @param {Object} object - object to search from
11
+ * @param {String} path - complex object path to find descendant property from, must be a string with dot (.) notation
12
+ * @param {String} [sourceName] - source name of which object name to delete the field from.
13
+ */
14
+ function deleteComplexObjectProp(object, path, sourceName) {
15
+ if (!object || !path) {
16
+ return object;
17
+ }
18
+ const props = path.split('.');
19
+ const lastProp = props.slice(-1).pop();
20
+ return props.reduce((obj, prop) => {
21
+ if (lastProp !== undefined && (obj === null || obj === void 0 ? void 0 : obj[prop]) !== undefined && prop === lastProp) {
22
+ delete obj[prop];
23
+ npmlog_1.default.verbose('mutation', `Removed "${path}" field from ${sourceName || 'n/a'}.`);
24
+ }
25
+ else {
26
+ return obj === null || obj === void 0 ? void 0 : obj[prop];
27
+ }
28
+ }, object);
29
+ }
30
+ exports.deleteComplexObjectProp = deleteComplexObjectProp;
31
+ /**
32
+ * From a dot (.) notation path, find and return a property within an object given a complex object path
33
+ * Note that the object path does should not include the parent itself
34
+ * for example if we want to get `address.zip` from `user` object, we would call `getComplexObjectValue(user, 'address.zip')`
35
+ * @param object - object to search from
36
+ * @param path - complex object path to find descendant property from, must be a string with dot (.) notation
37
+ * @returns outputValue - the object property value found if any
38
+ */
39
+ function getComplexObjectValue(object, path) {
40
+ if (!object || !path) {
41
+ return object;
42
+ }
43
+ return path.split('.').reduce((obj, prop) => obj === null || obj === void 0 ? void 0 : obj[prop], object);
44
+ }
45
+ exports.getComplexObjectValue = getComplexObjectValue;
46
+ //# sourceMappingURL=object-utils.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"object-utils.js","sourceRoot":"","sources":["../../src/utils/object-utils.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAyB;AAEzB;;;;;GAKG;AACH,SAAgB,uBAAuB,CAAC,MAAW,EAAE,IAAY,EAAE,UAAmB;IACpF,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE;QACpB,OAAO,MAAM,CAAC;KACf;IACD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC9B,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;IAEvC,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QAChC,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAG,IAAI,CAAC,MAAK,SAAS,IAAI,IAAI,KAAK,QAAQ,EAAE;YAC5E,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC;YACjB,gBAAG,CAAC,OAAO,CAAC,UAAU,EAAE,YAAY,IAAI,gBAAgB,UAAU,IAAI,KAAK,GAAG,CAAC,CAAC;SACjF;aAAM;YACL,OAAO,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAG,IAAI,CAAC,CAAC;SACpB;IACH,CAAC,EAAE,MAAM,CAAC,CAAC;AACb,CAAC;AAfD,0DAeC;AAED;;;;;;;GAOG;AACH,SAAgB,qBAAqB,CAAI,MAAW,EAAE,IAAY;IAChE,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE;QACpB,OAAO,MAAM,CAAC;KACf;IACD,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAG,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC;AACpE,CAAC;AALD,sDAKC"}
@@ -1 +1 @@
1
- export declare function pulseTillDone(prefix: string | Promise<string>, promise?: Promise<any> | string): Promise<any>;
1
+ export declare function pulseTillDone(prefix: string | Promise<unknown>, promise?: Promise<any> | string): Promise<any>;
@@ -1 +1 @@
1
- {"version":3,"file":"pulse-till-done.js","sourceRoot":"","sources":["../../src/utils/pulse-till-done.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAyB;AAEzB,IAAI,OAAO,GAAG,CAAC,CAAC;AAChB,IAAI,KAAU,CAAC;AAEf,SAAS,UAAU,CAAC,MAAgC;IAClD,OAAO,IAAI,CAAC,CAAC;IAEb,IAAI,OAAO,GAAG,CAAC,EAAE;QACf,OAAO;KACR;IAED,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,gBAAG,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC;AAC1D,CAAC;AAED,SAAS,SAAS;IAChB,OAAO,IAAI,CAAC,CAAC;IAEb,IAAI,OAAO,GAAG,CAAC,EAAE;QACf,OAAO;KACR;IAED,aAAa,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED,SAAgB,aAAa,CAAC,MAAgC,EAAE,OAA+B;IAC7F,IAAI,CAAC,OAAO,EAAE;QACZ,sCAAsC;QACtC,OAAO,GAAG,MAAM,CAAC;QACjB,MAAM,GAAG,EAAE,CAAC;QACZ,qCAAqC;KACtC;IAED,UAAU,CAAC,MAAM,CAAC,CAAC;IAEnB,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAClC,CAAC,GAAG,EAAE,EAAE;QACN,SAAS,EAAE,CAAC;QACZ,OAAO,GAAG,CAAC;IACb,CAAC,EACD,CAAC,GAAG,EAAE,EAAE;QACN,SAAS,EAAE,CAAC;QACZ,MAAM,GAAG,CAAC;IACZ,CAAC,CACF,CAAC;AACJ,CAAC;AApBD,sCAoBC"}
1
+ {"version":3,"file":"pulse-till-done.js","sourceRoot":"","sources":["../../src/utils/pulse-till-done.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAyB;AAEzB,IAAI,OAAO,GAAG,CAAC,CAAC;AAChB,IAAI,KAAU,CAAC;AAEf,SAAS,UAAU,CAAC,MAAiC;IACnD,OAAO,IAAI,CAAC,CAAC;IAEb,IAAI,OAAO,GAAG,CAAC,EAAE;QACf,OAAO;KACR;IAED,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,gBAAG,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC;AAC1D,CAAC;AAED,SAAS,SAAS;IAChB,OAAO,IAAI,CAAC,CAAC;IAEb,IAAI,OAAO,GAAG,CAAC,EAAE;QACf,OAAO;KACR;IAED,aAAa,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED,SAAgB,aAAa,CAAC,MAAiC,EAAE,OAA+B;IAC9F,IAAI,CAAC,OAAO,EAAE;QACZ,sCAAsC;QACtC,OAAO,GAAG,MAAM,CAAC;QACjB,MAAM,GAAG,EAAE,CAAC;QACZ,qCAAqC;KACtC;IAED,UAAU,CAAC,MAAM,CAAC,CAAC;IAEnB,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAClC,CAAC,GAAG,EAAE,EAAE;QACN,SAAS,EAAE,CAAC;QACZ,OAAO,GAAG,CAAC;IACb,CAAC,EACD,CAAC,GAAG,EAAE,EAAE;QACN,SAAS,EAAE,CAAC;QACZ,MAAM,GAAG,CAAC;IACZ,CAAC,CACF,CAAC;AACJ,CAAC;AApBD,sCAoBC"}