@ms-cloudpack/api-server 0.58.11 → 0.58.12

package/lib/index.d.ts

@@ -8,7 +8,7 @@ export type { TaskEndDescription } from './types/TaskEndDescription.js';
 export type { TaskMessage } from './types/TaskMessage.js';
 export type { TaskOptions } from './types/TaskOptions.js';
 export type { TaskStartDescription } from './types/TaskStartDescription.js';
-export type { EnsurePackageBundledContext } from './apis/ensurePackageBundled.js';
+export type { EnsurePackageBundledContext, EnsurePackageBundledResult } from './apis/ensurePackageBundled.js';
 export { TaskRunner } from './utilities/TaskRunner.js';
 export { errorEntrySource } from './data/busSources.js';
 export { createCloudpackClient, type CloudpackClient } from './trpc/createCloudpackClient.js';

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAClE,YAAY,EAAE,UAAU,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC9F,YAAY,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAC1D,YAAY,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,YAAY,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC5C,YAAY,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,YAAY,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACxE,YAAY,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,YAAY,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,YAAY,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAC5E,YAAY,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAElF,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,KAAK,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAC9F,OAAO,EAAE,qBAAqB,EAAE,KAAK,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAC9F,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAGnE,OAAO,EAAE,uBAAuB,EAAE,KAAK,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAG1G,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,YAAY,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAClE,YAAY,EAAE,UAAU,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC9F,YAAY,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAC1D,YAAY,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,YAAY,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC5C,YAAY,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,YAAY,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACxE,YAAY,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,YAAY,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,YAAY,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAC5E,YAAY,EAAE,2BAA2B,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAE9G,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,KAAK,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAC9F,OAAO,EAAE,qBAAqB,EAAE,KAAK,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAC9F,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAGnE,OAAO,EAAE,uBAAuB,EAAE,KAAK,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAG1G,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,YAAY,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC"}

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAwB,MAAM,iCAAiC,CAAC;AAC9F,OAAO,EAAE,qBAAqB,EAAwB,MAAM,iCAAiC,CAAC;AAC9F,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,YAAY;AACZ,OAAO,EAAE,uBAAuB,EAA8B,MAAM,qCAAqC,CAAC;AAE1G,iDAAiD;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC","sourcesContent":["export type { Context, PartialContext } from './types/Context.js';\nexport type { BundleInfo, BundleEntryInfo, BundleEntryConsumes } from './types/BundleInfo.js';\nexport type { Session } from '@ms-cloudpack/common-types';\nexport type { TaskStats } from './types/TaskStats.js';\nexport type { Task } from './types/Task.js';\nexport type { TaskDescription } from './types/TaskDescription.js';\nexport type { TaskEndDescription } from './types/TaskEndDescription.js';\nexport type { TaskMessage } from './types/TaskMessage.js';\nexport type { TaskOptions } from './types/TaskOptions.js';\nexport type { TaskStartDescription } from './types/TaskStartDescription.js';\nexport type { EnsurePackageBundledContext } from './apis/ensurePackageBundled.js';\n\nexport { TaskRunner } from './utilities/TaskRunner.js';\nexport { errorEntrySource } from './data/busSources.js';\nexport { createCloudpackClient, type CloudpackClient } from './trpc/createCloudpackClient.js';\nexport { createCloudpackServer, type CloudpackServer } from './trpc/createCloudpackServer.js';\nexport { getActiveSessionsPath } from './utilities/getActiveSessionsPath.js';\nexport { getConsumedDependencies } from './utilities/getConsumedDependencies.js';\nexport { getConsumedPaths } from './utilities/getConsumedPaths.js';\n\n// Utilities\nexport { createPartialApiContext, type LazyApiContextOptions } from './common/createPartialApiContext.js';\n\n// API methods directly used outside this package\nexport { addPackageOverride } from './apis/addPackageOverride.js';\nexport { ensurePackageBundled } from './apis/ensurePackageBundled.js';\nexport { syncDownload } from './apis/syncDownload.js';\nexport { syncUpload } from './apis/syncUpload.js';\nexport type { SyncResult } from './types/SyncResult.js';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAwB,MAAM,iCAAiC,CAAC;AAC9F,OAAO,EAAE,qBAAqB,EAAwB,MAAM,iCAAiC,CAAC;AAC9F,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,YAAY;AACZ,OAAO,EAAE,uBAAuB,EAA8B,MAAM,qCAAqC,CAAC;AAE1G,iDAAiD;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC","sourcesContent":["export type { Context, PartialContext } from './types/Context.js';\nexport type { BundleInfo, BundleEntryInfo, BundleEntryConsumes } from './types/BundleInfo.js';\nexport type { Session } from '@ms-cloudpack/common-types';\nexport type { TaskStats } from './types/TaskStats.js';\nexport type { Task } from './types/Task.js';\nexport type { TaskDescription } from './types/TaskDescription.js';\nexport type { TaskEndDescription } from './types/TaskEndDescription.js';\nexport type { TaskMessage } from './types/TaskMessage.js';\nexport type { TaskOptions } from './types/TaskOptions.js';\nexport type { TaskStartDescription } from './types/TaskStartDescription.js';\nexport type { EnsurePackageBundledContext, EnsurePackageBundledResult } from './apis/ensurePackageBundled.js';\n\nexport { TaskRunner } from './utilities/TaskRunner.js';\nexport { errorEntrySource } from './data/busSources.js';\nexport { createCloudpackClient, type CloudpackClient } from './trpc/createCloudpackClient.js';\nexport { createCloudpackServer, type CloudpackServer } from './trpc/createCloudpackServer.js';\nexport { getActiveSessionsPath } from './utilities/getActiveSessionsPath.js';\nexport { getConsumedDependencies } from './utilities/getConsumedDependencies.js';\nexport { getConsumedPaths } from './utilities/getConsumedPaths.js';\n\n// Utilities\nexport { createPartialApiContext, type LazyApiContextOptions } from './common/createPartialApiContext.js';\n\n// API methods directly used outside this package\nexport { addPackageOverride } from './apis/addPackageOverride.js';\nexport { ensurePackageBundled } from './apis/ensurePackageBundled.js';\nexport { syncDownload } from './apis/syncDownload.js';\nexport { syncUpload } from './apis/syncUpload.js';\nexport type { SyncResult } from './types/SyncResult.js';\n"]}

package/lib/task-scheduler/createTaskSchedulerReporter.js

@@ -14,7 +14,7 @@ export function createTaskSchedulerReporter(reporter) {
                 const target = entry.data.target;
                 const task = reporterTasks.get(target.id);
                 if (task) {
-                    task.message += entry.msg;
+                    task.addMessage(entry.msg);
                 }
                 return;
             }

package/lib/task-scheduler/createTaskSchedulerReporter.js.map

@@ -1 +1 @@
-{"version":3,"file":"createTaskSchedulerReporter.js","sourceRoot":"","sources":["../../src/task-scheduler/createTaskSchedulerReporter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAiB,MAAM,kBAAkB,CAAC;AAI3D,MAAM,sBAAsB,GAAG;IAC7B,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,KAAK;IAC/B,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI;IAC7B,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI;IAC7B,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,KAAK;IACjC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,KAAK;CAChC,CAAC;AAEF,MAAM,UAAU,2BAA2B,CAAC,QAAsB;IAChE,MAAM,aAAa,GAAG,IAAI,GAAG,EAA4B,CAAC;IAE1D,OAAO;QACL,GAAG,CAAC,KAAK;YACP,IAAI,KAAK,CAAC,GAAG,IAAI,KAAK,CAAC,KAAK,IAAI,QAAQ,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;gBACpE,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,MAAgB,CAAC;gBAC3C,MAAM,IAAI,GAAG,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAC1C,IAAI,IAAI,EAAE,CAAC;oBACT,IAAI,CAAC,OAAO,IAAI,KAAK,CAAC,GAAG,CAAC;gBAC5B,CAAC;gBACD,OAAO;YACT,CAAC;YAED,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACpC,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC;gBAC9B,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,MAAgB,CAAC;gBAE3C,0CAA0C;gBAC1C,IAAI,IAAI,GAAG,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACxC,IAAI,CAAC,IAAI,EAAE,CAAC;oBACV,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;oBAC5C,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;gBACrC,CAAC;gBAED,QAAQ,MAAM,EAAE,CAAC;oBACf,KAAK,SAAS;wBACZ,IAAI,CAAC,KAAK,EAAE,CAAC;wBACb,MAAM;oBAER,KAAK,SAAS;wBACZ,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;wBACtC,MAAM;oBAER,KAAK,SAAS;wBACZ,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;wBAClC,MAAM;oBAER,KAAK,QAAQ;wBACX,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;wBAClC,MAAM;oBAER,KAAK,SAAS;wBACZ,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;wBACnC,MAAM;gBACV,CAAC;gBACD,OAAO;YACT,CAAC;YAED,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC;gBACd,sBAAsB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC/C,OAAO;YACT,CAAC;QACH,CAAC;QACD,SAAS;YACP,OAAO;QACT,CAAC;KACF,CAAC;AACJ,CAAC","sourcesContent":["import { LogLevel, type Reporter } from '@lage-run/logger';\nimport type { Target } from '@lage-run/target-graph';\nimport type { TaskReporter, TaskReporterTask } from '@ms-cloudpack/task-reporter';\n\nconst logLevelToConsoleFnMap = {\n  [LogLevel.error]: console.error,\n  [LogLevel.warn]: console.warn,\n  [LogLevel.info]: console.info,\n  [LogLevel.verbose]: console.debug,\n  [LogLevel.silly]: console.debug,\n};\n\nexport function createTaskSchedulerReporter(reporter: TaskReporter): Reporter {\n  const reporterTasks = new Map<string, TaskReporterTask>();\n\n  return {\n    log(entry): void {\n      if (entry.msg && entry.level <= LogLevel.warn && entry.data?.target) {\n        const target = entry.data.target as Target;\n        const task = reporterTasks.get(target.id);\n        if (task) {\n          task.message += entry.msg;\n        }\n        return;\n      }\n\n      if (entry.data && entry.data.status) {\n        const { status } = entry.data;\n        const target = entry.data.target as Target;\n\n        // Ensure task is in the reporterTasks map\n        let task = reporterTasks.get(target.id);\n        if (!task) {\n          task = reporter.addTask(target.label, true);\n          reporterTasks.set(target.id, task);\n        }\n\n        switch (status) {\n          case 'running':\n            task.start();\n            break;\n\n          case 'success':\n            task.complete({ status: 'complete' });\n            break;\n\n          case 'skipped':\n            task.complete({ status: 'skip' });\n            break;\n\n          case 'failed':\n            task.complete({ status: 'fail' });\n            break;\n\n          case 'aborted':\n            task.complete({ status: 'abort' });\n            break;\n        }\n        return;\n      }\n\n      if (entry.msg) {\n        logLevelToConsoleFnMap[entry.level](entry.msg);\n        return;\n      }\n    },\n    summarize(): void {\n      // noop\n    },\n  };\n}\n"]}
+{"version":3,"file":"createTaskSchedulerReporter.js","sourceRoot":"","sources":["../../src/task-scheduler/createTaskSchedulerReporter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAiB,MAAM,kBAAkB,CAAC;AAI3D,MAAM,sBAAsB,GAAG;IAC7B,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,KAAK;IAC/B,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI;IAC7B,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI;IAC7B,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,KAAK;IACjC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,KAAK;CAChC,CAAC;AAEF,MAAM,UAAU,2BAA2B,CAAC,QAAsB;IAChE,MAAM,aAAa,GAAG,IAAI,GAAG,EAA4B,CAAC;IAE1D,OAAO;QACL,GAAG,CAAC,KAAK;YACP,IAAI,KAAK,CAAC,GAAG,IAAI,KAAK,CAAC,KAAK,IAAI,QAAQ,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;gBACpE,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,MAAgB,CAAC;gBAC3C,MAAM,IAAI,GAAG,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAC1C,IAAI,IAAI,EAAE,CAAC;oBACT,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC7B,CAAC;gBACD,OAAO;YACT,CAAC;YAED,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACpC,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC;gBAC9B,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,MAAgB,CAAC;gBAE3C,0CAA0C;gBAC1C,IAAI,IAAI,GAAG,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACxC,IAAI,CAAC,IAAI,EAAE,CAAC;oBACV,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;oBAC5C,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;gBACrC,CAAC;gBAED,QAAQ,MAAM,EAAE,CAAC;oBACf,KAAK,SAAS;wBACZ,IAAI,CAAC,KAAK,EAAE,CAAC;wBACb,MAAM;oBAER,KAAK,SAAS;wBACZ,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;wBACtC,MAAM;oBAER,KAAK,SAAS;wBACZ,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;wBAClC,MAAM;oBAER,KAAK,QAAQ;wBACX,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;wBAClC,MAAM;oBAER,KAAK,SAAS;wBACZ,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;wBACnC,MAAM;gBACV,CAAC;gBACD,OAAO;YACT,CAAC;YAED,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC;gBACd,sBAAsB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC/C,OAAO;YACT,CAAC;QACH,CAAC;QACD,SAAS;YACP,OAAO;QACT,CAAC;KACF,CAAC;AACJ,CAAC","sourcesContent":["import { LogLevel, type Reporter } from '@lage-run/logger';\nimport type { Target } from '@lage-run/target-graph';\nimport type { TaskReporter, TaskReporterTask } from '@ms-cloudpack/task-reporter';\n\nconst logLevelToConsoleFnMap = {\n  [LogLevel.error]: console.error,\n  [LogLevel.warn]: console.warn,\n  [LogLevel.info]: console.info,\n  [LogLevel.verbose]: console.debug,\n  [LogLevel.silly]: console.debug,\n};\n\nexport function createTaskSchedulerReporter(reporter: TaskReporter): Reporter {\n  const reporterTasks = new Map<string, TaskReporterTask>();\n\n  return {\n    log(entry): void {\n      if (entry.msg && entry.level <= LogLevel.warn && entry.data?.target) {\n        const target = entry.data.target as Target;\n        const task = reporterTasks.get(target.id);\n        if (task) {\n          task.addMessage(entry.msg);\n        }\n        return;\n      }\n\n      if (entry.data && entry.data.status) {\n        const { status } = entry.data;\n        const target = entry.data.target as Target;\n\n        // Ensure task is in the reporterTasks map\n        let task = reporterTasks.get(target.id);\n        if (!task) {\n          task = reporter.addTask(target.label, true);\n          reporterTasks.set(target.id, task);\n        }\n\n        switch (status) {\n          case 'running':\n            task.start();\n            break;\n\n          case 'success':\n            task.complete({ status: 'complete' });\n            break;\n\n          case 'skipped':\n            task.complete({ status: 'skip' });\n            break;\n\n          case 'failed':\n            task.complete({ status: 'fail' });\n            break;\n\n          case 'aborted':\n            task.complete({ status: 'abort' });\n            break;\n        }\n        return;\n      }\n\n      if (entry.msg) {\n        logLevelToConsoleFnMap[entry.level](entry.msg);\n        return;\n      }\n    },\n    summarize(): void {\n      // noop\n    },\n  };\n}\n"]}

package/lib/types/BundleRequest.d.ts

@@ -26,6 +26,7 @@ export interface BundleRequest {
         inputPath?: string;
         hash?: string;
         info?: BundleInfo;
+        bundleSource?: 'remote-cache' | 'local-cache' | 'bundler';
     };
     /** Whether the result was retrieved from the cache (set while bundling) */
     resultFromCache?: boolean;

package/lib/types/BundleRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BundleRequest.d.ts","sourceRoot":"","sources":["../../src/types/BundleRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,0FAA0F;IAC1F,EAAE,EAAE,MAAM,CAAC;IACX,iCAAiC;IACjC,WAAW,EAAE,MAAM,CAAC;IACpB,oCAAoC;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,mCAAmC;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,0CAA0C;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,4DAA4D;IAC5D,UAAU,EAAE,OAAO,CAAC;IACpB,oDAAoD;IACpD,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,kBAAkB;IAClB,IAAI,EAAE,UAAU,CAAC;IACjB,yBAAyB;IACzB,MAAM,CAAC,EAAE,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,GAAG;QACzC,4FAA4F;QAC5F,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,UAAU,CAAC;KACnB,CAAC;IACF,2EAA2E;IAE3E,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,qCAAqC;IACrC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,+DAA+D;IAC/D,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,iCAAiC;IACjC,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB"}
+{"version":3,"file":"BundleRequest.d.ts","sourceRoot":"","sources":["../../src/types/BundleRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,0FAA0F;IAC1F,EAAE,EAAE,MAAM,CAAC;IACX,iCAAiC;IACjC,WAAW,EAAE,MAAM,CAAC;IACpB,oCAAoC;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,mCAAmC;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,0CAA0C;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,4DAA4D;IAC5D,UAAU,EAAE,OAAO,CAAC;IACpB,oDAAoD;IACpD,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,kBAAkB;IAClB,IAAI,EAAE,UAAU,CAAC;IACjB,yBAAyB;IACzB,MAAM,CAAC,EAAE,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,GAAG;QACzC,4FAA4F;QAC5F,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,UAAU,CAAC;QAClB,YAAY,CAAC,EAAE,cAAc,GAAG,aAAa,GAAG,SAAS,CAAC;KAC3D,CAAC;IACF,2EAA2E;IAE3E,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,qCAAqC;IACrC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,+DAA+D;IAC/D,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,iCAAiC;IACjC,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB"}

package/lib/types/BundleRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"BundleRequest.js","sourceRoot":"","sources":["../../src/types/BundleRequest.ts"],"names":[],"mappings":"","sourcesContent":["import type { BundleMode, BundleResult } from '@ms-cloudpack/common-types';\nimport type { BundleInfo } from './BundleInfo.js';\n\n/**\n * Tracks a given bundle request and its result.\n */\nexport interface BundleRequest {\n  /** ID for the bundle. This will usually be the package path, or occasionally the hash. */\n  id: string;\n  /** Package name being bundled */\n  packageName: string;\n  /** Package version being bundled */\n  version: string;\n  /** Absolute path to the package */\n  packagePath: string;\n  /** Absolute path for the bundle output */\n  outputPath?: string;\n  /** Whether this is an external package (in node_modules) */\n  isExternal: boolean;\n  /** Whether we should force the incremental flag. */\n  isIncremental?: boolean;\n  /** Bundle mode */\n  mode: BundleMode;\n  /** Result of bundling */\n  result?: Omit<BundleResult, 'inputPath'> & {\n    /** Input path. Will be unset if the package couldn't be found or had an unhandled error. */\n    inputPath?: string;\n    hash?: string;\n    info?: BundleInfo;\n  };\n  /** Whether the result was retrieved from the cache (set while bundling) */\n  // TODO: this seems like it should be a property of the result?\n  resultFromCache?: boolean;\n  /** Whether to disable source maps */\n  disableSourceMaps?: boolean;\n  /** Whether to scan the bundled code for imports and exports */\n  shouldGetBundleInfo?: boolean;\n  /** Whether to disable caching */\n  disableCache?: boolean;\n}\n"]}
+{"version":3,"file":"BundleRequest.js","sourceRoot":"","sources":["../../src/types/BundleRequest.ts"],"names":[],"mappings":"","sourcesContent":["import type { BundleMode, BundleResult } from '@ms-cloudpack/common-types';\nimport type { BundleInfo } from './BundleInfo.js';\n\n/**\n * Tracks a given bundle request and its result.\n */\nexport interface BundleRequest {\n  /** ID for the bundle. This will usually be the package path, or occasionally the hash. */\n  id: string;\n  /** Package name being bundled */\n  packageName: string;\n  /** Package version being bundled */\n  version: string;\n  /** Absolute path to the package */\n  packagePath: string;\n  /** Absolute path for the bundle output */\n  outputPath?: string;\n  /** Whether this is an external package (in node_modules) */\n  isExternal: boolean;\n  /** Whether we should force the incremental flag. */\n  isIncremental?: boolean;\n  /** Bundle mode */\n  mode: BundleMode;\n  /** Result of bundling */\n  result?: Omit<BundleResult, 'inputPath'> & {\n    /** Input path. Will be unset if the package couldn't be found or had an unhandled error. */\n    inputPath?: string;\n    hash?: string;\n    info?: BundleInfo;\n    bundleSource?: 'remote-cache' | 'local-cache' | 'bundler';\n  };\n  /** Whether the result was retrieved from the cache (set while bundling) */\n  // TODO: this seems like it should be a property of the result?\n  resultFromCache?: boolean;\n  /** Whether to disable source maps */\n  disableSourceMaps?: boolean;\n  /** Whether to scan the bundled code for imports and exports */\n  shouldGetBundleInfo?: boolean;\n  /** Whether to disable caching */\n  disableCache?: boolean;\n}\n"]}

package/lib/types/ResultJson.d.ts

@@ -2,5 +2,5 @@ import type { BundleRequest } from './BundleRequest.js';
 /**
  * The result object that is written to the cache. This is a subset of the BundleRequest.result object.
  */
-export type ResultJson = Pick<NonNullable<BundleRequest['result']>, 'bundler' | 'entries' | 'hash' | 'outputFiles' | 'warnings' | 'errors'>;
+export type ResultJson = Pick<NonNullable<BundleRequest['result']>, 'bundler' | 'bundlerVersion' | 'entries' | 'hash' | 'outputFiles' | 'warnings' | 'errors'>;
 //# sourceMappingURL=ResultJson.d.ts.map

package/lib/types/ResultJson.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ResultJson.d.ts","sourceRoot":"","sources":["../../src/types/ResultJson.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,IAAI,CAC3B,WAAW,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,EACpC,SAAS,GAAG,SAAS,GAAG,MAAM,GAAG,aAAa,GAAG,UAAU,GAAG,QAAQ,CACvE,CAAC"}
+{"version":3,"file":"ResultJson.d.ts","sourceRoot":"","sources":["../../src/types/ResultJson.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,IAAI,CAC3B,WAAW,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,EACpC,SAAS,GAAG,gBAAgB,GAAG,SAAS,GAAG,MAAM,GAAG,aAAa,GAAG,UAAU,GAAG,QAAQ,CAC1F,CAAC"}

package/lib/types/ResultJson.js.map

@@ -1 +1 @@
-{"version":3,"file":"ResultJson.js","sourceRoot":"","sources":["../../src/types/ResultJson.ts"],"names":[],"mappings":"","sourcesContent":["import type { BundleRequest } from './BundleRequest.js';\n\n/**\n * The result object that is written to the cache. This is a subset of the BundleRequest.result object.\n */\nexport type ResultJson = Pick<\n  NonNullable<BundleRequest['result']>,\n  'bundler' | 'entries' | 'hash' | 'outputFiles' | 'warnings' | 'errors'\n>;\n"]}
+{"version":3,"file":"ResultJson.js","sourceRoot":"","sources":["../../src/types/ResultJson.ts"],"names":[],"mappings":"","sourcesContent":["import type { BundleRequest } from './BundleRequest.js';\n\n/**\n * The result object that is written to the cache. This is a subset of the BundleRequest.result object.\n */\nexport type ResultJson = Pick<\n  NonNullable<BundleRequest['result']>,\n  'bundler' | 'bundlerVersion' | 'entries' | 'hash' | 'outputFiles' | 'warnings' | 'errors'\n>;\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"bundleTask.d.ts","sourceRoot":"","sources":["../../src/utilities/bundleTask.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAOvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAI1D,MAAM,MAAM,yBAAyB,GAAG,iBAAiB,GAAG;IAAE,aAAa,EAAE,aAAa,CAAA;CAAE,CAAC;AAC7F,MAAM,MAAM,yBAAyB,GAAG,cAAc,CACpD,UAAU,GAAG,eAAe,GAAG,UAAU,GAAG,iBAAiB,GAAG,mBAAmB,EACnF,YAAY,GAAG,QAAQ,GAAG,UAAU,GAAG,WAAW,CACnD,CAAC;AAEF;;GAEG;AACH,wBAAsB,UAAU,CAC9B,OAAO,EAAE,yBAAyB,EAClC,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,IAAI,CAAC,CA+Kf"}
+{"version":3,"file":"bundleTask.d.ts","sourceRoot":"","sources":["../../src/utilities/bundleTask.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAOvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAG1D,MAAM,MAAM,yBAAyB,GAAG,iBAAiB,GAAG;IAAE,aAAa,EAAE,aAAa,CAAA;CAAE,CAAC;AAC7F,MAAM,MAAM,yBAAyB,GAAG,cAAc,CACpD,UAAU,GAAG,eAAe,GAAG,UAAU,GAAG,iBAAiB,GAAG,mBAAmB,EACnF,YAAY,GAAG,QAAQ,GAAG,UAAU,GAAG,WAAW,CACnD,CAAC;AAEF;;GAEG;AACH,wBAAsB,UAAU,CAC9B,OAAO,EAAE,yBAAyB,EAClC,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,IAAI,CAAC,CAsCf"}

package/lib/utilities/bundleTask.js

@@ -11,154 +11,148 @@ import { readResultFromCache } from './readResultFromCache.js';
 import { saveResultToCache } from './saveResultToCache.js';
 import { formatBundleTaskResult } from './formatBundleTaskResult.js';
 import { writeStubForDensityEntries } from './writeStubForDensityEntries.js';
-import { getRemoteCachePackageId } from './getRemoteCachePackageId.js';
 /**
  * Create and run a TaskReporter task which calls `bundle()` from `@ms-cloudpack/bundler` and formats the result.
  */
 export async function bundleTask(options, context) {
-    const { bundleRequest, force, hash, sourceHash } = options;
+    const { bundleRequest } = options;
     const { packageName, version } = bundleRequest;
-    const { reporter, telemetryClient, packageHashes, packages, session, remoteCacheClient } = context;
-    const { config, sequence } = session;
-    const { mode } = config;
+    const { reporter, telemetryClient, session } = context;
+    const { sequence } = session;
     const { retryCount } = options;
-    const taskName = `Bundle ${formatPackageName({
-        name: packageName,
-        version,
-    })}${retryCount ? ` (retry ${retryCount})` : ''}`;
-    await reporter.runTask(taskName, async () => {
+    const task = reporter.addTask(`Bundle ${formatPackageName({ name: packageName, version })}${retryCount ? ` (retry ${retryCount})` : ''}`);
+    try {
         await telemetryClient.tracer.startActiveSpan('BUNDLE_TASK', async (span) => {
-            // If force is set, dispose the existing result.
-            if (force && bundleRequest?.result?.dispose) {
-                bundleRequest.result.dispose();
-                bundleRequest.result = undefined;
-            }
-            let bundleSource = 'local-cache';
-            const { packagePath, isExternal, isIncremental, disableSourceMaps, shouldGetBundleInfo } = bundleRequest;
-            const outputPath = bundleRequest.outputPath ??
-                (await getBundleLocation({ packagePath, shouldRecalculate: force, hash }, context)).path;
-            // Rehydrate the result if not incremental.
-            if (bundleRequest.result === undefined && !force) {
-                bundleRequest.result = await readResultFromCache(outputPath, {
-                    inputPath: packagePath,
-                });
-                bundleSource = 'local-cache';
-                if (!bundleRequest.result && remoteCacheClient) {
-                    const downloadResult = await remoteCacheClient.downloadFolder({
-                        id: await getRemoteCachePackageId({ packagePath }, context),
-                        path: outputPath,
-                        friendlyName: `${packageName}@${version}`,
-                    });
-                    if (downloadResult === 'success') {
-                        // If the download was successful, read the result from cache.
-                        bundleRequest.result = await readResultFromCache(outputPath, {
-                            inputPath: packagePath,
-                        });
-                        bundleSource = 'remote-cache';
-                    }
-                    else if (downloadResult === 'already-exist') {
-                        throw new Error('Remote cache already exist, but cloudpack result is not found in local cache. This must be a bug.');
-                    }
-                }
-            }
-            const cacheValidationHash = !isExternal
-                ? sourceHash ||
-                    (await packageHashes.get({ packagePath, isSourceHashingEnabled: true, shouldRecalculate: true }))
-                : undefined;
-            // if the cached result is valid, use it.
-            if (!force && isCachedResultValid({ bundleRequest, hash: cacheValidationHash })) {
-                console.debug(`Using cached result for ${bundleRequest.packageName}@${bundleRequest.version}`);
-                bundleRequest.resultFromCache = true;
-            }
-            else {
-                bundleRequest.resultFromCache = false;
-                // Only use cached result if it's successful.
-                await prepareOutputPath(outputPath);
-                if (bundleRequest.result?.rebuild) {
-                    bundleRequest.result = {
-                        ...(await bundleRequest.result.rebuild()),
-                        outputPath: bundleRequest.result.outputPath,
-                        hash: cacheValidationHash,
-                    };
-                }
-                else {
-                    const { bundler, bundlerOptions, inlinedDependencies, dynamicImports, bundlerCapabilities, ignoredBundlerWarnings, unsafeCjsExportNames, } = (await packages.get(packagePath)).cloudpack || {};
-                    const bundleOptions = {
-                        bundler,
-                        minify: mode === 'production',
-                        bundlerOptions,
-                        inputPath: packagePath,
-                        outputPath,
-                        incremental: isIncremental !== undefined ? isIncremental : false,
-                        sourcemap: !disableSourceMaps,
-                        entries: await getEntriesMapFromPackage({ inputPath: packagePath }, { packages, config }),
-                        inlined: inlinedDependencies,
-                        external: await getExternalsFromPackage({ inputPath: packagePath }, { packages }),
-                        dynamicImports,
-                        ignoredBundlerWarnings,
-                        bundlerCapabilities,
-                        unsafeCjsExportNames,
-                    };
-                    const bundleInternalResult = await bundle(bundleOptions, { config });
-                    if (bundleInternalResult.bundler) {
-                        span.setAttribute('bundler', bundleInternalResult.bundler);
-                    }
-                    bundleRequest.result = {
-                        ...bundleInternalResult,
-                        outputPath: bundleOptions.outputPath ?? outputPath,
-                        hash: cacheValidationHash,
-                    };
-                    if (bundlerCapabilities?.density) {
-                        // Get export maps that need to be written as stubs for density.
-                        // If there are density exports, write stubs for them.
-                        const densityErrors = await writeStubForDensityEntries({
-                            options: {
-                                packageName,
-                                packagePath,
-                                result: bundleInternalResult,
-                            },
-                            context: { packages, config },
-                        });
-                        // Add any errors to the result.
-                        if (densityErrors.length > 0) {
-                            bundleRequest.result.errors = [...(bundleRequest.result.errors ?? []), ...densityErrors];
-                        }
-                    }
-                }
-                // Write the result to disk.
-                await saveResultToCache(bundleRequest.result);
-            }
-            // If we should find required imports and exports per bundle
-            if (shouldGetBundleInfo && !bundleRequest.result?.errors?.length && bundleRequest.result?.outputFiles?.length) {
-                const bundleInfoPath = path.join(outputPath, 'bundle-info.json');
-                // Exports map is needed to find the bundle info per entry we intend to bundle.
-                // Exports map is used instead of bundleRequest.entries since it is easier to use
-                // because it contains the paths other packages use to import the entry and
-                // the relative location of the bundled files.
-                const exportsMap = await getExportsMap({ packagePath }, { packages, config });
-                const bundleInfo = await getBundleInfo({
-                    outputPath,
-                    outputFiles: bundleRequest.result.outputFiles,
-                    exportsMap,
-                    isExternal,
-                    packagePath,
-                });
-                bundleRequest.result.info = bundleInfo;
-                // Write to cache for future use. (Ignore the promise result.)
-                // eslint-disable-next-line @typescript-eslint/no-floating-promises
-                writeJson(bundleInfoPath, bundleInfo);
-            }
+            await bundleTaskInternal(options, context);
             span.setAttributes({
                 sequence,
                 isCacheHit: !!bundleRequest.resultFromCache,
                 isExternal: bundleRequest.isExternal,
                 packageName: bundleRequest.packageName,
                 packageVersion: bundleRequest.version,
-                bundleSource,
+                bundleSource: bundleRequest.result?.bundleSource,
+                bundler: bundleRequest.result?.bundler,
+                bundlerVersion: bundleRequest.result?.bundlerVersion,
             });
-            const taskResult = formatBundleTaskResult(bundleRequest);
-            return taskResult;
         });
-    });
+    }
+    catch (err) {
+        // If an unexpected error is thrown, add it to the result.
+        // This ensures consistent handling of either actual bundler errors or exceptions.
+        bundleRequest.result ??= {};
+        bundleRequest.result.errors ??= [];
+        bundleRequest.result.errors.push({
+            text: `Unexpected exception while bundling: ${err.stack || String(err)}`,
+            source: 'bundleTask',
+        });
+    }
+    task.complete(formatBundleTaskResult(bundleRequest));
+}
+/**
+ * Actually read the result from the cache or call `bundle()`.
+ * NOTE: The result is returned by mutating `options.bundleRequest.result`.
+ */
+async function bundleTaskInternal(options, context) {
+    const { bundleRequest, force, hash, sourceHash } = options;
+    const { packageName, version } = bundleRequest;
+    const { packageHashes, packages, session } = context;
+    const { config } = session;
+    const { mode } = config;
+    // If force is set, dispose the existing result.
+    if (force && bundleRequest?.result?.dispose) {
+        bundleRequest.result.dispose();
+        bundleRequest.result = undefined;
+    }
+    const { packagePath, isExternal, isIncremental, disableSourceMaps, shouldGetBundleInfo } = bundleRequest;
+    const outputPath = bundleRequest.outputPath ??
+        (await getBundleLocation({ packagePath, shouldRecalculate: force, hash }, context)).path;
+    // Rehydrate the result if not incremental.
+    if (bundleRequest.result === undefined && !force) {
+        bundleRequest.result = await readResultFromCache({ packageName, version, inputPath: packagePath, outputPath }, context);
+    }
+    const cacheValidationHash = !isExternal
+        ? sourceHash || (await packageHashes.get({ packagePath, isSourceHashingEnabled: true, shouldRecalculate: true }))
+        : undefined;
+    // if the cached result is valid, use it.
+    if (!force && isCachedResultValid({ bundleRequest, hash: cacheValidationHash })) {
+        console.debug(`Using cached result for ${bundleRequest.packageName}@${bundleRequest.version}`);
+        bundleRequest.resultFromCache = true;
+    }
+    else {
+        bundleRequest.resultFromCache = false;
+        // Only use cached result if it's successful.
+        await prepareOutputPath(outputPath);
+        if (bundleRequest.result?.rebuild) {
+            bundleRequest.result = {
+                ...(await bundleRequest.result.rebuild()),
+                outputPath: bundleRequest.result.outputPath,
+                hash: cacheValidationHash,
+            };
+        }
+        else {
+            const { bundler, bundlerOptions, inlinedDependencies, dynamicImports, bundlerCapabilities, ignoredBundlerWarnings, unsafeCjsExportNames, } = (await packages.get(packagePath)).cloudpack || {};
+            const bundleOptions = {
+                bundler,
+                minify: mode === 'production',
+                bundlerOptions,
+                inputPath: packagePath,
+                outputPath,
+                incremental: isIncremental !== undefined ? isIncremental : false,
+                sourcemap: !disableSourceMaps,
+                entries: await getEntriesMapFromPackage({ inputPath: packagePath }, { packages, config }),
+                inlined: inlinedDependencies,
+                external: await getExternalsFromPackage({ inputPath: packagePath }, { packages }),
+                dynamicImports,
+                ignoredBundlerWarnings,
+                bundlerCapabilities,
+                unsafeCjsExportNames,
+            };
+            const bundleInternalResult = await bundle(bundleOptions, { config });
+            bundleRequest.result = {
+                ...bundleInternalResult,
+                outputPath: bundleOptions.outputPath ?? outputPath,
+                hash: cacheValidationHash,
+                bundleSource: 'bundler',
+            };
+            if (bundlerCapabilities?.density) {
+                // Get export maps that need to be written as stubs for density.
+                // If there are density exports, write stubs for them.
+                const densityErrors = await writeStubForDensityEntries({
+                    options: {
+                        packageName,
+                        packagePath,
+                        result: bundleInternalResult,
+                    },
+                    context: { packages, config },
+                });
+                // Add any errors to the result.
+                if (densityErrors.length > 0) {
+                    bundleRequest.result.errors = [...(bundleRequest.result.errors ?? []), ...densityErrors];
+                }
+            }
+        }
+        // Write the result to disk.
+        await saveResultToCache(bundleRequest.result);
+    }
+    // If we should find required imports and exports per bundle
+    if (shouldGetBundleInfo && !bundleRequest.result?.errors?.length && bundleRequest.result?.outputFiles?.length) {
+        const bundleInfoPath = path.join(outputPath, 'bundle-info.json');
+        // Exports map is needed to find the bundle info per entry we intend to bundle.
+        // Exports map is used instead of bundleRequest.entries since it is easier to use
+        // because it contains the paths other packages use to import the entry and
+        // the relative location of the bundled files.
+        const exportsMap = await getExportsMap({ packagePath }, { packages, config });
+        const bundleInfo = await getBundleInfo({
+            outputPath,
+            outputFiles: bundleRequest.result.outputFiles,
+            exportsMap,
+            isExternal,
+            packagePath,
+        });
+        bundleRequest.result.info = bundleInfo;
+        // Write to cache for future use. (Ignore the promise result.)
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
+        writeJson(bundleInfoPath, bundleInfo);
+    }
 }
 //# sourceMappingURL=bundleTask.js.map

package/lib/utilities/bundleTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"bundleTask.js","sourceRoot":"","sources":["../../src/utilities/bundleTask.ts"],"names":[],"mappings":"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","sourcesContent":["import { bundle, getEntriesMapFromPackage, getExternalsFromPackage } from '@ms-cloudpack/bundler';\nimport type { BundleOptions } from '@ms-cloudpack/common-types';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport { getExportsMap } from '@ms-cloudpack/package-utilities';\nimport { formatPackageName } from '@ms-cloudpack/task-reporter';\nimport path from 'path';\nimport { prepareOutputPath } from '../common/prepareOutputPath.js';\nimport type { BundleRequest } from '../types/BundleRequest.js';\nimport type { BundleTaskOptions } from '../types/BundleTaskOptions.js';\nimport { getBundleInfo } from './getBundleInfo.js';\nimport { getBundleLocation } from './getBundleLocation.js';\nimport { isCachedResultValid } from './isCachedResultValid.js';\nimport { readResultFromCache } from './readResultFromCache.js';\nimport { saveResultToCache } from './saveResultToCache.js';\nimport { formatBundleTaskResult } from './formatBundleTaskResult.js';\nimport type { PartialContext } from '../types/Context.js';\nimport { writeStubForDensityEntries } from './writeStubForDensityEntries.js';\nimport { getRemoteCachePackageId } from './getRemoteCachePackageId.js';\n\nexport type BundleTaskInternalOptions = BundleTaskOptions & { bundleRequest: BundleRequest };\nexport type BundleTaskInternalContext = PartialContext<\n  'packages' | 'packageHashes' | 'reporter' | 'telemetryClient' | 'remoteCacheClient',\n  'resolveMap' | 'config' | 'sequence' | 'cachePath'\n>;\n\n/**\n * Create and run a TaskReporter task which calls `bundle()` from `@ms-cloudpack/bundler` and formats the result.\n */\nexport async function bundleTask(\n  options: BundleTaskInternalOptions,\n  context: BundleTaskInternalContext,\n): Promise<void> {\n  const { bundleRequest, force, hash, sourceHash } = options;\n  const { packageName, version } = bundleRequest;\n  const { reporter, telemetryClient, packageHashes, packages, session, remoteCacheClient } = context;\n  const { config, sequence } = session;\n  const { mode } = config;\n  const { retryCount } = options;\n\n  const taskName = `Bundle ${formatPackageName({\n    name: packageName,\n    version,\n  })}${retryCount ? ` (retry ${retryCount})` : ''}`;\n\n  await reporter.runTask(taskName, async () => {\n    await telemetryClient.tracer.startActiveSpan('BUNDLE_TASK', async (span) => {\n      // If force is set, dispose the existing result.\n      if (force && bundleRequest?.result?.dispose) {\n        bundleRequest.result.dispose();\n        bundleRequest.result = undefined;\n      }\n\n      let bundleSource: 'remote-cache' | 'local-cache' | 'bundler' = 'local-cache';\n      const { packagePath, isExternal, isIncremental, disableSourceMaps, shouldGetBundleInfo } = bundleRequest;\n\n      const outputPath =\n        bundleRequest.outputPath ??\n        (await getBundleLocation({ packagePath, shouldRecalculate: force, hash }, context)).path;\n      // Rehydrate the result if not incremental.\n      if (bundleRequest.result === undefined && !force) {\n        bundleRequest.result = await readResultFromCache(outputPath, {\n          inputPath: packagePath,\n        });\n        bundleSource = 'local-cache';\n\n        if (!bundleRequest.result && remoteCacheClient) {\n          const downloadResult = await remoteCacheClient.downloadFolder({\n            id: await getRemoteCachePackageId({ packagePath }, context),\n            path: outputPath,\n            friendlyName: `${packageName}@${version}`,\n          });\n\n          if (downloadResult === 'success') {\n            // If the download was successful, read the result from cache.\n            bundleRequest.result = await readResultFromCache(outputPath, {\n              inputPath: packagePath,\n            });\n            bundleSource = 'remote-cache';\n          } else if (downloadResult === 'already-exist') {\n            throw new Error(\n              'Remote cache already exist, but cloudpack result is not found in local cache. This must be a bug.',\n            );\n          }\n        }\n      }\n      const cacheValidationHash = !isExternal\n        ? sourceHash ||\n          (await packageHashes.get({ packagePath, isSourceHashingEnabled: true, shouldRecalculate: true }))\n        : undefined;\n\n      // if the cached result is valid, use it.\n      if (!force && isCachedResultValid({ bundleRequest, hash: cacheValidationHash })) {\n        console.debug(`Using cached result for ${bundleRequest.packageName}@${bundleRequest.version}`);\n        bundleRequest.resultFromCache = true;\n      } else {\n        bundleRequest.resultFromCache = false;\n\n        // Only use cached result if it's successful.\n        await prepareOutputPath(outputPath);\n\n        if (bundleRequest.result?.rebuild) {\n          bundleRequest.result = {\n            ...(await bundleRequest.result.rebuild()),\n            outputPath: bundleRequest.result.outputPath,\n            hash: cacheValidationHash,\n          };\n        } else {\n          const {\n            bundler,\n            bundlerOptions,\n            inlinedDependencies,\n            dynamicImports,\n            bundlerCapabilities,\n            ignoredBundlerWarnings,\n            unsafeCjsExportNames,\n          } = (await packages.get(packagePath)).cloudpack || {};\n\n          const bundleOptions: BundleOptions = {\n            bundler,\n            minify: mode === 'production',\n            bundlerOptions,\n            inputPath: packagePath,\n            outputPath,\n            incremental: isIncremental !== undefined ? isIncremental : false,\n            sourcemap: !disableSourceMaps,\n            entries: await getEntriesMapFromPackage({ inputPath: packagePath }, { packages, config }),\n            inlined: inlinedDependencies,\n            external: await getExternalsFromPackage({ inputPath: packagePath }, { packages }),\n            dynamicImports,\n            ignoredBundlerWarnings,\n            bundlerCapabilities,\n            unsafeCjsExportNames,\n          };\n\n          const bundleInternalResult = await bundle(bundleOptions, { config });\n          if (bundleInternalResult.bundler) {\n            span.setAttribute('bundler', bundleInternalResult.bundler);\n          }\n          bundleRequest.result = {\n            ...bundleInternalResult,\n            outputPath: bundleOptions.outputPath ?? outputPath,\n            hash: cacheValidationHash,\n          };\n\n          if (bundlerCapabilities?.density) {\n            // Get export maps that need to be written as stubs for density.\n            // If there are density exports, write stubs for them.\n            const densityErrors = await writeStubForDensityEntries({\n              options: {\n                packageName,\n                packagePath,\n                result: bundleInternalResult,\n              },\n              context: { packages, config },\n            });\n\n            // Add any errors to the result.\n            if (densityErrors.length > 0) {\n              bundleRequest.result.errors = [...(bundleRequest.result.errors ?? []), ...densityErrors];\n            }\n          }\n        }\n\n        // Write the result to disk.\n        await saveResultToCache(bundleRequest.result);\n      }\n\n      // If we should find required imports and exports per bundle\n      if (shouldGetBundleInfo && !bundleRequest.result?.errors?.length && bundleRequest.result?.outputFiles?.length) {\n        const bundleInfoPath = path.join(outputPath, 'bundle-info.json');\n\n        // Exports map is needed to find the bundle info per entry we intend to bundle.\n        // Exports map is used instead of bundleRequest.entries since it is easier to use\n        // because it contains the paths other packages use to import the entry and\n        // the relative location of the bundled files.\n        const exportsMap = await getExportsMap({ packagePath }, { packages, config });\n\n        const bundleInfo = await getBundleInfo({\n          outputPath,\n          outputFiles: bundleRequest.result.outputFiles,\n          exportsMap,\n          isExternal,\n          packagePath,\n        });\n\n        bundleRequest.result.info = bundleInfo;\n\n        // Write to cache for future use. (Ignore the promise result.)\n        // eslint-disable-next-line @typescript-eslint/no-floating-promises\n        writeJson(bundleInfoPath, bundleInfo);\n      }\n\n      span.setAttributes({\n        sequence,\n        isCacheHit: !!bundleRequest.resultFromCache,\n        isExternal: bundleRequest.isExternal,\n        packageName: bundleRequest.packageName,\n        packageVersion: bundleRequest.version,\n        bundleSource,\n      });\n\n      const taskResult = formatBundleTaskResult(bundleRequest);\n\n      return taskResult;\n    });\n  });\n}\n"]}
+{"version":3,"file":"bundleTask.js","sourceRoot":"","sources":["../../src/utilities/bundleTask.ts"],"names":[],"mappings":"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","sourcesContent":["import { bundle, getEntriesMapFromPackage, getExternalsFromPackage } from '@ms-cloudpack/bundler';\nimport type { BundleOptions } from '@ms-cloudpack/common-types';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport { getExportsMap } from '@ms-cloudpack/package-utilities';\nimport { formatPackageName } from '@ms-cloudpack/task-reporter';\nimport path from 'path';\nimport { prepareOutputPath } from '../common/prepareOutputPath.js';\nimport type { BundleRequest } from '../types/BundleRequest.js';\nimport type { BundleTaskOptions } from '../types/BundleTaskOptions.js';\nimport { getBundleInfo } from './getBundleInfo.js';\nimport { getBundleLocation } from './getBundleLocation.js';\nimport { isCachedResultValid } from './isCachedResultValid.js';\nimport { readResultFromCache } from './readResultFromCache.js';\nimport { saveResultToCache } from './saveResultToCache.js';\nimport { formatBundleTaskResult } from './formatBundleTaskResult.js';\nimport type { PartialContext } from '../types/Context.js';\nimport { writeStubForDensityEntries } from './writeStubForDensityEntries.js';\n\nexport type BundleTaskInternalOptions = BundleTaskOptions & { bundleRequest: BundleRequest };\nexport type BundleTaskInternalContext = PartialContext<\n  'packages' | 'packageHashes' | 'reporter' | 'telemetryClient' | 'remoteCacheClient',\n  'resolveMap' | 'config' | 'sequence' | 'cachePath'\n>;\n\n/**\n * Create and run a TaskReporter task which calls `bundle()` from `@ms-cloudpack/bundler` and formats the result.\n */\nexport async function bundleTask(\n  options: BundleTaskInternalOptions,\n  context: BundleTaskInternalContext,\n): Promise<void> {\n  const { bundleRequest } = options;\n  const { packageName, version } = bundleRequest;\n  const { reporter, telemetryClient, session } = context;\n  const { sequence } = session;\n  const { retryCount } = options;\n\n  const task = reporter.addTask(\n    `Bundle ${formatPackageName({ name: packageName, version })}${retryCount ? ` (retry ${retryCount})` : ''}`,\n  );\n\n  try {\n    await telemetryClient.tracer.startActiveSpan('BUNDLE_TASK', async (span) => {\n      await bundleTaskInternal(options, context);\n\n      span.setAttributes({\n        sequence,\n        isCacheHit: !!bundleRequest.resultFromCache,\n        isExternal: bundleRequest.isExternal,\n        packageName: bundleRequest.packageName,\n        packageVersion: bundleRequest.version,\n        bundleSource: bundleRequest.result?.bundleSource,\n        bundler: bundleRequest.result?.bundler,\n        bundlerVersion: bundleRequest.result?.bundlerVersion,\n      });\n    });\n  } catch (err) {\n    // If an unexpected error is thrown, add it to the result.\n    // This ensures consistent handling of either actual bundler errors or exceptions.\n    bundleRequest.result ??= {};\n    bundleRequest.result.errors ??= [];\n    bundleRequest.result.errors.push({\n      text: `Unexpected exception while bundling: ${(err as Error).stack || String(err)}`,\n      source: 'bundleTask',\n    });\n  }\n\n  task.complete(formatBundleTaskResult(bundleRequest));\n}\n\n/**\n * Actually read the result from the cache or call `bundle()`.\n * NOTE: The result is returned by mutating `options.bundleRequest.result`.\n */\nasync function bundleTaskInternal(\n  options: BundleTaskInternalOptions,\n  context: BundleTaskInternalContext,\n): Promise<void> {\n  const { bundleRequest, force, hash, sourceHash } = options;\n  const { packageName, version } = bundleRequest;\n  const { packageHashes, packages, session } = context;\n  const { config } = session;\n  const { mode } = config;\n\n  // If force is set, dispose the existing result.\n  if (force && bundleRequest?.result?.dispose) {\n    bundleRequest.result.dispose();\n    bundleRequest.result = undefined;\n  }\n\n  const { packagePath, isExternal, isIncremental, disableSourceMaps, shouldGetBundleInfo } = bundleRequest;\n\n  const outputPath =\n    bundleRequest.outputPath ??\n    (await getBundleLocation({ packagePath, shouldRecalculate: force, hash }, context)).path;\n\n  // Rehydrate the result if not incremental.\n  if (bundleRequest.result === undefined && !force) {\n    bundleRequest.result = await readResultFromCache(\n      { packageName, version, inputPath: packagePath, outputPath },\n      context,\n    );\n  }\n\n  const cacheValidationHash = !isExternal\n    ? sourceHash || (await packageHashes.get({ packagePath, isSourceHashingEnabled: true, shouldRecalculate: true }))\n    : undefined;\n\n  // if the cached result is valid, use it.\n  if (!force && isCachedResultValid({ bundleRequest, hash: cacheValidationHash })) {\n    console.debug(`Using cached result for ${bundleRequest.packageName}@${bundleRequest.version}`);\n    bundleRequest.resultFromCache = true;\n  } else {\n    bundleRequest.resultFromCache = false;\n\n    // Only use cached result if it's successful.\n    await prepareOutputPath(outputPath);\n\n    if (bundleRequest.result?.rebuild) {\n      bundleRequest.result = {\n        ...(await bundleRequest.result.rebuild()),\n        outputPath: bundleRequest.result.outputPath,\n        hash: cacheValidationHash,\n      };\n    } else {\n      const {\n        bundler,\n        bundlerOptions,\n        inlinedDependencies,\n        dynamicImports,\n        bundlerCapabilities,\n        ignoredBundlerWarnings,\n        unsafeCjsExportNames,\n      } = (await packages.get(packagePath)).cloudpack || {};\n\n      const bundleOptions: BundleOptions = {\n        bundler,\n        minify: mode === 'production',\n        bundlerOptions,\n        inputPath: packagePath,\n        outputPath,\n        incremental: isIncremental !== undefined ? isIncremental : false,\n        sourcemap: !disableSourceMaps,\n        entries: await getEntriesMapFromPackage({ inputPath: packagePath }, { packages, config }),\n        inlined: inlinedDependencies,\n        external: await getExternalsFromPackage({ inputPath: packagePath }, { packages }),\n        dynamicImports,\n        ignoredBundlerWarnings,\n        bundlerCapabilities,\n        unsafeCjsExportNames,\n      };\n\n      const bundleInternalResult = await bundle(bundleOptions, { config });\n      bundleRequest.result = {\n        ...bundleInternalResult,\n        outputPath: bundleOptions.outputPath ?? outputPath,\n        hash: cacheValidationHash,\n        bundleSource: 'bundler',\n      };\n\n      if (bundlerCapabilities?.density) {\n        // Get export maps that need to be written as stubs for density.\n        // If there are density exports, write stubs for them.\n        const densityErrors = await writeStubForDensityEntries({\n          options: {\n            packageName,\n            packagePath,\n            result: bundleInternalResult,\n          },\n          context: { packages, config },\n        });\n\n        // Add any errors to the result.\n        if (densityErrors.length > 0) {\n          bundleRequest.result.errors = [...(bundleRequest.result.errors ?? []), ...densityErrors];\n        }\n      }\n    }\n\n    // Write the result to disk.\n    await saveResultToCache(bundleRequest.result);\n  }\n\n  // If we should find required imports and exports per bundle\n  if (shouldGetBundleInfo && !bundleRequest.result?.errors?.length && bundleRequest.result?.outputFiles?.length) {\n    const bundleInfoPath = path.join(outputPath, 'bundle-info.json');\n\n    // Exports map is needed to find the bundle info per entry we intend to bundle.\n    // Exports map is used instead of bundleRequest.entries since it is easier to use\n    // because it contains the paths other packages use to import the entry and\n    // the relative location of the bundled files.\n    const exportsMap = await getExportsMap({ packagePath }, { packages, config });\n\n    const bundleInfo = await getBundleInfo({\n      outputPath,\n      outputFiles: bundleRequest.result.outputFiles,\n      exportsMap,\n      isExternal,\n      packagePath,\n    });\n\n    bundleRequest.result.info = bundleInfo;\n\n    // Write to cache for future use. (Ignore the promise result.)\n    // eslint-disable-next-line @typescript-eslint/no-floating-promises\n    writeJson(bundleInfoPath, bundleInfo);\n  }\n}\n"]}

package/lib/utilities/formatBundleTaskResult.d.ts

@@ -1,4 +1,13 @@
 import { type TaskReporterTaskResult } from '@ms-cloudpack/task-reporter';
 import type { BundleRequest } from '../types/BundleRequest.js';
+/**
+ * Format a bundle result into a TaskReporter task result.
+ *
+ * NOTE: The info as formatted here will only be shown when a task is completed, not in the summary.
+ * Reporter configuration may change over time, but as of writing:
+ * - Failed tasks (message and errors) will be shown unless `--quiet`.
+ * - Successful tasks will only be shown with `--verbose` or `--debug`, or if the command sets
+ *   `showCompleted` (`cloudpack bundle` does as of writing).
+ */
 export declare function formatBundleTaskResult(bundleRequest: BundleRequest): TaskReporterTaskResult;
 //# sourceMappingURL=formatBundleTaskResult.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"formatBundleTaskResult.d.ts","sourceRoot":"","sources":["../../src/utilities/formatBundleTaskResult.ts"],"names":[],"mappings":"AACA,OAAO,EAAqC,KAAK,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAC7G,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAK/D,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,aAAa,GAAG,sBAAsB,CAqD3F"}
+{"version":3,"file":"formatBundleTaskResult.d.ts","sourceRoot":"","sources":["../../src/utilities/formatBundleTaskResult.ts"],"names":[],"mappings":"AACA,OAAO,EAAqC,KAAK,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAC7G,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAK/D;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,aAAa,GAAG,sBAAsB,CAsD3F"}

package/lib/utilities/formatBundleTaskResult.js

@@ -3,6 +3,15 @@ import { red, bulletedList, plural, indent } from '@ms-cloudpack/task-reporter';
 import { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';
 import { getFileSizeSync } from './getFileSizeSync.js';
 import path from 'path';
+/**
+ * Format a bundle result into a TaskReporter task result.
+ *
+ * NOTE: The info as formatted here will only be shown when a task is completed, not in the summary.
+ * Reporter configuration may change over time, but as of writing:
+ * - Failed tasks (message and errors) will be shown unless `--quiet`.
+ * - Successful tasks will only be shown with `--verbose` or `--debug`, or if the command sets
+ *   `showCompleted` (`cloudpack bundle` does as of writing).
+ */
 export function formatBundleTaskResult(bundleRequest) {
     const { result, packageName, version, packagePath } = bundleRequest;
     if (!result) {
@@ -28,6 +37,7 @@ export function formatBundleTaskResult(bundleRequest) {
     const hasErrors = result.errors.length > 0;
     const status = hasErrors ? 'fail' : 'complete';
     const message = hasErrors ? plural(result.errors.length, 'error$s found') : undefined;
+    // Only shown with --verbose or --debug
     const details = bulletedList([
         `Package: ${bundleRequest.packageName}@${bundleRequest.version}`,
         `Bundler: ${result.bundler || 'unknown'}`,

package/lib/utilities/formatBundleTaskResult.js.map

@@ -1 +1 @@
-{"version":3,"file":"formatBundleTaskResult.js","sourceRoot":"","sources":["../../src/utilities/formatBundleTaskResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAA+B,MAAM,6BAA6B,CAAC;AAE7G,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,UAAU,sBAAsB,CAAC,aAA4B;IACjE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,aAAa,CAAC;IAEpE,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;YACL,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,yCAAyC,WAAW,IAAI,OAAO,GAAG;SAC5E,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,WAAW,KAAK,EAAE,CAAC;IAC1B,MAAM,CAAC,MAAM,KAAK,EAAE,CAAC;IACrB,MAAM,CAAC,QAAQ,KAAK,EAAE,CAAC;IAEvB,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;QACzD,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;YACnB,IAAI,EAAE,mCAAmC,WAAW,SAAS,MAAM,CAAC,UAAU,GAAG;YACjF,MAAM,EAAE,YAAY;SACrB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC1C,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;QACzC,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;QAC9F,OAAO,IAAI,MAAM,IAAI,QAAQ,KAAK,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3D,CAAC,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC;IAC/C,MAAM,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACtF,MAAM,OAAO,GAAG,YAAY,CAAC;QAC3B,YAAY,aAAa,CAAC,WAAW,IAAI,aAAa,CAAC,OAAO,EAAE;QAChE,YAAY,MAAM,CAAC,OAAO,IAAI,SAAS,EAAE;QACzC,eAAe,aAAa,CAAC,eAAe,EAAE;QAC9C,eAAe,aAAa,CAAC,WAAW,EAAE;QAC1C,UAAU;QACV,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;QACnC,gBAAgB,MAAM,CAAC,UAAU,EAAE;QACnC,eAAe;QACf,MAAM,CAAC,WAAW,CAAC,GAAG,CACpB,CAAC,IAAI,EAAE,EAAE,CACP,GAAG,qBAAqB,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,eAAe;QAC3D,8GAA8G;QAC9G,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAW,EAAE,IAAI,CAAC,UAAU,CAAC,CAClD,GAAG,CACP;KACF,CAAC,CAAC;IAEH,OAAO;QACL,MAAM;QACN,OAAO;QACP,MAAM;QACN,OAAO;KACR,CAAC;AACJ,CAAC","sourcesContent":["import { formatLocation } from '@ms-cloudpack/path-utilities';\nimport { red, bulletedList, plural, indent, type TaskReporterTaskResult } from '@ms-cloudpack/task-reporter';\nimport type { BundleRequest } from '../types/BundleRequest.js';\nimport { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport { getFileSizeSync } from './getFileSizeSync.js';\nimport path from 'path';\n\nexport function formatBundleTaskResult(bundleRequest: BundleRequest): TaskReporterTaskResult {\n  const { result, packageName, version, packagePath } = bundleRequest;\n\n  if (!result) {\n    return {\n      status: 'fail',\n      details: `[bundleTask] No result was found for \"${packageName}@${version}\"`,\n    };\n  }\n\n  result.outputFiles ??= [];\n  result.errors ??= [];\n  result.warnings ??= [];\n\n  if (!result.outputFiles.length && !result.errors?.length) {\n    result.warnings.push({\n      text: `No output files were found for \"${packageName}\" in \"${result.outputPath}\"`,\n      source: 'bundleTask',\n    });\n  }\n\n  const errors = result.errors?.map((error) => {\n    const { text, source, location } = error;\n    const filePath = location ? ' ' + formatLocation({ ...location, fromPath: packagePath }) : '';\n    return `[${source}]${filePath}\\n${red(indent(text, 1))}`;\n  });\n  const hasErrors = result.errors.length > 0;\n  const status = hasErrors ? 'fail' : 'complete';\n  const message = hasErrors ? plural(result.errors.length, 'error$s found') : undefined;\n  const details = bulletedList([\n    `Package: ${bundleRequest.packageName}@${bundleRequest.version}`,\n    `Bundler: ${result.bundler || 'unknown'}`,\n    `From cache: ${bundleRequest.resultFromCache}`,\n    `Input path: ${bundleRequest.packagePath}`,\n    `Entries:`,\n    Object.values(result.entries || {}),\n    `Output path: ${result.outputPath}`,\n    `Output files:`,\n    result.outputFiles.map(\n      (file) =>\n        `${normalizeRelativePath(file.outputPath)} (${getFileSizeSync(\n          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- there are output files, so this is set\n          path.resolve(result.outputPath!, file.outputPath),\n        )})`,\n    ),\n  ]);\n\n  return {\n    status,\n    message,\n    errors,\n    details,\n  };\n}\n"]}
+{"version":3,"file":"formatBundleTaskResult.js","sourceRoot":"","sources":["../../src/utilities/formatBundleTaskResult.ts"],"names":[],"mappings":"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","sourcesContent":["import { formatLocation } from '@ms-cloudpack/path-utilities';\nimport { red, bulletedList, plural, indent, type TaskReporterTaskResult } from '@ms-cloudpack/task-reporter';\nimport type { BundleRequest } from '../types/BundleRequest.js';\nimport { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport { getFileSizeSync } from './getFileSizeSync.js';\nimport path from 'path';\n\n/**\n * Format a bundle result into a TaskReporter task result.\n *\n * NOTE: The info as formatted here will only be shown when a task is completed, not in the summary.\n * Reporter configuration may change over time, but as of writing:\n * - Failed tasks (message and errors) will be shown unless `--quiet`.\n * - Successful tasks will only be shown with `--verbose` or `--debug`, or if the command sets\n *   `showCompleted` (`cloudpack bundle` does as of writing).\n */\nexport function formatBundleTaskResult(bundleRequest: BundleRequest): TaskReporterTaskResult {\n  const { result, packageName, version, packagePath } = bundleRequest;\n\n  if (!result) {\n    return {\n      status: 'fail',\n      details: `[bundleTask] No result was found for \"${packageName}@${version}\"`,\n    };\n  }\n\n  result.outputFiles ??= [];\n  result.errors ??= [];\n  result.warnings ??= [];\n\n  if (!result.outputFiles.length && !result.errors?.length) {\n    result.warnings.push({\n      text: `No output files were found for \"${packageName}\" in \"${result.outputPath}\"`,\n      source: 'bundleTask',\n    });\n  }\n\n  const errors = result.errors?.map((error) => {\n    const { text, source, location } = error;\n    const filePath = location ? ' ' + formatLocation({ ...location, fromPath: packagePath }) : '';\n    return `[${source}]${filePath}\\n${red(indent(text, 1))}`;\n  });\n  const hasErrors = result.errors.length > 0;\n  const status = hasErrors ? 'fail' : 'complete';\n  const message = hasErrors ? plural(result.errors.length, 'error$s found') : undefined;\n  // Only shown with --verbose or --debug\n  const details = bulletedList([\n    `Package: ${bundleRequest.packageName}@${bundleRequest.version}`,\n    `Bundler: ${result.bundler || 'unknown'}`,\n    `From cache: ${bundleRequest.resultFromCache}`,\n    `Input path: ${bundleRequest.packagePath}`,\n    `Entries:`,\n    Object.values(result.entries || {}),\n    `Output path: ${result.outputPath}`,\n    `Output files:`,\n    result.outputFiles.map(\n      (file) =>\n        `${normalizeRelativePath(file.outputPath)} (${getFileSizeSync(\n          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- there are output files, so this is set\n          path.resolve(result.outputPath!, file.outputPath),\n        )})`,\n    ),\n  ]);\n\n  return {\n    status,\n    message,\n    errors,\n    details,\n  };\n}\n"]}

package/lib/utilities/getResultJsonPath.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Returns the path to the result.json file (result object that is written to the cache)
+ * in the bundle output directory.
+ * @param outputPath Path to the bundle output directory.
+ */
+export declare function getResultJsonPath(outputPath: string): string;
+//# sourceMappingURL=getResultJsonPath.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"getResultJsonPath.d.ts","sourceRoot":"","sources":["../../src/utilities/getResultJsonPath.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE5D"}

package/lib/utilities/getResultJsonPath.js

@@ -0,0 +1,10 @@
+import path from 'path';
+/**
+ * Returns the path to the result.json file (result object that is written to the cache)
+ * in the bundle output directory.
+ * @param outputPath Path to the bundle output directory.
+ */
+export function getResultJsonPath(outputPath) {
+    return path.join(outputPath, 'result.json');
+}
+//# sourceMappingURL=getResultJsonPath.js.map

package/lib/utilities/getResultJsonPath.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getResultJsonPath.js","sourceRoot":"","sources":["../../src/utilities/getResultJsonPath.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,UAAkB;IAClD,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;AAC9C,CAAC","sourcesContent":["import path from 'path';\n\n/**\n * Returns the path to the result.json file (result object that is written to the cache)\n * in the bundle output directory.\n * @param outputPath Path to the bundle output directory.\n */\nexport function getResultJsonPath(outputPath: string): string {\n  return path.join(outputPath, 'result.json');\n}\n"]}

package/lib/utilities/readResultFromCache.d.ts

@@ -1,10 +1,18 @@
 import type { BundleRequest } from '../types/BundleRequest.js';
+import type { RemoteCacheClient } from '@ms-cloudpack/remote-cache';
+import type { PartialContext } from '../types/Context.js';
 /**
- * Reads the 'results.json' file from the cache, and construct a BundleRequest.result object from it.
- * @param outputPath - The path to the cache directory.
- * @param additionalProperties - Additional properties to add to the result object.
+ * Reads the `result.json` file from the cache, and construct a BundleRequest.result object from it.
+ * If the package wasn't already cached and `context.remoteCacheClient` is set, attempts to download it.
  */
-export declare function readResultFromCache(outputPath: string, additionalProperties: {
+export declare function readResultFromCache(params: {
+    packageName: string;
+    version: string;
+    /** Package path (will be added to the result). */
     inputPath: string;
-}): Promise<BundleRequest['result']>;
+    /** The path to the cache directory. */
+    outputPath: string;
+    /** If provided, and the package isn't found locally, attempt to download it. */
+    remoteCacheClient?: RemoteCacheClient;
+}, context: PartialContext<'packageHashes' | 'packages', 'cachePath'>): Promise<BundleRequest['result']>;
 //# sourceMappingURL=readResultFromCache.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"readResultFromCache.d.ts","sourceRoot":"","sources":["../../src/utilities/readResultFromCache.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAG/D;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,MAAM,EAClB,oBAAoB,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,GAC1C,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAsBlC"}
+{"version":3,"file":"readResultFromCache.d.ts","sourceRoot":"","sources":["../../src/utilities/readResultFromCache.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE/D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAG1D;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,MAAM,EAAE;IACN,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,kDAAkD;IAClD,SAAS,EAAE,MAAM,CAAC;IAClB,uCAAuC;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB,gFAAgF;IAChF,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACvC,EACD,OAAO,EAAE,cAAc,CAAC,eAAe,GAAG,UAAU,EAAE,WAAW,CAAC,GAEjE,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAoDlC"}

package/lib/utilities/readResultFromCache.js

@@ -1,19 +1,43 @@
 import { readJson } from '@ms-cloudpack/json-utilities';
-import path from 'path';
+import { getRemoteCachePackageId } from './getRemoteCachePackageId.js';
+import { getResultJsonPath } from './getResultJsonPath.js';
 /**
- * Reads the 'results.json' file from the cache, and construct a BundleRequest.result object from it.
- * @param outputPath - The path to the cache directory.
- * @param additionalProperties - Additional properties to add to the result object.
+ * Reads the `result.json` file from the cache, and construct a BundleRequest.result object from it.
+ * If the package wasn't already cached and `context.remoteCacheClient` is set, attempts to download it.
  */
-export async function readResultFromCache(outputPath, additionalProperties) {
-    const resultFromFile = await readJson(path.join(outputPath, 'result.json'));
+export async function readResultFromCache(params, context) {
+    const { packageName, version, inputPath, outputPath, remoteCacheClient } = params;
+    let bundleSource;
+    const resultPath = getResultJsonPath(outputPath);
+    let resultFromFile = await readJson(resultPath);
+    if (resultFromFile) {
+        bundleSource = 'local-cache';
+    }
+    else if (remoteCacheClient) {
+        const downloadResult = await remoteCacheClient.downloadFolder({
+            id: await getRemoteCachePackageId({ packagePath: inputPath }, context),
+            path: outputPath,
+            friendlyName: `${packageName}@${version}`,
+        });
+        if (downloadResult === 'success') {
+            resultFromFile = await readJson(resultPath);
+            if (!resultFromFile) {
+                throw new Error(`Downloading from the remote cache succeeded, but ${resultPath} could not be read. This is a Cloudpack bug.`);
+            }
+            bundleSource = 'remote-cache';
+        }
+        else if (downloadResult === 'already-exist') {
+            throw new Error(`The cache folder ${outputPath} already exists, but result.json was not found. This is a Cloudpack bug.`);
+        }
+    }
     if (!resultFromFile) {
         return undefined;
     }
     const result = {
         ...resultFromFile,
-        ...additionalProperties,
+        inputPath,
         outputPath,
+        bundleSource,
     };
     // Rename deprecated bundlerName to bundler to avoid bumping the hash version.
     /* eslint-disable etc/no-deprecated */

package/lib/utilities/readResultFromCache.js.map

@@ -1 +1 @@
-{"version":3,"file":"readResultFromCache.js","sourceRoot":"","sources":["../../src/utilities/readResultFromCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,IAAI,MAAM,MAAM,CAAC;AAIxB;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,UAAkB,EAClB,oBAA2C;IAE3C,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAa,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC;IAExF,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,MAAM,GAA4B;QACtC,GAAG,cAAc;QACjB,GAAG,oBAAoB;QACvB,UAAU;KACX,CAAC;IAEF,8EAA8E;IAC9E,sCAAsC;IACtC,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;QACvB,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC;QACpC,OAAO,MAAM,CAAC,WAAW,CAAC;IAC5B,CAAC;IACD,qCAAqC;IAErC,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import { readJson } from '@ms-cloudpack/json-utilities';\nimport path from 'path';\nimport type { BundleRequest } from '../types/BundleRequest.js';\nimport type { ResultJson } from '../types/ResultJson.js';\n\n/**\n * Reads the 'results.json' file from the cache, and construct a BundleRequest.result object from it.\n * @param outputPath - The path to the cache directory.\n * @param additionalProperties - Additional properties to add to the result object.\n */\nexport async function readResultFromCache(\n  outputPath: string,\n  additionalProperties: { inputPath: string },\n): Promise<BundleRequest['result']> {\n  const resultFromFile = await readJson<ResultJson>(path.join(outputPath, 'result.json'));\n\n  if (!resultFromFile) {\n    return undefined;\n  }\n\n  const result: BundleRequest['result'] = {\n    ...resultFromFile,\n    ...additionalProperties,\n    outputPath,\n  };\n\n  // Rename deprecated bundlerName to bundler to avoid bumping the hash version.\n  /* eslint-disable etc/no-deprecated */\n  if (result.bundlerName) {\n    result.bundler = result.bundlerName;\n    delete result.bundlerName;\n  }\n  /* eslint-enable etc/no-deprecated */\n\n  return result;\n}\n"]}
+{"version":3,"file":"readResultFromCache.js","sourceRoot":"","sources":["../../src/utilities/readResultFromCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAIxD,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAEvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,MASC,EACD,OAAkE;IAGlE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,iBAAiB,EAAE,GAAG,MAAM,CAAC;IAClF,IAAI,YAAkE,CAAC;IAEvE,MAAM,UAAU,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC;IAEjD,IAAI,cAAc,GAAG,MAAM,QAAQ,CAAa,UAAU,CAAC,CAAC;IAE5D,IAAI,cAAc,EAAE,CAAC;QACnB,YAAY,GAAG,aAAa,CAAC;IAC/B,CAAC;SAAM,IAAI,iBAAiB,EAAE,CAAC;QAC7B,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC,cAAc,CAAC;YAC5D,EAAE,EAAE,MAAM,uBAAuB,CAAC,EAAE,WAAW,EAAE,SAAS,EAAE,EAAE,OAAO,CAAC;YACtE,IAAI,EAAE,UAAU;YAChB,YAAY,EAAE,GAAG,WAAW,IAAI,OAAO,EAAE;SAC1C,CAAC,CAAC;QAEH,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;YACjC,cAAc,GAAG,MAAM,QAAQ,CAAa,UAAU,CAAC,CAAC;YACxD,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,MAAM,IAAI,KAAK,CACb,oDAAoD,UAAU,8CAA8C,CAC7G,CAAC;YACJ,CAAC;YACD,YAAY,GAAG,cAAc,CAAC;QAChC,CAAC;aAAM,IAAI,cAAc,KAAK,eAAe,EAAE,CAAC;YAC9C,MAAM,IAAI,KAAK,CACb,oBAAoB,UAAU,0EAA0E,CACzG,CAAC;QACJ,CAAC;IACH,CAAC;IAED,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,MAAM,GAA4B;QACtC,GAAG,cAAc;QACjB,SAAS;QACT,UAAU;QACV,YAAY;KACb,CAAC;IAEF,8EAA8E;IAC9E,sCAAsC;IACtC,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;QACvB,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC;QACpC,OAAO,MAAM,CAAC,WAAW,CAAC;IAC5B,CAAC;IACD,qCAAqC;IAErC,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import { readJson } from '@ms-cloudpack/json-utilities';\nimport type { BundleRequest } from '../types/BundleRequest.js';\nimport type { ResultJson } from '../types/ResultJson.js';\nimport type { RemoteCacheClient } from '@ms-cloudpack/remote-cache';\nimport { getRemoteCachePackageId } from './getRemoteCachePackageId.js';\nimport type { PartialContext } from '../types/Context.js';\nimport { getResultJsonPath } from './getResultJsonPath.js';\n\n/**\n * Reads the `result.json` file from the cache, and construct a BundleRequest.result object from it.\n * If the package wasn't already cached and `context.remoteCacheClient` is set, attempts to download it.\n */\nexport async function readResultFromCache(\n  params: {\n    packageName: string;\n    version: string;\n    /** Package path (will be added to the result). */\n    inputPath: string;\n    /** The path to the cache directory. */\n    outputPath: string;\n    /** If provided, and the package isn't found locally, attempt to download it. */\n    remoteCacheClient?: RemoteCacheClient;\n  },\n  context: PartialContext<'packageHashes' | 'packages', 'cachePath'>,\n  // outputPath: string,\n): Promise<BundleRequest['result']> {\n  const { packageName, version, inputPath, outputPath, remoteCacheClient } = params;\n  let bundleSource: NonNullable<BundleRequest['result']>['bundleSource'];\n\n  const resultPath = getResultJsonPath(outputPath);\n\n  let resultFromFile = await readJson<ResultJson>(resultPath);\n\n  if (resultFromFile) {\n    bundleSource = 'local-cache';\n  } else if (remoteCacheClient) {\n    const downloadResult = await remoteCacheClient.downloadFolder({\n      id: await getRemoteCachePackageId({ packagePath: inputPath }, context),\n      path: outputPath,\n      friendlyName: `${packageName}@${version}`,\n    });\n\n    if (downloadResult === 'success') {\n      resultFromFile = await readJson<ResultJson>(resultPath);\n      if (!resultFromFile) {\n        throw new Error(\n          `Downloading from the remote cache succeeded, but ${resultPath} could not be read. This is a Cloudpack bug.`,\n        );\n      }\n      bundleSource = 'remote-cache';\n    } else if (downloadResult === 'already-exist') {\n      throw new Error(\n        `The cache folder ${outputPath} already exists, but result.json was not found. This is a Cloudpack bug.`,\n      );\n    }\n  }\n\n  if (!resultFromFile) {\n    return undefined;\n  }\n\n  const result: BundleRequest['result'] = {\n    ...resultFromFile,\n    inputPath,\n    outputPath,\n    bundleSource,\n  };\n\n  // Rename deprecated bundlerName to bundler to avoid bumping the hash version.\n  /* eslint-disable etc/no-deprecated */\n  if (result.bundlerName) {\n    result.bundler = result.bundlerName;\n    delete result.bundlerName;\n  }\n  /* eslint-enable etc/no-deprecated */\n\n  return result;\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"saveResultToCache.d.ts","sourceRoot":"","sources":["../../src/utilities/saveResultToCache.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAG/D;;;GAGG;AACH,wBAAsB,iBAAiB,CAAC,mBAAmB,EAAE,WAAW,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBhH"}
+{"version":3,"file":"saveResultToCache.d.ts","sourceRoot":"","sources":["../../src/utilities/saveResultToCache.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAI/D;;;GAGG;AACH,wBAAsB,iBAAiB,CAAC,mBAAmB,EAAE,WAAW,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBhH"}

package/lib/utilities/saveResultToCache.js

@@ -1,22 +1,23 @@
 import { writeJson } from '@ms-cloudpack/json-utilities';
-import path from 'path';
+import { getResultJsonPath } from './getResultJsonPath.js';
 /**
  * Writes the bundleRequestResults to a 'results.json' file.
  * @param bundleRequestResult - The result object to write to the cache.
  */
 export async function saveResultToCache(bundleRequestResult) {
-    const { outputPath, bundler, entries, hash, outputFiles, warnings, errors } = bundleRequestResult;
+    const { outputPath, bundler, bundlerVersion, entries, hash, outputFiles, warnings, errors } = bundleRequestResult;
     if (!outputPath) {
         return;
     }
     const result = {
         bundler,
+        bundlerVersion,
         entries,
         hash,
         outputFiles,
         warnings,
         errors,
     };
-    await writeJson(path.join(outputPath, 'result.json'), result);
+    await writeJson(getResultJsonPath(outputPath), result);
 }
 //# sourceMappingURL=saveResultToCache.js.map

package/lib/utilities/saveResultToCache.js.map

@@ -1 +1 @@
-{"version":3,"file":"saveResultToCache.js","sourceRoot":"","sources":["../../src/utilities/saveResultToCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,IAAI,MAAM,MAAM,CAAC;AAIxB;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,mBAAyD;IAC/F,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,mBAAmB,CAAC;IAClG,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO;IACT,CAAC;IAED,MAAM,MAAM,GAAe;QACzB,OAAO;QACP,OAAO;QACP,IAAI;QACJ,WAAW;QACX,QAAQ;QACR,MAAM;KACP,CAAC;IAEF,MAAM,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,EAAE,MAAM,CAAC,CAAC;AAChE,CAAC","sourcesContent":["import { writeJson } from '@ms-cloudpack/json-utilities';\nimport path from 'path';\nimport type { BundleRequest } from '../types/BundleRequest.js';\nimport type { ResultJson } from '../types/ResultJson.js';\n\n/**\n * Writes the bundleRequestResults to a 'results.json' file.\n * @param bundleRequestResult - The result object to write to the cache.\n */\nexport async function saveResultToCache(bundleRequestResult: NonNullable<BundleRequest['result']>): Promise<void> {\n  const { outputPath, bundler, entries, hash, outputFiles, warnings, errors } = bundleRequestResult;\n  if (!outputPath) {\n    return;\n  }\n\n  const result: ResultJson = {\n    bundler,\n    entries,\n    hash,\n    outputFiles,\n    warnings,\n    errors,\n  };\n\n  await writeJson(path.join(outputPath, 'result.json'), result);\n}\n"]}
+{"version":3,"file":"saveResultToCache.js","sourceRoot":"","sources":["../../src/utilities/saveResultToCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAGzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,mBAAyD;IAC/F,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,mBAAmB,CAAC;IAClH,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO;IACT,CAAC;IAED,MAAM,MAAM,GAAe;QACzB,OAAO;QACP,cAAc;QACd,OAAO;QACP,IAAI;QACJ,WAAW;QACX,QAAQ;QACR,MAAM;KACP,CAAC;IAEF,MAAM,SAAS,CAAC,iBAAiB,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,CAAC;AACzD,CAAC","sourcesContent":["import { writeJson } from '@ms-cloudpack/json-utilities';\nimport type { BundleRequest } from '../types/BundleRequest.js';\nimport type { ResultJson } from '../types/ResultJson.js';\nimport { getResultJsonPath } from './getResultJsonPath.js';\n\n/**\n * Writes the bundleRequestResults to a 'results.json' file.\n * @param bundleRequestResult - The result object to write to the cache.\n */\nexport async function saveResultToCache(bundleRequestResult: NonNullable<BundleRequest['result']>): Promise<void> {\n  const { outputPath, bundler, bundlerVersion, entries, hash, outputFiles, warnings, errors } = bundleRequestResult;\n  if (!outputPath) {\n    return;\n  }\n\n  const result: ResultJson = {\n    bundler,\n    bundlerVersion,\n    entries,\n    hash,\n    outputFiles,\n    warnings,\n    errors,\n  };\n\n  await writeJson(getResultJsonPath(outputPath), result);\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/api-server",
-  "version": "0.58.11",
+  "version": "0.58.12",
   "description": "An implementation of the API server that does interacts with a task scheduler.",
   "license": "MIT",
   "type": "module",
@@ -27,22 +27,22 @@
     "@lage-run/logger": "^1.3.0",
     "@lage-run/scheduler": "^1.2.1",
     "@lage-run/target-graph": "^0.9.0",
-    "@ms-cloudpack/bundler": "^0.23.34",
-    "@ms-cloudpack/common-types": "^0.24.3",
-    "@ms-cloudpack/config": "^0.33.10",
-    "@ms-cloudpack/create-express-app": "^1.10.15",
+    "@ms-cloudpack/bundler": "^0.23.35",
+    "@ms-cloudpack/common-types": "^0.24.4",
+    "@ms-cloudpack/config": "^0.33.11",
+    "@ms-cloudpack/create-express-app": "^1.10.16",
     "@ms-cloudpack/data-bus": "^0.4.3",
-    "@ms-cloudpack/esm-stub-utilities": "^0.14.4",
+    "@ms-cloudpack/esm-stub-utilities": "^0.14.5",
     "@ms-cloudpack/file-watcher": "^0.2.0",
-    "@ms-cloudpack/import-map": "^0.8.25",
+    "@ms-cloudpack/import-map": "^0.8.26",
     "@ms-cloudpack/json-utilities": "^0.1.10",
-    "@ms-cloudpack/package-hashes": "^0.7.22",
-    "@ms-cloudpack/package-utilities": "^11.3.0",
+    "@ms-cloudpack/package-hashes": "^0.7.23",
+    "@ms-cloudpack/package-utilities": "^11.3.1",
     "@ms-cloudpack/path-string-parsing": "^1.2.6",
-    "@ms-cloudpack/path-utilities": "^3.0.0",
-    "@ms-cloudpack/remote-cache": "^0.10.6",
-    "@ms-cloudpack/task-reporter": "^0.14.8",
-    "@ms-cloudpack/telemetry": "^0.10.10",
+    "@ms-cloudpack/path-utilities": "^3.0.1",
+    "@ms-cloudpack/remote-cache": "^0.10.7",
+    "@ms-cloudpack/task-reporter": "^0.15.0",
+    "@ms-cloudpack/telemetry": "^0.10.11",
     "@trpc/client": "11.0.0-rc.682",
     "@trpc/server": "11.0.0-rc.682",
     "cors": "^2.8.5",