beachball 2.65.2 → 2.65.4

package/README.md

@@ -110,6 +110,10 @@ beachball publish -r http://localhost:4873 -t beta
 
 In large monorepos, the process of fetching versions for sync or before publishing can be time-consuming due to the high number of packages. To optimize performance, you can override the concurrency for fetching from the registry by setting `options.npmReadConcurrency` (default: 5). You can also increase concurrency for hook calls and publish operations via `options.concurrency` (default: 1; respects topological order).
 
+### Optimizing for large monorepos
+
+If you have a large to very large monorepo, there are several configuration options and strategies that can help improve Beachball's performance. For details, see the [large repos guide](https://microsoft.github.io/beachball/concepts/large-repos.html).
+
 ### API surface
 
 Beachball **does not** have a public API beyond the provided [options](https://microsoft.github.io/beachball/overview/configuration.html). Usage of private APIs is not supported and may break at any time.

package/lib/changefile/getAllChangedPackages.d.ts

@@ -0,0 +1,18 @@
+import type { BeachballOptions } from '../types/BeachballOptions';
+import type { PackageInfos, ScopedPackages } from '../types/PackageInfo';
+/**
+ * Gets all the changed package names, regardless of the change files.
+ *
+ * PRE: Assumes shared git history has already been fetched, probably by `getChangedPackages`.
+ */
+export declare function getAllChangedPackages(params: {
+    options: Pick<BeachballOptions, 'path' | 'changeDir' | 'ignorePatterns' | 'verbose'>;
+    packageInfos: PackageInfos;
+    scopedPackages: ScopedPackages;
+    /**
+     * Paths of all committed and staged files in the current branch as returned by git,
+     * relative to `options.path` with forward slashes.
+     */
+    allChangedFiles: Set<string>;
+}): string[];
+//# sourceMappingURL=getAllChangedPackages.d.ts.map

package/lib/changefile/getAllChangedPackages.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getAllChangedPackages.d.ts","sourceRoot":"","sources":["../../src/changefile/getAllChangedPackages.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAe,YAAY,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAKtF;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE;IAC5C,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,GAAG,WAAW,GAAG,gBAAgB,GAAG,SAAS,CAAC,CAAC;IACrF,YAAY,EAAE,YAAY,CAAC;IAC3B,cAAc,EAAE,cAAc,CAAC;IAC/B;;;OAGG;IACH,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC9B,GAAG,MAAM,EAAE,CAwDX"}

package/lib/changefile/getAllChangedPackages.js

@@ -0,0 +1,78 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAllChangedPackages = void 0;
+const path_1 = __importDefault(require("path"));
+const filterIgnoredFiles_1 = require("../monorepo/filterIgnoredFiles");
+const isPackageIncluded_1 = require("./isPackageIncluded");
+const count = (n, str) => `${n} ${str}${n === 1 ? '' : 's'}`;
+/**
+ * Gets all the changed package names, regardless of the change files.
+ *
+ * PRE: Assumes shared git history has already been fetched, probably by `getChangedPackages`.
+ */
+function getAllChangedPackages(params) {
+    const { options, packageInfos, scopedPackages, allChangedFiles } = params;
+    const { path: cwd, changeDir } = options;
+    const { verboseLog, logIgnored, logIncluded } = (0, isPackageIncluded_1.getIncludedLoggers)(options);
+    if (!allChangedFiles.size) {
+        verboseLog('Found no changed files in current branch');
+        return [];
+    }
+    verboseLog(`Found ${count(allChangedFiles.size, 'changed file')} in current branch (before filtering)`);
+    // Filter out changed files which are ignored by ignorePatterns.
+    // Also ignore the CHANGELOG files and change files because they're generated by beachball.
+    const nonIgnoredChanges = (0, filterIgnoredFiles_1.filterIgnoredFiles)({
+        filePaths: allChangedFiles,
+        ignorePatterns: [...(options.ignorePatterns || []), `${changeDir}/*.json`, 'CHANGELOG.{md,json}'],
+        logIgnored,
+    });
+    if (!nonIgnoredChanges.length) {
+        verboseLog('All files were ignored');
+        return [];
+    }
+    // Determine which package each changed file came from (using packageInfos[x].packageJsonPath),
+    // and whether that package is in scope and not private
+    const includedPackages = new Set();
+    let fileCount = 0;
+    const packageInfosByPath = {};
+    for (const info of Object.values(packageInfos)) {
+        packageInfosByPath[path_1.default.normalize(path_1.default.dirname(info.packageJsonPath))] = info;
+    }
+    for (const moddedFile of nonIgnoredChanges) {
+        const packageInfo = getMatchingPackageInfo(moddedFile, cwd, packageInfosByPath);
+        if (!packageInfo) {
+            logIgnored(moddedFile, 'not in a package');
+            continue;
+        }
+        const { isIncluded, reason } = (0, isPackageIncluded_1.isPackageIncluded)(packageInfo, scopedPackages);
+        if (!isIncluded) {
+            logIgnored(moddedFile, reason);
+        }
+        else {
+            includedPackages.add(packageInfo.name);
+            fileCount++;
+            logIncluded(moddedFile);
+        }
+    }
+    verboseLog(`Found ${count(fileCount, 'file')} in ${count(includedPackages.size, 'package')} that should be published`);
+    return [...includedPackages];
+}
+exports.getAllChangedPackages = getAllChangedPackages;
+function getMatchingPackageInfo(file, cwd, packageInfosByPath) {
+    // Normalize all the paths before comparing (the packageInfosByPath entries should also be normalized)
+    // to ensure that this doesn't break on Windows if any input paths have forward slashes
+    cwd = path_1.default.normalize(cwd);
+    const absFile = path_1.default.normalize(path_1.default.join(cwd, file));
+    let absDir = '';
+    do {
+        absDir = path_1.default.dirname(absDir || absFile);
+        if (packageInfosByPath[absDir]) {
+            return packageInfosByPath[absDir];
+        }
+    } while (absDir !== cwd);
+    return undefined;
+}
+//# sourceMappingURL=getAllChangedPackages.js.map

package/lib/changefile/getAllChangedPackages.js.map

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

package/lib/changefile/getCatalogChangedPackages.d.ts

@@ -0,0 +1,19 @@
+import type { BeachballOptions } from '../types/BeachballOptions';
+import { type PackageInfos, type ScopedPackages } from '../types/PackageInfo';
+/**
+ * Get the packages that were changed due to catalog version modifications.
+ *
+ * PRE: Assumes shared git history has already been fetched, probably by `getChangedPackages`.
+ */
+export declare function getCatalogChangedPackages(params: {
+    packageInfos: PackageInfos;
+    scopedPackages: ScopedPackages;
+    options: Pick<BeachballOptions, 'branch' | 'path' | 'verbose'>;
+    /**
+     * All changed file paths in the current branch, relative to `options.path` with forward slashes.
+     * This is only used to determine if the file which might have catalog info has changed (to avoid
+     * reading it from git history in the most common case where it hasn't changed).
+     */
+    allChangedFiles: Set<string>;
+}): string[];
+//# sourceMappingURL=getCatalogChangedPackages.d.ts.map

package/lib/changefile/getCatalogChangedPackages.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getCatalogChangedPackages.d.ts","sourceRoot":"","sources":["../../src/changefile/getCatalogChangedPackages.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,KAAK,YAAY,EAA0B,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAKtG;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE;IAChD,YAAY,EAAE,YAAY,CAAC;IAC3B,cAAc,EAAE,cAAc,CAAC;IAC/B,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,QAAQ,GAAG,MAAM,GAAG,SAAS,CAAC,CAAC;IAC/D;;;;OAIG;IACH,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC9B,GAAG,MAAM,EAAE,CA+EX"}

package/lib/changefile/getCatalogChangedPackages.js

@@ -0,0 +1,84 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCatalogChangedPackages = void 0;
+const workspace_tools_1 = require("workspace-tools");
+const PackageInfo_1 = require("../types/PackageInfo");
+const isPackageIncluded_1 = require("./isPackageIncluded");
+const diffCatalogs_1 = require("../monorepo/diffCatalogs");
+const path_1 = __importDefault(require("path"));
+/**
+ * Get the packages that were changed due to catalog version modifications.
+ *
+ * PRE: Assumes shared git history has already been fetched, probably by `getChangedPackages`.
+ */
+function getCatalogChangedPackages(params) {
+    const { options, packageInfos, scopedPackages, allChangedFiles } = params;
+    const { branch, path: cwd } = options;
+    const { verboseLog, logIncluded } = (0, isPackageIncluded_1.getIncludedLoggers)(options);
+    const currentCatalogs = (0, workspace_tools_1.getCatalogs)(cwd);
+    const catalogFilePath = currentCatalogs && (0, workspace_tools_1.getCatalogFilePath)(cwd);
+    // If there are catalogs, convert the file path to relative with forward slashes for comparison
+    // with git output. (Do the slash conversion to be safe, but realistically this should be either
+    // .yarnrc.yml, package.json, or pnpm-workspace.yaml directly under cwd.)
+    const relCatalogFilePath = catalogFilePath && path_1.default.relative(cwd, catalogFilePath.filePath).replace(/\\/g, '/');
+    // If the repo doesn't define catalogs or the catalog file hasn't changed, return early
+    // (skip the git operation to read the file from history, since this can be expensive in
+    // very large repos, and the change command is run frequently by developers)
+    if (!relCatalogFilePath || !currentCatalogs || !allChangedFiles.has(relCatalogFilePath)) {
+        return [];
+    }
+    verboseLog('Checking for changes to catalog: dependencies...');
+    // Get the old catalog file content from the branch we're comparing against
+    const oldCatalogFileContent = (0, workspace_tools_1.getFileFromRef)({ ref: branch, filePath: relCatalogFilePath, cwd });
+    const oldCatalogs = oldCatalogFileContent
+        ? (0, workspace_tools_1.parseCatalogContent)(oldCatalogFileContent, catalogFilePath.manager)
+        : undefined;
+    // Calculate the diff before going into packages, so we only check everything in the less-common
+    // case that a catalog version has changed
+    const catalogsDiff = oldCatalogs ? (0, diffCatalogs_1.diffCatalogs)({ before: oldCatalogs, after: currentCatalogs }) : currentCatalogs;
+    if (!catalogsDiff) {
+        verboseLog('No catalog: changes found');
+        return [];
+    }
+    const changedPackages = [];
+    const changedCatalogDepNames = [
+        Object.keys(catalogsDiff.default || {}),
+        Object.values(catalogsDiff.named || {}).map(catalog => Object.keys(catalog)),
+    ].flat(2);
+    for (const pkg of Object.values(packageInfos)) {
+        // Skip logging exclude reasons for catalog references
+        if (!(0, isPackageIncluded_1.isPackageIncluded)(pkg, scopedPackages).isIncluded)
+            continue;
+        const changedDeps = [];
+        for (const depType of PackageInfo_1.consideredDependencies) {
+            const deps = pkg[depType];
+            if (!deps)
+                continue;
+            for (const [name, version] of Object.entries(deps)) {
+                // If this dep name might be one of the changed catalog dependencies, check if the version
+                // specified in this package can be resolved from the catalog diff. If so, it's a change.
+                // (it's possible some package could specify a non-catalog version of the same dep)
+                if (changedCatalogDepNames.includes(name) &&
+                    (0, workspace_tools_1.getCatalogVersion)({ name, version, catalogs: catalogsDiff, allowNotFound: true })) {
+                    changedDeps.push(name);
+                }
+            }
+        }
+        if (changedDeps.length) {
+            if (!changedPackages.length) {
+                verboseLog('catalog: dependencies referenced by the following packages have changed:');
+            }
+            changedPackages.push(pkg.name);
+            logIncluded(`${pkg.name}: ${changedDeps.join(', ')}`);
+        }
+    }
+    if (!changedPackages.length) {
+        verboseLog('No changes found to catalog: dependencies of in-scope published packages');
+    }
+    return changedPackages;
+}
+exports.getCatalogChangedPackages = getCatalogChangedPackages;
+//# sourceMappingURL=getCatalogChangedPackages.js.map

package/lib/changefile/getCatalogChangedPackages.js.map

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

package/lib/changefile/getChangedPackages.d.ts

@@ -1,21 +1,19 @@
 import type { BeachballOptions } from '../types/BeachballOptions';
-import type { PackageInfos, PackageInfo, ScopedPackages } from '../types/PackageInfo';
+import type { PackageInfos, ScopedPackages } from '../types/PackageInfo';
 /**
- * Determines whether the package is included in the list of potentially-changed published packages,
- * based on private flags and scopedPackages.
+ * Gets all the changed packages which **do not already have a change file** and are in scope.
+ * This includes all packages which should change due to catalog version changes.
+ * This is only used by the `change` and `check` commands, not the bump/publish process.
  *
- * (All the reasons except nonexistent include the package name.)
- */
-export declare function isPackageIncluded(packageInfo: PackageInfo | undefined, scopedPackages: ScopedPackages): {
-    isIncluded: boolean;
-    reason: string;
-};
-/**
- * Gets all the changed packages which do not already have a change file and are in scope.
- * Exceptions:
+ * Special cases:
  * - If `options.package` is provided, use that as-is (skipping all git operations).
- * - If `options.all` is true, returns all the packages in scope (skipping all git operations),
- *   regardless of whether they've changed.
+ * - If `options.all` is true, gets all the packages in scope regardless of whether they've changed
+ *   (skipping git diff of files), omitting packages that already have change files.
+ *
+ * Usually (without `options.package`) this has the side effect of calling `ensureSharedHistory` to
+ * verify that enough git history is available to check for changes between `HEAD` and
+ * `options.branch` (only an issue for shallow clones), and deepens the history if needed.
+ * Unless `options.fetch` is `false`, it will also fetch from the remote.
  */
 export declare function getChangedPackages(options: BeachballOptions, packageInfos: PackageInfos, scopedPackages: ScopedPackages): string[];
 //# sourceMappingURL=getChangedPackages.d.ts.map

package/lib/changefile/getChangedPackages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getChangedPackages.d.ts","sourceRoot":"","sources":["../../src/changefile/getChangedPackages.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AA6BtF;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,WAAW,EAAE,WAAW,GAAG,SAAS,EACpC,cAAc,EAAE,cAAc,GAC7B;IAAE,UAAU,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAazC;AAkFD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,gBAAgB,EACzB,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,GAC7B,MAAM,EAAE,CAsDV"}
+{"version":3,"file":"getChangedPackages.d.ts","sourceRoot":"","sources":["../../src/changefile/getChangedPackages.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAQzE;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,gBAAgB,EACzB,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,GAC7B,MAAM,EAAE,CAgGV"}

package/lib/changefile/getChangedPackages.js

@@ -3,129 +3,73 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getChangedPackages = exports.isPackageIncluded = void 0;
+exports.getChangedPackages = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const paths_1 = require("../paths");
 const workspace_tools_1 = require("workspace-tools");
-const ensureSharedHistory_1 = require("../git/ensureSharedHistory");
+const paths_1 = require("../paths");
 const readJson_1 = require("../object/readJson");
 const bulletedList_1 = require("../logging/bulletedList");
-const filterIgnoredFiles_1 = require("../monorepo/filterIgnoredFiles");
-const count = (n, str) => `${n} ${str}${n === 1 ? '' : 's'}`;
-function getMatchingPackageInfo(file, cwd, packageInfosByPath) {
-    // Normalize all the paths before comparing (the packageInfosByPath entries should also be normalized)
-    // to ensure that this doesn't break on Windows if any input paths have forward slashes
-    cwd = path_1.default.normalize(cwd);
-    const absFile = path_1.default.normalize(path_1.default.join(cwd, file));
-    let absDir = '';
-    do {
-        absDir = path_1.default.dirname(absDir || absFile);
-        if (packageInfosByPath[absDir]) {
-            return packageInfosByPath[absDir];
-        }
-    } while (absDir !== cwd);
-    return undefined;
-}
+const getAllChangedPackages_1 = require("./getAllChangedPackages");
+const getCatalogChangedPackages_1 = require("./getCatalogChangedPackages");
+const isPackageIncluded_1 = require("./isPackageIncluded");
+const ensureSharedHistory_1 = require("../git/ensureSharedHistory");
 /**
- * Determines whether the package is included in the list of potentially-changed published packages,
- * based on private flags and scopedPackages.
+ * Gets all the changed packages which **do not already have a change file** and are in scope.
+ * This includes all packages which should change due to catalog version changes.
+ * This is only used by the `change` and `check` commands, not the bump/publish process.
  *
- * (All the reasons except nonexistent include the package name.)
- */
-function isPackageIncluded(packageInfo, scopedPackages) {
-    const reason = !packageInfo
-        ? 'no corresponding package found'
-        : packageInfo.private
-            ? `${packageInfo.name} is private`
-            : // This is a package-only option (can't be set at repo level or via CLI)
-                packageInfo.packageOptions?.shouldPublish === false
-                    ? `${packageInfo.name} has beachball.shouldPublish=false`
-                    : !scopedPackages.has(packageInfo.name)
-                        ? `${packageInfo.name} is out of scope`
-                        : ''; // not ignored
-    return { isIncluded: !reason, reason };
-}
-exports.isPackageIncluded = isPackageIncluded;
-/**
- * Gets all the changed package names, regardless of the change files.
- * If `options.all` is set, returns all the packages in scope, regardless of whether they've changed.
- */
-function getAllChangedPackages(options, packageInfos, scopedPackages) {
-    const { branch, path: cwd, verbose, all, changeDir } = options;
-    const verboseLog = (msg) => verbose && console.log(msg);
-    const logIgnored = (file, reason) => verboseLog(`  - ~~${file}~~ (${reason})`);
-    const logIncluded = (file) => verboseLog(`  - ${file}`);
-    // If --all is set, return all the packages in scope rather than looking at which files changed
-    if (all) {
-        verboseLog('--all option was provided, so including all packages that are in scope (regardless of changes)');
-        return Object.values(packageInfos)
-            .filter(pkg => {
-            const { isIncluded, reason } = isPackageIncluded(pkg, scopedPackages);
-            verboseLog(isIncluded ? `  - ${pkg.name}` : `  - ~~${pkg.name}~~ (${reason.replace(`${pkg.name} `, '')})`);
-            return isIncluded;
-        })
-            .map(pkg => pkg.name);
-    }
-    console.log(`Checking for changes against "${options.branch}"`);
-    (0, ensureSharedHistory_1.ensureSharedHistory)(options);
-    const changes = [...((0, workspace_tools_1.getBranchChanges)({ branch, cwd }) || []), ...((0, workspace_tools_1.getStagedChanges)({ cwd }) || [])];
-    verboseLog(`Found ${count(changes.length, 'changed file')} in current branch (before filtering)`);
-    if (!changes.length) {
-        return [];
-    }
-    // Filter out changed files which are ignored by ignorePatterns.
-    // Also ignore the CHANGELOG files and change files because they're generated by beachball.
-    const nonIgnoredChanges = (0, filterIgnoredFiles_1.filterIgnoredFiles)({
-        filePaths: changes,
-        ignorePatterns: [...(options.ignorePatterns || []), `${changeDir}/*.json`, 'CHANGELOG.{md,json}'],
-        logIgnored,
-    });
-    if (!nonIgnoredChanges.length) {
-        verboseLog('All files were ignored');
-        return [];
-    }
-    // Determine which package each changed file came from (using packageInfos[x].packageJsonPath),
-    // and whether that package is in scope and not private
-    const includedPackages = new Set();
-    let fileCount = 0;
-    const packageInfosByPath = {};
-    for (const info of Object.values(packageInfos)) {
-        packageInfosByPath[path_1.default.normalize(path_1.default.dirname(info.packageJsonPath))] = info;
-    }
-    for (const moddedFile of nonIgnoredChanges) {
-        const packageInfo = getMatchingPackageInfo(moddedFile, cwd, packageInfosByPath);
-        if (!packageInfo)
-            continue;
-        const { isIncluded, reason } = isPackageIncluded(packageInfo, scopedPackages);
-        if (!isIncluded) {
-            logIgnored(moddedFile, reason);
-        }
-        else {
-            includedPackages.add(packageInfo.name);
-            fileCount++;
-            logIncluded(moddedFile);
-        }
-    }
-    verboseLog(`Found ${count(fileCount, 'file')} in ${count(includedPackages.size, 'package')} that should be published`);
-    return [...includedPackages];
-}
-/**
- * Gets all the changed packages which do not already have a change file and are in scope.
- * Exceptions:
+ * Special cases:
  * - If `options.package` is provided, use that as-is (skipping all git operations).
- * - If `options.all` is true, returns all the packages in scope (skipping all git operations),
- *   regardless of whether they've changed.
+ * - If `options.all` is true, gets all the packages in scope regardless of whether they've changed
+ *   (skipping git diff of files), omitting packages that already have change files.
+ *
+ * Usually (without `options.package`) this has the side effect of calling `ensureSharedHistory` to
+ * verify that enough git history is available to check for changes between `HEAD` and
+ * `options.branch` (only an issue for shallow clones), and deepens the history if needed.
+ * Unless `options.fetch` is `false`, it will also fetch from the remote.
  */
 function getChangedPackages(options, packageInfos, scopedPackages) {
     const { branch } = options;
+    const { verboseLog, logIncluded, logIgnored } = (0, isPackageIncluded_1.getIncludedLoggers)(options);
     if (options.package) {
         return typeof options.package === 'string' ? [options.package] : [...options.package];
     }
-    const changedPackages = getAllChangedPackages(options, packageInfos, scopedPackages);
+    console.log(`Checking for changes against "${branch}"`);
+    // Ensure the current branch and target branch have a common shared commit. This has the side
+    // effect of fetching from the remote (unless disabled), which should be done even if there's
+    // already shared history (and even with --all) for accurate added change file checks later.
+    (0, ensureSharedHistory_1.ensureSharedHistory)(options);
+    let changedPackages;
+    let stagedFiles;
+    if (options.all) {
+        // If --all is set, return all the packages in scope rather than looking at which files changed
+        verboseLog('--all option was provided, so including all packages that are in scope (regardless of changes)');
+        changedPackages = new Set(Object.values(packageInfos)
+            .filter(pkg => {
+            const { isIncluded, reason } = (0, isPackageIncluded_1.isPackageIncluded)(pkg, scopedPackages);
+            isIncluded ? logIncluded(pkg.name) : logIgnored(pkg.name, reason.replace(`${pkg.name} `, ''));
+            return isIncluded;
+        })
+            .map(pkg => pkg.name));
+    }
+    else {
+        stagedFiles = (0, workspace_tools_1.getStagedChanges)({ cwd: options.path }) || [];
+        const committedFiles = (0, workspace_tools_1.getBranchChanges)({ branch, cwd: options.path }) || [];
+        // dedupe with a Set in case a file was already committed and has more changes staged
+        const allChangedFiles = new Set([...committedFiles, ...stagedFiles]);
+        const directChangedPackages = (0, getAllChangedPackages_1.getAllChangedPackages)({ options, packageInfos, scopedPackages, allChangedFiles });
+        const catalogChangedPackages = (0, getCatalogChangedPackages_1.getCatalogChangedPackages)({
+            options,
+            packageInfos,
+            scopedPackages,
+            allChangedFiles,
+        });
+        changedPackages = new Set([...directChangedPackages, ...catalogChangedPackages]);
+    }
     const changePath = (0, paths_1.getChangePath)(options);
     if (!fs_1.default.existsSync(changePath)) {
-        return changedPackages;
+        return [...changedPackages];
     }
     // TODO: this should probably reuse the result of readChangeFiles, but they use slightly different args...
     const committedChangeFiles = (0, workspace_tools_1.getChangesBetweenRefs)({
@@ -137,7 +81,9 @@ function getChangedPackages(options, packageInfos, scopedPackages) {
         throwOnError: false,
     });
     // Also consider staged change files (not yet committed) so that `check` respects them
-    const stagedChangeFiles = ((0, workspace_tools_1.getStagedChanges)({ cwd: changePath }) || []).filter(f => f.endsWith('.json'));
+    const relChangeDir = path_1.default.relative(options.path, changePath).replace(/\\/g, '/') + '/';
+    const stagedChangeFiles = (stagedFiles?.filter(f => f.startsWith(relChangeDir)).map(f => f.replace(relChangeDir, '')) ||
+        (0, workspace_tools_1.getStagedChanges)({ cwd: changePath })).filter(f => f.endsWith('.json'));
     const changeFiles = [...new Set([...committedChangeFiles, ...stagedChangeFiles])];
     const changeFilePackageSet = new Set();
     // Loop through the change files, building up a set of packages that we can skip
@@ -149,6 +95,7 @@ function getChangedPackages(options, packageInfos, scopedPackages) {
             for (const change of changes) {
                 if (change.packageName) {
                     changeFilePackageSet.add(change.packageName);
+                    changedPackages.delete(change.packageName);
                 }
             }
         }
@@ -160,7 +107,7 @@ function getChangedPackages(options, packageInfos, scopedPackages) {
         console.log('Your local repository already has change files for these packages:\n' +
             (0, bulletedList_1.bulletedList)([...changeFilePackageSet].sort()));
     }
-    return changedPackages.filter(pkgName => !changeFilePackageSet.has(pkgName));
+    return [...changedPackages];
 }
 exports.getChangedPackages = getChangedPackages;
 //# sourceMappingURL=getChangedPackages.js.map

package/lib/changefile/getChangedPackages.js.map

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

package/lib/changefile/isPackageIncluded.d.ts

@@ -0,0 +1,18 @@
+import type { BeachballOptions } from '../types/BeachballOptions';
+import type { PackageInfo, ScopedPackages } from '../types/PackageInfo';
+/**
+ * Determines whether the package is included in the list of potentially-changed published packages,
+ * based on private flags and scopedPackages.
+ *
+ * (All the reasons except nonexistent include the package name.)
+ */
+export declare function isPackageIncluded(packageInfo: PackageInfo | undefined, scopedPackages: ScopedPackages): {
+    isIncluded: boolean;
+    reason: string;
+};
+export declare function getIncludedLoggers(options: Pick<BeachballOptions, 'verbose'>): {
+    verboseLog: (msg: string) => void;
+    logIgnored: (name: string, reason: string) => void;
+    logIncluded: (name: string) => void;
+};
+//# sourceMappingURL=isPackageIncluded.d.ts.map

package/lib/changefile/isPackageIncluded.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"isPackageIncluded.d.ts","sourceRoot":"","sources":["../../src/changefile/isPackageIncluded.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAExE;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,WAAW,EAAE,WAAW,GAAG,SAAS,EACpC,cAAc,EAAE,cAAc,GAC7B;IAAE,UAAU,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAazC;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,SAAS,CAAC,GAAG;IAC9E,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACnD,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC,CAOA"}

package/lib/changefile/isPackageIncluded.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getIncludedLoggers = exports.isPackageIncluded = void 0;
+/**
+ * Determines whether the package is included in the list of potentially-changed published packages,
+ * based on private flags and scopedPackages.
+ *
+ * (All the reasons except nonexistent include the package name.)
+ */
+function isPackageIncluded(packageInfo, scopedPackages) {
+    const reason = !packageInfo
+        ? 'no corresponding package found'
+        : packageInfo.private
+            ? `${packageInfo.name} is private`
+            : // This is a package-only option (can't be set at repo level or via CLI)
+                packageInfo.packageOptions?.shouldPublish === false
+                    ? `${packageInfo.name} has beachball.shouldPublish=false`
+                    : !scopedPackages.has(packageInfo.name)
+                        ? `${packageInfo.name} is out of scope`
+                        : ''; // not ignored
+    return { isIncluded: !reason, reason };
+}
+exports.isPackageIncluded = isPackageIncluded;
+function getIncludedLoggers(options) {
+    const verboseLog = (msg) => options.verbose && console.log(msg);
+    return {
+        verboseLog,
+        logIgnored: (name, reason) => verboseLog(`  - ~~${name}~~ (${reason})`),
+        logIncluded: name => verboseLog(`  - ${name}`),
+    };
+}
+exports.getIncludedLoggers = getIncludedLoggers;
+//# sourceMappingURL=isPackageIncluded.js.map

package/lib/changefile/isPackageIncluded.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"isPackageIncluded.js","sourceRoot":"","sources":["../../src/changefile/isPackageIncluded.ts"],"names":[],"mappings":";;;AAGA;;;;;GAKG;AACH,SAAgB,iBAAiB,CAC/B,WAAoC,EACpC,cAA8B;IAE9B,MAAM,MAAM,GAAG,CAAC,WAAW;QACzB,CAAC,CAAC,gCAAgC;QAClC,CAAC,CAAC,WAAW,CAAC,OAAO;YACrB,CAAC,CAAC,GAAG,WAAW,CAAC,IAAI,aAAa;YAClC,CAAC,CAAC,wEAAwE;gBAC1E,WAAW,CAAC,cAAc,EAAE,aAAa,KAAK,KAAK;oBACnD,CAAC,CAAC,GAAG,WAAW,CAAC,IAAI,oCAAoC;oBACzD,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC;wBACvC,CAAC,CAAC,GAAG,WAAW,CAAC,IAAI,kBAAkB;wBACvC,CAAC,CAAC,EAAE,CAAC,CAAC,cAAc;IAEtB,OAAO,EAAE,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;AACzC,CAAC;AAhBD,8CAgBC;AAED,SAAgB,kBAAkB,CAAC,OAA0C;IAK3E,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACxE,OAAO;QACL,UAAU;QACV,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,SAAS,IAAI,OAAO,MAAM,GAAG,CAAC;QACvE,WAAW,EAAE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,IAAI,EAAE,CAAC;KAC/C,CAAC;AACJ,CAAC;AAXD,gDAWC"}

package/lib/changefile/writeChangeFiles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"writeChangeFiles.d.ts","sourceRoot":"","sources":["../../src/changefile/writeChangeFiles.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAM1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAGlE;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,cAAc,EAAE,EACzB,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,GAAG,cAAc,GAAG,WAAW,GAAG,QAAQ,CAAC,GAChF,MAAM,EAAE,CAgDV"}
+{"version":3,"file":"writeChangeFiles.d.ts","sourceRoot":"","sources":["../../src/changefile/writeChangeFiles.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAM1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAGlE;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,cAAc,EAAE,EACzB,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,GAAG,cAAc,GAAG,WAAW,GAAG,QAAQ,CAAC,GAChF,MAAM,EAAE,CA4CV"}

package/lib/changefile/writeChangeFiles.js

@@ -17,7 +17,6 @@ const writeJson_1 = require("../object/writeJson");
 function writeChangeFiles(changes, options) {
     const { path: cwd, groupChanges, commit: commitChangeFiles } = options;
     const changePath = (0, paths_1.getChangePath)(options);
-    const branchName = (0, workspace_tools_1.getBranchName)({ cwd });
     if (!Object.keys(changes).length) {
         return [];
     }
@@ -39,15 +38,12 @@ function writeChangeFiles(changes, options) {
             return changeFile;
         });
     }
-    // Stage and maybe commit if in a git repo.
-    // The actual context should always be a git repo, but during testing it might not be.
-    if (branchName) {
-        (0, workspace_tools_1.stage)({ patterns: changeFiles, cwd });
-        if (commitChangeFiles) {
-            // only commit change files, ignore other staged files/changes
-            const commitOptions = ['--only', path_1.default.join(changePath, '*.json')];
-            (0, workspace_tools_1.commit)({ message: 'Change files', cwd, options: commitOptions });
-        }
+    // Stage and maybe commit
+    (0, workspace_tools_1.stage)({ patterns: changeFiles, cwd });
+    if (commitChangeFiles) {
+        // only commit change files, ignore other staged files/changes
+        const commitOptions = ['--only', path_1.default.join(changePath, '*.json')];
+        (0, workspace_tools_1.commit)({ message: 'Change files', cwd, options: commitOptions });
     }
     console.log(`git ${commitChangeFiles ? 'committed' : 'staged'} these change files: ${changeFiles
         .map(f => `\n - ${f}`)