@ms-cloudpack/package-hashes 0.7.35 → 0.7.37

package/lib/PackageHashes.d.ts

@@ -38,6 +38,8 @@ export declare class PackageHashes implements PackageHashesCache {
      * Creates a serializable representation of the cache.
      */
     toSerializable(): SerializablePackageHashesCache;
+    set(input: Omit<PackageHashOptions, 'shouldRecalculate'>, hash: string): void;
+    extend(input: SerializablePackageHashesCache): void;
 }
 export {};
 //# sourceMappingURL=PackageHashes.d.ts.map

package/lib/PackageHashes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PackageHashes.d.ts","sourceRoot":"","sources":["../src/PackageHashes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,uBAAuB,EACvB,kBAAkB,EAClB,kBAAkB,EAClB,UAAU,EACV,8BAA8B,EAC/B,MAAM,4BAA4B,CAAC;AAEpC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAI5D;;;;GAIG;AACH,KAAK,oBAAoB,GACrB;IACE,iFAAiF;IACjF,GAAG,EAAE,MAAM,CAAC;IACZ;;OAEG;IACH,OAAO,EAAE;QACP,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,uBAAuB,GAAG,6BAA6B,CAAC,CAAC;QACvF,QAAQ,EAAE,uBAAuB,CAAC;QAClC,UAAU,EAAE,UAAU,CAAC;KACxB,CAAC;CACH,GACD;IACE;;OAEG;IACH,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC;AAEN;;GAEG;AACH,qBAAa,aAAc,YAAW,kBAAkB;IAa1C,QAAQ,CAAC,OAAO,EAAE,oBAAoB;IAZlD,mEAAmE;IACnE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAGhC;IACF,uEAAuE;IACvE,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAGlC;IACF,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAe;gBAEhB,OAAO,EAAE,oBAAoB;IAwB5C,GAAG,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC;IAgBrD;;OAEG;IACH,cAAc,IAAI,8BAA8B;CAYjD"}
+{"version":3,"file":"PackageHashes.d.ts","sourceRoot":"","sources":["../src/PackageHashes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,uBAAuB,EACvB,kBAAkB,EAClB,kBAAkB,EAClB,UAAU,EACV,8BAA8B,EAC/B,MAAM,4BAA4B,CAAC;AAEpC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAI5D;;;;GAIG;AACH,KAAK,oBAAoB,GACrB;IACE,iFAAiF;IACjF,GAAG,EAAE,MAAM,CAAC;IACZ;;OAEG;IACH,OAAO,EAAE;QACP,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,uBAAuB,GAAG,6BAA6B,CAAC,CAAC;QACvF,QAAQ,EAAE,uBAAuB,CAAC;QAClC,UAAU,EAAE,UAAU,CAAC;KACxB,CAAC;CACH,GACD;IACE;;OAEG;IACH,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC;AAEN;;GAEG;AACH,qBAAa,aAAc,YAAW,kBAAkB;IAa1C,QAAQ,CAAC,OAAO,EAAE,oBAAoB;IAZlD,mEAAmE;IACnE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAGhC;IACF,uEAAuE;IACvE,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAGlC;IACF,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAe;gBAEhB,OAAO,EAAE,oBAAoB;IAwB5C,GAAG,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC;IAgBrD;;OAEG;IACH,cAAc,IAAI,8BAA8B;IAahD,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,kBAAkB,EAAE,mBAAmB,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAM7E,MAAM,CAAC,KAAK,EAAE,8BAA8B,GAAG,IAAI;CAcpD"}

package/lib/PackageHashes.js

@@ -63,5 +63,23 @@ export class PackageHashes {
             },
         };
     }
+    set(input, hash) {
+        const { packagePath, isSourceHashingEnabled, targetEnvironment } = input;
+        const map = (isSourceHashingEnabled ? this._hashesWithSource : this._hashesWithNoSource)[targetEnvironment];
+        map.set(packagePath, hash);
+    }
+    extend(input) {
+        // Helper function to merge an object's entries into a Map
+        const extendMap = (map, obj = {}) => {
+            for (const [key, value] of Object.entries(obj)) {
+                map.set(key, value);
+            }
+        };
+        // Apply to all map collections
+        extendMap(this._hashesWithSource.browser, input.hashesWithSource?.browser);
+        extendMap(this._hashesWithSource.node, input.hashesWithSource?.node);
+        extendMap(this._hashesWithNoSource.browser, input.hashesWithNoSource?.browser);
+        extendMap(this._hashesWithNoSource.node, input.hashesWithNoSource?.node);
+    }
 }
 //# sourceMappingURL=PackageHashes.js.map

package/lib/PackageHashes.js.map

@@ -1 +1 @@
-{"version":3,"file":"PackageHashes.js","sourceRoot":"","sources":["../src/PackageHashes.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AA2BzE;;GAEG;AACH,MAAM,OAAO,aAAa;IAaH;IAZrB,mEAAmE;IAClD,iBAAiB,GAAG;QACnC,OAAO,EAAE,IAAI,GAAG,EAAkB;QAClC,IAAI,EAAE,IAAI,GAAG,EAAkB;KAChC,CAAC;IACF,uEAAuE;IACtD,mBAAmB,GAAG;QACrC,OAAO,EAAE,IAAI,GAAG,EAAkB;QAClC,IAAI,EAAE,IAAI,GAAG,EAAkB;KAChC,CAAC;IACe,KAAK,CAAe;IAErC,YAAqB,OAA6B;QAA7B,YAAO,GAAP,OAAO,CAAsB;QAChD,IAAI,MAAM,IAAI,OAAO,EAAE,CAAC;YACtB,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;YAC1B,OAAO;QACT,CAAC;QAED,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;QACnC,MAAM,OAAO,GAAG,IAAI,mBAAmB,CAAC;YACtC,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,WAAW,EAAE,MAAM,CAAC,qBAAqB;SAC1C,CAAC,CAAC;QACH,MAAM,wBAAwB,GAAG,IAAI,wBAAwB,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC;QAElG,IAAI,CAAC,KAAK,GAAG,CAAC,KAAK,EAAE,EAAE,CACrB,WAAW,CAAC;YACV,KAAK;YACL,OAAO,EAAE;gBACP,GAAG,OAAO,CAAC,OAAO;gBAClB,OAAO;gBACP,wBAAwB;aACzB;SACF,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,KAAyB;QACjC,MAAM,EAAE,WAAW,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,GAAG,KAAK,CAAC;QAE5F,MAAM,GAAG,GAAG,CAAC,sBAAsB,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,iBAAiB,CAAC,CAAC;QAE5G,IAAI,CAAC,iBAAiB,IAAI,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;YAC/C,OAAO,GAAG,CAAC,GAAG,CAAC,WAAW,CAAW,CAAC;QACxC,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAErC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QAE3B,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACH,cAAc;QACZ,OAAO;YACL,gBAAgB,EAAE;gBAChB,OAAO,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC;gBAC3D,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC;aACtD;YACD,kBAAkB,EAAE;gBAClB,OAAO,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC;gBAC7D,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC;aACxD;SACF,CAAC;IACJ,CAAC;CACF","sourcesContent":["import type {\n  CloudpackConfig,\n  PackageDefinitionsCache,\n  PackageHashOptions,\n  PackageHashesCache,\n  ResolveMap,\n  SerializablePackageHashesCache,\n} from '@ms-cloudpack/common-types';\nimport { hashPackage } from './hashPackage.js';\nimport type { HashFunction } from './types/HashFunction.js';\nimport { PackagePatchesCache } from './PackagePatchesCache.js';\nimport { BundlerCapabilitiesCache } from './BundlerCapabilitiesCache.js';\n\n/**\n * Constructor options for the PackageHashes class.\n *\n * (For `PackageHashes.get` options, see `PackageHashOptions`.)\n */\ntype PackageHashesOptions =\n  | {\n      /** Working directory used to find the project root (usually repository root). */\n      cwd: string;\n      /**\n       * Context for the hash calculations.\n       */\n      context: {\n        config: Pick<CloudpackConfig, 'patchFilesGlobPattern' | 'bundlerCapabilitiesRegistry'>;\n        packages: PackageDefinitionsCache;\n        resolveMap: ResolveMap;\n      };\n    }\n  | {\n      /**\n       * A function that returns the hash for a given package path. This is intended for testing purposes.\n       */\n      hash: HashFunction;\n    };\n\n/**\n * Utility class for hashing packages and caching the results.\n */\nexport class PackageHashes implements PackageHashesCache {\n  /** Mapping from package path to hash (considering source files) */\n  private readonly _hashesWithSource = {\n    browser: new Map<string, string>(),\n    node: new Map<string, string>(),\n  };\n  /** Mapping from package path to hash (not considering source files) */\n  private readonly _hashesWithNoSource = {\n    browser: new Map<string, string>(),\n    node: new Map<string, string>(),\n  };\n  private readonly _hash: HashFunction;\n\n  constructor(readonly options: PackageHashesOptions) {\n    if ('hash' in options) {\n      this._hash = options.hash;\n      return;\n    }\n\n    const { config } = options.context;\n    const patches = new PackagePatchesCache({\n      cwd: options.cwd,\n      globPattern: config.patchFilesGlobPattern,\n    });\n    const bundlerCapabilitiesCache = new BundlerCapabilitiesCache(config.bundlerCapabilitiesRegistry);\n\n    this._hash = (input) =>\n      hashPackage({\n        input,\n        context: {\n          ...options.context,\n          patches,\n          bundlerCapabilitiesCache,\n        },\n      });\n  }\n\n  async get(input: PackageHashOptions): Promise<string> {\n    const { packagePath, isSourceHashingEnabled, shouldRecalculate, targetEnvironment } = input;\n\n    const map = (isSourceHashingEnabled ? this._hashesWithSource : this._hashesWithNoSource)[targetEnvironment];\n\n    if (!shouldRecalculate && map.has(packagePath)) {\n      return map.get(packagePath) as string;\n    }\n\n    const hash = await this._hash(input);\n\n    map.set(packagePath, hash);\n\n    return hash;\n  }\n\n  /**\n   * Creates a serializable representation of the cache.\n   */\n  toSerializable(): SerializablePackageHashesCache {\n    return {\n      hashesWithSource: {\n        browser: Object.fromEntries(this._hashesWithSource.browser),\n        node: Object.fromEntries(this._hashesWithSource.node),\n      },\n      hashesWithNoSource: {\n        browser: Object.fromEntries(this._hashesWithNoSource.browser),\n        node: Object.fromEntries(this._hashesWithNoSource.node),\n      },\n    };\n  }\n}\n"]}
+{"version":3,"file":"PackageHashes.js","sourceRoot":"","sources":["../src/PackageHashes.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  CloudpackConfig,\n  PackageDefinitionsCache,\n  PackageHashOptions,\n  PackageHashesCache,\n  ResolveMap,\n  SerializablePackageHashesCache,\n} from '@ms-cloudpack/common-types';\nimport { hashPackage } from './hashPackage.js';\nimport type { HashFunction } from './types/HashFunction.js';\nimport { PackagePatchesCache } from './PackagePatchesCache.js';\nimport { BundlerCapabilitiesCache } from './BundlerCapabilitiesCache.js';\n\n/**\n * Constructor options for the PackageHashes class.\n *\n * (For `PackageHashes.get` options, see `PackageHashOptions`.)\n */\ntype PackageHashesOptions =\n  | {\n      /** Working directory used to find the project root (usually repository root). */\n      cwd: string;\n      /**\n       * Context for the hash calculations.\n       */\n      context: {\n        config: Pick<CloudpackConfig, 'patchFilesGlobPattern' | 'bundlerCapabilitiesRegistry'>;\n        packages: PackageDefinitionsCache;\n        resolveMap: ResolveMap;\n      };\n    }\n  | {\n      /**\n       * A function that returns the hash for a given package path. This is intended for testing purposes.\n       */\n      hash: HashFunction;\n    };\n\n/**\n * Utility class for hashing packages and caching the results.\n */\nexport class PackageHashes implements PackageHashesCache {\n  /** Mapping from package path to hash (considering source files) */\n  private readonly _hashesWithSource = {\n    browser: new Map<string, string>(),\n    node: new Map<string, string>(),\n  };\n  /** Mapping from package path to hash (not considering source files) */\n  private readonly _hashesWithNoSource = {\n    browser: new Map<string, string>(),\n    node: new Map<string, string>(),\n  };\n  private readonly _hash: HashFunction;\n\n  constructor(readonly options: PackageHashesOptions) {\n    if ('hash' in options) {\n      this._hash = options.hash;\n      return;\n    }\n\n    const { config } = options.context;\n    const patches = new PackagePatchesCache({\n      cwd: options.cwd,\n      globPattern: config.patchFilesGlobPattern,\n    });\n    const bundlerCapabilitiesCache = new BundlerCapabilitiesCache(config.bundlerCapabilitiesRegistry);\n\n    this._hash = (input) =>\n      hashPackage({\n        input,\n        context: {\n          ...options.context,\n          patches,\n          bundlerCapabilitiesCache,\n        },\n      });\n  }\n\n  async get(input: PackageHashOptions): Promise<string> {\n    const { packagePath, isSourceHashingEnabled, shouldRecalculate, targetEnvironment } = input;\n\n    const map = (isSourceHashingEnabled ? this._hashesWithSource : this._hashesWithNoSource)[targetEnvironment];\n\n    if (!shouldRecalculate && map.has(packagePath)) {\n      return map.get(packagePath) as string;\n    }\n\n    const hash = await this._hash(input);\n\n    map.set(packagePath, hash);\n\n    return hash;\n  }\n\n  /**\n   * Creates a serializable representation of the cache.\n   */\n  toSerializable(): SerializablePackageHashesCache {\n    return {\n      hashesWithSource: {\n        browser: Object.fromEntries(this._hashesWithSource.browser),\n        node: Object.fromEntries(this._hashesWithSource.node),\n      },\n      hashesWithNoSource: {\n        browser: Object.fromEntries(this._hashesWithNoSource.browser),\n        node: Object.fromEntries(this._hashesWithNoSource.node),\n      },\n    };\n  }\n\n  set(input: Omit<PackageHashOptions, 'shouldRecalculate'>, hash: string): void {\n    const { packagePath, isSourceHashingEnabled, targetEnvironment } = input;\n    const map = (isSourceHashingEnabled ? this._hashesWithSource : this._hashesWithNoSource)[targetEnvironment];\n    map.set(packagePath, hash);\n  }\n\n  extend(input: SerializablePackageHashesCache): void {\n    // Helper function to merge an object's entries into a Map\n    const extendMap = (map: Map<string, string>, obj: Record<string, string> = {}): void => {\n      for (const [key, value] of Object.entries(obj)) {\n        map.set(key, value);\n      }\n    };\n\n    // Apply to all map collections\n    extendMap(this._hashesWithSource.browser, input.hashesWithSource?.browser);\n    extendMap(this._hashesWithSource.node, input.hashesWithSource?.node);\n    extendMap(this._hashesWithNoSource.browser, input.hashesWithNoSource?.browser);\n    extendMap(this._hashesWithNoSource.node, input.hashesWithNoSource?.node);\n  }\n}\n"]}

package/lib/PackagePatchesCache.d.ts

@@ -1,3 +1,4 @@
+import type { PackageJson } from '@ms-cloudpack/common-types';
 export interface PackagePatchesSettings {
     /** Working directory, used to determine the project root where patches are stored. */
     cwd: string;
@@ -12,17 +13,20 @@ interface PackagePatch {
 }
 /**
  * PackagePatchesCache manages a cache of information about patch files, which are usually stored in the
- * `patches` folder at the root of the repo. It provides a method to retrieve the patch file
- * path and contents for a given package name and version.
+ * `patches` folder at the root of the repo (also handles yarn v2+ patches).
  */
 export declare class PackagePatchesCache {
     private readonly settings;
     /**
-     * Mapping from `${packageName}@${version}` to patch file path and contents.
-     * The paths are saved on an initial pass, but the contents are only saved on first read
-     * (in case of very large patch files which are never used).
+     * Mapping from package key (see `getKey`) to patch file path and contents.
+     *
+     * The paths from `globPattern` (or `defaultGlobPattern`) are saved in an initial pass, but the
+     * contents are only read on first request (in case of very large patches for packages that
+     * cloudpack doesn't process). Yarn v2+ patches are also lazy loaded.
      */
     private _patches;
+    private _loaded;
+    private _rootPath;
     constructor(settings: PackagePatchesSettings);
     private getKey;
     /**
@@ -32,11 +36,9 @@ export declare class PackagePatchesCache {
     private readPatchFile;
     /**
      * Gets info about the patch file for the specified package.
-     * @param packageName - The name of the package to check.
-     * @param version - The version of the package to check.
      * @returns Patch file path and contents if the package has been patched, undefined otherwise.
      */
-    getPackagePatch(packageName: string, version: string): Promise<PackagePatch | undefined>;
+    getPackagePatch(definition: PackageJson): Promise<PackagePatch | undefined>;
 }
 export {};
 //# sourceMappingURL=PackagePatchesCache.d.ts.map

package/lib/PackagePatchesCache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PackagePatchesCache.d.ts","sourceRoot":"","sources":["../src/PackagePatchesCache.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,sBAAsB;IACrC,sFAAsF;IACtF,GAAG,EAAE,MAAM,CAAC;IAEZ,oFAAoF;IACpF,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,iEAAiE;IACjE,OAAO,CAAC,EAAE,MAAM,CAAC,GAAG,MAAM,IAAI,MAAM,EAAE,EAAE,YAAY,CAAC,CAAC;CACvD;AAED,UAAU,YAAY;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;GAIG;AACH,qBAAa,mBAAmB;IAQlB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAPrC;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAA0D;gBAE7C,QAAQ,EAAE,sBAAsB;IAE7D,OAAO,CAAC,MAAM;IAId;;OAEG;YACW,mBAAmB;YAqCnB,aAAa;IAS3B;;;;;OAKG;IACU,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;CAetG"}
+{"version":3,"file":"PackagePatchesCache.d.ts","sourceRoot":"","sources":["../src/PackagePatchesCache.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAK9D,MAAM,WAAW,sBAAsB;IACrC,sFAAsF;IACtF,GAAG,EAAE,MAAM,CAAC;IAEZ,oFAAoF;IACpF,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,iEAAiE;IACjE,OAAO,CAAC,EAAE,MAAM,CAAC,GAAG,MAAM,IAAI,MAAM,EAAE,EAAE,YAAY,CAAC,CAAC;CACvD;AAED,UAAU,YAAY;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;GAGG;AACH,qBAAa,mBAAmB;IAYlB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAXrC;;;;;;OAMG;IACH,OAAO,CAAC,QAAQ,CAA8C;IAC9D,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,SAAS,CAAqB;gBAET,QAAQ,EAAE,sBAAsB;IAI7D,OAAO,CAAC,MAAM;IAId;;OAEG;YACW,mBAAmB;YA+BnB,aAAa;IAS3B;;;OAGG;IACU,eAAe,CAAC,UAAU,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;CA0BzF"}

package/lib/PackagePatchesCache.js

@@ -3,21 +3,27 @@ import fsPromises from 'fs/promises';
 import glob from 'fast-glob';
 import path from 'path';
 import { parsePatchFilePath } from './parsePatchFilePath.js';
+/** Default `patch-package` patches path. (yarn v2+ patches are handled separately.) */
+const defaultGlobPattern = 'patches/*.patch';
 /**
  * PackagePatchesCache manages a cache of information about patch files, which are usually stored in the
- * `patches` folder at the root of the repo. It provides a method to retrieve the patch file
- * path and contents for a given package name and version.
+ * `patches` folder at the root of the repo (also handles yarn v2+ patches).
  */
 export class PackagePatchesCache {
     settings;
     /**
-     * Mapping from `${packageName}@${version}` to patch file path and contents.
-     * The paths are saved on an initial pass, but the contents are only saved on first read
-     * (in case of very large patch files which are never used).
+     * Mapping from package key (see `getKey`) to patch file path and contents.
+     *
+     * The paths from `globPattern` (or `defaultGlobPattern`) are saved in an initial pass, but the
+     * contents are only read on first request (in case of very large patches for packages that
+     * cloudpack doesn't process). Yarn v2+ patches are also lazy loaded.
      */
     _patches;
+    _loaded = false;
+    _rootPath;
     constructor(settings) {
         this.settings = settings;
+        this._patches = settings.patches || {};
     }
     getKey(packageName, version) {
         return `${packageName}@${version}`;
@@ -26,20 +32,15 @@ export class PackagePatchesCache {
      * Loads the list of patched packages from the `patches` folder.
      */
     async loadPatchedPackages() {
-        if (this.settings.patches) {
-            this._patches = this.settings.patches;
+        if (this._loaded) {
             return;
         }
-        this._patches = {};
+        this._loaded = true;
         // get the repo root
-        const rootPath = findProjectRoot(this.settings.cwd) || this.settings.cwd;
-        if (!rootPath) {
-            console.info('Could not find the root of the repo. Skipping loading patched packages.');
-            return;
-        }
+        this._rootPath = findProjectRoot(this.settings.cwd) || this.settings.cwd;
         // get the files with .patch extension
-        const patchFiles = await glob(this.settings.globPattern || 'patches/*.patch', {
-            cwd: rootPath,
+        const patchFiles = await glob(this.settings.globPattern || defaultGlobPattern, {
+            cwd: this._rootPath,
             absolute: true,
         });
         for (const absoluteFilePath of patchFiles) {
@@ -65,15 +66,22 @@ export class PackagePatchesCache {
     }
     /**
      * Gets info about the patch file for the specified package.
-     * @param packageName - The name of the package to check.
-     * @param version - The version of the package to check.
      * @returns Patch file path and contents if the package has been patched, undefined otherwise.
      */
-    async getPackagePatch(packageName, version) {
-        if (!this._patches) {
+    async getPackagePatch(definition) {
+        if (!this._loaded) {
             await this.loadPatchedPackages();
         }
-        const patchInfo = this._patches?.[this.getKey(packageName, version)];
+        const key = this.getKey(definition.name, definition.version);
+        let patchInfo = this._patches[key];
+        if (!patchInfo && definition.cloudpack?.patchFilePath && this._rootPath) {
+            // Yarn v2+ patch files don't use a parseable name, so we handle them separately.
+            // The file paths are like .yarn/patches/@foo-bar-baz-npm-4.3.0-e85334d38f.patch
+            // without a way to distinguish where the scope ends.
+            console.debug(`Found yarn patch file for package: ${key}`);
+            patchInfo = { path: path.join(this._rootPath, definition.cloudpack.patchFilePath) };
+            this._patches[key] = patchInfo;
+        }
         if (patchInfo) {
             // The contents are lazy loaded
             patchInfo.contents ??= await this.readPatchFile(patchInfo.path);

package/lib/PackagePatchesCache.js.map

@@ -1 +1 @@
-{"version":3,"file":"PackagePatchesCache.js","sourceRoot":"","sources":["../src/PackagePatchesCache.ts"],"names":[],"mappings":"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","sourcesContent":["import { findProjectRoot } from '@ms-cloudpack/path-utilities';\nimport fsPromises from 'fs/promises';\nimport glob from 'fast-glob';\nimport path from 'path';\nimport { parsePatchFilePath } from './parsePatchFilePath.js';\n\nexport interface PackagePatchesSettings {\n  /** Working directory, used to determine the project root where patches are stored. */\n  cwd: string;\n\n  /** Custom glob pattern for patch files (from `AppConfig.patchFilesGlobPattern`). */\n  globPattern?: string;\n\n  /** Patches to use instead of reading from disk (for testing). */\n  patches?: Record<`${string}@${string}`, PackagePatch>;\n}\n\ninterface PackagePatch {\n  path: string;\n  contents?: string;\n}\n\n/**\n * PackagePatchesCache manages a cache of information about patch files, which are usually stored in the\n * `patches` folder at the root of the repo. It provides a method to retrieve the patch file\n * path and contents for a given package name and version.\n */\nexport class PackagePatchesCache {\n  /**\n   * Mapping from `${packageName}@${version}` to patch file path and contents.\n   * The paths are saved on an initial pass, but the contents are only saved on first read\n   * (in case of very large patch files which are never used).\n   */\n  private _patches: Record<`${string}@${string}`, PackagePatch> | undefined;\n\n  constructor(private readonly settings: PackagePatchesSettings) {}\n\n  private getKey(packageName: string, version: string): `${string}@${string}` {\n    return `${packageName}@${version}`;\n  }\n\n  /**\n   * Loads the list of patched packages from the `patches` folder.\n   */\n  private async loadPatchedPackages(): Promise<void> {\n    if (this.settings.patches) {\n      this._patches = this.settings.patches;\n      return;\n    }\n\n    this._patches = {};\n\n    // get the repo root\n    const rootPath = findProjectRoot(this.settings.cwd) || this.settings.cwd;\n\n    if (!rootPath) {\n      console.info('Could not find the root of the repo. Skipping loading patched packages.');\n      return;\n    }\n\n    // get the files with .patch extension\n    const patchFiles = await glob(this.settings.globPattern || 'patches/*.patch', {\n      cwd: rootPath,\n      absolute: true,\n    });\n\n    for (const absoluteFilePath of patchFiles) {\n      try {\n        const normalizedPath = path.normalize(absoluteFilePath);\n\n        const { packageName, version } = parsePatchFilePath(normalizedPath);\n\n        console.debug(`Found patch file for package: ${packageName}@${version}`);\n\n        this._patches[this.getKey(packageName, version)] = { path: normalizedPath };\n      } catch (e) {\n        console.warn(`Invalid patch file \"${absoluteFilePath}\": ${e}`);\n      }\n    }\n  }\n\n  private async readPatchFile(patchFilePath: string): Promise<string> {\n    try {\n      return await fsPromises.readFile(patchFilePath, 'utf-8');\n    } catch (e) {\n      console.warn(`Error reading patch file \"${patchFilePath}\": ${e}`);\n      return '';\n    }\n  }\n\n  /**\n   * Gets info about the patch file for the specified package.\n   * @param packageName - The name of the package to check.\n   * @param version - The version of the package to check.\n   * @returns Patch file path and contents if the package has been patched, undefined otherwise.\n   */\n  public async getPackagePatch(packageName: string, version: string): Promise<PackagePatch | undefined> {\n    if (!this._patches) {\n      await this.loadPatchedPackages();\n    }\n\n    const patchInfo = this._patches?.[this.getKey(packageName, version)];\n\n    if (patchInfo) {\n      // The contents are lazy loaded\n      patchInfo.contents ??= await this.readPatchFile(patchInfo.path);\n      return patchInfo;\n    }\n\n    return undefined;\n  }\n}\n"]}
+{"version":3,"file":"PackagePatchesCache.js","sourceRoot":"","sources":["../src/PackagePatchesCache.ts"],"names":[],"mappings":"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","sourcesContent":["import { findProjectRoot } from '@ms-cloudpack/path-utilities';\nimport fsPromises from 'fs/promises';\nimport glob from 'fast-glob';\nimport path from 'path';\nimport { parsePatchFilePath } from './parsePatchFilePath.js';\nimport type { PackageJson } from '@ms-cloudpack/common-types';\n\n/** Default `patch-package` patches path. (yarn v2+ patches are handled separately.) */\nconst defaultGlobPattern = 'patches/*.patch';\n\nexport interface PackagePatchesSettings {\n  /** Working directory, used to determine the project root where patches are stored. */\n  cwd: string;\n\n  /** Custom glob pattern for patch files (from `AppConfig.patchFilesGlobPattern`). */\n  globPattern?: string;\n\n  /** Patches to use instead of reading from disk (for testing). */\n  patches?: Record<`${string}@${string}`, PackagePatch>;\n}\n\ninterface PackagePatch {\n  path: string;\n  contents?: string;\n}\n\n/**\n * PackagePatchesCache manages a cache of information about patch files, which are usually stored in the\n * `patches` folder at the root of the repo (also handles yarn v2+ patches).\n */\nexport class PackagePatchesCache {\n  /**\n   * Mapping from package key (see `getKey`) to patch file path and contents.\n   *\n   * The paths from `globPattern` (or `defaultGlobPattern`) are saved in an initial pass, but the\n   * contents are only read on first request (in case of very large patches for packages that\n   * cloudpack doesn't process). Yarn v2+ patches are also lazy loaded.\n   */\n  private _patches: Record<`${string}@${string}`, PackagePatch>;\n  private _loaded = false;\n  private _rootPath: string | undefined;\n\n  constructor(private readonly settings: PackagePatchesSettings) {\n    this._patches = settings.patches || {};\n  }\n\n  private getKey(packageName: string, version: string): `${string}@${string}` {\n    return `${packageName}@${version}`;\n  }\n\n  /**\n   * Loads the list of patched packages from the `patches` folder.\n   */\n  private async loadPatchedPackages(): Promise<void> {\n    if (this._loaded) {\n      return;\n    }\n\n    this._loaded = true;\n\n    // get the repo root\n    this._rootPath = findProjectRoot(this.settings.cwd) || this.settings.cwd;\n\n    // get the files with .patch extension\n    const patchFiles = await glob(this.settings.globPattern || defaultGlobPattern, {\n      cwd: this._rootPath,\n      absolute: true,\n    });\n\n    for (const absoluteFilePath of patchFiles) {\n      try {\n        const normalizedPath = path.normalize(absoluteFilePath);\n\n        const { packageName, version } = parsePatchFilePath(normalizedPath);\n\n        console.debug(`Found patch file for package: ${packageName}@${version}`);\n\n        this._patches[this.getKey(packageName, version)] = { path: normalizedPath };\n      } catch (e) {\n        console.warn(`Invalid patch file \"${absoluteFilePath}\": ${e}`);\n      }\n    }\n  }\n\n  private async readPatchFile(patchFilePath: string): Promise<string> {\n    try {\n      return await fsPromises.readFile(patchFilePath, 'utf-8');\n    } catch (e) {\n      console.warn(`Error reading patch file \"${patchFilePath}\": ${e}`);\n      return '';\n    }\n  }\n\n  /**\n   * Gets info about the patch file for the specified package.\n   * @returns Patch file path and contents if the package has been patched, undefined otherwise.\n   */\n  public async getPackagePatch(definition: PackageJson): Promise<PackagePatch | undefined> {\n    if (!this._loaded) {\n      await this.loadPatchedPackages();\n    }\n\n    const key = this.getKey(definition.name, definition.version);\n\n    let patchInfo = this._patches[key];\n\n    if (!patchInfo && definition.cloudpack?.patchFilePath && this._rootPath) {\n      // Yarn v2+ patch files don't use a parseable name, so we handle them separately.\n      // The file paths are like .yarn/patches/@foo-bar-baz-npm-4.3.0-e85334d38f.patch\n      // without a way to distinguish where the scope ends.\n      console.debug(`Found yarn patch file for package: ${key}`);\n      patchInfo = { path: path.join(this._rootPath, definition.cloudpack.patchFilePath) };\n      this._patches[key] = patchInfo;\n    }\n\n    if (patchInfo) {\n      // The contents are lazy loaded\n      patchInfo.contents ??= await this.readPatchFile(patchInfo.path);\n      return patchInfo;\n    }\n\n    return undefined;\n  }\n}\n"]}

package/lib/getPackageHashEntries.js

@@ -16,7 +16,7 @@ export async function getPackageHashEntries(params) {
     const filesHash = !isExternal && isSourceHashingEnabled
         ? await getSourceHash({ packagePath, inputPaths: packageSettings.inputPaths })
         : undefined;
-    const patchFileContent = isExternal ? (await patches.getPackagePatch(name, version))?.contents : undefined;
+    const patchFileContent = isExternal ? (await patches.getPackagePatch(definition))?.contents : undefined;
     // Only include a subset of package.json properties to reduce the amount hashed.
     const result = {
         // This will be calculated by createPackageSettingsTransform and incorporates the original

package/lib/getPackageHashEntries.js.map

@@ -1 +1 @@
-{"version":3,"file":"getPackageHashEntries.js","sourceRoot":"","sources":["../src/getPackageHashEntries.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAEjE,OAAO,EAAE,aAAa,EAAkB,MAAM,oBAAoB,CAAC;AA0BnE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,MAO3C;IACC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IACpC,MAAM,EAAE,WAAW,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC;IAC3E,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,wBAAwB,EAAE,GAAG,OAAO,CAAC;IAEhE,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACnD,MAAM,kBAAkB,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;IAExF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;IAErC,4FAA4F;IAC5F,MAAM,eAAe,GAAG,EAAE,GAAG,UAAU,CAAC,SAAS,EAAE,CAAC;IAEpD,MAAM,UAAU,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAElD,MAAM,SAAS,GACb,CAAC,UAAU,IAAI,sBAAsB;QACnC,CAAC,CAAC,MAAM,aAAa,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,eAAe,CAAC,UAAU,EAAE,CAAC;QAC9E,CAAC,CAAC,SAAS,CAAC;IAEhB,MAAM,gBAAgB,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAE3G,gFAAgF;IAChF,MAAM,MAAM,GAAuB;QACjC,0FAA0F;QAC1F,sCAAsC;QACtC,OAAO,EAAE,UAAU,CAAC,OAAO;QAC3B,uEAAuE;QACvE,iDAAiD;QACjD,YAAY,EAAE,kBAAkB,CAAC,YAAY;QAC7C,gBAAgB,EAAE,kBAAkB,CAAC,gBAAgB;QACrD,IAAI;QACJ,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW;QAC3C,SAAS;QACT,gBAAgB;QAChB,eAAe;KAChB,CAAC;IAEF,MAAM,0BAA0B,GAAG,MAAM,wBAAwB,CAAC,GAAG,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAC;IAC3G,IAAI,MAAM,CAAC,IAAI,CAAC,0BAA0B,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7D,MAAM,CAAC,0BAA0B,GAAG,0BAA0B,CAAC;IACjE,CAAC;IAED,sEAAsE;IACtE,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;QACpC,MAAM,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC/C,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import type {\n  PackageDefinitionsCache,\n  PackageJsonCloudpackMeta,\n  PackageJsonDependencies,\n  PackageJsonExports,\n  TargetEnvironment,\n} from '@ms-cloudpack/common-types';\nimport { isExternalPackage } from '@ms-cloudpack/path-utilities';\nimport type { HashFunctionOptions } from './types/HashFunction.js';\nimport { getSourceHash, type FilesHash } from './getSourceHash.js';\nimport type { PackagePatchesCache } from './PackagePatchesCache.js';\nimport type { BundlerCapabilitiesCache } from './BundlerCapabilitiesCache.js';\n\n/**\n * Values used to calculate the hash of a package.\n */\nexport interface PackageHashEntries {\n  name: string;\n  /** This will be the actual version if the package is external, or the path if it's internal. */\n  version: string;\n  exports: PackageJsonExports | undefined;\n  dependencies: PackageJsonDependencies | undefined;\n  peerDependencies: PackageJsonDependencies | undefined;\n  /** Hash of files in the package. */\n  filesHash: FilesHash | undefined;\n  /** Content of any `.patch` file for the package. */\n  patchFileContent: string | undefined;\n  /** Subset of calculated package settings and other info saved under `PackageJson.cloudpack`. */\n  packageSettings: Partial<PackageJsonCloudpackMeta>;\n  /** Content of any bundler capabilities files for the package. */\n  bundlerCapabilitiesContent?: Record<string, string>;\n  /** Target environment, if not `'browser'` */\n  targetEnvironment?: TargetEnvironment;\n}\n\n/**\n * Get an object that's used to calculate the hash of the package.\n */\nexport async function getPackageHashEntries(params: {\n  options: HashFunctionOptions;\n  context: {\n    packages: PackageDefinitionsCache;\n    patches: PackagePatchesCache;\n    bundlerCapabilitiesCache: BundlerCapabilitiesCache;\n  };\n}): Promise<PackageHashEntries> {\n  const { options, context } = params;\n  const { packagePath, targetEnvironment, isSourceHashingEnabled } = options;\n  const { packages, patches, bundlerCapabilitiesCache } = context;\n\n  const definition = await packages.get(packagePath);\n  const originalDefinition = await packages.get(packagePath, { disableTransforms: true });\n\n  const { name, version } = definition;\n\n  // This has the cached calculated package settings, with included and excluded deps removed.\n  const packageSettings = { ...definition.cloudpack };\n\n  const isExternal = isExternalPackage(packagePath);\n\n  const filesHash =\n    !isExternal && isSourceHashingEnabled\n      ? await getSourceHash({ packagePath, inputPaths: packageSettings.inputPaths })\n      : undefined;\n\n  const patchFileContent = isExternal ? (await patches.getPackagePatch(name, version))?.contents : undefined;\n\n  // Only include a subset of package.json properties to reduce the amount hashed.\n  const result: PackageHashEntries = {\n    // This will be calculated by createPackageSettingsTransform and incorporates the original\n    // exports as well as main and module.\n    exports: definition.exports,\n    // Use the original dependencies to ensure that the hash is consistent,\n    // and unaffected by include and exclude changes.\n    dependencies: originalDefinition.dependencies,\n    peerDependencies: originalDefinition.peerDependencies,\n    name,\n    version: isExternal ? version : packagePath,\n    filesHash,\n    patchFileContent,\n    packageSettings,\n  };\n\n  const bundlerCapabilitiesContent = await bundlerCapabilitiesCache.get(packageSettings.bundlerCapabilities);\n  if (Object.keys(bundlerCapabilitiesContent || {}).length > 0) {\n    result.bundlerCapabilitiesContent = bundlerCapabilitiesContent;\n  }\n\n  // Conditionally setting this prevents invalidating all cached content\n  if (targetEnvironment !== 'browser') {\n    result.targetEnvironment = targetEnvironment;\n  }\n\n  return result;\n}\n"]}
+{"version":3,"file":"getPackageHashEntries.js","sourceRoot":"","sources":["../src/getPackageHashEntries.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAEjE,OAAO,EAAE,aAAa,EAAkB,MAAM,oBAAoB,CAAC;AA0BnE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,MAO3C;IACC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IACpC,MAAM,EAAE,WAAW,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC;IAC3E,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,wBAAwB,EAAE,GAAG,OAAO,CAAC;IAEhE,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACnD,MAAM,kBAAkB,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;IAExF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;IAErC,4FAA4F;IAC5F,MAAM,eAAe,GAAG,EAAE,GAAG,UAAU,CAAC,SAAS,EAAE,CAAC;IAEpD,MAAM,UAAU,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAElD,MAAM,SAAS,GACb,CAAC,UAAU,IAAI,sBAAsB;QACnC,CAAC,CAAC,MAAM,aAAa,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,eAAe,CAAC,UAAU,EAAE,CAAC;QAC9E,CAAC,CAAC,SAAS,CAAC;IAEhB,MAAM,gBAAgB,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAExG,gFAAgF;IAChF,MAAM,MAAM,GAAuB;QACjC,0FAA0F;QAC1F,sCAAsC;QACtC,OAAO,EAAE,UAAU,CAAC,OAAO;QAC3B,uEAAuE;QACvE,iDAAiD;QACjD,YAAY,EAAE,kBAAkB,CAAC,YAAY;QAC7C,gBAAgB,EAAE,kBAAkB,CAAC,gBAAgB;QACrD,IAAI;QACJ,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW;QAC3C,SAAS;QACT,gBAAgB;QAChB,eAAe;KAChB,CAAC;IAEF,MAAM,0BAA0B,GAAG,MAAM,wBAAwB,CAAC,GAAG,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAC;IAC3G,IAAI,MAAM,CAAC,IAAI,CAAC,0BAA0B,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7D,MAAM,CAAC,0BAA0B,GAAG,0BAA0B,CAAC;IACjE,CAAC;IAED,sEAAsE;IACtE,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;QACpC,MAAM,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC/C,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import type {\n  PackageDefinitionsCache,\n  PackageJsonCloudpackMeta,\n  PackageJsonDependencies,\n  PackageJsonExports,\n  TargetEnvironment,\n} from '@ms-cloudpack/common-types';\nimport { isExternalPackage } from '@ms-cloudpack/path-utilities';\nimport type { HashFunctionOptions } from './types/HashFunction.js';\nimport { getSourceHash, type FilesHash } from './getSourceHash.js';\nimport type { PackagePatchesCache } from './PackagePatchesCache.js';\nimport type { BundlerCapabilitiesCache } from './BundlerCapabilitiesCache.js';\n\n/**\n * Values used to calculate the hash of a package.\n */\nexport interface PackageHashEntries {\n  name: string;\n  /** This will be the actual version if the package is external, or the path if it's internal. */\n  version: string;\n  exports: PackageJsonExports | undefined;\n  dependencies: PackageJsonDependencies | undefined;\n  peerDependencies: PackageJsonDependencies | undefined;\n  /** Hash of files in the package. */\n  filesHash: FilesHash | undefined;\n  /** Content of any `.patch` file for the package. */\n  patchFileContent: string | undefined;\n  /** Subset of calculated package settings and other info saved under `PackageJson.cloudpack`. */\n  packageSettings: Partial<PackageJsonCloudpackMeta>;\n  /** Content of any bundler capabilities files for the package. */\n  bundlerCapabilitiesContent?: Record<string, string>;\n  /** Target environment, if not `'browser'` */\n  targetEnvironment?: TargetEnvironment;\n}\n\n/**\n * Get an object that's used to calculate the hash of the package.\n */\nexport async function getPackageHashEntries(params: {\n  options: HashFunctionOptions;\n  context: {\n    packages: PackageDefinitionsCache;\n    patches: PackagePatchesCache;\n    bundlerCapabilitiesCache: BundlerCapabilitiesCache;\n  };\n}): Promise<PackageHashEntries> {\n  const { options, context } = params;\n  const { packagePath, targetEnvironment, isSourceHashingEnabled } = options;\n  const { packages, patches, bundlerCapabilitiesCache } = context;\n\n  const definition = await packages.get(packagePath);\n  const originalDefinition = await packages.get(packagePath, { disableTransforms: true });\n\n  const { name, version } = definition;\n\n  // This has the cached calculated package settings, with included and excluded deps removed.\n  const packageSettings = { ...definition.cloudpack };\n\n  const isExternal = isExternalPackage(packagePath);\n\n  const filesHash =\n    !isExternal && isSourceHashingEnabled\n      ? await getSourceHash({ packagePath, inputPaths: packageSettings.inputPaths })\n      : undefined;\n\n  const patchFileContent = isExternal ? (await patches.getPackagePatch(definition))?.contents : undefined;\n\n  // Only include a subset of package.json properties to reduce the amount hashed.\n  const result: PackageHashEntries = {\n    // This will be calculated by createPackageSettingsTransform and incorporates the original\n    // exports as well as main and module.\n    exports: definition.exports,\n    // Use the original dependencies to ensure that the hash is consistent,\n    // and unaffected by include and exclude changes.\n    dependencies: originalDefinition.dependencies,\n    peerDependencies: originalDefinition.peerDependencies,\n    name,\n    version: isExternal ? version : packagePath,\n    filesHash,\n    patchFileContent,\n    packageSettings,\n  };\n\n  const bundlerCapabilitiesContent = await bundlerCapabilitiesCache.get(packageSettings.bundlerCapabilities);\n  if (Object.keys(bundlerCapabilitiesContent || {}).length > 0) {\n    result.bundlerCapabilitiesContent = bundlerCapabilitiesContent;\n  }\n\n  // Conditionally setting this prevents invalidating all cached content\n  if (targetEnvironment !== 'browser') {\n    result.targetEnvironment = targetEnvironment;\n  }\n\n  return result;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/package-hashes",
-  "version": "0.7.35",
+  "version": "0.7.37",
   "description": "Utilities for hashing packages.",
   "license": "MIT",
   "type": "module",
@@ -14,11 +14,11 @@
     }
   },
   "dependencies": {
-    "@ms-cloudpack/common-types": "^0.24.11",
-    "@ms-cloudpack/config": "^0.33.23",
-    "@ms-cloudpack/package-utilities": "^12.0.2",
-    "@ms-cloudpack/path-string-parsing": "^1.2.6",
-    "@ms-cloudpack/path-utilities": "^3.0.8",
+    "@ms-cloudpack/common-types": "^0.24.13",
+    "@ms-cloudpack/config": "^0.33.25",
+    "@ms-cloudpack/package-utilities": "^12.1.0",
+    "@ms-cloudpack/path-string-parsing": "^1.2.7",
+    "@ms-cloudpack/path-utilities": "^3.0.10",
     "fast-glob": "^3.2.12",
     "glob-hasher": "^1.4.2",
     "object-hash": "^3.0.0"