@ms-cloudpack/package-utilities 12.0.2 → 12.1.0

package/lib/packageDefinitions/PackageDefinitions.d.ts

@@ -1,4 +1,4 @@
-import type { CloudpackConfig, GetPackageDefinitionOptions, PackageDefinitionTransformFactory, PackageDefinitionsCache, PackageJson } from '@ms-cloudpack/common-types';
+import type { CloudpackConfig, GetPackageDefinitionOptions, PackageDefinitionTransformFactory, PackageDefinitionsCache, PackageJson, SerializablePackageDefinitionsCache } from '@ms-cloudpack/common-types';
 export interface PackageDefinitionsOptions {
     /**
      * Config object to pass to transforms. When `reset` is called with a new value, the transforms
@@ -29,7 +29,8 @@ export declare class PackageDefinitions implements PackageDefinitionsCache {
         newConfig?: CloudpackConfig;
         force?: boolean;
     }): void;
-    _getAll(options?: Pick<GetPackageDefinitionOptions, 'disableTransforms'>): Record<string, PackageJson | undefined>;
+    extend(input: SerializablePackageDefinitionsCache): void;
+    toSerializable(): SerializablePackageDefinitionsCache;
     protected _readPackage(normalizedPath: string): Promise<PackageJson | undefined>;
 }
 //# sourceMappingURL=PackageDefinitions.d.ts.map

package/lib/packageDefinitions/PackageDefinitions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PackageDefinitions.d.ts","sourceRoot":"","sources":["../../src/packageDefinitions/PackageDefinitions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,eAAe,EACf,2BAA2B,EAE3B,iCAAiC,EACjC,uBAAuB,EACvB,WAAW,EACZ,MAAM,4BAA4B,CAAC;AAOpC,MAAM,WAAW,yBAAyB;IACxC;;;OAGG;IACH,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB;;OAEG;IACH,kBAAkB,CAAC,EAAE,iCAAiC,EAAE,CAAC;CAC1D;AA6BD,qBAAa,kBAAmB,YAAW,uBAAuB;IAChE,OAAO,CAAC,YAAY,CAA+C;IACnE,OAAO,CAAC,uBAAuB,CAAmC;IAClE,OAAO,CAAC,OAAO,CAA8B;IAC7C,OAAO,CAAC,WAAW,CAAoC;IACvD,OAAO,CAAC,mBAAmB,CAA2C;IAEtE;;;;OAIG;gBACS,OAAO,GAAE,yBAA8B;IAO7C,GAAG,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,2BAA2B,GAAG,OAAO,CAAC,WAAW,CAAC;IAQrF,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,GAAE,2BAAgC,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAkD9G,iBAAiB,CAAC,OAAO,EAAE,iCAAiC,GAAG,IAAI;IAOnE,KAAK,CAAC,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,eAAe,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI;IAYvE,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,2BAA2B,EAAE,mBAAmB,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,CAAC;cAIlG,YAAY,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;CAIvF"}
+{"version":3,"file":"PackageDefinitions.d.ts","sourceRoot":"","sources":["../../src/packageDefinitions/PackageDefinitions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,eAAe,EACf,2BAA2B,EAE3B,iCAAiC,EACjC,uBAAuB,EACvB,WAAW,EACX,mCAAmC,EACpC,MAAM,4BAA4B,CAAC;AAOpC,MAAM,WAAW,yBAAyB;IACxC;;;OAGG;IACH,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB;;OAEG;IACH,kBAAkB,CAAC,EAAE,iCAAiC,EAAE,CAAC;CAC1D;AA6BD,qBAAa,kBAAmB,YAAW,uBAAuB;IAChE,OAAO,CAAC,YAAY,CAA+C;IACnE,OAAO,CAAC,uBAAuB,CAAmC;IAClE,OAAO,CAAC,OAAO,CAA8B;IAC7C,OAAO,CAAC,WAAW,CAAoC;IACvD,OAAO,CAAC,mBAAmB,CAA2C;IAEtE;;;;OAIG;gBACS,OAAO,GAAE,yBAA8B;IAO7C,GAAG,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,2BAA2B,GAAG,OAAO,CAAC,WAAW,CAAC;IAQrF,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,GAAE,2BAAgC,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAkD9G,iBAAiB,CAAC,OAAO,EAAE,iCAAiC,GAAG,IAAI;IAOnE,KAAK,CAAC,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,eAAe,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI;IAYvE,MAAM,CAAC,KAAK,EAAE,mCAAmC,GAAG,IAAI;IAKxD,cAAc,IAAI,mCAAmC;cAOrC,YAAY,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;CAIvF"}

package/lib/packageDefinitions/PackageDefinitions.js

@@ -106,8 +106,15 @@ export class PackageDefinitions {
             this._transforms = [...getDefaultTransforms(), ...this._transformFactories.map((factory) => factory(newConfig))];
         }
     }
-    _getAll(options) {
-        return options?.disableTransforms ? this._definitions : this._transformedDefinitions;
+    extend(input) {
+        Object.assign(this._definitions, input.definitions);
+        Object.assign(this._transformedDefinitions, input.transformedDefinitions);
+    }
+    toSerializable() {
+        return {
+            definitions: this._definitions,
+            transformedDefinitions: this._transformedDefinitions,
+        };
     }
     async _readPackage(normalizedPath) {
         // `verbose` logs if the file exists but isn't valid JSON (or can't be read for some reason)

package/lib/packageDefinitions/PackageDefinitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"PackageDefinitions.js","sourceRoot":"","sources":["../../src/packageDefinitions/PackageDefinitions.ts"],"names":[],"mappings":"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","sourcesContent":["import path from 'path';\nimport type {\n  CloudpackConfig,\n  GetPackageDefinitionOptions,\n  PackageDefinitionTransform,\n  PackageDefinitionTransformFactory,\n  PackageDefinitionsCache,\n  PackageJson,\n} from '@ms-cloudpack/common-types';\nimport { cloneJson, readJson } from '@ms-cloudpack/json-utilities';\nimport { getNonSemverTransform } from './getNonSemverTransform.js';\nimport { getApiServerTransform } from './getApiServerTransform.js';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport { getTypesTransform } from './getTypesTransform.js';\n\nexport interface PackageDefinitionsOptions {\n  /**\n   * Config object to pass to transforms. When `reset` is called with a new value, the transforms\n   * will be transforms will be re-created using the new config.\n   */\n  config?: CloudpackConfig;\n  /**\n   * Transform factories to register on initialization.\n   */\n  transformFactories?: PackageDefinitionTransformFactory[];\n}\n\n/**\n * `nonSemverTransform` has state defined when the function is called, so we need a wrapper function\n * which returns new transforms to ensure that state is cleared when resetting.\n */\nconst getDefaultTransforms = () => [getApiServerTransform(), getTypesTransform(), getNonSemverTransform()];\n\n/** Only copy these keys from package.json. (It's an object for better typings and faster access.) */\nconst copyPackageJsonKeys: Record<keyof PackageJson, true> = {\n  name: true,\n  version: true,\n  description: true,\n  dependencies: true,\n  devDependencies: true,\n  peerDependencies: true,\n  peerDependenciesMeta: true,\n  optionalDependencies: true,\n  bundledDependencies: true,\n  bundleDependencies: true,\n  type: true,\n  main: true,\n  module: true,\n  browser: true,\n  exports: true,\n  resolutions: true,\n  cloudpack: true,\n};\n\nexport class PackageDefinitions implements PackageDefinitionsCache {\n  private _definitions: Record<string, PackageJson | undefined> = {};\n  private _transformedDefinitions: Record<string, PackageJson> = {};\n  private _config: CloudpackConfig | undefined;\n  private _transforms: PackageDefinitionTransform[] = [];\n  private _transformFactories: PackageDefinitionTransformFactory[] = [];\n\n  /**\n   * **WARNING**: Cloudpack code (including tests) outside of `@ms-cloudpack/package-utilities`\n   * should use `createPackageDefinitions` from `@ms-cloudpack/config` instead. That wrapper adds\n   * some transforms which are essential for applying settings from the cloudpack config.\n   */\n  constructor(options: PackageDefinitionsOptions = {}) {\n    const { config, transformFactories } = options;\n    this._transformFactories = transformFactories || [];\n\n    this.reset({ newConfig: config, force: true });\n  }\n\n  async get(packagePath: string, options?: GetPackageDefinitionOptions): Promise<PackageJson> {\n    const definition = await this.tryGet(packagePath, options);\n    if (!definition) {\n      throw new Error(`package.json not found at \"${packagePath}\"`);\n    }\n    return definition;\n  }\n\n  async tryGet(packagePath: string, options: GetPackageDefinitionOptions = {}): Promise<PackageJson | undefined> {\n    const { refresh, disableTransforms, importerContext } = options;\n\n    // Normalize the path used for caching to ensure consistency and avoid duplicates.\n    const normalizedPath = slash(packagePath);\n\n    if (refresh) {\n      delete this._definitions[normalizedPath];\n      delete this._transformedDefinitions[normalizedPath];\n    }\n\n    // If the definition is not in the cache, read it from disk (or from the fixture).\n    // (If the definition was invalid JSON or not found, undefined is cached.)\n    let definition = this._definitions[normalizedPath];\n    if (!(normalizedPath in this._definitions)) {\n      definition = await this._readPackage(normalizedPath);\n      this._definitions[normalizedPath] = definition;\n\n      if (definition) {\n        definition.name ??= `unknown-${packagePath.replace(/[^\\w-]/g, '-')}`;\n        definition.version ??= '0.0.0-unknown';\n      }\n    }\n\n    if (disableTransforms || !definition) {\n      return definition;\n    }\n\n    // If we don't want to skip the transform, transform the definition.\n    let transformedDefinition = this._transformedDefinitions[normalizedPath];\n    if (!transformedDefinition) {\n      // Clone the definition (only keys we care about) so we don't accidentally modify the original.\n      transformedDefinition = cloneJson(definition, { onlyKeys: copyPackageJsonKeys });\n\n      for (const transform of this._transforms) {\n        transformedDefinition =\n          (await transform({\n            definition: transformedDefinition,\n            packagePath: normalizedPath,\n            packages: this,\n            importerContext,\n          })) || transformedDefinition;\n      }\n\n      this._transformedDefinitions[normalizedPath] = transformedDefinition;\n    }\n\n    return transformedDefinition;\n  }\n\n  registerTransform(factory: PackageDefinitionTransformFactory): void {\n    this._transformFactories.push(factory);\n    this._transforms.push(factory(this._config));\n\n    this.reset();\n  }\n\n  reset(options?: { newConfig?: CloudpackConfig; force?: boolean }): void {\n    this._definitions = {};\n    this._transformedDefinitions = {};\n\n    const { newConfig, force } = options || {};\n\n    if (newConfig || force) {\n      this._config = newConfig;\n      this._transforms = [...getDefaultTransforms(), ...this._transformFactories.map((factory) => factory(newConfig))];\n    }\n  }\n\n  _getAll(options?: Pick<GetPackageDefinitionOptions, 'disableTransforms'>): Record<string, PackageJson | undefined> {\n    return options?.disableTransforms ? this._definitions : this._transformedDefinitions;\n  }\n\n  protected async _readPackage(normalizedPath: string): Promise<PackageJson | undefined> {\n    // `verbose` logs if the file exists but isn't valid JSON (or can't be read for some reason)\n    return readJson<PackageJson>(path.join(normalizedPath, 'package.json'), { verbose: true });\n  }\n}\n"]}
+{"version":3,"file":"PackageDefinitions.js","sourceRoot":"","sources":["../../src/packageDefinitions/PackageDefinitions.ts"],"names":[],"mappings":"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","sourcesContent":["import path from 'path';\nimport type {\n  CloudpackConfig,\n  GetPackageDefinitionOptions,\n  PackageDefinitionTransform,\n  PackageDefinitionTransformFactory,\n  PackageDefinitionsCache,\n  PackageJson,\n  SerializablePackageDefinitionsCache,\n} from '@ms-cloudpack/common-types';\nimport { cloneJson, readJson } from '@ms-cloudpack/json-utilities';\nimport { getNonSemverTransform } from './getNonSemverTransform.js';\nimport { getApiServerTransform } from './getApiServerTransform.js';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport { getTypesTransform } from './getTypesTransform.js';\n\nexport interface PackageDefinitionsOptions {\n  /**\n   * Config object to pass to transforms. When `reset` is called with a new value, the transforms\n   * will be transforms will be re-created using the new config.\n   */\n  config?: CloudpackConfig;\n  /**\n   * Transform factories to register on initialization.\n   */\n  transformFactories?: PackageDefinitionTransformFactory[];\n}\n\n/**\n * `nonSemverTransform` has state defined when the function is called, so we need a wrapper function\n * which returns new transforms to ensure that state is cleared when resetting.\n */\nconst getDefaultTransforms = () => [getApiServerTransform(), getTypesTransform(), getNonSemverTransform()];\n\n/** Only copy these keys from package.json. (It's an object for better typings and faster access.) */\nconst copyPackageJsonKeys: Record<keyof PackageJson, true> = {\n  name: true,\n  version: true,\n  description: true,\n  dependencies: true,\n  devDependencies: true,\n  peerDependencies: true,\n  peerDependenciesMeta: true,\n  optionalDependencies: true,\n  bundledDependencies: true,\n  bundleDependencies: true,\n  type: true,\n  main: true,\n  module: true,\n  browser: true,\n  exports: true,\n  resolutions: true,\n  cloudpack: true,\n};\n\nexport class PackageDefinitions implements PackageDefinitionsCache {\n  private _definitions: Record<string, PackageJson | undefined> = {};\n  private _transformedDefinitions: Record<string, PackageJson> = {};\n  private _config: CloudpackConfig | undefined;\n  private _transforms: PackageDefinitionTransform[] = [];\n  private _transformFactories: PackageDefinitionTransformFactory[] = [];\n\n  /**\n   * **WARNING**: Cloudpack code (including tests) outside of `@ms-cloudpack/package-utilities`\n   * should use `createPackageDefinitions` from `@ms-cloudpack/config` instead. That wrapper adds\n   * some transforms which are essential for applying settings from the cloudpack config.\n   */\n  constructor(options: PackageDefinitionsOptions = {}) {\n    const { config, transformFactories } = options;\n    this._transformFactories = transformFactories || [];\n\n    this.reset({ newConfig: config, force: true });\n  }\n\n  async get(packagePath: string, options?: GetPackageDefinitionOptions): Promise<PackageJson> {\n    const definition = await this.tryGet(packagePath, options);\n    if (!definition) {\n      throw new Error(`package.json not found at \"${packagePath}\"`);\n    }\n    return definition;\n  }\n\n  async tryGet(packagePath: string, options: GetPackageDefinitionOptions = {}): Promise<PackageJson | undefined> {\n    const { refresh, disableTransforms, importerContext } = options;\n\n    // Normalize the path used for caching to ensure consistency and avoid duplicates.\n    const normalizedPath = slash(packagePath);\n\n    if (refresh) {\n      delete this._definitions[normalizedPath];\n      delete this._transformedDefinitions[normalizedPath];\n    }\n\n    // If the definition is not in the cache, read it from disk (or from the fixture).\n    // (If the definition was invalid JSON or not found, undefined is cached.)\n    let definition = this._definitions[normalizedPath];\n    if (!(normalizedPath in this._definitions)) {\n      definition = await this._readPackage(normalizedPath);\n      this._definitions[normalizedPath] = definition;\n\n      if (definition) {\n        definition.name ??= `unknown-${packagePath.replace(/[^\\w-]/g, '-')}`;\n        definition.version ??= '0.0.0-unknown';\n      }\n    }\n\n    if (disableTransforms || !definition) {\n      return definition;\n    }\n\n    // If we don't want to skip the transform, transform the definition.\n    let transformedDefinition = this._transformedDefinitions[normalizedPath];\n    if (!transformedDefinition) {\n      // Clone the definition (only keys we care about) so we don't accidentally modify the original.\n      transformedDefinition = cloneJson(definition, { onlyKeys: copyPackageJsonKeys });\n\n      for (const transform of this._transforms) {\n        transformedDefinition =\n          (await transform({\n            definition: transformedDefinition,\n            packagePath: normalizedPath,\n            packages: this,\n            importerContext,\n          })) || transformedDefinition;\n      }\n\n      this._transformedDefinitions[normalizedPath] = transformedDefinition;\n    }\n\n    return transformedDefinition;\n  }\n\n  registerTransform(factory: PackageDefinitionTransformFactory): void {\n    this._transformFactories.push(factory);\n    this._transforms.push(factory(this._config));\n\n    this.reset();\n  }\n\n  reset(options?: { newConfig?: CloudpackConfig; force?: boolean }): void {\n    this._definitions = {};\n    this._transformedDefinitions = {};\n\n    const { newConfig, force } = options || {};\n\n    if (newConfig || force) {\n      this._config = newConfig;\n      this._transforms = [...getDefaultTransforms(), ...this._transformFactories.map((factory) => factory(newConfig))];\n    }\n  }\n\n  extend(input: SerializablePackageDefinitionsCache): void {\n    Object.assign(this._definitions, input.definitions);\n    Object.assign(this._transformedDefinitions, input.transformedDefinitions);\n  }\n\n  toSerializable(): SerializablePackageDefinitionsCache {\n    return {\n      definitions: this._definitions,\n      transformedDefinitions: this._transformedDefinitions,\n    };\n  }\n\n  protected async _readPackage(normalizedPath: string): Promise<PackageJson | undefined> {\n    // `verbose` logs if the file exists but isn't valid JSON (or can't be read for some reason)\n    return readJson<PackageJson>(path.join(normalizedPath, 'package.json'), { verbose: true });\n  }\n}\n"]}

package/lib/packageDefinitions/getNonSemverTransform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getNonSemverTransform.d.ts","sourceRoot":"","sources":["../../src/packageDefinitions/getNonSemverTransform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAM7E;;;;;;GAMG;AACH,wBAAgB,qBAAqB,IAAI,0BAA0B,CAoFlE"}
+{"version":3,"file":"getNonSemverTransform.d.ts","sourceRoot":"","sources":["../../src/packageDefinitions/getNonSemverTransform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAA4B,MAAM,4BAA4B,CAAC;AAiBvG;;;;;;GAMG;AACH,wBAAgB,qBAAqB,IAAI,0BAA0B,CAgHlE"}

package/lib/packageDefinitions/getNonSemverTransform.js

@@ -1,6 +1,16 @@
 import semver from 'semver';
 import { generateVersionFromNonSemver } from './generateVersionFromNonSemver.js';
 const depTypes = ['dependencies', 'peerDependencies', 'devDependencies', 'optionalDependencies'];
+/**
+ * Match yarn berry (v2+) patch versions:
+ * `patch:@foo/bar@npm%3A7.18.0#~/.yarn/patches/@foo-bar-npm-7.18.0-f1d556a934.patch`
+ *
+ * - `[1]` is the part of the version before the `#`
+ * - `[2]` is the patch path relative to root: `.yarn/patches/@foo-bar-npm-7.18.0-f1d556a934.patch`
+ */
+// Be strict about matching yarn's generated path in case of other patching-related cases that
+// might need different handling (those could be explicitly supported later if needed).
+const yarnBerryPatchRegex = /^(patch:.*?)#~\/(\.yarn\/patches\/.*\.patch)$/;
 /**
  * Get a transform which handles non-semver dependencies:
  * - In a parent package, if a dependency is specified with a non-semver version, change the dep
@@ -14,6 +24,18 @@ export function getNonSemverTransform() {
      * Map from parent name/version => dep type => non-semver dependency names
      */
     const nonSemverDeps = {};
+    /**
+     * Map from transformed yarn berry patch versions to relative patch file paths.
+     * (This is necessary to save because the original path is only available in the parent's deps,
+     * but it needs to be added to the child's cloudpack metadata.)
+     *
+     * Example:
+     * - Original version: `patch:@foo/bar@npm%3A7.18.0#~/.yarn/patches/@foo-bar-npm-7.18.0-f1d556a934.patch`
+     *   - the part after `#~/` is the patch file path
+     * - Transformed version: `0.0.0-patch--foo-bar-npm-3A7-18-0`
+     * - This map: `0.0.0-patch--foo-bar-npm-3A7-18-0` to `.yarn/patches/@foo-bar-npm-7.18.0-f1d556a934.patch`
+     */
+    const yarnPatchVersionsToFiles = {};
     return ({ definition, packagePath, importerContext }) => {
         // Check for non-semver dependencies
         for (const depType of depTypes) {
@@ -31,9 +53,18 @@ export function getNonSemverTransform() {
                         `(in ${definition.name}@${definition.version} at ${packagePath}). ` +
                         "Cloudpack will attempt to handle this, but it's recommended to use semantic versions only if possible.");
                 }
+                const patchFileMatch = depVersion.match(yarnBerryPatchRegex);
                 // Update the version in the returned dependencies:
                 //   "bar": "npm:@custom/bar@^1"  =>  "0.0.0-npm--custom-bar--1"
-                deps[depName] = generateVersionFromNonSemver(depVersion);
+                // (For the yarn berry patch files, remove the path from the end to make the version shorter;
+                // this will probably still be a unique version/not collide with anything else.)
+                const updatedVersion = generateVersionFromNonSemver(patchFileMatch?.[1] || depVersion);
+                deps[depName] = updatedVersion;
+                if (patchFileMatch) {
+                    // This version corresponds to a yarn berry patch file.
+                    // Save the patch file path for reference when we're updating the child package.
+                    yarnPatchVersionsToFiles[updatedVersion] = patchFileMatch[2];
+                }
                 // Save that this was a non-semver dep
                 const record = (nonSemverDeps[`${definition.name}@${definition.version}`] ??= {});
                 (record[depType] ??= []).push(depName);
@@ -64,6 +95,13 @@ export function getNonSemverTransform() {
                 const origSpec = `${definition.name}@${definition.version}`;
                 definition.name = importedName;
                 definition.version = versionRequirement;
+                if (yarnPatchVersionsToFiles[versionRequirement]) {
+                    // This version corresponds to a yarn berry patch file.
+                    // Save the patch file path for reference in PackagePatchesCache.
+                    // (technically `cloudpack.mode` is required, but it's set in another transform)
+                    definition.cloudpack ??= {};
+                    definition.cloudpack.patchFilePath = yarnPatchVersionsToFiles[versionRequirement];
+                }
                 // We have changed the definition, so link the entry in nonSemverDeps to the new name/version.
                 if (nonSemverDeps[origSpec]) {
                     nonSemverDeps[`${importedName}@${versionRequirement}`] = nonSemverDeps[origSpec];

package/lib/packageDefinitions/getNonSemverTransform.js.map

@@ -1 +1 @@
-{"version":3,"file":"getNonSemverTransform.js","sourceRoot":"","sources":["../../src/packageDefinitions/getNonSemverTransform.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PackageDefinitionTransform } from '@ms-cloudpack/common-types';\nimport semver from 'semver';\nimport { generateVersionFromNonSemver } from './generateVersionFromNonSemver.js';\n\nconst depTypes = ['dependencies', 'peerDependencies', 'devDependencies', 'optionalDependencies'] as const;\n\n/**\n * Get a transform which handles non-semver dependencies:\n * - In a parent package, if a dependency is specified with a non-semver version, change the dep\n *   to a special `0.0.0-<original-version>` prerelease version.\n * - In a child package, if the package was pulled in as a non-semver dependency by a parent\n *   (per the `importerContext`), change its version to the special prerelease version as above.\n */\nexport function getNonSemverTransform(): PackageDefinitionTransform {\n  /**\n   * Cached info about parent packages with non-semver dependencies:\n   * Map from parent name/version => dep type => non-semver dependency names\n   */\n  const nonSemverDeps: Record<\n    `${string}@${string}`,\n    Partial<Record<'dependencies' | 'peerDependencies' | 'devDependencies' | 'optionalDependencies', string[]>>\n  > = {};\n\n  return ({ definition, packagePath, importerContext }) => {\n    // Check for non-semver dependencies\n    for (const depType of depTypes) {\n      const deps = definition[depType] || {};\n\n      for (const [depName, depVersion] of Object.entries(deps)) {\n        if (!depVersion || semver.validRange(depVersion)) {\n          continue;\n        }\n\n        // Don't warn about workspace: deps, but still process them as non-semver.\n        // (Alternatively, we could change the version of all workspace deps to * in dependencies,\n        // but that's risky since there could theoretically be an additional version of that dep\n        // from the registry nested somewhere in the tree.)\n        if (!depVersion.startsWith('workspace:')) {\n          console.debug(\n            `Non-semver dependency found: ${depName}@${depVersion} ` +\n              `(in ${definition.name}@${definition.version} at ${packagePath}). ` +\n              \"Cloudpack will attempt to handle this, but it's recommended to use semantic versions only if possible.\",\n          );\n        }\n\n        // Update the version in the returned dependencies:\n        //   \"bar\": \"npm:@custom/bar@^1\"  =>  \"0.0.0-npm--custom-bar--1\"\n        deps[depName] = generateVersionFromNonSemver(depVersion);\n\n        // Save that this was a non-semver dep\n        const record = (nonSemverDeps[`${definition.name}@${definition.version}`] ??= {});\n        (record[depType] ??= []).push(depName);\n      }\n    }\n\n    // Check if this package's parent pulled it in with a non-semver dependency, and if so,\n    // update the returned name and version.\n    const nonSemverParentInfo =\n      importerContext && nonSemverDeps[`${importerContext.parentName}@${importerContext.parentVersion}`];\n\n    // TODO: maybe this could also be used for resolutions if we have problems there:\n    // adding a check for !semver.satisfies(requiredAs, definition.version) and forcing the package version?\n\n    if (nonSemverParentInfo) {\n      // The parent has at least one non-semver dependency (which might not be this package).\n      // Check in each dependency type to see if this package is listed as non-semver.\n      const { importedName, versionRequirement } = importerContext;\n\n      for (const depType of depTypes) {\n        if (!nonSemverParentInfo[depType]?.includes(importedName)) {\n          continue;\n        }\n\n        // This package's parent pulled it in with a non-semver dependency.\n        // Example: the parent depended on this package as \"bar\": \"npm:@custom/bar@^1\"\n        //   importedName = bar\n        //   versionRequirement = 0.0.0-npm--custom-bar--1 (was modified when this transform ran on the parent definition)\n        //\n        // To ensure other code handles this package properly, change its name and version to\n        // the ones used by the parent (after transforms). This ensures it works properly with\n        // the resolve map and isn't accidentally used by other packages which depend on this\n        // package under its real name.\n        const origSpec = `${definition.name}@${definition.version}` as const;\n        definition.name = importedName;\n        definition.version = versionRequirement;\n\n        // We have changed the definition, so link the entry in nonSemverDeps to the new name/version.\n        if (nonSemverDeps[origSpec]) {\n          nonSemverDeps[`${importedName}@${versionRequirement}`] = nonSemverDeps[origSpec];\n        }\n\n        break;\n      }\n    }\n\n    return definition;\n  };\n}\n"]}
+{"version":3,"file":"getNonSemverTransform.js","sourceRoot":"","sources":["../../src/packageDefinitions/getNonSemverTransform.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PackageDefinitionTransform, PackageJsonCloudpackMeta } from '@ms-cloudpack/common-types';\nimport semver from 'semver';\nimport { generateVersionFromNonSemver } from './generateVersionFromNonSemver.js';\n\nconst depTypes = ['dependencies', 'peerDependencies', 'devDependencies', 'optionalDependencies'] as const;\n\n/**\n * Match yarn berry (v2+) patch versions:\n * `patch:@foo/bar@npm%3A7.18.0#~/.yarn/patches/@foo-bar-npm-7.18.0-f1d556a934.patch`\n *\n * - `[1]` is the part of the version before the `#`\n * - `[2]` is the patch path relative to root: `.yarn/patches/@foo-bar-npm-7.18.0-f1d556a934.patch`\n */\n// Be strict about matching yarn's generated path in case of other patching-related cases that\n// might need different handling (those could be explicitly supported later if needed).\nconst yarnBerryPatchRegex = /^(patch:.*?)#~\\/(\\.yarn\\/patches\\/.*\\.patch)$/;\n\n/**\n * Get a transform which handles non-semver dependencies:\n * - In a parent package, if a dependency is specified with a non-semver version, change the dep\n *   to a special `0.0.0-<original-version>` prerelease version.\n * - In a child package, if the package was pulled in as a non-semver dependency by a parent\n *   (per the `importerContext`), change its version to the special prerelease version as above.\n */\nexport function getNonSemverTransform(): PackageDefinitionTransform {\n  /**\n   * Cached info about parent packages with non-semver dependencies:\n   * Map from parent name/version => dep type => non-semver dependency names\n   */\n  const nonSemverDeps: Record<`${string}@${string}`, Partial<Record<(typeof depTypes)[number], string[]>>> = {};\n  /**\n   * Map from transformed yarn berry patch versions to relative patch file paths.\n   * (This is necessary to save because the original path is only available in the parent's deps,\n   * but it needs to be added to the child's cloudpack metadata.)\n   *\n   * Example:\n   * - Original version: `patch:@foo/bar@npm%3A7.18.0#~/.yarn/patches/@foo-bar-npm-7.18.0-f1d556a934.patch`\n   *   - the part after `#~/` is the patch file path\n   * - Transformed version: `0.0.0-patch--foo-bar-npm-3A7-18-0`\n   * - This map: `0.0.0-patch--foo-bar-npm-3A7-18-0` to `.yarn/patches/@foo-bar-npm-7.18.0-f1d556a934.patch`\n   */\n  const yarnPatchVersionsToFiles: Record<string, string> = {};\n\n  return ({ definition, packagePath, importerContext }) => {\n    // Check for non-semver dependencies\n    for (const depType of depTypes) {\n      const deps = definition[depType] || {};\n\n      for (const [depName, depVersion] of Object.entries(deps)) {\n        if (!depVersion || semver.validRange(depVersion)) {\n          continue;\n        }\n\n        // Don't warn about workspace: deps, but still process them as non-semver.\n        // (Alternatively, we could change the version of all workspace deps to * in dependencies,\n        // but that's risky since there could theoretically be an additional version of that dep\n        // from the registry nested somewhere in the tree.)\n        if (!depVersion.startsWith('workspace:')) {\n          console.debug(\n            `Non-semver dependency found: ${depName}@${depVersion} ` +\n              `(in ${definition.name}@${definition.version} at ${packagePath}). ` +\n              \"Cloudpack will attempt to handle this, but it's recommended to use semantic versions only if possible.\",\n          );\n        }\n\n        const patchFileMatch = depVersion.match(yarnBerryPatchRegex);\n\n        // Update the version in the returned dependencies:\n        //   \"bar\": \"npm:@custom/bar@^1\"  =>  \"0.0.0-npm--custom-bar--1\"\n        // (For the yarn berry patch files, remove the path from the end to make the version shorter;\n        // this will probably still be a unique version/not collide with anything else.)\n        const updatedVersion = generateVersionFromNonSemver(patchFileMatch?.[1] || depVersion);\n        deps[depName] = updatedVersion;\n\n        if (patchFileMatch) {\n          // This version corresponds to a yarn berry patch file.\n          // Save the patch file path for reference when we're updating the child package.\n          yarnPatchVersionsToFiles[updatedVersion] = patchFileMatch[2];\n        }\n\n        // Save that this was a non-semver dep\n        const record = (nonSemverDeps[`${definition.name}@${definition.version}`] ??= {});\n        (record[depType] ??= []).push(depName);\n      }\n    }\n\n    // Check if this package's parent pulled it in with a non-semver dependency, and if so,\n    // update the returned name and version.\n    const nonSemverParentInfo =\n      importerContext && nonSemverDeps[`${importerContext.parentName}@${importerContext.parentVersion}`];\n\n    // TODO: maybe this could also be used for resolutions if we have problems there:\n    // adding a check for !semver.satisfies(requiredAs, definition.version) and forcing the package version?\n\n    if (nonSemverParentInfo) {\n      // The parent has at least one non-semver dependency (which might not be this package).\n      // Check in each dependency type to see if this package is listed as non-semver.\n      const { importedName, versionRequirement } = importerContext;\n\n      for (const depType of depTypes) {\n        if (!nonSemverParentInfo[depType]?.includes(importedName)) {\n          continue;\n        }\n\n        // This package's parent pulled it in with a non-semver dependency.\n        // Example: the parent depended on this package as \"bar\": \"npm:@custom/bar@^1\"\n        //   importedName = bar\n        //   versionRequirement = 0.0.0-npm--custom-bar--1 (was modified when this transform ran on the parent definition)\n        //\n        // To ensure other code handles this package properly, change its name and version to\n        // the ones used by the parent (after transforms). This ensures it works properly with\n        // the resolve map and isn't accidentally used by other packages which depend on this\n        // package under its real name.\n        const origSpec = `${definition.name}@${definition.version}` as const;\n        definition.name = importedName;\n        definition.version = versionRequirement;\n\n        if (yarnPatchVersionsToFiles[versionRequirement]) {\n          // This version corresponds to a yarn berry patch file.\n          // Save the patch file path for reference in PackagePatchesCache.\n          // (technically `cloudpack.mode` is required, but it's set in another transform)\n          definition.cloudpack ??= {} as PackageJsonCloudpackMeta;\n          definition.cloudpack.patchFilePath = yarnPatchVersionsToFiles[versionRequirement];\n        }\n\n        // We have changed the definition, so link the entry in nonSemverDeps to the new name/version.\n        if (nonSemverDeps[origSpec]) {\n          nonSemverDeps[`${importedName}@${versionRequirement}`] = nonSemverDeps[origSpec];\n        }\n\n        break;\n      }\n    }\n\n    return definition;\n  };\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/package-utilities",
-  "version": "12.0.2",
+  "version": "12.1.0",
   "description": "Utilities for resolving/parsing packages and their imports.",
   "license": "MIT",
   "type": "module",
@@ -14,10 +14,10 @@
     }
   },
   "dependencies": {
-    "@ms-cloudpack/common-types": "^0.24.11",
+    "@ms-cloudpack/common-types": "^0.24.13",
     "@ms-cloudpack/json-utilities": "^0.1.10",
-    "@ms-cloudpack/path-string-parsing": "^1.2.6",
-    "@ms-cloudpack/path-utilities": "^3.0.8",
+    "@ms-cloudpack/path-string-parsing": "^1.2.7",
+    "@ms-cloudpack/path-utilities": "^3.0.10",
     "@ms-cloudpack/task-reporter": "^0.16.0",
     "acorn": "^8.11.2",
     "acorn-walk": "^8.2.1",