@ms-cloudpack/api-server 0.35.0 → 0.37.0

package/lib/utilities/createBundleRequestForPackage.d.ts

@@ -1,8 +1,8 @@
 import type { CloudpackConfig } from '@ms-cloudpack/common-types';
 import type { ResolveMapEntry } from '@ms-cloudpack/package-utilities';
 import type { BundleRequest } from '../types/BundleRequest.js';
-import type { PackageHashes } from '@ms-cloudpack/package-hashes';
 export declare function createBundleRequestForPackage(options: {
+    id: string;
     packageEntry: ResolveMapEntry;
     outputPath?: string;
     bundlerType?: string;
@@ -10,9 +10,7 @@ export declare function createBundleRequestForPackage(options: {
     shouldGetBundleInfo?: boolean;
     disableCache?: boolean;
     isIncremental?: boolean;
-    useHashAsId?: boolean;
 }, context: {
     config: CloudpackConfig;
-    packageHashes: PackageHashes;
-}): Promise<BundleRequest>;
+}): BundleRequest;
 //# sourceMappingURL=createBundleRequestForPackage.d.ts.map

package/lib/utilities/createBundleRequestForPackage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createBundleRequestForPackage.d.ts","sourceRoot":"","sources":["../../src/utilities/createBundleRequestForPackage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,wBAAsB,6BAA6B,CACjD,OAAO,EAAE;IACP,YAAY,EAAE,eAAe,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,EACD,OAAO,EAAE;IACP,MAAM,EAAE,eAAe,CAAC;IACxB,aAAa,EAAE,aAAa,CAAC;CAC9B,GACA,OAAO,CAAC,aAAa,CAAC,CA2BxB"}
+{"version":3,"file":"createBundleRequestForPackage.d.ts","sourceRoot":"","sources":["../../src/utilities/createBundleRequestForPackage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE/D,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE;IACP,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,eAAe,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,EACD,OAAO,EAAE;IACP,MAAM,EAAE,eAAe,CAAC;CACzB,GACA,aAAa,CAmBf"}

package/lib/utilities/createBundleRequestForPackage.js

@@ -1,15 +1,8 @@
-export async function createBundleRequestForPackage(options, context) {
-    const { packageEntry, isIncremental, useHashAsId } = options;
-    const { config, packageHashes } = context;
+export function createBundleRequestForPackage(options, context) {
+    const { id, packageEntry, isIncremental } = options;
+    const { config } = context;
     const { features = {} } = config;
     const { path, version, name, isExternal } = packageEntry;
-    const id = useHashAsId
-        ? await packageHashes.get({
-            packagePath: packageEntry.path,
-            isSourceHashingEnabled: false,
-            shouldRecalculate: true,
-        })
-        : path;
     return {
         id,
         packagePath: path,

package/lib/utilities/createBundleRequestForPackage.js.map

@@ -1 +1 @@
-{"version":3,"file":"createBundleRequestForPackage.js","sourceRoot":"","sources":["../../src/utilities/createBundleRequestForPackage.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,KAAK,UAAU,6BAA6B,CACjD,OASC,EACD,OAGC;IAED,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAC7D,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAC1C,MAAM,EAAE,QAAQ,GAAG,EAAE,EAAE,GAAG,MAAM,CAAC;IACjC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,YAAY,CAAC;IAEzD,MAAM,EAAE,GAAG,WAAW;QACpB,CAAC,CAAC,MAAM,aAAa,CAAC,GAAG,CAAC;YACtB,WAAW,EAAE,YAAY,CAAC,IAAI;YAC9B,sBAAsB,EAAE,KAAK;YAC7B,iBAAiB,EAAE,IAAI;SACxB,CAAC;QACJ,CAAC,CAAC,IAAI,CAAC;IAET,OAAO;QACL,EAAE;QACF,WAAW,EAAE,IAAI;QACjB,WAAW,EAAE,IAAI;QACjB,UAAU,EAAE,CAAC,CAAC,UAAU;QACxB,aAAa,EAAE,aAAa;QAC5B,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,OAAO;QACP,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,IAAI,QAAQ,CAAC,iBAAiB;QAC1E,mBAAmB,EAAE,OAAO,CAAC,mBAAmB,IAAI,QAAQ,CAAC,mBAAmB;QAChF,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,WAAW,EAAE,OAAO,CAAC,WAAW;KACjC,CAAC;AACJ,CAAC","sourcesContent":["import type { CloudpackConfig } from '@ms-cloudpack/common-types';\nimport type { ResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport type { BundleRequest } from '../types/BundleRequest.js';\nimport type { PackageHashes } from '@ms-cloudpack/package-hashes';\n\nexport async function createBundleRequestForPackage(\n  options: {\n    packageEntry: ResolveMapEntry;\n    outputPath?: string;\n    bundlerType?: string;\n    disableSourceMaps?: boolean;\n    shouldGetBundleInfo?: boolean;\n    disableCache?: boolean;\n    isIncremental?: boolean;\n    useHashAsId?: boolean;\n  },\n  context: {\n    config: CloudpackConfig;\n    packageHashes: PackageHashes;\n  },\n): Promise<BundleRequest> {\n  const { packageEntry, isIncremental, useHashAsId } = options;\n  const { config, packageHashes } = context;\n  const { features = {} } = config;\n  const { path, version, name, isExternal } = packageEntry;\n\n  const id = useHashAsId\n    ? await packageHashes.get({\n        packagePath: packageEntry.path,\n        isSourceHashingEnabled: false,\n        shouldRecalculate: true,\n      })\n    : path;\n\n  return {\n    id,\n    packagePath: path,\n    packageName: name,\n    isExternal: !!isExternal,\n    isIncremental: isIncremental,\n    outputPath: options.outputPath,\n    version,\n    disableSourceMaps: options.disableSourceMaps ?? features.disableSourceMaps,\n    shouldGetBundleInfo: options.shouldGetBundleInfo ?? features.enqueueDependencies,\n    disableCache: options.disableCache,\n    bundlerType: options.bundlerType,\n  };\n}\n"]}
+{"version":3,"file":"createBundleRequestForPackage.js","sourceRoot":"","sources":["../../src/utilities/createBundleRequestForPackage.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,6BAA6B,CAC3C,OASC,EACD,OAEC;IAED,MAAM,EAAE,EAAE,EAAE,YAAY,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IACpD,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,MAAM,EAAE,QAAQ,GAAG,EAAE,EAAE,GAAG,MAAM,CAAC;IACjC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,YAAY,CAAC;IAEzD,OAAO;QACL,EAAE;QACF,WAAW,EAAE,IAAI;QACjB,WAAW,EAAE,IAAI;QACjB,UAAU,EAAE,CAAC,CAAC,UAAU;QACxB,aAAa,EAAE,aAAa;QAC5B,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,OAAO;QACP,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,IAAI,QAAQ,CAAC,iBAAiB;QAC1E,mBAAmB,EAAE,OAAO,CAAC,mBAAmB,IAAI,QAAQ,CAAC,mBAAmB;QAChF,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,WAAW,EAAE,OAAO,CAAC,WAAW;KACjC,CAAC;AACJ,CAAC","sourcesContent":["import type { CloudpackConfig } from '@ms-cloudpack/common-types';\nimport type { ResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport type { BundleRequest } from '../types/BundleRequest.js';\n\nexport function createBundleRequestForPackage(\n  options: {\n    id: string;\n    packageEntry: ResolveMapEntry;\n    outputPath?: string;\n    bundlerType?: string;\n    disableSourceMaps?: boolean;\n    shouldGetBundleInfo?: boolean;\n    disableCache?: boolean;\n    isIncremental?: boolean;\n  },\n  context: {\n    config: CloudpackConfig;\n  },\n): BundleRequest {\n  const { id, packageEntry, isIncremental } = options;\n  const { config } = context;\n  const { features = {} } = config;\n  const { path, version, name, isExternal } = packageEntry;\n\n  return {\n    id,\n    packagePath: path,\n    packageName: name,\n    isExternal: !!isExternal,\n    isIncremental: isIncremental,\n    outputPath: options.outputPath,\n    version,\n    disableSourceMaps: options.disableSourceMaps ?? features.disableSourceMaps,\n    shouldGetBundleInfo: options.shouldGetBundleInfo ?? features.enqueueDependencies,\n    disableCache: options.disableCache,\n    bundlerType: options.bundlerType,\n  };\n}\n"]}

package/lib/utilities/createBundleTask.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createBundleTask.d.ts","sourceRoot":"","sources":["../../src/utilities/createBundleTask.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAK7C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE;IACvC,aAAa,EAAE,aAAa,CAAC;IAC7B,OAAO,EAAE;QACP,OAAO,EAAE,OAAO,CAAC;QACjB,QAAQ,EAAE,uBAAuB,CAAC;QAClC,aAAa,EAAE,aAAa,CAAC;QAC7B,kBAAkB,EAAE,kBAAkB,CAAC;QACvC,QAAQ,CAAC,EAAE,YAAY,CAAC;QACxB,eAAe,CAAC,EAAE,eAAe,CAAC;KACnC,CAAC;IACF,OAAO,CAAC,EAAE,iBAAiB,CAAC;CAC7B,GAAG,IAAI,CAAC,aAAa,CAAC,CAkEtB"}
+{"version":3,"file":"createBundleTask.d.ts","sourceRoot":"","sources":["../../src/utilities/createBundleTask.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAK7C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE;IACvC,aAAa,EAAE,aAAa,CAAC;IAC7B,OAAO,EAAE;QACP,OAAO,EAAE,OAAO,CAAC;QACjB,QAAQ,EAAE,uBAAuB,CAAC;QAClC,aAAa,EAAE,aAAa,CAAC;QAC7B,kBAAkB,EAAE,kBAAkB,CAAC;QACvC,QAAQ,CAAC,EAAE,YAAY,CAAC;QACxB,eAAe,CAAC,EAAE,eAAe,CAAC;KACnC,CAAC;IACF,OAAO,CAAC,EAAE,iBAAiB,CAAC;CAC7B,GAAG,IAAI,CAAC,aAAa,CAAC,CAoEtB"}

package/lib/utilities/createBundleTask.js

@@ -7,10 +7,11 @@ import { addImportMapHash } from '@ms-cloudpack/import-map';
  * remotely (e.g. in the browser) and allows the user to cancel tasks.
  */
 export function createBundleTask(params) {
-    const { bundleRequest, context, options } = params;
+    const { bundleRequest, context, options = {} } = params;
     const { id, packageName, version, packagePath, isExternal } = bundleRequest;
     const { session, reporter, telemetryClient, packageImportPaths, packages, packageHashes } = context;
     const { config, resolveMap } = session;
+    const { hash, sourceHash } = options;
     return {
         name: `Bundle ${packageName}@${version}`,
         id,
@@ -30,8 +31,8 @@ export function createBundleTask(params) {
                 },
             });
             try {
-                const hash = await packageHashes.get({ packagePath, isSourceHashingEnabled: !isExternal });
-                addImportMapHash({ packageName, version, importMap: session.getImportMap(), resolveMap, hash }, {
+                const importMapHash = sourceHash || hash || (await packageHashes.get({ packagePath, isSourceHashingEnabled: !isExternal }));
+                addImportMapHash({ packageName, version, importMap: session.getImportMap(), resolveMap, hash: importMapHash }, {
                     packageImportPaths,
                 });
             }

package/lib/utilities/createBundleTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"createBundleTask.js","sourceRoot":"","sources":["../../src/utilities/createBundleTask.ts"],"names":[],"mappings":"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","sourcesContent":["import type { BundleTaskOptions } from '../types/BundleTaskOptions.js';\nimport type { BundleRequest } from '../types/BundleRequest.js';\nimport type { Task } from '../types/Task.js';\nimport type { TaskEndDescription } from '../types/TaskEndDescription.js';\nimport path from 'path';\nimport fs from 'fs';\nimport { bundleTask } from './bundleTask.js';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport { addImportMapHash } from '@ms-cloudpack/import-map';\nimport type { Session } from '../types/Session.js';\nimport type { TelemetryClient } from '@ms-cloudpack/telemetry';\nimport type { PackageImportPaths } from '@ms-cloudpack/import-map';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport type { PackageHashes } from '@ms-cloudpack/package-hashes';\n\n/**\n * Creates a bundle task tracked in the task runner of the api server. This allows active tasks to be tracked\n * remotely (e.g. in the browser) and allows the user to cancel tasks.\n */\nexport function createBundleTask(params: {\n  bundleRequest: BundleRequest;\n  context: {\n    session: Session;\n    packages: PackageDefinitionsCache;\n    packageHashes: PackageHashes;\n    packageImportPaths: PackageImportPaths;\n    reporter?: TaskReporter;\n    telemetryClient?: TelemetryClient;\n  };\n  options?: BundleTaskOptions;\n}): Task<BundleRequest> {\n  const { bundleRequest, context, options } = params;\n  const { id, packageName, version, packagePath, isExternal } = bundleRequest;\n  const { session, reporter, telemetryClient, packageImportPaths, packages, packageHashes } = context;\n  const { config, resolveMap } = session;\n\n  return {\n    name: `Bundle ${packageName}@${version}`,\n    id,\n    dir: `${path.join(packagePath, 'src')}`,\n    watch: !isExternal,\n    async execute(): Promise<BundleRequest> {\n      await bundleTask({\n        bundleRequest,\n        options,\n        context: {\n          packages,\n          config,\n          resolveMap,\n          packageHashes,\n          reporter,\n          telemetryClient,\n        },\n      });\n      try {\n        const hash = await packageHashes.get({ packagePath, isSourceHashingEnabled: !isExternal });\n        addImportMapHash(\n          { packageName, version, importMap: session.getImportMap(), resolveMap, hash },\n          {\n            packageImportPaths,\n          },\n        );\n      } catch (e) {\n        console.error(`Error adding hash to import map for ${bundleRequest.packagePath}:`, (e as Error).stack || e);\n      }\n      return bundleRequest;\n    },\n    clear: () => {\n      if (!bundleRequest.result) {\n        return;\n      }\n\n      bundleRequest.result.dispose?.();\n\n      // eslint-disable-next-line @ms-cloudpack/internal/no-sync-filesystem -- this function can't be async\n      fs.rmSync(bundleRequest.result.outputPath, { recursive: true, force: true });\n\n      bundleRequest.result = undefined;\n    },\n    onDispose: () => {\n      bundleRequest.result?.dispose?.();\n    },\n    getErrors: () => bundleRequest.result?.errors,\n    getStartDescription: () => ({\n      id,\n      name: `Bundle ${packageName}@${version}`,\n      inputPath: packagePath || '',\n    }),\n    getEndDescription: (taskResult) =>\n      ({\n        id,\n        errors: taskResult?.result?.errors,\n        warnings: taskResult?.result?.warnings,\n        outputPath: bundleRequest.result?.outputPath || '',\n      }) as TaskEndDescription,\n  };\n}\n"]}
+{"version":3,"file":"createBundleTask.js","sourceRoot":"","sources":["../../src/utilities/createBundleTask.ts"],"names":[],"mappings":"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","sourcesContent":["import type { BundleTaskOptions } from '../types/BundleTaskOptions.js';\nimport type { BundleRequest } from '../types/BundleRequest.js';\nimport type { Task } from '../types/Task.js';\nimport type { TaskEndDescription } from '../types/TaskEndDescription.js';\nimport path from 'path';\nimport fs from 'fs';\nimport { bundleTask } from './bundleTask.js';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport { addImportMapHash } from '@ms-cloudpack/import-map';\nimport type { Session } from '../types/Session.js';\nimport type { TelemetryClient } from '@ms-cloudpack/telemetry';\nimport type { PackageImportPaths } from '@ms-cloudpack/import-map';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport type { PackageHashes } from '@ms-cloudpack/package-hashes';\n\n/**\n * Creates a bundle task tracked in the task runner of the api server. This allows active tasks to be tracked\n * remotely (e.g. in the browser) and allows the user to cancel tasks.\n */\nexport function createBundleTask(params: {\n  bundleRequest: BundleRequest;\n  context: {\n    session: Session;\n    packages: PackageDefinitionsCache;\n    packageHashes: PackageHashes;\n    packageImportPaths: PackageImportPaths;\n    reporter?: TaskReporter;\n    telemetryClient?: TelemetryClient;\n  };\n  options?: BundleTaskOptions;\n}): Task<BundleRequest> {\n  const { bundleRequest, context, options = {} } = params;\n  const { id, packageName, version, packagePath, isExternal } = bundleRequest;\n  const { session, reporter, telemetryClient, packageImportPaths, packages, packageHashes } = context;\n  const { config, resolveMap } = session;\n  const { hash, sourceHash } = options;\n\n  return {\n    name: `Bundle ${packageName}@${version}`,\n    id,\n    dir: `${path.join(packagePath, 'src')}`,\n    watch: !isExternal,\n    async execute(): Promise<BundleRequest> {\n      await bundleTask({\n        bundleRequest,\n        options,\n        context: {\n          packages,\n          config,\n          resolveMap,\n          packageHashes,\n          reporter,\n          telemetryClient,\n        },\n      });\n      try {\n        const importMapHash =\n          sourceHash || hash || (await packageHashes.get({ packagePath, isSourceHashingEnabled: !isExternal }));\n        addImportMapHash(\n          { packageName, version, importMap: session.getImportMap(), resolveMap, hash: importMapHash },\n          {\n            packageImportPaths,\n          },\n        );\n      } catch (e) {\n        console.error(`Error adding hash to import map for ${bundleRequest.packagePath}:`, (e as Error).stack || e);\n      }\n      return bundleRequest;\n    },\n    clear: () => {\n      if (!bundleRequest.result) {\n        return;\n      }\n\n      bundleRequest.result.dispose?.();\n\n      // eslint-disable-next-line @ms-cloudpack/internal/no-sync-filesystem -- this function can't be async\n      fs.rmSync(bundleRequest.result.outputPath, { recursive: true, force: true });\n\n      bundleRequest.result = undefined;\n    },\n    onDispose: () => {\n      bundleRequest.result?.dispose?.();\n    },\n    getErrors: () => bundleRequest.result?.errors,\n    getStartDescription: () => ({\n      id,\n      name: `Bundle ${packageName}@${version}`,\n      inputPath: packagePath || '',\n    }),\n    getEndDescription: (taskResult) =>\n      ({\n        id,\n        errors: taskResult?.result?.errors,\n        warnings: taskResult?.result?.warnings,\n        outputPath: bundleRequest.result?.outputPath || '',\n      }) as TaskEndDescription,\n  };\n}\n"]}

package/lib/utilities/createRemoteCacheClient.js

@@ -4,11 +4,11 @@ export async function createRemoteCacheClient(params) {
     const { ctx, input } = params;
     const { loginMethod } = input;
     const { session, reporter, telemetryClient } = ctx;
-    const { container, storageAccount } = ensureRemoteCacheEnabled(session.config);
+    const { container, storageAccount, tenantId } = ensureRemoteCacheEnabled(session.config);
     const remoteCacheModule = await import('@ms-cloudpack/remote-cache');
     const client = await remoteCacheModule.createRemoteCacheClient({
         context: { reporter, telemetryClient },
-        options: { container, loginMethod, storageAccount, cachePath: getCachePath() },
+        options: { container, loginMethod, storageAccount, cachePath: getCachePath(), tenantId },
     });
     return client;
 }

package/lib/utilities/createRemoteCacheClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"createRemoteCacheClient.js","sourceRoot":"","sources":["../../src/utilities/createRemoteCacheClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AAGpF,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,MAKC;IAED,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IAC9B,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;IAC9B,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,GAAG,CAAC;IACnD,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,wBAAwB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAE/E,MAAM,iBAAiB,GAAG,MAAM,MAAM,CAAC,4BAA4B,CAAC,CAAC;IAErE,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,uBAAuB,CAAC;QAC7D,OAAO,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE;QACtC,OAAO,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,cAAc,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE;KAC/E,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import { ensureRemoteCacheEnabled } from '../utilities/ensureRemoteCacheEnabled.js';\nimport type { LoginMethod } from '@ms-cloudpack/remote-cache';\nimport type { ApiParams } from '../types/ApiParams.js';\nimport { getCachePath } from './getCachePath.js';\n\nexport async function createRemoteCacheClient(\n  params: ApiParams<\n    {\n      loginMethod: LoginMethod;\n    },\n    'session' | 'reporter' | 'telemetryClient'\n  >,\n) {\n  const { ctx, input } = params;\n  const { loginMethod } = input;\n  const { session, reporter, telemetryClient } = ctx;\n  const { container, storageAccount } = ensureRemoteCacheEnabled(session.config);\n\n  const remoteCacheModule = await import('@ms-cloudpack/remote-cache');\n\n  const client = await remoteCacheModule.createRemoteCacheClient({\n    context: { reporter, telemetryClient },\n    options: { container, loginMethod, storageAccount, cachePath: getCachePath() },\n  });\n\n  return client;\n}\n"]}
+{"version":3,"file":"createRemoteCacheClient.js","sourceRoot":"","sources":["../../src/utilities/createRemoteCacheClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AAGpF,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,MAKC;IAED,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IAC9B,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;IAC9B,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,GAAG,CAAC;IACnD,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,wBAAwB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAEzF,MAAM,iBAAiB,GAAG,MAAM,MAAM,CAAC,4BAA4B,CAAC,CAAC;IAErE,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,uBAAuB,CAAC;QAC7D,OAAO,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE;QACtC,OAAO,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,cAAc,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,QAAQ,EAAE;KACzF,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import { ensureRemoteCacheEnabled } from '../utilities/ensureRemoteCacheEnabled.js';\nimport type { LoginMethod } from '@ms-cloudpack/remote-cache';\nimport type { ApiParams } from '../types/ApiParams.js';\nimport { getCachePath } from './getCachePath.js';\n\nexport async function createRemoteCacheClient(\n  params: ApiParams<\n    {\n      loginMethod: LoginMethod;\n    },\n    'session' | 'reporter' | 'telemetryClient'\n  >,\n) {\n  const { ctx, input } = params;\n  const { loginMethod } = input;\n  const { session, reporter, telemetryClient } = ctx;\n  const { container, storageAccount, tenantId } = ensureRemoteCacheEnabled(session.config);\n\n  const remoteCacheModule = await import('@ms-cloudpack/remote-cache');\n\n  const client = await remoteCacheModule.createRemoteCacheClient({\n    context: { reporter, telemetryClient },\n    options: { container, loginMethod, storageAccount, cachePath: getCachePath(), tenantId },\n  });\n\n  return client;\n}\n"]}

package/lib/utilities/ensureRemoteCacheEnabled.d.ts

@@ -7,5 +7,6 @@ import type { CloudpackConfig } from '@ms-cloudpack/common-types';
 export declare function ensureRemoteCacheEnabled({ remoteCache }: CloudpackConfig): {
     storageAccount: string;
     container: string;
+    tenantId?: string | undefined;
 };
 //# sourceMappingURL=ensureRemoteCacheEnabled.d.ts.map

package/lib/utilities/ensureRemoteCacheEnabled.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ensureRemoteCacheEnabled.d.ts","sourceRoot":"","sources":["../../src/utilities/ensureRemoteCacheEnabled.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAElE;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,EAAE,WAAW,EAAE,EAAE,eAAe;;;EAMxE"}
+{"version":3,"file":"ensureRemoteCacheEnabled.d.ts","sourceRoot":"","sources":["../../src/utilities/ensureRemoteCacheEnabled.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAElE;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,EAAE,WAAW,EAAE,EAAE,eAAe;;;;EAMxE"}

package/lib/utilities/formatBundleErrors.d.ts

@@ -1,5 +1,5 @@
 import type { BundleMessage } from '@ms-cloudpack/common-types';
-export declare function formatBundleErrors(errors: BundleMessage[] | undefined): {
+export declare function formatBundleErrors(errors: BundleMessage[] | undefined, packagePath: string): {
     message?: undefined;
     details?: undefined;
 } | {

package/lib/utilities/formatBundleErrors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"formatBundleErrors.d.ts","sourceRoot":"","sources":["../../src/utilities/formatBundleErrors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAGhE,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,SAAS;;;;;;EAOrE"}
+{"version":3,"file":"formatBundleErrors.d.ts","sourceRoot":"","sources":["../../src/utilities/formatBundleErrors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAIhE,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,SAAS,EAAE,WAAW,EAAE,MAAM;;;;;;EAO1F"}

package/lib/utilities/formatBundleErrors.js

@@ -1,19 +1,16 @@
-import { darkGrey, red, bulletedList } from '@ms-cloudpack/task-reporter';
-export function formatBundleErrors(errors) {
+import { formatLocation } from '@ms-cloudpack/path-utilities';
+import { red, bulletedList, plural, indent } from '@ms-cloudpack/task-reporter';
+export function formatBundleErrors(errors, packagePath) {
     if (!errors?.length)
         return {};
     return {
-        message: `${errors.length} ${errors.length === 1 ? 'error' : 'errors'} found`,
-        details: bulletedList(errors.map((error) => formatError(error))),
+        message: plural(errors.length, 'error$s found'),
+        details: bulletedList(errors.map((error) => formatError(error, packagePath))),
     };
 }
-function formatError(error) {
-    const { location } = error;
-    return [
-        location && darkGrey(`${location.file}:${location.line}:${location.column}:`),
-        red(error.text ? error.text : JSON.stringify(error, null, 2)),
-    ]
-        .filter(Boolean)
-        .join(' ');
+function formatError(error, packagePath) {
+    const { text, source, location } = error;
+    const filePath = location ? ' ' + formatLocation({ ...location, fromPath: packagePath }) : '';
+    return `[${source}]${filePath}\n${red(indent(text, 1))}`;
 }
 //# sourceMappingURL=formatBundleErrors.js.map

package/lib/utilities/formatBundleErrors.js.map

@@ -1 +1 @@
-{"version":3,"file":"formatBundleErrors.js","sourceRoot":"","sources":["../../src/utilities/formatBundleErrors.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE1E,MAAM,UAAU,kBAAkB,CAAC,MAAmC;IACpE,IAAI,CAAC,MAAM,EAAE,MAAM;QAAE,OAAO,EAAE,CAAC;IAE/B,OAAO;QACL,OAAO,EAAE,GAAG,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,QAAQ;QAC7E,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;KACjE,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,KAAoB;IACvC,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAE3B,OAAO;QACL,QAAQ,IAAI,QAAQ,CAAC,GAAG,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC;QAC7E,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;KAC9D;SACE,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;AACf,CAAC","sourcesContent":["import type { BundleMessage } from '@ms-cloudpack/common-types';\nimport { darkGrey, red, bulletedList } from '@ms-cloudpack/task-reporter';\n\nexport function formatBundleErrors(errors: BundleMessage[] | undefined) {\n  if (!errors?.length) return {};\n\n  return {\n    message: `${errors.length} ${errors.length === 1 ? 'error' : 'errors'} found`,\n    details: bulletedList(errors.map((error) => formatError(error))),\n  };\n}\n\nfunction formatError(error: BundleMessage) {\n  const { location } = error;\n\n  return [\n    location && darkGrey(`${location.file}:${location.line}:${location.column}:`),\n    red(error.text ? error.text : JSON.stringify(error, null, 2)),\n  ]\n    .filter(Boolean)\n    .join(' ');\n}\n"]}
+{"version":3,"file":"formatBundleErrors.js","sourceRoot":"","sources":["../../src/utilities/formatBundleErrors.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAEhF,MAAM,UAAU,kBAAkB,CAAC,MAAmC,EAAE,WAAmB;IACzF,IAAI,CAAC,MAAM,EAAE,MAAM;QAAE,OAAO,EAAE,CAAC;IAE/B,OAAO;QACL,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;QAC/C,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC;KAC9E,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,KAAoB,EAAE,WAAmB;IAC5D,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAEzC,MAAM,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,GAAG,cAAc,CAAC,EAAE,GAAG,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9F,OAAO,IAAI,MAAM,IAAI,QAAQ,KAAK,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AAC3D,CAAC","sourcesContent":["import type { BundleMessage } from '@ms-cloudpack/common-types';\nimport { formatLocation } from '@ms-cloudpack/path-utilities';\nimport { red, bulletedList, plural, indent } from '@ms-cloudpack/task-reporter';\n\nexport function formatBundleErrors(errors: BundleMessage[] | undefined, packagePath: string) {\n  if (!errors?.length) return {};\n\n  return {\n    message: plural(errors.length, 'error$s found'),\n    details: bulletedList(errors.map((error) => formatError(error, packagePath))),\n  };\n}\n\nfunction formatError(error: BundleMessage, packagePath: string) {\n  const { text, source, location } = error;\n\n  const filePath = location ? ' ' + formatLocation({ ...location, fromPath: packagePath }) : '';\n  return `[${source}]${filePath}\\n${red(indent(text, 1))}`;\n}\n"]}

package/lib/utilities/getBundleInfo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getBundleInfo.d.ts","sourceRoot":"","sources":["../../src/utilities/getBundleInfo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAIvF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD;;GAEG;AACH,wBAAsB,aAAa,CAAC,MAAM,EAAE;IAC1C,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,gBAAgB,EAAE,CAAC;IAChC,UAAU,EAAE,kBAAkB,CAAC;IAC/B,UAAU,EAAE,OAAO,CAAC;CACrB,GAAG,OAAO,CAAC,UAAU,CAAC,CAoHtB"}
+{"version":3,"file":"getBundleInfo.d.ts","sourceRoot":"","sources":["../../src/utilities/getBundleInfo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAIvF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD;;GAEG;AACH,wBAAsB,aAAa,CAAC,MAAM,EAAE;IAC1C,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,gBAAgB,EAAE,CAAC;IAChC,UAAU,EAAE,kBAAkB,CAAC;IAC/B,UAAU,EAAE,OAAO,CAAC;CACrB,GAAG,OAAO,CAAC,UAAU,CAAC,CAmHtB"}

package/lib/utilities/getBundleInfo.js

@@ -7,9 +7,7 @@ import { getImportsAndExports } from './getImportsAndExports.js';
  */
 export async function getBundleInfo(params) {
     const { outputPath, outputFiles, exportsMap, isExternal } = params;
-    const bundleInfo = {
-        entry: {},
-    };
+    const bundleInfo = {};
     // If there are no output files, return the empty bundle info.
     if (!outputFiles.length) {
         return bundleInfo;
@@ -54,7 +52,7 @@ export async function getBundleInfo(params) {
             continue;
         }
         const safePath = localPathToSafe[filePath];
-        if (safePath === undefined) {
+        if (safePath === undefined || !outputFileInfo[safePath]) {
             throw new Error(`Found file that was not expected to be processed: ${filePath}`);
         }
         const parseResult = await getImportsAndExports(filePath);
@@ -62,12 +60,9 @@ export async function getBundleInfo(params) {
             continue;
         }
         const { exportNames, imports } = parseResult;
-        const { entry, produces } = outputFileInfo[safePath] || {
-            entry: safePath,
-            produces: new Set(),
-        };
+        const { entry, produces } = outputFileInfo[safePath];
         exportNames.forEach((name) => produces.add(name));
-        bundleInfo.entry[entry] ??= {
+        bundleInfo[entry] ??= {
             bundlePath: safePath,
             produces: Array.from(produces),
             consumes: [],
@@ -83,15 +78,19 @@ export async function getBundleInfo(params) {
             }
             else if (packageName && !packageName.startsWith('node:')) {
                 // Find if the import is already in the consumes list.
-                const entryIndex = bundleInfo.entry[entry].consumes.findIndex((c) => c.packageName === packageName && c.importPath === importPath);
+                const entryIndex = bundleInfo[entry].consumes.findIndex((c) => c.packageName === packageName && c.importPath === importPath);
                 if (entryIndex < 0) {
                     // If not, add it.
-                    bundleInfo.entry[entry].consumes.push({ packageName, importPath: importPath || '.', names: [...names] });
+                    bundleInfo[entry].consumes.push({
+                        packageName: packageName,
+                        importPath: importPath || '.',
+                        names: [...names],
+                    });
                 }
                 else {
                     // If so, add the names to the existing entry.
                     // This is necessary because the same import may be used in multiple places.
-                    bundleInfo.entry[entry].consumes[entryIndex].names = Array.from(new Set([...names, ...bundleInfo.entry[entry].consumes[entryIndex].names]));
+                    bundleInfo[entry].consumes[entryIndex].names = Array.from(new Set([...names, ...bundleInfo[entry].consumes[entryIndex].names]));
                 }
             }
         }
@@ -99,7 +98,7 @@ export async function getBundleInfo(params) {
             // Multiple entries for the same path.
             for (const repeatedEntry of repeatedExports[safePath]) {
                 if (repeatedEntry !== entry) {
-                    bundleInfo.entry[repeatedEntry] = bundleInfo.entry[entry];
+                    bundleInfo[repeatedEntry] = bundleInfo[entry];
                 }
             }
         }

package/lib/utilities/getBundleInfo.js.map

@@ -1 +1 @@
-{"version":3,"file":"getBundleInfo.js","sourceRoot":"","sources":["../../src/utilities/getBundleInfo.ts"],"names":[],"mappings":"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","sourcesContent":["import type { BundleOutputFile, PackageJsonExports } from '@ms-cloudpack/common-types';\nimport { getRuntimeEntryPaths } from '@ms-cloudpack/import-map';\nimport { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport path from 'path';\nimport type { BundleInfo } from '../types/BundleInfo.js';\nimport { getImportsAndExports } from './getImportsAndExports.js';\n/**\n * Returns a mapping from entry file path to list of paths that are produced and consumed in the searched files.\n */\nexport async function getBundleInfo(params: {\n  outputPath: string;\n  outputFiles: BundleOutputFile[];\n  exportsMap: PackageJsonExports;\n  isExternal: boolean;\n}): Promise<BundleInfo> {\n  const { outputPath, outputFiles, exportsMap, isExternal } = params;\n  const bundleInfo: BundleInfo = {\n    entry: {},\n  };\n\n  // If there are no output files, return the empty bundle info.\n  if (!outputFiles.length) {\n    return bundleInfo;\n  }\n\n  /** Mapping from output file (safe/normalized relative path) to possible entry path and exports. */\n  const outputFileInfo: Record<string, { entry: string; produces: Set<string> }> = {};\n  outputFiles.forEach((file) => {\n    // Normalize the path to start with ./ (or . for an empty path)\n    const safePath = normalizeRelativePath(file.outputPath);\n    // Store safe path to possible entry path and exports.\n    outputFileInfo[safePath] = {\n      entry: safePath,\n      produces: new Set<string>(file.exports),\n    };\n  });\n\n  const repeatedExports: Record<string, string[]> = {};\n  const entryPaths = getRuntimeEntryPaths({ isExternal, exportsMap });\n\n  for (const [importPath, actualEntryPath] of Object.entries(entryPaths)) {\n    const safePath = normalizeRelativePath(actualEntryPath);\n\n    if (outputFileInfo[safePath]) {\n      if (repeatedExports[safePath]) {\n        repeatedExports[safePath].push(importPath);\n      } else {\n        // Change best guess entry path to exports map entry.\n        outputFileInfo[safePath].entry = importPath;\n        repeatedExports[safePath] = [importPath];\n      }\n    }\n  }\n\n  const localPathToSafe: Record<string, string> = {};\n  Object.keys(outputFileInfo).forEach((safePath) => {\n    localPathToSafe[path.resolve(outputPath, safePath)] = safePath;\n  });\n\n  const filePaths = Object.keys(localPathToSafe);\n  const visitedPaths = new Set(filePaths);\n  const pathsToParse = [...filePaths];\n\n  while (pathsToParse.length) {\n    const filePath = pathsToParse.shift();\n    // Ignore any non-JS/TS files such as SVGs and sourcemaps\n    if (!filePath || path.extname(filePath) !== '.js') {\n      continue;\n    }\n\n    const safePath = localPathToSafe[filePath];\n    if (safePath === undefined) {\n      throw new Error(`Found file that was not expected to be processed: ${filePath}`);\n    }\n\n    const parseResult = await getImportsAndExports(filePath);\n    if (!parseResult) {\n      continue;\n    }\n    const { exportNames, imports } = parseResult;\n\n    const { entry, produces } = outputFileInfo[safePath] || {\n      entry: safePath,\n      produces: new Set<string>(),\n    };\n    exportNames.forEach((name) => produces.add(name));\n\n    bundleInfo.entry[entry] ??= {\n      bundlePath: safePath,\n      produces: Array.from(produces),\n      consumes: [],\n    };\n\n    for (const { packageName, importPath, names } of imports) {\n      if (packageName?.startsWith('.')) {\n        const localPath = path.resolve(path.dirname(filePath), packageName, importPath || '');\n\n        if (!visitedPaths.has(localPath)) {\n          visitedPaths.add(localPath);\n          pathsToParse.push(localPath);\n          localPathToSafe[localPath] = importPath;\n        }\n      } else if (packageName && !packageName.startsWith('node:')) {\n        // Find if the import is already in the consumes list.\n        const entryIndex = bundleInfo.entry[entry].consumes.findIndex(\n          (c) => c.packageName === packageName && c.importPath === importPath,\n        );\n        if (entryIndex < 0) {\n          // If not, add it.\n          bundleInfo.entry[entry].consumes.push({ packageName, importPath: importPath || '.', names: [...names] });\n        } else {\n          // If so, add the names to the existing entry.\n          // This is necessary because the same import may be used in multiple places.\n          bundleInfo.entry[entry].consumes[entryIndex].names = Array.from(\n            new Set([...names, ...bundleInfo.entry[entry].consumes[entryIndex].names]),\n          );\n        }\n      }\n    }\n    if (repeatedExports[safePath]?.length > 1) {\n      // Multiple entries for the same path.\n      for (const repeatedEntry of repeatedExports[safePath]) {\n        if (repeatedEntry !== entry) {\n          bundleInfo.entry[repeatedEntry] = bundleInfo.entry[entry];\n        }\n      }\n    }\n  }\n\n  return bundleInfo;\n}\n"]}
+{"version":3,"file":"getBundleInfo.js","sourceRoot":"","sources":["../../src/utilities/getBundleInfo.ts"],"names":[],"mappings":"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","sourcesContent":["import type { BundleOutputFile, PackageJsonExports } from '@ms-cloudpack/common-types';\nimport { getRuntimeEntryPaths } from '@ms-cloudpack/import-map';\nimport { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport path from 'path';\nimport type { BundleInfo } from '../types/BundleInfo.js';\nimport { getImportsAndExports } from './getImportsAndExports.js';\n/**\n * Returns a mapping from entry file path to list of paths that are produced and consumed in the searched files.\n */\nexport async function getBundleInfo(params: {\n  outputPath: string;\n  outputFiles: BundleOutputFile[];\n  exportsMap: PackageJsonExports;\n  isExternal: boolean;\n}): Promise<BundleInfo> {\n  const { outputPath, outputFiles, exportsMap, isExternal } = params;\n  const bundleInfo: BundleInfo = {};\n\n  // If there are no output files, return the empty bundle info.\n  if (!outputFiles.length) {\n    return bundleInfo;\n  }\n\n  /** Mapping from output file (safe/normalized relative path) to possible entry path and exports. */\n  const outputFileInfo: Record<string, { entry: string; produces: Set<string> }> = {};\n  outputFiles.forEach((file) => {\n    // Normalize the path to start with ./ (or . for an empty path)\n    const safePath = normalizeRelativePath(file.outputPath);\n    // Store safe path to possible entry path and exports.\n    outputFileInfo[safePath] = {\n      entry: safePath,\n      produces: new Set<string>(file.exports),\n    };\n  });\n\n  const repeatedExports: Record<string, string[]> = {};\n  const entryPaths = getRuntimeEntryPaths({ isExternal, exportsMap });\n\n  for (const [importPath, actualEntryPath] of Object.entries(entryPaths)) {\n    const safePath = normalizeRelativePath(actualEntryPath);\n\n    if (outputFileInfo[safePath]) {\n      if (repeatedExports[safePath]) {\n        repeatedExports[safePath].push(importPath);\n      } else {\n        // Change best guess entry path to exports map entry.\n        outputFileInfo[safePath].entry = importPath;\n        repeatedExports[safePath] = [importPath];\n      }\n    }\n  }\n\n  const localPathToSafe: Record<string, string> = {};\n  Object.keys(outputFileInfo).forEach((safePath) => {\n    localPathToSafe[path.resolve(outputPath, safePath)] = safePath;\n  });\n\n  const filePaths = Object.keys(localPathToSafe);\n  const visitedPaths = new Set(filePaths);\n  const pathsToParse = [...filePaths];\n\n  while (pathsToParse.length) {\n    const filePath = pathsToParse.shift();\n    // Ignore any non-JS/TS files such as SVGs and sourcemaps\n    if (!filePath || path.extname(filePath) !== '.js') {\n      continue;\n    }\n\n    const safePath = localPathToSafe[filePath];\n    if (safePath === undefined || !outputFileInfo[safePath]) {\n      throw new Error(`Found file that was not expected to be processed: ${filePath}`);\n    }\n\n    const parseResult = await getImportsAndExports(filePath);\n    if (!parseResult) {\n      continue;\n    }\n    const { exportNames, imports } = parseResult;\n\n    const { entry, produces } = outputFileInfo[safePath];\n    exportNames.forEach((name) => produces.add(name));\n\n    bundleInfo[entry] ??= {\n      bundlePath: safePath,\n      produces: Array.from(produces),\n      consumes: [],\n    };\n\n    for (const { packageName, importPath, names } of imports) {\n      if (packageName?.startsWith('.')) {\n        const localPath = path.resolve(path.dirname(filePath), packageName, importPath || '');\n\n        if (!visitedPaths.has(localPath)) {\n          visitedPaths.add(localPath);\n          pathsToParse.push(localPath);\n          localPathToSafe[localPath] = importPath;\n        }\n      } else if (packageName && !packageName.startsWith('node:')) {\n        // Find if the import is already in the consumes list.\n        const entryIndex = bundleInfo[entry].consumes.findIndex(\n          (c) => c.packageName === packageName && c.importPath === importPath,\n        );\n        if (entryIndex < 0) {\n          // If not, add it.\n          bundleInfo[entry].consumes.push({\n            packageName: packageName,\n            importPath: importPath || '.',\n            names: [...names],\n          });\n        } else {\n          // If so, add the names to the existing entry.\n          // This is necessary because the same import may be used in multiple places.\n          bundleInfo[entry].consumes[entryIndex].names = Array.from(\n            new Set([...names, ...bundleInfo[entry].consumes[entryIndex].names]),\n          );\n        }\n      }\n    }\n    if (repeatedExports[safePath]?.length > 1) {\n      // Multiple entries for the same path.\n      for (const repeatedEntry of repeatedExports[safePath]) {\n        if (repeatedEntry !== entry) {\n          bundleInfo[repeatedEntry] = bundleInfo[entry];\n        }\n      }\n    }\n  }\n\n  return bundleInfo;\n}\n"]}

package/lib/utilities/getBundleLocation.d.ts

@@ -3,6 +3,7 @@ import type { PackageHashes } from '@ms-cloudpack/package-hashes';
 export declare function getBundleLocation(options: {
     packagePath: string;
     shouldRecalculate?: boolean;
+    hash?: string;
 }, context: {
     packages: PackageDefinitionsCache;
     packageHashes: PackageHashes;

package/lib/utilities/getBundleLocation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getBundleLocation.d.ts","sourceRoot":"","sources":["../../src/utilities/getBundleLocation.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,wBAAsB,iBAAiB,CACrC,OAAO,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAAE,EAC7D,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;IAClC,aAAa,EAAE,aAAa,CAAC;CAC9B;;;GAiCF"}
+{"version":3,"file":"getBundleLocation.d.ts","sourceRoot":"","sources":["../../src/utilities/getBundleLocation.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,wBAAsB,iBAAiB,CACrC,OAAO,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,EAC5E,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;IAClC,aAAa,EAAE,aAAa,CAAC;CAC9B;;;GAmCF"}

package/lib/utilities/getBundleLocation.js

@@ -2,7 +2,7 @@ import filenamify from 'filenamify';
 import path from 'path';
 import { getCachePath } from './getCachePath.js';
 export async function getBundleLocation(options, context) {
-    const { packagePath, shouldRecalculate } = options;
+    const { packagePath, shouldRecalculate, hash } = options;
     const { packages, packageHashes } = context;
     const definition = await packages.get(packagePath);
     if (!definition) {
@@ -12,15 +12,16 @@ export async function getBundleLocation(options, context) {
         throw new Error(`Package definition (package.json) missing name at "${packagePath}"`);
     }
     const { name, version } = definition;
-    const hashResult = await packageHashes.get({
-        packagePath,
-        /**
-         *  We don't use source hashing for location,
-         *  because we do not want to create a new folder for each change in a package.
-         */
-        isSourceHashingEnabled: false,
-        shouldRecalculate,
-    });
+    const hashResult = hash ||
+        (await packageHashes.get({
+            packagePath,
+            /**
+             *  We don't use source hashing for location,
+             *  because we do not want to create a new folder for each change in a package.
+             */
+            isSourceHashingEnabled: false,
+            shouldRecalculate,
+        }));
     // Derive where the output should be.
     const folderName = `${filenamify(name, { replacement: '^' })}-${version}-${hashResult}`;
     const outputPath = path.join(getCachePath(), folderName);

package/lib/utilities/getBundleLocation.js.map

@@ -1 +1 @@
-{"version":3,"file":"getBundleLocation.js","sourceRoot":"","sources":["../../src/utilities/getBundleLocation.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAIjD,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,OAA6D,EAC7D,OAGC;IAED,MAAM,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC;IACnD,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAC5C,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAEnD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,4DAA4D,WAAW,GAAG,CAAC,CAAC;IAC9F,CAAC;IAED,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sDAAsD,WAAW,GAAG,CAAC,CAAC;IACxF,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;IAErC,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,GAAG,CAAC;QACzC,WAAW;QACX;;;WAGG;QACH,sBAAsB,EAAE,KAAK;QAC7B,iBAAiB;KAClB,CAAC,CAAC;IACH,qCAAqC;IACrC,MAAM,UAAU,GAAG,GAAG,UAAU,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI,OAAO,IAAI,UAAU,EAAE,CAAC;IACxF,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,UAAU,CAAC,CAAC;IAEzD,OAAO;QACL,IAAI,EAAE,UAAU;QAChB,UAAU;KACX,CAAC;AACJ,CAAC","sourcesContent":["import filenamify from 'filenamify';\nimport path from 'path';\nimport { getCachePath } from './getCachePath.js';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport type { PackageHashes } from '@ms-cloudpack/package-hashes';\n\nexport async function getBundleLocation(\n  options: { packagePath: string; shouldRecalculate?: boolean },\n  context: {\n    packages: PackageDefinitionsCache;\n    packageHashes: PackageHashes;\n  },\n) {\n  const { packagePath, shouldRecalculate } = options;\n  const { packages, packageHashes } = context;\n  const definition = await packages.get(packagePath);\n\n  if (!definition) {\n    throw new Error(`Package definition (package.json) missing or invalid at \"${packagePath}\"`);\n  }\n\n  if (!definition.name) {\n    throw new Error(`Package definition (package.json) missing name at \"${packagePath}\"`);\n  }\n\n  const { name, version } = definition;\n\n  const hashResult = await packageHashes.get({\n    packagePath,\n    /**\n     *  We don't use source hashing for location,\n     *  because we do not want to create a new folder for each change in a package.\n     */\n    isSourceHashingEnabled: false,\n    shouldRecalculate,\n  });\n  // Derive where the output should be.\n  const folderName = `${filenamify(name, { replacement: '^' })}-${version}-${hashResult}`;\n  const outputPath = path.join(getCachePath(), folderName);\n\n  return {\n    path: outputPath,\n    folderName,\n  };\n}\n"]}
+{"version":3,"file":"getBundleLocation.js","sourceRoot":"","sources":["../../src/utilities/getBundleLocation.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAIjD,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,OAA4E,EAC5E,OAGC;IAED,MAAM,EAAE,WAAW,EAAE,iBAAiB,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IACzD,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAC5C,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAEnD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,4DAA4D,WAAW,GAAG,CAAC,CAAC;IAC9F,CAAC;IAED,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sDAAsD,WAAW,GAAG,CAAC,CAAC;IACxF,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;IAErC,MAAM,UAAU,GACd,IAAI;QACJ,CAAC,MAAM,aAAa,CAAC,GAAG,CAAC;YACvB,WAAW;YACX;;;eAGG;YACH,sBAAsB,EAAE,KAAK;YAC7B,iBAAiB;SAClB,CAAC,CAAC,CAAC;IACN,qCAAqC;IACrC,MAAM,UAAU,GAAG,GAAG,UAAU,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI,OAAO,IAAI,UAAU,EAAE,CAAC;IACxF,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,UAAU,CAAC,CAAC;IAEzD,OAAO;QACL,IAAI,EAAE,UAAU;QAChB,UAAU;KACX,CAAC;AACJ,CAAC","sourcesContent":["import filenamify from 'filenamify';\nimport path from 'path';\nimport { getCachePath } from './getCachePath.js';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport type { PackageHashes } from '@ms-cloudpack/package-hashes';\n\nexport async function getBundleLocation(\n  options: { packagePath: string; shouldRecalculate?: boolean; hash?: string },\n  context: {\n    packages: PackageDefinitionsCache;\n    packageHashes: PackageHashes;\n  },\n) {\n  const { packagePath, shouldRecalculate, hash } = options;\n  const { packages, packageHashes } = context;\n  const definition = await packages.get(packagePath);\n\n  if (!definition) {\n    throw new Error(`Package definition (package.json) missing or invalid at \"${packagePath}\"`);\n  }\n\n  if (!definition.name) {\n    throw new Error(`Package definition (package.json) missing name at \"${packagePath}\"`);\n  }\n\n  const { name, version } = definition;\n\n  const hashResult =\n    hash ||\n    (await packageHashes.get({\n      packagePath,\n      /**\n       *  We don't use source hashing for location,\n       *  because we do not want to create a new folder for each change in a package.\n       */\n      isSourceHashingEnabled: false,\n      shouldRecalculate,\n    }));\n  // Derive where the output should be.\n  const folderName = `${filenamify(name, { replacement: '^' })}-${version}-${hashResult}`;\n  const outputPath = path.join(getCachePath(), folderName);\n\n  return {\n    path: outputPath,\n    folderName,\n  };\n}\n"]}

package/lib/utilities/getConsumedDependencies.js

@@ -6,8 +6,8 @@
 export function getConsumedDependencies(info) {
     const consumedDependencies = new Set();
     // Iterate through imports and find their path from the resolve map.
-    for (const entryInfo of Object.values(info.entry)) {
-        // iterate through all package names of result.info.entry.consumes
+    for (const entryInfo of Object.values(info)) {
+        // iterate through all package names of result.info.consumes
         for (const consume of entryInfo.consumes) {
             consumedDependencies.add(consume.packageName);
         }

package/lib/utilities/getConsumedDependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"getConsumedDependencies.js","sourceRoot":"","sources":["../../src/utilities/getConsumedDependencies.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,UAAU,uBAAuB,CAAC,IAAgB;IACtD,MAAM,oBAAoB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/C,oEAAoE;IACpE,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAClD,kEAAkE;QAClE,KAAK,MAAM,OAAO,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;YACzC,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAED,OAAO,oBAAoB,CAAC;AAC9B,CAAC","sourcesContent":["import type { BundleInfo } from '../types/BundleInfo.js';\n\n/**\n * Get the set of dependencies consumed by the given bundle info.\n * @param info - The bundle info.\n * @returns The deduplicated set of dependencies consumed by the given bundle info.\n */\nexport function getConsumedDependencies(info: BundleInfo) {\n  const consumedDependencies = new Set<string>();\n  // Iterate through imports and find their path from the resolve map.\n  for (const entryInfo of Object.values(info.entry)) {\n    // iterate through all package names of result.info.entry.consumes\n    for (const consume of entryInfo.consumes) {\n      consumedDependencies.add(consume.packageName);\n    }\n  }\n\n  return consumedDependencies;\n}\n"]}
+{"version":3,"file":"getConsumedDependencies.js","sourceRoot":"","sources":["../../src/utilities/getConsumedDependencies.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,UAAU,uBAAuB,CAAC,IAAgB;IACtD,MAAM,oBAAoB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/C,oEAAoE;IACpE,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5C,4DAA4D;QAC5D,KAAK,MAAM,OAAO,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;YACzC,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAED,OAAO,oBAAoB,CAAC;AAC9B,CAAC","sourcesContent":["import type { BundleInfo } from '../types/BundleInfo.js';\n\n/**\n * Get the set of dependencies consumed by the given bundle info.\n * @param info - The bundle info.\n * @returns The deduplicated set of dependencies consumed by the given bundle info.\n */\nexport function getConsumedDependencies(info: BundleInfo) {\n  const consumedDependencies = new Set<string>();\n  // Iterate through imports and find their path from the resolve map.\n  for (const entryInfo of Object.values(info)) {\n    // iterate through all package names of result.info.consumes\n    for (const consume of entryInfo.consumes) {\n      consumedDependencies.add(consume.packageName);\n    }\n  }\n\n  return consumedDependencies;\n}\n"]}

package/lib/utilities/getConsumedPaths.js

@@ -6,8 +6,8 @@
 export function getConsumedPaths(info) {
     const consumedPaths = {};
     // Iterate through imports and find their path from the resolve map.
-    for (const entryInfo of Object.values(info.entry)) {
-        // iterate through all package names of result.info.entry.consumes
+    for (const entryInfo of Object.values(info)) {
+        // iterate through all package names of result.info.consumes
         for (const consume of entryInfo.consumes) {
             consumedPaths[consume.packageName] ??= new Set();
             consumedPaths[consume.packageName].add(consume.importPath);

package/lib/utilities/getConsumedPaths.js.map

@@ -1 +1 @@
-{"version":3,"file":"getConsumedPaths.js","sourceRoot":"","sources":["../../src/utilities/getConsumedPaths.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAAgB;IAC/C,MAAM,aAAa,GAAgC,EAAE,CAAC;IACtD,oEAAoE;IACpE,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAClD,kEAAkE;QAClE,KAAK,MAAM,OAAO,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;YACzC,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,IAAI,GAAG,EAAE,CAAC;YACjD,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC","sourcesContent":["import type { BundleInfo } from '../types/BundleInfo.js';\n\n/**\n * Get a record of the consumed dependencies and their import paths by the given bundle info.\n * @param info - The bundle info.\n * @returns The record of consumed dependencies and their import paths.\n */\nexport function getConsumedPaths(info: BundleInfo) {\n  const consumedPaths: Record<string, Set<string>> = {};\n  // Iterate through imports and find their path from the resolve map.\n  for (const entryInfo of Object.values(info.entry)) {\n    // iterate through all package names of result.info.entry.consumes\n    for (const consume of entryInfo.consumes) {\n      consumedPaths[consume.packageName] ??= new Set();\n      consumedPaths[consume.packageName].add(consume.importPath);\n    }\n  }\n\n  return consumedPaths;\n}\n"]}
+{"version":3,"file":"getConsumedPaths.js","sourceRoot":"","sources":["../../src/utilities/getConsumedPaths.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAAgB;IAC/C,MAAM,aAAa,GAAgC,EAAE,CAAC;IACtD,oEAAoE;IACpE,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5C,4DAA4D;QAC5D,KAAK,MAAM,OAAO,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;YACzC,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,IAAI,GAAG,EAAE,CAAC;YACjD,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC","sourcesContent":["import type { BundleInfo } from '../types/BundleInfo.js';\n\n/**\n * Get a record of the consumed dependencies and their import paths by the given bundle info.\n * @param info - The bundle info.\n * @returns The record of consumed dependencies and their import paths.\n */\nexport function getConsumedPaths(info: BundleInfo) {\n  const consumedPaths: Record<string, Set<string>> = {};\n  // Iterate through imports and find their path from the resolve map.\n  for (const entryInfo of Object.values(info)) {\n    // iterate through all package names of result.info.consumes\n    for (const consume of entryInfo.consumes) {\n      consumedPaths[consume.packageName] ??= new Set();\n      consumedPaths[consume.packageName].add(consume.importPath);\n    }\n  }\n\n  return consumedPaths;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/api-server",
-  "version": "0.35.0",
+  "version": "0.37.0",
   "description": "An implementation of the API server that does interacts with a task scheduler.",
   "license": "MIT",
   "type": "module",
@@ -27,20 +27,20 @@
     "@lage-run/logger": "^1.3.0",
     "@lage-run/scheduler": "^1.1.9",
     "@lage-run/target-graph": "^0.8.9",
-    "@ms-cloudpack/bundler": "^0.19.1",
-    "@ms-cloudpack/common-types": "^0.2.0",
-    "@ms-cloudpack/config": "^0.18.1",
-    "@ms-cloudpack/create-express-app": "^1.6.1",
+    "@ms-cloudpack/bundler": "^0.19.3",
+    "@ms-cloudpack/common-types": "^0.2.2",
+    "@ms-cloudpack/config": "^0.19.1",
+    "@ms-cloudpack/create-express-app": "^1.6.3",
     "@ms-cloudpack/data-bus": "^0.4.2",
     "@ms-cloudpack/file-watcher": "^0.1.2",
-    "@ms-cloudpack/import-map": "^0.2.1",
+    "@ms-cloudpack/import-map": "^0.2.3",
     "@ms-cloudpack/json-utilities": "^0.1.4",
-    "@ms-cloudpack/package-hashes": "^0.5.1",
-    "@ms-cloudpack/package-utilities": "^7.1.1",
+    "@ms-cloudpack/package-hashes": "^0.5.3",
+    "@ms-cloudpack/package-utilities": "^7.1.3",
     "@ms-cloudpack/path-string-parsing": "^1.2.1",
-    "@ms-cloudpack/path-utilities": "^2.6.1",
-    "@ms-cloudpack/remote-cache": "^0.6.2",
-    "@ms-cloudpack/task-reporter": "^0.11.3",
+    "@ms-cloudpack/path-utilities": "^2.7.0",
+    "@ms-cloudpack/remote-cache": "^0.6.4",
+    "@ms-cloudpack/task-reporter": "^0.13.0",
     "@ms-cloudpack/telemetry": "^0.5.1",
     "@trpc/client": "^10.45.0",
     "@trpc/server": "^10.45.0",