@rushstack/rush-sdk 5.153.1 → 5.154.0

package/dist/rush-lib.d.ts

@@ -1274,6 +1274,10 @@ export declare interface ICredentialCacheEntry {
  */
 export declare interface ICredentialCacheOptions {
     supportEditing: boolean;
+    /**
+     * If specified, use the specified path instead of the default path of `~/.rush-user/credentials.json`
+     */
+    cacheFilePath?: string;
 }
 
 /**
@@ -1580,6 +1584,10 @@ export declare interface IInputsSnapshot {
      * The directory that all paths in `hashes` are relative to.
      */
     readonly rootDirectory: string;
+    /**
+     * Whether or not the repository has uncommitted changes.
+     */
+    readonly hasUncommittedChanges: boolean;
     /**
      * Gets the map of file paths to Git hashes that will be used to compute the local state hash of the operation.
      * Exposed separately from the final state hash to facilitate detailed change detection.
@@ -1745,6 +1753,20 @@ export declare class IndividualVersionPolicy extends VersionPolicy {
 export declare interface _INpmOptionsJson extends IPackageManagerOptionsJsonBase {
 }
 
+/**
+ * @internal
+ */
+export declare interface _IOperationBuildCacheOptions {
+    /**
+     * The repo-wide configuration for the build cache.
+     */
+    buildCacheConfiguration: BuildCacheConfiguration;
+    /**
+     * The terminal to use for logging.
+     */
+    terminal: ITerminal;
+}
+
 /**
  * The `IOperationExecutionResult` interface represents the results of executing an {@link Operation}.
  * @alpha
@@ -1782,10 +1804,6 @@ export declare interface IOperationExecutionResult {
      * The value indicates the duration of the same operation without cache hit.
      */
     readonly nonCachedDurationMs: number | undefined;
-    /**
-     * The id of the runner which actually runs the building process in cobuild mode.
-     */
-    readonly cobuildRunnerId: string | undefined;
     /**
      * The relative path to the folder that contains operation metadata. This folder will be automatically included in cache entries.
      */
@@ -2237,6 +2255,28 @@ export declare interface IPnpmPeerDependencyRules {
 
 export { IPrefixMatch }
 
+/**
+ * @internal
+ */
+export declare type _IProjectBuildCacheOptions = _IOperationBuildCacheOptions & {
+    /**
+     * Value from rush-project.json
+     */
+    projectOutputFolderNames: ReadonlyArray<string>;
+    /**
+     * The project to be cached.
+     */
+    project: RushConfigurationProject;
+    /**
+     * The hash of all relevant inputs and configuration that uniquely identifies this execution.
+     */
+    operationStateHash: string;
+    /**
+     * The name of the phase that is being cached.
+     */
+    phaseName: string;
+};
+
 /**
  * Information about the currently executing command provided to plugins.
  * @beta
@@ -2857,6 +2897,35 @@ export declare class Operation {
     deleteDependency(dependency: Operation): void;
 }
 
+/**
+ * @internal
+ */
+export declare class _OperationBuildCache {
+    private static _tarUtilityPromise;
+    private readonly _project;
+    private readonly _localBuildCacheProvider;
+    private readonly _cloudBuildCacheProvider;
+    private readonly _buildCacheEnabled;
+    private readonly _cacheWriteEnabled;
+    private readonly _projectOutputFolderNames;
+    private readonly _cacheId;
+    private constructor();
+    private static _tryGetTarUtility;
+    get cacheId(): string | undefined;
+    static getOperationBuildCache(options: _IProjectBuildCacheOptions): _OperationBuildCache;
+    static forOperation(executionResult: IOperationExecutionResult, options: _IOperationBuildCacheOptions): _OperationBuildCache;
+    tryRestoreFromCacheAsync(terminal: ITerminal, specifiedCacheId?: string): Promise<boolean>;
+    trySetCacheEntryAsync(terminal: ITerminal, specifiedCacheId?: string): Promise<boolean>;
+    /**
+     * Walks the declared output folders of the project and collects a list of files.
+     * @returns The list of output files as project-relative paths, or `undefined` if a
+     *   symbolic link was encountered.
+     */
+    private _tryCollectPathsToCacheAsync;
+    private _getTarLogFilePath;
+    private static _getCacheId;
+}
+
 /**
  * A helper class for managing the meta files of a operation.
  *
@@ -2869,6 +2938,7 @@ export declare class _OperationMetadataManager {
     private readonly _logPath;
     private readonly _errorLogPath;
     private readonly _logChunksPath;
+    wasCobuilt: boolean;
     constructor(options: _IOperationMetadataManagerOptions);
     /**
      * Returns the relative paths of the metadata files to project folder.
@@ -2879,11 +2949,14 @@ export declare class _OperationMetadataManager {
      */
     get metadataFolderPath(): string;
     saveAsync({ durationInSeconds, cobuildContextId, cobuildRunnerId, logPath, errorLogPath, logChunksPath }: _IOperationMetadata): Promise<void>;
-    tryRestoreAsync({ terminal, terminalProvider, errorLogPath }: {
+    tryRestoreAsync({ terminal, terminalProvider, errorLogPath, cobuildContextId, cobuildRunnerId }: {
         terminalProvider: ITerminalProvider;
         terminal: ITerminal;
         errorLogPath: string;
+        cobuildContextId?: string;
+        cobuildRunnerId?: string;
     }): Promise<void>;
+    tryRestoreStopwatch(originalStopwatch: IStopwatchResult): IStopwatchResult;
 }
 
 /**

package/dist/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.52.5"
+      "packageVersion": "7.52.8"
     }
   ]
 }

package/lib/index.d.ts

@@ -59,4 +59,6 @@ export type { IStopwatchResult } from './utilities/Stopwatch';
 export { OperationStateFile as _OperationStateFile, type IOperationStateFileOptions as _IOperationStateFileOptions, type IOperationStateJson as _IOperationStateJson } from './logic/operations/OperationStateFile';
 export { OperationMetadataManager as _OperationMetadataManager, type IOperationMetadataManagerOptions as _IOperationMetadataManagerOptions, type IOperationMetaData as _IOperationMetadata } from './logic/operations/OperationMetadataManager';
 export { RushCommandLine, type IRushCommandLineSpec, type IRushCommandLineParameter, type IRushCommandLineAction } from './api/RushCommandLine';
+export { OperationBuildCache as _OperationBuildCache } from './logic/buildCache/OperationBuildCache';
+export type { IOperationBuildCacheOptions as _IOperationBuildCacheOptions, IProjectBuildCacheOptions as _IProjectBuildCacheOptions } from './logic/buildCache/OperationBuildCache';
 //# sourceMappingURL=index.d.ts.map

package/lib/logic/CredentialCache.d.ts

@@ -11,6 +11,10 @@ export interface ICredentialCacheEntry {
  */
 export interface ICredentialCacheOptions {
     supportEditing: boolean;
+    /**
+     * If specified, use the specified path instead of the default path of `~/.rush-user/credentials.json`
+     */
+    cacheFilePath?: string;
 }
 /**
  * @beta

package/lib/logic/buildCache/{ProjectBuildCache.d.ts → OperationBuildCache.d.ts}

@@ -1,7 +1,10 @@
 import type { ITerminal } from '@rushstack/terminal';
 import type { RushConfigurationProject } from '../../api/RushConfigurationProject';
 import type { BuildCacheConfiguration } from '../../api/BuildCacheConfiguration';
-import type { OperationExecutionRecord } from '../operations/OperationExecutionRecord';
+import type { IOperationExecutionResult } from '../operations/IOperationExecutionResult';
+/**
+ * @internal
+ */
 export interface IOperationBuildCacheOptions {
     /**
      * The repo-wide configuration for the build cache.
@@ -12,6 +15,9 @@ export interface IOperationBuildCacheOptions {
      */
     terminal: ITerminal;
 }
+/**
+ * @internal
+ */
 export type IProjectBuildCacheOptions = IOperationBuildCacheOptions & {
     /**
      * Value from rush-project.json
@@ -30,7 +36,10 @@ export type IProjectBuildCacheOptions = IOperationBuildCacheOptions & {
      */
     phaseName: string;
 };
-export declare class ProjectBuildCache {
+/**
+ * @internal
+ */
+export declare class OperationBuildCache {
     private static _tarUtilityPromise;
     private readonly _project;
     private readonly _localBuildCacheProvider;
@@ -42,8 +51,8 @@ export declare class ProjectBuildCache {
     private constructor();
     private static _tryGetTarUtility;
     get cacheId(): string | undefined;
-    static getProjectBuildCache(options: IProjectBuildCacheOptions): ProjectBuildCache;
-    static forOperation(operation: OperationExecutionRecord, options: IOperationBuildCacheOptions): ProjectBuildCache;
+    static getOperationBuildCache(options: IProjectBuildCacheOptions): OperationBuildCache;
+    static forOperation(executionResult: IOperationExecutionResult, options: IOperationBuildCacheOptions): OperationBuildCache;
     tryRestoreFromCacheAsync(terminal: ITerminal, specifiedCacheId?: string): Promise<boolean>;
     trySetCacheEntryAsync(terminal: ITerminal, specifiedCacheId?: string): Promise<boolean>;
     /**
@@ -55,4 +64,4 @@ export declare class ProjectBuildCache {
     private _getTarLogFilePath;
     private static _getCacheId;
 }
-//# sourceMappingURL=ProjectBuildCache.d.ts.map
+//# sourceMappingURL=OperationBuildCache.d.ts.map

package/lib/logic/buildCache/{ProjectBuildCache.js → OperationBuildCache.js}

@@ -1 +1 @@
-module.exports = require("../../../lib-shim/index")._rushSdk_loadInternalModule("logic/buildCache/ProjectBuildCache");
+module.exports = require("../../../lib-shim/index")._rushSdk_loadInternalModule("logic/buildCache/OperationBuildCache");

package/lib/logic/cobuild/CobuildLock.d.ts

@@ -1,7 +1,7 @@
 import type { CobuildConfiguration } from '../../api/CobuildConfiguration';
 import type { OperationStatus } from '../operations/OperationStatus';
 import type { ICobuildContext } from './ICobuildLockProvider';
-import type { ProjectBuildCache } from '../buildCache/ProjectBuildCache';
+import type { OperationBuildCache } from '../buildCache/OperationBuildCache';
 export interface ICobuildLockOptions {
     /**
      * {@inheritdoc CobuildConfiguration}
@@ -19,7 +19,7 @@ export interface ICobuildLockOptions {
      * {@inheritdoc ICobuildContext.phaseName}
      */
     phaseName: string;
-    projectBuildCache: ProjectBuildCache;
+    operationBuildCache: OperationBuildCache;
     /**
      * The expire time of the lock in seconds.
      */
@@ -31,7 +31,7 @@ export interface ICobuildCompletedState {
 }
 export declare class CobuildLock {
     readonly cobuildConfiguration: CobuildConfiguration;
-    readonly projectBuildCache: ProjectBuildCache;
+    readonly operationBuildCache: OperationBuildCache;
     private _cobuildContext;
     constructor(options: ICobuildLockOptions);
     setCompletedStateAsync(state: ICobuildCompletedState): Promise<void>;

package/lib/logic/incremental/InputsSnapshot.d.ts

@@ -50,6 +50,10 @@ export interface IInputsSnapshotParameters {
      * The hashes of all tracked files in the repository.
      */
     hashes: ReadonlyMap<string, string>;
+    /**
+     * Whether or not the repository has uncommitted changes.
+     */
+    hasUncommittedChanges: boolean;
     /**
      * Optimized lookup engine used to route `hashes` to individual projects.
      */
@@ -78,6 +82,10 @@ export interface IInputsSnapshot {
      * The directory that all paths in `hashes` are relative to.
      */
     readonly rootDirectory: string;
+    /**
+     * Whether or not the repository has uncommitted changes.
+     */
+    readonly hasUncommittedChanges: boolean;
     /**
      * Gets the map of file paths to Git hashes that will be used to compute the local state hash of the operation.
      * Exposed separately from the final state hash to facilitate detailed change detection.
@@ -110,6 +118,10 @@ export declare class InputsSnapshot implements IInputsSnapshot {
      * {@inheritdoc IInputsSnapshot.hashes}
      */
     readonly hashes: ReadonlyMap<string, string>;
+    /**
+     * {@inheritdoc IInputsSnapshot.hasUncommittedChanges}
+     */
+    readonly hasUncommittedChanges: boolean;
     /**
      * {@inheritdoc IInputsSnapshot.rootDirectory}
      */

package/lib/logic/operations/CacheableOperationPlugin.d.ts

@@ -1,6 +1,6 @@
 import { type TerminalWritable, type ITerminal } from '@rushstack/terminal';
 import { CobuildLock } from '../cobuild/CobuildLock';
-import { ProjectBuildCache } from '../buildCache/ProjectBuildCache';
+import { OperationBuildCache } from '../buildCache/OperationBuildCache';
 import type { CobuildConfiguration } from '../../api/CobuildConfiguration';
 import { DisjointSet } from '../cobuild/DisjointSet';
 import { PeriodicCallback } from './PeriodicCallback';
@@ -16,7 +16,7 @@ export interface IProjectDeps {
 export interface IOperationBuildCacheContext {
     isCacheWriteAllowed: boolean;
     isCacheReadAllowed: boolean;
-    operationBuildCache: ProjectBuildCache | undefined;
+    operationBuildCache: OperationBuildCache | undefined;
     cacheDisabledReason: string | undefined;
     outputFolderNames: ReadonlyArray<string>;
     cobuildLock: CobuildLock | undefined;
@@ -40,8 +40,8 @@ export declare class CacheableOperationPlugin implements IPhasedCommandPlugin {
     apply(hooks: PhasedCommandHooks): void;
     private _getBuildCacheContextByOperation;
     private _getBuildCacheContextByOperationOrThrow;
-    private _tryGetProjectBuildCache;
-    private _tryGetLogOnlyProjectBuildCacheAsync;
+    private _tryGetOperationBuildCache;
+    private _tryGetLogOnlyOperationBuildCacheAsync;
     private _tryGetCobuildLockAsync;
     private _createBuildCacheTerminalAsync;
     private _tryGetBuildCacheTerminalWritableAsync;

package/lib/logic/operations/ConsoleTimelinePlugin.d.ts

@@ -16,11 +16,11 @@ export declare class ConsoleTimelinePlugin implements IPhasedCommandPlugin {
 export interface IPrintTimelineParameters {
     terminal: ITerminal;
     result: IExecutionResult;
-    cobuildConfiguration: CobuildConfiguration | undefined;
+    cobuildConfiguration?: CobuildConfiguration;
 }
 /**
  * Print a more detailed timeline and analysis of CPU usage for the build.
  * @internal
  */
-export declare function _printTimeline({ terminal, result, cobuildConfiguration }: IPrintTimelineParameters): void;
+export declare function _printTimeline({ terminal, result }: IPrintTimelineParameters): void;
 //# sourceMappingURL=ConsoleTimelinePlugin.d.ts.map

package/lib/logic/operations/IOperationExecutionResult.d.ts

@@ -40,10 +40,6 @@ export interface IOperationExecutionResult {
      * The value indicates the duration of the same operation without cache hit.
      */
     readonly nonCachedDurationMs: number | undefined;
-    /**
-     * The id of the runner which actually runs the building process in cobuild mode.
-     */
-    readonly cobuildRunnerId: string | undefined;
     /**
      * The relative path to the folder that contains operation metadata. This folder will be automatically included in cache entries.
      */

package/lib/logic/operations/OperationExecutionRecord.d.ts

@@ -7,10 +7,13 @@ import { Stopwatch } from '../../utilities/Stopwatch';
 import { OperationMetadataManager } from './OperationMetadataManager';
 import type { IPhase } from '../../api/CommandLineConfiguration';
 import type { RushConfigurationProject } from '../../api/RushConfigurationProject';
-import { type ILogFilePaths } from './ProjectLogWritable';
 import type { IOperationExecutionResult } from './IOperationExecutionResult';
 import type { IInputsSnapshot } from '../incremental/InputsSnapshot';
 import type { IEnvironment } from '../../utilities/Utilities';
+import { type ILogFilePaths } from './ProjectLogWritable';
+/**
+ * @internal
+ */
 export interface IOperationExecutionRecordContext {
     streamCollator: StreamCollator;
     onOperationStatusChanged?: (record: OperationExecutionRecord) => void;

package/lib/logic/operations/OperationMetadataManager.d.ts

@@ -1,6 +1,7 @@
 import { type ITerminalChunk, type ITerminal, type ITerminalProvider } from '@rushstack/terminal';
 import { OperationStateFile } from './OperationStateFile';
 import type { Operation } from './Operation';
+import { type IStopwatchResult } from '../../utilities/Stopwatch';
 /**
  * @internal
  */
@@ -33,6 +34,7 @@ export declare class OperationMetadataManager {
     private readonly _logPath;
     private readonly _errorLogPath;
     private readonly _logChunksPath;
+    wasCobuilt: boolean;
     constructor(options: IOperationMetadataManagerOptions);
     /**
      * Returns the relative paths of the metadata files to project folder.
@@ -43,10 +45,13 @@ export declare class OperationMetadataManager {
      */
     get metadataFolderPath(): string;
     saveAsync({ durationInSeconds, cobuildContextId, cobuildRunnerId, logPath, errorLogPath, logChunksPath }: IOperationMetaData): Promise<void>;
-    tryRestoreAsync({ terminal, terminalProvider, errorLogPath }: {
+    tryRestoreAsync({ terminal, terminalProvider, errorLogPath, cobuildContextId, cobuildRunnerId }: {
         terminalProvider: ITerminalProvider;
         terminal: ITerminal;
         errorLogPath: string;
+        cobuildContextId?: string;
+        cobuildRunnerId?: string;
     }): Promise<void>;
+    tryRestoreStopwatch(originalStopwatch: IStopwatchResult): IStopwatchResult;
 }
 //# sourceMappingURL=OperationMetadataManager.d.ts.map

package/lib/utilities/Stopwatch.d.ts

@@ -37,6 +37,10 @@ export declare class Stopwatch implements IStopwatchResult {
     private _state;
     private _getTime;
     constructor(getTime?: () => number);
+    static fromState({ startTime, endTime }: {
+        startTime: number;
+        endTime: number;
+    }): Stopwatch;
     /**
      * Static helper function which creates a stopwatch which is immediately started
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/rush-sdk",
-  "version": "5.153.1",
+  "version": "5.154.0",
   "description": "An API for interacting with the Rush engine",
   "repository": {
     "type": "git",
@@ -36,22 +36,22 @@
   "dependencies": {
     "@pnpm/lockfile.types": "~1.0.3",
     "tapable": "2.2.1",
-    "@rushstack/lookup-by-path": "0.5.21",
-    "@rushstack/node-core-library": "5.13.0",
-    "@rushstack/package-deps-hash": "4.3.22",
-    "@rushstack/terminal": "0.15.2"
+    "@rushstack/node-core-library": "5.13.1",
+    "@rushstack/lookup-by-path": "0.7.0",
+    "@rushstack/package-deps-hash": "4.4.1",
+    "@rushstack/terminal": "0.15.3"
   },
   "devDependencies": {
     "@types/semver": "7.5.0",
     "@types/webpack-env": "1.18.8",
     "webpack": "~5.98.0",
-    "@microsoft/rush-lib": "5.153.1",
-    "@rushstack/heft": "0.73.3",
-    "@rushstack/heft-webpack5-plugin": "0.11.30",
+    "@microsoft/rush-lib": "5.154.0",
+    "@rushstack/heft": "0.73.6",
+    "@rushstack/heft-webpack5-plugin": "0.11.33",
     "local-node-rig": "1.0.0",
-    "@rushstack/ts-command-line": "5.0.0",
-    "@rushstack/webpack-preserve-dynamic-require-plugin": "0.11.99",
-    "@rushstack/stream-collator": "4.1.100"
+    "@rushstack/ts-command-line": "5.0.1",
+    "@rushstack/webpack-preserve-dynamic-require-plugin": "0.11.102",
+    "@rushstack/stream-collator": "4.1.103"
   },
   "scripts": {
     "build": "heft build --clean",