@ms-cloudpack/api-server 0.61.23 → 0.61.25

package/lib/common/createSession.d.ts

@@ -5,6 +5,7 @@ export type SessionVersions = {
     targetVersions: Record<string, number>;
 };
 export interface CreateSessionOptions {
+    config: CloudpackConfig;
     /**
      * Path to the `@ms-cloudpack/overlay` package root directory.
      */
@@ -14,7 +15,11 @@ export interface CreateSessionOptions {
      * If not provided, will use the one from user preferences if set, or the default cache path.
      */
     cachePath?: string;
-    config: CloudpackConfig;
+    /**
+     * Skip full dependency resolution (`resolveMap` will only contain the package at `config.appPath`).
+     * This should only be used for the `bundle` command when it's bundling the current package.
+     */
+    skipResolveDependencies?: boolean;
 }
 export declare function createSession(options: CreateSessionOptions, context: Pick<Context, 'reporter' | 'packages' | 'telemetryClient'>): Promise<Session>;
 /**

package/lib/common/createSession.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createSession.d.ts","sourceRoot":"","sources":["../../src/common/createSession.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,OAAO,EAAc,MAAM,4BAA4B,CAAC;AAMvF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAInD,MAAM,MAAM,eAAe,GAAG;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACxC,CAAC;AAEF,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,eAAe,CAAC;CACzB;AAED,wBAAsB,aAAa,CACjC,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,GAAG,UAAU,GAAG,iBAAiB,CAAC,GAClE,OAAO,CAAC,OAAO,CAAC,CAyGlB;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE/D"}
+{"version":3,"file":"createSession.d.ts","sourceRoot":"","sources":["../../src/common/createSession.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,OAAO,EAAc,MAAM,4BAA4B,CAAC;AAMvF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAInD,MAAM,MAAM,eAAe,GAAG;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACxC,CAAC;AAEF,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,eAAe,CAAC;IACxB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;AAED,wBAAsB,aAAa,CACjC,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,GAAG,UAAU,GAAG,iBAAiB,CAAC,GAClE,OAAO,CAAC,OAAO,CAAC,CAmGlB;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE/D"}

package/lib/common/createSession.js

@@ -2,17 +2,14 @@ import { getCachePath, getLocalCachePath } from '@ms-cloudpack/config';
 import { readJson, writeJson, writeJsonSync } from '@ms-cloudpack/json-utilities';
 import fs from 'fs';
 import path from 'path';
-import { resolveDependenciesTask } from '../utilities/resolveDependenciesTask.js';
+import { createResolveMapTask } from '../utilities/createResolveMapTask.js';
 import { randomUUID } from 'crypto';
 export async function createSession(options, context) {
-    const { config, overlayPath } = options;
+    const { config, overlayPath, skipResolveDependencies } = options;
     const { appPath } = config;
     const projectName = path.basename(appPath);
     const id = randomUUID();
-    let resolveMap = await resolveDependenciesTask({
-        appPath,
-        additionalPaths: overlayPath ? [overlayPath] : [],
-    }, context);
+    let resolveMap = await createResolveMapTask({ appPath, overlayPath, skipResolveDependencies }, context);
     let importMap = undefined;
     const versionsPath = _getSessionVersionsPath(appPath);
     const previousVersions = await readJson(versionsPath);
@@ -64,28 +61,26 @@ export async function createSession(options, context) {
         packageImportPaths: new Map(),
         linkedPaths,
         addLinkedPath: async (linkedPath) => {
-            if (linkedPaths.find((p) => p.path === linkedPath.path)) {
-                return { resolveMap: resolveMap, linkedPaths: linkedPaths };
+            if (skipResolveDependencies) {
+                throw new Error('Cannot use `addLinkedPath` with `skipResolveDependencies`');
+            }
+            if (linkedPaths.some((p) => p.path === linkedPath.path)) {
+                return { resolveMap, linkedPaths };
             }
             linkedPaths.push(linkedPath);
-            resolveMap = await resolveDependenciesTask({
-                appPath,
-                additionalPaths: overlayPath ? [overlayPath] : [],
-                linkedPaths,
-            }, context);
+            resolveMap = await createResolveMapTask({ appPath, overlayPath, linkedPaths, skipResolveDependencies: false }, context);
             return { resolveMap, linkedPaths };
         },
         removeLinkedPath: async (linkedPath) => {
+            if (skipResolveDependencies) {
+                throw new Error('Cannot use `removeLinkedPath` with `skipResolveDependencies`');
+            }
             const index = linkedPaths.findIndex((p) => p.path === linkedPath.path);
             if (index === -1) {
-                return { resolveMap: resolveMap, linkedPaths: linkedPaths };
+                return { resolveMap, linkedPaths };
             }
             linkedPaths.splice(index, 1);
-            resolveMap = await resolveDependenciesTask({
-                appPath,
-                additionalPaths: overlayPath ? [overlayPath] : [],
-                linkedPaths,
-            }, context);
+            resolveMap = await createResolveMapTask({ appPath, overlayPath, linkedPaths, skipResolveDependencies: false }, context);
             return { resolveMap, linkedPaths };
         },
         cachePath,

package/lib/common/createSession.js.map

@@ -1 +1 @@
-{"version":3,"file":"createSession.js","sourceRoot":"","sources":["../../src/common/createSession.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CloudpackConfig, Session, LinkedPath } from '@ms-cloudpack/common-types';\nimport { getCachePath, getLocalCachePath } from '@ms-cloudpack/config';\nimport type { ImportMap } from '@ms-cloudpack/import-map';\nimport { readJson, writeJson, writeJsonSync } from '@ms-cloudpack/json-utilities';\nimport fs from 'fs';\nimport path from 'path';\nimport type { Context } from '../types/Context.js';\nimport { resolveDependenciesTask } from '../utilities/resolveDependenciesTask.js';\nimport { randomUUID } from 'crypto';\n\nexport type SessionVersions = {\n  sessionVersion: number;\n  targetVersions: Record<string, number>;\n};\n\nexport interface CreateSessionOptions {\n  /**\n   * Path to the `@ms-cloudpack/overlay` package root directory.\n   */\n  overlayPath?: string;\n  /**\n   * Custom cache folder for the session.\n   * If not provided, will use the one from user preferences if set, or the default cache path.\n   */\n  cachePath?: string;\n  config: CloudpackConfig;\n}\n\nexport async function createSession(\n  options: CreateSessionOptions,\n  context: Pick<Context, 'reporter' | 'packages' | 'telemetryClient'>,\n): Promise<Session> {\n  const { config, overlayPath } = options;\n  const { appPath } = config;\n\n  const projectName = path.basename(appPath);\n  const id = randomUUID();\n  let resolveMap = await resolveDependenciesTask(\n    {\n      appPath,\n      additionalPaths: overlayPath ? [overlayPath] : [],\n    },\n    context,\n  );\n\n  let importMap: ImportMap | undefined = undefined;\n\n  const versionsPath = _getSessionVersionsPath(appPath);\n  const previousVersions = await readJson<SessionVersions>(versionsPath);\n  const versions = previousVersions || { sessionVersion: 0, targetVersions: {} };\n  if (!previousVersions) {\n    await writeJson(versionsPath, versions);\n  }\n\n  // In the future, we might put all the user preferences in the session, but right now the only\n  // preference is cachePath, so we just read that and save the custom or default value.\n  const cachePath = await getCachePath(options.cachePath);\n\n  const linkedPaths: LinkedPath[] = [];\n\n  return {\n    id,\n    config,\n    projectName,\n    get resolveMap() {\n      return resolveMap;\n    },\n    set resolveMap(newResolveMap) {\n      // If the resolve map changes, clear the import map\n      // so that it is regenerated on the next request\n      importMap = undefined;\n      resolveMap = newResolveMap;\n    },\n    sequence: 0,\n    urls: {},\n    targetVersions: versions.targetVersions,\n    get sessionVersion() {\n      return versions.sessionVersion;\n    },\n    incrementSessionVersion: () => {\n      versions.sessionVersion++;\n      importMap = undefined;\n      // Write the new session version to the file\n      fs.writeFileSync(versionsPath, JSON.stringify(versions, null, 2));\n    },\n    incrementTargetVersion: (inputPath: string) => {\n      versions.targetVersions[inputPath] ??= 0;\n      versions.targetVersions[inputPath]++;\n      importMap = undefined;\n      writeJsonSync(versionsPath, versions);\n    },\n    get importMap() {\n      return importMap;\n    },\n    set importMap(newImportMap) {\n      importMap = newImportMap;\n    },\n    packageImportPaths: new Map(),\n    linkedPaths,\n    addLinkedPath: async (linkedPath: LinkedPath) => {\n      if (linkedPaths.find((p) => p.path === linkedPath.path)) {\n        return { resolveMap: resolveMap, linkedPaths: linkedPaths };\n      }\n\n      linkedPaths.push(linkedPath);\n      resolveMap = await resolveDependenciesTask(\n        {\n          appPath,\n          additionalPaths: overlayPath ? [overlayPath] : [],\n          linkedPaths,\n        },\n        context,\n      );\n\n      return { resolveMap, linkedPaths };\n    },\n    removeLinkedPath: async (linkedPath: LinkedPath) => {\n      const index = linkedPaths.findIndex((p) => p.path === linkedPath.path);\n      if (index === -1) {\n        return { resolveMap: resolveMap, linkedPaths: linkedPaths };\n      }\n\n      linkedPaths.splice(index, 1);\n      resolveMap = await resolveDependenciesTask(\n        {\n          appPath,\n          additionalPaths: overlayPath ? [overlayPath] : [],\n          linkedPaths,\n        },\n        context,\n      );\n\n      return { resolveMap, linkedPaths };\n    },\n    cachePath,\n  };\n}\n\n/**\n * Get `sessionVersions.json` path. Exported for the test.\n * @internal\n */\nexport function _getSessionVersionsPath(appPath: string): string {\n  return path.join(getLocalCachePath(appPath), 'sessionVersions.json');\n}\n"]}
+{"version":3,"file":"createSession.js","sourceRoot":"","sources":["../../src/common/createSession.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CloudpackConfig, Session, LinkedPath } from '@ms-cloudpack/common-types';\nimport { getCachePath, getLocalCachePath } from '@ms-cloudpack/config';\nimport type { ImportMap } from '@ms-cloudpack/import-map';\nimport { readJson, writeJson, writeJsonSync } from '@ms-cloudpack/json-utilities';\nimport fs from 'fs';\nimport path from 'path';\nimport type { Context } from '../types/Context.js';\nimport { createResolveMapTask } from '../utilities/createResolveMapTask.js';\nimport { randomUUID } from 'crypto';\n\nexport type SessionVersions = {\n  sessionVersion: number;\n  targetVersions: Record<string, number>;\n};\n\nexport interface CreateSessionOptions {\n  config: CloudpackConfig;\n  /**\n   * Path to the `@ms-cloudpack/overlay` package root directory.\n   */\n  overlayPath?: string;\n  /**\n   * Custom cache folder for the session.\n   * If not provided, will use the one from user preferences if set, or the default cache path.\n   */\n  cachePath?: string;\n  /**\n   * Skip full dependency resolution (`resolveMap` will only contain the package at `config.appPath`).\n   * This should only be used for the `bundle` command when it's bundling the current package.\n   */\n  skipResolveDependencies?: boolean;\n}\n\nexport async function createSession(\n  options: CreateSessionOptions,\n  context: Pick<Context, 'reporter' | 'packages' | 'telemetryClient'>,\n): Promise<Session> {\n  const { config, overlayPath, skipResolveDependencies } = options;\n  const { appPath } = config;\n\n  const projectName = path.basename(appPath);\n  const id = randomUUID();\n  let resolveMap = await createResolveMapTask({ appPath, overlayPath, skipResolveDependencies }, context);\n\n  let importMap: ImportMap | undefined = undefined;\n\n  const versionsPath = _getSessionVersionsPath(appPath);\n  const previousVersions = await readJson<SessionVersions>(versionsPath);\n  const versions = previousVersions || { sessionVersion: 0, targetVersions: {} };\n  if (!previousVersions) {\n    await writeJson(versionsPath, versions);\n  }\n\n  // In the future, we might put all the user preferences in the session, but right now the only\n  // preference is cachePath, so we just read that and save the custom or default value.\n  const cachePath = await getCachePath(options.cachePath);\n\n  const linkedPaths: LinkedPath[] = [];\n\n  return {\n    id,\n    config,\n    projectName,\n    get resolveMap() {\n      return resolveMap;\n    },\n    set resolveMap(newResolveMap) {\n      // If the resolve map changes, clear the import map\n      // so that it is regenerated on the next request\n      importMap = undefined;\n      resolveMap = newResolveMap;\n    },\n    sequence: 0,\n    urls: {},\n    targetVersions: versions.targetVersions,\n    get sessionVersion() {\n      return versions.sessionVersion;\n    },\n    incrementSessionVersion: () => {\n      versions.sessionVersion++;\n      importMap = undefined;\n      // Write the new session version to the file\n      fs.writeFileSync(versionsPath, JSON.stringify(versions, null, 2));\n    },\n    incrementTargetVersion: (inputPath: string) => {\n      versions.targetVersions[inputPath] ??= 0;\n      versions.targetVersions[inputPath]++;\n      importMap = undefined;\n      writeJsonSync(versionsPath, versions);\n    },\n    get importMap() {\n      return importMap;\n    },\n    set importMap(newImportMap) {\n      importMap = newImportMap;\n    },\n    packageImportPaths: new Map(),\n    linkedPaths,\n    addLinkedPath: async (linkedPath: LinkedPath) => {\n      if (skipResolveDependencies) {\n        throw new Error('Cannot use `addLinkedPath` with `skipResolveDependencies`');\n      }\n\n      if (linkedPaths.some((p) => p.path === linkedPath.path)) {\n        return { resolveMap, linkedPaths };\n      }\n\n      linkedPaths.push(linkedPath);\n      resolveMap = await createResolveMapTask(\n        { appPath, overlayPath, linkedPaths, skipResolveDependencies: false },\n        context,\n      );\n\n      return { resolveMap, linkedPaths };\n    },\n    removeLinkedPath: async (linkedPath: LinkedPath) => {\n      if (skipResolveDependencies) {\n        throw new Error('Cannot use `removeLinkedPath` with `skipResolveDependencies`');\n      }\n\n      const index = linkedPaths.findIndex((p) => p.path === linkedPath.path);\n      if (index === -1) {\n        return { resolveMap, linkedPaths };\n      }\n\n      linkedPaths.splice(index, 1);\n      resolveMap = await createResolveMapTask(\n        { appPath, overlayPath, linkedPaths, skipResolveDependencies: false },\n        context,\n      );\n\n      return { resolveMap, linkedPaths };\n    },\n    cachePath,\n  };\n}\n\n/**\n * Get `sessionVersions.json` path. Exported for the test.\n * @internal\n */\nexport function _getSessionVersionsPath(appPath: string): string {\n  return path.join(getLocalCachePath(appPath), 'sessionVersions.json');\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"TaskRunner.d.ts","sourceRoot":"","sources":["../../src/utilities/TaskRunner.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAK7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD;;;;;;GAMG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,IAAI,CAAsB;IAClC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,aAAa,CAAgC;IACrD,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,cAAc,CAAc;IAEpC,OAAO,CAAC,UAAU,CAAyB;;IAW3C;;;;OAIG;IACI,YAAY,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAIvC;;;;;OAKG;IACH,GAAG,CAAC,OAAO,EACT,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,EACnB,OAAO,CAAC,EAAE;QACR,KAAK,CAAC,EAAE,OAAO,CAAC;QAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,GACA,OAAO,CAAC,OAAO,CAAC;IAiEnB;;;;;;;;OAQG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAgBxB;;OAEG;IACH,KAAK,IAAI,IAAI;IASb,2CAA2C;IAC3C,MAAM,IAAI,IAAI;IAId,sDAAsD;IACtD,MAAM,IAAI,IAAI;IAId;;OAEG;IACH,OAAO,CAAC,YAAY;IAoCpB;;OAEG;IACH,OAAO,CAAC,UAAU;CA8BnB"}
+{"version":3,"file":"TaskRunner.d.ts","sourceRoot":"","sources":["../../src/utilities/TaskRunner.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAK7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD;;;;;;GAMG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,IAAI,CAAsB;IAClC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,aAAa,CAAgC;IACrD,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,cAAc,CAAc;IACpC,OAAO,CAAC,UAAU,CAA6B;;IAW/C;;;;OAIG;IACI,YAAY,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAIvC;;;;;OAKG;IACH,GAAG,CAAC,OAAO,EACT,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,EACnB,OAAO,CAAC,EAAE;QACR,KAAK,CAAC,EAAE,OAAO,CAAC;QAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,GACA,OAAO,CAAC,OAAO,CAAC;IAiEnB;;;;;;;;OAQG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAgBxB;;OAEG;IACH,KAAK,IAAI,IAAI;IASb,2CAA2C;IAC3C,MAAM,IAAI,IAAI;IAId,sDAAsD;IACtD,MAAM,IAAI,IAAI;IAId;;OAEG;IACH,OAAO,CAAC,YAAY;IAoCpB;;OAEG;IACH,OAAO,CAAC,UAAU;CA8BnB"}

package/lib/utilities/TaskRunner.js

@@ -14,7 +14,6 @@ export class TaskRunner {
     _pendingTasks;
     _completedTasks;
     _requiresRerun;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     _prevTasks;
     constructor() {
         this._queue = new PQueue({ concurrency: 10 });
@@ -41,7 +40,7 @@ export class TaskRunner {
     add(task, options) {
         const { name, id, execute } = task;
         const { rerun, priority } = options || {};
-        if (!this._prevTasks.get(id)) {
+        if (!this._prevTasks.has(id)) {
             this._prevTasks.set(id, task);
         }
         // Check if we are already completed the task with that id.

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 { Task } from '../types/Task.js';\nimport type { TaskStats } from '../types/TaskStats.js';\nimport type { TaskList } from '../types/TaskList.js';\nimport PQueue from 'p-queue';\nimport { taskListSource, taskStatsSource, type TaskDescription } from '../index.browser.js';\nimport type { DataBus } from '@ms-cloudpack/data-bus';\n\n/**\n * TaskRunner tracks the status of tasks, manages concurrency, allows reusing task results,\n * and sends notifications about task status to the data bus (currently just used for `start`).\n *\n * NOTE: To enable data bus notifications, you must call `connectToBus()`.\n * `createApiContext` does this with the `taskRunner` passed in.\n */\nexport class TaskRunner {\n  private _bus: DataBus | undefined;\n  private _queue: PQueue;\n  private _taskStats: TaskStats;\n  private _pendingTasks: Map<string, Promise<unknown>>;\n  private _completedTasks: Map<string, unknown>;\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    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\n  /**\n   * Connects the TaskRunner to the data bus. Tasks will still run without this, but they won't\n   * send any notifications to a client (which only matters if a client is listening, e.g.\n   * the browser while running `start`).\n   */\n  public connectToBus(bus: DataBus): void {\n    this._bus = bus;\n  }\n\n  /**\n   * Enqueue a task and return its result promise.\n   *\n   * If a task with the same `id` was already added, it returns either the previous result\n   * (if completed) or the promise (if pending). Pass `options.rerun` to force re-running.\n   */\n  add<TReturn>(\n    task: Task<TReturn>,\n    options?: {\n      rerun?: boolean;\n      priority?: number;\n    },\n  ): Promise<TReturn> {\n    const { name, id, execute } = task;\n    const { rerun, priority } = options || {};\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: Promise<TReturn> = (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          execute,\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      if (task.getEndDescription) {\n        this._reportEnd(id, task.getEndDescription(taskResult));\n      }\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    if (task.getStartDescription) {\n      this._reportStart(id, task.getStartDescription());\n    }\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)?.onDispose?.();\n    this._prevTasks.delete(id);\n    this._requiresRerun.delete(id);\n    if (this._pendingTasks.has(id)) {\n      this._pendingTasks.delete(id);\n      this._taskStats.remainingTasks = this._pendingTasks.size;\n    }\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    this._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._bus) return;\n\n    const bus = this._bus;\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 = this._pendingTasks.size;\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._bus) return;\n\n    const bus = this._bus;\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 = this._pendingTasks.size;\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\nconst getDefaultTaskStats: () => TaskStats = () => ({\n  status: 'idle',\n  remainingTasks: 0,\n  totalTasks: 0,\n  totalErrors: 0,\n  totalWarnings: 0,\n});\n"]}
+{"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 { Task } from '../types/Task.js';\nimport type { TaskStats } from '../types/TaskStats.js';\nimport type { TaskList } from '../types/TaskList.js';\nimport PQueue from 'p-queue';\nimport { taskListSource, taskStatsSource, type TaskDescription } from '../index.browser.js';\nimport type { DataBus } from '@ms-cloudpack/data-bus';\n\n/**\n * TaskRunner tracks the status of tasks, manages concurrency, allows reusing task results,\n * and sends notifications about task status to the data bus (currently just used for `start`).\n *\n * NOTE: To enable data bus notifications, you must call `connectToBus()`.\n * `createApiContext` does this with the `taskRunner` passed in.\n */\nexport class TaskRunner {\n  private _bus: DataBus | undefined;\n  private _queue: PQueue;\n  private _taskStats: TaskStats;\n  private _pendingTasks: Map<string, Promise<unknown>>;\n  private _completedTasks: Map<string, unknown>;\n  private _requiresRerun: Set<string>;\n  private _prevTasks: Map<string, Task<unknown>>;\n\n  constructor() {\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\n  /**\n   * Connects the TaskRunner to the data bus. Tasks will still run without this, but they won't\n   * send any notifications to a client (which only matters if a client is listening, e.g.\n   * the browser while running `start`).\n   */\n  public connectToBus(bus: DataBus): void {\n    this._bus = bus;\n  }\n\n  /**\n   * Enqueue a task and return its result promise.\n   *\n   * If a task with the same `id` was already added, it returns either the previous result\n   * (if completed) or the promise (if pending). Pass `options.rerun` to force re-running.\n   */\n  add<TReturn>(\n    task: Task<TReturn>,\n    options?: {\n      rerun?: boolean;\n      priority?: number;\n    },\n  ): Promise<TReturn> {\n    const { name, id, execute } = task;\n    const { rerun, priority } = options || {};\n\n    if (!this._prevTasks.has(id)) {\n      this._prevTasks.set(id, task as Task<unknown>);\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: Promise<TReturn> = (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          execute,\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      if (task.getEndDescription) {\n        this._reportEnd(id, task.getEndDescription(taskResult));\n      }\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    if (task.getStartDescription) {\n      this._reportStart(id, task.getStartDescription());\n    }\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)?.onDispose?.();\n    this._prevTasks.delete(id);\n    this._requiresRerun.delete(id);\n    if (this._pendingTasks.has(id)) {\n      this._pendingTasks.delete(id);\n      this._taskStats.remainingTasks = this._pendingTasks.size;\n    }\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    this._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._bus) return;\n\n    const bus = this._bus;\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 = this._pendingTasks.size;\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._bus) return;\n\n    const bus = this._bus;\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 = this._pendingTasks.size;\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\nconst getDefaultTaskStats: () => TaskStats = () => ({\n  status: 'idle',\n  remainingTasks: 0,\n  totalTasks: 0,\n  totalErrors: 0,\n  totalWarnings: 0,\n});\n"]}

package/lib/utilities/createResolveMapTask.d.ts

@@ -0,0 +1,20 @@
+import type { LinkedPath, ResolveMap } from '@ms-cloudpack/common-types';
+import type { Context } from '../types/Context.js';
+/**
+ * Create the resolve map, logging the results to the task reporter.
+ * Throws if dependencies could not be resolved.
+ *
+ * Usually this will contain all dependencies of `appPath` (and other paths if specified),
+ * but if `skipResolveDependencies` is true, it will only contain the package at `appPath`.
+ */
+export declare function createResolveMapTask(options: {
+    appPath: string;
+    overlayPath: string | undefined;
+    linkedPaths?: LinkedPath[];
+    /**
+     * Skip the actual resolution of dependencies. The returned resolve map will only contain
+     * the package at `appPath`. Not compatible with `linkedPaths`.
+     */
+    skipResolveDependencies: boolean | undefined;
+}, context: Pick<Context, 'reporter' | 'packages' | 'telemetryClient'>): Promise<ResolveMap>;
+//# sourceMappingURL=createResolveMapTask.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"createResolveMapTask.d.ts","sourceRoot":"","sources":["../../src/utilities/createResolveMapTask.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAmB,MAAM,4BAA4B,CAAC;AAI1F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE;IACP,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;IAC3B;;;OAGG;IACH,uBAAuB,EAAE,OAAO,GAAG,SAAS,CAAC;CAC9C,EACD,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,GAAG,UAAU,GAAG,iBAAiB,CAAC,GAClE,OAAO,CAAC,UAAU,CAAC,CA8DrB"}

package/lib/utilities/{resolveDependenciesTask.js → createResolveMapTask.js}

@@ -2,25 +2,39 @@ import { environmentInfo } from '@ms-cloudpack/environment';
 import { createResolveMap } from '@ms-cloudpack/package-utilities';
 import { bold, bulletedList, cyan, yellow } from '@ms-cloudpack/task-reporter';
 /**
- * Resolves the locations of dependencies and returns the resolve map, logging results
- * to the task reporter. Throws if dependencies could not be resolved.
+ * Create the resolve map, logging the results to the task reporter.
+ * Throws if dependencies could not be resolved.
+ *
+ * Usually this will contain all dependencies of `appPath` (and other paths if specified),
+ * but if `skipResolveDependencies` is true, it will only contain the package at `appPath`.
  */
-export async function resolveDependenciesTask(options, context) {
-    const { appPath, additionalPaths, linkedPaths } = options;
+export async function createResolveMapTask(options, context) {
+    const { appPath, overlayPath, linkedPaths, skipResolveDependencies } = options;
     const { reporter, packages, telemetryClient } = context;
     let resolveMap;
-    // Grab the installed dependency locations.
-    const task = reporter.addTask('Resolving dependencies');
+    if (skipResolveDependencies && linkedPaths?.length) {
+        throw new Error('Cannot use `linkedPaths` with `skipResolveDependencies`');
+    }
+    const task = reporter.addTask(skipResolveDependencies ? 'Creating resolve map' : 'Resolving dependencies');
     try {
         resolveMap = await telemetryClient.tracer.startActiveSpan('CREATE_RESOLVE_MAP', async (span) => {
-            span.setAttributes({ linkedPaths: linkedPaths?.length || 0 });
-            // await here is important to be able to report telemetry correctly
-            const result = await createResolveMap({ appPath, additionalPaths, linkedPaths }, { packages });
-            return result;
+            span.setAttributes({ linkedPaths: linkedPaths?.length || 0, skipResolveDependencies });
+            const additionalPaths = overlayPath ? [overlayPath] : [];
+            // await is required here to report telemetry correctly
+            return await createResolveMap({ appPath, additionalPaths, linkedPaths, skipResolveDependencies }, { packages });
         });
-        const { allPackages, duplicatedPackages } = getPackagesFromResolveMap(resolveMap);
-        const message = `Found ${cyan(allPackages.size)} total packages, ${duplicatedPackages.size ? `${yellow(duplicatedPackages.size)} with multiple versions.` : `no duplicates.`}`;
-        const extended = bulletedList(Array.from(duplicatedPackages.entries()).map(([name, versions]) => `${bold(name)}: ${Array.from(versions).join(', ')}`));
+        let message;
+        let extended;
+        if (skipResolveDependencies) {
+            // In theory this could include the overlay too, but overlayPath and skipResolveDependencies
+            // are for unrelated scenarios, so it's not likely to happen (and not a problem if it does).
+            message = 'Created resolve map with the current package only.';
+        }
+        else {
+            const { allPackages, duplicatedPackages } = getPackagesFromResolveMap(resolveMap);
+            message = `Found ${cyan(allPackages.size)} total packages, ${duplicatedPackages.size ? `${yellow(duplicatedPackages.size)} with multiple versions.` : `no duplicates.`}`;
+            extended = bulletedList(Array.from(duplicatedPackages.entries(), ([name, versions]) => `${bold(name)}: ${Array.from(versions).join(', ')}`));
+        }
         task.complete({ message, extended, forceShow: true });
         return resolveMap;
     }
@@ -75,4 +89,4 @@ function getPackagesFromResolveMap(resolveMap) {
         duplicatedPackages,
     };
 }
-//# sourceMappingURL=resolveDependenciesTask.js.map
+//# sourceMappingURL=createResolveMapTask.js.map

package/lib/utilities/createResolveMapTask.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createResolveMapTask.js","sourceRoot":"","sources":["../../src/utilities/createResolveMapTask.ts"],"names":[],"mappings":"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","sourcesContent":["import type { LinkedPath, ResolveMap, ResolveMapEntry } from '@ms-cloudpack/common-types';\nimport { environmentInfo } from '@ms-cloudpack/environment';\nimport { createResolveMap } from '@ms-cloudpack/package-utilities';\nimport { bold, bulletedList, cyan, yellow } from '@ms-cloudpack/task-reporter';\nimport type { Context } from '../types/Context.js';\n\n/**\n * Create the resolve map, logging the results to the task reporter.\n * Throws if dependencies could not be resolved.\n *\n * Usually this will contain all dependencies of `appPath` (and other paths if specified),\n * but if `skipResolveDependencies` is true, it will only contain the package at `appPath`.\n */\nexport async function createResolveMapTask(\n  options: {\n    appPath: string;\n    overlayPath: string | undefined;\n    linkedPaths?: LinkedPath[];\n    /**\n     * Skip the actual resolution of dependencies. The returned resolve map will only contain\n     * the package at `appPath`. Not compatible with `linkedPaths`.\n     */\n    skipResolveDependencies: boolean | undefined;\n  },\n  context: Pick<Context, 'reporter' | 'packages' | 'telemetryClient'>,\n): Promise<ResolveMap> {\n  const { appPath, overlayPath, linkedPaths, skipResolveDependencies } = options;\n  const { reporter, packages, telemetryClient } = context;\n  let resolveMap: ResolveMap | undefined;\n\n  if (skipResolveDependencies && linkedPaths?.length) {\n    throw new Error('Cannot use `linkedPaths` with `skipResolveDependencies`');\n  }\n\n  const task = reporter.addTask(skipResolveDependencies ? 'Creating resolve map' : 'Resolving dependencies');\n\n  try {\n    resolveMap = await telemetryClient.tracer.startActiveSpan('CREATE_RESOLVE_MAP', async (span) => {\n      span.setAttributes({ linkedPaths: linkedPaths?.length || 0, skipResolveDependencies });\n\n      const additionalPaths = overlayPath ? [overlayPath] : [];\n      // await is required here to report telemetry correctly\n      return await createResolveMap({ appPath, additionalPaths, linkedPaths, skipResolveDependencies }, { packages });\n    });\n\n    let message: string;\n    let extended: string | undefined;\n\n    if (skipResolveDependencies) {\n      // In theory this could include the overlay too, but overlayPath and skipResolveDependencies\n      // are for unrelated scenarios, so it's not likely to happen (and not a problem if it does).\n      message = 'Created resolve map with the current package only.';\n    } else {\n      const { allPackages, duplicatedPackages } = getPackagesFromResolveMap(resolveMap);\n\n      message = `Found ${cyan(allPackages.size)} total packages, ${\n        duplicatedPackages.size ? `${yellow(duplicatedPackages.size)} with multiple versions.` : `no duplicates.`\n      }`;\n      extended = bulletedList(\n        Array.from(\n          duplicatedPackages.entries(),\n          ([name, versions]) => `${bold(name)}: ${Array.from(versions).join(', ')}`,\n        ),\n      );\n    }\n\n    task.complete({ message, extended, forceShow: true });\n\n    return resolveMap;\n  } catch (err) {\n    task.complete({\n      status: 'fail',\n      message: 'Failed to resolve dependencies',\n      errors: [String(err)],\n      forceShow: true,\n      // Don't use the message as \"details\" because this will cause the message to be logged twice\n      extended: (err as Error).stack,\n    });\n\n    if (err instanceof Error && !environmentInfo.isJest) {\n      // Remove the call stack because we already logged it in the extended details of the task\n      // (unless running in a test, because it prevents the error from being logged in an understandable way)\n      err.stack = undefined;\n    }\n\n    throw err;\n  }\n}\n\n/**\n * Given a resolveMap, returns a map of all packages and a map of packages with multiple versions.\n * This is used to log the results of the resolve task.\n */\nfunction getPackagesFromResolveMap(resolveMap: ResolveMap): {\n  allPackages: Map<string, ResolveMapEntry>;\n  duplicatedPackages: Map<string, Set<string>>;\n} {\n  const allPackages = new Map<string, ResolveMapEntry>();\n  const duplicatedPackages = new Map<string, Set<string>>();\n\n  function addEntry(entry: ResolveMapEntry): void {\n    const existingEntry = allPackages.get(entry.name);\n    if (existingEntry) {\n      let dupeSet = duplicatedPackages.get(entry.name);\n      if (!dupeSet) {\n        dupeSet = new Set([existingEntry.version]);\n        duplicatedPackages.set(entry.name, dupeSet);\n      }\n      dupeSet.add(entry.version);\n    } else {\n      allPackages.set(entry.name, entry);\n    }\n  }\n\n  for (const currentEntry of Object.values(resolveMap)) {\n    addEntry(currentEntry);\n\n    if (currentEntry.scopedVersions) {\n      for (const scopedEntry of Object.values(currentEntry.scopedVersions)) {\n        addEntry(scopedEntry);\n      }\n    }\n  }\n\n  return {\n    allPackages,\n    duplicatedPackages,\n  };\n}\n"]}

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,EAKL,KAAK,sBAAsB,EAC3B,KAAK,YAAY,EAClB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAK/D;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,GAAG,sBAAsB,CAwDnH"}
+{"version":3,"file":"formatBundleTaskResult.d.ts","sourceRoot":"","sources":["../../src/utilities/formatBundleTaskResult.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,KAAK,sBAAsB,EAC3B,KAAK,YAAY,EAClB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAK/D;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,GAAG,sBAAsB,CAwEnH"}

package/lib/utilities/formatBundleTaskResult.js

@@ -36,13 +36,26 @@ export function formatBundleTaskResult(bundleRequest, reporter) {
     });
     const hasErrors = result.errors.length > 0;
     const status = hasErrors ? 'fail' : 'complete';
-    const message = hasErrors ? plural(result.errors.length, 'error$s found') : undefined;
+    const extraMessages = [];
+    if (result.bundler) {
+        extraMessages.push(`bundler: ${result.bundler}`);
+    }
+    const source = bundleRequest.result?.bundleSource;
+    // If the result is from running the bundler, don't note anything extra
+    if (source && source !== 'bundler') {
+        // Simplify "local-cache" to "cache", or remove the dash from "remote-cache"
+        extraMessages.push(`from ${source === 'local-cache' ? 'cache' : source.replace('-', ' ')}`);
+    }
+    const extraMessage = extraMessages.join(', ');
+    // The completion message will show up after the task name, like this:
+    //   Bundle foo@1.0.0 - 1 error found (bundler: ori)
+    //   Bundle foo@1.0.0 - bundler: ori, from cache
+    // Note that this will only be shown if --verbose or --debug was set, or the command set the
+    // showCompleted option for TaskReporter.
+    const message = hasErrors ? `${plural(result.errors.length, 'error$s found')} (${extraMessage})` : extraMessage;
     // Only shown with --verbose or --debug. Don't calculate if not needed.
     const details = reporter.getOptions().showTaskDetails
         ? bulletedList([
-            `Package: ${bundleRequest.packageName}@${bundleRequest.version}`,
-            `Bundler: ${result.bundler || 'unknown'}`,
-            `From cache: ${bundleRequest.resultFromCache}`,
             `Input path: ${bundleRequest.packagePath}`,
             `Entries:`,
             Object.values(result.entries || {}),

package/lib/utilities/formatBundleTaskResult.js.map

@@ -1 +1 @@
-{"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 {\n  red,\n  bulletedList,\n  plural,\n  indent,\n  type TaskReporterTaskResult,\n  type TaskReporter,\n} 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, reporter: TaskReporter): 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. Don't calculate if not needed.\n  const details = reporter.getOptions().showTaskDetails\n    ? 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    : undefined;\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 {\n  red,\n  bulletedList,\n  plural,\n  indent,\n  type TaskReporterTaskResult,\n  type TaskReporter,\n} 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, reporter: TaskReporter): 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\n  const extraMessages: string[] = [];\n  if (result.bundler) {\n    extraMessages.push(`bundler: ${result.bundler}`);\n  }\n  const source = bundleRequest.result?.bundleSource;\n  // If the result is from running the bundler, don't note anything extra\n  if (source && source !== 'bundler') {\n    // Simplify \"local-cache\" to \"cache\", or remove the dash from \"remote-cache\"\n    extraMessages.push(`from ${source === 'local-cache' ? 'cache' : source.replace('-', ' ')}`);\n  }\n  const extraMessage = extraMessages.join(', ');\n\n  // The completion message will show up after the task name, like this:\n  //   Bundle foo@1.0.0 - 1 error found (bundler: ori)\n  //   Bundle foo@1.0.0 - bundler: ori, from cache\n  // Note that this will only be shown if --verbose or --debug was set, or the command set the\n  // showCompleted option for TaskReporter.\n  const message = hasErrors ? `${plural(result.errors.length, 'error$s found')} (${extraMessage})` : extraMessage;\n\n  // Only shown with --verbose or --debug. Don't calculate if not needed.\n  const details = reporter.getOptions().showTaskDetails\n    ? bulletedList([\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    : undefined;\n\n  return {\n    status,\n    message,\n    errors,\n    details,\n  };\n}\n"]}

package/lib/utilities/getFileSizeSync.d.ts

@@ -1,5 +1,6 @@
 /**
  * Given a file path, returns a human-readable file size description.
+ * Returns "?? bytes" if there's some issue getting stats.
  */
 export declare function getFileSizeSync(filePath: string): string;
 //# sourceMappingURL=getFileSizeSync.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getFileSizeSync.d.ts","sourceRoot":"","sources":["../../src/utilities/getFileSizeSync.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAkBxD"}
+{"version":3,"file":"getFileSizeSync.d.ts","sourceRoot":"","sources":["../../src/utilities/getFileSizeSync.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAkBxD"}

package/lib/utilities/getFileSizeSync.js

@@ -1,6 +1,7 @@
 import fs from 'fs';
 /**
  * Given a file path, returns a human-readable file size description.
+ * Returns "?? bytes" if there's some issue getting stats.
  */
 export function getFileSizeSync(filePath) {
     let size;

package/lib/utilities/getFileSizeSync.js.map

@@ -1 +1 @@
-{"version":3,"file":"getFileSizeSync.js","sourceRoot":"","sources":["../../src/utilities/getFileSizeSync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,QAAgB;IAC9C,IAAI,IAAY,CAAC;IACjB,IAAI,CAAC;QACH,uDAAuD;QACvD,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC;IACpC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,IAAI,IAAI,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC;QACvB,OAAO,GAAG,CAAC,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;IACjD,CAAC;IAED,IAAI,IAAI,GAAG,IAAI,EAAE,CAAC;QAChB,OAAO,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;IAC1C,CAAC;IAED,OAAO,GAAG,IAAI,IAAI,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;AACpD,CAAC","sourcesContent":["import fs from 'fs';\n\n/**\n * Given a file path, returns a human-readable file size description.\n */\nexport function getFileSizeSync(filePath: string): string {\n  let size: number;\n  try {\n    // Sometimes this throws due to file locks or something\n    size = fs.statSync(filePath).size;\n  } catch {\n    return '?? bytes';\n  }\n\n  if (size > 1024 * 1024) {\n    return `${(size / 1024 / 1024).toFixed(2)} MB`;\n  }\n\n  if (size > 1024) {\n    return `${(size / 1024).toFixed(2)} KB`;\n  }\n\n  return `${size} ${size === 1 ? 'byte' : 'bytes'}`;\n}\n"]}
+{"version":3,"file":"getFileSizeSync.js","sourceRoot":"","sources":["../../src/utilities/getFileSizeSync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAC,QAAgB;IAC9C,IAAI,IAAY,CAAC;IACjB,IAAI,CAAC;QACH,uDAAuD;QACvD,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC;IACpC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,IAAI,IAAI,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC;QACvB,OAAO,GAAG,CAAC,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;IACjD,CAAC;IAED,IAAI,IAAI,GAAG,IAAI,EAAE,CAAC;QAChB,OAAO,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;IAC1C,CAAC;IAED,OAAO,GAAG,IAAI,IAAI,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;AACpD,CAAC","sourcesContent":["import fs from 'fs';\n\n/**\n * Given a file path, returns a human-readable file size description.\n * Returns \"?? bytes\" if there's some issue getting stats.\n */\nexport function getFileSizeSync(filePath: string): string {\n  let size: number;\n  try {\n    // Sometimes this throws due to file locks or something\n    size = fs.statSync(filePath).size;\n  } catch {\n    return '?? bytes';\n  }\n\n  if (size > 1024 * 1024) {\n    return `${(size / 1024 / 1024).toFixed(2)} MB`;\n  }\n\n  if (size > 1024) {\n    return `${(size / 1024).toFixed(2)} KB`;\n  }\n\n  return `${size} ${size === 1 ? 'byte' : 'bytes'}`;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/api-server",
-  "version": "0.61.23",
+  "version": "0.61.25",
   "description": "An implementation of the API server that does interacts with a task scheduler.",
   "license": "MIT",
   "type": "module",
@@ -23,27 +23,23 @@
     }
   },
   "dependencies": {
-    "@lage-run/hasher": "^1.1.1",
-    "@lage-run/logger": "^1.3.0",
-    "@lage-run/scheduler": "^1.2.1",
-    "@lage-run/target-graph": "^0.11.0",
-    "@ms-cloudpack/bundler": "^0.24.18",
+    "@ms-cloudpack/bundler": "^0.24.20",
     "@ms-cloudpack/common-types": "^0.24.13",
-    "@ms-cloudpack/config": "^0.33.26",
+    "@ms-cloudpack/config": "^0.33.28",
     "@ms-cloudpack/create-express-app": "^1.10.25",
     "@ms-cloudpack/data-bus": "^0.4.3",
     "@ms-cloudpack/environment": "^0.1.1",
-    "@ms-cloudpack/esm-stub-utilities": "^0.14.17",
+    "@ms-cloudpack/esm-stub-utilities": "^0.14.19",
     "@ms-cloudpack/file-watcher": "^0.2.0",
-    "@ms-cloudpack/import-map": "^0.10.8",
+    "@ms-cloudpack/import-map": "^0.10.10",
     "@ms-cloudpack/json-utilities": "^0.1.10",
-    "@ms-cloudpack/package-hashes": "^0.7.38",
-    "@ms-cloudpack/package-utilities": "^12.1.0",
+    "@ms-cloudpack/package-hashes": "^0.7.40",
+    "@ms-cloudpack/package-utilities": "^12.2.1",
     "@ms-cloudpack/path-string-parsing": "^1.2.7",
     "@ms-cloudpack/path-utilities": "^3.0.10",
-    "@ms-cloudpack/remote-cache": "^0.11.2",
-    "@ms-cloudpack/task-reporter": "^0.16.0",
-    "@ms-cloudpack/telemetry": "^0.11.6",
+    "@ms-cloudpack/remote-cache": "^0.11.4",
+    "@ms-cloudpack/task-reporter": "^0.16.1",
+    "@ms-cloudpack/telemetry": "^0.11.8",
     "@trpc/client": "^11.0.1",
     "@trpc/server": "^11.0.1",
     "cors": "^2.8.5",

package/lib/task-scheduler/TaskScheduler.d.ts

@@ -1,19 +0,0 @@
-import type { TaskReporter } from '@ms-cloudpack/task-reporter';
-import type { BundleRequest } from '../types/BundleRequest.js';
-export declare const require: NodeJS.Require;
-interface TaskSchedulerOptions {
-    reporter: TaskReporter;
-    root: string;
-}
-/**
- * A class to abstract the creation of the lage scheduler and scheduling tasks
- */
-export declare class TaskScheduler {
-    #private;
-    constructor(options: TaskSchedulerOptions);
-    scheduleTask<T extends BundleRequest>(bundleRequest: T, scripts: Record<string, string>, options: {
-        rerun?: boolean;
-    }): Promise<void>;
-}
-export {};
-//# sourceMappingURL=TaskScheduler.d.ts.map

package/lib/task-scheduler/TaskScheduler.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"TaskScheduler.d.ts","sourceRoot":"","sources":["../../src/task-scheduler/TaskScheduler.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAM/D,eAAO,MAAM,OAAO,gBAAiC,CAAC;AAEtD,UAAU,oBAAoB;IAC5B,QAAQ,EAAE,YAAY,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,qBAAa,aAAa;;gBAGZ,OAAO,EAAE,oBAAoB;IAMnC,YAAY,CAAC,CAAC,SAAS,aAAa,EACxC,aAAa,EAAE,CAAC,EAChB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC/B,OAAO,EAAE;QACP,KAAK,CAAC,EAAE,OAAO,CAAC;KACjB,GACA,OAAO,CAAC,IAAI,CAAC;CAajB"}

package/lib/task-scheduler/TaskScheduler.js

@@ -1,29 +0,0 @@
-import targetGraph from '@lage-run/target-graph';
-import { createRequire } from 'node:module';
-import { createSimpleScheduler } from './createSimpleScheduler.js';
-import { createBundleTarget } from './createBundleTarget.js';
-export const require = createRequire(import.meta.url);
-/**
- * A class to abstract the creation of the lage scheduler and scheduling tasks
- */
-export class TaskScheduler {
-    #scheduler;
-    constructor(options) {
-        this.#scheduler = createSimpleScheduler(options);
-    }
-    // Schedules task to be run according to the bundle request that came through from the bundler server
-    // TODO: from a bundle request, we should be able to determine if we need to auto add several targets into the graph
-    async scheduleTask(bundleRequest, scripts, options) {
-        const target = createBundleTarget(scripts, bundleRequest);
-        const targetGraphBuilder = new targetGraph.TargetGraphBuilder();
-        targetGraphBuilder.addTarget(target);
-        const graph = targetGraphBuilder.build();
-        try {
-            await this.#scheduler.run(target.cwd, graph, options.rerun);
-        }
-        catch (e) {
-            console.error(e.stack || e);
-        }
-    }
-}
-//# sourceMappingURL=TaskScheduler.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"TaskScheduler.js","sourceRoot":"","sources":["../../src/task-scheduler/TaskScheduler.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,wBAAwB,CAAC;AAIjD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,MAAM,CAAC,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAOtD;;GAEG;AACH,MAAM,OAAO,aAAa;IACxB,UAAU,CAAkB;IAE5B,YAAY,OAA6B;QACvC,IAAI,CAAC,UAAU,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC;IAED,qGAAqG;IACrG,oHAAoH;IACpH,KAAK,CAAC,YAAY,CAChB,aAAgB,EAChB,OAA+B,EAC/B,OAEC;QAED,MAAM,MAAM,GAAG,kBAAkB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAE1D,MAAM,kBAAkB,GAAG,IAAI,WAAW,CAAC,kBAAkB,EAAE,CAAC;QAChE,kBAAkB,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACrC,MAAM,KAAK,GAAG,kBAAkB,CAAC,KAAK,EAAE,CAAC;QAEzC,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QAC9D,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAE,CAAW,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;CACF","sourcesContent":["import type { SimpleScheduler } from '@lage-run/scheduler';\nimport targetGraph from '@lage-run/target-graph';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport type { BundleRequest } from '../types/BundleRequest.js';\n\nimport { createRequire } from 'node:module';\nimport { createSimpleScheduler } from './createSimpleScheduler.js';\nimport { createBundleTarget } from './createBundleTarget.js';\n\nexport const require = createRequire(import.meta.url);\n\ninterface TaskSchedulerOptions {\n  reporter: TaskReporter;\n  root: string;\n}\n\n/**\n * A class to abstract the creation of the lage scheduler and scheduling tasks\n */\nexport class TaskScheduler {\n  #scheduler: SimpleScheduler;\n\n  constructor(options: TaskSchedulerOptions) {\n    this.#scheduler = createSimpleScheduler(options);\n  }\n\n  // Schedules task to be run according to the bundle request that came through from the bundler server\n  // TODO: from a bundle request, we should be able to determine if we need to auto add several targets into the graph\n  async scheduleTask<T extends BundleRequest>(\n    bundleRequest: T,\n    scripts: Record<string, string>,\n    options: {\n      rerun?: boolean;\n    },\n  ): Promise<void> {\n    const target = createBundleTarget(scripts, bundleRequest);\n\n    const targetGraphBuilder = new targetGraph.TargetGraphBuilder();\n    targetGraphBuilder.addTarget(target);\n    const graph = targetGraphBuilder.build();\n\n    try {\n      await this.#scheduler.run(target.cwd, graph, options.rerun);\n    } catch (e) {\n      console.error((e as Error).stack || e);\n    }\n  }\n}\n"]}

package/lib/task-scheduler/createBundleTarget.d.ts

@@ -1,4 +0,0 @@
-import type { Target } from '@lage-run/target-graph';
-import type { BundleRequest } from '../types/BundleRequest.js';
-export declare function createBundleTarget(scripts: Record<string, string>, bundleRequest: BundleRequest): Target;
-//# sourceMappingURL=createBundleTarget.d.ts.map

package/lib/task-scheduler/createBundleTarget.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"createBundleTarget.d.ts","sourceRoot":"","sources":["../../src/task-scheduler/createBundleTarget.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE/D,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,aAAa,EAAE,aAAa,GAAG,MAAM,CAiBxG"}

package/lib/task-scheduler/createBundleTarget.js

@@ -1,19 +0,0 @@
-export function createBundleTarget(scripts, bundleRequest) {
-    const cwd = bundleRequest.packagePath;
-    const target = {
-        id: bundleRequest.id,
-        label: `${bundleRequest.packageName} bundle`,
-        task: 'bundle',
-        type: 'worker',
-        cwd,
-        dependencies: [],
-        dependents: [],
-        depSpecs: [],
-        options: {
-            script: scripts.bundle ?? '',
-            bundleRequest,
-        },
-    };
-    return target;
-}
-//# sourceMappingURL=createBundleTarget.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"createBundleTarget.js","sourceRoot":"","sources":["../../src/task-scheduler/createBundleTarget.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,kBAAkB,CAAC,OAA+B,EAAE,aAA4B;IAC9F,MAAM,GAAG,GAAG,aAAa,CAAC,WAAW,CAAC;IACtC,MAAM,MAAM,GAAW;QACrB,EAAE,EAAE,aAAa,CAAC,EAAE;QACpB,KAAK,EAAE,GAAG,aAAa,CAAC,WAAW,SAAS;QAC5C,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,QAAQ;QACd,GAAG;QACH,YAAY,EAAE,EAAE;QAChB,UAAU,EAAE,EAAE;QACd,QAAQ,EAAE,EAAE;QACZ,OAAO,EAAE;YACP,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,EAAE;YAC5B,aAAa;SACd;KACF,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import type { Target } from '@lage-run/target-graph';\nimport type { BundleRequest } from '../types/BundleRequest.js';\n\nexport function createBundleTarget(scripts: Record<string, string>, bundleRequest: BundleRequest): Target {\n  const cwd = bundleRequest.packagePath;\n  const target: Target = {\n    id: bundleRequest.id,\n    label: `${bundleRequest.packageName} bundle`,\n    task: 'bundle',\n    type: 'worker',\n    cwd,\n    dependencies: [],\n    dependents: [],\n    depSpecs: [],\n    options: {\n      script: scripts.bundle ?? '',\n      bundleRequest,\n    },\n  };\n  return target;\n}\n"]}

package/lib/task-scheduler/createSimpleScheduler.d.ts

@@ -1,7 +0,0 @@
-import scheduler from '@lage-run/scheduler';
-import type { TaskReporter } from '@ms-cloudpack/task-reporter';
-export declare function createSimpleScheduler(params: {
-    reporter: TaskReporter;
-    root: string;
-}): scheduler.SimpleScheduler;
-//# sourceMappingURL=createSimpleScheduler.d.ts.map

package/lib/task-scheduler/createSimpleScheduler.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"createSimpleScheduler.d.ts","sourceRoot":"","sources":["../../src/task-scheduler/createSimpleScheduler.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,qBAAqB,CAAC;AAG5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAIhE,wBAAgB,qBAAqB,CAAC,MAAM,EAAE;IAAE,QAAQ,EAAE,YAAY,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAAC,eAAe,CAiCjH"}

package/lib/task-scheduler/createSimpleScheduler.js

@@ -1,38 +0,0 @@
-import { Logger } from '@lage-run/logger';
-import scheduler from '@lage-run/scheduler';
-import { TargetHasher } from '@lage-run/hasher';
-import os from 'os';
-import { createTaskSchedulerReporter } from './createTaskSchedulerReporter.js';
-import { require } from './TaskScheduler.js';
-export function createSimpleScheduler(params) {
-    const { reporter, root } = params;
-    const logger = new Logger();
-    logger.addReporter(createTaskSchedulerReporter(reporter));
-    const runners = {
-        worker: {
-            script: require.resolve('@lage-run/scheduler/lib/runners/WorkerRunner.js'),
-            options: {},
-        },
-        noop: {
-            script: require.resolve('@lage-run/scheduler/lib/runners/NoOpRunner.js'),
-            options: {},
-        },
-    };
-    const hasher = new TargetHasher({ root, environmentGlob: [] });
-    return new scheduler.SimpleScheduler({
-        concurrency: 10,
-        continueOnError: true,
-        logger,
-        maxWorkersPerTask: new Map(),
-        workerData: {
-            runners,
-            root,
-            taskArgs: [],
-        },
-        shouldCache: true,
-        shouldResetCache: false,
-        workerIdleMemoryLimit: os.totalmem(),
-        hasher,
-    });
-}
-//# sourceMappingURL=createSimpleScheduler.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"createSimpleScheduler.js","sourceRoot":"","sources":["../../src/task-scheduler/createSimpleScheduler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,SAAS,MAAM,qBAAqB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,MAAM,UAAU,qBAAqB,CAAC,MAAgD;IACpF,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAClC,MAAM,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;IAC5B,MAAM,CAAC,WAAW,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE1D,MAAM,OAAO,GAAG;QACd,MAAM,EAAE;YACN,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,iDAAiD,CAAC;YAC1E,OAAO,EAAE,EAAE;SACZ;QACD,IAAI,EAAE;YACJ,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,+CAA+C,CAAC;YACxE,OAAO,EAAE,EAAE;SACZ;KACF,CAAC;IAEF,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC,CAAC;IAE/D,OAAO,IAAI,SAAS,CAAC,eAAe,CAAC;QACnC,WAAW,EAAE,EAAE;QACf,eAAe,EAAE,IAAI;QACrB,MAAM;QACN,iBAAiB,EAAE,IAAI,GAAG,EAAE;QAC5B,UAAU,EAAE;YACV,OAAO;YACP,IAAI;YACJ,QAAQ,EAAE,EAAE;SACb;QACD,WAAW,EAAE,IAAI;QACjB,gBAAgB,EAAE,KAAK;QACvB,qBAAqB,EAAE,EAAE,CAAC,QAAQ,EAAE;QACpC,MAAM;KACP,CAAC,CAAC;AACL,CAAC","sourcesContent":["import { Logger } from '@lage-run/logger';\nimport scheduler from '@lage-run/scheduler';\nimport { TargetHasher } from '@lage-run/hasher';\nimport os from 'os';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport { createTaskSchedulerReporter } from './createTaskSchedulerReporter.js';\nimport { require } from './TaskScheduler.js';\n\nexport function createSimpleScheduler(params: { reporter: TaskReporter; root: string }): scheduler.SimpleScheduler {\n  const { reporter, root } = params;\n  const logger = new Logger();\n  logger.addReporter(createTaskSchedulerReporter(reporter));\n\n  const runners = {\n    worker: {\n      script: require.resolve('@lage-run/scheduler/lib/runners/WorkerRunner.js'),\n      options: {},\n    },\n    noop: {\n      script: require.resolve('@lage-run/scheduler/lib/runners/NoOpRunner.js'),\n      options: {},\n    },\n  };\n\n  const hasher = new TargetHasher({ root, environmentGlob: [] });\n\n  return new scheduler.SimpleScheduler({\n    concurrency: 10,\n    continueOnError: true,\n    logger,\n    maxWorkersPerTask: new Map(),\n    workerData: {\n      runners,\n      root,\n      taskArgs: [],\n    },\n    shouldCache: true,\n    shouldResetCache: false,\n    workerIdleMemoryLimit: os.totalmem(),\n    hasher,\n  });\n}\n"]}

package/lib/task-scheduler/createTaskSchedulerReporter.d.ts

@@ -1,4 +0,0 @@
-import { type Reporter } from '@lage-run/logger';
-import type { TaskReporter } from '@ms-cloudpack/task-reporter';
-export declare function createTaskSchedulerReporter(reporter: TaskReporter): Reporter;
-//# sourceMappingURL=createTaskSchedulerReporter.d.ts.map

package/lib/task-scheduler/createTaskSchedulerReporter.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"createTaskSchedulerReporter.d.ts","sourceRoot":"","sources":["../../src/task-scheduler/createTaskSchedulerReporter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE3D,OAAO,KAAK,EAAE,YAAY,EAAoB,MAAM,6BAA6B,CAAC;AAUlF,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,YAAY,GAAG,QAAQ,CA0D5E"}

package/lib/task-scheduler/createTaskSchedulerReporter.js

@@ -1,59 +0,0 @@
-import { LogLevel } from '@lage-run/logger';
-const logLevelToConsoleFnMap = {
-    [LogLevel.error]: console.error,
-    [LogLevel.warn]: console.warn,
-    [LogLevel.info]: console.info,
-    [LogLevel.verbose]: console.debug,
-    [LogLevel.silly]: console.debug,
-};
-export function createTaskSchedulerReporter(reporter) {
-    const reporterTasks = new Map();
-    return {
-        log(entry) {
-            if (entry.msg && entry.level <= LogLevel.warn && entry.data?.target) {
-                const target = entry.data.target;
-                const task = reporterTasks.get(target.id);
-                if (task) {
-                    task.addMessage(entry.msg);
-                }
-                return;
-            }
-            if (entry.data && entry.data.status) {
-                const { status } = entry.data;
-                const target = entry.data.target;
-                // Ensure task is in the reporterTasks map
-                let task = reporterTasks.get(target.id);
-                if (!task) {
-                    task = reporter.addTask(target.label, true);
-                    reporterTasks.set(target.id, task);
-                }
-                switch (status) {
-                    case 'running':
-                        task.start();
-                        break;
-                    case 'success':
-                        task.complete({ status: 'complete' });
-                        break;
-                    case 'skipped':
-                        task.complete({ status: 'skip' });
-                        break;
-                    case 'failed':
-                        task.complete({ status: 'fail' });
-                        break;
-                    case 'aborted':
-                        task.complete({ status: 'abort' });
-                        break;
-                }
-                return;
-            }
-            if (entry.msg) {
-                logLevelToConsoleFnMap[entry.level](entry.msg);
-                return;
-            }
-        },
-        summarize() {
-            // noop
-        },
-    };
-}
-//# sourceMappingURL=createTaskSchedulerReporter.js.map

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

@@ -1 +0,0 @@
-{"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/utilities/resolveDependenciesTask.d.ts

@@ -1,12 +0,0 @@
-import type { LinkedPath, ResolveMap } from '@ms-cloudpack/common-types';
-import type { Context } from '../types/Context.js';
-/**
- * Resolves the locations of dependencies and returns the resolve map, logging results
- * to the task reporter. Throws if dependencies could not be resolved.
- */
-export declare function resolveDependenciesTask(options: {
-    appPath: string;
-    additionalPaths?: string[];
-    linkedPaths?: LinkedPath[];
-}, context: Pick<Context, 'reporter' | 'packages' | 'telemetryClient'>): Promise<ResolveMap>;
-//# sourceMappingURL=resolveDependenciesTask.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"resolveDependenciesTask.d.ts","sourceRoot":"","sources":["../../src/utilities/resolveDependenciesTask.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAmB,MAAM,4BAA4B,CAAC;AAI1F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD;;;GAGG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE;IACP,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;CAC5B,EACD,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,GAAG,UAAU,GAAG,iBAAiB,CAAC,GAClE,OAAO,CAAC,UAAU,CAAC,CAiDrB"}

package/lib/utilities/resolveDependenciesTask.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"resolveDependenciesTask.js","sourceRoot":"","sources":["../../src/utilities/resolveDependenciesTask.ts"],"names":[],"mappings":"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","sourcesContent":["import type { LinkedPath, ResolveMap, ResolveMapEntry } from '@ms-cloudpack/common-types';\nimport { environmentInfo } from '@ms-cloudpack/environment';\nimport { createResolveMap } from '@ms-cloudpack/package-utilities';\nimport { bold, bulletedList, cyan, yellow } from '@ms-cloudpack/task-reporter';\nimport type { Context } from '../types/Context.js';\n\n/**\n * Resolves the locations of dependencies and returns the resolve map, logging results\n * to the task reporter. Throws if dependencies could not be resolved.\n */\nexport async function resolveDependenciesTask(\n  options: {\n    appPath: string;\n    additionalPaths?: string[];\n    linkedPaths?: LinkedPath[];\n  },\n  context: Pick<Context, 'reporter' | 'packages' | 'telemetryClient'>,\n): Promise<ResolveMap> {\n  const { appPath, additionalPaths, linkedPaths } = options;\n  const { reporter, packages, telemetryClient } = context;\n  let resolveMap: ResolveMap | undefined;\n\n  // Grab the installed dependency locations.\n  const task = reporter.addTask('Resolving dependencies');\n\n  try {\n    resolveMap = await telemetryClient.tracer.startActiveSpan('CREATE_RESOLVE_MAP', async (span) => {\n      span.setAttributes({ linkedPaths: linkedPaths?.length || 0 });\n\n      // await here is important to be able to report telemetry correctly\n      const result = await createResolveMap({ appPath, additionalPaths, linkedPaths }, { packages });\n\n      return result;\n    });\n\n    const { allPackages, duplicatedPackages } = getPackagesFromResolveMap(resolveMap);\n    const message = `Found ${cyan(allPackages.size)} total packages, ${\n      duplicatedPackages.size ? `${yellow(duplicatedPackages.size)} with multiple versions.` : `no duplicates.`\n    }`;\n    const extended = bulletedList(\n      Array.from(duplicatedPackages.entries()).map(\n        ([name, versions]) => `${bold(name)}: ${Array.from(versions).join(', ')}`,\n      ),\n    );\n\n    task.complete({ message, extended, forceShow: true });\n\n    return resolveMap;\n  } catch (err) {\n    task.complete({\n      status: 'fail',\n      message: 'Failed to resolve dependencies',\n      errors: [String(err)],\n      forceShow: true,\n      // Don't use the message as \"details\" because this will cause the message to be logged twice\n      extended: (err as Error).stack,\n    });\n\n    if (err instanceof Error && !environmentInfo.isJest) {\n      // Remove the call stack because we already logged it in the extended details of the task\n      // (unless running in a test, because it prevents the error from being logged in an understandable way)\n      err.stack = undefined;\n    }\n\n    throw err;\n  }\n}\n\n/**\n * Given a resolveMap, returns a map of all packages and a map of packages with multiple versions.\n * This is used to log the results of the resolve task.\n */\nfunction getPackagesFromResolveMap(resolveMap: ResolveMap): {\n  allPackages: Map<string, ResolveMapEntry>;\n  duplicatedPackages: Map<string, Set<string>>;\n} {\n  const allPackages = new Map<string, ResolveMapEntry>();\n  const duplicatedPackages = new Map<string, Set<string>>();\n\n  function addEntry(entry: ResolveMapEntry): void {\n    const existingEntry = allPackages.get(entry.name);\n    if (existingEntry) {\n      let dupeSet = duplicatedPackages.get(entry.name);\n      if (!dupeSet) {\n        dupeSet = new Set([existingEntry.version]);\n        duplicatedPackages.set(entry.name, dupeSet);\n      }\n      dupeSet.add(entry.version);\n    } else {\n      allPackages.set(entry.name, entry);\n    }\n  }\n\n  for (const currentEntry of Object.values(resolveMap)) {\n    addEntry(currentEntry);\n\n    if (currentEntry.scopedVersions) {\n      for (const scopedEntry of Object.values(currentEntry.scopedVersions)) {\n        addEntry(scopedEntry);\n      }\n    }\n  }\n\n  return {\n    allPackages,\n    duplicatedPackages,\n  };\n}\n"]}