@ms-cloudpack/api-server 0.42.0 → 0.43.0

package/lib/utilities/TaskRunner.js

@@ -1,21 +1,23 @@
 import PQueue from 'p-queue';
-import EventEmitter from 'events';
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const log = (...messages) => {
-    // console.log(`TaskRunner:`, ...messages);
-};
+import { getDefaultTaskStats } from './getDefaultTaskStats.js';
+import { taskListSource, taskStatsSource } from '../index.browser.js';
 /**
  * TaskRunner class manages the state of Tasks.
  * This class is to be called by the api server.
  */
-export class TaskRunner extends EventEmitter {
-    constructor() {
-        super();
+export class TaskRunner {
+    constructor(context) {
+        this._context = context;
         this._queue = new PQueue({ concurrency: 10 });
+        this._taskStats = getDefaultTaskStats();
         this._pendingTasks = new Map();
         this._completedTasks = new Map();
         this._requiresRerun = new Set();
         this._prevTasks = new Map();
+        if (this._context) {
+            const { bus, session } = this._context;
+            bus.publish([session.id, 'status'], this._taskStats);
+        }
     }
     /**
      * The add method enqueues a Task and returns its Promise.
@@ -33,7 +35,6 @@ export class TaskRunner extends EventEmitter {
         // Check if we are already completed the task with that id.
         const action = this._completedTasks.get(id);
         if (action !== undefined && !rerun) {
-            log(`Previous action found, returning: "${name}:${id}"`);
             return Promise.resolve(action);
         }
         // Check if we are already running the task with that id.
@@ -42,7 +43,6 @@ export class TaskRunner extends EventEmitter {
             if (rerun) {
                 this._requiresRerun.add(id);
             }
-            log(`Previous action found, waiting: "${name}:${id}"`);
             return pending;
         }
         const resultPromise = (async () => {
@@ -53,22 +53,21 @@ export class TaskRunner extends EventEmitter {
                 taskResult = await this._queue.add(async () => {
                     const startDescription = {
                         ...task.getStartDescription?.(),
-                        id: task.id,
+                        id,
                     };
-                    this.emit('executeStarted', startDescription);
+                    this._reportStart(id, startDescription);
                     const result = await execute();
                     const endDescription = {
                         ...task.getEndDescription?.(result),
-                        id: task.id,
+                        id,
                     };
-                    this.emit('executeCompleted', endDescription);
+                    this._reportEnd(id, endDescription);
                     return result;
                 }, 
                 // Removes void from return type.
                 // Read more on: https://github.com/sindresorhus/p-queue/issues/175
                 { throwOnTimeout: true, priority });
             } while (this._requiresRerun.has(id));
-            log(`Task finished: "${name}:${id}"`);
             // Delete from pending list.
             this._pendingTasks.delete(id);
             // Extra check to ensure that the task returned a value.
@@ -98,7 +97,7 @@ export class TaskRunner extends EventEmitter {
             .get(id)
             ?.dispose?.()
             .catch(() => {
-            log(`Error disposing task: ${id}`);
+            console.debug(`Error disposing task: ${id}`);
         });
         this._prevTasks.get(id)?.clear?.();
         this._prevTasks.delete(id);
@@ -106,13 +105,90 @@ export class TaskRunner extends EventEmitter {
         this._pendingTasks.delete(id);
         this._completedTasks.delete(id);
     }
+    /**
+     * The clear method disposes all tasks and clears the TaskRunner.
+     */
+    clear() {
+        this._taskStats = getDefaultTaskStats();
+        if (this._context) {
+            const { bus, session } = this._context;
+            bus.publish([session.id, 'status'], this._taskStats);
+            bus.publish(taskListSource, { tasks: [] });
+        }
+        for (const id of this._prevTasks.keys()) {
+            this.remove(id);
+        }
+    }
     /** Pauses the TaskRunner (for testing). */
-    pause() {
+    _pause() {
         this._queue.pause();
     }
     /** Starts or resumes the TaskRunner (for testing). */
-    start() {
+    _start() {
         this._queue.start();
     }
+    /**
+     * Internal method to report the start of a task to the bus.
+     */
+    _reportStart(id, description) {
+        if (!this._context)
+            return;
+        const { bus } = this._context;
+        const { tasks } = bus.getData(taskListSource.path) || { tasks: [] };
+        const index = tasks.findIndex((t) => t.id === id);
+        const previousDescription = tasks[index];
+        const now = new Date().getTime();
+        if (!previousDescription) {
+            this._taskStats.totalTasks++;
+        }
+        if (previousDescription?.status === 'complete') {
+            this._taskStats.totalErrors -= previousDescription.errors?.length || 0;
+            this._taskStats.totalWarnings -= previousDescription.warnings?.length || 0;
+        }
+        this._taskStats.remainingTasks++;
+        this._taskStats.status = 'pending';
+        const task = {
+            ...description,
+            status: 'pending',
+            startTime: now,
+        };
+        if (index === -1) {
+            tasks.push(task);
+        }
+        else {
+            tasks[index] = task;
+        }
+        bus.publish(taskStatsSource, this._taskStats);
+        bus.publish(taskListSource, { tasks });
+    }
+    /**
+     * Internal method to report the end of a task to the bus.
+     */
+    _reportEnd(id, description) {
+        if (!this._context)
+            return;
+        const { bus } = this._context;
+        const { tasks } = bus.getData(taskListSource.path) || { tasks: [] };
+        const index = tasks.findIndex((t) => t.id === id);
+        const previousDescription = tasks[index];
+        const now = new Date().getTime();
+        if (previousDescription) {
+            this._taskStats.remainingTasks--;
+            this._taskStats.totalErrors += description?.errors?.length || 0;
+            this._taskStats.totalWarnings += description?.warnings?.length || 0;
+            tasks[index] = {
+                ...previousDescription,
+                ...description,
+                status: 'complete',
+                durationMilliseconds: now - previousDescription.startTime,
+                lastUpdated: now,
+            };
+            if (this._taskStats.remainingTasks === 0) {
+                this._taskStats.status = 'idle';
+            }
+            bus.publish(taskStatsSource, this._taskStats);
+            bus.publish(taskListSource, { tasks });
+        }
+    }
 }
 //# sourceMappingURL=TaskRunner.js.map

package/lib/utilities/TaskRunner.js.map

@@ -1 +1 @@
-{"version":3,"file":"TaskRunner.js","sourceRoot":"","sources":["../../src/utilities/TaskRunner.ts"],"names":[],"mappings":"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","sourcesContent":["import type { TaskStartDescription } from '../types/TaskStartDescription.js';\nimport type { TaskEndDescription } from '../types/TaskEndDescription.js';\nimport type { TaskOptions } from '../types/TaskOptions.js';\nimport type { Task } from '../types/Task.js';\nimport PQueue from 'p-queue';\nimport EventEmitter from 'events';\n\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\nconst log = (...messages: unknown[]) => {\n  // console.log(`TaskRunner:`, ...messages);\n};\n\n/**\n * TaskRunner class manages the state of Tasks.\n * This class is to be called by the api server.\n */\nexport class TaskRunner extends EventEmitter {\n  private _queue: PQueue;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private _pendingTasks: Map<string, Promise<any>>;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private _completedTasks: Map<string, any>;\n  private _requiresRerun: Set<string>;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private _prevTasks: Map<string, Task<any>>;\n\n  constructor() {\n    super();\n\n    this._queue = new PQueue({ concurrency: 10 });\n    this._pendingTasks = new Map();\n    this._completedTasks = new Map();\n    this._requiresRerun = new Set();\n    this._prevTasks = new Map();\n  }\n\n  /**\n   * The add method enqueues a Task and returns its Promise.\n   * If a Task with the same id has already been processed,\n   * it returns either the result or the promise.\n   * Rerun flag forces the Task to be run again.\n   */\n  add<TReturn>(task: Task<TReturn>, options?: TaskOptions): Promise<TReturn> {\n    const { name, id, execute } = task;\n    const { rerun, watch, priority } = options || {};\n\n    watch?.();\n\n    if (!this._prevTasks.get(id)) {\n      this._prevTasks.set(id, task);\n    }\n\n    // Check if we are already completed the task with that id.\n    const action = this._completedTasks.get(id) as TReturn | undefined;\n    if (action !== undefined && !rerun) {\n      log(`Previous action found, returning: \"${name}:${id}\"`);\n      return Promise.resolve(action);\n    }\n\n    // Check if we are already running the task with that id.\n    const pending = this._pendingTasks.get(id) as Promise<TReturn> | undefined;\n    if (pending !== undefined) {\n      if (rerun) {\n        this._requiresRerun.add(id);\n      }\n      log(`Previous action found, waiting: \"${name}:${id}\"`);\n      return pending;\n    }\n\n    const resultPromise = (async () => {\n      let taskResult: TReturn | undefined;\n\n      do {\n        // Delete from rerun list (if present).\n        this._requiresRerun.delete(id);\n\n        taskResult = await this._queue.add(\n          async () => {\n            const startDescription: TaskStartDescription = {\n              ...task.getStartDescription?.(),\n              id: task.id,\n            };\n            this.emit('executeStarted', startDescription);\n\n            const result = await execute();\n\n            const endDescription: TaskEndDescription = {\n              ...task.getEndDescription?.(result),\n              id: task.id,\n            };\n            this.emit('executeCompleted', endDescription);\n\n            return result;\n          },\n          // Removes void from return type.\n          // Read more on: https://github.com/sindresorhus/p-queue/issues/175\n          { throwOnTimeout: true, priority },\n        );\n      } while (this._requiresRerun.has(id));\n\n      log(`Task finished: \"${name}:${id}\"`);\n\n      // Delete from pending list.\n      this._pendingTasks.delete(id);\n\n      // Extra check to ensure that the task returned a value.\n      // It should never throw, if it does we have a bug.\n      if (taskResult === undefined) {\n        throw new Error(`Task \"${name}:${id}\" returned undefined, without throwing an error, which was unexpected.`);\n      }\n\n      // Update finished Tasks.\n      this._completedTasks.set(id, taskResult);\n\n      return taskResult;\n    })();\n\n    this._pendingTasks.set(id, resultPromise);\n    this._completedTasks.delete(id);\n\n    return resultPromise;\n  }\n\n  /**\n   * The remove method disposes a task if available\n   * and then removes it from the TaskRunner.\n   *\n   * This is useful when the state of a task needs to be cleared.\n   *\n   * It is intended to be used by the api server\n   * to clear the TaskRunner's state before reloading the page.\n   */\n  remove(id: string): void {\n    this._prevTasks\n      .get(id)\n      ?.dispose?.()\n      .catch(() => {\n        log(`Error disposing task: ${id}`);\n      });\n    this._prevTasks.get(id)?.clear?.();\n    this._prevTasks.delete(id);\n    this._requiresRerun.delete(id);\n    this._pendingTasks.delete(id);\n    this._completedTasks.delete(id);\n  }\n\n  /** Pauses the TaskRunner (for testing). */\n  pause(): void {\n    this._queue.pause();\n  }\n\n  /** Starts or resumes the TaskRunner (for testing). */\n  start(): void {\n    this._queue.start();\n  }\n}\n"]}
+{"version":3,"file":"TaskRunner.js","sourceRoot":"","sources":["../../src/utilities/TaskRunner.ts"],"names":[],"mappings":"AAOA,OAAO,MAAM,MAAM,SAAS,CAAC;AAC7B,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAwB,MAAM,qBAAqB,CAAC;AAE5F;;;GAGG;AACH,MAAM,OAAO,UAAU;IAcrB,YAAY,OAA2B;QACrC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC;QAC9C,IAAI,CAAC,UAAU,GAAG,mBAAmB,EAAE,CAAC;QACxC,IAAI,CAAC,aAAa,GAAG,IAAI,GAAG,EAAE,CAAC;QAC/B,IAAI,CAAC,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;QACjC,IAAI,CAAC,cAAc,GAAG,IAAI,GAAG,EAAE,CAAC;QAChC,IAAI,CAAC,UAAU,GAAG,IAAI,GAAG,EAAE,CAAC;QAE5B,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;YACvC,GAAG,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,GAAG,CAAU,IAAmB,EAAE,OAAqB;QACrD,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACnC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;QAEjD,KAAK,EAAE,EAAE,CAAC;QAEV,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YAC7B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAChC,CAAC;QAED,2DAA2D;QAC3D,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,CAAwB,CAAC;QACnE,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,KAAK,EAAE,CAAC;YACnC,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACjC,CAAC;QAED,yDAAyD;QACzD,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAiC,CAAC;QAC3E,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,IAAI,KAAK,EAAE,CAAC;gBACV,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC9B,CAAC;YACD,OAAO,OAAO,CAAC;QACjB,CAAC;QAED,MAAM,aAAa,GAAG,CAAC,KAAK,IAAI,EAAE;YAChC,IAAI,UAA+B,CAAC;YAEpC,GAAG,CAAC;gBACF,uCAAuC;gBACvC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAE/B,UAAU,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAChC,KAAK,IAAI,EAAE;oBACT,MAAM,gBAAgB,GAAyB;wBAC7C,GAAG,IAAI,CAAC,mBAAmB,EAAE,EAAE;wBAC/B,EAAE;qBACH,CAAC;oBACF,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;oBAExC,MAAM,MAAM,GAAG,MAAM,OAAO,EAAE,CAAC;oBAE/B,MAAM,cAAc,GAAuB;wBACzC,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC,MAAM,CAAC;wBACnC,EAAE;qBACH,CAAC;oBACF,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,cAAc,CAAC,CAAC;oBAEpC,OAAO,MAAM,CAAC;gBAChB,CAAC;gBACD,iCAAiC;gBACjC,mEAAmE;gBACnE,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE,CACnC,CAAC;YACJ,CAAC,QAAQ,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YAEtC,4BAA4B;YAC5B,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAE9B,wDAAwD;YACxD,mDAAmD;YACnD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gBAC7B,MAAM,IAAI,KAAK,CAAC,SAAS,IAAI,IAAI,EAAE,wEAAwE,CAAC,CAAC;YAC/G,CAAC;YAED,yBAAyB;YACzB,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;YAEzC,OAAO,UAAU,CAAC;QACpB,CAAC,CAAC,EAAE,CAAC;QAEL,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC;QAC1C,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEhC,OAAO,aAAa,CAAC;IACvB,CAAC;IAED;;;;;;;;OAQG;IACH,MAAM,CAAC,EAAU;QACf,IAAI,CAAC,UAAU;aACZ,GAAG,CAAC,EAAE,CAAC;YACR,EAAE,OAAO,EAAE,EAAE;aACZ,KAAK,CAAC,GAAG,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,EAAE,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;QACL,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;QACnC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC3B,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC/B,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC9B,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAClC,CAAC;IACD;;OAEG;IACH,KAAK;QACH,IAAI,CAAC,UAAU,GAAG,mBAAmB,EAAE,CAAC;QACxC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;YACvC,GAAG,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;YACrD,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;QAC7C,CAAC;QACD,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC;YACxC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IAED,2CAA2C;IAC3C,MAAM;QACJ,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;IAED,sDAAsD;IACtD,MAAM;QACJ,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;IAED;;OAEG;IACK,YAAY,CAAC,EAAU,EAAE,WAAiC;QAChE,IAAI,CAAC,IAAI,CAAC,QAAQ;YAAE,OAAO;QAC3B,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,OAAO,CAAW,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;QAC9E,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAClD,MAAM,mBAAmB,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;QACzC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAEjC,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACzB,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;QAC/B,CAAC;QAED,IAAI,mBAAmB,EAAE,MAAM,KAAK,UAAU,EAAE,CAAC;YAC/C,IAAI,CAAC,UAAU,CAAC,WAAW,IAAI,mBAAmB,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC,CAAC;YACvE,IAAI,CAAC,UAAU,CAAC,aAAa,IAAI,mBAAmB,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAC,CAAC;QAC7E,CAAC;QAED,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;QACjC,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,SAAS,CAAC;QAEnC,MAAM,IAAI,GAAoB;YAC5B,GAAG,WAAW;YACd,MAAM,EAAE,SAAS;YACjB,SAAS,EAAE,GAAG;SACf,CAAC;QACF,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;YACjB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnB,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;QACtB,CAAC;QAED,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAC9C,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;IACzC,CAAC;IAED;;OAEG;IACK,UAAU,CAAC,EAAU,EAAE,WAA+B;QAC5D,IAAI,CAAC,IAAI,CAAC,QAAQ;YAAE,OAAO;QAC3B,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,OAAO,CAAW,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;QAC9E,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAClD,MAAM,mBAAmB,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;QACzC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAEjC,IAAI,mBAAmB,EAAE,CAAC;YACxB,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;YACjC,IAAI,CAAC,UAAU,CAAC,WAAW,IAAI,WAAW,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC,CAAC;YAChE,IAAI,CAAC,UAAU,CAAC,aAAa,IAAI,WAAW,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC,CAAC;YAEpE,KAAK,CAAC,KAAK,CAAC,GAAG;gBACb,GAAG,mBAAmB;gBACtB,GAAG,WAAW;gBACd,MAAM,EAAE,UAAU;gBAClB,oBAAoB,EAAE,GAAG,GAAG,mBAAmB,CAAC,SAAS;gBACzD,WAAW,EAAE,GAAG;aACjB,CAAC;YAEF,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,KAAK,CAAC,EAAE,CAAC;gBACzC,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC;YAClC,CAAC;YAED,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;YAC9C,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;CACF","sourcesContent":["import type { TaskStartDescription } from '../types/TaskStartDescription.js';\nimport type { TaskEndDescription } from '../types/TaskEndDescription.js';\nimport type { TaskOptions } from '../types/TaskOptions.js';\nimport type { Task } from '../types/Task.js';\nimport type { TaskRunnerContext } from '../types/TaskRunnerContext.js';\nimport type { TaskStats } from '../types/TaskStats.js';\nimport type { TaskList } from '../types/TaskList.js';\nimport PQueue from 'p-queue';\nimport { getDefaultTaskStats } from './getDefaultTaskStats.js';\nimport { taskListSource, taskStatsSource, type TaskDescription } from '../index.browser.js';\n\n/**\n * TaskRunner class manages the state of Tasks.\n * This class is to be called by the api server.\n */\nexport class TaskRunner {\n  // Context is used to publish task status to the bus,\n  // so it is optional, as it is not needed during init or testing.\n  private _context: TaskRunnerContext | undefined;\n  private _queue: PQueue;\n  private _taskStats: TaskStats;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private _pendingTasks: Map<string, Promise<any>>;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private _completedTasks: Map<string, any>;\n  private _requiresRerun: Set<string>;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private _prevTasks: Map<string, Task<any>>;\n\n  constructor(context?: TaskRunnerContext) {\n    this._context = context;\n    this._queue = new PQueue({ concurrency: 10 });\n    this._taskStats = getDefaultTaskStats();\n    this._pendingTasks = new Map();\n    this._completedTasks = new Map();\n    this._requiresRerun = new Set();\n    this._prevTasks = new Map();\n\n    if (this._context) {\n      const { bus, session } = this._context;\n      bus.publish([session.id, 'status'], this._taskStats);\n    }\n  }\n\n  /**\n   * The add method enqueues a Task and returns its Promise.\n   * If a Task with the same id has already been processed,\n   * it returns either the result or the promise.\n   * Rerun flag forces the Task to be run again.\n   */\n  add<TReturn>(task: Task<TReturn>, options?: TaskOptions): Promise<TReturn> {\n    const { name, id, execute } = task;\n    const { rerun, watch, priority } = options || {};\n\n    watch?.();\n\n    if (!this._prevTasks.get(id)) {\n      this._prevTasks.set(id, task);\n    }\n\n    // Check if we are already completed the task with that id.\n    const action = this._completedTasks.get(id) as TReturn | undefined;\n    if (action !== undefined && !rerun) {\n      return Promise.resolve(action);\n    }\n\n    // Check if we are already running the task with that id.\n    const pending = this._pendingTasks.get(id) as Promise<TReturn> | undefined;\n    if (pending !== undefined) {\n      if (rerun) {\n        this._requiresRerun.add(id);\n      }\n      return pending;\n    }\n\n    const resultPromise = (async () => {\n      let taskResult: TReturn | undefined;\n\n      do {\n        // Delete from rerun list (if present).\n        this._requiresRerun.delete(id);\n\n        taskResult = await this._queue.add(\n          async () => {\n            const startDescription: TaskStartDescription = {\n              ...task.getStartDescription?.(),\n              id,\n            };\n            this._reportStart(id, startDescription);\n\n            const result = await execute();\n\n            const endDescription: TaskEndDescription = {\n              ...task.getEndDescription?.(result),\n              id,\n            };\n            this._reportEnd(id, endDescription);\n\n            return result;\n          },\n          // Removes void from return type.\n          // Read more on: https://github.com/sindresorhus/p-queue/issues/175\n          { throwOnTimeout: true, priority },\n        );\n      } while (this._requiresRerun.has(id));\n\n      // Delete from pending list.\n      this._pendingTasks.delete(id);\n\n      // Extra check to ensure that the task returned a value.\n      // It should never throw, if it does we have a bug.\n      if (taskResult === undefined) {\n        throw new Error(`Task \"${name}:${id}\" returned undefined, without throwing an error, which was unexpected.`);\n      }\n\n      // Update finished Tasks.\n      this._completedTasks.set(id, taskResult);\n\n      return taskResult;\n    })();\n\n    this._pendingTasks.set(id, resultPromise);\n    this._completedTasks.delete(id);\n\n    return resultPromise;\n  }\n\n  /**\n   * The remove method disposes a task if available\n   * and then removes it from the TaskRunner.\n   *\n   * This is useful when the state of a task needs to be cleared.\n   *\n   * It is intended to be used by the api server\n   * to clear the TaskRunner's state before reloading the page.\n   */\n  remove(id: string): void {\n    this._prevTasks\n      .get(id)\n      ?.dispose?.()\n      .catch(() => {\n        console.debug(`Error disposing task: ${id}`);\n      });\n    this._prevTasks.get(id)?.clear?.();\n    this._prevTasks.delete(id);\n    this._requiresRerun.delete(id);\n    this._pendingTasks.delete(id);\n    this._completedTasks.delete(id);\n  }\n  /**\n   * The clear method disposes all tasks and clears the TaskRunner.\n   */\n  clear(): void {\n    this._taskStats = getDefaultTaskStats();\n    if (this._context) {\n      const { bus, session } = this._context;\n      bus.publish([session.id, 'status'], this._taskStats);\n      bus.publish(taskListSource, { tasks: [] });\n    }\n    for (const id of this._prevTasks.keys()) {\n      this.remove(id);\n    }\n  }\n\n  /** Pauses the TaskRunner (for testing). */\n  _pause(): void {\n    this._queue.pause();\n  }\n\n  /** Starts or resumes the TaskRunner (for testing). */\n  _start(): void {\n    this._queue.start();\n  }\n\n  /**\n   * Internal method to report the start of a task to the bus.\n   */\n  private _reportStart(id: string, description: TaskStartDescription): void {\n    if (!this._context) return;\n    const { bus } = this._context;\n    const { tasks } = bus.getData<TaskList>(taskListSource.path) || { tasks: [] };\n    const index = tasks.findIndex((t) => t.id === id);\n    const previousDescription = tasks[index];\n    const now = new Date().getTime();\n\n    if (!previousDescription) {\n      this._taskStats.totalTasks++;\n    }\n\n    if (previousDescription?.status === 'complete') {\n      this._taskStats.totalErrors -= previousDescription.errors?.length || 0;\n      this._taskStats.totalWarnings -= previousDescription.warnings?.length || 0;\n    }\n\n    this._taskStats.remainingTasks++;\n    this._taskStats.status = 'pending';\n\n    const task: TaskDescription = {\n      ...description,\n      status: 'pending',\n      startTime: now,\n    };\n    if (index === -1) {\n      tasks.push(task);\n    } else {\n      tasks[index] = task;\n    }\n\n    bus.publish(taskStatsSource, this._taskStats);\n    bus.publish(taskListSource, { tasks });\n  }\n\n  /**\n   * Internal method to report the end of a task to the bus.\n   */\n  private _reportEnd(id: string, description: TaskEndDescription): void {\n    if (!this._context) return;\n    const { bus } = this._context;\n    const { tasks } = bus.getData<TaskList>(taskListSource.path) || { tasks: [] };\n    const index = tasks.findIndex((t) => t.id === id);\n    const previousDescription = tasks[index];\n    const now = new Date().getTime();\n\n    if (previousDescription) {\n      this._taskStats.remainingTasks--;\n      this._taskStats.totalErrors += description?.errors?.length || 0;\n      this._taskStats.totalWarnings += description?.warnings?.length || 0;\n\n      tasks[index] = {\n        ...previousDescription,\n        ...description,\n        status: 'complete',\n        durationMilliseconds: now - previousDescription.startTime,\n        lastUpdated: now,\n      };\n\n      if (this._taskStats.remainingTasks === 0) {\n        this._taskStats.status = 'idle';\n      }\n\n      bus.publish(taskStatsSource, this._taskStats);\n      bus.publish(taskListSource, { tasks });\n    }\n  }\n}\n"]}

package/lib/utilities/addOverride.js

@@ -1,7 +1,7 @@
 import { checkMatch, readGeneratedConfig, writeGeneratedConfig } from '@ms-cloudpack/config';
-import { parseRequestUrl } from '@ms-cloudpack/import-map';
+import { parseRequestInfo } from '@ms-cloudpack/import-map';
 import { addExportsMapEntry, findResolveMapEntry, flattenExportsMap, getExportsMap, } from '@ms-cloudpack/package-utilities';
-import { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';
+import { makeUrl, normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';
 /**
  * The addOverride method is triggered by a user action in the overlay, when we detect new usage of an import path
  * that isn't recognized. When the user triggers this override, we write it to the cloudpack generated config.
@@ -12,7 +12,7 @@ export async function addOverride(options, context) {
     let addedOverride = false;
     let requiredBy = undefined;
     if (issuerUrl) {
-        const { packageName: issuerName, version: issuerVersion } = parseRequestUrl(issuerUrl);
+        const { packageName: issuerName, version: issuerVersion } = parseRequestInfo(makeUrl(issuerUrl).pathname);
         requiredBy = { name: issuerName, version: issuerVersion };
     }
     const entry = findResolveMapEntry({

package/lib/utilities/addOverride.js.map

@@ -1 +1 @@
-{"version":3,"file":"addOverride.js","sourceRoot":"","sources":["../../src/utilities/addOverride.ts"],"names":[],"mappings":"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","sourcesContent":["import { checkMatch, readGeneratedConfig, writeGeneratedConfig } from '@ms-cloudpack/config';\nimport { parseRequestUrl } from '@ms-cloudpack/import-map';\nimport {\n  addExportsMapEntry,\n  findResolveMapEntry,\n  flattenExportsMap,\n  getExportsMap,\n  type ResolveMapEntry,\n} from '@ms-cloudpack/package-utilities';\nimport { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport type { Context } from '../types/Context.js';\nimport type { OverrideOptions } from '../types/OverrideOptions.js';\n\n/**\n * The addOverride method is triggered by a user action in the overlay, when we detect new usage of an import path\n * that isn't recognized. When the user triggers this override, we write it to the cloudpack generated config.\n */\nexport async function addOverride(\n  options: OverrideOptions,\n  context: Pick<Context, 'packages' | 'session'>,\n): Promise<{\n  /** Whether the override was successfully added */\n  addedOverride: boolean;\n  /** The entry (if any) in the resolve map the override was added to */\n  entry?: ResolveMapEntry;\n}> {\n  const { packageName, importPath, version, issuerUrl } = options;\n  const { session, packages } = context;\n  let addedOverride = false;\n  let requiredBy = undefined;\n\n  if (issuerUrl) {\n    const { packageName: issuerName, version: issuerVersion } = parseRequestUrl(issuerUrl);\n    requiredBy = { name: issuerName, version: issuerVersion };\n  }\n\n  const entry = findResolveMapEntry({\n    packageName,\n    resolveMap: session.resolveMap,\n    definition: requiredBy,\n    version,\n  });\n\n  if (!entry) {\n    console.error(`Could not find entry of package \"${packageName}\" in resolve map`);\n    return { addedOverride, entry };\n  }\n\n  const packagePath = entry.path;\n\n  // Get current exports. We want to add an additional entry to what's there - not replace the default exports,\n  // so we need the full map for the package.\n  const exports = await getExportsMap({ packagePath }, { packages, config: session.config });\n  const flattenedExports = flattenExportsMap(exports, { packagePath });\n\n  // Return false if the import path already exists in the exports map.\n  if (flattenedExports[normalizeRelativePath(importPath)]) {\n    console.debug(`The import path \"${importPath}\" already exists in the exports map for \"${packageName}\".`);\n    return { addedOverride, entry };\n  }\n\n  const addedExports = {};\n\n  // Add the single new exports entry to the exports map.\n  addedOverride = await addExportsMapEntry(\n    {\n      // This is required as addExportsMapEntry assumes addedExports is a record.\n      exports: addedExports,\n      packagePath,\n      importPath,\n    },\n    { packages, config: session.config },\n  );\n\n  if (!addedOverride) {\n    console.warn(\n      `Unable to add override for package \"${packageName}\" to \"cloudpack.config.json\". The file \"${normalizeRelativePath(\n        importPath,\n      )}\" could not be found. Please check the import path and try again.`,\n    );\n    return { addedOverride, entry };\n  }\n\n  if (Array.isArray(exports)) {\n    exports.push(addedExports);\n  } else {\n    const definition = await packages.get(packagePath);\n    if (!definition) {\n      console.error(`Could not find definition of package \"${packageName}\" in the cache`);\n      return { addedOverride, entry };\n    }\n    definition.exports = [exports, addedExports];\n  }\n\n  // Parse the user config if it exists.\n  const config = await readGeneratedConfig(session.appPath);\n\n  // Ensure packageSettings exist.\n  config.packageSettings ??= [];\n\n  const configMatches = config.packageSettings.filter(({ match }) =>\n    checkMatch({ name: packageName, version: entry.version, match, exactMatch: true }),\n  );\n\n  if (!configMatches.length) {\n    config.packageSettings.push({\n      match: {\n        name: packageName,\n        version: `^${entry.version}`,\n      },\n      exports: addedExports,\n    });\n  } else {\n    if (configMatches.length > 1) {\n      console.debug(\n        `Found multiple matches for package \"${packageName}\" in cloudpack.config.json. Using the first match.`,\n      );\n    }\n\n    // Use the first match and ensure exports exist\n    configMatches[0].exports ??= {};\n\n    const flattenedMatchExports = flattenExportsMap(configMatches[0].exports, { packagePath });\n\n    // Return false if the import path already exists in the match exports map.\n    if (flattenedMatchExports[normalizeRelativePath(importPath)]) {\n      console.debug(`The import path \"${importPath}\" already exists in the config exports map for \"${packageName}\".`);\n      return { addedOverride: false, entry };\n    }\n\n    // Add the single new exports entry to the match exports map.\n    await addExportsMapEntry(\n      {\n        exports: configMatches[0].exports,\n        packagePath,\n        importPath,\n      },\n      { packages, config: session.config },\n    );\n  }\n\n  await writeGeneratedConfig(config, session.appPath);\n  console.debug(`Added override for \"${packageName}\" to \"cloudpack.config.json\".`);\n\n  return { addedOverride, entry };\n}\n"]}
+{"version":3,"file":"addOverride.js","sourceRoot":"","sources":["../../src/utilities/addOverride.ts"],"names":[],"mappings":"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","sourcesContent":["import { checkMatch, readGeneratedConfig, writeGeneratedConfig } from '@ms-cloudpack/config';\nimport { parseRequestInfo } from '@ms-cloudpack/import-map';\nimport {\n  addExportsMapEntry,\n  findResolveMapEntry,\n  flattenExportsMap,\n  getExportsMap,\n  type ResolveMapEntry,\n} from '@ms-cloudpack/package-utilities';\nimport { makeUrl, normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport type { Context } from '../types/Context.js';\nimport type { OverrideOptions } from '../types/OverrideOptions.js';\n\n/**\n * The addOverride method is triggered by a user action in the overlay, when we detect new usage of an import path\n * that isn't recognized. When the user triggers this override, we write it to the cloudpack generated config.\n */\nexport async function addOverride(\n  options: OverrideOptions,\n  context: Pick<Context, 'packages' | 'session'>,\n): Promise<{\n  /** Whether the override was successfully added */\n  addedOverride: boolean;\n  /** The entry (if any) in the resolve map the override was added to */\n  entry?: ResolveMapEntry;\n}> {\n  const { packageName, importPath, version, issuerUrl } = options;\n  const { session, packages } = context;\n  let addedOverride = false;\n  let requiredBy = undefined;\n\n  if (issuerUrl) {\n    const { packageName: issuerName, version: issuerVersion } = parseRequestInfo(makeUrl(issuerUrl).pathname);\n    requiredBy = { name: issuerName, version: issuerVersion };\n  }\n\n  const entry = findResolveMapEntry({\n    packageName,\n    resolveMap: session.resolveMap,\n    definition: requiredBy,\n    version,\n  });\n\n  if (!entry) {\n    console.error(`Could not find entry of package \"${packageName}\" in resolve map`);\n    return { addedOverride, entry };\n  }\n\n  const packagePath = entry.path;\n\n  // Get current exports. We want to add an additional entry to what's there - not replace the default exports,\n  // so we need the full map for the package.\n  const exports = await getExportsMap({ packagePath }, { packages, config: session.config });\n  const flattenedExports = flattenExportsMap(exports, { packagePath });\n\n  // Return false if the import path already exists in the exports map.\n  if (flattenedExports[normalizeRelativePath(importPath)]) {\n    console.debug(`The import path \"${importPath}\" already exists in the exports map for \"${packageName}\".`);\n    return { addedOverride, entry };\n  }\n\n  const addedExports = {};\n\n  // Add the single new exports entry to the exports map.\n  addedOverride = await addExportsMapEntry(\n    {\n      // This is required as addExportsMapEntry assumes addedExports is a record.\n      exports: addedExports,\n      packagePath,\n      importPath,\n    },\n    { packages, config: session.config },\n  );\n\n  if (!addedOverride) {\n    console.warn(\n      `Unable to add override for package \"${packageName}\" to \"cloudpack.config.json\". The file \"${normalizeRelativePath(\n        importPath,\n      )}\" could not be found. Please check the import path and try again.`,\n    );\n    return { addedOverride, entry };\n  }\n\n  if (Array.isArray(exports)) {\n    exports.push(addedExports);\n  } else {\n    const definition = await packages.get(packagePath);\n    if (!definition) {\n      console.error(`Could not find definition of package \"${packageName}\" in the cache`);\n      return { addedOverride, entry };\n    }\n    definition.exports = [exports, addedExports];\n  }\n\n  // Parse the user config if it exists.\n  const config = await readGeneratedConfig(session.appPath);\n\n  // Ensure packageSettings exist.\n  config.packageSettings ??= [];\n\n  const configMatches = config.packageSettings.filter(({ match }) =>\n    checkMatch({ name: packageName, version: entry.version, match, exactMatch: true }),\n  );\n\n  if (!configMatches.length) {\n    config.packageSettings.push({\n      match: {\n        name: packageName,\n        version: `^${entry.version}`,\n      },\n      exports: addedExports,\n    });\n  } else {\n    if (configMatches.length > 1) {\n      console.debug(\n        `Found multiple matches for package \"${packageName}\" in cloudpack.config.json. Using the first match.`,\n      );\n    }\n\n    // Use the first match and ensure exports exist\n    configMatches[0].exports ??= {};\n\n    const flattenedMatchExports = flattenExportsMap(configMatches[0].exports, { packagePath });\n\n    // Return false if the import path already exists in the match exports map.\n    if (flattenedMatchExports[normalizeRelativePath(importPath)]) {\n      console.debug(`The import path \"${importPath}\" already exists in the config exports map for \"${packageName}\".`);\n      return { addedOverride: false, entry };\n    }\n\n    // Add the single new exports entry to the match exports map.\n    await addExportsMapEntry(\n      {\n        exports: configMatches[0].exports,\n        packagePath,\n        importPath,\n      },\n      { packages, config: session.config },\n    );\n  }\n\n  await writeGeneratedConfig(config, session.appPath);\n  console.debug(`Added override for \"${packageName}\" to \"cloudpack.config.json\".`);\n\n  return { addedOverride, entry };\n}\n"]}

package/lib/utilities/bundleTask.d.ts

@@ -1,20 +1,12 @@
-import type { CloudpackConfig, PackageDefinitionsCache } from '@ms-cloudpack/common-types';
-import type { PackageHashes } from '@ms-cloudpack/package-hashes';
-import { type ResolveMap } from '@ms-cloudpack/package-utilities';
-import { type TaskReporter } from '@ms-cloudpack/task-reporter';
-import type { TelemetryClient } from '@ms-cloudpack/telemetry';
 import type { BundleRequest } from '../types/BundleRequest.js';
 import type { BundleTaskOptions } from '../types/BundleTaskOptions.js';
-export declare function bundleTask(params: {
+import type { PartialContext } from '../types/Context.js';
+export type BundleTaskInternalOptions = BundleTaskOptions & {
     bundleRequest: BundleRequest;
-    options?: BundleTaskOptions;
-    context: {
-        packages: PackageDefinitionsCache;
-        config: CloudpackConfig;
-        resolveMap: ResolveMap;
-        packageHashes: PackageHashes;
-        reporter?: TaskReporter;
-        telemetryClient?: TelemetryClient;
-    };
-}): Promise<BundleRequest>;
+};
+export type BundleTaskInternalContext = PartialContext<'packages' | 'packageHashes' | 'reporter' | 'telemetryClient', 'resolveMap' | 'config'>;
+/**
+ * Create and run a TaskReporter task which calls `bundle()` from `@ms-cloudpack/bundler` and formats the result.
+ */
+export declare function bundleTask(options: BundleTaskInternalOptions, context: BundleTaskInternalContext): Promise<void>;
 //# sourceMappingURL=bundleTask.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"bundleTask.d.ts","sourceRoot":"","sources":["../../src/utilities/bundleTask.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAiB,eAAe,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAC1G,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAGlE,OAAO,EAAiB,KAAK,UAAU,EAAE,MAAM,iCAAiC,CAAC;AACjF,OAAO,EAAqB,KAAK,YAAY,EAA+B,MAAM,6BAA6B,CAAC;AAChH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAG/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AASvE,wBAAsB,UAAU,CAAC,MAAM,EAAE;IACvC,aAAa,EAAE,aAAa,CAAC;IAC7B,OAAO,CAAC,EAAE,iBAAiB,CAAC;IAC5B,OAAO,EAAE;QACP,QAAQ,EAAE,uBAAuB,CAAC;QAClC,MAAM,EAAE,eAAe,CAAC;QACxB,UAAU,EAAE,UAAU,CAAC;QACvB,aAAa,EAAE,aAAa,CAAC;QAC7B,QAAQ,CAAC,EAAE,YAAY,CAAC;QACxB,eAAe,CAAC,EAAE,eAAe,CAAC;KACnC,CAAC;CACH,GAAG,OAAO,CAAC,aAAa,CAAC,CA8BzB"}
+{"version":3,"file":"bundleTask.d.ts","sourceRoot":"","sources":["../../src/utilities/bundleTask.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAQvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,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,EAC7D,YAAY,GAAG,QAAQ,CACxB,CAAC;AAEF;;GAEG;AACH,wBAAsB,UAAU,CAC9B,OAAO,EAAE,yBAAyB,EAClC,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,IAAI,CAAC,CAmIf"}

package/lib/utilities/bundleTask.js

@@ -1,4 +1,4 @@
-import { bundle as bundleInternal, getEntriesMapFromPackage, getExternalsFromPackage } from '@ms-cloudpack/bundler';
+import { bundle, getEntriesMapFromPackage, getExternalsFromPackage } from '@ms-cloudpack/bundler';
 import { getPackageSettings } from '@ms-cloudpack/config';
 import { writeJson } from '@ms-cloudpack/json-utilities';
 import { getExportsMap } from '@ms-cloudpack/package-utilities';
@@ -12,127 +12,117 @@ import { isCachedResultValid } from './isCachedResultValid.js';
 import { readResultFromCache } from './readResultFromCache.js';
 import { saveResultToCache } from './saveResultToCache.js';
 import { formatBundleTaskResult } from './formatBundleTaskResult.js';
-export async function bundleTask(params) {
-    const { bundleRequest, options = {}, context } = params;
+/**
+ * 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 { packageName, version } = bundleRequest;
-    const { reporter, telemetryClient } = context;
+    const { reporter, telemetryClient, packageHashes, packages, session } = context;
+    const { config } = session;
     const { retryCount } = options;
     telemetryClient?.performance.registerAggregator(diskCacheRatioMetricEventAggregator);
-    const executeBundle = async () => {
-        await bundle({ bundleRequest, context, options });
-        diskCacheRatioMetricEventAggregator?.record({
-            isCacheHit: !!bundleRequest.resultFromCache,
-            isExternal: bundleRequest.isExternal,
-        });
-        return formatBundleTaskResult(bundleRequest);
-    };
-    if (reporter) {
-        const taskName = `Bundle ${formatPackageName({
-            name: packageName,
-            version,
-        })}${retryCount ? ` (retry ${retryCount})` : ''}`;
-        await reporter.runTask(taskName, executeBundle);
-    }
-    else {
-        await executeBundle();
-    }
-    return bundleRequest;
-}
-async function bundle(params) {
-    const { bundleRequest, context, options = {} } = params;
-    const { config, packageHashes } = context;
-    const { force, hash, sourceHash } = options;
-    // 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(outputPath, {
-            inputPath: packagePath,
-        });
-    }
-    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,
-            };
+    const taskName = `Bundle ${formatPackageName({
+        name: packageName,
+        version,
+    })}${retryCount ? ` (retry ${retryCount})` : ''}`;
+    await reporter.runTask(taskName, async () => {
+        // If force is set, dispose the existing result.
+        if (force && bundleRequest?.result?.dispose) {
+            bundleRequest.result.dispose();
+            bundleRequest.result = undefined;
         }
-        else {
-            const { userPackageSettings, generatedPackageSettings } = getPackageSettings({
-                name: bundleRequest.packageName,
-                version: bundleRequest.version,
-                config,
-            }) || {};
-            const { bundlerType, bundlerOptions } = userPackageSettings || {};
-            const inlinedDependencies = [
-                ...(userPackageSettings?.inlinedDependencies || []),
-                ...(generatedPackageSettings?.inlinedDependencies || []),
-            ];
-            // These are only used by the bundler-plugin-ori.
-            const dynamicImports = [
-                ...(userPackageSettings?.dynamicImports || []),
-                ...(generatedPackageSettings?.dynamicImports || []),
-            ];
-            const bundleOptions = {
-                bundlerType: bundleRequest.bundlerType || bundlerType,
-                overrideOptions: bundlerOptions,
+        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,
+            });
+        }
+        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 { userPackageSettings, generatedPackageSettings } = getPackageSettings({
+                    name: bundleRequest.packageName,
+                    version: bundleRequest.version,
+                    config: session.config,
+                }) || {};
+                const { bundlerType, bundlerOptions } = userPackageSettings || {};
+                const inlinedDependencies = [
+                    ...(userPackageSettings?.inlinedDependencies || []),
+                    ...(generatedPackageSettings?.inlinedDependencies || []),
+                ];
+                // These are only used by the bundler-plugin-ori.
+                const dynamicImports = [
+                    ...(userPackageSettings?.dynamicImports || []),
+                    ...(generatedPackageSettings?.dynamicImports || []),
+                ];
+                const bundleOptions = {
+                    bundlerType: bundleRequest.bundlerType || bundlerType,
+                    overrideOptions: bundlerOptions,
+                    inputPath: packagePath,
+                    outputPath,
+                    incremental: isIncremental !== undefined ? isIncremental : false,
+                    sourcemap: disableSourceMaps ? undefined : 'linked',
+                    entries: await getEntriesMapFromPackage({ inputPath: packagePath }, { packages, config }),
+                    inlined: inlinedDependencies,
+                    external: await getExternalsFromPackage({ inputPath: packagePath }, { packages, config }),
+                    dynamicImports,
+                };
+                const bundleInternalResult = await bundle(bundleOptions, { config });
+                bundleRequest.result = {
+                    ...bundleInternalResult,
+                    outputPath: bundleOptions.outputPath ?? outputPath,
+                    hash: cacheValidationHash,
+                };
+            }
+            // 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,
-                incremental: isIncremental !== undefined ? isIncremental : false,
-                sourcemap: disableSourceMaps ? undefined : 'linked',
-                entries: await getEntriesMapFromPackage({ inputPath: packagePath }, context),
-                inlined: inlinedDependencies,
-                external: await getExternalsFromPackage({ inputPath: packagePath }, context),
-                dynamicImports,
-            };
-            const bundleInternalResult = await bundleInternal(bundleOptions, { config });
-            bundleRequest.result = {
-                ...bundleInternalResult,
-                outputPath: bundleOptions.outputPath ?? outputPath,
-                hash: cacheValidationHash,
-            };
+                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);
         }
-        // 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 }, context);
-        const bundleInfo = await getBundleInfo({
-            outputPath,
-            outputFiles: bundleRequest.result.outputFiles,
-            exportsMap,
-            isExternal,
-            packagePath,
+        diskCacheRatioMetricEventAggregator?.record({
+            isCacheHit: !!bundleRequest.resultFromCache,
+            isExternal: bundleRequest.isExternal,
         });
-        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);
-    }
-    return bundleRequest;
+        return formatBundleTaskResult(bundleRequest);
+    });
 }
 //# 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 as bundleInternal, getEntriesMapFromPackage, getExternalsFromPackage } from '@ms-cloudpack/bundler';\nimport type { BundleOptions, CloudpackConfig, PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport type { PackageHashes } from '@ms-cloudpack/package-hashes';\nimport { getPackageSettings } from '@ms-cloudpack/config';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport { getExportsMap, type ResolveMap } from '@ms-cloudpack/package-utilities';\nimport { formatPackageName, type TaskReporter, type TaskReporterTaskResult } from '@ms-cloudpack/task-reporter';\nimport type { TelemetryClient } from '@ms-cloudpack/telemetry';\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 { diskCacheRatioMetricEventAggregator } from './diskCacheRatioMetricEventAggregator.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';\n\nexport async function bundleTask(params: {\n  bundleRequest: BundleRequest;\n  options?: BundleTaskOptions;\n  context: {\n    packages: PackageDefinitionsCache;\n    config: CloudpackConfig;\n    resolveMap: ResolveMap;\n    packageHashes: PackageHashes;\n    reporter?: TaskReporter;\n    telemetryClient?: TelemetryClient;\n  };\n}): Promise<BundleRequest> {\n  const { bundleRequest, options = {}, context } = params;\n  const { packageName, version } = bundleRequest;\n  const { reporter, telemetryClient } = context;\n  const { retryCount } = options;\n\n  telemetryClient?.performance.registerAggregator(diskCacheRatioMetricEventAggregator);\n\n  const executeBundle = async (): Promise<TaskReporterTaskResult> => {\n    await bundle({ bundleRequest, context, options });\n\n    diskCacheRatioMetricEventAggregator?.record({\n      isCacheHit: !!bundleRequest.resultFromCache,\n      isExternal: bundleRequest.isExternal,\n    });\n\n    return formatBundleTaskResult(bundleRequest);\n  };\n\n  if (reporter) {\n    const taskName = `Bundle ${formatPackageName({\n      name: packageName,\n      version,\n    })}${retryCount ? ` (retry ${retryCount})` : ''}`;\n    await reporter.runTask(taskName, executeBundle);\n  } else {\n    await executeBundle();\n  }\n\n  return bundleRequest;\n}\n\nasync function bundle(params: {\n  bundleRequest: BundleRequest;\n  context: {\n    packages: PackageDefinitionsCache;\n    config: CloudpackConfig;\n    packageHashes: PackageHashes;\n  };\n  options?: BundleTaskOptions;\n}): Promise<BundleRequest> {\n  const { bundleRequest, context, options = {} } = params;\n  const { config, packageHashes } = context;\n  const { force, hash, sourceHash } = options;\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(outputPath, {\n      inputPath: packagePath,\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 { userPackageSettings, generatedPackageSettings } =\n        getPackageSettings({\n          name: bundleRequest.packageName,\n          version: bundleRequest.version,\n          config,\n        }) || {};\n      const { bundlerType, bundlerOptions } = userPackageSettings || {};\n\n      const inlinedDependencies = [\n        ...(userPackageSettings?.inlinedDependencies || []),\n        ...(generatedPackageSettings?.inlinedDependencies || []),\n      ];\n\n      // These are only used by the bundler-plugin-ori.\n      const dynamicImports = [\n        ...(userPackageSettings?.dynamicImports || []),\n        ...(generatedPackageSettings?.dynamicImports || []),\n      ];\n\n      const bundleOptions: BundleOptions = {\n        bundlerType: bundleRequest.bundlerType || bundlerType,\n        overrideOptions: bundlerOptions,\n        inputPath: packagePath,\n        outputPath,\n        incremental: isIncremental !== undefined ? isIncremental : false,\n        sourcemap: disableSourceMaps ? undefined : 'linked',\n        entries: await getEntriesMapFromPackage({ inputPath: packagePath }, context),\n        inlined: inlinedDependencies,\n        external: await getExternalsFromPackage({ inputPath: packagePath }, context),\n        dynamicImports,\n      };\n\n      const bundleInternalResult = await bundleInternal(bundleOptions, { config });\n      bundleRequest.result = {\n        ...bundleInternalResult,\n        outputPath: bundleOptions.outputPath ?? outputPath,\n        hash: cacheValidationHash,\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 }, context);\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  return bundleRequest;\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 { getPackageSettings } from '@ms-cloudpack/config';\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 { diskCacheRatioMetricEventAggregator } from './diskCacheRatioMetricEventAggregator.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';\n\nexport type BundleTaskInternalOptions = BundleTaskOptions & { bundleRequest: BundleRequest };\nexport type BundleTaskInternalContext = PartialContext<\n  'packages' | 'packageHashes' | 'reporter' | 'telemetryClient',\n  'resolveMap' | 'config'\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 } = context;\n  const { config } = session;\n  const { retryCount } = options;\n\n  telemetryClient?.performance.registerAggregator(diskCacheRatioMetricEventAggregator);\n\n  const taskName = `Bundle ${formatPackageName({\n    name: packageName,\n    version,\n  })}${retryCount ? ` (retry ${retryCount})` : ''}`;\n\n  await reporter.runTask(taskName, async () => {\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(outputPath, {\n        inputPath: packagePath,\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 { userPackageSettings, generatedPackageSettings } =\n          getPackageSettings({\n            name: bundleRequest.packageName,\n            version: bundleRequest.version,\n            config: session.config,\n          }) || {};\n        const { bundlerType, bundlerOptions } = userPackageSettings || {};\n\n        const inlinedDependencies = [\n          ...(userPackageSettings?.inlinedDependencies || []),\n          ...(generatedPackageSettings?.inlinedDependencies || []),\n        ];\n\n        // These are only used by the bundler-plugin-ori.\n        const dynamicImports = [\n          ...(userPackageSettings?.dynamicImports || []),\n          ...(generatedPackageSettings?.dynamicImports || []),\n        ];\n\n        const bundleOptions: BundleOptions = {\n          bundlerType: bundleRequest.bundlerType || bundlerType,\n          overrideOptions: bundlerOptions,\n          inputPath: packagePath,\n          outputPath,\n          incremental: isIncremental !== undefined ? isIncremental : false,\n          sourcemap: disableSourceMaps ? undefined : 'linked',\n          entries: await getEntriesMapFromPackage({ inputPath: packagePath }, { packages, config }),\n          inlined: inlinedDependencies,\n          external: await getExternalsFromPackage({ inputPath: packagePath }, { packages, config }),\n          dynamicImports,\n        };\n\n        const bundleInternalResult = await bundle(bundleOptions, { config });\n        bundleRequest.result = {\n          ...bundleInternalResult,\n          outputPath: bundleOptions.outputPath ?? outputPath,\n          hash: cacheValidationHash,\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    diskCacheRatioMetricEventAggregator?.record({\n      isCacheHit: !!bundleRequest.resultFromCache,\n      isExternal: bundleRequest.isExternal,\n    });\n\n    return formatBundleTaskResult(bundleRequest);\n  });\n}\n"]}