@ms-cloudpack/package-utilities 5.1.12 → 5.1.14

package/lib/PackageDefinitions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PackageDefinitions.d.ts","sourceRoot":"","sources":["../src/PackageDefinitions.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAIpH,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;IAClF,OAAO,CAAC,OAAO,CAA6B;IAE5C;;;;;OAKG;gBACS,eAAe,GAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAM,EAAE,MAAM,CAAC,EAAE,OAAO;IAQzE,GAAG,CACP,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAC;QAAC,iBAAiB,CAAC,EAAE,OAAO,CAAA;KAAE,GAC3D,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAwCnC;;;;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;;;;OAIG;IACG,OAAO,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA2BnD;;;OAGG;IACH,UAAU,CAAC,WAAW,EAAE,MAAM;CAG/B"}
+{"version":3,"file":"PackageDefinitions.d.ts","sourceRoot":"","sources":["../src/PackageDefinitions.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAIpH,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;IAClF,OAAO,CAAC,OAAO,CAAsB;IAErC;;;;;OAKG;gBACS,eAAe,GAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAM,EAAE,MAAM,CAAC,EAAE,OAAO;IASzE,GAAG,CACP,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAC;QAAC,iBAAiB,CAAC,EAAE,OAAO,CAAA;KAAE,GAC3D,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAwCnC;;;;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;;;;OAIG;IACG,OAAO,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA2BnD;;;OAGG;IACH,UAAU,CAAC,WAAW,EAAE,MAAM;CAG/B"}

package/lib/PackageDefinitions.js

@@ -12,12 +12,12 @@ export class PackageDefinitions {
      */
     constructor(definitionCache = {}, config) {
         this._transforms = [];
-        this._hashes = new Map();
         this._definitions = definitionCache;
         this._transformedDefinitions = {};
         this._config = config;
         this._transforms = [applyOverrides];
         this._transformFactories = [];
+        this._hashes = new Map();
     }
     async get(packagePath, options) {
         let definition = this._definitions[packagePath];

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 { applyOverrides } from '@ms-cloudpack/package-overrides';\nimport { readJson } from '@ms-cloudpack/json-utilities';\nimport type { PackageJson, PackageDefinitionTransform, PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport hash from 'object-hash';\nimport { isExternalPackage } from './isExternalPackage.js';\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  private _hashes = new Map<string, string>();\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 = [applyOverrides];\n    this._transformFactories = [];\n  }\n\n  async get(\n    packagePath: string,\n    options?: { refresh?: boolean; disableTransforms?: boolean },\n  ): Promise<PackageJson | undefined> {\n    let definition: PackageJson | undefined = this._definitions[packagePath];\n    let transformedDefinition: PackageJson | undefined = this._transformedDefinitions[packagePath];\n    const { refresh, disableTransforms } = 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(packagePath, 'package.json'));\n\n      if (!definition) {\n        return undefined;\n      }\n\n      this._definitions[packagePath] = definition;\n    }\n\n    // If we don't want to skip the transform, transform the definition.\n    if (!disableTransforms && (!transformedDefinition || refresh)) {\n      for (const transform of this._transforms) {\n        transformedDefinition =\n          (await transform(transformedDefinition || definition, packagePath, this)) || transformedDefinition;\n      }\n\n      this._transformedDefinitions[packagePath] = transformedDefinition;\n    }\n\n    return (!disableTransforms && transformedDefinition) || definition;\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 = [applyOverrides, ...this._transformFactories.map((factory) => factory(newConfig))];\n    }\n  }\n\n  /**\n   * Gets the hash for a given package path. This is useful for caching, to determine if the package has changed.\n   * @param packagePath - The package path to get the hash for.\n   * @returns The hash for the package.\n   */\n  async getHash(packagePath: string): Promise<string> {\n    if (this._hashes.has(packagePath)) {\n      return this._hashes.get(packagePath) as string;\n    }\n\n    const definition = await this.get(packagePath);\n    if (!definition) {\n      throw new Error(`Package definition (package.json) missing or invalid at \"${packagePath}\"`);\n    }\n\n    const { name, version } = definition;\n    if (!name) {\n      throw new Error(`Package definition (package.json) missing name at \"${packagePath}\"`);\n    }\n\n    const isExternal = isExternalPackage(packagePath);\n    const bundleId = hash({\n      name,\n      ...definition,\n      version: (isExternal ? version : packagePath) || packagePath,\n    });\n\n    this._hashes.set(packagePath, bundleId);\n\n    return bundleId;\n  }\n\n  /**\n   * Removes the hash for a given package path.\n   * @param packagePath - The package path to remove the hash for.\n   */\n  removeHash(packagePath: string) {\n    this._hashes.delete(packagePath);\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 { applyOverrides } from '@ms-cloudpack/package-overrides';\nimport { readJson } from '@ms-cloudpack/json-utilities';\nimport type { PackageJson, PackageDefinitionTransform, PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport hash from 'object-hash';\nimport { isExternalPackage } from './isExternalPackage.js';\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  private _hashes: Map<string, string>;\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 = [applyOverrides];\n    this._transformFactories = [];\n    this._hashes = new Map<string, string>();\n  }\n\n  async get(\n    packagePath: string,\n    options?: { refresh?: boolean; disableTransforms?: boolean },\n  ): Promise<PackageJson | undefined> {\n    let definition: PackageJson | undefined = this._definitions[packagePath];\n    let transformedDefinition: PackageJson | undefined = this._transformedDefinitions[packagePath];\n    const { refresh, disableTransforms } = 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(packagePath, 'package.json'));\n\n      if (!definition) {\n        return undefined;\n      }\n\n      this._definitions[packagePath] = definition;\n    }\n\n    // If we don't want to skip the transform, transform the definition.\n    if (!disableTransforms && (!transformedDefinition || refresh)) {\n      for (const transform of this._transforms) {\n        transformedDefinition =\n          (await transform(transformedDefinition || definition, packagePath, this)) || transformedDefinition;\n      }\n\n      this._transformedDefinitions[packagePath] = transformedDefinition;\n    }\n\n    return (!disableTransforms && transformedDefinition) || definition;\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 = [applyOverrides, ...this._transformFactories.map((factory) => factory(newConfig))];\n    }\n  }\n\n  /**\n   * Gets the hash for a given package path. This is useful for caching, to determine if the package has changed.\n   * @param packagePath - The package path to get the hash for.\n   * @returns The hash for the package.\n   */\n  async getHash(packagePath: string): Promise<string> {\n    if (this._hashes.has(packagePath)) {\n      return this._hashes.get(packagePath) as string;\n    }\n\n    const definition = await this.get(packagePath);\n    if (!definition) {\n      throw new Error(`Package definition (package.json) missing or invalid at \"${packagePath}\"`);\n    }\n\n    const { name, version } = definition;\n    if (!name) {\n      throw new Error(`Package definition (package.json) missing name at \"${packagePath}\"`);\n    }\n\n    const isExternal = isExternalPackage(packagePath);\n    const bundleId = hash({\n      name,\n      ...definition,\n      version: (isExternal ? version : packagePath) || packagePath,\n    });\n\n    this._hashes.set(packagePath, bundleId);\n\n    return bundleId;\n  }\n\n  /**\n   * Removes the hash for a given package path.\n   * @param packagePath - The package path to remove the hash for.\n   */\n  removeHash(packagePath: string) {\n    this._hashes.delete(packagePath);\n  }\n}\n"]}

package/lib/PackageImportPaths.d.ts

@@ -0,0 +1,27 @@
+/**
+ * A class for storing the import paths for a given package path.
+ * This is used to cache the import paths for a given package path, so that they don't need to be resolved again.
+ * This is useful for performance, as resolving import paths can be expensive.
+ */
+export declare class PackageImportPaths {
+    private _importPaths;
+    constructor();
+    /**
+     * Adds an import path to the list of paths for a given package path.
+     * @param packagePath - The package path to add the path to.
+     * @param resolvedImportPath - The import path to add.
+     */
+    add(packagePath: string, resolvedImportPath: string): void;
+    /**
+     * Gets the list of import paths for a given package path.
+     * @param packagePath - The package path to get the paths for.
+     * @returns The list of import paths for the given package path.
+     */
+    get(packagePath: string): string[];
+    /**
+     * Clears the list of import paths for a given package path.
+     * @param packagePath - The package path to clear the import paths for.
+     */
+    clear(): void;
+}
+//# sourceMappingURL=PackageImportPaths.d.ts.map

package/lib/PackageImportPaths.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PackageImportPaths.d.ts","sourceRoot":"","sources":["../src/PackageImportPaths.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,YAAY,CAAwB;;IAM5C;;;;OAIG;IACH,GAAG,CAAC,WAAW,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG,IAAI;IAO1D;;;;OAIG;IACH,GAAG,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE;IAIlC;;;OAGG;IACH,KAAK,IAAI,IAAI;CAGd"}

package/lib/PackageImportPaths.js

@@ -0,0 +1,37 @@
+/**
+ * A class for storing the import paths for a given package path.
+ * This is used to cache the import paths for a given package path, so that they don't need to be resolved again.
+ * This is useful for performance, as resolving import paths can be expensive.
+ */
+export class PackageImportPaths {
+    constructor() {
+        this._importPaths = new Map();
+    }
+    /**
+     * Adds an import path to the list of paths for a given package path.
+     * @param packagePath - The package path to add the path to.
+     * @param resolvedImportPath - The import path to add.
+     */
+    add(packagePath, resolvedImportPath) {
+        if (!this._importPaths.has(packagePath)) {
+            this._importPaths.set(packagePath, []);
+        }
+        this._importPaths.get(packagePath)?.push(resolvedImportPath);
+    }
+    /**
+     * Gets the list of import paths for a given package path.
+     * @param packagePath - The package path to get the paths for.
+     * @returns The list of import paths for the given package path.
+     */
+    get(packagePath) {
+        return this._importPaths.get(packagePath) ?? [];
+    }
+    /**
+     * Clears the list of import paths for a given package path.
+     * @param packagePath - The package path to clear the import paths for.
+     */
+    clear() {
+        this._importPaths.clear();
+    }
+}
+//# sourceMappingURL=PackageImportPaths.js.map

package/lib/PackageImportPaths.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PackageImportPaths.js","sourceRoot":"","sources":["../src/PackageImportPaths.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,OAAO,kBAAkB;IAG7B;QACE,IAAI,CAAC,YAAY,GAAG,IAAI,GAAG,EAAoB,CAAC;IAClD,CAAC;IAED;;;;OAIG;IACH,GAAG,CAAC,WAAmB,EAAE,kBAA0B;QACjD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;YACvC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;SACxC;QACD,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAC/D,CAAC;IAED;;;;OAIG;IACH,GAAG,CAAC,WAAmB;QACrB,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;IAClD,CAAC;IAED;;;OAGG;IACH,KAAK;QACH,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;CACF","sourcesContent":["/**\n * A class for storing the import paths for a given package path.\n * This is used to cache the import paths for a given package path, so that they don't need to be resolved again.\n * This is useful for performance, as resolving import paths can be expensive.\n */\nexport class PackageImportPaths {\n  private _importPaths: Map<string, string[]>;\n\n  constructor() {\n    this._importPaths = new Map<string, string[]>();\n  }\n\n  /**\n   * Adds an import path to the list of paths for a given package path.\n   * @param packagePath - The package path to add the path to.\n   * @param resolvedImportPath - The import path to add.\n   */\n  add(packagePath: string, resolvedImportPath: string): void {\n    if (!this._importPaths.has(packagePath)) {\n      this._importPaths.set(packagePath, []);\n    }\n    this._importPaths.get(packagePath)?.push(resolvedImportPath);\n  }\n\n  /**\n   * Gets the list of import paths for a given package path.\n   * @param packagePath - The package path to get the paths for.\n   * @returns The list of import paths for the given package path.\n   */\n  get(packagePath: string): string[] {\n    return this._importPaths.get(packagePath) ?? [];\n  }\n\n  /**\n   * Clears the list of import paths for a given package path.\n   * @param packagePath - The package path to clear the import paths for.\n   */\n  clear(): void {\n    this._importPaths.clear();\n  }\n}\n"]}

package/lib/addImportMapHash.d.ts

@@ -0,0 +1,24 @@
+import type { ImportMap } from './createImportMap.js';
+import type { ResolveMap } from './types/ResolveMap.js';
+import type { PackageImportPaths } from './PackageImportPaths.js';
+/**
+ * Adds hash to import map for a package.
+ * @param packagePath Path to package
+ * @param importMap Import map to add hash to
+ * @param resolveMap Resolve map to use
+ * @param hash Hash to add
+ * @param context Context
+ */
+export declare function addImportMapHash(packageName: string, version: string, importMap: ImportMap | undefined, resolveMap: ResolveMap, hash: string, context: {
+    packageImportPaths: PackageImportPaths;
+}): void;
+/**
+ * Adds hash after name and version.
+ * If hash already exists, replaces it.
+ * @param url URL to add hash to
+ * @param packageUrl Package name and version
+ * @param hash Hash to add
+ * @returns URL with hash
+ */
+export declare function addHashUrl(url: string, packageUrl: string, hash: string): string;
+//# sourceMappingURL=addImportMapHash.d.ts.map

package/lib/addImportMapHash.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"addImportMapHash.d.ts","sourceRoot":"","sources":["../src/addImportMapHash.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,SAAS,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE;IAAE,kBAAkB,EAAE,kBAAkB,CAAA;CAAE,QAyCpD;AAED;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAmBhF"}

package/lib/addImportMapHash.js

@@ -0,0 +1,77 @@
+/**
+ * Adds hash to import map for a package.
+ * @param packagePath Path to package
+ * @param importMap Import map to add hash to
+ * @param resolveMap Resolve map to use
+ * @param hash Hash to add
+ * @param context Context
+ */
+export function addImportMapHash(packageName, version, importMap, resolveMap, hash, context) {
+    if (!importMap) {
+        return;
+    }
+    const { packageImportPaths } = context;
+    const resolveEntry = resolveMap[packageName];
+    if (!resolveEntry) {
+        throw new Error(`Could not find package ${packageName} in the resolve map.`);
+    }
+    if (version === resolveEntry.version) {
+        // Package is not scoped
+        const entry = resolveEntry;
+        const packageUrl = `${entry.name}@${entry.version}`;
+        const importPaths = packageImportPaths.get(entry.path);
+        importPaths.forEach((importPath) => {
+            importMap.imports[importPath] = addHashUrl(importMap.imports[importPath], packageUrl, hash);
+        });
+    }
+    else if (resolveEntry.scopedVersions?.[version] !== undefined && importMap.scopes) {
+        // Package is scoped
+        const entry = resolveEntry.scopedVersions?.[version];
+        if (!entry) {
+            throw new Error(`Could not find package ${packageName}@${version} in the resolve map.`);
+        }
+        const packageUrl = `${entry.name}@${entry.version}`;
+        const importPaths = packageImportPaths.get(entry.path);
+        const bundleServerUrl = new URL(Object.values(importMap.imports)[0]).origin;
+        for (const requiredById of Object.keys(entry.requiredBy)) {
+            const key = `${bundleServerUrl}/${requiredById}/`;
+            importPaths.forEach((importPath) => {
+                if (!importMap.scopes) {
+                    return;
+                }
+                importMap.scopes[key][importPath] = addHashUrl(importMap.scopes[key][importPath], packageUrl, hash);
+            });
+        }
+    }
+}
+/**
+ * Adds hash after name and version.
+ * If hash already exists, replaces it.
+ * @param url URL to add hash to
+ * @param packageUrl Package name and version
+ * @param hash Hash to add
+ * @returns URL with hash
+ */
+export function addHashUrl(url, packageUrl, hash) {
+    const search = url.indexOf(packageUrl);
+    if (search !== -1) {
+        const hashIndex = search + packageUrl.length;
+        const prefix = 'h-';
+        const pending = 'pending';
+        if (url.startsWith(prefix, hashIndex + 1)) {
+            // Replace hash if it already exists
+            if (url.startsWith(pending, hashIndex + prefix.length + 1)) {
+                url = url.slice(0, hashIndex) + `/h-${hash}` + url.slice(hashIndex + prefix.length + pending.length + 1);
+            }
+            else {
+                url = url.slice(0, hashIndex) + `/h-${hash}` + url.slice(hashIndex + hash.length + prefix.length + 1);
+            }
+        }
+        else {
+            // Add hash after name and version
+            url = url.slice(0, hashIndex) + `/h-${hash}` + url.slice(hashIndex);
+        }
+    }
+    return url;
+}
+//# sourceMappingURL=addImportMapHash.js.map

package/lib/addImportMapHash.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"addImportMapHash.js","sourceRoot":"","sources":["../src/addImportMapHash.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ImportMap } from './createImportMap.js';\nimport type { ResolveMap } from './types/ResolveMap.js';\nimport type { PackageImportPaths } from './PackageImportPaths.js';\n\n/**\n * Adds hash to import map for a package.\n * @param packagePath Path to package\n * @param importMap Import map to add hash to\n * @param resolveMap Resolve map to use\n * @param hash Hash to add\n * @param context Context\n */\nexport function addImportMapHash(\n  packageName: string,\n  version: string,\n  importMap: ImportMap | undefined,\n  resolveMap: ResolveMap,\n  hash: string,\n  context: { packageImportPaths: PackageImportPaths },\n) {\n  if (!importMap) {\n    return;\n  }\n\n  const { packageImportPaths } = context;\n\n  const resolveEntry = resolveMap[packageName];\n\n  if (!resolveEntry) {\n    throw new Error(`Could not find package ${packageName} in the resolve map.`);\n  }\n\n  if (version === resolveEntry.version) {\n    // Package is not scoped\n    const entry = resolveEntry;\n    const packageUrl = `${entry.name}@${entry.version}`;\n    const importPaths = packageImportPaths.get(entry.path);\n    importPaths.forEach((importPath) => {\n      importMap.imports[importPath] = addHashUrl(importMap.imports[importPath], packageUrl, hash);\n    });\n  } else if (resolveEntry.scopedVersions?.[version] !== undefined && importMap.scopes) {\n    // Package is scoped\n    const entry = resolveEntry.scopedVersions?.[version];\n    if (!entry) {\n      throw new Error(`Could not find package ${packageName}@${version} in the resolve map.`);\n    }\n    const packageUrl = `${entry.name}@${entry.version}`;\n    const importPaths = packageImportPaths.get(entry.path);\n    const bundleServerUrl = new URL(Object.values(importMap.imports)[0]).origin;\n    for (const requiredById of Object.keys(entry.requiredBy)) {\n      const key = `${bundleServerUrl}/${requiredById}/`;\n      importPaths.forEach((importPath) => {\n        if (!importMap.scopes) {\n          return;\n        }\n        importMap.scopes[key][importPath] = addHashUrl(importMap.scopes[key][importPath], packageUrl, hash);\n      });\n    }\n  }\n}\n\n/**\n * Adds hash after name and version.\n * If hash already exists, replaces it.\n * @param url URL to add hash to\n * @param packageUrl Package name and version\n * @param hash Hash to add\n * @returns URL with hash\n */\nexport function addHashUrl(url: string, packageUrl: string, hash: string): string {\n  const search = url.indexOf(packageUrl);\n  if (search !== -1) {\n    const hashIndex = search + packageUrl.length;\n    const prefix = 'h-';\n    const pending = 'pending';\n    if (url.startsWith(prefix, hashIndex + 1)) {\n      // Replace hash if it already exists\n      if (url.startsWith(pending, hashIndex + prefix.length + 1)) {\n        url = url.slice(0, hashIndex) + `/h-${hash}` + url.slice(hashIndex + prefix.length + pending.length + 1);\n      } else {\n        url = url.slice(0, hashIndex) + `/h-${hash}` + url.slice(hashIndex + hash.length + prefix.length + 1);\n      }\n    } else {\n      // Add hash after name and version\n      url = url.slice(0, hashIndex) + `/h-${hash}` + url.slice(hashIndex);\n    }\n  }\n  return url;\n}\n"]}

package/lib/createImportMap.d.ts

@@ -1,5 +1,6 @@
 import type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';
 import type { ResolveMap } from './types/ResolveMap.js';
+import type { PackageImportPaths } from './PackageImportPaths.js';
 export interface ImportMap {
     imports: Record<string, string>;
     scopes?: Record<string, Record<string, string>>;
@@ -12,7 +13,9 @@ export declare function createImportMap(options: {
     bundleServerUrl: string;
     sessionVersion?: number;
     targetVersions?: Record<string, number>;
+    hashPackages?: boolean;
 }, context: {
     packages: PackageDefinitionsCache;
+    packageImportPaths?: PackageImportPaths;
 }): Promise<ImportMap>;
 //# sourceMappingURL=createImportMap.d.ts.map

package/lib/createImportMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createImportMap.d.ts","sourceRoot":"","sources":["../src/createImportMap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAC3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAQxD,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CACjD;AAED;;GAEG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE;IACP,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACzC,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;CACnC,GACA,OAAO,CAAC,SAAS,CAAC,CAmCpB"}
+{"version":3,"file":"createImportMap.d.ts","sourceRoot":"","sources":["../src/createImportMap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAC3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAOxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CACjD;AAED;;GAEG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE;IACP,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;IAClC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;CACzC,GACA,OAAO,CAAC,SAAS,CAAC,CA+CpB"}

package/lib/createImportMap.js

@@ -7,18 +7,19 @@ import { isExternalPackage } from './isExternalPackage.js';
  * Given a resolve map and a bundleServerUrl, returns an import map to be used in the browser.
  */
 export async function createImportMap(options, context) {
-    const { resolveMap, bundleServerUrl, sessionVersion = 0, targetVersions } = options;
-    const { packages } = context;
+    const { resolveMap, bundleServerUrl, sessionVersion = 0, targetVersions, hashPackages } = options;
+    const { packages, packageImportPaths } = context;
     const importMap = {
         imports: {},
     };
+    packageImportPaths?.clear();
     for (const resolveEntry of Object.values(resolveMap)) {
-        merge(importMap.imports, await getImportMapFromEntry(resolveEntry, bundleServerUrl, packages, sessionVersion, targetVersions));
+        merge(importMap.imports, await getImportMapFromEntry(resolveEntry, bundleServerUrl, packages, sessionVersion, packageImportPaths, targetVersions, hashPackages));
         if (resolveEntry.scopedVersions) {
             // Initialize scopes
             importMap.scopes ??= {};
             for (const scopedEntry of Object.values(resolveEntry.scopedVersions)) {
-                const importMapForEntry = await getImportMapFromEntry(scopedEntry, bundleServerUrl, packages, sessionVersion, targetVersions);
+                const importMapForEntry = await getImportMapFromEntry(scopedEntry, bundleServerUrl, packages, sessionVersion, packageImportPaths, targetVersions, hashPackages);
                 for (const requiredById of Object.keys(scopedEntry.requiredBy)) {
                     const scopes = (importMap.scopes[`${bundleServerUrl}/${requiredById}/`] ??= {});
                     merge(scopes, importMapForEntry);
@@ -28,7 +29,7 @@ export async function createImportMap(options, context) {
     }
     return importMap;
 }
-async function getImportMapFromEntry(entry, bundleServerUrl, packages, sessionVersion, targetVersions) {
+async function getImportMapFromEntry(entry, bundleServerUrl, packages, sessionVersion, packageImportPaths, targetVersions, hashPackages) {
     const importMap = {};
     const definition = await packages.get(entry.path);
     const exportsMap = await getExportsMap({ packagePath: entry.path }, { packages });
@@ -48,14 +49,15 @@ async function getImportMapFromEntry(entry, bundleServerUrl, packages, sessionVe
     const bundledExportsMap = flattenExportsMap(exportsMap);
     const packagePrefix = `${entry.name}@${entry.version}/`;
     const baseUrl = `${bundleServerUrl}/${packagePrefix}`;
+    const isExternal = isExternalPackage(entry.path);
+    const targetVersion = targetVersions?.[entry.path];
+    const cacheBuster = `v${sessionVersion ?? 0}${targetVersion ? `.${targetVersion}` : ''}/`;
+    const hash = hashPackages ? (isExternal ? `h-${await packages.getHash(entry.path)}/` : 'h-pending/') : '';
     // Add the bundled entries to the import map, but prefer unbundled if the entry exists.
     for (const [importPath, bundledFilePath] of Object.entries(bundledExportsMap)) {
-        const isExternal = isExternalPackage(entry.path);
         const unbundledFilePath = isExternal ? unbundledExportsMap[importPath] : undefined;
         let resolvedFilePath = unbundledFilePath ? `unbundled/${unbundledFilePath}` : `bundled/${bundledFilePath}`;
-        const targetVersion = targetVersions?.[entry.path];
-        const cacheBuster = `v${sessionVersion ?? 0}${targetVersion ? `.${targetVersion}` : ''}/`;
-        resolvedFilePath = `${cacheBuster}${resolvedFilePath}`;
+        resolvedFilePath = `${hash}${cacheBuster}${resolvedFilePath}`;
         const ext = path.extname(resolvedFilePath);
         // For bundled files:
         if (!unbundledFilePath) {
@@ -70,7 +72,9 @@ async function getImportMapFromEntry(entry, bundleServerUrl, packages, sessionVe
             // Plus signs should be replaced with underscores.
             resolvedFilePath = resolvedFilePath.replace(/\+/g, '_');
         }
-        importMap[importPath.replace('.', `${definition.name}`)] = new URL(resolvedFilePath, baseUrl).href;
+        const resolvedImportPath = importPath.replace('.', `${definition.name}`);
+        packageImportPaths?.add(entry.path, resolvedImportPath);
+        importMap[resolvedImportPath] = new URL(resolvedFilePath, baseUrl).href;
     }
     // Finally add a fallback for all other unexpected bundle entries. (Note, this should point to a script
     // which logs this as an error to the user and offers a way to add the entry to exports overrides.)

package/lib/createImportMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"createImportMap.js","sourceRoot":"","sources":["../src/createImportMap.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC9B,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAO3D;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,OAKC,EACD,OAEC;IAED,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,cAAc,GAAG,CAAC,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC;IACpF,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAC7B,MAAM,SAAS,GAAc;QAC3B,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;QACpD,KAAK,CACH,SAAS,CAAC,OAAO,EACjB,MAAM,qBAAqB,CAAC,YAAY,EAAE,eAAe,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,CAAC,CACrG,CAAC;QAEF,IAAI,YAAY,CAAC,cAAc,EAAE;YAC/B,oBAAoB;YACpB,SAAS,CAAC,MAAM,KAAK,EAAE,CAAC;YAExB,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE;gBACpE,MAAM,iBAAiB,GAAG,MAAM,qBAAqB,CACnD,WAAW,EACX,eAAe,EACf,QAAQ,EACR,cAAc,EACd,cAAc,CACf,CAAC;gBAEF,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE;oBAC9D,MAAM,MAAM,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,eAAe,IAAI,YAAY,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;oBAChF,KAAK,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;iBAClC;aACF;SACF;KACF;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,KAAK,UAAU,qBAAqB,CAClC,KAAsB,EACtB,eAAuB,EACvB,QAAiC,EACjC,cAAsB,EACtB,cAAuC;IAEvC,MAAM,SAAS,GAA2B,EAAE,CAAC;IAC7C,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAClD,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IAElF,IACE,CAAC,UAAU;QACX,CAAC,UAAU,CAAC,IAAI;QAChB,CAAC,UAAU,CAAC,OAAO;QACnB,CAAC,UAAU;QACX,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,KAAK,CAAC;QACpC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EACrC;QACA,OAAO,SAAS,CAAC;KAClB;IAED,sDAAsD;IACtD,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,UAAU,EAAE;QACxD,UAAU,EAAE,CAAC,aAAa,CAAC;QAC3B,kBAAkB,EAAE,CAAC,aAAa,CAAC;KACpC,CAAC,CAAC;IACH,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC;IACxD,MAAM,aAAa,GAAG,GAAG,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,OAAO,GAAG,CAAC;IACxD,MAAM,OAAO,GAAG,GAAG,eAAe,IAAI,aAAa,EAAE,CAAC;IAEtD,uFAAuF;IACvF,KAAK,MAAM,CAAC,UAAU,EAAE,eAAe,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE;QAC7E,MAAM,UAAU,GAAG,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACjD,MAAM,iBAAiB,GAAG,UAAU,CAAC,CAAC,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnF,IAAI,gBAAgB,GAAG,iBAAiB,CAAC,CAAC,CAAC,aAAa,iBAAiB,EAAE,CAAC,CAAC,CAAC,WAAW,eAAe,EAAE,CAAC;QAC3G,MAAM,aAAa,GAAG,cAAc,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACnD,MAAM,WAAW,GAAG,IAAI,cAAc,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC;QAE1F,gBAAgB,GAAG,GAAG,WAAW,GAAG,gBAAgB,EAAE,CAAC;QACvD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAE3C,qBAAqB;QACrB,IAAI,CAAC,iBAAiB,EAAE;YACtB,uBAAuB;YACvB,IAAI,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;gBACtC,SAAS;aACV;YAED,0EAA0E;YAC1E,IAAI,GAAG,KAAK,KAAK,EAAE;gBACjB,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAC1B,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAC9B,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,CAC9E,CAAC;aACH;YAED,kDAAkD;YAClD,gBAAgB,GAAG,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;SACzD;QAED,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC;KACpG;IAED,uGAAuG;IACvG,mGAAmG;IACnG,2DAA2D;IAE3D,OAAO,SAAS,CAAC;AACnB,CAAC","sourcesContent":["import type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { ResolveMap } from './types/ResolveMap.js';\nimport type { ResolveMapEntry } from './types/ResolveMapEntry.js';\nimport { merge } from 'merge';\nimport { flattenExportsMap } from './flattenExportsMap.js';\nimport path from 'path';\nimport { getExportsMap } from './getExportsMap.js';\nimport { isExternalPackage } from './isExternalPackage.js';\n\nexport interface ImportMap {\n  imports: Record<string, string>;\n  scopes?: Record<string, Record<string, string>>;\n}\n\n/**\n * Given a resolve map and a bundleServerUrl, returns an import map to be used in the browser.\n */\nexport async function createImportMap(\n  options: {\n    resolveMap: ResolveMap;\n    bundleServerUrl: string;\n    sessionVersion?: number;\n    targetVersions?: Record<string, number>;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n  },\n): Promise<ImportMap> {\n  const { resolveMap, bundleServerUrl, sessionVersion = 0, targetVersions } = options;\n  const { packages } = context;\n  const importMap: ImportMap = {\n    imports: {},\n  };\n\n  for (const resolveEntry of Object.values(resolveMap)) {\n    merge(\n      importMap.imports,\n      await getImportMapFromEntry(resolveEntry, bundleServerUrl, packages, sessionVersion, targetVersions),\n    );\n\n    if (resolveEntry.scopedVersions) {\n      // Initialize scopes\n      importMap.scopes ??= {};\n\n      for (const scopedEntry of Object.values(resolveEntry.scopedVersions)) {\n        const importMapForEntry = await getImportMapFromEntry(\n          scopedEntry,\n          bundleServerUrl,\n          packages,\n          sessionVersion,\n          targetVersions,\n        );\n\n        for (const requiredById of Object.keys(scopedEntry.requiredBy)) {\n          const scopes = (importMap.scopes[`${bundleServerUrl}/${requiredById}/`] ??= {});\n          merge(scopes, importMapForEntry);\n        }\n      }\n    }\n  }\n\n  return importMap;\n}\n\nasync function getImportMapFromEntry(\n  entry: ResolveMapEntry,\n  bundleServerUrl: string,\n  packages: PackageDefinitionsCache,\n  sessionVersion: number,\n  targetVersions?: Record<string, number>,\n): Promise<Record<string, string>> {\n  const importMap: Record<string, string> = {};\n  const definition = await packages.get(entry.path);\n  const exportsMap = await getExportsMap({ packagePath: entry.path }, { packages });\n\n  if (\n    !definition ||\n    !definition.name ||\n    !definition.version ||\n    !exportsMap ||\n    Object.keys(exportsMap).length === 0 ||\n    definition.name.startsWith('@types/')\n  ) {\n    return importMap;\n  }\n\n  // Get both the unbundled entries from the exports map\n  const unbundledExportsMap = flattenExportsMap(exportsMap, {\n    conditions: ['browser-esm'],\n    requiredConditions: ['browser-esm'],\n  });\n  const bundledExportsMap = flattenExportsMap(exportsMap);\n  const packagePrefix = `${entry.name}@${entry.version}/`;\n  const baseUrl = `${bundleServerUrl}/${packagePrefix}`;\n\n  // Add the bundled entries to the import map, but prefer unbundled if the entry exists.\n  for (const [importPath, bundledFilePath] of Object.entries(bundledExportsMap)) {\n    const isExternal = isExternalPackage(entry.path);\n    const unbundledFilePath = isExternal ? unbundledExportsMap[importPath] : undefined;\n    let resolvedFilePath = unbundledFilePath ? `unbundled/${unbundledFilePath}` : `bundled/${bundledFilePath}`;\n    const targetVersion = targetVersions?.[entry.path];\n    const cacheBuster = `v${sessionVersion ?? 0}${targetVersion ? `.${targetVersion}` : ''}/`;\n\n    resolvedFilePath = `${cacheBuster}${resolvedFilePath}`;\n    const ext = path.extname(resolvedFilePath);\n\n    // For bundled files:\n    if (!unbundledFilePath) {\n      // Ignore .d.ts entries\n      if (resolvedFilePath.endsWith('.d.ts')) {\n        continue;\n      }\n\n      // We always expect responses to come back as javascript (.js extensions.)\n      if (ext !== '.js') {\n        resolvedFilePath = path.join(\n          path.dirname(resolvedFilePath),\n          path.basename(resolvedFilePath, ext) + (ext === '.mjs' ? '.js' : ext + '.js'),\n        );\n      }\n\n      // Plus signs should be replaced with underscores.\n      resolvedFilePath = resolvedFilePath.replace(/\\+/g, '_');\n    }\n\n    importMap[importPath.replace('.', `${definition.name}`)] = new URL(resolvedFilePath, baseUrl).href;\n  }\n\n  // Finally add a fallback for all other unexpected bundle entries. (Note, this should point to a script\n  // which logs this as an error to the user and offers a way to add the entry to exports overrides.)\n  // importMap[definition.name + '/'] = baseUrl + 'missing/';\n\n  return importMap;\n}\n"]}
+{"version":3,"file":"createImportMap.js","sourceRoot":"","sources":["../src/createImportMap.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { ResolveMap } from './types/ResolveMap.js';\nimport type { ResolveMapEntry } from './types/ResolveMapEntry.js';\nimport { merge } from 'merge';\nimport { flattenExportsMap } from './flattenExportsMap.js';\nimport path from 'path';\nimport { getExportsMap } from './getExportsMap.js';\nimport { isExternalPackage } from './isExternalPackage.js';\nimport type { PackageImportPaths } from './PackageImportPaths.js';\n\nexport interface ImportMap {\n  imports: Record<string, string>;\n  scopes?: Record<string, Record<string, string>>;\n}\n\n/**\n * Given a resolve map and a bundleServerUrl, returns an import map to be used in the browser.\n */\nexport async function createImportMap(\n  options: {\n    resolveMap: ResolveMap;\n    bundleServerUrl: string;\n    sessionVersion?: number;\n    targetVersions?: Record<string, number>;\n    hashPackages?: boolean;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n    packageImportPaths?: PackageImportPaths;\n  },\n): Promise<ImportMap> {\n  const { resolveMap, bundleServerUrl, sessionVersion = 0, targetVersions, hashPackages } = options;\n  const { packages, packageImportPaths } = context;\n  const importMap: ImportMap = {\n    imports: {},\n  };\n\n  packageImportPaths?.clear();\n\n  for (const resolveEntry of Object.values(resolveMap)) {\n    merge(\n      importMap.imports,\n      await getImportMapFromEntry(\n        resolveEntry,\n        bundleServerUrl,\n        packages,\n        sessionVersion,\n        packageImportPaths,\n        targetVersions,\n        hashPackages,\n      ),\n    );\n\n    if (resolveEntry.scopedVersions) {\n      // Initialize scopes\n      importMap.scopes ??= {};\n\n      for (const scopedEntry of Object.values(resolveEntry.scopedVersions)) {\n        const importMapForEntry = await getImportMapFromEntry(\n          scopedEntry,\n          bundleServerUrl,\n          packages,\n          sessionVersion,\n          packageImportPaths,\n          targetVersions,\n          hashPackages,\n        );\n\n        for (const requiredById of Object.keys(scopedEntry.requiredBy)) {\n          const scopes = (importMap.scopes[`${bundleServerUrl}/${requiredById}/`] ??= {});\n          merge(scopes, importMapForEntry);\n        }\n      }\n    }\n  }\n\n  return importMap;\n}\n\nasync function getImportMapFromEntry(\n  entry: ResolveMapEntry,\n  bundleServerUrl: string,\n  packages: PackageDefinitionsCache,\n  sessionVersion: number,\n  packageImportPaths?: PackageImportPaths,\n  targetVersions?: Record<string, number>,\n  hashPackages?: boolean,\n): Promise<Record<string, string>> {\n  const importMap: Record<string, string> = {};\n  const definition = await packages.get(entry.path);\n  const exportsMap = await getExportsMap({ packagePath: entry.path }, { packages });\n\n  if (\n    !definition ||\n    !definition.name ||\n    !definition.version ||\n    !exportsMap ||\n    Object.keys(exportsMap).length === 0 ||\n    definition.name.startsWith('@types/')\n  ) {\n    return importMap;\n  }\n\n  // Get both the unbundled entries from the exports map\n  const unbundledExportsMap = flattenExportsMap(exportsMap, {\n    conditions: ['browser-esm'],\n    requiredConditions: ['browser-esm'],\n  });\n  const bundledExportsMap = flattenExportsMap(exportsMap);\n  const packagePrefix = `${entry.name}@${entry.version}/`;\n  const baseUrl = `${bundleServerUrl}/${packagePrefix}`;\n  const isExternal = isExternalPackage(entry.path);\n  const targetVersion = targetVersions?.[entry.path];\n  const cacheBuster = `v${sessionVersion ?? 0}${targetVersion ? `.${targetVersion}` : ''}/`;\n  const hash = hashPackages ? (isExternal ? `h-${await packages.getHash(entry.path)}/` : 'h-pending/') : '';\n\n  // Add the bundled entries to the import map, but prefer unbundled if the entry exists.\n  for (const [importPath, bundledFilePath] of Object.entries(bundledExportsMap)) {\n    const unbundledFilePath = isExternal ? unbundledExportsMap[importPath] : undefined;\n    let resolvedFilePath = unbundledFilePath ? `unbundled/${unbundledFilePath}` : `bundled/${bundledFilePath}`;\n\n    resolvedFilePath = `${hash}${cacheBuster}${resolvedFilePath}`;\n    const ext = path.extname(resolvedFilePath);\n\n    // For bundled files:\n    if (!unbundledFilePath) {\n      // Ignore .d.ts entries\n      if (resolvedFilePath.endsWith('.d.ts')) {\n        continue;\n      }\n\n      // We always expect responses to come back as javascript (.js extensions.)\n      if (ext !== '.js') {\n        resolvedFilePath = path.join(\n          path.dirname(resolvedFilePath),\n          path.basename(resolvedFilePath, ext) + (ext === '.mjs' ? '.js' : ext + '.js'),\n        );\n      }\n\n      // Plus signs should be replaced with underscores.\n      resolvedFilePath = resolvedFilePath.replace(/\\+/g, '_');\n    }\n\n    const resolvedImportPath = importPath.replace('.', `${definition.name}`);\n    packageImportPaths?.add(entry.path, resolvedImportPath);\n    importMap[resolvedImportPath] = new URL(resolvedFilePath, baseUrl).href;\n  }\n\n  // Finally add a fallback for all other unexpected bundle entries. (Note, this should point to a script\n  // which logs this as an error to the user and offers a way to add the entry to exports overrides.)\n  // importMap[definition.name + '/'] = baseUrl + 'missing/';\n\n  return importMap;\n}\n"]}

package/lib/findFileInPackage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findFileInPackage.d.ts","sourceRoot":"","sources":["../src/findFileInPackage.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAI3E,MAAM,MAAM,wBAAwB,GAAG;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;;;;;;;;GASG;AAEH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,wBAAwB,EACjC,OAAO,EAAE;IAAE,QAAQ,EAAE,uBAAuB,CAAA;CAAE,GAC7C,OAAO,CAAC,uBAAuB,CAAC,CAuFlC"}
+{"version":3,"file":"findFileInPackage.d.ts","sourceRoot":"","sources":["../src/findFileInPackage.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAO3E,MAAM,MAAM,wBAAwB,GAAG;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;;;;;;;;GASG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,wBAAwB,EACjC,OAAO,EAAE;IAAE,QAAQ,EAAE,uBAAuB,CAAA;CAAE,GAC7C,OAAO,CAAC,uBAAuB,CAAC,CAoFlC"}

package/lib/findFileInPackage.js

@@ -1,10 +1,12 @@
 import path from 'path';
-import { intermediateToSourcePath, sourceToIntermediatePath, isFile } from '@ms-cloudpack/path-utilities';
-import { isExternalPackage } from './isExternalPackage.js';
-import { safeRelativePath } from '@ms-cloudpack/path-string-parsing';
+import { intermediateToSourcePath, sourceToIntermediatePath, isFileSync } from '@ms-cloudpack/path-utilities';
+import { safeRelativePath, slash } from '@ms-cloudpack/path-string-parsing';
 import { getExportsMap } from './getExportsMap.js';
 import { flattenExportsMap } from './flattenExportsMap.js';
-const typescriptExtensions = ['.ts', '.tsx', '.cts', '.mts'];
+import { getCandidates } from './getCandidates.js';
+import { isExternalPackage } from './isExternalPackage.js';
+const sourceExtensions = ['.ts', '.tsx', '.cts', '.mts', '.jsx'];
+const javascriptExtensions = ['.js', '.mjs', '.cjs'];
 /**
  * Given a requested partial filePath, resolves the relative intermediate path if the file exists, with special
  * consideration for internal packages, which may not have intermediate files but only source files. Paths returned
@@ -16,48 +18,17 @@ const typescriptExtensions = ['.ts', '.tsx', '.cts', '.mts'];
  * exist, then we should not include it in the exports map.
  */
 export async function findFileInPackage(options, context) {
-    const { packagePath } = options;
-    let filePath = safeRelativePath(options.filePath);
+    const originalPath = safeRelativePath(options.filePath);
+    const packagePath = slash(options.packagePath);
+    let filePath;
     let sourcePath;
     let typesPath;
     const isInternal = !isExternalPackage(packagePath);
-    const candidates = [
-        filePath,
-        filePath + '.js',
-        filePath + '.mjs',
-        filePath + '.cjs',
-        safeRelativePath(path.join(filePath, 'index.js')),
-        safeRelativePath(path.join(filePath, 'package.json')),
-    ];
-    filePath = undefined;
-    for (const candidate of candidates) {
-        if (await isFile(path.join(packagePath, candidate))) {
-            filePath = candidate;
-            break;
-        }
-    }
-    // For internal packages, try and find source/typings and convert to intermediate (which may be missing.)
-    if (isInternal) {
-        for (const candidate of candidates) {
-            sourcePath = intermediateToSourcePath(candidate, packagePath);
-            if (sourcePath) {
-                break;
-            }
-        }
-        // If the discovered source file is the same as the provided file, resolve the intermediate path.
-        if (sourcePath && (!filePath || sourcePath === filePath)) {
-            filePath = sourceToIntermediatePath(sourcePath);
-        }
-        // If the sourcePath is the same as the filePath, clear it. By this point we should have resolved
-        // the true intermediate path.
-        if (sourcePath === filePath) {
-            sourcePath = undefined;
-        }
-        if (sourcePath && typescriptExtensions.includes(path.extname(sourcePath))) {
-            typesPath = filePath && path.extname(filePath) === '.js' ? filePath.replace(/\.js$/, '.d.ts') : undefined;
-        }
-    }
-    const isNestedPackageDefinition = filePath && path.basename(filePath) === 'package.json' && path.basename(options.filePath) !== 'package.json';
+    const candidates = getCandidates({ filePath: originalPath, packagePath });
+    // Try and resolve a physical file given the candidates.
+    // eslint-disable-next-line @ms-cloudpack/internal/no-sync-filesystem
+    filePath = candidates.find((candidate) => isFileSync(path.join(packagePath, candidate)));
+    const isNestedPackageDefinition = filePath && path.basename(filePath) === 'package.json' && path.basename(originalPath) !== 'package.json';
     const result = {};
     if (isNestedPackageDefinition) {
         const nestedDefinitionPath = path.dirname(path.join(packagePath, filePath));
@@ -74,6 +45,32 @@ export async function findFileInPackage(options, context) {
             };
         }
     }
+    // If the resolved file is a typescript file in an internal package, try to resolve the intermediate.
+    if (filePath && sourceExtensions.includes(path.extname(filePath))) {
+        sourcePath = filePath;
+        filePath = isInternal ? sourceToIntermediatePath(filePath) : undefined;
+    }
+    // If we haven't resolved a sourcePath, try to resolve it from the intermediate.
+    if (isInternal && filePath && !sourcePath) {
+        const ext = path.extname(filePath);
+        const isJavaScriptExt = javascriptExtensions.includes(ext);
+        if (isJavaScriptExt) {
+            // Not a TS file, but a JS file. Try to find the source.
+            sourcePath = intermediateToSourcePath(filePath, packagePath);
+            // If we couldn't find a TS file, clear sourcePath.
+            if (sourcePath === filePath) {
+                sourcePath = undefined;
+            }
+        }
+    }
+    // Try to resolve the typesPath
+    if (sourcePath && filePath) {
+        typesPath = filePath.replace(/\.js$/, '.d.ts');
+        // eslint-disable-next-line @ms-cloudpack/internal/no-sync-filesystem
+        if (!isInternal && !isFileSync(path.join(packagePath, typesPath))) {
+            typesPath = undefined;
+        }
+    }
     if (typesPath) {
         result.typesPath = safeRelativePath(typesPath);
     }

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 path from 'path';\nimport { intermediateToSourcePath, sourceToIntermediatePath, isFile } from '@ms-cloudpack/path-utilities';\nimport { isExternalPackage } from './isExternalPackage.js';\nimport { safeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport { getExportsMap } from './getExportsMap.js';\nimport { flattenExportsMap } from './flattenExportsMap.js';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\n\nconst typescriptExtensions = ['.ts', '.tsx', '.cts', '.mts'];\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 */\n\nexport async function findFileInPackage(\n  options: FindFileInPackageOptions,\n  context: { packages: PackageDefinitionsCache },\n): Promise<FindFileInPackageResult> {\n  const { packagePath } = options;\n  let filePath: string | undefined = safeRelativePath(options.filePath);\n  let sourcePath: string | undefined;\n  let typesPath: string | undefined;\n  const isInternal = !isExternalPackage(packagePath);\n  const candidates = [\n    filePath,\n    filePath + '.js',\n    filePath + '.mjs',\n    filePath + '.cjs',\n    safeRelativePath(path.join(filePath, 'index.js')),\n    safeRelativePath(path.join(filePath, 'package.json')),\n  ];\n\n  filePath = undefined;\n  for (const candidate of candidates) {\n    if (await isFile(path.join(packagePath, candidate))) {\n      filePath = candidate;\n      break;\n    }\n  }\n\n  // For internal packages, try and find source/typings and convert to intermediate (which may be missing.)\n  if (isInternal) {\n    for (const candidate of candidates) {\n      sourcePath = intermediateToSourcePath(candidate, packagePath);\n      if (sourcePath) {\n        break;\n      }\n    }\n\n    // If the discovered source file is the same as the provided file, resolve the intermediate path.\n    if (sourcePath && (!filePath || sourcePath === filePath)) {\n      filePath = sourceToIntermediatePath(sourcePath);\n    }\n\n    // If the sourcePath is the same as the filePath, clear it. By this point we should have resolved\n    // the true intermediate path.\n    if (sourcePath === filePath) {\n      sourcePath = undefined;\n    }\n\n    if (sourcePath && typescriptExtensions.includes(path.extname(sourcePath))) {\n      typesPath = filePath && path.extname(filePath) === '.js' ? filePath.replace(/\\.js$/, '.d.ts') : undefined;\n    }\n  }\n\n  const isNestedPackageDefinition =\n    filePath && path.basename(filePath) === 'package.json' && path.basename(options.filePath) !== '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: safeRelativePath(path.relative(packagePath, path.join(nestedDefinitionPath, entryPath))),\n          },\n          context,\n        )),\n        typesPath:\n          typesPath && safeRelativePath(path.relative(packagePath, path.join(nestedDefinitionPath, typesPath))),\n      };\n    }\n  }\n\n  if (typesPath) {\n    result.typesPath = safeRelativePath(typesPath);\n  }\n\n  if (filePath) {\n    result.filePath = safeRelativePath(filePath);\n  }\n\n  if (sourcePath) {\n    result.sourcePath = safeRelativePath(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 path from 'path';\nimport { intermediateToSourcePath, sourceToIntermediatePath, isFileSync } from '@ms-cloudpack/path-utilities';\nimport { safeRelativePath, slash } from '@ms-cloudpack/path-string-parsing';\nimport { getExportsMap } from './getExportsMap.js';\nimport { flattenExportsMap } from './flattenExportsMap.js';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport { getCandidates } from './getCandidates.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 },\n): Promise<FindFileInPackageResult> {\n  const originalPath = safeRelativePath(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 candidates = getCandidates({ filePath: originalPath, packagePath });\n\n  // Try and resolve a physical file given the candidates.\n  // eslint-disable-next-line @ms-cloudpack/internal/no-sync-filesystem\n  filePath = candidates.find((candidate) => isFileSync(path.join(packagePath, candidate)));\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: safeRelativePath(path.relative(packagePath, path.join(nestedDefinitionPath, entryPath))),\n          },\n          context,\n        )),\n        typesPath:\n          typesPath && safeRelativePath(path.relative(packagePath, path.join(nestedDefinitionPath, typesPath))),\n      };\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    // eslint-disable-next-line @ms-cloudpack/internal/no-sync-filesystem\n    if (!isInternal && !isFileSync(path.join(packagePath, typesPath))) {\n      typesPath = undefined;\n    }\n  }\n\n  if (typesPath) {\n    result.typesPath = safeRelativePath(typesPath);\n  }\n\n  if (filePath) {\n    result.filePath = safeRelativePath(filePath);\n  }\n\n  if (sourcePath) {\n    result.sourcePath = safeRelativePath(sourcePath);\n  }\n\n  return result;\n}\n"]}

package/lib/getCandidates.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Given a packagePath and a filePath from its exports map (or main/module), build candidate paths
+ * to look for the physical file in order of priority. For internal packages, we try to discover
+ * source files first, and then fallback to the original file name. We also search for index files
+ * and expand folder paths as well for ambiguous references. For external packages, we prioritize
+ * intermediate paths.
+ */
+export declare function getCandidates(options: {
+    filePath: string;
+    packagePath: string;
+}): string[];
+//# sourceMappingURL=getCandidates.d.ts.map

package/lib/getCandidates.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getCandidates.d.ts","sourceRoot":"","sources":["../src/getCandidates.ts"],"names":[],"mappings":"AA0BA;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,YAoD/E"}

package/lib/getCandidates.js

@@ -0,0 +1,98 @@
+import { safeRelativePath } from '@ms-cloudpack/path-string-parsing';
+import path from 'path';
+import { isExternalPackage } from './isExternalPackage.js';
+// Mappings to possible candidate extensions for a given input extension.
+const externalExtensions = ['.js', '.mjs', '.cjs'];
+const internalExtensions = ['.ts', '.tsx', '.mts', '.cts', '.jsx', '.js', '.mjs', '.cjs'];
+const internalExtensionMap = {
+    '.ts': ['.ts', '.js'],
+    '.tsx': ['.tsx', '.js'],
+    '.mts': ['.mts', '.mjs', '.js'],
+    '.cts': ['.cts', '.cjs', '.js'],
+    '.jsx': ['.jsx', '.js'],
+    '.js': ['.ts', '.tsx', '.mts', '.cts', '.jsx', '.js'],
+    '.mjs': ['.mjs', '.js'],
+    '.cjs': ['.cjs', '.js'],
+};
+const externalExtensionMap = {
+    '.ts': ['.ts', '.js'],
+    '.tsx': ['.js'],
+    '.mts': ['.mjs', '.js'],
+    '.cts': ['.mts', '.cts'],
+    '.jsx': ['.js'],
+    '.js': ['.js'],
+};
+/**
+ * Given a packagePath and a filePath from its exports map (or main/module), build candidate paths
+ * to look for the physical file in order of priority. For internal packages, we try to discover
+ * source files first, and then fallback to the original file name. We also search for index files
+ * and expand folder paths as well for ambiguous references. For external packages, we prioritize
+ * intermediate paths.
+ */
+export function getCandidates(options) {
+    const { filePath, packagePath } = options;
+    const isBlankPath = !filePath || filePath === '.';
+    const originalPath = isBlankPath ? './index' : safeRelativePath(filePath);
+    const originalExt = path.extname(originalPath);
+    const isInternal = !isExternalPackage(packagePath);
+    const endsWithSlash = originalPath.endsWith('/');
+    const candidates = [];
+    const defaultExtensions = isInternal ? internalExtensions : externalExtensions;
+    const extensions = (isInternal ? internalExtensionMap : externalExtensionMap)[originalExt] || defaultExtensions;
+    const pathsToAdd = [originalPath];
+    if (isInternal && originalPath.startsWith('./lib')) {
+        pathsToAdd.unshift(originalPath.replace(/^\.\/lib/, './src'));
+    }
+    for (let currentPath of pathsToAdd) {
+        const unrecognizedExt = originalExt && !extensions.includes(path.extname(currentPath));
+        // For internal packages, we try and resolve the original file name first.
+        if (isInternal && unrecognizedExt) {
+            candidates.push(currentPath);
+        }
+        // If the path doesn't end with a slash, it could be a file. Add extensions.
+        if (!endsWithSlash) {
+            candidates.push(...expandExtensions(currentPath, extensions));
+        }
+        // For non-extension references, we might be referring to a folder, or a barrel file within a folder. Add the
+        // appropriate extensions for the barrel file, and fall back to a package.json in the case of nested definitions.
+        if (!originalExt) {
+            if (isBlankPath) {
+                candidates.push('./package.json');
+            }
+            else {
+                // Trim trailing slash
+                if (endsWithSlash) {
+                    currentPath = currentPath.slice(0, -1);
+                }
+                candidates.push(...expandExtensions(currentPath + '/index', extensions));
+                candidates.push(currentPath + '/package.json');
+            }
+        }
+        // For external packages, we try and resolve the original file name last.
+        if (!isInternal && unrecognizedExt) {
+            candidates.push(currentPath);
+        }
+    }
+    return candidates;
+}
+/**
+ * Given a filepath and list of extensions, maps extensions to prepend the filepath. In the case that
+ * the filepath has an extension already in the list, avoids appending the extension twice.
+ *
+ * For example, filePath = './foo/bar.js' with extensions ['.ts', '.js'] would result in:
+ *
+ * ['./foo/bar.ts.js', './foo/bar.js'].
+ *
+ */
+function expandExtensions(filePath, extensions) {
+    const result = [];
+    const ext = path.extname(filePath);
+    if (extensions.includes(ext)) {
+        filePath = `${filePath.slice(0, -ext.length)}`;
+    }
+    for (const currentExt of extensions) {
+        result.push(filePath + currentExt);
+    }
+    return result;
+}
+//# sourceMappingURL=getCandidates.js.map

package/lib/getCandidates.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getCandidates.js","sourceRoot":"","sources":["../src/getCandidates.ts"],"names":[],"mappings":"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","sourcesContent":["import { safeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport path from 'path';\nimport { isExternalPackage } from './isExternalPackage.js';\n\n// Mappings to possible candidate extensions for a given input extension.\nconst externalExtensions = ['.js', '.mjs', '.cjs'];\nconst internalExtensions = ['.ts', '.tsx', '.mts', '.cts', '.jsx', '.js', '.mjs', '.cjs'];\nconst internalExtensionMap: Record<string, string[]> = {\n  '.ts': ['.ts', '.js'],\n  '.tsx': ['.tsx', '.js'],\n  '.mts': ['.mts', '.mjs', '.js'],\n  '.cts': ['.cts', '.cjs', '.js'],\n  '.jsx': ['.jsx', '.js'],\n  '.js': ['.ts', '.tsx', '.mts', '.cts', '.jsx', '.js'],\n  '.mjs': ['.mjs', '.js'],\n  '.cjs': ['.cjs', '.js'],\n};\nconst externalExtensionMap: Record<string, string[]> = {\n  '.ts': ['.ts', '.js'],\n  '.tsx': ['.js'],\n  '.mts': ['.mjs', '.js'],\n  '.cts': ['.mts', '.cts'],\n  '.jsx': ['.js'],\n  '.js': ['.js'],\n};\n\n/**\n * Given a packagePath and a filePath from its exports map (or main/module), build candidate paths\n * to look for the physical file in order of priority. For internal packages, we try to discover\n * source files first, and then fallback to the original file name. We also search for index files\n * and expand folder paths as well for ambiguous references. For external packages, we prioritize\n * intermediate paths.\n */\nexport function getCandidates(options: { filePath: string; packagePath: string }) {\n  const { filePath, packagePath } = options;\n  const isBlankPath = !filePath || filePath === '.';\n  const originalPath = isBlankPath ? './index' : safeRelativePath(filePath);\n  const originalExt = path.extname(originalPath);\n  const isInternal = !isExternalPackage(packagePath);\n  const endsWithSlash = originalPath.endsWith('/');\n  const candidates = [];\n  const defaultExtensions = isInternal ? internalExtensions : externalExtensions;\n  const extensions = (isInternal ? internalExtensionMap : externalExtensionMap)[originalExt] || defaultExtensions;\n  const pathsToAdd = [originalPath];\n\n  if (isInternal && originalPath.startsWith('./lib')) {\n    pathsToAdd.unshift(originalPath.replace(/^\\.\\/lib/, './src'));\n  }\n\n  for (let currentPath of pathsToAdd) {\n    const unrecognizedExt = originalExt && !extensions.includes(path.extname(currentPath));\n\n    // For internal packages, we try and resolve the original file name first.\n    if (isInternal && unrecognizedExt) {\n      candidates.push(currentPath);\n    }\n\n    // If the path doesn't end with a slash, it could be a file. Add extensions.\n    if (!endsWithSlash) {\n      candidates.push(...expandExtensions(currentPath, extensions));\n    }\n\n    // For non-extension references, we might be referring to a folder, or a barrel file within a folder. Add the\n    // appropriate extensions for the barrel file, and fall back to a package.json in the case of nested definitions.\n    if (!originalExt) {\n      if (isBlankPath) {\n        candidates.push('./package.json');\n      } else {\n        // Trim trailing slash\n        if (endsWithSlash) {\n          currentPath = currentPath.slice(0, -1);\n        }\n\n        candidates.push(...expandExtensions(currentPath + '/index', extensions));\n        candidates.push(currentPath + '/package.json');\n      }\n    }\n\n    // For external packages, we try and resolve the original file name last.\n    if (!isInternal && unrecognizedExt) {\n      candidates.push(currentPath);\n    }\n  }\n\n  return candidates;\n}\n\n/**\n * Given a filepath and list of extensions, maps extensions to prepend the filepath. In the case that\n * the filepath has an extension already in the list, avoids appending the extension twice.\n *\n * For example, filePath = './foo/bar.js' with extensions ['.ts', '.js'] would result in:\n *\n * ['./foo/bar.ts.js', './foo/bar.js'].\n *\n */\nfunction expandExtensions(filePath: string, extensions: string[]) {\n  const result: string[] = [];\n  const ext = path.extname(filePath);\n\n  if (extensions.includes(ext)) {\n    filePath = `${filePath.slice(0, -ext.length)}`;\n  }\n\n  for (const currentExt of extensions) {\n    result.push(filePath + currentExt);\n  }\n\n  return result;\n}\n"]}

package/lib/index.d.ts

@@ -11,6 +11,8 @@ export { createExportsMap } from './createExportsMap.js';
 export { addExportsMapEntry, type AddExportsMapEntryOptions } from './addExportsMapEntry.js';
 export { getExportsMap } from './getExportsMap.js';
 export { createImportMap, type ImportMap } from './createImportMap.js';
+export { addImportMapHash } from './addImportMapHash.js';
+export { PackageImportPaths } from './PackageImportPaths.js';
 export { resolve } from './resolve.js';
 export { detectModuleType, type ModuleType } from './detectModuleType.js';
 export { isExternalPackage } from './isExternalPackage.js';

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAG7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,YAAY,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,YAAY,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,YAAY,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC1G,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,YAAY,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAGxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,KAAK,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAC7F,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGnD,OAAO,EAAE,eAAe,EAAE,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGvE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAGvC,OAAO,EAAE,gBAAgB,EAAE,KAAK,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,KAAK,wBAAwB,EAAE,KAAK,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACxH,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAG7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,YAAY,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,YAAY,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,YAAY,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC1G,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,YAAY,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAGxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,KAAK,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAC7F,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGnD,OAAO,EAAE,eAAe,EAAE,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAG7D,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAGvC,OAAO,EAAE,gBAAgB,EAAE,KAAK,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,KAAK,wBAAwB,EAAE,KAAK,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACxH,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC"}

package/lib/index.js

@@ -11,6 +11,10 @@ export { addExportsMapEntry } from './addExportsMapEntry.js';
 export { getExportsMap } from './getExportsMap.js';
 // ImportMap creation
 export { createImportMap } from './createImportMap.js';
+// ImportMap hashing
+export { addImportMapHash } from './addImportMapHash.js';
+// Import paths caching
+export { PackageImportPaths } from './PackageImportPaths.js';
 // Import resolution utilities
 export { resolve } from './resolve.js';
 // Other package utilities

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,sBAAsB;AACtB,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAG1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAGxE,kCAAkC;AAClC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAkC,MAAM,yBAAyB,CAAC;AAC7F,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,qBAAqB;AACrB,OAAO,EAAE,eAAe,EAAkB,MAAM,sBAAsB,CAAC;AAEvE,8BAA8B;AAC9B,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,0BAA0B;AAC1B,OAAO,EAAE,gBAAgB,EAAmB,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAA+D,MAAM,wBAAwB,CAAC;AACxH,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC","sourcesContent":["// Package definition parsing\nexport { PackageDefinitions } from './PackageDefinitions.js';\n\n// ResolveMap creation\nexport { createResolveMap } from './createResolveMap/createResolveMap.js';\nexport type { ResolveMap } from './types/ResolveMap.js';\nexport type { ResolveMapEntry } from './types/ResolveMapEntry.js';\nexport { findResolveMapEntry } from './findResolveMapEntry.js';\nexport type { DiffResolveMapsChanges, DiffResolveMapsStats } from './createResolveMap/diffResolveMaps.js';\nexport { diffResolveMaps } from './createResolveMap/diffResolveMaps.js';\nexport type { LinkedPath } from './types/LinkedPath.js';\n\n// ExportsMap parsing and creation\nexport { flattenExportsMap } from './flattenExportsMap.js';\nexport { createExportsMap } from './createExportsMap.js';\nexport { addExportsMapEntry, type AddExportsMapEntryOptions } from './addExportsMapEntry.js';\nexport { getExportsMap } from './getExportsMap.js';\n\n// ImportMap creation\nexport { createImportMap, type ImportMap } from './createImportMap.js';\n\n// Import resolution utilities\nexport { resolve } from './resolve.js';\n\n// Other package utilities\nexport { detectModuleType, type ModuleType } from './detectModuleType.js';\nexport { isExternalPackage } from './isExternalPackage.js';\nexport { findFileInPackage, type FindFileInPackageOptions, type FindFileInPackageResult } from './findFileInPackage.js';\nexport { getVersion } from './getVersion.js';\nexport { getDependencies } from './getDependencies.js';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,sBAAsB;AACtB,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAG1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAGxE,kCAAkC;AAClC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAkC,MAAM,yBAAyB,CAAC;AAC7F,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,qBAAqB;AACrB,OAAO,EAAE,eAAe,EAAkB,MAAM,sBAAsB,CAAC;AAEvE,oBAAoB;AACpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,uBAAuB;AACvB,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,8BAA8B;AAC9B,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,0BAA0B;AAC1B,OAAO,EAAE,gBAAgB,EAAmB,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAA+D,MAAM,wBAAwB,CAAC;AACxH,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC","sourcesContent":["// Package definition parsing\nexport { PackageDefinitions } from './PackageDefinitions.js';\n\n// ResolveMap creation\nexport { createResolveMap } from './createResolveMap/createResolveMap.js';\nexport type { ResolveMap } from './types/ResolveMap.js';\nexport type { ResolveMapEntry } from './types/ResolveMapEntry.js';\nexport { findResolveMapEntry } from './findResolveMapEntry.js';\nexport type { DiffResolveMapsChanges, DiffResolveMapsStats } from './createResolveMap/diffResolveMaps.js';\nexport { diffResolveMaps } from './createResolveMap/diffResolveMaps.js';\nexport type { LinkedPath } from './types/LinkedPath.js';\n\n// ExportsMap parsing and creation\nexport { flattenExportsMap } from './flattenExportsMap.js';\nexport { createExportsMap } from './createExportsMap.js';\nexport { addExportsMapEntry, type AddExportsMapEntryOptions } from './addExportsMapEntry.js';\nexport { getExportsMap } from './getExportsMap.js';\n\n// ImportMap creation\nexport { createImportMap, type ImportMap } from './createImportMap.js';\n\n// ImportMap hashing\nexport { addImportMapHash } from './addImportMapHash.js';\n\n// Import paths caching\nexport { PackageImportPaths } from './PackageImportPaths.js';\n\n// Import resolution utilities\nexport { resolve } from './resolve.js';\n\n// Other package utilities\nexport { detectModuleType, type ModuleType } from './detectModuleType.js';\nexport { isExternalPackage } from './isExternalPackage.js';\nexport { findFileInPackage, type FindFileInPackageOptions, type FindFileInPackageResult } from './findFileInPackage.js';\nexport { getVersion } from './getVersion.js';\nexport { getDependencies } from './getDependencies.js';\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/package-utilities",
-  "version": "5.1.12",
+  "version": "5.1.14",
   "description": "Utilities for resolving/parsing packages and their imports.",
   "license": "MIT",
   "type": "module",
@@ -14,9 +14,9 @@
     }
   },
   "dependencies": {
-    "@ms-cloudpack/bundler-types": "^0.19.3",
+    "@ms-cloudpack/bundler-types": "^0.19.4",
     "@ms-cloudpack/json-utilities": "^0.0.8",
-    "@ms-cloudpack/package-overrides": "^0.4.6",
+    "@ms-cloudpack/package-overrides": "^0.4.7",
     "@ms-cloudpack/path-utilities": "^2.3.5",
     "@ms-cloudpack/path-string-parsing": "^1.1.1",
     "fast-glob": "^3.2.12",