@ms-cloudpack/api-server 0.29.21 → 0.30.1

package/lib/startApiServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"startApiServer.d.ts","sourceRoot":"","sources":["../src/startApiServer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAM5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAIlD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAS3E;;;;;;;;;;;;;GAaG;AACH,wBAAsB,cAAc,CAAC,MAAM,EAAE;IAC3C,OAAO,EAAE,OAAO,CAAC;IACjB,eAAe,EAAE,eAAe,CAAC;IACjC,QAAQ,EAAE,uBAAuB,CAAC;IAClC,GAAG,EAAE,OAAO,CAAC;IACb,UAAU,EAAE,UAAU,CAAC;CACxB,GAAG,OAAO,CAAC,SAAS,CAAC,CA8SrB"}
+{"version":3,"file":"startApiServer.d.ts","sourceRoot":"","sources":["../src/startApiServer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAM5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAIlD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAU3E;;;;;;;;;;;;;GAaG;AACH,wBAAsB,cAAc,CAAC,MAAM,EAAE;IAC3C,OAAO,EAAE,OAAO,CAAC;IACjB,eAAe,EAAE,eAAe,CAAC;IACjC,QAAQ,EAAE,uBAAuB,CAAC;IAClC,GAAG,EAAE,OAAO,CAAC;IACb,UAAU,EAAE,UAAU,CAAC;CACxB,GAAG,OAAO,CAAC,SAAS,CAAC,CAqTrB"}

package/lib/startApiServer.js

@@ -12,6 +12,7 @@ import { reloadCountSource, taskListSource, taskStatsSource } from './data/busSo
 import { openCodeEditor } from './apis/openCodeEditor.js';
 import { openFilePath } from './apis/openFilePath.js';
 import { reportMetric } from './apis/reportMetric.js';
+import { findResolveMapEntry } from '@ms-cloudpack/package-utilities';
 /**
  * The api server handles the data pub/sub (for things like reporting build status)
  * and hosting the dashboard verb backend (for executing actions like loading vscode,
@@ -183,8 +184,15 @@ export async function startApiServer(params) {
                     case 'addOverride': {
                         // TODO: Send filename from request data to findResolveMapEntry when chromium Issue 1371551 is fixed.
                         (async () => {
-                            await addOverride(request.data, { session, packages });
-                            session.incrementSessionVersion();
+                            const { packageName, importPath } = request.data;
+                            const entry = findResolveMapEntry({ packageName, resolveMap: session.resolveMap });
+                            if (!entry) {
+                                console.error(`Could not find entry of package "${packageName}" in resolve map`);
+                                return;
+                            }
+                            await addOverride({ packageName, importPath }, { session, packages });
+                            taskRunner.remove(entry.path);
+                            session.incrementTargetVersion(entry.path);
                             notifyReload();
                         })().catch(() => {
                             // no-op

package/lib/startApiServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"startApiServer.js","sourceRoot":"","sources":["../src/startApiServer.ts"],"names":[],"mappings":"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","sourcesContent":["import getPort from 'get-port';\nimport http from 'http';\nimport https from 'https';\nimport WebSocket, { WebSocketServer } from 'ws';\nimport type { DataBus } from '@ms-cloudpack/data-bus';\nimport type { TaskRunner } from './utilities/TaskRunner.js';\nimport { getCachePath } from './utilities/getCachePath.js';\nimport fsExtra from 'fs-extra';\nimport type { TaskDescription } from './types/TaskDescription.js';\nimport type { TaskEndDescription } from './types/TaskEndDescription.js';\nimport type { TaskStartDescription } from './types/TaskStartDescription.js';\nimport type { ApiServer } from './types/ApiServer.js';\nimport type { Session } from './types/Session.js';\nimport { addOverride } from './utilities/addOverride.js';\nimport { validateOverride } from './utilities/validateOverride.js';\nimport { parseHttpsConfig } from '@ms-cloudpack/create-express-app';\nimport type { TelemetryClient } from '@ms-cloudpack/telemetry';\nimport { editCloudpackConfig } from './utilities/editCloudpackConfig.js';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport { reloadCountSource, taskListSource, taskStatsSource } from './data/busSources.js';\nimport type { TaskStats } from './types/TaskStats.js';\nimport type { AddPackageOverrideInput } from './apis/addPackageOverride.js';\nimport type { ValidatePackageOverrideInput, ValidatePackageOverrideOutput } from './apis/validatePackageOverride.js';\nimport { openCodeEditor, type OpenCodeEditorInput } from './apis/openCodeEditor.js';\nimport { openFilePath, type OpenFilePathInput } from './apis/openFilePath.js';\nimport { reportMetric, type ReportMetricInput } from './apis/reportMetric.js';\n\n/**\n * The api server handles the data pub/sub (for things like reporting build status)\n * and hosting the dashboard verb backend (for executing actions like loading vscode,\n * changing dependencies, connecting new projects to the running session, etc.)\n *\n * Each time `cloudpack start` is run, an api server will start up for that session. The\n * hosted web page will have a \"cloudpack-api-server\" header which points\n * to the websocket server.\n *\n * The bundle server will call the api server to publish build status updates.\n *\n * The app server will burn the api server url on the host html, so that client-side\n * javascript can connect and subscribe to page changes.\n */\nexport async function startApiServer(params: {\n  session: Session;\n  telemetryClient: TelemetryClient;\n  packages: PackageDefinitionsCache;\n  bus: DataBus;\n  taskRunner: TaskRunner;\n}): Promise<ApiServer> {\n  const { session, telemetryClient, packages, bus, taskRunner } = params;\n  const host = session.config?.devServer?.domain || 'localhost';\n  const port = await getPort({ port: [9890, 9891, 9892, 9893] });\n  const sessionStats: TaskStats = {\n    status: 'idle',\n\n    remainingTasks: 0,\n    totalTasks: 0,\n\n    totalErrors: 0,\n    totalWarnings: 0,\n  };\n\n  const allTasks = new Map<string, TaskDescription>();\n\n  function reportStart(taskStart: TaskStartDescription): void {\n    const previousResult = allTasks.get(taskStart.id);\n    const now = new Date().getTime();\n\n    if (!previousResult) {\n      sessionStats.totalTasks++;\n    }\n\n    if (previousResult?.status === 'complete') {\n      sessionStats.totalErrors -= previousResult.errors?.length || 0;\n      sessionStats.totalWarnings -= previousResult.warnings?.length || 0;\n    }\n\n    sessionStats.remainingTasks++;\n    sessionStats.status = 'pending';\n\n    allTasks.set(taskStart.id, {\n      ...taskStart,\n      status: 'pending',\n      startTime: now,\n    });\n\n    bus.publish(taskStatsSource, sessionStats);\n    bus.publish(taskListSource, { tasks: Array.from(allTasks.values()) });\n  }\n\n  function reportEnd(taskEnd: TaskEndDescription): void {\n    const previousResult = allTasks.get(taskEnd.id);\n    const now = new Date().getTime();\n\n    if (previousResult) {\n      sessionStats.remainingTasks--;\n      sessionStats.totalErrors += taskEnd.errors?.length || 0;\n      sessionStats.totalWarnings += taskEnd.warnings?.length || 0;\n\n      allTasks.set(taskEnd.id, {\n        ...previousResult,\n        ...taskEnd,\n        status: 'complete',\n        durationMilliseconds: now - previousResult.startTime,\n        lastUpdated: now,\n      });\n\n      if (sessionStats.remainingTasks === 0) {\n        sessionStats.status = 'idle';\n      }\n\n      bus.publish(taskStatsSource, sessionStats);\n      bus.publish(taskListSource, { tasks: Array.from(allTasks.values()) });\n    }\n  }\n\n  taskRunner.on('executeStarted', reportStart);\n  taskRunner.on('executeCompleted', reportEnd);\n\n  bus.publish([session.id, 'status'], sessionStats);\n\n  // Create a node http(s) server.\n  let server: http.Server | https.Server;\n  const httpsConfig = session.config?.devServer?.https;\n  const protocol = httpsConfig ? 'wss' : 'ws';\n\n  if (httpsConfig) {\n    const { key, cert, passphrase } = parseHttpsConfig(httpsConfig);\n\n    if (!key || !cert) {\n      console.error('Invalid https config in cloudpack.config.json. Make sure key and cert are valid.');\n\n      throw new Error('Invalid https config.');\n    }\n\n    server = https\n      .createServer(\n        {\n          key,\n          cert,\n          passphrase,\n        },\n        () => {\n          /* no-op */\n        },\n      )\n      .listen(port, host);\n  } else {\n    server = http.createServer().listen(port, host);\n  }\n\n  // Create a websocket server which listens for subscriptions and verb requests,\n  // and broadcasts the data to all connected clients.\n  const socketServer = new WebSocketServer({ server }, () => {\n    // console.log(`ApiServer: Started on port ${port}`);\n  }).on('connection', (socket: WebSocket) => {\n    const disposables = new Map<number, () => void>();\n\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    function sendMessage(message: any) {\n      socket.send(JSON.stringify(message, null, 2));\n    }\n\n    socket.send(\n      JSON.stringify({\n        type: 'sequence',\n        sequence: session.sequence,\n      }),\n    );\n\n    socket\n      .on('message', (rawData) => {\n        try {\n          // eslint-disable-next-line @typescript-eslint/no-base-to-string\n          const request = JSON.parse(rawData.toString()) as {\n            type: string;\n            requestId?: string;\n            data: Record<string, unknown>;\n          };\n\n          switch (request.type) {\n            /**\n             * Subscribe to a data subscription.\n             */\n            case 'subscribe': {\n              const { path: subscriptionPath, id } = request.data;\n\n              disposables.set(\n                id as number,\n                bus.subscribe(\n                  subscriptionPath as string[],\n                  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment\n                  (data: any) => sendMessage({ type: 'notify', id, path: subscriptionPath, data }),\n                ),\n              );\n\n              break;\n            }\n\n            /**\n             * Unsubscribe from a data subscription.\n             */\n            case 'unsubscribe': {\n              const id = request.data.id as number | undefined;\n              if (id) {\n                const dispose = disposables.get(id);\n\n                if (dispose) {\n                  dispose();\n                  disposables.delete(id);\n                }\n              }\n\n              break;\n            }\n\n            /**\n             * Open a file in VSCode.\n             */\n            case 'openSource': {\n              openCodeEditor({ input: request.data as OpenCodeEditorInput, ctx: {} }).catch(() => {\n                // ignore\n              });\n              break;\n            }\n\n            /**\n             * Open a file or folder in the OS's default file manager.\n             */\n            case 'open': {\n              openFilePath({ input: request.data as OpenFilePathInput, ctx: { session } }).catch(() => {\n                // ignore\n              });\n              break;\n            }\n\n            /**\n             * Opens the cloudpack config in VSCode for the user to manually edit. If the file doesn't exist,\n             * it will be created.\n             */\n            case 'editConfig': {\n              editCloudpackConfig(session.appPath).catch(() => {\n                /* no-op */\n              });\n              break;\n            }\n\n            /**\n             * Adds an override to the cloudpack config.\n             */\n            case 'addOverride': {\n              // TODO: Send filename from request data to findResolveMapEntry when chromium Issue 1371551 is fixed.\n              (async () => {\n                await addOverride(request.data as AddPackageOverrideInput, { session, packages });\n                session.incrementSessionVersion();\n                notifyReload();\n              })().catch(() => {\n                // no-op\n              });\n              break;\n            }\n\n            case 'validateOverride': {\n              // TODO: Get filename from request data when chromium Issue 1371551 is fixed.\n              const requestId = request.requestId || '';\n              (async () => {\n                const input = request.data as ValidatePackageOverrideInput;\n                const fixable = await validateOverride(input, { session, packages });\n                const result: ValidatePackageOverrideOutput = { fixable };\n                sendMessage({ type: 'validateOverride', requestId, data: result });\n              })().catch(() => {\n                // no-op\n              });\n              break;\n            }\n\n            case 'restartAllTasks': {\n              console.log('ApiServer: Restarting all tasks');\n\n              // Clear entire local cache.\n              // eslint-disable-next-line @ms-cloudpack/internal/no-sync-filesystem\n              fsExtra.emptyDirSync(getCachePath());\n\n              // All tasks can be removed as notifyReload()\n              // will cause the client to add the tasks again.\n              allTasks.forEach((_, id) => {\n                taskRunner.remove(id);\n              });\n\n              // Update session version.\n              session.incrementSessionVersion();\n\n              notifyReload();\n              break;\n            }\n\n            case 'restartTask': {\n              const { id, inputPath } = request.data as Record<string, string>;\n              console.log(`ApiServer: Restarting task ${id}`);\n              taskRunner.remove(id);\n              session.incrementTargetVersion(inputPath);\n              notifyReload();\n              break;\n            }\n\n            case 'reportMetric': {\n              reportMetric({ input: request.data as ReportMetricInput, ctx: { telemetryClient } });\n              break;\n            }\n          }\n        } catch (err) {\n          console.error('ApiServer: error handling message');\n          console.error('Error:', err);\n          // eslint-disable-next-line @typescript-eslint/no-base-to-string\n          console.error('Message:', rawData.toString());\n        }\n      })\n      .on('close', () => {\n        for (const d of disposables.values()) {\n          d();\n        }\n      });\n  });\n\n  const notifyReload = () => {\n    session.sequence++;\n    socketServer.clients.forEach((socket: WebSocket) => {\n      if (socket.readyState === WebSocket.OPEN) {\n        socket.send(\n          JSON.stringify({\n            type: 'reload',\n            data: { sessionId: session.id },\n          }),\n        );\n      }\n    });\n  };\n\n  bus.subscribe(reloadCountSource, notifyReload);\n\n  return {\n    url: `${protocol}://${host}:${port}`,\n    port,\n    close: () =>\n      new Promise<void>((resolve, reject) => {\n        socketServer.clients.forEach((socket: WebSocket) => socket.terminate());\n        socketServer.close((err) => (err ? reject(err) : resolve()));\n        server.close();\n      }),\n  };\n}\n"]}
+{"version":3,"file":"startApiServer.js","sourceRoot":"","sources":["../src/startApiServer.ts"],"names":[],"mappings":"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","sourcesContent":["import getPort from 'get-port';\nimport http from 'http';\nimport https from 'https';\nimport WebSocket, { WebSocketServer } from 'ws';\nimport type { DataBus } from '@ms-cloudpack/data-bus';\nimport type { TaskRunner } from './utilities/TaskRunner.js';\nimport { getCachePath } from './utilities/getCachePath.js';\nimport fsExtra from 'fs-extra';\nimport type { TaskDescription } from './types/TaskDescription.js';\nimport type { TaskEndDescription } from './types/TaskEndDescription.js';\nimport type { TaskStartDescription } from './types/TaskStartDescription.js';\nimport type { ApiServer } from './types/ApiServer.js';\nimport type { Session } from './types/Session.js';\nimport { addOverride } from './utilities/addOverride.js';\nimport { validateOverride } from './utilities/validateOverride.js';\nimport { parseHttpsConfig } from '@ms-cloudpack/create-express-app';\nimport type { TelemetryClient } from '@ms-cloudpack/telemetry';\nimport { editCloudpackConfig } from './utilities/editCloudpackConfig.js';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport { reloadCountSource, taskListSource, taskStatsSource } from './data/busSources.js';\nimport type { TaskStats } from './types/TaskStats.js';\nimport type { AddPackageOverrideInput } from './apis/addPackageOverride.js';\nimport type { ValidatePackageOverrideInput, ValidatePackageOverrideOutput } from './apis/validatePackageOverride.js';\nimport { openCodeEditor, type OpenCodeEditorInput } from './apis/openCodeEditor.js';\nimport { openFilePath, type OpenFilePathInput } from './apis/openFilePath.js';\nimport { reportMetric, type ReportMetricInput } from './apis/reportMetric.js';\nimport { findResolveMapEntry } from '@ms-cloudpack/package-utilities';\n\n/**\n * The api server handles the data pub/sub (for things like reporting build status)\n * and hosting the dashboard verb backend (for executing actions like loading vscode,\n * changing dependencies, connecting new projects to the running session, etc.)\n *\n * Each time `cloudpack start` is run, an api server will start up for that session. The\n * hosted web page will have a \"cloudpack-api-server\" header which points\n * to the websocket server.\n *\n * The bundle server will call the api server to publish build status updates.\n *\n * The app server will burn the api server url on the host html, so that client-side\n * javascript can connect and subscribe to page changes.\n */\nexport async function startApiServer(params: {\n  session: Session;\n  telemetryClient: TelemetryClient;\n  packages: PackageDefinitionsCache;\n  bus: DataBus;\n  taskRunner: TaskRunner;\n}): Promise<ApiServer> {\n  const { session, telemetryClient, packages, bus, taskRunner } = params;\n  const host = session.config?.devServer?.domain || 'localhost';\n  const port = await getPort({ port: [9890, 9891, 9892, 9893] });\n  const sessionStats: TaskStats = {\n    status: 'idle',\n\n    remainingTasks: 0,\n    totalTasks: 0,\n\n    totalErrors: 0,\n    totalWarnings: 0,\n  };\n\n  const allTasks = new Map<string, TaskDescription>();\n\n  function reportStart(taskStart: TaskStartDescription): void {\n    const previousResult = allTasks.get(taskStart.id);\n    const now = new Date().getTime();\n\n    if (!previousResult) {\n      sessionStats.totalTasks++;\n    }\n\n    if (previousResult?.status === 'complete') {\n      sessionStats.totalErrors -= previousResult.errors?.length || 0;\n      sessionStats.totalWarnings -= previousResult.warnings?.length || 0;\n    }\n\n    sessionStats.remainingTasks++;\n    sessionStats.status = 'pending';\n\n    allTasks.set(taskStart.id, {\n      ...taskStart,\n      status: 'pending',\n      startTime: now,\n    });\n\n    bus.publish(taskStatsSource, sessionStats);\n    bus.publish(taskListSource, { tasks: Array.from(allTasks.values()) });\n  }\n\n  function reportEnd(taskEnd: TaskEndDescription): void {\n    const previousResult = allTasks.get(taskEnd.id);\n    const now = new Date().getTime();\n\n    if (previousResult) {\n      sessionStats.remainingTasks--;\n      sessionStats.totalErrors += taskEnd.errors?.length || 0;\n      sessionStats.totalWarnings += taskEnd.warnings?.length || 0;\n\n      allTasks.set(taskEnd.id, {\n        ...previousResult,\n        ...taskEnd,\n        status: 'complete',\n        durationMilliseconds: now - previousResult.startTime,\n        lastUpdated: now,\n      });\n\n      if (sessionStats.remainingTasks === 0) {\n        sessionStats.status = 'idle';\n      }\n\n      bus.publish(taskStatsSource, sessionStats);\n      bus.publish(taskListSource, { tasks: Array.from(allTasks.values()) });\n    }\n  }\n\n  taskRunner.on('executeStarted', reportStart);\n  taskRunner.on('executeCompleted', reportEnd);\n\n  bus.publish([session.id, 'status'], sessionStats);\n\n  // Create a node http(s) server.\n  let server: http.Server | https.Server;\n  const httpsConfig = session.config?.devServer?.https;\n  const protocol = httpsConfig ? 'wss' : 'ws';\n\n  if (httpsConfig) {\n    const { key, cert, passphrase } = parseHttpsConfig(httpsConfig);\n\n    if (!key || !cert) {\n      console.error('Invalid https config in cloudpack.config.json. Make sure key and cert are valid.');\n\n      throw new Error('Invalid https config.');\n    }\n\n    server = https\n      .createServer(\n        {\n          key,\n          cert,\n          passphrase,\n        },\n        () => {\n          /* no-op */\n        },\n      )\n      .listen(port, host);\n  } else {\n    server = http.createServer().listen(port, host);\n  }\n\n  // Create a websocket server which listens for subscriptions and verb requests,\n  // and broadcasts the data to all connected clients.\n  const socketServer = new WebSocketServer({ server }, () => {\n    // console.log(`ApiServer: Started on port ${port}`);\n  }).on('connection', (socket: WebSocket) => {\n    const disposables = new Map<number, () => void>();\n\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    function sendMessage(message: any) {\n      socket.send(JSON.stringify(message, null, 2));\n    }\n\n    socket.send(\n      JSON.stringify({\n        type: 'sequence',\n        sequence: session.sequence,\n      }),\n    );\n\n    socket\n      .on('message', (rawData) => {\n        try {\n          // eslint-disable-next-line @typescript-eslint/no-base-to-string\n          const request = JSON.parse(rawData.toString()) as {\n            type: string;\n            requestId?: string;\n            data: Record<string, unknown>;\n          };\n\n          switch (request.type) {\n            /**\n             * Subscribe to a data subscription.\n             */\n            case 'subscribe': {\n              const { path: subscriptionPath, id } = request.data;\n\n              disposables.set(\n                id as number,\n                bus.subscribe(\n                  subscriptionPath as string[],\n                  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment\n                  (data: any) => sendMessage({ type: 'notify', id, path: subscriptionPath, data }),\n                ),\n              );\n\n              break;\n            }\n\n            /**\n             * Unsubscribe from a data subscription.\n             */\n            case 'unsubscribe': {\n              const id = request.data.id as number | undefined;\n              if (id) {\n                const dispose = disposables.get(id);\n\n                if (dispose) {\n                  dispose();\n                  disposables.delete(id);\n                }\n              }\n\n              break;\n            }\n\n            /**\n             * Open a file in VSCode.\n             */\n            case 'openSource': {\n              openCodeEditor({ input: request.data as OpenCodeEditorInput, ctx: {} }).catch(() => {\n                // ignore\n              });\n              break;\n            }\n\n            /**\n             * Open a file or folder in the OS's default file manager.\n             */\n            case 'open': {\n              openFilePath({ input: request.data as OpenFilePathInput, ctx: { session } }).catch(() => {\n                // ignore\n              });\n              break;\n            }\n\n            /**\n             * Opens the cloudpack config in VSCode for the user to manually edit. If the file doesn't exist,\n             * it will be created.\n             */\n            case 'editConfig': {\n              editCloudpackConfig(session.appPath).catch(() => {\n                /* no-op */\n              });\n              break;\n            }\n\n            /**\n             * Adds an override to the cloudpack config.\n             */\n            case 'addOverride': {\n              // TODO: Send filename from request data to findResolveMapEntry when chromium Issue 1371551 is fixed.\n              (async () => {\n                const { packageName, importPath } = request.data as AddPackageOverrideInput;\n                const entry = findResolveMapEntry({ packageName, resolveMap: session.resolveMap });\n                if (!entry) {\n                  console.error(`Could not find entry of package \"${packageName}\" in resolve map`);\n                  return;\n                }\n                await addOverride({ packageName, importPath }, { session, packages });\n                taskRunner.remove(entry.path);\n                session.incrementTargetVersion(entry.path);\n                notifyReload();\n              })().catch(() => {\n                // no-op\n              });\n              break;\n            }\n\n            case 'validateOverride': {\n              // TODO: Get filename from request data when chromium Issue 1371551 is fixed.\n              const requestId = request.requestId || '';\n              (async () => {\n                const input = request.data as ValidatePackageOverrideInput;\n                const fixable = await validateOverride(input, { session, packages });\n                const result: ValidatePackageOverrideOutput = { fixable };\n                sendMessage({ type: 'validateOverride', requestId, data: result });\n              })().catch(() => {\n                // no-op\n              });\n              break;\n            }\n\n            case 'restartAllTasks': {\n              console.log('ApiServer: Restarting all tasks');\n\n              // Clear entire local cache.\n              // eslint-disable-next-line @ms-cloudpack/internal/no-sync-filesystem\n              fsExtra.emptyDirSync(getCachePath());\n\n              // All tasks can be removed as notifyReload()\n              // will cause the client to add the tasks again.\n              allTasks.forEach((_, id) => {\n                taskRunner.remove(id);\n              });\n\n              // Update session version.\n              session.incrementSessionVersion();\n\n              notifyReload();\n              break;\n            }\n\n            case 'restartTask': {\n              const { id, inputPath } = request.data as Record<string, string>;\n              console.log(`ApiServer: Restarting task ${id}`);\n              taskRunner.remove(id);\n              session.incrementTargetVersion(inputPath);\n              notifyReload();\n              break;\n            }\n\n            case 'reportMetric': {\n              reportMetric({ input: request.data as ReportMetricInput, ctx: { telemetryClient } });\n              break;\n            }\n          }\n        } catch (err) {\n          console.error('ApiServer: error handling message');\n          console.error('Error:', err);\n          // eslint-disable-next-line @typescript-eslint/no-base-to-string\n          console.error('Message:', rawData.toString());\n        }\n      })\n      .on('close', () => {\n        for (const d of disposables.values()) {\n          d();\n        }\n      });\n  });\n\n  const notifyReload = () => {\n    session.sequence++;\n    socketServer.clients.forEach((socket: WebSocket) => {\n      if (socket.readyState === WebSocket.OPEN) {\n        socket.send(\n          JSON.stringify({\n            type: 'reload',\n            data: { sessionId: session.id },\n          }),\n        );\n      }\n    });\n  };\n\n  bus.subscribe(reloadCountSource, notifyReload);\n\n  return {\n    url: `${protocol}://${host}:${port}`,\n    port,\n    close: () =>\n      new Promise<void>((resolve, reject) => {\n        socketServer.clients.forEach((socket: WebSocket) => socket.terminate());\n        socketServer.close((err) => (err ? reject(err) : resolve()));\n        server.close();\n      }),\n  };\n}\n"]}

package/lib/utilities/TaskRunner.d.ts

@@ -20,23 +20,13 @@ export declare class TaskRunner extends EventEmitter {
      * Rerun flag forces the Task to be run again.
      */
     add<TReturn>(task: Task<TReturn>, options?: TaskOptions): Promise<TReturn>;
-    /**
-     * The reset method removes a task from the TaskRunner
-     * and then adds it again through a previous execute function.
-     *
-     * This is useful for when a task needs to be forcibly rerun.
-     *
-     * It is intented to be used by the api server
-     * to rerun a task when it is stuck or it failed.
-     */
-    reset<TReturn>(id: string): Promise<TReturn>;
     /**
      * The remove method disposes a task if available
      * and then removes it from the TaskRunner.
      *
      * This is useful when the state of a task needs to be cleared.
      *
-     * It is intented to be used by the api server
+     * It is intended to be used by the api server
      * to clear the TaskRunner's state before reloading the page.
      */
     remove(id: string): void;

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

@@ -1 +1 @@
-{"version":3,"file":"TaskRunner.d.ts","sourceRoot":"","sources":["../../src/utilities/TaskRunner.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,YAAY,MAAM,QAAQ,CAAC;AAQlC;;;GAGG;AACH,qBAAa,UAAW,SAAQ,YAAY;IAC1C,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,aAAa,CAA4B;IAEjD,OAAO,CAAC,eAAe,CAAmB;IAC1C,OAAO,CAAC,cAAc,CAAc;IAEpC,OAAO,CAAC,UAAU,CAAyB;;IAY3C;;;;;OAKG;IACH,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAoF1E;;;;;;;;OAQG;IACH,KAAK,CAAC,OAAO,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAS5C;;;;;;;;OAQG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;CAYzB"}
+{"version":3,"file":"TaskRunner.d.ts","sourceRoot":"","sources":["../../src/utilities/TaskRunner.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,YAAY,MAAM,QAAQ,CAAC;AAQlC;;;GAGG;AACH,qBAAa,UAAW,SAAQ,YAAY;IAC1C,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,aAAa,CAA4B;IAEjD,OAAO,CAAC,eAAe,CAAmB;IAC1C,OAAO,CAAC,cAAc,CAAc;IAEpC,OAAO,CAAC,UAAU,CAAyB;;IAY3C;;;;;OAKG;IACH,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAoF1E;;;;;;;;OAQG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;CAazB"}

package/lib/utilities/TaskRunner.js

@@ -92,30 +92,13 @@ export class TaskRunner extends EventEmitter {
         this._completedTasks.delete(id);
         return resultPromise;
     }
-    /**
-     * The reset method removes a task from the TaskRunner
-     * and then adds it again through a previous execute function.
-     *
-     * This is useful for when a task needs to be forcibly rerun.
-     *
-     * It is intented to be used by the api server
-     * to rerun a task when it is stuck or it failed.
-     */
-    reset(id) {
-        this.remove(id);
-        const prevTask = this._prevTasks.get(id);
-        if (prevTask === undefined) {
-            throw new Error(`Task not found: ${id}`);
-        }
-        return this.add(prevTask, { rerun: true });
-    }
     /**
      * The remove method disposes a task if available
      * and then removes it from the TaskRunner.
      *
      * This is useful when the state of a task needs to be cleared.
      *
-     * It is intented to be used by the api server
+     * It is intended to be used by the api server
      * to clear the TaskRunner's state before reloading the page.
      */
     remove(id) {
@@ -126,6 +109,7 @@ export class TaskRunner extends EventEmitter {
             log(`Error disposing task: ${id}`);
         });
         this._prevTasks.get(id)?.clear?.();
+        this._prevTasks.delete(id);
         this._requiresRerun.delete(id);
         this._pendingTasks.delete(id);
         this._completedTasks.delete(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 PQueue from 'p-queue';\nimport type { TaskOptions } from '../types/TaskOptions.js';\nimport type { Task } from '../types/Task.js';\nimport EventEmitter from 'events';\nimport type { TaskEndDescription, TaskStartDescription } from '../index.js';\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 } = 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      let taskError: unknown;\n      let completed = false;\n\n      do {\n        // Delete from rerun list (if present).\n        this._requiresRerun.delete(id);\n        try {\n          // TODO: possibly remove cast once this issue is resolved\n          // https://github.com/sindresorhus/p-queue/issues/175\n          taskResult = (await this._queue.add(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          })) as TReturn | undefined;\n          completed = true;\n        } catch (err) {\n          // Save the error--it will be thrown later if a rerun was not requested.\n          taskError = err;\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      if (completed) {\n        // Update finished Tasks.\n        this._completedTasks.set(id, taskResult);\n        // Resolve the promise.\n        return taskResult as TReturn;\n      }\n\n      // If the task never completed successfully, throw the error from earlier.\n      throw taskError;\n    })();\n\n    this._pendingTasks.set(id, resultPromise);\n    this._completedTasks.delete(id);\n\n    return resultPromise;\n  }\n\n  /**\n   * The reset method removes a task from the TaskRunner\n   * and then adds it again through a previous execute function.\n   *\n   * This is useful for when a task needs to be forcibly rerun.\n   *\n   * It is intented to be used by the api server\n   * to rerun a task when it is stuck or it failed.\n   */\n  reset<TReturn>(id: string): Promise<TReturn> {\n    this.remove(id);\n    const prevTask = this._prevTasks.get(id);\n    if (prevTask === undefined) {\n      throw new Error(`Task not found: ${id}`);\n    }\n    return this.add(prevTask, { rerun: true }) as Promise<TReturn>;\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 intented 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._requiresRerun.delete(id);\n    this._pendingTasks.delete(id);\n    this._completedTasks.delete(id);\n  }\n}\n"]}
+{"version":3,"file":"TaskRunner.js","sourceRoot":"","sources":["../../src/utilities/TaskRunner.ts"],"names":[],"mappings":"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","sourcesContent":["import PQueue from 'p-queue';\nimport type { TaskOptions } from '../types/TaskOptions.js';\nimport type { Task } from '../types/Task.js';\nimport EventEmitter from 'events';\nimport type { TaskEndDescription, TaskStartDescription } from '../index.js';\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 } = 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      let taskError: unknown;\n      let completed = false;\n\n      do {\n        // Delete from rerun list (if present).\n        this._requiresRerun.delete(id);\n        try {\n          // TODO: possibly remove cast once this issue is resolved\n          // https://github.com/sindresorhus/p-queue/issues/175\n          taskResult = (await this._queue.add(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          })) as TReturn | undefined;\n          completed = true;\n        } catch (err) {\n          // Save the error--it will be thrown later if a rerun was not requested.\n          taskError = err;\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      if (completed) {\n        // Update finished Tasks.\n        this._completedTasks.set(id, taskResult);\n        // Resolve the promise.\n        return taskResult as TReturn;\n      }\n\n      // If the task never completed successfully, throw the error from earlier.\n      throw taskError;\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"]}

package/lib/utilities/addOverride.d.ts

@@ -5,5 +5,5 @@ import type { OverrideOptions } from '../types/OverrideOptions.js';
  * that isn't recognized. When the user triggers this override, we write it to the cloudpack user config, rather
  * than generated configs which could get "reset" on `init --reset`.
  */
-export declare function addOverride(options: OverrideOptions, context: Pick<Context, 'packages' | 'session'>): Promise<void>;
+export declare function addOverride(options: OverrideOptions, context: Pick<Context, 'packages' | 'session'>): Promise<boolean>;
 //# sourceMappingURL=addOverride.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"addOverride.d.ts","sourceRoot":"","sources":["../../src/utilities/addOverride.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAEnE;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,GAAG,SAAS,CAAC,iBA8EzG"}
+{"version":3,"file":"addOverride.d.ts","sourceRoot":"","sources":["../../src/utilities/addOverride.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAGnE;;;;GAIG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,GAAG,SAAS,CAAC,GAC7C,OAAO,CAAC,OAAO,CAAC,CAsGlB"}

package/lib/utilities/addOverride.js

@@ -1,6 +1,7 @@
-import { readUserConfig, writeUserConfig, checkMatch } from '@ms-cloudpack/config';
-import { addExportsMapEntry, findResolveMapEntry, getExportsMap } from '@ms-cloudpack/package-utilities';
+import { checkMatch, readUserConfig, writeUserConfig } from '@ms-cloudpack/config';
+import { addExportsMapEntry, findResolveMapEntry, flattenExportsMap, getExportsMap, } from '@ms-cloudpack/package-utilities';
 import { parseRequestUrl } from './parseRequestUrl.js';
+import { safeRelativePath } 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 user config, rather
@@ -10,6 +11,7 @@ export async function addOverride(options, context) {
     const { packageName, importPath, issuerUrl } = options;
     const { session, packages } = context;
     let definition = undefined;
+    let addedEntry = false;
     if (issuerUrl) {
         const { packageName: name, version } = parseRequestUrl(issuerUrl);
         definition = { name, version };
@@ -21,23 +23,29 @@ export async function addOverride(options, context) {
     });
     if (!entry) {
         console.error(`Could not find entry of package "${packageName}" in resolve map`);
-        return;
+        return addedEntry;
     }
+    // Get current exports. We want to add an additional entry to what's there - not replace the default exports,
+    // so we need the full map for the package.
+    const exports = await getExportsMap({ packagePath: entry.path }, { packages, config: session.config });
+    const flattenedExports = flattenExportsMap(exports);
+    // Return false if the import path already exists in the exports map.
+    if (flattenedExports[safeRelativePath(importPath)]) {
+        console.debug(`The import path "${importPath}" already exists in the exports map for "${packageName}".`);
+        return addedEntry;
+    }
+    // Add the single new exports entry to the exports map.
+    addedEntry = await addExportsMapEntry({
+        exports,
+        packagePath: entry.path,
+        importPath,
+    }, { packages, config: session.config });
     // Parse the user config if it exists.
     const config = await readUserConfig(session.appPath);
     // Ensure packageSettings exist.
     config.packageSettings ??= [];
-    const matches = config.packageSettings.filter(({ match }) => checkMatch({ name: packageName, version: entry.version, match, firstMatch: true }));
-    if (!matches.length) {
-        // Get current exports. We want to add an additional entry to what's there - not replace the default exports,
-        // so we need the full map for the package.
-        const exports = await getExportsMap({ packagePath: entry.path }, { packages, config: session.config });
-        // Add the single new exports entry.
-        await addExportsMapEntry({
-            exports,
-            packagePath: entry.path,
-            importPath,
-        }, { packages, config: session.config });
+    const configMatches = config.packageSettings.filter(({ match }) => checkMatch({ name: packageName, version: entry.version, match, firstMatch: true }));
+    if (!configMatches.length) {
         config.packageSettings.push({
             match: {
                 name: packageName,
@@ -47,22 +55,32 @@ export async function addOverride(options, context) {
         });
     }
     else {
-        if (matches.length > 1) {
+        if (configMatches.length > 1) {
             console.debug(`Found multiple matches for package "${packageName}" in cloudpack.config.json. Using the first match.`);
         }
         // Use the first match.
-        matches[0].exports ??= {};
-        // Add the single new exports entry.
-        await addExportsMapEntry({
-            exports: matches[0].exports,
+        configMatches[0].exports ??= {};
+        const flattenedMatchExports = flattenExportsMap(configMatches[0].exports);
+        // Return false if the import path already exists in the match exports map.
+        if (flattenedMatchExports[safeRelativePath(importPath)]) {
+            console.debug(`The import path "${importPath}" already exists in the config exports map for "${packageName}".`);
+            return addedEntry;
+        }
+        // Add the single new exports entry to the match exports map.
+        addedEntry = await addExportsMapEntry({
+            exports: configMatches[0].exports,
             packagePath: entry.path,
             importPath,
         }, { packages, config: session.config });
     }
     // Write config.
-    await writeUserConfig(config, session.appPath);
-    console.debug(`Added override for "${packageName}" to "cloudpack.config.json".`);
-    // Remove the cached package definition, so that transforms can respect the modification to the exports map.
-    packages.resetPackage(entry.path);
+    if (addedEntry) {
+        await writeUserConfig(config, session.appPath);
+        console.debug(`Added override for "${packageName}" to "cloudpack.config.json".`);
+    }
+    else {
+        console.warn(`Unable to add override for package ${packageName} to "cloudpack.config.json". The file ${safeRelativePath(importPath)} could not be found. Please check the import path and try again.`);
+    }
+    return addedEntry;
 }
 //# sourceMappingURL=addOverride.js.map

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 { readUserConfig, writeUserConfig, checkMatch } from '@ms-cloudpack/config';\nimport { addExportsMapEntry, findResolveMapEntry, getExportsMap } from '@ms-cloudpack/package-utilities';\nimport { parseRequestUrl } from './parseRequestUrl.js';\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 user config, rather\n * than generated configs which could get \"reset\" on `init --reset`.\n */\nexport async function addOverride(options: OverrideOptions, context: Pick<Context, 'packages' | 'session'>) {\n  const { packageName, importPath, issuerUrl } = options;\n  const { session, packages } = context;\n  let definition = undefined;\n\n  if (issuerUrl) {\n    const { packageName: name, version } = parseRequestUrl(issuerUrl);\n    definition = { name, version };\n  }\n\n  const entry = findResolveMapEntry({\n    packageName,\n    resolveMap: session.resolveMap,\n    definition,\n  });\n\n  if (!entry) {\n    console.error(`Could not find entry of package \"${packageName}\" in resolve map`);\n    return;\n  }\n\n  // Parse the user config if it exists.\n  const config = await readUserConfig(session.appPath);\n\n  // Ensure packageSettings exist.\n  config.packageSettings ??= [];\n\n  const matches = config.packageSettings.filter(({ match }) =>\n    checkMatch({ name: packageName, version: entry.version, match, firstMatch: true }),\n  );\n\n  if (!matches.length) {\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: entry.path }, { packages, config: session.config });\n\n    // Add the single new exports entry.\n    await addExportsMapEntry(\n      {\n        exports,\n        packagePath: entry.path,\n        importPath,\n      },\n      { packages, config: session.config },\n    );\n    config.packageSettings.push({\n      match: {\n        name: packageName,\n        version: entry.version?.match(/^\\d+\\.\\d+\\.\\d+(-[a-z0-9.-]+)?$/) ? `^${entry.version}` : undefined,\n      },\n      exports,\n    });\n  } else {\n    if (matches.length > 1) {\n      console.debug(\n        `Found multiple matches for package \"${packageName}\" in cloudpack.config.json. Using the first match.`,\n      );\n    }\n    // Use the first match.\n    matches[0].exports ??= {};\n    // Add the single new exports entry.\n    await addExportsMapEntry(\n      {\n        exports: matches[0].exports,\n        packagePath: entry.path,\n        importPath,\n      },\n      { packages, config: session.config },\n    );\n  }\n\n  // Write config.\n  await writeUserConfig(config, session.appPath);\n\n  console.debug(`Added override for \"${packageName}\" to \"cloudpack.config.json\".`);\n\n  // Remove the cached package definition, so that transforms can respect the modification to the exports map.\n  packages.resetPackage(entry.path);\n}\n"]}
+{"version":3,"file":"addOverride.js","sourceRoot":"","sources":["../../src/utilities/addOverride.ts"],"names":[],"mappings":"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","sourcesContent":["import { checkMatch, readUserConfig, writeUserConfig } from '@ms-cloudpack/config';\nimport {\n  addExportsMapEntry,\n  findResolveMapEntry,\n  flattenExportsMap,\n  getExportsMap,\n} from '@ms-cloudpack/package-utilities';\nimport { parseRequestUrl } from './parseRequestUrl.js';\nimport type { Context } from '../types/Context.js';\nimport type { OverrideOptions } from '../types/OverrideOptions.js';\nimport { safeRelativePath } from '@ms-cloudpack/path-string-parsing';\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 user config, rather\n * than generated configs which could get \"reset\" on `init --reset`.\n */\nexport async function addOverride(\n  options: OverrideOptions,\n  context: Pick<Context, 'packages' | 'session'>,\n): Promise<boolean> {\n  const { packageName, importPath, issuerUrl } = options;\n  const { session, packages } = context;\n  let definition = undefined;\n  let addedEntry = false;\n\n  if (issuerUrl) {\n    const { packageName: name, version } = parseRequestUrl(issuerUrl);\n    definition = { name, version };\n  }\n\n  const entry = findResolveMapEntry({\n    packageName,\n    resolveMap: session.resolveMap,\n    definition,\n  });\n\n  if (!entry) {\n    console.error(`Could not find entry of package \"${packageName}\" in resolve map`);\n    return addedEntry;\n  }\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: entry.path }, { packages, config: session.config });\n  const flattenedExports = flattenExportsMap(exports);\n\n  // Return false if the import path already exists in the exports map.\n  if (flattenedExports[safeRelativePath(importPath)]) {\n    console.debug(`The import path \"${importPath}\" already exists in the exports map for \"${packageName}\".`);\n    return addedEntry;\n  }\n\n  // Add the single new exports entry to the exports map.\n  addedEntry = await addExportsMapEntry(\n    {\n      exports,\n      packagePath: entry.path,\n      importPath,\n    },\n    { packages, config: session.config },\n  );\n\n  // Parse the user config if it exists.\n  const config = await readUserConfig(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, firstMatch: true }),\n  );\n\n  if (!configMatches.length) {\n    config.packageSettings.push({\n      match: {\n        name: packageName,\n        version: entry.version?.match(/^\\d+\\.\\d+\\.\\d+(-[a-z0-9.-]+)?$/) ? `^${entry.version}` : undefined,\n      },\n      exports,\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    // Use the first match.\n    configMatches[0].exports ??= {};\n\n    const flattenedMatchExports = flattenExportsMap(configMatches[0].exports);\n\n    // Return false if the import path already exists in the match exports map.\n    if (flattenedMatchExports[safeRelativePath(importPath)]) {\n      console.debug(`The import path \"${importPath}\" already exists in the config exports map for \"${packageName}\".`);\n      return addedEntry;\n    }\n\n    // Add the single new exports entry to the match exports map.\n    addedEntry = await addExportsMapEntry(\n      {\n        exports: configMatches[0].exports,\n        packagePath: entry.path,\n        importPath,\n      },\n      { packages, config: session.config },\n    );\n  }\n\n  // Write config.\n  if (addedEntry) {\n    await writeUserConfig(config, session.appPath);\n    console.debug(`Added override for \"${packageName}\" to \"cloudpack.config.json\".`);\n  } else {\n    console.warn(\n      `Unable to add override for package ${packageName} to \"cloudpack.config.json\". The file ${safeRelativePath(\n        importPath,\n      )} could not be found. Please check the import path and try again.`,\n    );\n  }\n\n  return addedEntry;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/api-server",
-  "version": "0.29.21",
+  "version": "0.30.1",
   "description": "An implementation of the API server that does interacts with a task scheduler.",
   "license": "MIT",
   "type": "module",
@@ -28,16 +28,16 @@
     "@lage-run/scheduler": "^1.1.9",
     "@lage-run/target-graph": "^0.8.9",
     "@lage-run/hasher": "^1.0.5",
-    "@ms-cloudpack/bundler": "^0.17.24",
-    "@ms-cloudpack/bundler-types": "^0.23.12",
-    "@ms-cloudpack/config": "^0.17.19",
+    "@ms-cloudpack/bundler": "^0.17.26",
+    "@ms-cloudpack/bundler-types": "^0.24.0",
+    "@ms-cloudpack/config": "^0.17.21",
     "@ms-cloudpack/config-types": "^0.4.3",
     "@ms-cloudpack/create-express-app": "^1.4.0",
     "@ms-cloudpack/data-bus": "^0.4.2",
     "@ms-cloudpack/file-watcher": "^0.1.2",
     "@ms-cloudpack/json-utilities": "^0.1.3",
-    "@ms-cloudpack/package-hashes": "^0.3.16",
-    "@ms-cloudpack/package-utilities": "^5.8.1",
+    "@ms-cloudpack/package-hashes": "^0.3.18",
+    "@ms-cloudpack/package-utilities": "^5.8.2",
     "@ms-cloudpack/path-string-parsing": "^1.1.3",
     "@ms-cloudpack/path-utilities": "^2.5.0",
     "@ms-cloudpack/task-reporter": "^0.11.1",