@ms-cloudpack/package-utilities 9.0.5 → 10.0.1

package/lib/PackageDefinitions.d.ts

@@ -1,4 +1,4 @@
-import type { GetPackageDefinitionOptions, PackageDefinitionTransform, PackageDefinitionsCache, PackageJson } from '@ms-cloudpack/common-types';
+import type { CloudpackConfig, GetPackageDefinitionOptions, PackageDefinitionTransformFactory, PackageDefinitionsCache, PackageJson } from '@ms-cloudpack/common-types';
 export declare class PackageDefinitions implements PackageDefinitionsCache {
     private _definitions;
     private _transformedDefinitions;
@@ -11,23 +11,13 @@ export declare class PackageDefinitions implements PackageDefinitionsCache {
      * @param config - The optional config object to pass to transforms. When `reset` is called with a new value, the
      * transforms will be re-created using the new config.
      */
-    constructor(definitionCache?: Record<string, PackageJson>, config?: unknown);
-    get(packagePath: string, options?: GetPackageDefinitionOptions): Promise<PackageJson | undefined>;
-    /**
-     * Registers a transform factory function, which will be called on initialization, and when reset, to re-generate
-     * the transform function. Transform functions are called only when the package definition hasn't been loaded before,
-     * and the result will be cached. Calling `reset` will reset the cache.
-     */
-    registerTransform(factory: (config?: unknown) => PackageDefinitionTransform): void;
-    /**
-     * Resets the cache of package definitions. This is useful when testing, to ensure that the cache is empty.
-     */
+    constructor(definitionCache?: Record<string, PackageJson>, config?: CloudpackConfig);
+    get(packagePath: string, options?: GetPackageDefinitionOptions): Promise<PackageJson>;
+    tryGet(packagePath: string, options?: GetPackageDefinitionOptions): Promise<PackageJson | undefined>;
+    registerTransform(factory: PackageDefinitionTransformFactory): void;
     reset(options?: {
-        newConfig?: unknown;
+        newConfig?: CloudpackConfig;
     }): void;
-    /**
-     * This is a helper function for testing, to get all package definitions in the cache.
-     */
-    _getAll(options?: Pick<GetPackageDefinitionOptions, 'disableTransforms'>): Record<string, PackageJson>;
+    _getAll(options?: Pick<GetPackageDefinitionOptions, 'disableTransforms'>): Record<string, PackageJson | undefined>;
 }
 //# sourceMappingURL=PackageDefinitions.d.ts.map

package/lib/PackageDefinitions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PackageDefinitions.d.ts","sourceRoot":"","sources":["../src/PackageDefinitions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,2BAA2B,EAC3B,0BAA0B,EAC1B,uBAAuB,EACvB,WAAW,EACZ,MAAM,4BAA4B,CAAC;AAapC,qBAAa,kBAAmB,YAAW,uBAAuB;IAChE,OAAO,CAAC,YAAY,CAA8B;IAClD,OAAO,CAAC,uBAAuB,CAA8B;IAC7D,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,WAAW,CAAoC;IACvD,OAAO,CAAC,mBAAmB,CAAuD;IAElF;;;;;OAKG;gBACS,eAAe,GAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAM,EAAE,MAAM,CAAC,EAAE,OAAO;IAQzE,GAAG,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,GAAE,2BAAgC,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAqD3G;;;;OAIG;IACH,iBAAiB,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,KAAK,0BAA0B;IAO3E;;OAEG;IACH,KAAK,CAAC,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE;IAYvC;;OAEG;IACH,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,2BAA2B,EAAE,mBAAmB,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC;CAGvG"}
+{"version":3,"file":"PackageDefinitions.d.ts","sourceRoot":"","sources":["../src/PackageDefinitions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,eAAe,EACf,2BAA2B,EAE3B,iCAAiC,EACjC,uBAAuB,EACvB,WAAW,EACZ,MAAM,4BAA4B,CAAC;AAapC,qBAAa,kBAAmB,YAAW,uBAAuB;IAChE,OAAO,CAAC,YAAY,CAA0C;IAC9D,OAAO,CAAC,uBAAuB,CAA8B;IAC7D,OAAO,CAAC,OAAO,CAA8B;IAC7C,OAAO,CAAC,WAAW,CAAoC;IACvD,OAAO,CAAC,mBAAmB,CAAsC;IAEjE;;;;;OAKG;gBACS,eAAe,GAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAM,EAAE,MAAM,CAAC,EAAE,eAAe;IAQjF,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;IAO5D,KAAK,CAAC,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,eAAe,CAAA;KAAE;IAY/C,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,2BAA2B,EAAE,mBAAmB,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,CAAC;CAGnH"}

package/lib/PackageDefinitions.js

@@ -24,34 +24,39 @@ export class PackageDefinitions {
         this._transforms = [...getDefaultTransforms()];
         this._transformFactories = [];
     }
-    async get(packagePath, options = {}) {
-        // Normalize the path to ensure consistency and avoid duplicates.
-        const normalizedPath = slash(packagePath);
-        let definition = this._definitions[normalizedPath];
-        let transformedDefinition = this._transformedDefinitions[normalizedPath];
+    async get(packagePath, options) {
+        const definition = await this.tryGet(packagePath, options);
+        if (!definition) {
+            throw new Error(`package.json not found at "${packagePath}"`);
+        }
+        return definition;
+    }
+    async tryGet(packagePath, options = {}) {
         const { refresh, disableTransforms, importerContext } = options;
-        // If we already have the answer they need, return immediately.
-        if (!refresh) {
-            if (disableTransforms && definition) {
-                return definition;
-            }
-            if (!disableTransforms && transformedDefinition) {
-                return transformedDefinition;
-            }
+        // Normalize the path used for caching to ensure consistency and avoid duplicates.
+        const normalizedPath = slash(packagePath);
+        if (refresh) {
+            delete this._definitions[normalizedPath];
+            delete this._transformedDefinitions[normalizedPath];
         }
-        // If we don't have the definition, try to load it.
-        if (!definition || refresh) {
-            definition = await readJson(path.join(normalizedPath, 'package.json'));
-            if (!definition) {
-                return undefined;
-            }
+        // If the definition is not in the cache, read it from disk.
+        // (If the definition was invalid JSON or not found, undefined is cached.)
+        let definition = this._definitions[normalizedPath];
+        if (!(normalizedPath in this._definitions)) {
+            // `verbose` logs if the file exists but isn't valid JSON (or can't be read for some reason)
+            definition = await readJson(path.join(packagePath, 'package.json'), { verbose: true });
             this._definitions[normalizedPath] = definition;
+            if (definition) {
+                definition.name ??= `unknown-${packagePath.replace(/[^\w-]/g, '-')}`;
+                definition.version ??= '0.0.0-unknown';
+            }
         }
-        if (disableTransforms) {
+        if (disableTransforms || !definition) {
             return definition;
         }
         // If we don't want to skip the transform, transform the definition.
-        if (!transformedDefinition || refresh) {
+        let transformedDefinition = this._transformedDefinitions[normalizedPath];
+        if (!transformedDefinition) {
             transformedDefinition = definition;
             for (const transform of this._transforms) {
                 transformedDefinition =
@@ -66,19 +71,11 @@ export class PackageDefinitions {
         }
         return transformedDefinition;
     }
-    /**
-     * Registers a transform factory function, which will be called on initialization, and when reset, to re-generate
-     * the transform function. Transform functions are called only when the package definition hasn't been loaded before,
-     * and the result will be cached. Calling `reset` will reset the cache.
-     */
     registerTransform(factory) {
         this._transformFactories.push(factory);
         this._transforms.push(factory(this._config));
         this.reset();
     }
-    /**
-     * Resets the cache of package definitions. This is useful when testing, to ensure that the cache is empty.
-     */
     reset(options) {
         this._definitions = {};
         this._transformedDefinitions = {};
@@ -88,9 +85,6 @@ export class PackageDefinitions {
             this._transforms = [...getDefaultTransforms(), ...this._transformFactories.map((factory) => factory(newConfig))];
         }
     }
-    /**
-     * This is a helper function for testing, to get all package definitions in the cache.
-     */
     _getAll(options) {
         return options?.disableTransforms ? this._definitions : this._transformedDefinitions;
     }

package/lib/PackageDefinitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"PackageDefinitions.js","sourceRoot":"","sources":["../src/PackageDefinitions.ts"],"names":[],"mappings":"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","sourcesContent":["import path from 'path';\nimport type {\n  GetPackageDefinitionOptions,\n  PackageDefinitionTransform,\n  PackageDefinitionsCache,\n  PackageJson,\n} from '@ms-cloudpack/common-types';\nimport { readJson } from '@ms-cloudpack/json-utilities';\nimport { getApplyOverridesTransform } from '@ms-cloudpack/package-overrides';\nimport { getNonSemverTransform } from './getNonSemverTransform.js';\nimport { getApiServerTransform } from './getApiServerTransform.js';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\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(), getNonSemverTransform(), getApplyOverridesTransform()];\n\nexport class PackageDefinitions implements PackageDefinitionsCache {\n  private _definitions: Record<string, PackageJson>;\n  private _transformedDefinitions: Record<string, PackageJson>;\n  private _config: unknown;\n  private _transforms: PackageDefinitionTransform[] = [];\n  private _transformFactories: ((config?: unknown) => PackageDefinitionTransform)[];\n\n  /**\n   * Constructor for PackageDefinitions.\n   * @param definitionCache - The map of package paths to package definitions, used mainly for testing.\n   * @param config - The optional config object to pass to transforms. When `reset` is called with a new value, the\n   * transforms will be re-created using the new config.\n   */\n  constructor(definitionCache: Record<string, PackageJson> = {}, config?: unknown) {\n    this._definitions = definitionCache;\n    this._transformedDefinitions = {};\n    this._config = config;\n    this._transforms = [...getDefaultTransforms()];\n    this._transformFactories = [];\n  }\n\n  async get(packagePath: string, options: GetPackageDefinitionOptions = {}): Promise<PackageJson | undefined> {\n    // Normalize the path to ensure consistency and avoid duplicates.\n    const normalizedPath = slash(packagePath);\n    let definition: PackageJson | undefined = this._definitions[normalizedPath];\n    let transformedDefinition: PackageJson | undefined = this._transformedDefinitions[normalizedPath];\n    const { refresh, disableTransforms, importerContext } = options;\n\n    // If we already have the answer they need, return immediately.\n    if (!refresh) {\n      if (disableTransforms && definition) {\n        return definition;\n      }\n\n      if (!disableTransforms && transformedDefinition) {\n        return transformedDefinition;\n      }\n    }\n\n    // If we don't have the definition, try to load it.\n    if (!definition || refresh) {\n      definition = await readJson(path.join(normalizedPath, 'package.json'));\n\n      if (!definition) {\n        return undefined;\n      }\n\n      this._definitions[normalizedPath] = definition;\n    }\n\n    if (disableTransforms) {\n      return definition;\n    }\n\n    // If we don't want to skip the transform, transform the definition.\n    if (!transformedDefinition || refresh) {\n      transformedDefinition = definition;\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  /**\n   * Registers a transform factory function, which will be called on initialization, and when reset, to re-generate\n   * the transform function. Transform functions are called only when the package definition hasn't been loaded before,\n   * and the result will be cached. Calling `reset` will reset the cache.\n   */\n  registerTransform(factory: (config?: unknown) => PackageDefinitionTransform) {\n    this._transformFactories.push(factory);\n    this._transforms.push(factory(this._config));\n\n    this.reset();\n  }\n\n  /**\n   * Resets the cache of package definitions. This is useful when testing, to ensure that the cache is empty.\n   */\n  reset(options?: { newConfig?: unknown }) {\n    this._definitions = {};\n    this._transformedDefinitions = {};\n\n    const { newConfig } = options || {};\n\n    if (newConfig) {\n      this._config = newConfig;\n      this._transforms = [...getDefaultTransforms(), ...this._transformFactories.map((factory) => factory(newConfig))];\n    }\n  }\n\n  /**\n   * This is a helper function for testing, to get all package definitions in the cache.\n   */\n  _getAll(options?: Pick<GetPackageDefinitionOptions, 'disableTransforms'>): Record<string, PackageJson> {\n    return options?.disableTransforms ? this._definitions : this._transformedDefinitions;\n  }\n}\n"]}
+{"version":3,"file":"PackageDefinitions.js","sourceRoot":"","sources":["../src/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 { readJson } from '@ms-cloudpack/json-utilities';\nimport { getApplyOverridesTransform } from '@ms-cloudpack/package-overrides';\nimport { getNonSemverTransform } from './getNonSemverTransform.js';\nimport { getApiServerTransform } from './getApiServerTransform.js';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\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(), getNonSemverTransform(), getApplyOverridesTransform()];\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   * Constructor for PackageDefinitions.\n   * @param definitionCache - The map of package paths to package definitions, used mainly for testing.\n   * @param config - The optional config object to pass to transforms. When `reset` is called with a new value, the\n   * transforms will be re-created using the new config.\n   */\n  constructor(definitionCache: Record<string, PackageJson> = {}, config?: CloudpackConfig) {\n    this._definitions = definitionCache;\n    this._transformedDefinitions = {};\n    this._config = config;\n    this._transforms = [...getDefaultTransforms()];\n    this._transformFactories = [];\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.\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      // `verbose` logs if the file exists but isn't valid JSON (or can't be read for some reason)\n      definition = await readJson<PackageJson>(path.join(packagePath, 'package.json'), { verbose: true });\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      transformedDefinition = definition;\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) {\n    this._transformFactories.push(factory);\n    this._transforms.push(factory(this._config));\n\n    this.reset();\n  }\n\n  reset(options?: { newConfig?: CloudpackConfig }) {\n    this._definitions = {};\n    this._transformedDefinitions = {};\n\n    const { newConfig } = options || {};\n\n    if (newConfig) {\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"]}

package/lib/createExportsMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createExportsMap.d.ts","sourceRoot":"","sources":["../src/createExportsMap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAI/G;;GAEG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE;IACP,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,EACD,OAAO,EAAE;IAAE,QAAQ,EAAE,uBAAuB,CAAC;IAAC,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;CAAE,GACxF,OAAO,CAAC,kBAAkB,CAAC,CAwG7B"}
+{"version":3,"file":"createExportsMap.d.ts","sourceRoot":"","sources":["../src/createExportsMap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAI/G;;GAEG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE;IACP,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,EACD,OAAO,EAAE;IAAE,QAAQ,EAAE,uBAAuB,CAAC;IAAC,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;CAAE,GACxF,OAAO,CAAC,kBAAkB,CAAC,CAoG7B"}

package/lib/createExportsMap.js

@@ -7,9 +7,6 @@ export async function createExportsMap(options, context) {
     const { packagePath } = options;
     const { packages } = context;
     const definition = await packages.get(packagePath, { disableTransforms: options.disableTransforms });
-    if (!definition) {
-        throw new Error(`Package definition not found for ${packagePath}`);
-    }
     // Don't create an exports map for a definition that already has one.
     if (definition.exports) {
         return definition.exports;

package/lib/createExportsMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"createExportsMap.js","sourceRoot":"","sources":["../src/createExportsMap.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CloudpackConfig, PackageDefinitionsCache, PackageJsonExports } from '@ms-cloudpack/common-types';\nimport { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport { addExportsMapEntry } from './addExportsMapEntry.js';\n\n/**\n * Given a package path, generates an export map for the package.\n */\nexport async function createExportsMap(\n  options: {\n    packagePath: string;\n    disableTransforms?: boolean;\n  },\n  context: { packages: PackageDefinitionsCache; config: Pick<CloudpackConfig, 'features'> },\n): Promise<PackageJsonExports> {\n  const { packagePath } = options;\n  const { packages } = context;\n  const definition = await packages.get(packagePath, { disableTransforms: options.disableTransforms });\n\n  if (!definition) {\n    throw new Error(`Package definition not found for ${packagePath}`);\n  }\n\n  // Don't create an exports map for a definition that already has one.\n  if (definition.exports) {\n    return definition.exports;\n  }\n\n  const { browser, main, module, types, typings, type } = definition;\n  const exports = {};\n  const typesPath = types || typings;\n\n  // Only try to add `index.js` as an entry if main/module/browser isn't available.\n  if (!(main || module || browser)) {\n    await addExportsMapEntry(\n      {\n        exports,\n        packagePath,\n        filePath: 'index.js',\n        typesPath,\n        requestCondition: type === 'module' ? 'import' : undefined,\n      },\n      context,\n    );\n  }\n\n  if (main) {\n    await addExportsMapEntry(\n      {\n        exports,\n        packagePath,\n        filePath: main,\n        typesPath,\n        requestCondition: type === 'module' ? 'import' : undefined,\n      },\n      context,\n    );\n  }\n\n  if (module) {\n    await addExportsMapEntry(\n      {\n        exports,\n        packagePath,\n        filePath: module,\n        typesPath,\n        requestCondition: 'import',\n      },\n      context,\n    );\n  }\n\n  if (browser) {\n    if (typeof definition.browser === 'string') {\n      await addExportsMapEntry(\n        { exports, packagePath, filePath: definition.browser, requestCondition: 'browser' },\n        context,\n      );\n    } else if (typeof definition.browser === 'object') {\n      for (const [key, value] of Object.entries(definition.browser)) {\n        if (!value || typeof value !== 'string') {\n          continue;\n        }\n\n        const isDefaultImport = normalizeRelativePath(module || main) === normalizeRelativePath(key);\n\n        const importPaths = isDefaultImport ? ['.'] : [key];\n\n        if (!isDefaultImport && key.endsWith('.js')) {\n          importPaths.push(key.replace(/\\.js$/, ''));\n        }\n\n        for (const importPath of importPaths) {\n          await addExportsMapEntry(\n            {\n              exports,\n              packagePath,\n              importPath,\n              filePath: value,\n              requestCondition: 'browser',\n            },\n            context,\n          );\n        }\n      }\n    }\n  }\n\n  // If we couldn't infer the exports map shape from existing metadata,\n  // formulate based off inferred file structure.\n  // Note: CRA defaults to src/index.js, Vite defaults to src/main.js\n  if (Object.keys(exports).length === 0) {\n    (await addExportsMapEntry({ exports, packagePath, filePath: './lib/index.js' }, context)) ||\n      (await addExportsMapEntry({ exports, packagePath, filePath: './lib/main.js' }, context)) ||\n      (await addExportsMapEntry({ exports, packagePath, filePath: './index.js' }, context));\n  }\n\n  return exports;\n}\n"]}
+{"version":3,"file":"createExportsMap.js","sourceRoot":"","sources":["../src/createExportsMap.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CloudpackConfig, PackageDefinitionsCache, PackageJsonExports } from '@ms-cloudpack/common-types';\nimport { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport { addExportsMapEntry } from './addExportsMapEntry.js';\n\n/**\n * Given a package path, generates an export map for the package.\n */\nexport async function createExportsMap(\n  options: {\n    packagePath: string;\n    disableTransforms?: boolean;\n  },\n  context: { packages: PackageDefinitionsCache; config: Pick<CloudpackConfig, 'features'> },\n): Promise<PackageJsonExports> {\n  const { packagePath } = options;\n  const { packages } = context;\n  const definition = await packages.get(packagePath, { disableTransforms: options.disableTransforms });\n\n  // Don't create an exports map for a definition that already has one.\n  if (definition.exports) {\n    return definition.exports;\n  }\n\n  const { browser, main, module, types, typings, type } = definition;\n  const exports = {};\n  const typesPath = types || typings;\n\n  // Only try to add `index.js` as an entry if main/module/browser isn't available.\n  if (!(main || module || browser)) {\n    await addExportsMapEntry(\n      {\n        exports,\n        packagePath,\n        filePath: 'index.js',\n        typesPath,\n        requestCondition: type === 'module' ? 'import' : undefined,\n      },\n      context,\n    );\n  }\n\n  if (main) {\n    await addExportsMapEntry(\n      {\n        exports,\n        packagePath,\n        filePath: main,\n        typesPath,\n        requestCondition: type === 'module' ? 'import' : undefined,\n      },\n      context,\n    );\n  }\n\n  if (module) {\n    await addExportsMapEntry(\n      {\n        exports,\n        packagePath,\n        filePath: module,\n        typesPath,\n        requestCondition: 'import',\n      },\n      context,\n    );\n  }\n\n  if (browser) {\n    if (typeof definition.browser === 'string') {\n      await addExportsMapEntry(\n        { exports, packagePath, filePath: definition.browser, requestCondition: 'browser' },\n        context,\n      );\n    } else if (typeof definition.browser === 'object') {\n      for (const [key, value] of Object.entries(definition.browser)) {\n        if (!value || typeof value !== 'string') {\n          continue;\n        }\n\n        const isDefaultImport = normalizeRelativePath(module || main) === normalizeRelativePath(key);\n\n        const importPaths = isDefaultImport ? ['.'] : [key];\n\n        if (!isDefaultImport && key.endsWith('.js')) {\n          importPaths.push(key.replace(/\\.js$/, ''));\n        }\n\n        for (const importPath of importPaths) {\n          await addExportsMapEntry(\n            {\n              exports,\n              packagePath,\n              importPath,\n              filePath: value,\n              requestCondition: 'browser',\n            },\n            context,\n          );\n        }\n      }\n    }\n  }\n\n  // If we couldn't infer the exports map shape from existing metadata,\n  // formulate based off inferred file structure.\n  // Note: CRA defaults to src/index.js, Vite defaults to src/main.js\n  if (Object.keys(exports).length === 0) {\n    (await addExportsMapEntry({ exports, packagePath, filePath: './lib/index.js' }, context)) ||\n      (await addExportsMapEntry({ exports, packagePath, filePath: './lib/main.js' }, context)) ||\n      (await addExportsMapEntry({ exports, packagePath, filePath: './index.js' }, context));\n  }\n\n  return exports;\n}\n"]}

package/lib/createResolveMap/addLinkedEntryDependencies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addLinkedEntryDependencies.d.ts","sourceRoot":"","sources":["../../src/createResolveMap/addLinkedEntryDependencies.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAExG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAGzD;;;;GAIG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE;IACP,MAAM,EAAE,UAAU,CAAC;IACnB,OAAO,EAAE,UAAU,CAAC;IACpB,WAAW,EAAE,eAAe,CAAC;IAC7B,WAAW,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;CAC1C,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;CACnC;;GA2FF"}
+{"version":3,"file":"addLinkedEntryDependencies.d.ts","sourceRoot":"","sources":["../../src/createResolveMap/addLinkedEntryDependencies.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAExG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAGzD;;;;GAIG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE;IACP,MAAM,EAAE,UAAU,CAAC;IACnB,OAAO,EAAE,UAAU,CAAC;IACpB,WAAW,EAAE,eAAe,CAAC;IAC7B,WAAW,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;CAC1C,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;CACnC;;GA+FF"}

package/lib/createResolveMap/addLinkedEntryDependencies.js

@@ -21,8 +21,11 @@ export async function addLinkedEntryDependencies(options, context) {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- already checked the length
         const entry = entriesToVisit.pop();
         const { name, version, dependencies } = entry;
-        const linkDefinition = await packages.get(entry.path);
-        const versionRequirements = getDependencies(linkDefinition || {});
+        const linkDefinition = await packages.tryGet(entry.path);
+        if (!linkDefinition) {
+            continue;
+        }
+        const versionRequirements = getDependencies(linkDefinition);
         // Iterate through the dependencies of the linked package.
         for (const [dependencyName, linkedDependencyVersion] of Object.entries(dependencies)) {
             const versionRequirement = versionRequirements[dependencyName];

package/lib/createResolveMap/addLinkedEntryDependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"addLinkedEntryDependencies.js","sourceRoot":"","sources":["../../src/createResolveMap/addLinkedEntryDependencies.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PackageDefinitionsCache, PackageJson, ResolveMapEntry } from '@ms-cloudpack/common-types';\nimport { satisfies } from 'semver';\nimport type { PackageMap } from '../types/PackageMap.js';\nimport { getDependencies } from '../getDependencies.js';\n\n/**\n * Given a linkedEntry, iterates through dependencies to ensure they are added to the packageMap,\n * preferring packageMap dependencies over linkedMap dependencies.\n * Returns a list of duplicated packages that were added to the packageMap.\n */\nexport async function addLinkedEntryDependencies(\n  options: {\n    appMap: PackageMap;\n    linkMap: PackageMap;\n    linkedEntry: ResolveMapEntry;\n    resolutions?: PackageJson['resolutions'];\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n  },\n) {\n  const { appMap, linkMap, linkedEntry, resolutions } = options;\n  const { packages } = context;\n  const visitedEntryPaths = new Set<string>(linkedEntry.path);\n  const duplicates: string[] = [];\n  const entriesToVisit: ResolveMapEntry[] = [linkedEntry];\n\n  function enqueue(newEntry: ResolveMapEntry) {\n    if (!visitedEntryPaths.has(newEntry.path)) {\n      visitedEntryPaths.add(newEntry.path);\n      entriesToVisit.push(newEntry);\n    }\n  }\n\n  while (entriesToVisit.length) {\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- already checked the length\n    const entry = entriesToVisit.pop()!;\n\n    const { name, version, dependencies } = entry;\n\n    const linkDefinition = await packages.get(entry.path);\n    const versionRequirements = getDependencies(linkDefinition || {});\n\n    // Iterate through the dependencies of the linked package.\n    for (const [dependencyName, linkedDependencyVersion] of Object.entries(dependencies)) {\n      const versionRequirement = versionRequirements[dependencyName];\n      if (!versionRequirement) {\n        continue;\n      }\n\n      const appVersions = appMap[dependencyName];\n\n      if (!appVersions) {\n        // The app does not have any version of this dependency, so we need to bring over the version\n        // used by the linkedEntry.\n        const dependencyEntry = linkMap[dependencyName]?.[linkedDependencyVersion];\n        if (dependencyEntry) {\n          appMap[dependencyName] = { [linkedDependencyVersion]: dependencyEntry };\n          dependencyEntry.requiredBy = { [`${name}@${version}`]: versionRequirement };\n\n          // Recurse through the dependency's dependencies.\n          enqueue(dependencyEntry);\n        }\n      } else {\n        // We have one or more versions of this dependency already. If a sufficient version\n        // of the dependency is already in the appMap, we we just need to update the linkedEntry's\n        // dependency and the dependency's requiredBy record for the parent.\n        const appDependencyVersions = Object.values(appVersions);\n\n        if (appDependencyVersions.length === 1 && !appDependencyVersions[0]?.isExternal) {\n          continue;\n        }\n\n        // See if an existing version of the dependency satisfies the semver.\n        const appDependencyEntry = appDependencyVersions.find(\n          (e) =>\n            // If the dependency is linked, use that.\n            e.isLinked ||\n            // If the dependency version is required as a resolution, use that.\n            resolutions?.[dependencyName] ||\n            // If the dependency satisfies the semver, use that.\n            satisfies(e.version, versionRequirement),\n        );\n\n        if (appDependencyEntry) {\n          // If the dependency satisfies the semver, use that!\n          entry.dependencies[dependencyName] = appDependencyEntry.version;\n          appDependencyEntry.requiredBy[`${name}@${version}`] = versionRequirement;\n\n          enqueue(appDependencyEntry);\n        } else {\n          // We have at least one version of this dependency but nothing satisfies the requirement.\n          // We need to introduce a duplicate. During the final pass, we will remove non-required deps.\n          const dependencyEntry = Object.values(linkMap[dependencyName] || {}).find((e) =>\n            satisfies(e.version, versionRequirement),\n          );\n          if (dependencyEntry) {\n            appVersions[dependencyEntry.version] = dependencyEntry;\n            entry.dependencies[dependencyName] = linkedDependencyVersion;\n            dependencyEntry.requiredBy = { [`${name}@${version}`]: versionRequirement };\n            duplicates.push(`${dependencyName}@${dependencyEntry.version}`);\n            // Recursive through the dependency's dependencies.\n            enqueue(dependencyEntry);\n          }\n        }\n      }\n    }\n  }\n\n  return { duplicates };\n}\n"]}
+{"version":3,"file":"addLinkedEntryDependencies.js","sourceRoot":"","sources":["../../src/createResolveMap/addLinkedEntryDependencies.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PackageDefinitionsCache, PackageJson, ResolveMapEntry } from '@ms-cloudpack/common-types';\nimport { satisfies } from 'semver';\nimport type { PackageMap } from '../types/PackageMap.js';\nimport { getDependencies } from '../getDependencies.js';\n\n/**\n * Given a linkedEntry, iterates through dependencies to ensure they are added to the packageMap,\n * preferring packageMap dependencies over linkedMap dependencies.\n * Returns a list of duplicated packages that were added to the packageMap.\n */\nexport async function addLinkedEntryDependencies(\n  options: {\n    appMap: PackageMap;\n    linkMap: PackageMap;\n    linkedEntry: ResolveMapEntry;\n    resolutions?: PackageJson['resolutions'];\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n  },\n) {\n  const { appMap, linkMap, linkedEntry, resolutions } = options;\n  const { packages } = context;\n  const visitedEntryPaths = new Set<string>(linkedEntry.path);\n  const duplicates: string[] = [];\n  const entriesToVisit: ResolveMapEntry[] = [linkedEntry];\n\n  function enqueue(newEntry: ResolveMapEntry) {\n    if (!visitedEntryPaths.has(newEntry.path)) {\n      visitedEntryPaths.add(newEntry.path);\n      entriesToVisit.push(newEntry);\n    }\n  }\n\n  while (entriesToVisit.length) {\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- already checked the length\n    const entry = entriesToVisit.pop()!;\n\n    const { name, version, dependencies } = entry;\n\n    const linkDefinition = await packages.tryGet(entry.path);\n    if (!linkDefinition) {\n      continue;\n    }\n\n    const versionRequirements = getDependencies(linkDefinition);\n\n    // Iterate through the dependencies of the linked package.\n    for (const [dependencyName, linkedDependencyVersion] of Object.entries(dependencies)) {\n      const versionRequirement = versionRequirements[dependencyName];\n      if (!versionRequirement) {\n        continue;\n      }\n\n      const appVersions = appMap[dependencyName];\n\n      if (!appVersions) {\n        // The app does not have any version of this dependency, so we need to bring over the version\n        // used by the linkedEntry.\n        const dependencyEntry = linkMap[dependencyName]?.[linkedDependencyVersion];\n        if (dependencyEntry) {\n          appMap[dependencyName] = { [linkedDependencyVersion]: dependencyEntry };\n          dependencyEntry.requiredBy = { [`${name}@${version}`]: versionRequirement };\n\n          // Recurse through the dependency's dependencies.\n          enqueue(dependencyEntry);\n        }\n      } else {\n        // We have one or more versions of this dependency already. If a sufficient version\n        // of the dependency is already in the appMap, we we just need to update the linkedEntry's\n        // dependency and the dependency's requiredBy record for the parent.\n        const appDependencyVersions = Object.values(appVersions);\n\n        if (appDependencyVersions.length === 1 && !appDependencyVersions[0]?.isExternal) {\n          continue;\n        }\n\n        // See if an existing version of the dependency satisfies the semver.\n        const appDependencyEntry = appDependencyVersions.find(\n          (e) =>\n            // If the dependency is linked, use that.\n            e.isLinked ||\n            // If the dependency version is required as a resolution, use that.\n            resolutions?.[dependencyName] ||\n            // If the dependency satisfies the semver, use that.\n            satisfies(e.version, versionRequirement),\n        );\n\n        if (appDependencyEntry) {\n          // If the dependency satisfies the semver, use that!\n          entry.dependencies[dependencyName] = appDependencyEntry.version;\n          appDependencyEntry.requiredBy[`${name}@${version}`] = versionRequirement;\n\n          enqueue(appDependencyEntry);\n        } else {\n          // We have at least one version of this dependency but nothing satisfies the requirement.\n          // We need to introduce a duplicate. During the final pass, we will remove non-required deps.\n          const dependencyEntry = Object.values(linkMap[dependencyName] || {}).find((e) =>\n            satisfies(e.version, versionRequirement),\n          );\n          if (dependencyEntry) {\n            appVersions[dependencyEntry.version] = dependencyEntry;\n            entry.dependencies[dependencyName] = linkedDependencyVersion;\n            dependencyEntry.requiredBy = { [`${name}@${version}`]: versionRequirement };\n            duplicates.push(`${dependencyName}@${dependencyEntry.version}`);\n            // Recursive through the dependency's dependencies.\n            enqueue(dependencyEntry);\n          }\n        }\n      }\n    }\n  }\n\n  return { duplicates };\n}\n"]}

package/lib/createResolveMap/createResolveMap.js

@@ -16,7 +16,7 @@ import { linkPath } from './linkPath.js';
 export async function createResolveMap(options, context) {
     const { appPath, additionalPaths = [], linkedPaths = [] } = options;
     const rootPath = options.rootPath || findProjectRoot(appPath, { noPackageRoot: true });
-    const repoDefinition = rootPath ? await context.packages.get(rootPath) : undefined;
+    const repoDefinition = rootPath ? await context.packages.tryGet(rootPath) : undefined;
     // First we discover the dependencies for the app.
     const appMap = await findPackagesFromPath({
         searchPaths: [appPath, ...additionalPaths],

package/lib/createResolveMap/createResolveMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"createResolveMap.js","sourceRoot":"","sources":["../../src/createResolveMap/createResolveMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGzC;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,OAeC,EACD,OAEC;IAED,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,EAAE,EAAE,WAAW,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC;IAEpE,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,eAAe,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IAEvF,MAAM,cAAc,GAAG,QAAQ,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAEnF,kDAAkD;IAClD,MAAM,MAAM,GAAG,MAAM,oBAAoB,CACvC;QACE,WAAW,EAAE,CAAC,OAAO,EAAE,GAAG,eAAe,CAAC;QAC1C,QAAQ;KACT,EACD,OAAO,CACR,CAAC;IAEF,4EAA4E;IAC5E,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACrC,MAAM,QAAQ,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,cAAc,EAAE,EAAE,OAAO,CAAC,CAAC;IAC5E,CAAC;IAED,0CAA0C;IAC1C,OAAO,mBAAmB,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,OAAO,EAAE,GAAG,eAAe,CAAC,EAAE,CAAC,CAAC;AACnF,CAAC","sourcesContent":["import { findProjectRoot } from '../findProjectRoot.js';\nimport { convertToResolveMap } from './convertToResolveMap.js';\nimport { findPackagesFromPath } from './findPackagesFromPath.js';\nimport { linkPath } from './linkPath.js';\nimport type { PackageDefinitionsCache, LinkedPath, ResolveMap } from '@ms-cloudpack/common-types';\n\n/**\n * Create a resolve map for a given `appPath`.\n * 1. Walk the dependency tree to build a map of all packages and their dependencies.\n * 2. If `linkedPaths` are provided, for each one:\n *    1. Walk its dependency tree to build a map as above.\n *    2. Redirect any existing dependencies to the linked package.\n *    3. Ensure that any transitive dependencies of the linked package which aren't already\n *       satisfied in the resolve map are added as scoped versions.\n * 3. For each dependency, sort the versions by the number of packages that depend on that version.\n *    The most popular version will be considered the \"default\", to reduce the size of scoped versions.\n */\nexport async function createResolveMap(\n  options: {\n    /** Path to the app whose dependencies we want to resolve. */\n    appPath: string;\n\n    /** Any additional packages whose dependencies we want to resolve. */\n    additionalPaths?: string[];\n\n    /** See `createResolveMap` comment. */\n    linkedPaths?: LinkedPath[];\n\n    /**\n     * Where to stop looking for packages (mainly used for testing).\n     * If not specified, will look for the project/git root of the `appPath`.\n     */\n    rootPath?: string;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n  },\n): Promise<ResolveMap> {\n  const { appPath, additionalPaths = [], linkedPaths = [] } = options;\n\n  const rootPath = options.rootPath || findProjectRoot(appPath, { noPackageRoot: true });\n\n  const repoDefinition = rootPath ? await context.packages.get(rootPath) : undefined;\n\n  // First we discover the dependencies for the app.\n  const appMap = await findPackagesFromPath(\n    {\n      searchPaths: [appPath, ...additionalPaths],\n      rootPath,\n    },\n    context,\n  );\n\n  // Next, we iterate through linked paths to inject them into the packageMap.\n  for (const linkedPath of linkedPaths) {\n    await linkPath({ rootPath, linkedPath, appMap, repoDefinition }, context);\n  }\n\n  // Finally we condense into a resolve map.\n  return convertToResolveMap({ appMap, rootPaths: [appPath, ...additionalPaths] });\n}\n"]}
+{"version":3,"file":"createResolveMap.js","sourceRoot":"","sources":["../../src/createResolveMap/createResolveMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGzC;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,OAeC,EACD,OAEC;IAED,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,EAAE,EAAE,WAAW,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC;IAEpE,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,eAAe,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IAEvF,MAAM,cAAc,GAAG,QAAQ,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAEtF,kDAAkD;IAClD,MAAM,MAAM,GAAG,MAAM,oBAAoB,CACvC;QACE,WAAW,EAAE,CAAC,OAAO,EAAE,GAAG,eAAe,CAAC;QAC1C,QAAQ;KACT,EACD,OAAO,CACR,CAAC;IAEF,4EAA4E;IAC5E,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACrC,MAAM,QAAQ,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,cAAc,EAAE,EAAE,OAAO,CAAC,CAAC;IAC5E,CAAC;IAED,0CAA0C;IAC1C,OAAO,mBAAmB,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,OAAO,EAAE,GAAG,eAAe,CAAC,EAAE,CAAC,CAAC;AACnF,CAAC","sourcesContent":["import { findProjectRoot } from '../findProjectRoot.js';\nimport { convertToResolveMap } from './convertToResolveMap.js';\nimport { findPackagesFromPath } from './findPackagesFromPath.js';\nimport { linkPath } from './linkPath.js';\nimport type { PackageDefinitionsCache, LinkedPath, ResolveMap } from '@ms-cloudpack/common-types';\n\n/**\n * Create a resolve map for a given `appPath`.\n * 1. Walk the dependency tree to build a map of all packages and their dependencies.\n * 2. If `linkedPaths` are provided, for each one:\n *    1. Walk its dependency tree to build a map as above.\n *    2. Redirect any existing dependencies to the linked package.\n *    3. Ensure that any transitive dependencies of the linked package which aren't already\n *       satisfied in the resolve map are added as scoped versions.\n * 3. For each dependency, sort the versions by the number of packages that depend on that version.\n *    The most popular version will be considered the \"default\", to reduce the size of scoped versions.\n */\nexport async function createResolveMap(\n  options: {\n    /** Path to the app whose dependencies we want to resolve. */\n    appPath: string;\n\n    /** Any additional packages whose dependencies we want to resolve. */\n    additionalPaths?: string[];\n\n    /** See `createResolveMap` comment. */\n    linkedPaths?: LinkedPath[];\n\n    /**\n     * Where to stop looking for packages (mainly used for testing).\n     * If not specified, will look for the project/git root of the `appPath`.\n     */\n    rootPath?: string;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n  },\n): Promise<ResolveMap> {\n  const { appPath, additionalPaths = [], linkedPaths = [] } = options;\n\n  const rootPath = options.rootPath || findProjectRoot(appPath, { noPackageRoot: true });\n\n  const repoDefinition = rootPath ? await context.packages.tryGet(rootPath) : undefined;\n\n  // First we discover the dependencies for the app.\n  const appMap = await findPackagesFromPath(\n    {\n      searchPaths: [appPath, ...additionalPaths],\n      rootPath,\n    },\n    context,\n  );\n\n  // Next, we iterate through linked paths to inject them into the packageMap.\n  for (const linkedPath of linkedPaths) {\n    await linkPath({ rootPath, linkedPath, appMap, repoDefinition }, context);\n  }\n\n  // Finally we condense into a resolve map.\n  return convertToResolveMap({ appMap, rootPaths: [appPath, ...additionalPaths] });\n}\n"]}

package/lib/createResolveMap/dedupeLinkedPackages.js

@@ -20,7 +20,7 @@ export async function dedupeLinkedPackages(options, context) {
         let dedupeStrategy = 'allow-duplication';
         for (const entry of Object.values(entries)) {
             const packageJson = await packages.get(entry.path);
-            if (packageJson?.cloudpack?.link?.duplicatedDependencyBehavior) {
+            if (packageJson.cloudpack?.link?.duplicatedDependencyBehavior) {
                 dedupeStrategy = packageJson.cloudpack.link.duplicatedDependencyBehavior;
             }
         }

package/lib/createResolveMap/dedupeLinkedPackages.js.map

@@ -1 +1 @@
-{"version":3,"file":"dedupeLinkedPackages.js","sourceRoot":"","sources":["../../src/createResolveMap/dedupeLinkedPackages.ts"],"names":[],"mappings":"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","sourcesContent":["import { satisfies, rcompare as semverReverseCompare } from 'semver';\nimport type { PackageMap } from '../types/PackageMap.js';\nimport { parseRequiredBy } from './parseRequiredBy.js';\nimport { detachEntry } from './detachEntry.js';\nimport type { PackageDefinitionsCache, PackageSettings, ResolveMapEntry } from '@ms-cloudpack/common-types';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\n\ntype DuplicatedDependencyBehavior = NonNullable<NonNullable<PackageSettings['link']>['duplicatedDependencyBehavior']>;\n\n/**\n * Deduplicates linked packages by removing all but the highest version,\n * that satisfies the semver requirements of all the requiredBy entries.\n */\nexport async function dedupeLinkedPackages(\n  options: { appMap: PackageMap; allDuplicates: Set<string>; remotePath?: string; rootPath?: string },\n  context: { packages: PackageDefinitionsCache },\n) {\n  const { rootPath, appMap, allDuplicates, remotePath } = options;\n  const { packages } = context;\n  console.debug(`The following packages were duplicated by linking:\\n ${Array.from(allDuplicates).join(', ')}`);\n  for (const duplicate of allDuplicates) {\n    const packageName = parseRequiredBy(duplicate).name;\n\n    const entries = appMap[packageName] || {};\n\n    // Sanity check to ensure that it is a duplicate.\n    if (Object.keys(entries).length <= 1) {\n      continue;\n    }\n\n    let dedupeStrategy: DuplicatedDependencyBehavior = 'allow-duplication';\n    for (const entry of Object.values(entries)) {\n      const packageJson = await packages.get(entry.path);\n      if (packageJson?.cloudpack?.link?.duplicatedDependencyBehavior) {\n        dedupeStrategy = packageJson.cloudpack.link.duplicatedDependencyBehavior;\n      }\n    }\n\n    const availableVersions = Object.keys(entries);\n\n    const versionRequirements = new Set<string>();\n    // Find if any of the duplicate entries satisfy the semver requirement of all the requiredBy entries.\n    const requiredBy: ResolveMapEntry['requiredBy'] = {};\n    for (const entry of Object.values(entries)) {\n      for (const [requiredById, range] of Object.entries(entry.requiredBy) as [`${string}@${string}`, string][]) {\n        requiredBy[requiredById] = range;\n        // We only care about satisfying version requirements that are already satisfied.\n        if (satisfies(entry.version, range)) {\n          versionRequirements.add(range);\n        }\n      }\n    }\n\n    // Find the versions that satisfy the semver requirements of all the requiredBy entries.\n    // Sort the versions in descending order.\n    const satisfiedVersions = availableVersions\n      .filter((v) => [...versionRequirements].every((range) => satisfies(v, range)))\n      .sort(semverReverseCompare);\n\n    let satisfiedVersion: string | undefined;\n\n    if (dedupeStrategy === 'force-host-version') {\n      if (!rootPath) {\n        console.error(\n          'Root path for project not found and is required when using the \"force-host-version\" dedupe strategy.',\n        );\n        continue;\n      }\n      // Use the app host's version of the package.\n      // Find the version of the package that belongs to the host.\n      // We assume that the host has a single version of the package.\n      const hostVersion = availableVersions.find((v) => slash(entries[v].path).startsWith(slash(rootPath)));\n\n      if (!hostVersion) {\n        console.error(`Could not find a version of \"${packageName}\" that is belongs to the host.`);\n        continue;\n      }\n\n      satisfiedVersion = hostVersion;\n    } else if (dedupeStrategy === 'force-remote-version') {\n      if (!remotePath) {\n        console.error(\n          'Root path for project not found and is required when using the \"force-remote-version\" dedupe strategy.',\n        );\n        continue;\n      }\n\n      // Use the version of the package that is the remote.\n      // Find the version of the package that does not belong to the host.\n      // We assume that the remote has a single version of the package.\n      const remoteVersion = availableVersions.find((v) => slash(entries[v].path).startsWith(slash(remotePath)));\n\n      if (!remoteVersion) {\n        console.error(`Could not find a version of \"${packageName}\" that is belongs to the remote.`);\n        continue;\n      }\n\n      satisfiedVersion = remoteVersion;\n    } else if (dedupeStrategy === 'allow-duplication' && satisfiedVersions.length > 0) {\n      // Select the highest version that satisfies the semver requirements of all the requiredBy entries.\n      satisfiedVersion = satisfiedVersions[0];\n      console.debug(\n        `Version \"${satisfiedVersion}\" of \"${packageName}\" satisfies the semver requirements of all the requiredBy entries.`,\n      );\n    } else {\n      // If the deduplication strategy allows duplicates and\n      // no version satisfies the semver requirements for all dependents,\n      // then deduplication of this package is not possible.\n      console.debug(\n        `Could not find a version of \"${packageName}\" that satisfies the semver requirements of all the requiredBy entries.`,\n      );\n      continue;\n    }\n\n    entries[satisfiedVersion].requiredBy = requiredBy;\n\n    for (const version of availableVersions) {\n      if (version == satisfiedVersion) {\n        continue;\n      }\n      detachEntry({ appMap, entry: entries[version] });\n      delete appMap[packageName][version];\n    }\n\n    for (const requiredById of Object.keys(requiredBy)) {\n      const { name: requiredByName, version: requiredByVersion } = parseRequiredBy(requiredById);\n      appMap[requiredByName][requiredByVersion].dependencies[packageName] = satisfiedVersion;\n    }\n\n    console.debug(`Removed versions of \"${packageName}\" except for \"${satisfiedVersion}\".`);\n  }\n}\n"]}
+{"version":3,"file":"dedupeLinkedPackages.js","sourceRoot":"","sources":["../../src/createResolveMap/dedupeLinkedPackages.ts"],"names":[],"mappings":"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","sourcesContent":["import { satisfies, rcompare as semverReverseCompare } from 'semver';\nimport type { PackageMap } from '../types/PackageMap.js';\nimport { parseRequiredBy } from './parseRequiredBy.js';\nimport { detachEntry } from './detachEntry.js';\nimport type { PackageDefinitionsCache, PackageSettings, ResolveMapEntry } from '@ms-cloudpack/common-types';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\n\ntype DuplicatedDependencyBehavior = NonNullable<NonNullable<PackageSettings['link']>['duplicatedDependencyBehavior']>;\n\n/**\n * Deduplicates linked packages by removing all but the highest version,\n * that satisfies the semver requirements of all the requiredBy entries.\n */\nexport async function dedupeLinkedPackages(\n  options: { appMap: PackageMap; allDuplicates: Set<string>; remotePath?: string; rootPath?: string },\n  context: { packages: PackageDefinitionsCache },\n) {\n  const { rootPath, appMap, allDuplicates, remotePath } = options;\n  const { packages } = context;\n  console.debug(`The following packages were duplicated by linking:\\n ${Array.from(allDuplicates).join(', ')}`);\n  for (const duplicate of allDuplicates) {\n    const packageName = parseRequiredBy(duplicate).name;\n\n    const entries = appMap[packageName] || {};\n\n    // Sanity check to ensure that it is a duplicate.\n    if (Object.keys(entries).length <= 1) {\n      continue;\n    }\n\n    let dedupeStrategy: DuplicatedDependencyBehavior = 'allow-duplication';\n    for (const entry of Object.values(entries)) {\n      const packageJson = await packages.get(entry.path);\n      if (packageJson.cloudpack?.link?.duplicatedDependencyBehavior) {\n        dedupeStrategy = packageJson.cloudpack.link.duplicatedDependencyBehavior;\n      }\n    }\n\n    const availableVersions = Object.keys(entries);\n\n    const versionRequirements = new Set<string>();\n    // Find if any of the duplicate entries satisfy the semver requirement of all the requiredBy entries.\n    const requiredBy: ResolveMapEntry['requiredBy'] = {};\n    for (const entry of Object.values(entries)) {\n      for (const [requiredById, range] of Object.entries(entry.requiredBy) as [`${string}@${string}`, string][]) {\n        requiredBy[requiredById] = range;\n        // We only care about satisfying version requirements that are already satisfied.\n        if (satisfies(entry.version, range)) {\n          versionRequirements.add(range);\n        }\n      }\n    }\n\n    // Find the versions that satisfy the semver requirements of all the requiredBy entries.\n    // Sort the versions in descending order.\n    const satisfiedVersions = availableVersions\n      .filter((v) => [...versionRequirements].every((range) => satisfies(v, range)))\n      .sort(semverReverseCompare);\n\n    let satisfiedVersion: string | undefined;\n\n    if (dedupeStrategy === 'force-host-version') {\n      if (!rootPath) {\n        console.error(\n          'Root path for project not found and is required when using the \"force-host-version\" dedupe strategy.',\n        );\n        continue;\n      }\n      // Use the app host's version of the package.\n      // Find the version of the package that belongs to the host.\n      // We assume that the host has a single version of the package.\n      const hostVersion = availableVersions.find((v) => slash(entries[v].path).startsWith(slash(rootPath)));\n\n      if (!hostVersion) {\n        console.error(`Could not find a version of \"${packageName}\" that is belongs to the host.`);\n        continue;\n      }\n\n      satisfiedVersion = hostVersion;\n    } else if (dedupeStrategy === 'force-remote-version') {\n      if (!remotePath) {\n        console.error(\n          'Root path for project not found and is required when using the \"force-remote-version\" dedupe strategy.',\n        );\n        continue;\n      }\n\n      // Use the version of the package that is the remote.\n      // Find the version of the package that does not belong to the host.\n      // We assume that the remote has a single version of the package.\n      const remoteVersion = availableVersions.find((v) => slash(entries[v].path).startsWith(slash(remotePath)));\n\n      if (!remoteVersion) {\n        console.error(`Could not find a version of \"${packageName}\" that is belongs to the remote.`);\n        continue;\n      }\n\n      satisfiedVersion = remoteVersion;\n    } else if (dedupeStrategy === 'allow-duplication' && satisfiedVersions.length > 0) {\n      // Select the highest version that satisfies the semver requirements of all the requiredBy entries.\n      satisfiedVersion = satisfiedVersions[0];\n      console.debug(\n        `Version \"${satisfiedVersion}\" of \"${packageName}\" satisfies the semver requirements of all the requiredBy entries.`,\n      );\n    } else {\n      // If the deduplication strategy allows duplicates and\n      // no version satisfies the semver requirements for all dependents,\n      // then deduplication of this package is not possible.\n      console.debug(\n        `Could not find a version of \"${packageName}\" that satisfies the semver requirements of all the requiredBy entries.`,\n      );\n      continue;\n    }\n\n    entries[satisfiedVersion].requiredBy = requiredBy;\n\n    for (const version of availableVersions) {\n      if (version == satisfiedVersion) {\n        continue;\n      }\n      detachEntry({ appMap, entry: entries[version] });\n      delete appMap[packageName][version];\n    }\n\n    for (const requiredById of Object.keys(requiredBy)) {\n      const { name: requiredByName, version: requiredByVersion } = parseRequiredBy(requiredById);\n      appMap[requiredByName][requiredByVersion].dependencies[packageName] = satisfiedVersion;\n    }\n\n    console.debug(`Removed versions of \"${packageName}\" except for \"${satisfiedVersion}\".`);\n  }\n}\n"]}

package/lib/createResolveMap/findPackagesFromPath.js

@@ -60,13 +60,6 @@ async function visitPackage(options, context) {
     const { packagePath, packageMap, rootPath, importerContext, realPathCache } = options;
     const { packages } = context;
     const packageDefinition = await packages.get(packagePath, { importerContext });
-    if (!packageDefinition) {
-        throw new Error(`Could not find package definition at "${packagePath}".\n\n` +
-            `Make sure the package.json file exists and try again.\n`);
-    }
-    if (!(packageDefinition.name && packageDefinition.version)) {
-        return [];
-    }
     const { name, version } = packageDefinition;
     const entry = ensurePackageEntry({
         packageName: importerContext?.importedName || name,
@@ -125,7 +118,6 @@ async function visitPackage(options, context) {
  */
 function ensurePackageEntry(options) {
     const { packagePath = '', packageName: name, packageMap, definition } = options;
-    // the caller verified that these are set
     const { version } = definition;
     packageMap[name] ??= {};
     let entry = packageMap[name][version];

package/lib/createResolveMap/findPackagesFromPath.js.map

@@ -1 +1 @@
-{"version":3,"file":"findPackagesFromPath.js","sourceRoot":"","sources":["../../src/createResolveMap/findPackagesFromPath.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  PackageDefinitionsCache,\n  PackageImporterContext,\n  PackageJson,\n  ResolveMapEntry,\n} from '@ms-cloudpack/common-types';\nimport { isFolder } from '@ms-cloudpack/path-utilities';\nimport glob from 'fast-glob';\nimport path from 'path';\nimport { findPackage } from '../findPackage.js';\nimport { isExternalPackage } from '../isExternalPackage.js';\nimport type { PackageMap } from '../types/PackageMap.js';\nimport { getDependencies } from '../getDependencies.js';\nimport { findProjectRoot } from '../findProjectRoot.js';\nimport { bulletedList } from '@ms-cloudpack/task-reporter';\n\ntype PackagePathInfo = { packagePath: string; importerContext?: PackageImporterContext };\n\n/**\n * Find all packages from a given path. We do this by walking the dependency tree\n * of the app to build a map of all packages and their dependencies.\n */\nexport async function findPackagesFromPath(\n  options: {\n    /**\n     * Paths to search for package.json files and traverse their dependencies to build a PackageMap.\n     */\n    searchPaths: string[];\n\n    /**\n     * Where to stop looking for packages (mainly used for testing).\n     * If not specified, will look for the project/git root of the first path in the paths array.\n     */\n    rootPath?: string;\n\n    /**\n     * If true will glob for all package.json files in the path and add them to the map.\n     */\n    discoverPackages?: boolean;\n  },\n  context: {\n    /**\n     * Package cache.\n     */\n    packages: PackageDefinitionsCache;\n  },\n): Promise<PackageMap> {\n  const { searchPaths, discoverPackages } = options;\n  const packageMap: PackageMap = {};\n  const visitedPaths = new Set<string>();\n  const realPathCache: Record<string, string | undefined> = {};\n\n  for (const searchPath of searchPaths) {\n    if (!(await isFolder(searchPath))) {\n      throw new Error(`Path ${searchPath} is not a folder.\\n\\nMake sure the path exists and try again.`);\n    }\n\n    const rootPath = options.rootPath || findProjectRoot(searchPath, { noPackageRoot: true });\n\n    let pathsToVisit: PackagePathInfo[];\n\n    if (discoverPackages) {\n      const packagePaths = await glob('**/package.json', { cwd: searchPath, ignore: ['**/node_modules/**'] });\n\n      pathsToVisit = packagePaths.map((p) => ({ packagePath: path.dirname(path.join(searchPath, p)) }));\n    } else {\n      pathsToVisit = [{ packagePath: searchPath }];\n    }\n\n    while (pathsToVisit.length) {\n      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- already checked length\n      const { packagePath, importerContext } = pathsToVisit.shift()!;\n\n      // There's a very slight possibility (not yet observed even in large repos) that both semver\n      // and non-semver dependencies could resolve to the same package name and version and therefore\n      // be installed at the same path. (If the non-semver dependency was encountered first, the\n      // version and possibly name in the package definition would have been transformed to match by\n      // getNonSemverTransform.) It would be possible to detect this case if needed, but for now we're\n      // not going to bother because it's so rare/theoretical and the effect in practice will probably\n      // be the same as a dependency that's forced with `resolutions` to a version violating semver.\n      if (!visitedPaths.has(packagePath)) {\n        visitedPaths.add(packagePath);\n\n        const dependencyPaths = await visitPackage(\n          { packagePath, packageMap, rootPath, importerContext, realPathCache },\n          context,\n        );\n\n        for (const dependencyPath of dependencyPaths) {\n          // Let's avoid pushing tons of things into the work queue that we'll be skipping later.\n          if (!visitedPaths.has(dependencyPath.packagePath)) {\n            pathsToVisit.push(dependencyPath);\n          }\n        }\n      }\n    }\n  }\n\n  return packageMap;\n}\n\n/**\n * Visit a package path, and add entries for the package and its dependencies to `packageMap`.\n * Returns a list of additional dependency paths to visit.\n */\nasync function visitPackage(\n  options: PackagePathInfo & {\n    packageMap: PackageMap;\n    rootPath: string | undefined;\n    realPathCache?: Record<string, string | undefined>;\n  },\n  context: Parameters<typeof findPackagesFromPath>[1],\n) {\n  const { packagePath, packageMap, rootPath, importerContext, realPathCache } = options;\n  const { packages } = context;\n\n  const packageDefinition = await packages.get(packagePath, { importerContext });\n  if (!packageDefinition) {\n    throw new Error(\n      `Could not find package definition at \"${packagePath}\".\\n\\n` +\n        `Make sure the package.json file exists and try again.\\n`,\n    );\n  }\n  if (!(packageDefinition.name && packageDefinition.version)) {\n    return [];\n  }\n\n  const { name, version } = packageDefinition;\n  const entry = ensurePackageEntry({\n    packageName: importerContext?.importedName || name,\n    packagePath: packagePath,\n    packageMap,\n    definition: packageDefinition,\n  });\n\n  // Add all dependencies to the list of paths to visit.\n  const dependencies = getDependencies(packageDefinition) as Record<string, string>;\n\n  const dependencyPaths: PackagePathInfo[] = [];\n\n  for (const [dependencyName, versionRequirement] of Object.entries(dependencies)) {\n    const depImporterContext: PackageImporterContext = {\n      parentName: name,\n      parentVersion: version,\n      importedName: dependencyName,\n      versionRequirement,\n    };\n\n    const dependencyPackage = await findPackage(\n      { dependencyName, startPath: packagePath, rootPath, importerContext: depImporterContext, realPathCache },\n      context,\n    );\n    if (!dependencyPackage) {\n      if (packageDefinition.peerDependencies?.[dependencyName]) {\n        // Ignore missing peer dependencies\n        continue;\n      }\n\n      throw new Error(\n        [\n          `A dependency could not be found:`,\n          bulletedList([\n            `Dependency: ${dependencyName} (Required: ${versionRequirement})`,\n            `Required by: ${packagePath}`,\n          ]),\n          ``,\n          `Make sure the dependency is installed and try again.`,\n        ].join('\\n'),\n      );\n    }\n\n    const { packagePath: dependencyPath, definition: dependencyDefinition } = dependencyPackage;\n\n    if (!(dependencyDefinition.name && dependencyDefinition.version)) {\n      throw new Error(`\"${dependencyPath}/package.json\" is missing a name or version.`);\n    }\n\n    const dependencyEntry = ensurePackageEntry({\n      packagePath: dependencyPath,\n      packageName: dependencyName,\n      packageMap,\n      definition: dependencyDefinition,\n    });\n\n    entry.dependencies[dependencyName] = dependencyDefinition.version;\n    dependencyEntry.requiredBy[`${name}@${version}`] = versionRequirement;\n\n    dependencyPaths.push({\n      packagePath: dependencyPath,\n      importerContext: depImporterContext,\n    });\n  }\n\n  return dependencyPaths;\n}\n\n/**\n * If `packageMap` doesn't already have an entry for this package name and version, create one\n * and add it to `packageMap`. Returns the entry.\n */\nfunction ensurePackageEntry(options: {\n  packagePath: string;\n  packageName: string;\n  packageMap: PackageMap;\n  definition: PackageJson;\n}): ResolveMapEntry {\n  const { packagePath = '', packageName: name, packageMap, definition } = options;\n  // the caller verified that these are set\n  const { version } = definition as Required<PackageJson>;\n\n  packageMap[name] ??= {};\n\n  let entry = packageMap[name][version];\n  if (!entry) {\n    entry = packageMap[name][version] = {\n      name,\n      version,\n      path: packagePath,\n      dependencies: {},\n      requiredBy: {},\n    };\n\n    if (isExternalPackage(packagePath)) {\n      entry.isExternal = true;\n    }\n  }\n\n  return entry;\n}\n"]}
+{"version":3,"file":"findPackagesFromPath.js","sourceRoot":"","sources":["../../src/createResolveMap/findPackagesFromPath.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  PackageDefinitionsCache,\n  PackageImporterContext,\n  PackageJson,\n  ResolveMapEntry,\n} from '@ms-cloudpack/common-types';\nimport { isFolder } from '@ms-cloudpack/path-utilities';\nimport glob from 'fast-glob';\nimport path from 'path';\nimport { findPackage } from '../findPackage.js';\nimport { isExternalPackage } from '../isExternalPackage.js';\nimport type { PackageMap } from '../types/PackageMap.js';\nimport { getDependencies } from '../getDependencies.js';\nimport { findProjectRoot } from '../findProjectRoot.js';\nimport { bulletedList } from '@ms-cloudpack/task-reporter';\n\ntype PackagePathInfo = { packagePath: string; importerContext?: PackageImporterContext };\n\n/**\n * Find all packages from a given path. We do this by walking the dependency tree\n * of the app to build a map of all packages and their dependencies.\n */\nexport async function findPackagesFromPath(\n  options: {\n    /**\n     * Paths to search for package.json files and traverse their dependencies to build a PackageMap.\n     */\n    searchPaths: string[];\n\n    /**\n     * Where to stop looking for packages (mainly used for testing).\n     * If not specified, will look for the project/git root of the first path in the paths array.\n     */\n    rootPath?: string;\n\n    /**\n     * If true will glob for all package.json files in the path and add them to the map.\n     */\n    discoverPackages?: boolean;\n  },\n  context: {\n    /**\n     * Package cache.\n     */\n    packages: PackageDefinitionsCache;\n  },\n): Promise<PackageMap> {\n  const { searchPaths, discoverPackages } = options;\n  const packageMap: PackageMap = {};\n  const visitedPaths = new Set<string>();\n  const realPathCache: Record<string, string | undefined> = {};\n\n  for (const searchPath of searchPaths) {\n    if (!(await isFolder(searchPath))) {\n      throw new Error(`Path ${searchPath} is not a folder.\\n\\nMake sure the path exists and try again.`);\n    }\n\n    const rootPath = options.rootPath || findProjectRoot(searchPath, { noPackageRoot: true });\n\n    let pathsToVisit: PackagePathInfo[];\n\n    if (discoverPackages) {\n      const packagePaths = await glob('**/package.json', { cwd: searchPath, ignore: ['**/node_modules/**'] });\n\n      pathsToVisit = packagePaths.map((p) => ({ packagePath: path.dirname(path.join(searchPath, p)) }));\n    } else {\n      pathsToVisit = [{ packagePath: searchPath }];\n    }\n\n    while (pathsToVisit.length) {\n      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- already checked length\n      const { packagePath, importerContext } = pathsToVisit.shift()!;\n\n      // There's a very slight possibility (not yet observed even in large repos) that both semver\n      // and non-semver dependencies could resolve to the same package name and version and therefore\n      // be installed at the same path. (If the non-semver dependency was encountered first, the\n      // version and possibly name in the package definition would have been transformed to match by\n      // getNonSemverTransform.) It would be possible to detect this case if needed, but for now we're\n      // not going to bother because it's so rare/theoretical and the effect in practice will probably\n      // be the same as a dependency that's forced with `resolutions` to a version violating semver.\n      if (!visitedPaths.has(packagePath)) {\n        visitedPaths.add(packagePath);\n\n        const dependencyPaths = await visitPackage(\n          { packagePath, packageMap, rootPath, importerContext, realPathCache },\n          context,\n        );\n\n        for (const dependencyPath of dependencyPaths) {\n          // Let's avoid pushing tons of things into the work queue that we'll be skipping later.\n          if (!visitedPaths.has(dependencyPath.packagePath)) {\n            pathsToVisit.push(dependencyPath);\n          }\n        }\n      }\n    }\n  }\n\n  return packageMap;\n}\n\n/**\n * Visit a package path, and add entries for the package and its dependencies to `packageMap`.\n * Returns a list of additional dependency paths to visit.\n */\nasync function visitPackage(\n  options: PackagePathInfo & {\n    packageMap: PackageMap;\n    rootPath: string | undefined;\n    realPathCache?: Record<string, string | undefined>;\n  },\n  context: Parameters<typeof findPackagesFromPath>[1],\n) {\n  const { packagePath, packageMap, rootPath, importerContext, realPathCache } = options;\n  const { packages } = context;\n\n  const packageDefinition = await packages.get(packagePath, { importerContext });\n\n  const { name, version } = packageDefinition;\n  const entry = ensurePackageEntry({\n    packageName: importerContext?.importedName || name,\n    packagePath: packagePath,\n    packageMap,\n    definition: packageDefinition,\n  });\n\n  // Add all dependencies to the list of paths to visit.\n  const dependencies = getDependencies(packageDefinition) as Record<string, string>;\n\n  const dependencyPaths: PackagePathInfo[] = [];\n\n  for (const [dependencyName, versionRequirement] of Object.entries(dependencies)) {\n    const depImporterContext: PackageImporterContext = {\n      parentName: name,\n      parentVersion: version,\n      importedName: dependencyName,\n      versionRequirement,\n    };\n\n    const dependencyPackage = await findPackage(\n      { dependencyName, startPath: packagePath, rootPath, importerContext: depImporterContext, realPathCache },\n      context,\n    );\n    if (!dependencyPackage) {\n      if (packageDefinition.peerDependencies?.[dependencyName]) {\n        // Ignore missing peer dependencies\n        continue;\n      }\n\n      throw new Error(\n        [\n          `A dependency could not be found:`,\n          bulletedList([\n            `Dependency: ${dependencyName} (Required: ${versionRequirement})`,\n            `Required by: ${packagePath}`,\n          ]),\n          ``,\n          `Make sure the dependency is installed and try again.`,\n        ].join('\\n'),\n      );\n    }\n\n    const { packagePath: dependencyPath, definition: dependencyDefinition } = dependencyPackage;\n\n    if (!(dependencyDefinition.name && dependencyDefinition.version)) {\n      throw new Error(`\"${dependencyPath}/package.json\" is missing a name or version.`);\n    }\n\n    const dependencyEntry = ensurePackageEntry({\n      packagePath: dependencyPath,\n      packageName: dependencyName,\n      packageMap,\n      definition: dependencyDefinition,\n    });\n\n    entry.dependencies[dependencyName] = dependencyDefinition.version;\n    dependencyEntry.requiredBy[`${name}@${version}`] = versionRequirement;\n\n    dependencyPaths.push({\n      packagePath: dependencyPath,\n      importerContext: depImporterContext,\n    });\n  }\n\n  return dependencyPaths;\n}\n\n/**\n * If `packageMap` doesn't already have an entry for this package name and version, create one\n * and add it to `packageMap`. Returns the entry.\n */\nfunction ensurePackageEntry(options: {\n  packagePath: string;\n  packageName: string;\n  packageMap: PackageMap;\n  definition: PackageJson;\n}): ResolveMapEntry {\n  const { packagePath = '', packageName: name, packageMap, definition } = options;\n  const { version } = definition;\n\n  packageMap[name] ??= {};\n\n  let entry = packageMap[name][version];\n  if (!entry) {\n    entry = packageMap[name][version] = {\n      name,\n      version,\n      path: packagePath,\n      dependencies: {},\n      requiredBy: {},\n    };\n\n    if (isExternalPackage(packagePath)) {\n      entry.isExternal = true;\n    }\n  }\n\n  return entry;\n}\n"]}

package/lib/ensureResolveMapEntry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ensureResolveMapEntry.d.ts","sourceRoot":"","sources":["../src/ensureResolveMapEntry.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,uBAAuB,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAInG;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE;IACN,UAAU,EAAE,WAAW,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;CACjB,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;CACnC,GACA,OAAO,CAAC;IAAE,cAAc,CAAC,EAAE,MAAM,CAAC;IAAC,iBAAiB,EAAE,OAAO,CAAA;CAAE,CAAC,CAkFlE"}
+{"version":3,"file":"ensureResolveMapEntry.d.ts","sourceRoot":"","sources":["../src/ensureResolveMapEntry.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,uBAAuB,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAInG;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE;IACN,UAAU,EAAE,WAAW,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;CACjB,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;CACnC,GACA,OAAO,CAAC;IAAE,cAAc,CAAC,EAAE,MAAM,CAAC;IAAC,iBAAiB,EAAE,OAAO,CAAA;CAAE,CAAC,CA+ElE"}

package/lib/ensureResolveMapEntry.js

@@ -8,9 +8,6 @@ import { isExternalPackage } from './isExternalPackage.js';
 export async function ensureResolveMapEntry(params, context) {
     const { dependencyName, resolveMap, packagePath, appPath, definition } = params;
     const { packages } = context;
-    if (!definition.name || !definition.version) {
-        throw new Error(`Package definition at "${packagePath}" is missing a name or version.`);
-    }
     const parentEntry = findResolveMapEntry({ packageName: definition.name, version: definition.version, resolveMap });
     // If we can't find the parent entry, we can't add the dependency.
     if (!parentEntry) {

package/lib/ensureResolveMapEntry.js.map

@@ -1 +1 @@
-{"version":3,"file":"ensureResolveMapEntry.js","sourceRoot":"","sources":["../src/ensureResolveMapEntry.ts"],"names":[],"mappings":"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","sourcesContent":["import { findProjectRoot } from './findProjectRoot.js';\nimport { findResolveMapEntry } from './findResolveMapEntry.js';\nimport type { PackageDefinitionsCache, PackageJson, ResolveMap } from '@ms-cloudpack/common-types';\nimport { findPackage } from './findPackage.js';\nimport { isExternalPackage } from './isExternalPackage.js';\n\n/**\n * Ensure that a package is in the resolve map and return the path to the package.\n */\nexport async function ensureResolveMapEntry(\n  params: {\n    definition: PackageJson;\n    packagePath: string;\n    dependencyName: string;\n    resolveMap: ResolveMap;\n    appPath: string;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n  },\n): Promise<{ dependencyPath?: string; updatedResolution: boolean }> {\n  const { dependencyName, resolveMap, packagePath, appPath, definition } = params;\n  const { packages } = context;\n  if (!definition.name || !definition.version) {\n    throw new Error(`Package definition at \"${packagePath}\" is missing a name or version.`);\n  }\n\n  const parentEntry = findResolveMapEntry({ packageName: definition.name, version: definition.version, resolveMap });\n\n  // If we can't find the parent entry, we can't add the dependency.\n  if (!parentEntry) {\n    return { updatedResolution: false };\n  }\n\n  const resolveEntry = findResolveMapEntry({ definition, packageName: dependencyName, resolveMap });\n  let dependencyPath = resolveEntry?.path;\n  let dependencyDefinition = dependencyPath ? await packages.get(dependencyPath) : undefined;\n\n  // If the dependency is already in the resolve map and required by the parent, return the path.\n  if (dependencyPath && dependencyDefinition && resolveEntry?.requiredBy[`${definition.name}@${definition.version}`]) {\n    return { dependencyPath, updatedResolution: false };\n  }\n\n  const rootPath = findProjectRoot(appPath, { noPackageRoot: true });\n\n  const dependencyPackage = await findPackage(\n    {\n      dependencyName,\n      startPath: packagePath,\n      rootPath,\n    },\n    context,\n  );\n\n  dependencyPath = dependencyPackage?.packagePath;\n  dependencyDefinition = dependencyPackage?.definition;\n  const version = dependencyDefinition?.version;\n\n  // If we can't find the dependency, we can't add it to the resolve map.\n  if (!dependencyPath || !dependencyDefinition || !version) {\n    return { updatedResolution: false };\n  }\n\n  // Check if the dependency is already in the resolve map.\n  let dependencyEntry = [resolveMap[dependencyName], ...Object.values(resolveMap[dependencyName]?.scopedVersions || {})]\n    .filter(Boolean)\n    .find((e) => e.version === version && e.path === dependencyPath);\n\n  // If it already exists, add the requiredBy entry and return the path.\n  if (dependencyEntry) {\n    parentEntry.dependencies[dependencyName] = version;\n    dependencyEntry.requiredBy[`${definition.name}@${definition.version}`] = version;\n    // If the dependency is scoped, we have changed the resolution.\n    return { dependencyPath, updatedResolution: dependencyEntry.version !== resolveMap[dependencyName].version };\n  }\n\n  // If it is missing from the resolve map, add it.\n  dependencyEntry = {\n    name: dependencyName,\n    version,\n    path: dependencyPath,\n    dependencies: {},\n    requiredBy: {\n      [`${definition.name}@${definition.version}`]: version,\n    },\n  };\n\n  if (isExternalPackage(dependencyPath)) {\n    dependencyEntry.isExternal = true;\n  }\n\n  parentEntry.dependencies[dependencyName] = version;\n\n  // Add the dependency to the resolve map.\n  if (!resolveMap[dependencyName]) {\n    resolveMap[dependencyName] = dependencyEntry;\n  } else {\n    resolveMap[dependencyName].scopedVersions ??= {};\n    resolveMap[dependencyName].scopedVersions[version] = dependencyEntry;\n  }\n\n  return { dependencyPath, updatedResolution: true };\n}\n"]}
+{"version":3,"file":"ensureResolveMapEntry.js","sourceRoot":"","sources":["../src/ensureResolveMapEntry.ts"],"names":[],"mappings":"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","sourcesContent":["import { findProjectRoot } from './findProjectRoot.js';\nimport { findResolveMapEntry } from './findResolveMapEntry.js';\nimport type { PackageDefinitionsCache, PackageJson, ResolveMap } from '@ms-cloudpack/common-types';\nimport { findPackage } from './findPackage.js';\nimport { isExternalPackage } from './isExternalPackage.js';\n\n/**\n * Ensure that a package is in the resolve map and return the path to the package.\n */\nexport async function ensureResolveMapEntry(\n  params: {\n    definition: PackageJson;\n    packagePath: string;\n    dependencyName: string;\n    resolveMap: ResolveMap;\n    appPath: string;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n  },\n): Promise<{ dependencyPath?: string; updatedResolution: boolean }> {\n  const { dependencyName, resolveMap, packagePath, appPath, definition } = params;\n  const { packages } = context;\n\n  const parentEntry = findResolveMapEntry({ packageName: definition.name, version: definition.version, resolveMap });\n\n  // If we can't find the parent entry, we can't add the dependency.\n  if (!parentEntry) {\n    return { updatedResolution: false };\n  }\n\n  const resolveEntry = findResolveMapEntry({ definition, packageName: dependencyName, resolveMap });\n  let dependencyPath = resolveEntry?.path;\n  let dependencyDefinition = dependencyPath ? await packages.get(dependencyPath) : undefined;\n\n  // If the dependency is already in the resolve map and required by the parent, return the path.\n  if (dependencyPath && dependencyDefinition && resolveEntry?.requiredBy[`${definition.name}@${definition.version}`]) {\n    return { dependencyPath, updatedResolution: false };\n  }\n\n  const rootPath = findProjectRoot(appPath, { noPackageRoot: true });\n\n  const dependencyPackage = await findPackage(\n    {\n      dependencyName,\n      startPath: packagePath,\n      rootPath,\n    },\n    context,\n  );\n\n  dependencyPath = dependencyPackage?.packagePath;\n  dependencyDefinition = dependencyPackage?.definition;\n  const version = dependencyDefinition?.version;\n\n  // If we can't find the dependency, we can't add it to the resolve map.\n  if (!dependencyPath || !dependencyDefinition || !version) {\n    return { updatedResolution: false };\n  }\n\n  // Check if the dependency is already in the resolve map.\n  let dependencyEntry = [resolveMap[dependencyName], ...Object.values(resolveMap[dependencyName]?.scopedVersions || {})]\n    .filter(Boolean)\n    .find((e) => e.version === version && e.path === dependencyPath);\n\n  // If it already exists, add the requiredBy entry and return the path.\n  if (dependencyEntry) {\n    parentEntry.dependencies[dependencyName] = version;\n    dependencyEntry.requiredBy[`${definition.name}@${definition.version}`] = version;\n    // If the dependency is scoped, we have changed the resolution.\n    return { dependencyPath, updatedResolution: dependencyEntry.version !== resolveMap[dependencyName].version };\n  }\n\n  // If it is missing from the resolve map, add it.\n  dependencyEntry = {\n    name: dependencyName,\n    version,\n    path: dependencyPath,\n    dependencies: {},\n    requiredBy: {\n      [`${definition.name}@${definition.version}`]: version,\n    },\n  };\n\n  if (isExternalPackage(dependencyPath)) {\n    dependencyEntry.isExternal = true;\n  }\n\n  parentEntry.dependencies[dependencyName] = version;\n\n  // Add the dependency to the resolve map.\n  if (!resolveMap[dependencyName]) {\n    resolveMap[dependencyName] = dependencyEntry;\n  } else {\n    resolveMap[dependencyName].scopedVersions ??= {};\n    resolveMap[dependencyName].scopedVersions[version] = dependencyEntry;\n  }\n\n  return { dependencyPath, updatedResolution: true };\n}\n"]}

package/lib/findFileInPackage.js

@@ -25,7 +25,7 @@ export async function findFileInPackage(options, context) {
     let typesPath;
     const isInternal = !isExternalPackage(packagePath);
     const pathsToConsider = [originalPath];
-    const definition = await context.packages.get(packagePath, { disableTransforms: true });
+    const definition = await context.packages.tryGet(packagePath, { disableTransforms: true });
     // If the original package.json has an exports map, we should not use main and module as hints.
     if (originalPath === '.' && definition && !definition.exports) {
         const { main, module } = definition;

package/lib/findFileInPackage.js.map

@@ -1 +1 @@
-{"version":3,"file":"findFileInPackage.js","sourceRoot":"","sources":["../src/findFileInPackage.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CloudpackConfig, PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport { normalizeRelativePath, slash } from '@ms-cloudpack/path-string-parsing';\nimport { intermediateToSourcePath, isFileSync, sourceToIntermediatePath } from '@ms-cloudpack/path-utilities';\nimport path from 'path';\nimport { flattenExportsMap } from './flattenExportsMap.js';\nimport { getCandidates } from './getCandidates.js';\nimport { getExportsMap } from './getExportsMap.js';\nimport { isExternalPackage } from './isExternalPackage.js';\n\nconst sourceExtensions = ['.ts', '.tsx', '.cts', '.mts', '.jsx'];\nconst javascriptExtensions = ['.js', '.mjs', '.cjs'];\n\nexport type FindFileInPackageOptions = {\n  packagePath: string;\n  filePath: string;\n};\n\nexport type FindFileInPackageResult = {\n  filePath?: string;\n  typesPath?: string;\n  sourcePath?: string;\n};\n\n/**\n * Given a requested partial filePath, resolves the relative intermediate path if the file exists, with special\n * consideration for internal packages, which may not have intermediate files but only source files. Paths returned\n * are always relative and start with `./`.\n *\n * This helper is used in deriving if the given package.json entries are actual validate candidates when constructing an\n * exports map from existing metadata. For example, a package.json may list `main` as `lib/index.js`. If this file\n * exists, or in internal packages, if `src/index.tsx` exists, then this is a valid candidate. If the file does not\n * exist, then we should not include it in the exports map.\n */\nexport async function findFileInPackage(\n  options: FindFileInPackageOptions,\n  context: { packages: PackageDefinitionsCache; config: Pick<CloudpackConfig, 'features'> },\n): Promise<FindFileInPackageResult> {\n  const originalPath = normalizeRelativePath(options.filePath);\n  const packagePath = slash(options.packagePath);\n  let filePath: string | undefined;\n  let sourcePath: string | undefined;\n  let typesPath: string | undefined;\n  const isInternal = !isExternalPackage(packagePath);\n  const pathsToConsider = [originalPath];\n\n  const definition = await context.packages.get(packagePath, { disableTransforms: true });\n  // If the original package.json has an exports map, we should not use main and module as hints.\n  if (originalPath === '.' && definition && !definition.exports) {\n    const { main, module } = definition;\n    if (main) {\n      pathsToConsider.unshift(main);\n    }\n    if (module) {\n      pathsToConsider.unshift(module);\n    }\n  }\n\n  for (const currentPath of pathsToConsider) {\n    const candidates = await getCandidates({ filePath: currentPath, packagePath }, context);\n\n    // Try and resolve a physical file given the candidates.\n    filePath = candidates.find((candidate) => isFileSync(path.join(packagePath, candidate)));\n    if (filePath) {\n      break;\n    }\n  }\n\n  const isNestedPackageDefinition =\n    filePath && path.basename(filePath) === 'package.json' && path.basename(originalPath) !== 'package.json';\n  const result: FindFileInPackageResult = {};\n\n  if (isNestedPackageDefinition) {\n    const nestedDefinitionPath = path.dirname(path.join(packagePath, filePath as string));\n    const exportsMap = await getExportsMap({ packagePath: nestedDefinitionPath }, context);\n    const entryPath = flattenExportsMap(exportsMap)['.'];\n\n    if (entryPath) {\n      typesPath = flattenExportsMap(exportsMap, { conditions: ['types'] })['.'];\n\n      return {\n        ...(await findFileInPackage(\n          {\n            packagePath,\n            filePath: normalizeRelativePath(path.relative(packagePath, path.join(nestedDefinitionPath, entryPath))),\n          },\n          context,\n        )),\n        typesPath:\n          typesPath && normalizeRelativePath(path.relative(packagePath, path.join(nestedDefinitionPath, typesPath))),\n      };\n    } else {\n      // If we can't find an entry, we should not include this in the exports map.\n      // This avoids adding a \"./package.json\" value to a \".\" entry.\n      return result;\n    }\n  }\n\n  // If the resolved file is a typescript file in an internal package, try to resolve the intermediate.\n  if (filePath && sourceExtensions.includes(path.extname(filePath))) {\n    sourcePath = filePath;\n    filePath = isInternal ? sourceToIntermediatePath(filePath) : undefined;\n  }\n\n  // If we haven't resolved a sourcePath, try to resolve it from the intermediate.\n  if (isInternal && filePath && !sourcePath) {\n    const ext = path.extname(filePath);\n    const isJavaScriptExt = javascriptExtensions.includes(ext);\n\n    if (isJavaScriptExt) {\n      // Not a TS file, but a JS file. Try to find the source.\n      sourcePath = intermediateToSourcePath(filePath, packagePath);\n\n      // If we couldn't find a TS file, clear sourcePath.\n      if (sourcePath === filePath) {\n        sourcePath = undefined;\n      }\n    }\n  }\n\n  // Try to resolve the typesPath\n  if (sourcePath && filePath) {\n    typesPath = filePath.replace(/\\.js$/, '.d.ts');\n\n    if (!isInternal && !isFileSync(path.join(packagePath, typesPath))) {\n      typesPath = undefined;\n    }\n  }\n\n  if (typesPath) {\n    result.typesPath = normalizeRelativePath(typesPath);\n  }\n\n  if (filePath) {\n    result.filePath = normalizeRelativePath(filePath);\n  }\n\n  if (sourcePath) {\n    result.sourcePath = normalizeRelativePath(sourcePath);\n  }\n\n  return result;\n}\n"]}
+{"version":3,"file":"findFileInPackage.js","sourceRoot":"","sources":["../src/findFileInPackage.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CloudpackConfig, PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport { normalizeRelativePath, slash } from '@ms-cloudpack/path-string-parsing';\nimport { intermediateToSourcePath, isFileSync, sourceToIntermediatePath } from '@ms-cloudpack/path-utilities';\nimport path from 'path';\nimport { flattenExportsMap } from './flattenExportsMap.js';\nimport { getCandidates } from './getCandidates.js';\nimport { getExportsMap } from './getExportsMap.js';\nimport { isExternalPackage } from './isExternalPackage.js';\n\nconst sourceExtensions = ['.ts', '.tsx', '.cts', '.mts', '.jsx'];\nconst javascriptExtensions = ['.js', '.mjs', '.cjs'];\n\nexport type FindFileInPackageOptions = {\n  packagePath: string;\n  filePath: string;\n};\n\nexport type FindFileInPackageResult = {\n  filePath?: string;\n  typesPath?: string;\n  sourcePath?: string;\n};\n\n/**\n * Given a requested partial filePath, resolves the relative intermediate path if the file exists, with special\n * consideration for internal packages, which may not have intermediate files but only source files. Paths returned\n * are always relative and start with `./`.\n *\n * This helper is used in deriving if the given package.json entries are actual validate candidates when constructing an\n * exports map from existing metadata. For example, a package.json may list `main` as `lib/index.js`. If this file\n * exists, or in internal packages, if `src/index.tsx` exists, then this is a valid candidate. If the file does not\n * exist, then we should not include it in the exports map.\n */\nexport async function findFileInPackage(\n  options: FindFileInPackageOptions,\n  context: { packages: PackageDefinitionsCache; config: Pick<CloudpackConfig, 'features'> },\n): Promise<FindFileInPackageResult> {\n  const originalPath = normalizeRelativePath(options.filePath);\n  const packagePath = slash(options.packagePath);\n  let filePath: string | undefined;\n  let sourcePath: string | undefined;\n  let typesPath: string | undefined;\n  const isInternal = !isExternalPackage(packagePath);\n  const pathsToConsider = [originalPath];\n\n  const definition = await context.packages.tryGet(packagePath, { disableTransforms: true });\n  // If the original package.json has an exports map, we should not use main and module as hints.\n  if (originalPath === '.' && definition && !definition.exports) {\n    const { main, module } = definition;\n    if (main) {\n      pathsToConsider.unshift(main);\n    }\n    if (module) {\n      pathsToConsider.unshift(module);\n    }\n  }\n\n  for (const currentPath of pathsToConsider) {\n    const candidates = await getCandidates({ filePath: currentPath, packagePath }, context);\n\n    // Try and resolve a physical file given the candidates.\n    filePath = candidates.find((candidate) => isFileSync(path.join(packagePath, candidate)));\n    if (filePath) {\n      break;\n    }\n  }\n\n  const isNestedPackageDefinition =\n    filePath && path.basename(filePath) === 'package.json' && path.basename(originalPath) !== 'package.json';\n  const result: FindFileInPackageResult = {};\n\n  if (isNestedPackageDefinition) {\n    const nestedDefinitionPath = path.dirname(path.join(packagePath, filePath as string));\n    const exportsMap = await getExportsMap({ packagePath: nestedDefinitionPath }, context);\n    const entryPath = flattenExportsMap(exportsMap)['.'];\n\n    if (entryPath) {\n      typesPath = flattenExportsMap(exportsMap, { conditions: ['types'] })['.'];\n\n      return {\n        ...(await findFileInPackage(\n          {\n            packagePath,\n            filePath: normalizeRelativePath(path.relative(packagePath, path.join(nestedDefinitionPath, entryPath))),\n          },\n          context,\n        )),\n        typesPath:\n          typesPath && normalizeRelativePath(path.relative(packagePath, path.join(nestedDefinitionPath, typesPath))),\n      };\n    } else {\n      // If we can't find an entry, we should not include this in the exports map.\n      // This avoids adding a \"./package.json\" value to a \".\" entry.\n      return result;\n    }\n  }\n\n  // If the resolved file is a typescript file in an internal package, try to resolve the intermediate.\n  if (filePath && sourceExtensions.includes(path.extname(filePath))) {\n    sourcePath = filePath;\n    filePath = isInternal ? sourceToIntermediatePath(filePath) : undefined;\n  }\n\n  // If we haven't resolved a sourcePath, try to resolve it from the intermediate.\n  if (isInternal && filePath && !sourcePath) {\n    const ext = path.extname(filePath);\n    const isJavaScriptExt = javascriptExtensions.includes(ext);\n\n    if (isJavaScriptExt) {\n      // Not a TS file, but a JS file. Try to find the source.\n      sourcePath = intermediateToSourcePath(filePath, packagePath);\n\n      // If we couldn't find a TS file, clear sourcePath.\n      if (sourcePath === filePath) {\n        sourcePath = undefined;\n      }\n    }\n  }\n\n  // Try to resolve the typesPath\n  if (sourcePath && filePath) {\n    typesPath = filePath.replace(/\\.js$/, '.d.ts');\n\n    if (!isInternal && !isFileSync(path.join(packagePath, typesPath))) {\n      typesPath = undefined;\n    }\n  }\n\n  if (typesPath) {\n    result.typesPath = normalizeRelativePath(typesPath);\n  }\n\n  if (filePath) {\n    result.filePath = normalizeRelativePath(filePath);\n  }\n\n  if (sourcePath) {\n    result.sourcePath = normalizeRelativePath(sourcePath);\n  }\n\n  return result;\n}\n"]}

package/lib/findPackage.js

@@ -18,7 +18,7 @@ export async function findPackage(options, context) {
             // realpathSync.native is faster than either realpathSync or realpath.
             // https://github.com/microsoft/cloudpack/pull/2127#discussion_r1607070201
             realPath = realPathCache?.[resolvedPath] || fs.realpathSync.native(resolvedPath);
-            definition = await packages.get(realPath, { importerContext });
+            definition = await packages.tryGet(realPath, { importerContext });
         }
         catch (e) {
             // Ignore errors and keep looking.

package/lib/findPackage.js.map

@@ -1 +1 @@
-{"version":3,"file":"findPackage.js","sourceRoot":"","sources":["../src/findPackage.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AAGpB;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,OAkBC,EACD,OAEC;IAED,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,SAAS,EAAE,eAAe,EAAE,aAAa,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC;IAC7F,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAE7B,IAAI,WAAW,GAAG,SAAS,CAAC;IAC5B,MAAM,aAAa,GAAG,0BAA0B,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAEnE,GAAG,CAAC;QACF,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;QAC5E,IAAI,UAAmC,CAAC;QACxC,IAAI,QAA4B,CAAC;QAEjC,IAAI,CAAC;YACH,kDAAkD;YAClD,sEAAsE;YACtE,0EAA0E;YAC1E,QAAQ,GAAG,aAAa,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YACjF,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC;QACjE,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,kCAAkC;QACpC,CAAC;QAED,IAAI,QAAQ,IAAI,UAAU,EAAE,CAAC;YAC3B,aAAa,CAAC,YAAY,CAAC,GAAG,QAAQ,CAAC;YACvC,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;QAC/C,CAAC;QAED,mDAAmD;QACnD,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAExC,oDAAoD;QACpD,gGAAgG;QAChG,yFAAyF;QACzF,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACjE,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC1C,CAAC;QAED,yCAAyC;QACzC,IAAI,WAAW,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;YACzC,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC,QAAQ,CAAC,CAAC,QAAQ,IAAI,WAAW,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,WAAW,EAAE;IAE5G,OAAO,SAAS,CAAC;AACnB,CAAC","sourcesContent":["import path from 'path';\nimport fs from 'fs';\nimport type { PackageDefinitionsCache, PackageImporterContext, PackageJson } from '@ms-cloudpack/common-types';\n\n/**\n * Find the package.json contents for `dependencyName`, searching up under `node_modules` folders\n * starting at `startPath` and ending at `rootPath` (usually the git root) or the filesystem root.\n */\nexport async function findPackage(\n  options: {\n    /**\n     * Dependency name as specified in the parent's deps and installed in `node_modules`.\n     * (This is usually the actual name, except for renamed non-semver deps.)\n     */\n    dependencyName: string;\n    /** Start searching up from the `node_modules` of this folder. */\n    startPath: string;\n    /** Context in which `dependencyName` is imported. */\n    importerContext?: PackageImporterContext;\n    /** Stop searching at this path (usually the git root). Defaults to filesystem root. */\n    rootPath?: string;\n    /**\n     * Cache of realpath results (improves perf, particularly on Windows).\n     * As of writing, this is scoped to a `findPackagesFromPath` call.\n     * (see https://github.com/microsoft/cloudpack/pull/2184)\n     */\n    realPathCache?: Record<string, string | undefined>;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n  },\n): Promise<{ packagePath: string; definition: PackageJson } | undefined> {\n  const { dependencyName, rootPath, startPath, importerContext, realPathCache = {} } = options;\n  const { packages } = context;\n\n  let packagePath = startPath;\n  const isStoreLayout = /[\\\\/]\\.(pnpm|store)[\\\\/]/.test(packagePath);\n\n  do {\n    const resolvedPath = path.join(packagePath, 'node_modules', dependencyName);\n    let definition: PackageJson | undefined;\n    let realPath: string | undefined;\n\n    try {\n      // Get the realpath in case of a symlinked layout.\n      // realpathSync.native is faster than either realpathSync or realpath.\n      // https://github.com/microsoft/cloudpack/pull/2127#discussion_r1607070201\n      realPath = realPathCache?.[resolvedPath] || fs.realpathSync.native(resolvedPath);\n      definition = await packages.get(realPath, { importerContext });\n    } catch (e) {\n      // Ignore errors and keep looking.\n    }\n\n    if (realPath && definition) {\n      realPathCache[resolvedPath] = realPath;\n      return { packagePath: realPath, definition };\n    }\n\n    // We haven't found it. Try to move up a directory.\n    packagePath = path.dirname(packagePath);\n\n    // If we moved up into a scope folder, skip over it.\n    // Exception: in a manager using a store layout, packages starting with @ are NOT scope folders;\n    // e.g. @foo/bar will be in a folder like @foo-bar-npm-1.2.3-abcdef1234 or @foo-bar@1.2.3\n    if (!isStoreLayout && path.basename(packagePath).startsWith('@')) {\n      packagePath = path.dirname(packagePath);\n    }\n\n    // Skip over nested node_modules folders.\n    if (packagePath.endsWith('node_modules')) {\n      packagePath = path.dirname(packagePath);\n    }\n  } while ((!rootPath || packagePath.length >= rootPath.length) && path.dirname(packagePath) !== packagePath);\n\n  return undefined;\n}\n"]}
+{"version":3,"file":"findPackage.js","sourceRoot":"","sources":["../src/findPackage.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AAGpB;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,OAkBC,EACD,OAEC;IAED,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,SAAS,EAAE,eAAe,EAAE,aAAa,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC;IAC7F,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAE7B,IAAI,WAAW,GAAG,SAAS,CAAC;IAC5B,MAAM,aAAa,GAAG,0BAA0B,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAEnE,GAAG,CAAC;QACF,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;QAC5E,IAAI,UAAmC,CAAC;QACxC,IAAI,QAA4B,CAAC;QAEjC,IAAI,CAAC;YACH,kDAAkD;YAClD,sEAAsE;YACtE,0EAA0E;YAC1E,QAAQ,GAAG,aAAa,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YACjF,UAAU,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC;QACpE,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,kCAAkC;QACpC,CAAC;QAED,IAAI,QAAQ,IAAI,UAAU,EAAE,CAAC;YAC3B,aAAa,CAAC,YAAY,CAAC,GAAG,QAAQ,CAAC;YACvC,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;QAC/C,CAAC;QAED,mDAAmD;QACnD,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAExC,oDAAoD;QACpD,gGAAgG;QAChG,yFAAyF;QACzF,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACjE,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC1C,CAAC;QAED,yCAAyC;QACzC,IAAI,WAAW,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;YACzC,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC,QAAQ,CAAC,CAAC,QAAQ,IAAI,WAAW,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,WAAW,EAAE;IAE5G,OAAO,SAAS,CAAC;AACnB,CAAC","sourcesContent":["import path from 'path';\nimport fs from 'fs';\nimport type { PackageDefinitionsCache, PackageImporterContext, PackageJson } from '@ms-cloudpack/common-types';\n\n/**\n * Find the package.json contents for `dependencyName`, searching up under `node_modules` folders\n * starting at `startPath` and ending at `rootPath` (usually the git root) or the filesystem root.\n */\nexport async function findPackage(\n  options: {\n    /**\n     * Dependency name as specified in the parent's deps and installed in `node_modules`.\n     * (This is usually the actual name, except for renamed non-semver deps.)\n     */\n    dependencyName: string;\n    /** Start searching up from the `node_modules` of this folder. */\n    startPath: string;\n    /** Context in which `dependencyName` is imported. */\n    importerContext?: PackageImporterContext;\n    /** Stop searching at this path (usually the git root). Defaults to filesystem root. */\n    rootPath?: string;\n    /**\n     * Cache of realpath results (improves perf, particularly on Windows).\n     * As of writing, this is scoped to a `findPackagesFromPath` call.\n     * (see https://github.com/microsoft/cloudpack/pull/2184)\n     */\n    realPathCache?: Record<string, string | undefined>;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n  },\n): Promise<{ packagePath: string; definition: PackageJson } | undefined> {\n  const { dependencyName, rootPath, startPath, importerContext, realPathCache = {} } = options;\n  const { packages } = context;\n\n  let packagePath = startPath;\n  const isStoreLayout = /[\\\\/]\\.(pnpm|store)[\\\\/]/.test(packagePath);\n\n  do {\n    const resolvedPath = path.join(packagePath, 'node_modules', dependencyName);\n    let definition: PackageJson | undefined;\n    let realPath: string | undefined;\n\n    try {\n      // Get the realpath in case of a symlinked layout.\n      // realpathSync.native is faster than either realpathSync or realpath.\n      // https://github.com/microsoft/cloudpack/pull/2127#discussion_r1607070201\n      realPath = realPathCache?.[resolvedPath] || fs.realpathSync.native(resolvedPath);\n      definition = await packages.tryGet(realPath, { importerContext });\n    } catch (e) {\n      // Ignore errors and keep looking.\n    }\n\n    if (realPath && definition) {\n      realPathCache[resolvedPath] = realPath;\n      return { packagePath: realPath, definition };\n    }\n\n    // We haven't found it. Try to move up a directory.\n    packagePath = path.dirname(packagePath);\n\n    // If we moved up into a scope folder, skip over it.\n    // Exception: in a manager using a store layout, packages starting with @ are NOT scope folders;\n    // e.g. @foo/bar will be in a folder like @foo-bar-npm-1.2.3-abcdef1234 or @foo-bar@1.2.3\n    if (!isStoreLayout && path.basename(packagePath).startsWith('@')) {\n      packagePath = path.dirname(packagePath);\n    }\n\n    // Skip over nested node_modules folders.\n    if (packagePath.endsWith('node_modules')) {\n      packagePath = path.dirname(packagePath);\n    }\n  } while ((!rootPath || packagePath.length >= rootPath.length) && path.dirname(packagePath) !== packagePath);\n\n  return undefined;\n}\n"]}

package/lib/findPackageOutputPaths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findPackageOutputPaths.d.ts","sourceRoot":"","sources":["../src/findPackageOutputPaths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAK1E;;;;;;;;;;;;GAYG;AACH,wBAAsB,sBAAsB,CAC1C,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE;IAAE,QAAQ,EAAE,uBAAuB,CAAA;CAAE,GAC7C,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAAC,CA2E3D"}
+{"version":3,"file":"findPackageOutputPaths.d.ts","sourceRoot":"","sources":["../src/findPackageOutputPaths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAK1E;;;;;;;;;;;;GAYG;AACH,wBAAsB,sBAAsB,CAC1C,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE;IAAE,QAAQ,EAAE,uBAAuB,CAAA;CAAE,GAC7C,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAAC,CAuE3D"}

package/lib/findPackageOutputPaths.js

@@ -15,11 +15,8 @@ import path from 'path';
  * If there is not enough info to conclude the output paths, return undefined.
  */
 export async function findPackageOutputPaths(packagePath, context) {
-    const packageDefinition = await context.packages.get(packagePath, { disableTransforms: true });
-    if (!packageDefinition) {
-        throw new Error(`Package definition not found for ${packagePath}`);
-    }
-    const { exports, main, module } = packageDefinition;
+    const originalDefinition = await context.packages.get(packagePath, { disableTransforms: true });
+    const { exports, main, module } = originalDefinition;
     // If an exports map is provided, or we're missing main or module, don't
     // try and derive an output path. We don't have enough information.
     if (exports || !main || !module || main === module) {

package/lib/findPackageOutputPaths.js.map

@@ -1 +1 @@
-{"version":3,"file":"findPackageOutputPaths.js","sourceRoot":"","sources":["../src/findPackageOutputPaths.ts"],"names":[],"mappings":"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","sourcesContent":["import { type PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport { normalizeRelativePath, slash } from '@ms-cloudpack/path-string-parsing';\nimport { isFileSync, isFolderSync } from '@ms-cloudpack/path-utilities';\nimport path from 'path';\n\n/**\n * Given a package path, read the package definition's main and modules, if present,\n * to uncover cjs and esm output paths. If both main and module are present, and they\n * point to the same filename in distinct paths, we can infer the common ancestor to\n * derive cjs/esm output paths. This is particularly useful in getCandidates, where\n * we need to translate a request import file path into a physical file.\n *\n * Paths are normalized - slashes will be forward, paths are relative and start with a period,\n * and they will always end with a trailing slash to make it easy to replace within\n * findCandidates.\n *\n * If there is not enough info to conclude the output paths, return undefined.\n */\nexport async function findPackageOutputPaths(\n  packagePath: string,\n  context: { packages: PackageDefinitionsCache },\n): Promise<{ cjsPath: string; esmPath: string } | undefined> {\n  const packageDefinition = await context.packages.get(packagePath, { disableTransforms: true });\n\n  if (!packageDefinition) {\n    throw new Error(`Package definition not found for ${packagePath}`);\n  }\n\n  const { exports, main, module } = packageDefinition;\n\n  // If an exports map is provided, or we're missing main or module, don't\n  // try and derive an output path. We don't have enough information.\n  if (exports || !main || !module || main === module) {\n    return undefined;\n  }\n\n  // We should only attempt to find package output paths if main and module\n  // are filenames that have extensions.\n  const mainExt = path.extname(main);\n  const moduleExt = path.extname(module);\n\n  // If main/module have an extension, we need to remove the filename to get the folder.\n  let cjsPath = main;\n  let esmPath = module;\n\n  // If either are folders, we should assume we're looking for index.js within the folder.\n  if (!mainExt) {\n    if (isFolderSync(path.resolve(packagePath, main))) {\n      cjsPath = slash(path.join(main, 'index.js'));\n    } else if (isFileSync(path.resolve(packagePath, main + '.js'))) {\n      cjsPath = main + '.js';\n    }\n  }\n  if (!moduleExt) {\n    if (isFolderSync(path.resolve(packagePath, module))) {\n      esmPath = slash(path.join(module, 'index.js'));\n    } else if (isFileSync(path.resolve(packagePath, module + '.js'))) {\n      esmPath = module + '.js';\n    }\n  }\n\n  // If the filenames don't match (ignoring extensions because of cjs vs mjs), we could\n  // be in an asymmetrical case (e.g. main: /dist/foo.js vs module: /dist-esm/src/bar.js)\n  if (path.basename(cjsPath, mainExt) !== path.basename(esmPath, moduleExt)) {\n    return undefined;\n  }\n\n  // Ignore the filenames (which might differ on extension, js vs cjs vs mjs.)\n  cjsPath = path.dirname(cjsPath);\n  esmPath = path.dirname(esmPath);\n\n  // They are different - strip off the common paths at the end to derive\n  // the unique cjs/esm output paths.\n  // For example, if main is `lib/cjs/foo/bar/index.js' and module is `lib/esm/foo/bar/index.js`,\n  // then the cjsOutputPath is `lib/cjs` and the esmOutputPath is `lib/esm`.\n  const mainParts = cjsPath?.split('/');\n  const moduleParts = esmPath?.split('/');\n  const commonParts = [];\n\n  while (\n    mainParts.length &&\n    moduleParts.length &&\n    mainParts[mainParts.length - 1] === moduleParts[moduleParts.length - 1]\n  ) {\n    commonParts.unshift(mainParts.pop());\n    moduleParts.pop();\n  }\n\n  cjsPath = normalizeRelativePath(mainParts.length ? mainParts.join('/') : cjsPath || '') + '/';\n  esmPath = normalizeRelativePath(moduleParts.length ? moduleParts.join('/') : esmPath || '') + '/';\n\n  if (cjsPath === esmPath || cjsPath === './' || esmPath === './') {\n    return undefined;\n  }\n\n  return { cjsPath, esmPath };\n}\n"]}
+{"version":3,"file":"findPackageOutputPaths.js","sourceRoot":"","sources":["../src/findPackageOutputPaths.ts"],"names":[],"mappings":"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","sourcesContent":["import { type PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport { normalizeRelativePath, slash } from '@ms-cloudpack/path-string-parsing';\nimport { isFileSync, isFolderSync } from '@ms-cloudpack/path-utilities';\nimport path from 'path';\n\n/**\n * Given a package path, read the package definition's main and modules, if present,\n * to uncover cjs and esm output paths. If both main and module are present, and they\n * point to the same filename in distinct paths, we can infer the common ancestor to\n * derive cjs/esm output paths. This is particularly useful in getCandidates, where\n * we need to translate a request import file path into a physical file.\n *\n * Paths are normalized - slashes will be forward, paths are relative and start with a period,\n * and they will always end with a trailing slash to make it easy to replace within\n * findCandidates.\n *\n * If there is not enough info to conclude the output paths, return undefined.\n */\nexport async function findPackageOutputPaths(\n  packagePath: string,\n  context: { packages: PackageDefinitionsCache },\n): Promise<{ cjsPath: string; esmPath: string } | undefined> {\n  const originalDefinition = await context.packages.get(packagePath, { disableTransforms: true });\n\n  const { exports, main, module } = originalDefinition;\n\n  // If an exports map is provided, or we're missing main or module, don't\n  // try and derive an output path. We don't have enough information.\n  if (exports || !main || !module || main === module) {\n    return undefined;\n  }\n\n  // We should only attempt to find package output paths if main and module\n  // are filenames that have extensions.\n  const mainExt = path.extname(main);\n  const moduleExt = path.extname(module);\n\n  // If main/module have an extension, we need to remove the filename to get the folder.\n  let cjsPath = main;\n  let esmPath = module;\n\n  // If either are folders, we should assume we're looking for index.js within the folder.\n  if (!mainExt) {\n    if (isFolderSync(path.resolve(packagePath, main))) {\n      cjsPath = slash(path.join(main, 'index.js'));\n    } else if (isFileSync(path.resolve(packagePath, main + '.js'))) {\n      cjsPath = main + '.js';\n    }\n  }\n  if (!moduleExt) {\n    if (isFolderSync(path.resolve(packagePath, module))) {\n      esmPath = slash(path.join(module, 'index.js'));\n    } else if (isFileSync(path.resolve(packagePath, module + '.js'))) {\n      esmPath = module + '.js';\n    }\n  }\n\n  // If the filenames don't match (ignoring extensions because of cjs vs mjs), we could\n  // be in an asymmetrical case (e.g. main: /dist/foo.js vs module: /dist-esm/src/bar.js)\n  if (path.basename(cjsPath, mainExt) !== path.basename(esmPath, moduleExt)) {\n    return undefined;\n  }\n\n  // Ignore the filenames (which might differ on extension, js vs cjs vs mjs.)\n  cjsPath = path.dirname(cjsPath);\n  esmPath = path.dirname(esmPath);\n\n  // They are different - strip off the common paths at the end to derive\n  // the unique cjs/esm output paths.\n  // For example, if main is `lib/cjs/foo/bar/index.js' and module is `lib/esm/foo/bar/index.js`,\n  // then the cjsOutputPath is `lib/cjs` and the esmOutputPath is `lib/esm`.\n  const mainParts = cjsPath?.split('/');\n  const moduleParts = esmPath?.split('/');\n  const commonParts = [];\n\n  while (\n    mainParts.length &&\n    moduleParts.length &&\n    mainParts[mainParts.length - 1] === moduleParts[moduleParts.length - 1]\n  ) {\n    commonParts.unshift(mainParts.pop());\n    moduleParts.pop();\n  }\n\n  cjsPath = normalizeRelativePath(mainParts.length ? mainParts.join('/') : cjsPath || '') + '/';\n  esmPath = normalizeRelativePath(moduleParts.length ? moduleParts.join('/') : esmPath || '') + '/';\n\n  if (cjsPath === esmPath || cjsPath === './' || esmPath === './') {\n    return undefined;\n  }\n\n  return { cjsPath, esmPath };\n}\n"]}

package/lib/getExportsMap.d.ts

@@ -1,4 +1,12 @@
 import type { CloudpackConfig, PackageDefinitionsCache, PackageJsonExports } from '@ms-cloudpack/common-types';
+/**
+ * Get a package's provided exports map, or create one based on other entry info and the
+ * package structure as a fallback.
+ *
+ * NOTE: Unless `disableTransforms` is true, this will use the cached exports map that was created
+ * by `createPackageSettingsTransform`. (Exception is tests within `package-utilities` or other
+ * contexts that didn't use `createPackageDefinitions`.)
+ */
 export declare function getExportsMap(options: {
     packagePath: string;
     disableTransforms?: boolean;

package/lib/getExportsMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getExportsMap.d.ts","sourceRoot":"","sources":["../src/getExportsMap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAG/G,wBAAsB,aAAa,CACjC,OAAO,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAAE,EAC7D,OAAO,EAAE;IAAE,QAAQ,EAAE,uBAAuB,CAAC;IAAC,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;CAAE,GACxF,OAAO,CAAC,kBAAkB,CAAC,CAY7B"}
+{"version":3,"file":"getExportsMap.d.ts","sourceRoot":"","sources":["../src/getExportsMap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAG/G;;;;;;;GAOG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAAE,EAC7D,OAAO,EAAE;IAAE,QAAQ,EAAE,uBAAuB,CAAC;IAAC,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;CAAE,GACxF,OAAO,CAAC,kBAAkB,CAAC,CAU7B"}

package/lib/getExportsMap.js

@@ -1,12 +1,19 @@
 import { createExportsMap } from './createExportsMap.js';
+/**
+ * Get a package's provided exports map, or create one based on other entry info and the
+ * package structure as a fallback.
+ *
+ * NOTE: Unless `disableTransforms` is true, this will use the cached exports map that was created
+ * by `createPackageSettingsTransform`. (Exception is tests within `package-utilities` or other
+ * contexts that didn't use `createPackageDefinitions`.)
+ */
 export async function getExportsMap(options, context) {
     const { packagePath } = options;
     const { packages } = context;
-    const packageDefinition = await packages.get(packagePath, options);
-    if (!packageDefinition) {
-        throw new Error(`Package definition not found for ${packagePath}`);
+    const definition = await packages.get(packagePath, options);
+    if (definition.exports !== undefined) {
+        return definition.exports;
     }
-    const { exports } = packageDefinition;
-    return exports === undefined ? await createExportsMap(options, context) : exports;
+    return createExportsMap(options, context);
 }
 //# sourceMappingURL=getExportsMap.js.map

package/lib/getExportsMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"getExportsMap.js","sourceRoot":"","sources":["../src/getExportsMap.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAA6D,EAC7D,OAAyF;IAEzF,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAChC,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAC7B,MAAM,iBAAiB,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAEnE,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,oCAAoC,WAAW,EAAE,CAAC,CAAC;IACrE,CAAC;IAED,MAAM,EAAE,OAAO,EAAE,GAAG,iBAAiB,CAAC;IAEtC,OAAO,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;AACpF,CAAC","sourcesContent":["import type { CloudpackConfig, PackageDefinitionsCache, PackageJsonExports } from '@ms-cloudpack/common-types';\nimport { createExportsMap } from './createExportsMap.js';\n\nexport async function getExportsMap(\n  options: { packagePath: string; disableTransforms?: boolean },\n  context: { packages: PackageDefinitionsCache; config: Pick<CloudpackConfig, 'features'> },\n): Promise<PackageJsonExports> {\n  const { packagePath } = options;\n  const { packages } = context;\n  const packageDefinition = await packages.get(packagePath, options);\n\n  if (!packageDefinition) {\n    throw new Error(`Package definition not found for ${packagePath}`);\n  }\n\n  const { exports } = packageDefinition;\n\n  return exports === undefined ? await createExportsMap(options, context) : exports;\n}\n"]}
+{"version":3,"file":"getExportsMap.js","sourceRoot":"","sources":["../src/getExportsMap.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAA6D,EAC7D,OAAyF;IAEzF,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAChC,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAC7B,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAE5D,IAAI,UAAU,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QACrC,OAAO,UAAU,CAAC,OAAO,CAAC;IAC5B,CAAC;IAED,OAAO,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AAC5C,CAAC","sourcesContent":["import type { CloudpackConfig, PackageDefinitionsCache, PackageJsonExports } from '@ms-cloudpack/common-types';\nimport { createExportsMap } from './createExportsMap.js';\n\n/**\n * Get a package's provided exports map, or create one based on other entry info and the\n * package structure as a fallback.\n *\n * NOTE: Unless `disableTransforms` is true, this will use the cached exports map that was created\n * by `createPackageSettingsTransform`. (Exception is tests within `package-utilities` or other\n * contexts that didn't use `createPackageDefinitions`.)\n */\nexport async function getExportsMap(\n  options: { packagePath: string; disableTransforms?: boolean },\n  context: { packages: PackageDefinitionsCache; config: Pick<CloudpackConfig, 'features'> },\n): Promise<PackageJsonExports> {\n  const { packagePath } = options;\n  const { packages } = context;\n  const definition = await packages.get(packagePath, options);\n\n  if (definition.exports !== undefined) {\n    return definition.exports;\n  }\n\n  return createExportsMap(options, context);\n}\n"]}

package/lib/isExternalPackage.d.ts

@@ -1,2 +1,6 @@
+/**
+ * Returns whether the package is external, based on whether the given path contains a
+ * `node_modules` segment (without any realpath checks).
+ */
 export declare function isExternalPackage(packagePath: string): boolean;
 //# sourceMappingURL=isExternalPackage.d.ts.map

package/lib/isExternalPackage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isExternalPackage.d.ts","sourceRoot":"","sources":["../src/isExternalPackage.ts"],"names":[],"mappings":"AAEA,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAQ9D"}
+{"version":3,"file":"isExternalPackage.d.ts","sourceRoot":"","sources":["../src/isExternalPackage.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAM9D"}

package/lib/isExternalPackage.js

@@ -1,8 +1,10 @@
-import { slash } from '@ms-cloudpack/path-string-parsing';
+/**
+ * Returns whether the package is external, based on whether the given path contains a
+ * `node_modules` segment (without any realpath checks).
+ */
 export function isExternalPackage(packagePath) {
     if (packagePath) {
-        const parts = slash(packagePath).split('/');
-        return parts.includes('node_modules');
+        return /[\\/]node_modules[\\/]/.test(packagePath);
     }
     return false;
 }

package/lib/isExternalPackage.js.map

@@ -1 +1 @@
-{"version":3,"file":"isExternalPackage.js","sourceRoot":"","sources":["../src/isExternalPackage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAE1D,MAAM,UAAU,iBAAiB,CAAC,WAAmB;IACnD,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE5C,OAAO,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IACxC,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC","sourcesContent":["import { slash } from '@ms-cloudpack/path-string-parsing';\n\nexport function isExternalPackage(packagePath: string): boolean {\n  if (packagePath) {\n    const parts = slash(packagePath).split('/');\n\n    return parts.includes('node_modules');\n  }\n\n  return false;\n}\n"]}
+{"version":3,"file":"isExternalPackage.js","sourceRoot":"","sources":["../src/isExternalPackage.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAAC,WAAmB;IACnD,IAAI,WAAW,EAAE,CAAC;QAChB,OAAO,wBAAwB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACpD,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC","sourcesContent":["/**\n * Returns whether the package is external, based on whether the given path contains a\n * `node_modules` segment (without any realpath checks).\n */\nexport function isExternalPackage(packagePath: string): boolean {\n  if (packagePath) {\n    return /[\\\\/]node_modules[\\\\/]/.test(packagePath);\n  }\n\n  return false;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/package-utilities",
-  "version": "9.0.5",
+  "version": "10.0.1",
   "description": "Utilities for resolving/parsing packages and their imports.",
   "license": "MIT",
   "type": "module",
@@ -14,11 +14,11 @@
     }
   },
   "dependencies": {
-    "@ms-cloudpack/common-types": "^0.18.0",
+    "@ms-cloudpack/common-types": "^0.19.1",
     "@ms-cloudpack/json-utilities": "^0.1.7",
-    "@ms-cloudpack/package-overrides": "^0.9.22",
+    "@ms-cloudpack/package-overrides": "^0.9.24",
     "@ms-cloudpack/path-string-parsing": "^1.2.4",
-    "@ms-cloudpack/path-utilities": "^2.7.36",
+    "@ms-cloudpack/path-utilities": "^2.7.38",
     "@ms-cloudpack/task-reporter": "^0.14.4",
     "acorn": "^8.11.2",
     "acorn-walk": "^8.2.1",