beachball 2.32.3 → 2.33.0

package/lib/git/ensureSharedHistory.js

@@ -0,0 +1,156 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureSharedHistory = void 0;
+const workspace_tools_1 = require("workspace-tools");
+const fetch_1 = require("./fetch");
+/**
+ * Ensure that adequate history is available to check for changes between HEAD and `options.branch`.
+ * Otherwise attempting to get changes will fail with an error "no merge base".
+ * (This is mostly an issue with CI builds that use shallow clones.)
+ *
+ * Throws an error if history is inadequate and cannot be fixed.
+ */
+function ensureSharedHistory(options) {
+    const { fetch, path: cwd, branch, depth, verbose } = options;
+    // `branch` should *usually* include a remote, but it's not guaranteed (see doc comment).
+    // `remote` is the remote name (e.g. "origin") or "" if `branch` was missing a remote.
+    // `remoteBranch` is the comparison branch name (e.g. "main").
+    const { remote, remoteBranch } = workspace_tools_1.parseRemoteBranch(branch);
+    // Ensure the comparison branch ref exists
+    if (!hasBranchRef(branch, cwd)) {
+        if (!fetch) {
+            // If fetching is disabled, the target branch must be available for comparison locally.
+            // This is most likely to be an issue in a CI build which does a shallow checkout (github
+            // actions/checkout does this by default) and also disables beachball fetching.
+            logError('missing-branch', branch, remote, remoteBranch);
+            throw new Error(`Target branch "${branch}" does not exist locally, and fetching is disabled`);
+        }
+        if (!remote) {
+            // If the remote isn't specified, even if fetching is allowed it will be unclear what to
+            // compare against
+            throw new Error(`Target branch "${branch}" doesn't exist locally, and a remote name wasn't specified and couldn't be inferred. ` +
+                'Please set "repository" in your root package.json or include a remote in the beachball "branch" setting.');
+        }
+        // If fetching the requested branch isn't already (probably) configured, add it to the list so
+        // it can be fetched in the next step. Otherwise the ref <remote>/<remoteBranch> won't exist locally.
+        const fetchConfig = workspace_tools_1.git(['config', '--get-all', `remote.${remote}.fetch`], { cwd }).stdout.trim();
+        if (!fetchConfig.includes(`${remote}/*`) && !fetchConfig.includes(branch)) {
+            console.log(`Adding branch "${remoteBranch}" to fetch config for remote "${remote}"`);
+            const result = workspace_tools_1.git(['remote', 'set-branches', '--add', remote, remoteBranch], { cwd });
+            if (!result.success) {
+                throw new Error(`Failed to add branch "${remoteBranch}" to fetch config for remote "${remote}":\n${result.stderr}`);
+            }
+        }
+    }
+    if (fetch) {
+        // Fetch the latest from the remote branch for comparison. If the specified remoteBranch doesn't
+        // exist (or there's a network error or something), this will return an error.
+        const result = fetch_1.gitFetch({
+            remote,
+            branch: remoteBranch,
+            cwd,
+            verbose,
+            // Only use "depth" if the repo is already shallow, since fetching a normal repo with --depth
+            // will convert it to shallow (which is likely not desired and could be confusing)
+            depth: depth && isShallowRepository(cwd) ? depth : undefined,
+        });
+        if (!result.success) {
+            throw new Error(result.errorMessage);
+        }
+    }
+    // Verify that HEAD and the target branch share history
+    let isConnected = hasCommonCommit(branch, cwd);
+    if (!isConnected) {
+        // If this is a shallow repo, history may not go back far enough to connect the branches
+        if (isShallowRepository(cwd)) {
+            if (!fetch) {
+                // Fetching is disabled, so the lack of history can't be fixed
+                logError('shallow-clone', branch, remote, remoteBranch);
+                throw new Error(`Inadequate history available to connect HEAD to target branch "${branch}"`);
+            }
+            // Try fetching more history
+            isConnected = deepenHistory({ remote, remoteBranch, branch, depth, cwd, verbose });
+        }
+        if (!isConnected) {
+            throw new Error(`HEAD does not appear to share history with target branch "${branch}"`);
+        }
+    }
+}
+exports.ensureSharedHistory = ensureSharedHistory;
+/**
+ * Try to deepen history of a shallow clone to find a common commit with the target branch.
+ * Returns true if a common commit can be found after fetching more history.
+ * Throws if there's any issue
+ */
+function deepenHistory(params) {
+    const { remote, remoteBranch, branch, cwd, verbose } = params;
+    const depth = params.depth || 100;
+    console.log(`This is a shallow clone. Deepening to check for changes...`);
+    // Iteratively deepen the history
+    const maxAttempts = 3;
+    for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+        console.log(`Deepening by ${depth} more commits (attempt ${attempt}/${maxAttempts})...`);
+        const result = fetch_1.gitFetch({ remote, branch: remoteBranch, deepen: depth, cwd, verbose });
+        if (!result.success) {
+            throw new Error(`Failed to fetch more history (see above for details)`);
+        }
+        if (hasCommonCommit(branch, cwd)) {
+            // Fetched enough history to find a common commit
+            return true;
+        }
+        if (!isShallowRepository(cwd)) {
+            // Fetched all history and still no common commit
+            return false;
+        }
+    }
+    // No common commit was found and the repo is still shallow, so fully unshallow it
+    console.log(`Still didn't find a common commit after deepening by ${depth * maxAttempts}. Unshallowing...`);
+    const result = fetch_1.gitFetch({ remote, branch: remoteBranch, unshallow: true, cwd, verbose });
+    if (!result.success) {
+        throw new Error(`Failed to unshallow repo (see above for details)`);
+    }
+    return hasCommonCommit(branch, cwd);
+}
+function logError(error, branch, remote, remoteBranch) {
+    let mainError;
+    let mitigationSteps;
+    switch (error) {
+        case 'missing-branch':
+            // Due to checks in the calling method, "remote" should be non-empty here
+            mainError = `Target branch "${branch}" does not exist locally, and fetching is disabled.`;
+            mitigationSteps = `- Fetch the branch manually:\n   git remote set-branches --add ${remote} ${remoteBranch} && git fetch ${remote}`;
+            break;
+        case 'shallow-clone':
+            mainError =
+                'This repo is a shallow clone, fetching is disabled, and not enough history is ' +
+                    `available to connect HEAD to "${branch}".`;
+            mitigationSteps = [
+                "- Verify that you're using the correct target branch",
+                '- Unshallow or deepen the clone manually',
+            ].join('\n');
+            break;
+    }
+    console.error(`
+
+${mainError}
+
+Some possible fixes:
+${mitigationSteps}
+- Omit the "--no-fetch" / "--fetch=false" option from the command line
+- Remove "fetch: false" from the beachball config
+- If this is a CI build, ensure that adequate history is being fetched
+  - For GitHub Actions (actions/checkout), add the option "fetch-depth: 0" in the checkout step
+
+`);
+}
+function hasBranchRef(branch, cwd) {
+    return workspace_tools_1.git(['rev-parse', '--verify', branch], { cwd }).success;
+}
+function isShallowRepository(cwd) {
+    return workspace_tools_1.git(['rev-parse', '--is-shallow-repository'], { cwd }).stdout.trim() === 'true';
+}
+/** Returns whether `branch` and HEAD have a common commit anywhere in their history */
+function hasCommonCommit(branch, cwd) {
+    return workspace_tools_1.git(['merge-base', branch, 'HEAD'], { cwd }).success;
+}
+//# sourceMappingURL=ensureSharedHistory.js.map

package/lib/git/ensureSharedHistory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ensureSharedHistory.js","sourceRoot":"","sources":["../../src/git/ensureSharedHistory.ts"],"names":[],"mappings":"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"}

package/lib/git/fetch.d.ts

@@ -0,0 +1,25 @@
+import { GitProcessOutput } from 'workspace-tools';
+declare type GitFetchParams = {
+    cwd: string;
+    /** Remote to fetch from. If not specified, fetches all remotes. */
+    remote?: string;
+    /** Branch to fetch. This will be ignored if `remote` is not also specified. */
+    branch?: string;
+    /** Set depth to this number of commits (mutually exclusive with `deepen` and `unshallow`) */
+    depth?: number;
+    /** Deepen a shallow clone by this number of commits (mutually exclusive with `depth` and `unshallow`) */
+    deepen?: number;
+    /** Convert this from a shallow clone to a full clone (mutually exclusive with `depth` and `deepen`) */
+    unshallow?: true;
+    verbose?: boolean;
+};
+/**
+ * Wrapper for `git fetch`. If `verbose` is true, log the command before starting, and display output
+ * on stdout (except in tests). In tests with `verbose`, the output will be logged all together to
+ * `console.log` when the command finishes (for easier mocking/capturing).
+ */
+export declare function gitFetch(params: GitFetchParams): GitProcessOutput & {
+    errorMessage?: string;
+};
+export {};
+//# sourceMappingURL=fetch.d.ts.map

package/lib/git/fetch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../src/git/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGxD,aAAK,cAAc,GAAG;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,mEAAmE;IACnE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,+EAA+E;IAC/E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,6FAA6F;IAC7F,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,yGAAyG;IACzG,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uGAAuG;IACvG,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,gBAAgB,GAAG;IAAE,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,CAqD7F"}

package/lib/git/fetch.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.gitFetch = void 0;
+const workspace_tools_1 = require("workspace-tools");
+const gitAsync_1 = require("./gitAsync");
+/**
+ * Wrapper for `git fetch`. If `verbose` is true, log the command before starting, and display output
+ * on stdout (except in tests). In tests with `verbose`, the output will be logged all together to
+ * `console.log` when the command finishes (for easier mocking/capturing).
+ */
+function gitFetch(params) {
+    const { remote, branch, depth, deepen, unshallow, cwd, verbose } = params;
+    const { shouldLog } = gitAsync_1.getGitEnv(verbose);
+    if ([depth, deepen, unshallow].filter(v => v !== undefined).length > 1) {
+        throw new Error('"depth", "deepen", and "unshallow" are mutually exclusive');
+    }
+    const extraArgs = depth ? [`--depth=${depth}`] : deepen ? [`--deepen=${deepen}`] : unshallow ? ['--unshallow'] : [];
+    let description = remote
+        ? `Fetching ${branch ? `branch "${branch}" from ` : ''}remote "${remote}"`
+        : 'Fetching all remotes';
+    if (extraArgs.length) {
+        description += ` (with ${extraArgs.join(' ')})`;
+    }
+    shouldLog && console.log(description + '...');
+    const result = workspace_tools_1.git([
+        'fetch',
+        ...extraArgs,
+        // If the remote is unknown, don't specify the branch (fetching a branch without a remote is invalid)
+        ...(remote && branch ? [remote, branch] : remote ? [remote] : []),
+    ], { cwd, stdio: shouldLog === 'live' ? 'inherit' : 'pipe' });
+    const log = result.success ? console.log : console.warn;
+    // do the jest logging all at once in a way that can be captured by mocks (jest can't mock process.stdout/err)
+    if (shouldLog === 'end') {
+        result.stdout && console.log(result.stdout);
+        result.stderr && log(result.stderr);
+    }
+    let message = `${description} ${result.success ? 'completed successfully' : `failed (code ${result.status})`}`;
+    if (shouldLog) {
+        log(message);
+        message += ' - see above for details';
+    }
+    else if (result.stdout && result.stderr) {
+        message += `\nstdout:\n${result.stdout}\nstderr:\n${result.stderr}`;
+    }
+    else if (result.stdout || result.stderr) {
+        message += ` - output:\n${result.stdout || result.stderr}`;
+    }
+    if (!result.success) {
+        result.errorMessage = message;
+    }
+    return result;
+}
+exports.gitFetch = gitFetch;
+//# sourceMappingURL=fetch.js.map

package/lib/git/fetch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../src/git/fetch.ts"],"names":[],"mappings":"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"}

package/lib/git/generateTag.d.ts

@@ -0,0 +1,3 @@
+/** Get a standardized package version git tag: `${name}_v${version}` */
+export declare function generateTag(name: string, version: string): string;
+//# sourceMappingURL=generateTag.d.ts.map

package/lib/git/generateTag.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generateTag.d.ts","sourceRoot":"","sources":["../../src/git/generateTag.ts"],"names":[],"mappings":"AAAA,wEAAwE;AACxE,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,UAExD"}

package/lib/{tag.js → git/generateTag.js}

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateTag = void 0;
+/** Get a standardized package version git tag: `${name}_v${version}` */
 function generateTag(name, version) {
     return `${name}_v${version}`;
 }
 exports.generateTag = generateTag;
-//# sourceMappingURL=tag.js.map
+//# sourceMappingURL=generateTag.js.map

package/lib/git/generateTag.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generateTag.js","sourceRoot":"","sources":["../../src/git/generateTag.ts"],"names":[],"mappings":";;;AAAA,wEAAwE;AACxE,SAAgB,WAAW,CAAC,IAAY,EAAE,OAAe;IACvD,OAAO,GAAG,IAAI,KAAK,OAAO,EAAE,CAAC;AAC/B,CAAC;AAFD,kCAEC"}

package/lib/git/gitAsync.d.ts

@@ -0,0 +1,33 @@
+import execa from 'execa';
+export declare type GitAsyncOptions = Omit<execa.Options, 'cwd' | 'all' | 'stdio' | 'stdout' | 'stderr' | 'stdin' | 'reject'> & {
+    cwd: string;
+    verbose?: boolean;
+};
+export declare type GitAsyncResult = ((Omit<execa.ExecaReturnValue<string>, 'failed'> & {
+    success: true;
+}) | (Omit<execa.ExecaError<string>, 'failed'> & {
+    success: false;
+})) & {
+    errorMessage?: string;
+};
+/**
+ * Run a git command asynchronously. If `verbose` is true, log the command before starting, and display
+ * output on stdout (except in tests) *and* return it in the result. For tests with `verbose`, the output
+ * will be logged all together to `console.log` when the command finishes (for easier mocking/capturing).
+ *
+ * (This utility should potentially be moved to `workspace-tools`, but it uses `execa` to capture
+ * interleaved stdout/stderr, and `execa` is a large-ish dep not currently used there.)
+ */
+export declare function gitAsync(args: string[], options: GitAsyncOptions): Promise<GitAsyncResult>;
+export declare function getGitEnv(verbose: boolean | undefined): {
+    /**
+     * If/when to log git commands and output:
+     * - false: never (but return output in result)
+     * - 'live': log command, and pipe output to stdout/stderr (if `verbose` or `process.env.GIT_DEBUG`, except in tests)
+     * - 'end': log command, and log output at the end (for tests, if `verbose` or `process.env.GIT_DEBUG`)
+     */
+    shouldLog: false | 'live' | 'end';
+    /** Max buffer for git operations, copied from workspace-tools implementation */
+    maxBuffer: number;
+};
+//# sourceMappingURL=gitAsync.d.ts.map

package/lib/git/gitAsync.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gitAsync.d.ts","sourceRoot":"","sources":["../../src/git/gitAsync.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,oBAAY,eAAe,GAAG,IAAI,CAChC,KAAK,CAAC,OAAO,EACb,KAAK,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,GAAG,OAAO,GAAG,QAAQ,CACnE,GAAG;IACF,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,oBAAY,cAAc,GAAG,CACzB,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,GAAG;IAAE,OAAO,EAAE,IAAI,CAAA;CAAE,CAAC,GACpE,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,GAAG;IAAE,OAAO,EAAE,KAAK,CAAA;CAAE,CAAC,CAClE,GAAG;IAAE,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE9B;;;;;;;GAOG;AACH,wBAAsB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC,CA2ChG;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,GAAG;IACvD;;;;;OAKG;IACH,SAAS,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,CAAC;IAClC,gFAAgF;IAChF,SAAS,EAAE,MAAM,CAAC;CACnB,CASA"}

package/lib/git/gitAsync.js

@@ -0,0 +1,63 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getGitEnv = exports.gitAsync = void 0;
+const execa_1 = __importDefault(require("execa"));
+/**
+ * Run a git command asynchronously. If `verbose` is true, log the command before starting, and display
+ * output on stdout (except in tests) *and* return it in the result. For tests with `verbose`, the output
+ * will be logged all together to `console.log` when the command finishes (for easier mocking/capturing).
+ *
+ * (This utility should potentially be moved to `workspace-tools`, but it uses `execa` to capture
+ * interleaved stdout/stderr, and `execa` is a large-ish dep not currently used there.)
+ */
+async function gitAsync(args, options) {
+    const { verbose, ...execaOpts } = options;
+    const { shouldLog, maxBuffer } = getGitEnv(verbose);
+    const gitCmd = `git ${args.join(' ')}`;
+    shouldLog && console.log(`Running: ${gitCmd}`);
+    const child = execa_1.default('git', args, {
+        maxBuffer,
+        ...execaOpts,
+        stdio: 'pipe',
+        all: true,
+        reject: false,
+    });
+    if (shouldLog === 'live') {
+        child.stdout.pipe(process.stdout);
+        child.stderr.pipe(process.stderr);
+    }
+    const execaResult = await child;
+    const result = { ...execaResult, success: !execaResult.failed };
+    const log = result.success ? console.log : console.warn;
+    if (shouldLog === 'end') {
+        // do the jest logging all at once in a way that can be captured by mocks
+        log(result.all);
+    }
+    let message = `${gitCmd} ${result.success ? 'completed successfully' : `failed (code ${result.exitCode})`}`;
+    if (shouldLog) {
+        log(message);
+    }
+    else {
+        message += ` - output:\n${result.all}`;
+    }
+    if (!result.success) {
+        result.errorMessage = message;
+    }
+    return result;
+}
+exports.gitAsync = gitAsync;
+function getGitEnv(verbose) {
+    verbose = verbose || !!process.env.GIT_DEBUG;
+    const isJest = !!process.env.JEST_WORKER_ID;
+    const maxBuffer = process.env.GIT_MAX_BUFFER && parseInt(process.env.GIT_MAX_BUFFER, 10);
+    return {
+        shouldLog: verbose ? (isJest ? 'end' : 'live') : false,
+        // isVerbose: verbose || !!process.env.GIT_DEBUG,
+        maxBuffer: maxBuffer || 500 * 1024 * 1024,
+    };
+}
+exports.getGitEnv = getGitEnv;
+//# sourceMappingURL=gitAsync.js.map

package/lib/git/gitAsync.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"gitAsync.js","sourceRoot":"","sources":["../../src/git/gitAsync.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAkB1B;;;;;;;GAOG;AACI,KAAK,UAAU,QAAQ,CAAC,IAAc,EAAE,OAAwB;IACrE,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,GAAG,OAAO,CAAC;IAC1C,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IAEpD,MAAM,MAAM,GAAG,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IAEvC,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,MAAM,EAAE,CAAC,CAAC;IAE/C,MAAM,KAAK,GAAG,eAAK,CAAC,KAAK,EAAE,IAAI,EAAE;QAC/B,SAAS;QACT,GAAG,SAAS;QACZ,KAAK,EAAE,MAAM;QACb,GAAG,EAAE,IAAI;QACT,MAAM,EAAE,KAAK;KACd,CAAC,CAAC;IAEH,IAAI,SAAS,KAAK,MAAM,EAAE;QACxB,KAAK,CAAC,MAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACnC,KAAK,CAAC,MAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;KACpC;IAED,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC;IAChC,MAAM,MAAM,GAAG,EAAE,GAAG,WAAW,EAAE,OAAO,EAAE,CAAC,WAAW,CAAC,MAAM,EAAoB,CAAC;IAElF,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;IAExD,IAAI,SAAS,KAAK,KAAK,EAAE;QACvB,yEAAyE;QACzE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;KACjB;IAED,IAAI,OAAO,GAAG,GAAG,MAAM,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,gBAAgB,MAAM,CAAC,QAAQ,GAAG,EAAE,CAAC;IAC5G,IAAI,SAAS,EAAE;QACb,GAAG,CAAC,OAAO,CAAC,CAAC;KACd;SAAM;QACL,OAAO,IAAI,eAAe,MAAM,CAAC,GAAG,EAAE,CAAC;KACxC;IAED,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;QACnB,MAAM,CAAC,YAAY,GAAG,OAAO,CAAC;KAC/B;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AA3CD,4BA2CC;AAED,SAAgB,SAAS,CAAC,OAA4B;IAWpD,OAAO,GAAG,OAAO,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;IAC7C,MAAM,MAAM,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;IAC5C,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;IACzF,OAAO;QACL,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK;QACtD,iDAAiD;QACjD,SAAS,EAAE,SAAS,IAAI,GAAG,GAAG,IAAI,GAAG,IAAI;KAC1C,CAAC;AACJ,CAAC;AAnBD,8BAmBC"}

package/lib/monorepo/getPackageGroups.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getPackageGroups.d.ts","sourceRoot":"","sources":["../../src/monorepo/getPackageGroups.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAEhE,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAGnE,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB,EAAE,GAAG,SAAS,iBAsCnH"}
+{"version":3,"file":"getPackageGroups.d.ts","sourceRoot":"","sources":["../../src/monorepo/getPackageGroups.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAEhE,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAGnE,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB,EAAE,GAAG,SAAS,iBAyCnH"}

package/lib/monorepo/getPackageGroups.js

@@ -7,32 +7,37 @@ exports.getPackageGroups = void 0;
 const path_1 = __importDefault(require("path"));
 const isPathIncluded_1 = require("./isPathIncluded");
 function getPackageGroups(packageInfos, root, groups) {
+    var _a;
+    if (!groups?.length) {
+        return {};
+    }
     const packageGroups = {};
     const packageNameToGroup = {};
-    if (groups && groups.length) {
-        // Check every package to see which group it belongs to
-        for (const [pkgName, info] of Object.entries(packageInfos)) {
-            const packagePath = path_1.default.dirname(info.packageJsonPath);
-            const relativePath = path_1.default.relative(root, packagePath);
-            for (const groupOption of groups) {
-                if (isPathIncluded_1.isPathIncluded(relativePath, groupOption.include, groupOption.exclude)) {
-                    const groupName = groupOption.name;
-                    if (packageNameToGroup[pkgName]) {
-                        console.error(`Error: ${pkgName} cannot belong to multiple groups: [${groupName}, ${packageNameToGroup[pkgName]}]!`);
-                        process.exit(1);
-                    }
-                    packageNameToGroup[pkgName] = groupName;
-                    if (!packageGroups[groupName]) {
-                        packageGroups[groupName] = {
-                            packageNames: [],
-                            disallowedChangeTypes: groupOption.disallowedChangeTypes,
-                        };
-                    }
-                    packageGroups[groupName].packageNames.push(pkgName);
-                }
-            }
+    let hasError = false;
+    // Check every package to see which group it belongs to
+    for (const [pkgName, info] of Object.entries(packageInfos)) {
+        const packagePath = path_1.default.dirname(info.packageJsonPath);
+        const relativePath = path_1.default.relative(root, packagePath);
+        const groupsForPkg = groups.filter(group => isPathIncluded_1.isPathIncluded(relativePath, group.include, group.exclude));
+        if (groupsForPkg.length > 1) {
+            // Keep going after this error to ensure we report all errors
+            console.error(`ERROR: "${pkgName}" cannot belong to multiple groups: [${groupsForPkg.map(g => g.name).join(', ')}]`);
+            hasError = true;
+        }
+        else if (groupsForPkg.length === 1) {
+            const group = groupsForPkg[0];
+            packageNameToGroup[pkgName] = group.name;
+            packageGroups[_a = group.name] ?? (packageGroups[_a] = {
+                packageNames: [],
+                disallowedChangeTypes: group.disallowedChangeTypes,
+            });
+            packageGroups[group.name].packageNames.push(pkgName);
         }
     }
+    if (hasError) {
+        // TODO: probably more appropriate to throw here and let the caller handle it?
+        process.exit(1);
+    }
     return packageGroups;
 }
 exports.getPackageGroups = getPackageGroups;

package/lib/monorepo/getPackageGroups.js.map

@@ -1 +1 @@
-{"version":3,"file":"getPackageGroups.js","sourceRoot":"","sources":["../../src/monorepo/getPackageGroups.ts"],"names":[],"mappings":";;;;;;AACA,gDAAwB;AAExB,qDAAkD;AAElD,SAAgB,gBAAgB,CAAC,YAA0B,EAAE,IAAY,EAAE,MAAyC;IAClH,MAAM,aAAa,GAAkB,EAAE,CAAC;IAExC,MAAM,kBAAkB,GAAsC,EAAE,CAAC;IAEjE,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE;QAC3B,uDAAuD;QACvD,KAAK,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;YAC1D,MAAM,WAAW,GAAG,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YACvD,MAAM,YAAY,GAAG,cAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAEtD,KAAK,MAAM,WAAW,IAAI,MAAM,EAAE;gBAChC,IAAI,+BAAc,CAAC,YAAY,EAAE,WAAW,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE;oBAC1E,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC;oBAEnC,IAAI,kBAAkB,CAAC,OAAO,CAAC,EAAE;wBAC/B,OAAO,CAAC,KAAK,CACX,UAAU,OAAO,uCAAuC,SAAS,KAAK,kBAAkB,CAAC,OAAO,CAAC,IAAI,CACtG,CAAC;wBACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;qBACjB;oBAED,kBAAkB,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;oBAExC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE;wBAC7B,aAAa,CAAC,SAAS,CAAC,GAAG;4BACzB,YAAY,EAAE,EAAE;4BAChB,qBAAqB,EAAE,WAAW,CAAC,qBAAqB;yBACzD,CAAC;qBACH;oBAED,aAAa,CAAC,SAAS,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;iBACrD;aACF;SACF;KACF;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAtCD,4CAsCC"}
+{"version":3,"file":"getPackageGroups.js","sourceRoot":"","sources":["../../src/monorepo/getPackageGroups.ts"],"names":[],"mappings":";;;;;;AACA,gDAAwB;AAExB,qDAAkD;AAElD,SAAgB,gBAAgB,CAAC,YAA0B,EAAE,IAAY,EAAE,MAAyC;;IAClH,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE;QACnB,OAAO,EAAE,CAAC;KACX;IAED,MAAM,aAAa,GAAkB,EAAE,CAAC;IAExC,MAAM,kBAAkB,GAAsC,EAAE,CAAC;IAEjE,IAAI,QAAQ,GAAG,KAAK,CAAC;IAErB,uDAAuD;IACvD,KAAK,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QAC1D,MAAM,WAAW,GAAG,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACvD,MAAM,YAAY,GAAG,cAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAEtD,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,+BAAc,CAAC,YAAY,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QACxG,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3B,6DAA6D;YAC7D,OAAO,CAAC,KAAK,CACX,WAAW,OAAO,wCAAwC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CACtG,CAAC;YACF,QAAQ,GAAG,IAAI,CAAC;SACjB;aAAM,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;YACpC,MAAM,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;YAC9B,kBAAkB,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC;YAEzC,aAAa,MAAC,KAAK,CAAC,IAAI,MAAxB,aAAa,OAAiB;gBAC5B,YAAY,EAAE,EAAE;gBAChB,qBAAqB,EAAE,KAAK,CAAC,qBAAqB;aACnD,EAAC;YACF,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACtD;KACF;IAED,IAAI,QAAQ,EAAE;QACZ,8EAA8E;QAC9E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAzCD,4CAyCC"}

package/lib/monorepo/getPackageInfos.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getPackageInfos.d.ts","sourceRoot":"","sources":["../../src/monorepo/getPackageInfos.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAUzD"}
+{"version":3,"file":"getPackageInfos.d.ts","sourceRoot":"","sources":["../../src/monorepo/getPackageInfos.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAUzD"}

package/lib/monorepo/getPackageInfos.js

@@ -22,54 +22,61 @@ function getPackageInfos(cwd) {
 }
 exports.getPackageInfos = getPackageInfos;
 function getPackageInfosFromWorkspace(projectRoot) {
+    let workspacePackages;
     try {
-        const packageInfos = {};
         // first try using the workspace provided packages (if available)
-        const workspaceInfo = workspace_tools_1.getWorkspaces(projectRoot);
-        if (workspaceInfo && workspaceInfo.length > 0) {
-            workspaceInfo.forEach(info => {
-                const { path: packagePath, packageJson } = info;
-                const packageJsonPath = path_1.default.join(packagePath, 'package.json');
-                try {
-                    packageInfos[packageJson.name] = infoFromPackageJson_1.infoFromPackageJson(packageJson, packageJsonPath);
-                }
-                catch (e) {
-                    // Pass, the package.json is invalid
-                    console.warn(`Invalid package.json file detected ${packageJsonPath}: `, e);
-                }
-            });
-            return packageInfos;
-        }
+        workspacePackages = workspace_tools_1.getWorkspaces(projectRoot);
     }
     catch (e) {
         // not a recognized workspace from workspace-tools
     }
+    if (!workspacePackages?.length) {
+        return;
+    }
+    const packageInfos = {};
+    for (const { path: packagePath, packageJson } of workspacePackages) {
+        const packageJsonPath = path_1.default.join(packagePath, 'package.json');
+        try {
+            packageInfos[packageJson.name] = infoFromPackageJson_1.infoFromPackageJson(packageJson, packageJsonPath);
+        }
+        catch (e) {
+            // Pass, the package.json is invalid
+            console.warn(`Problem processing ${packageJsonPath}: ${e}`);
+        }
+    }
+    return packageInfos;
 }
 function getPackageInfosFromNonWorkspaceMonorepo(projectRoot) {
     const packageJsonFiles = workspace_tools_1.listAllTrackedFiles(['**/package.json', 'package.json'], projectRoot);
+    if (!packageJsonFiles.length) {
+        return;
+    }
     const packageInfos = {};
-    if (packageJsonFiles && packageJsonFiles.length > 0) {
-        packageJsonFiles.forEach(packageJsonPath => {
-            let hasDuplicatePackage = false;
-            try {
-                const packageJsonFullPath = path_1.default.join(projectRoot, packageJsonPath);
-                const packageJson = fs_extra_1.default.readJSONSync(packageJsonFullPath);
-                if (packageInfos[packageJson.name]) {
-                    hasDuplicatePackage = true;
-                    throw new Error(`Two packages in different workspaces have the same name. Please rename one of these packages:\n- ${packageInfos[packageJson.name].packageJsonPath}\n- ${packageJsonPath}`);
-                }
+    let hasError = false;
+    for (const packageJsonPath of packageJsonFiles) {
+        try {
+            const packageJsonFullPath = path_1.default.join(projectRoot, packageJsonPath);
+            const packageJson = fs_extra_1.default.readJSONSync(packageJsonFullPath);
+            if (!packageInfos[packageJson.name]) {
                 packageInfos[packageJson.name] = infoFromPackageJson_1.infoFromPackageJson(packageJson, packageJsonFullPath);
             }
-            catch (e) {
-                if (hasDuplicatePackage) {
-                    throw e; // duplicate package error should propagate
-                }
-                // Pass, the package.json is invalid
-                console.warn(`Invalid package.json file detected ${packageJsonPath}: `, e);
+            else {
+                console.error(`ERROR: Two packages have the same name "${packageJson.name}". Please rename one of these packages:\n` +
+                    `- ${path_1.default.relative(projectRoot, packageInfos[packageJson.name].packageJsonPath)}\n` +
+                    `- ${packageJsonPath}`);
+                // Keep going so we can log all the errors
+                hasError = true;
             }
-        });
-        return packageInfos;
+        }
+        catch (e) {
+            // Pass, the package.json is invalid
+            console.warn(`Problem processing ${packageJsonPath}: ${e}`);
+        }
+    }
+    if (hasError) {
+        throw new Error('Duplicate package names found (see above for details)');
     }
+    return packageInfos;
 }
 function getPackageInfosFromSingleRepo(packageRoot) {
     const packageInfos = {};

package/lib/monorepo/getPackageInfos.js.map

@@ -1 +1 @@
-{"version":3,"file":"getPackageInfos.js","sourceRoot":"","sources":["../../src/monorepo/getPackageInfos.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getPackageInfos.js","sourceRoot":"","sources":["../../src/monorepo/getPackageInfos.ts"],"names":[],"mappings":"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"}

package/lib/publish/bumpAndPush.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bumpAndPush.d.ts","sourceRoot":"","sources":["../../src/publish/bumpAndPush.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAQ7D,wBAAsB,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,iBA6ErG"}
+{"version":3,"file":"bumpAndPush.d.ts","sourceRoot":"","sources":["../../src/publish/bumpAndPush.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAW7D,wBAAsB,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,iBAqErG"}