@ms-cloudpack/package-utilities 12.2.3 → 12.3.0

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,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,GAAG,CACD,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,WAAW,EACvB,OAAO,CAAC,EAAE,IAAI,CAAC,2BAA2B,EAAE,mBAAmB,CAAC,GAC/D,IAAI;IAYP,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"}
+{"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;AAkCD,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,GAAG,CACD,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,WAAW,EACvB,OAAO,CAAC,EAAE,IAAI,CAAC,2BAA2B,EAAE,mBAAmB,CAAC,GAC/D,IAAI;IAYP,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

@@ -9,7 +9,12 @@ import { getTypesTransform } from './getTypesTransform.js';
  * which returns new transforms to ensure that state is cleared when resetting.
  */
 const getDefaultTransforms = () => [getApiServerTransform(), getTypesTransform(), getNonSemverTransform()];
-/** Only copy these keys from package.json. (It's an object for better typings and faster access.) */
+/**
+ * Only copy these keys from package.json, to reduce the amount cloned before applying transforms.
+ * (It's an object for better typings and faster access.)
+ *
+ * NOTE: If you add any new keys to PackageJson, they must be added here too.
+ */
 const copyPackageJsonKeys = {
     name: true,
     version: true,

package/lib/packageDefinitions/PackageDefinitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"PackageDefinitions.js","sourceRoot":"","sources":["../../src/packageDefinitions/PackageDefinitions.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAUxB,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAc3D;;;GAGG;AACH,MAAM,oBAAoB,GAAG,GAAG,EAAE,CAAC,CAAC,qBAAqB,EAAE,EAAE,iBAAiB,EAAE,EAAE,qBAAqB,EAAE,CAAC,CAAC;AAE3G,qGAAqG;AACrG,MAAM,mBAAmB,GAAoC;IAC3D,IAAI,EAAE,IAAI;IACV,OAAO,EAAE,IAAI;IACb,WAAW,EAAE,IAAI;IACjB,YAAY,EAAE,IAAI;IAClB,eAAe,EAAE,IAAI;IACrB,gBAAgB,EAAE,IAAI;IACtB,oBAAoB,EAAE,IAAI;IAC1B,oBAAoB,EAAE,IAAI;IAC1B,mBAAmB,EAAE,IAAI;IACzB,kBAAkB,EAAE,IAAI;IACxB,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,IAAI;IACb,OAAO,EAAE,IAAI;IACb,WAAW,EAAE,IAAI;IACjB,SAAS,EAAE,IAAI;CAChB,CAAC;AAEF,MAAM,OAAO,kBAAkB;IACrB,YAAY,GAA4C,EAAE,CAAC;IAC3D,uBAAuB,GAAgC,EAAE,CAAC;IAC1D,OAAO,CAA8B;IACrC,WAAW,GAAiC,EAAE,CAAC;IAC/C,mBAAmB,GAAwC,EAAE,CAAC;IAEtE;;;;OAIG;IACH,YAAY,UAAqC,EAAE;QACjD,MAAM,EAAE,MAAM,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC;QAC/C,IAAI,CAAC,mBAAmB,GAAG,kBAAkB,IAAI,EAAE,CAAC;QAEpD,IAAI,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,WAAmB,EAAE,OAAqC;QAClE,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAC3D,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,8BAA8B,WAAW,GAAG,CAAC,CAAC;QAChE,CAAC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,WAAmB,EAAE,UAAuC,EAAE;QACzE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;QAEhE,kFAAkF;QAClF,MAAM,cAAc,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;QAE1C,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;YACzC,OAAO,IAAI,CAAC,uBAAuB,CAAC,cAAc,CAAC,CAAC;QACtD,CAAC;QAED,kFAAkF;QAClF,0EAA0E;QAC1E,IAAI,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;QACnD,IAAI,CAAC,CAAC,cAAc,IAAI,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;YAC3C,UAAU,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;YACrD,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,GAAG,UAAU,CAAC;YAE/C,IAAI,UAAU,EAAE,CAAC;gBACf,UAAU,CAAC,IAAI,KAAK,WAAW,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,EAAE,CAAC;gBACrE,UAAU,CAAC,OAAO,KAAK,eAAe,CAAC;YACzC,CAAC;QACH,CAAC;QAED,IAAI,iBAAiB,IAAI,CAAC,UAAU,EAAE,CAAC;YACrC,OAAO,UAAU,CAAC;QACpB,CAAC;QAED,oEAAoE;QACpE,IAAI,qBAAqB,GAAG,IAAI,CAAC,uBAAuB,CAAC,cAAc,CAAC,CAAC;QACzE,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC3B,+FAA+F;YAC/F,qBAAqB,GAAG,SAAS,CAAC,UAAU,EAAE,EAAE,QAAQ,EAAE,mBAAmB,EAAE,CAAC,CAAC;YAEjF,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBACzC,qBAAqB;oBACnB,CAAC,MAAM,SAAS,CAAC;wBACf,UAAU,EAAE,qBAAqB;wBACjC,WAAW,EAAE,cAAc;wBAC3B,QAAQ,EAAE,IAAI;wBACd,eAAe;qBAChB,CAAC,CAAC,IAAI,qBAAqB,CAAC;YACjC,CAAC;YAED,IAAI,CAAC,uBAAuB,CAAC,cAAc,CAAC,GAAG,qBAAqB,CAAC;QACvE,CAAC;QAED,OAAO,qBAAqB,CAAC;IAC/B,CAAC;IAED,iBAAiB,CAAC,OAA0C;QAC1D,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACvC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QAE7C,IAAI,CAAC,KAAK,EAAE,CAAC;IACf,CAAC;IAED,KAAK,CAAC,OAA0D;QAC9D,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,uBAAuB,GAAG,EAAE,CAAC;QAElC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;QAE3C,IAAI,SAAS,IAAI,KAAK,EAAE,CAAC;YACvB,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;YACzB,IAAI,CAAC,WAAW,GAAG,CAAC,GAAG,oBAAoB,EAAE,EAAE,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACnH,CAAC;IACH,CAAC;IAED,GAAG,CACD,WAAmB,EACnB,UAAuB,EACvB,OAAgE;QAEhE,MAAM,EAAE,iBAAiB,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;QAC5C,6DAA6D;QAC7D,MAAM,cAAc,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;QAC1C,+EAA+E;QAC/E,IAAI,iBAAiB,EAAE,CAAC;YACtB,OAAO,IAAI,CAAC,uBAAuB,CAAC,cAAc,CAAC,CAAC;QACtD,CAAC;QACD,MAAM,MAAM,GAAG,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC;QACpF,MAAM,CAAC,cAAc,CAAC,GAAG,UAAU,CAAC;IACtC,CAAC;IAED,MAAM,CAAC,KAA0C;QAC/C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;QACpD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC5E,CAAC;IAED,cAAc;QACZ,OAAO;YACL,WAAW,EAAE,IAAI,CAAC,YAAY;YAC9B,sBAAsB,EAAE,IAAI,CAAC,uBAAuB;SACrD,CAAC;IACJ,CAAC;IAES,KAAK,CAAC,YAAY,CAAC,cAAsB;QACjD,4FAA4F;QAC5F,OAAO,QAAQ,CAAc,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,cAAc,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAC7F,CAAC;CACF","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  set(\n    packagePath: string,\n    definition: PackageJson,\n    options?: Pick<GetPackageDefinitionOptions, 'disableTransforms'>,\n  ): void {\n    const { disableTransforms } = options || {};\n    // Normalize the path used for caching to ensure consistency.\n    const normalizedPath = slash(packagePath);\n    // Delete the transformed definition if it exists, so we don't have stale data.\n    if (disableTransforms) {\n      delete this._transformedDefinitions[normalizedPath];\n    }\n    const record = disableTransforms ? this._definitions : this._transformedDefinitions;\n    record[normalizedPath] = definition;\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"]}
+{"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/**\n * Only copy these keys from package.json, to reduce the amount cloned before applying transforms.\n * (It's an object for better typings and faster access.)\n *\n * NOTE: If you add any new keys to PackageJson, they must be added here too.\n */\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  set(\n    packagePath: string,\n    definition: PackageJson,\n    options?: Pick<GetPackageDefinitionOptions, 'disableTransforms'>,\n  ): void {\n    const { disableTransforms } = options || {};\n    // Normalize the path used for caching to ensure consistency.\n    const normalizedPath = slash(packagePath);\n    // Delete the transformed definition if it exists, so we don't have stale data.\n    if (disableTransforms) {\n      delete this._transformedDefinitions[normalizedPath];\n    }\n    const record = disableTransforms ? this._definitions : this._transformedDefinitions;\n    record[normalizedPath] = definition;\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/getApiServerTransform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getApiServerTransform.d.ts","sourceRoot":"","sources":["../../src/packageDefinitions/getApiServerTransform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAI7E;;;;GAIG;AACH,wBAAgB,qBAAqB,IAAI,0BAA0B,CAWlE"}
+{"version":3,"file":"getApiServerTransform.d.ts","sourceRoot":"","sources":["../../src/packageDefinitions/getApiServerTransform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAI7E;;;;GAIG;AACH,wBAAgB,qBAAqB,IAAI,0BAA0B,CAalE"}

package/lib/packageDefinitions/getApiServerTransform.js

@@ -6,10 +6,14 @@ const apiServerBrowserDeps = ['@ms-cloudpack/data-bus', '@ms-cloudpack/path-stri
  */
 export function getApiServerTransform() {
     return ({ definition }) => {
-        if (definition.name !== '@ms-cloudpack/api-server') {
+        if (definition.name !== '@ms-cloudpack/api-server' || !definition.dependencies) {
             return undefined;
         }
-        definition.dependencies = Object.fromEntries(Object.entries(definition.dependencies || {}).filter(([dep]) => apiServerBrowserDeps.includes(dep)));
+        for (const dep of Object.keys(definition.dependencies)) {
+            if (!apiServerBrowserDeps.includes(dep)) {
+                delete definition.dependencies[dep];
+            }
+        }
         return definition;
     };
 }

package/lib/packageDefinitions/getApiServerTransform.js.map

@@ -1 +1 @@
-{"version":3,"file":"getApiServerTransform.js","sourceRoot":"","sources":["../../src/packageDefinitions/getApiServerTransform.ts"],"names":[],"mappings":"AAEA,MAAM,oBAAoB,GAAG,CAAC,wBAAwB,EAAE,mCAAmC,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC;AAEpH;;;;GAIG;AACH,MAAM,UAAU,qBAAqB;IACnC,OAAO,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE;QACxB,IAAI,UAAU,CAAC,IAAI,KAAK,0BAA0B,EAAE,CAAC;YACnD,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,UAAU,CAAC,YAAY,GAAG,MAAM,CAAC,WAAW,CAC1C,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,oBAAoB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CACpG,CAAC;QACF,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import type { PackageDefinitionTransform } from '@ms-cloudpack/common-types';\n\nconst apiServerBrowserDeps = ['@ms-cloudpack/data-bus', '@ms-cloudpack/path-string-parsing', '@trpc/client', 'zod'];\n\n/**\n * Returns a transform that will update the dependencies of the `@ms-cloudpack/api-server` package\n * to only include the browser dependencies. This reduces the resolve map packages by removing\n * around ~500 server dependencies.\n */\nexport function getApiServerTransform(): PackageDefinitionTransform {\n  return ({ definition }) => {\n    if (definition.name !== '@ms-cloudpack/api-server') {\n      return undefined;\n    }\n\n    definition.dependencies = Object.fromEntries(\n      Object.entries(definition.dependencies || {}).filter(([dep]) => apiServerBrowserDeps.includes(dep)),\n    );\n    return definition;\n  };\n}\n"]}
+{"version":3,"file":"getApiServerTransform.js","sourceRoot":"","sources":["../../src/packageDefinitions/getApiServerTransform.ts"],"names":[],"mappings":"AAEA,MAAM,oBAAoB,GAAG,CAAC,wBAAwB,EAAE,mCAAmC,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC;AAEpH;;;;GAIG;AACH,MAAM,UAAU,qBAAqB;IACnC,OAAO,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE;QACxB,IAAI,UAAU,CAAC,IAAI,KAAK,0BAA0B,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC;YAC/E,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;YACvD,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACxC,OAAO,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YACtC,CAAC;QACH,CAAC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import type { PackageDefinitionTransform } from '@ms-cloudpack/common-types';\n\nconst apiServerBrowserDeps = ['@ms-cloudpack/data-bus', '@ms-cloudpack/path-string-parsing', '@trpc/client', 'zod'];\n\n/**\n * Returns a transform that will update the dependencies of the `@ms-cloudpack/api-server` package\n * to only include the browser dependencies. This reduces the resolve map packages by removing\n * around ~500 server dependencies.\n */\nexport function getApiServerTransform(): PackageDefinitionTransform {\n  return ({ definition }) => {\n    if (definition.name !== '@ms-cloudpack/api-server' || !definition.dependencies) {\n      return undefined;\n    }\n\n    for (const dep of Object.keys(definition.dependencies)) {\n      if (!apiServerBrowserDeps.includes(dep)) {\n        delete definition.dependencies[dep];\n      }\n    }\n    return definition;\n  };\n}\n"]}

package/lib/packageDefinitions/getTypesTransform.d.ts

@@ -1,7 +1,6 @@
 import type { PackageDefinitionTransform } from '@ms-cloudpack/common-types';
 /**
- * `@types/` dependencies should never be relevant for Cloudpack's purposes, so move them from
- * `dependencies` or `peerDependencies` to `devDependencies` so they're not processed by default.
+ * `@types/` dependencies should never be relevant for Cloudpack's purposes, so delete them.
  */
 export declare function getTypesTransform(): PackageDefinitionTransform;
 //# sourceMappingURL=getTypesTransform.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getTypesTransform.d.ts","sourceRoot":"","sources":["../../src/packageDefinitions/getTypesTransform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAK7E;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,0BAA0B,CAsB9D"}
+{"version":3,"file":"getTypesTransform.d.ts","sourceRoot":"","sources":["../../src/packageDefinitions/getTypesTransform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAE7E;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,0BAA0B,CAkB9D"}

package/lib/packageDefinitions/getTypesTransform.js

@@ -1,23 +1,18 @@
-const depTypes = ['dependencies', 'peerDependencies', 'devDependencies', 'optionalDependencies'];
 /**
- * `@types/` dependencies should never be relevant for Cloudpack's purposes, so move them from
- * `dependencies` or `peerDependencies` to `devDependencies` so they're not processed by default.
+ * `@types/` dependencies should never be relevant for Cloudpack's purposes, so delete them.
  */
 export function getTypesTransform() {
     return ({ definition }) => {
-        for (const depType of ['dependencies', 'peerDependencies']) {
+        // Ignore bundle(d)Dependencies since they're so uncommon and unlikely to cause issues if present
+        for (const depType of ['dependencies', 'peerDependencies', 'devDependencies', 'optionalDependencies']) {
             const deps = definition[depType];
             if (!deps) {
                 continue;
             }
             for (const depName of Object.keys(deps)) {
-                if (!depName.startsWith('@types/')) {
-                    continue;
+                if (depName.startsWith('@types/')) {
+                    delete deps[depName];
                 }
-                const depVersion = deps[depName];
-                delete definition[depType]?.[depName];
-                definition.devDependencies ??= {};
-                definition.devDependencies[depName] = depVersion;
             }
         }
         return definition;

package/lib/packageDefinitions/getTypesTransform.js.map

@@ -1 +1 @@
-{"version":3,"file":"getTypesTransform.js","sourceRoot":"","sources":["../../src/packageDefinitions/getTypesTransform.ts"],"names":[],"mappings":"AAEA,MAAM,QAAQ,GAAG,CAAC,cAAc,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,sBAAsB,CAAU,CAAC;AAG1G;;;GAGG;AACH,MAAM,UAAU,iBAAiB;IAC/B,OAAO,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE;QACxB,KAAK,MAAM,OAAO,IAAI,CAAC,cAAc,EAAE,kBAAkB,CAAU,EAAE,CAAC;YACpE,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;YACjC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,SAAS;YACX,CAAC;YAED,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAc,EAAE,CAAC;gBACrD,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;oBACnC,SAAS;gBACX,CAAC;gBAED,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;gBACjC,OAAO,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;gBACtC,UAAU,CAAC,eAAe,KAAK,EAAE,CAAC;gBAClC,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,UAAU,CAAC;YACnD,CAAC;QACH,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import type { PackageDefinitionTransform } from '@ms-cloudpack/common-types';\n\nconst depTypes = ['dependencies', 'peerDependencies', 'devDependencies', 'optionalDependencies'] as const;\ntype DepType = (typeof depTypes)[number];\n\n/**\n * `@types/` dependencies should never be relevant for Cloudpack's purposes, so move them from\n * `dependencies` or `peerDependencies` to `devDependencies` so they're not processed by default.\n */\nexport function getTypesTransform(): PackageDefinitionTransform {\n  return ({ definition }) => {\n    for (const depType of ['dependencies', 'peerDependencies'] as const) {\n      const deps = definition[depType];\n      if (!deps) {\n        continue;\n      }\n\n      for (const depName of Object.keys(deps) as DepType[]) {\n        if (!depName.startsWith('@types/')) {\n          continue;\n        }\n\n        const depVersion = deps[depName];\n        delete definition[depType]?.[depName];\n        definition.devDependencies ??= {};\n        definition.devDependencies[depName] = depVersion;\n      }\n    }\n\n    return definition;\n  };\n}\n"]}
+{"version":3,"file":"getTypesTransform.js","sourceRoot":"","sources":["../../src/packageDefinitions/getTypesTransform.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,UAAU,iBAAiB;IAC/B,OAAO,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE;QACxB,iGAAiG;QACjG,KAAK,MAAM,OAAO,IAAI,CAAC,cAAc,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,sBAAsB,CAAU,EAAE,CAAC;YAC/G,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;YACjC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,SAAS;YACX,CAAC;YAED,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBACxC,IAAI,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;oBAClC,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC;gBACvB,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import type { PackageDefinitionTransform } from '@ms-cloudpack/common-types';\n\n/**\n * `@types/` dependencies should never be relevant for Cloudpack's purposes, so delete them.\n */\nexport function getTypesTransform(): PackageDefinitionTransform {\n  return ({ definition }) => {\n    // Ignore bundle(d)Dependencies since they're so uncommon and unlikely to cause issues if present\n    for (const depType of ['dependencies', 'peerDependencies', 'devDependencies', 'optionalDependencies'] as const) {\n      const deps = definition[depType];\n      if (!deps) {\n        continue;\n      }\n\n      for (const depName of Object.keys(deps)) {\n        if (depName.startsWith('@types/')) {\n          delete deps[depName];\n        }\n      }\n    }\n\n    return definition;\n  };\n}\n"]}

package/lib/packageJson/getUnusedDependencies.d.ts

@@ -1,8 +1,4 @@
 import type { PackageJson, PackageJsonDependencies } from '@ms-cloudpack/common-types';
-/**
- * Get the extra dependencies that cloudpack doesn't consider for bundling by default:
- * bundle, bundled, and optional deps that might not be used, and dev deps which shouldn't
- * be used at runtime.
- */
+/** @deprecated Not used; to be deleted in v13+ */
 export declare function getUnusedDependencies(definition: PackageJson): PackageJsonDependencies;
 //# sourceMappingURL=getUnusedDependencies.d.ts.map

package/lib/packageJson/getUnusedDependencies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getUnusedDependencies.d.ts","sourceRoot":"","sources":["../../src/packageJson/getUnusedDependencies.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAEvF;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,WAAW,GAAG,uBAAuB,CAStF"}
+{"version":3,"file":"getUnusedDependencies.d.ts","sourceRoot":"","sources":["../../src/packageJson/getUnusedDependencies.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAEvF,kDAAkD;AAClD,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,WAAW,GAAG,uBAAuB,CAStF"}

package/lib/packageJson/getUnusedDependencies.js

@@ -1,8 +1,4 @@
-/**
- * Get the extra dependencies that cloudpack doesn't consider for bundling by default:
- * bundle, bundled, and optional deps that might not be used, and dev deps which shouldn't
- * be used at runtime.
- */
+/** @deprecated Not used; to be deleted in v13+ */
 export function getUnusedDependencies(definition) {
     // This is very simple but needs to be consistent between multiple places,
     // especially in case it needs to be changed somehow later.

package/lib/packageJson/getUnusedDependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"getUnusedDependencies.js","sourceRoot":"","sources":["../../src/packageJson/getUnusedDependencies.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CAAC,UAAuB;IAC3D,0EAA0E;IAC1E,2DAA2D;IAC3D,OAAO;QACL,GAAG,UAAU,CAAC,eAAe;QAC7B,GAAG,2BAA2B,CAAC,UAAU,CAAC,kBAAkB,CAAC;QAC7D,GAAG,2BAA2B,CAAC,UAAU,CAAC,mBAAmB,CAAC;QAC9D,GAAG,UAAU,CAAC,oBAAoB;KACnC,CAAC;AACJ,CAAC;AAED,+EAA+E;AAC/E,SAAS,2BAA2B,CAClC,YAA4D;IAE5D,OAAO,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;AAChH,CAAC","sourcesContent":["import type { PackageJson, PackageJsonDependencies } from '@ms-cloudpack/common-types';\n\n/**\n * Get the extra dependencies that cloudpack doesn't consider for bundling by default:\n * bundle, bundled, and optional deps that might not be used, and dev deps which shouldn't\n * be used at runtime.\n */\nexport function getUnusedDependencies(definition: PackageJson): PackageJsonDependencies {\n  // This is very simple but needs to be consistent between multiple places,\n  // especially in case it needs to be changed somehow later.\n  return {\n    ...definition.devDependencies,\n    ...normalizeBundleDependencies(definition.bundleDependencies),\n    ...normalizeBundleDependencies(definition.bundledDependencies),\n    ...definition.optionalDependencies,\n  };\n}\n\n/** If the bundle(d) dependencies are an array, normalize them to an object. */\nfunction normalizeBundleDependencies(\n  dependencies: PackageJsonDependencies | string[] | undefined,\n): PackageJsonDependencies | undefined {\n  return Array.isArray(dependencies) ? Object.fromEntries(dependencies.map((dep) => [dep, '*'])) : dependencies;\n}\n"]}
+{"version":3,"file":"getUnusedDependencies.js","sourceRoot":"","sources":["../../src/packageJson/getUnusedDependencies.ts"],"names":[],"mappings":"AAEA,kDAAkD;AAClD,MAAM,UAAU,qBAAqB,CAAC,UAAuB;IAC3D,0EAA0E;IAC1E,2DAA2D;IAC3D,OAAO;QACL,GAAG,UAAU,CAAC,eAAe;QAC7B,GAAG,2BAA2B,CAAC,UAAU,CAAC,kBAAkB,CAAC;QAC7D,GAAG,2BAA2B,CAAC,UAAU,CAAC,mBAAmB,CAAC;QAC9D,GAAG,UAAU,CAAC,oBAAoB;KACnC,CAAC;AACJ,CAAC;AAED,+EAA+E;AAC/E,SAAS,2BAA2B,CAClC,YAA+C;IAE/C,OAAO,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;AAChH,CAAC","sourcesContent":["import type { PackageJson, PackageJsonDependencies } from '@ms-cloudpack/common-types';\n\n/** @deprecated Not used; to be deleted in v13+ */\nexport function getUnusedDependencies(definition: PackageJson): PackageJsonDependencies {\n  // This is very simple but needs to be consistent between multiple places,\n  // especially in case it needs to be changed somehow later.\n  return {\n    ...definition.devDependencies,\n    ...normalizeBundleDependencies(definition.bundleDependencies),\n    ...normalizeBundleDependencies(definition.bundledDependencies),\n    ...definition.optionalDependencies,\n  };\n}\n\n/** If the bundle(d) dependencies are an array, normalize them to an object. */\nfunction normalizeBundleDependencies(\n  dependencies: PackageJson['bundleDependencies'],\n): PackageJsonDependencies | undefined {\n  return Array.isArray(dependencies) ? Object.fromEntries(dependencies.map((dep) => [dep, '*'])) : dependencies;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/package-utilities",
-  "version": "12.2.3",
+  "version": "12.3.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.15",
+    "@ms-cloudpack/common-types": "^0.24.16",
     "@ms-cloudpack/json-utilities": "^0.1.10",
     "@ms-cloudpack/path-string-parsing": "^1.2.7",
-    "@ms-cloudpack/path-utilities": "^3.0.12",
+    "@ms-cloudpack/path-utilities": "^3.0.13",
     "@ms-cloudpack/task-reporter": "^0.16.1",
     "acorn": "^8.11.2",
     "acorn-walk": "^8.2.1",