@ms-cloudpack/api-server 0.63.10 → 0.64.0

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  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"]}
+{"version":3,"file":"TaskRunner.js","sourceRoot":"","sources":["../../src/utilities/TaskRunner.ts"],"names":[],"mappings":"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","sourcesContent":["import type { DataBus } from '@ms-cloudpack/data-bus';\nimport PQueue from 'p-queue';\nimport { taskListSource, taskStatsSource } from '../data/busSources.js';\nimport type { Task, TaskEndDescription } from '../types/Task.js';\nimport type { TaskDescription } from '../types/TaskDescription.js';\nimport type { TaskList } from '../types/TaskList.js';\nimport type { TaskStats } from '../types/TaskStats.js';\n\ninterface TaskIssueStats extends Pick<TaskStats, 'totalErrors' | 'totalWarnings'> {\n  /** Mapping from ID to count */\n  taskWarnings: Record<string, number>;\n  /** Mapping from ID to count */\n  taskErrors: Record<string, number>;\n}\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 * (`createPartialApiContext` does not create or connect a data bus.)\n */\nexport class TaskRunner {\n  private _bus: DataBus | undefined;\n  private readonly _queue: PQueue;\n  /** Stats about task errors/warnings, only updated if a bus is connected */\n  private _taskIssues: TaskIssueStats;\n  /**\n   * Tasks that are currently either running or waiting. (Note that `PQeueue`'s definition of\n   * \"pending\" is slightly different: it only counts tasks that are currently running.)\n   */\n  private readonly _pendingTasks: Map<string, Promise<unknown>>;\n  /** Tasks that have completed */\n  private readonly _completedTasks: Map<string, unknown>;\n  /**\n   * Task IDs where a re-run was requested while the task was running.\n   * We let the current task finish, and then re-run it.\n   */\n  private readonly _requiresRerun: Set<string>;\n  /** All previously-seen tasks (regardless of state) */\n  private readonly _allTasks: Map<string, Task<unknown>>;\n\n  constructor() {\n    this._queue = new PQueue({ concurrency: 10 });\n    this._taskIssues = { totalErrors: 0, totalWarnings: 0, taskWarnings: {}, taskErrors: {} };\n    this._pendingTasks = new Map();\n    this._completedTasks = new Map();\n    this._requiresRerun = new Set();\n    this._allTasks = new Map();\n  }\n\n  /**\n   * Get current task stats. Public for testing.\n   * @internal\n   */\n  get _taskStats(): Readonly<TaskStats> {\n    return {\n      status: this._pendingTasks.size ? 'pending' : 'idle',\n      remainingTasks: this._pendingTasks.size,\n      totalTasks: this._allTasks.size,\n      totalErrors: this._taskIssues.totalErrors,\n      totalWarnings: this._taskIssues.totalWarnings,\n    };\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   * (Note that any re-runs will use the *original* task function, not the new one.\n   * If something has changed that requires a new task function, you should incorporate this\n   * into the `id`.)\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._allTasks.has(id)) {\n      this._allTasks.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      let taskError: unknown;\n\n      try {\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      } catch (error) {\n        taskError = error;\n        // Re-throw the error, but `finally` will handle completion\n        throw error;\n      } finally {\n        // Delete from pending list.\n        this._pendingTasks.delete(id);\n\n        this._reportEnd(task, taskResult, taskError);\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    const wasCompleted = this._completedTasks.delete(id);\n    if (wasCompleted) {\n      this._removeTaskIssues(task.id);\n    }\n\n    this._reportStart<TReturn>(task);\n\n    return resultPromise;\n  }\n\n  /**\n   * Dispose in-memory resources of all tasks and clear the TaskRunner's state.\n   */\n  // NOTE: This is also used by clearAllResults(), so if it's updated to do anything that\n  // renders the TaskRunner unusable/finished, the common parts should be refactored out.\n  dispose(): void {\n    this._queue.clear();\n    for (const task of this._allTasks.values()) {\n      task.dispose?.();\n    }\n    this._allTasks.clear();\n    this._pendingTasks.clear();\n    this._completedTasks.clear();\n    this._requiresRerun.clear();\n    this._taskIssues = { totalErrors: 0, totalWarnings: 0, taskWarnings: {}, taskErrors: {} };\n  }\n\n  /**\n   * Clear the result of a specific task (could involve deleting files from disk) and remove\n   * it from the TaskRunner's task records.\n   */\n  async clearResult(id: string): Promise<void> {\n    const task = this._allTasks.get(id);\n    task?.dispose?.();\n    await task?.clear?.();\n\n    this._allTasks.delete(id);\n    this._requiresRerun.delete(id);\n    this._pendingTasks.delete(id);\n    this._completedTasks.delete(id);\n    this._removeTaskIssues(id);\n\n    if (this._bus) {\n      const { tasks, index } = this._findFromTaskList(id);\n      if (index !== -1) {\n        tasks.splice(index, 1);\n        this._publishUpdates({ tasks, stats: true });\n      }\n    }\n  }\n\n  /**\n   * Clear the results of all tasks (might include deleting files on disk) and clear the\n   * TaskRunner's task records.\n   *\n   * (To only dispose in-memory resources, use `dispose()`.)\n   */\n  async clearAllResults(): Promise<void> {\n    // Publish the empty task list first since deleting things might take awhile.\n    this._publishUpdates({ tasks: [] });\n\n    for (const task of this._allTasks.values()) {\n      task.dispose?.();\n      await task.clear?.();\n    }\n    this.dispose();\n\n    // Publish new stats after clearing everything (otherwise the calculated values will be wrong)\n    this._publishUpdates({ stats: true });\n  }\n\n  /**\n   * Pauses the TaskRunner (for testing).\n   * @internal\n   */\n  _pause(): void {\n    this._queue.pause();\n  }\n\n  /**\n   * Starts or resumes the TaskRunner (for testing).\n   * @internal\n   */\n  _start(): void {\n    this._queue.start();\n  }\n\n  /** Remove any records of previous issues with this task from the totals */\n  private _removeTaskIssues(id: string): void {\n    this._taskIssues.totalErrors -= this._taskIssues.taskErrors[id] || 0;\n    this._taskIssues.totalWarnings -= this._taskIssues.taskWarnings[id] || 0;\n    delete this._taskIssues.taskErrors[id];\n    delete this._taskIssues.taskWarnings[id];\n  }\n\n  /**\n   * Internal method to report the start of a task to the bus.\n   */\n  private _reportStart<TReturn>(task: Task<TReturn>): void {\n    if (!this._bus || !task.getStartDescription) return;\n\n    const { tasks, index } = this._findFromTaskList(task.id);\n\n    const taskDesc: TaskDescription = {\n      id: task.id,\n      name: task.name,\n      ...task.getStartDescription(),\n      status: 'pending',\n      startTime: Date.now(),\n    };\n    if (index === -1) {\n      tasks.push(taskDesc);\n    } else {\n      tasks[index] = taskDesc;\n    }\n\n    this._publishUpdates({ tasks, stats: true });\n  }\n\n  /**\n   * Internal method to report the end of a task to the bus.\n   */\n  private _reportEnd<TReturn>(task: Task<TReturn>, taskResult: TReturn | undefined, taskError: unknown): void {\n    if (!this._bus || !task.getEndDescription) return;\n\n    // Replace the usual description with an error if relevant\n    const description: TaskEndDescription = taskError\n      ? {\n          errors: [\n            {\n              source: 'running task',\n              text: taskError instanceof Error ? taskError.stack || taskError.message : String(taskError),\n            },\n          ],\n        }\n      : task.getEndDescription(taskResult);\n    const errorCount = description.errors?.length || 0;\n    const warningCount = description.warnings?.length || 0;\n    if (errorCount) {\n      this._taskIssues.taskErrors[task.id] = errorCount;\n      this._taskIssues.totalErrors += errorCount;\n    }\n    if (warningCount) {\n      this._taskIssues.taskWarnings[task.id] = warningCount;\n      this._taskIssues.totalWarnings += warningCount;\n    }\n\n    const { tasks, index } = this._findFromTaskList(task.id);\n    const startDescription = tasks[index];\n\n    if (startDescription) {\n      const now = Date.now();\n      tasks[index] = {\n        ...startDescription,\n        ...description,\n        status: 'complete',\n        duration: now - startDescription.startTime,\n        lastUpdated: now,\n      };\n\n      this._publishUpdates({ tasks, stats: true });\n    }\n  }\n\n  /** Get the task list from the data bus, and find the task's index. */\n  private _findFromTaskList(id: string): { tasks: TaskDescription[]; index: number } {\n    const tasks = this._bus?.getData<TaskList>(taskListSource.path)?.tasks || [];\n    const index = tasks.findIndex((t) => t.id === id);\n    return { tasks, index };\n  }\n\n  /**\n   * Publish tasks and/or stats to the data bus.\n   */\n  private _publishUpdates(params: { tasks?: TaskDescription[]; stats?: boolean }): void {\n    const { tasks, stats } = params;\n    // Publish using .path for easier testing\n    stats && this._bus?.publish<TaskStats>(taskStatsSource.path, this._taskStats);\n    tasks && this._bus?.publish<TaskList>(taskListSource.path, { tasks });\n  }\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"createBundleTask.d.ts","sourceRoot":"","sources":["../../src/utilities/createBundleTask.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAc,KAAK,iBAAiB,EAAE,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAC7F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,iBAAiB,EAC1B,OAAO,EAAE,iBAAiB,GACxB,cAAc,CAAC,eAAe,EAAE,MAAM,iBAAiB,CAAC,SAAS,CAAC,GAAG,WAAW,GAAG,oBAAoB,GAAG,MAAM,CAAC,GAClH,IAAI,CAAC,aAAa,CAAC,CAkErB"}
+{"version":3,"file":"createBundleTask.d.ts","sourceRoot":"","sources":["../../src/utilities/createBundleTask.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAc,KAAK,iBAAiB,EAAE,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAC7F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,iBAAiB,EAC1B,OAAO,EAAE,iBAAiB,GACxB,cAAc,CAAC,eAAe,EAAE,MAAM,iBAAiB,CAAC,SAAS,CAAC,GAAG,WAAW,GAAG,oBAAoB,GAAG,MAAM,CAAC,GAClH,IAAI,CAAC,aAAa,CAAC,CA6DrB"}

package/lib/utilities/createBundleTask.js

@@ -1,6 +1,5 @@
 import { addImportMapHash } from '@ms-cloudpack/import-map';
-import fs from 'fs';
-import path from 'path';
+import fsPromises from 'fs/promises';
 import { bundleTask } from './bundleTask.js';
 /**
  * Create a bundle task (internally calls `bundleTask()`) that can be executed by the server's TaskRunner.
@@ -16,8 +15,6 @@ export function createBundleTask(options, context) {
         // Name for task runner logging.
         name,
         id,
-        dir: `${path.join(packagePath, 'src')}`,
-        watch: !isExternal,
         async execute() {
             await bundleTask(options, context);
             try {
@@ -35,34 +32,31 @@ export function createBundleTask(options, context) {
             }
             return bundleRequest;
         },
-        clear: () => {
-            if (!bundleRequest.result?.outputPath) {
+        clear: async () => {
+            if (!bundleRequest.result) {
                 return;
             }
             bundleRequest.result.dispose?.();
             try {
-                fs.rmSync(bundleRequest.result.outputPath, { recursive: true, force: true });
+                if (bundleRequest.result.outputPath) {
+                    await fsPromises.rm(bundleRequest.result.outputPath, { recursive: true, force: true, maxRetries: 2 });
+                }
             }
             catch {
                 console.warn(`Error clearing bundle output path (likely due to a file lock): ${bundleRequest.result.outputPath}`);
             }
             bundleRequest.result = undefined;
         },
-        onDispose: () => {
+        dispose: () => {
             bundleRequest.result?.dispose?.();
         },
-        getErrors: () => bundleRequest.result?.errors,
         getStartDescription: () => ({
-            id,
-            // Name to display in the overlay.
-            name,
-            inputPath: packagePath || '',
+            inputPath: packagePath,
         }),
         getEndDescription: (taskResult) => ({
-            id,
             errors: taskResult?.result?.errors,
             warnings: taskResult?.result?.warnings,
-            outputPath: bundleRequest.result?.outputPath || '',
+            outputPath: bundleRequest.result?.outputPath,
         }),
     };
 }

package/lib/utilities/createBundleTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"createBundleTask.js","sourceRoot":"","sources":["../../src/utilities/createBundleTask.ts"],"names":[],"mappings":"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","sourcesContent":["import { addImportMapHash } from '@ms-cloudpack/import-map';\nimport fs from 'fs';\nimport path from 'path';\nimport type { BundleRequest } from '../types/BundleRequest.js';\nimport type { Task } from '../types/Task.js';\nimport { bundleTask, type BundleTaskContext, type BundleTaskOptions } from './bundleTask.js';\nimport type { PartialContext } from '../types/Context.js';\n\n/**\n * Create a bundle task (internally calls `bundleTask()`) that can be executed by the server's TaskRunner.\n * This allows active tasks to be tracked remotely (e.g. in the browser) and allows the user to cancel tasks.\n */\nexport function createBundleTask(\n  options: BundleTaskOptions,\n  context: BundleTaskContext &\n    PartialContext<'packageHashes', keyof BundleTaskContext['session'] | 'importMap' | 'packageImportPaths' | 'urls'>,\n): Task<BundleRequest> {\n  const { bundleRequest } = options;\n  const { id, packageName, version, packagePath, isExternal, targetEnvironment } = bundleRequest;\n  const { packageHashes, session } = context;\n  const { hash, sourceHash } = options;\n  const name = `Bundle ${packageName}@${version}`;\n\n  return {\n    // Name for task runner logging.\n    name,\n    id,\n    dir: `${path.join(packagePath, 'src')}`,\n    watch: !isExternal,\n    async execute(): Promise<BundleRequest> {\n      await bundleTask(options, context);\n\n      try {\n        // Add a hash to the import map for this package.\n        // (Read the session properties here rather than above because they might not be set yet.)\n        if (session.importMap && session.urls.bundleServer && session.urls.appServer) {\n          const importMapHash =\n            sourceHash ||\n            hash ||\n            (await packageHashes.get({ packagePath, isSourceHashingEnabled: !isExternal, targetEnvironment }));\n          addImportMapHash({ packageName, version, hash: importMapHash }, context);\n        }\n      } catch (e) {\n        console.error(`Error adding hash to import map for ${bundleRequest.packagePath}:`, (e as Error).stack || e);\n      }\n\n      return bundleRequest;\n    },\n    clear: () => {\n      if (!bundleRequest.result?.outputPath) {\n        return;\n      }\n\n      bundleRequest.result.dispose?.();\n\n      try {\n        fs.rmSync(bundleRequest.result.outputPath, { recursive: true, force: true });\n      } catch {\n        console.warn(\n          `Error clearing bundle output path (likely due to a file lock): ${bundleRequest.result.outputPath}`,\n        );\n      }\n\n      bundleRequest.result = undefined;\n    },\n    onDispose: () => {\n      bundleRequest.result?.dispose?.();\n    },\n    getErrors: () => bundleRequest.result?.errors,\n    getStartDescription: () => ({\n      id,\n      // Name to display in the overlay.\n      name,\n      inputPath: packagePath || '',\n    }),\n    getEndDescription: (taskResult) => ({\n      id,\n      errors: taskResult?.result?.errors,\n      warnings: taskResult?.result?.warnings,\n      outputPath: bundleRequest.result?.outputPath || '',\n    }),\n  };\n}\n"]}
+{"version":3,"file":"createBundleTask.js","sourceRoot":"","sources":["../../src/utilities/createBundleTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,UAAU,MAAM,aAAa,CAAC;AAGrC,OAAO,EAAE,UAAU,EAAkD,MAAM,iBAAiB,CAAC;AAG7F;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAC9B,OAA0B,EAC1B,OACmH;IAEnH,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAClC,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,GAAG,aAAa,CAAC;IAC/F,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC3C,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IACrC,MAAM,IAAI,GAAG,UAAU,WAAW,IAAI,OAAO,EAAE,CAAC;IAEhD,OAAO;QACL,gCAAgC;QAChC,IAAI;QACJ,EAAE;QACF,KAAK,CAAC,OAAO;YACX,MAAM,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAEnC,IAAI,CAAC;gBACH,iDAAiD;gBACjD,0FAA0F;gBAC1F,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;oBAC7E,MAAM,aAAa,GACjB,UAAU;wBACV,IAAI;wBACJ,CAAC,MAAM,aAAa,CAAC,GAAG,CAAC,EAAE,WAAW,EAAE,sBAAsB,EAAE,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC;oBACrG,gBAAgB,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,OAAO,CAAC,CAAC;gBAC3E,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,KAAK,CAAC,uCAAuC,aAAa,CAAC,WAAW,GAAG,EAAG,CAAW,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;YAC9G,CAAC;YAED,OAAO,aAAa,CAAC;QACvB,CAAC;QACD,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;gBAC1B,OAAO;YACT,CAAC;YAED,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;YAEjC,IAAI,CAAC;gBACH,IAAI,aAAa,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;oBACpC,MAAM,UAAU,CAAC,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC;gBACxG,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,CAAC,IAAI,CACV,kEAAkE,aAAa,CAAC,MAAM,CAAC,UAAU,EAAE,CACpG,CAAC;YACJ,CAAC;YAED,aAAa,CAAC,MAAM,GAAG,SAAS,CAAC;QACnC,CAAC;QACD,OAAO,EAAE,GAAG,EAAE;YACZ,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC;QACpC,CAAC;QACD,mBAAmB,EAAE,GAAG,EAAE,CAAC,CAAC;YAC1B,SAAS,EAAE,WAAW;SACvB,CAAC;QACF,iBAAiB,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YAClC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM;YAClC,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ;YACtC,UAAU,EAAE,aAAa,CAAC,MAAM,EAAE,UAAU;SAC7C,CAAC;KACH,CAAC;AACJ,CAAC","sourcesContent":["import { addImportMapHash } from '@ms-cloudpack/import-map';\nimport fsPromises from 'fs/promises';\nimport type { BundleRequest } from '../types/BundleRequest.js';\nimport type { Task } from '../types/Task.js';\nimport { bundleTask, type BundleTaskContext, type BundleTaskOptions } from './bundleTask.js';\nimport type { PartialContext } from '../types/Context.js';\n\n/**\n * Create a bundle task (internally calls `bundleTask()`) that can be executed by the server's TaskRunner.\n * This allows active tasks to be tracked remotely (e.g. in the browser) and allows the user to cancel tasks.\n */\nexport function createBundleTask(\n  options: BundleTaskOptions,\n  context: BundleTaskContext &\n    PartialContext<'packageHashes', keyof BundleTaskContext['session'] | 'importMap' | 'packageImportPaths' | 'urls'>,\n): Task<BundleRequest> {\n  const { bundleRequest } = options;\n  const { id, packageName, version, packagePath, isExternal, targetEnvironment } = bundleRequest;\n  const { packageHashes, session } = context;\n  const { hash, sourceHash } = options;\n  const name = `Bundle ${packageName}@${version}`;\n\n  return {\n    // Name for task runner logging.\n    name,\n    id,\n    async execute(): Promise<BundleRequest> {\n      await bundleTask(options, context);\n\n      try {\n        // Add a hash to the import map for this package.\n        // (Read the session properties here rather than above because they might not be set yet.)\n        if (session.importMap && session.urls.bundleServer && session.urls.appServer) {\n          const importMapHash =\n            sourceHash ||\n            hash ||\n            (await packageHashes.get({ packagePath, isSourceHashingEnabled: !isExternal, targetEnvironment }));\n          addImportMapHash({ packageName, version, hash: importMapHash }, context);\n        }\n      } catch (e) {\n        console.error(`Error adding hash to import map for ${bundleRequest.packagePath}:`, (e as Error).stack || e);\n      }\n\n      return bundleRequest;\n    },\n    clear: async () => {\n      if (!bundleRequest.result) {\n        return;\n      }\n\n      bundleRequest.result.dispose?.();\n\n      try {\n        if (bundleRequest.result.outputPath) {\n          await fsPromises.rm(bundleRequest.result.outputPath, { recursive: true, force: true, maxRetries: 2 });\n        }\n      } catch {\n        console.warn(\n          `Error clearing bundle output path (likely due to a file lock): ${bundleRequest.result.outputPath}`,\n        );\n      }\n\n      bundleRequest.result = undefined;\n    },\n    dispose: () => {\n      bundleRequest.result?.dispose?.();\n    },\n    getStartDescription: () => ({\n      inputPath: packagePath,\n    }),\n    getEndDescription: (taskResult) => ({\n      errors: taskResult?.result?.errors,\n      warnings: taskResult?.result?.warnings,\n      outputPath: bundleRequest.result?.outputPath,\n    }),\n  };\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"getConsumedDependencies.d.ts","sourceRoot":"","sources":["../../src/utilities/getConsumedDependencies.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,CAWrE"}
+{"version":3,"file":"getConsumedDependencies.d.ts","sourceRoot":"","sources":["../../src/utilities/getConsumedDependencies.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,CAcrE"}

package/lib/utilities/getConsumedDependencies.js

@@ -7,6 +7,9 @@ export function getConsumedDependencies(info) {
     const consumedDependencies = new Set();
     // Iterate through imports and find their path from the resolve map.
     for (const entryInfo of Object.values(info)) {
+        if (!entryInfo) {
+            continue; // This is to make type-checking happy
+        }
         // iterate through all package names of result.info.consumes
         for (const consume of entryInfo.consumes) {
             consumedDependencies.add(consume.packageName);

package/lib/utilities/getConsumedDependencies.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"getConsumedPaths.d.ts","sourceRoot":"","sources":["../../src/utilities/getConsumedPaths.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAY9E"}
+{"version":3,"file":"getConsumedPaths.d.ts","sourceRoot":"","sources":["../../src/utilities/getConsumedPaths.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAe9E"}

package/lib/utilities/getConsumedPaths.js

@@ -7,6 +7,9 @@ export function getConsumedPaths(info) {
     const consumedPaths = {};
     // Iterate through imports and find their path from the resolve map.
     for (const entryInfo of Object.values(info)) {
+        if (!entryInfo) {
+            continue; // This is to make type-checking happy
+        }
         // iterate through all package names of result.info.consumes
         for (const consume of entryInfo.consumes) {
             consumedPaths[consume.packageName] ??= new Set();

package/lib/utilities/getConsumedPaths.js.map

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

package/lib/utilities/matchingZodObject.d.ts

@@ -1,19 +1,25 @@
-import { z } from 'zod';
+import { z } from 'zod/v4-mini';
 /**
  * Zod shape object matching type `T`, with any optional properties remapped to required properties
  * with type `originalType | undefined`.
  */
-type MatchingZodShape<T extends object> = {
-    [k in keyof Required<T>]: z.ZodType<T[k]>;
+export type MatchingZodShape<T extends object> = {
+    [K in keyof Required<T>]: Omit<T, K> extends T ? z.ZodMiniOptional<z.ZodMiniType<T[K], T[K]>> : z.ZodMiniType<T[K], T[K]>;
 };
-type MatchingZodObject<T extends object> = z.ZodObject<MatchingZodShape<T>, 'strict', z.ZodTypeAny, T, T>;
 /**
  * Get a Zod object that strictly matches the expected type, including any optional properties.
+ * (Does not provide the same guarantee for nested object types.)
  *
- * Defining TS types first and using this helper to ensure matching zod objects (rather than
- * defining the zod type first and using `infer`) helps reduce type explosion in intellisense
- * and API reports, and allows reusing types that are already defined elsewhere.
+ * Using this helper instead of `const ZodFoo = z.object({...}); type Foo = z.infer<typeof ZodFoo>;`
+ * is recommended in cases where the original type is defined elsewhere (such as in `common-types`),
+ * to ensure all the properties stay in sync.
  */
-export declare function matchingZodObject<Expected extends object>(shape: MatchingZodShape<Expected>): MatchingZodObject<Expected>;
-export {};
+export declare function matchingZodObject<Expected extends object>(shape: MatchingZodShape<Expected>): z.ZodMiniObject<MatchingZodShape<Expected>, z.core.$strict>;
+/**
+ * Like `matchingZodObject`, but pass through any extra properties that aren't defined in the shape.
+ * (The return type omits the index signature to ensure that the shape is still strictly typed.)
+ *
+ * See `matchingZodObject` comment for more details.
+ */
+export declare function matchingZodObjectLoose<Expected extends object>(shape: MatchingZodShape<Expected>): z.ZodMiniObject<MatchingZodShape<Expected>, z.core.$loose>;
 //# sourceMappingURL=matchingZodObject.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"matchingZodObject.d.ts","sourceRoot":"","sources":["../../src/utilities/matchingZodObject.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;GAGG;AACH,KAAK,gBAAgB,CAAC,CAAC,SAAS,MAAM,IAAI;KACvC,CAAC,IAAI,MAAM,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAC1C,CAAC;AAEF,KAAK,iBAAiB,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAE1G;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,SAAS,MAAM,EACvD,KAAK,EAAE,gBAAgB,CAAC,QAAQ,CAAC,GAChC,iBAAiB,CAAC,QAAQ,CAAC,CAG7B"}
+{"version":3,"file":"matchingZodObject.d.ts","sourceRoot":"","sources":["../../src/utilities/matchingZodObject.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,aAAa,CAAC;AAEhC;;;GAGG;AACH,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,MAAM,IAAI;KAG9C,CAAC,IAAI,MAAM,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,GAE1C,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAC5C,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;CAC9B,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,SAAS,MAAM,EAAE,KAAK,EAAE,gBAAgB,CAAC,QAAQ,CAAC,+DAE3F;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,SAAS,MAAM,EAAE,KAAK,EAAE,gBAAgB,CAAC,QAAQ,CAAC,8DAEhG"}

package/lib/utilities/matchingZodObject.js

@@ -1,13 +1,23 @@
-import { z } from 'zod';
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+import { z } from 'zod/v4-mini';
 /**
  * Get a Zod object that strictly matches the expected type, including any optional properties.
+ * (Does not provide the same guarantee for nested object types.)
  *
- * Defining TS types first and using this helper to ensure matching zod objects (rather than
- * defining the zod type first and using `infer`) helps reduce type explosion in intellisense
- * and API reports, and allows reusing types that are already defined elsewhere.
+ * Using this helper instead of `const ZodFoo = z.object({...}); type Foo = z.infer<typeof ZodFoo>;`
+ * is recommended in cases where the original type is defined elsewhere (such as in `common-types`),
+ * to ensure all the properties stay in sync.
  */
 export function matchingZodObject(shape) {
-    // Cast the return value to convert back to the original type with optional properties
-    return z.object(shape).strict();
+    return z.strictObject(shape);
+}
+/**
+ * Like `matchingZodObject`, but pass through any extra properties that aren't defined in the shape.
+ * (The return type omits the index signature to ensure that the shape is still strictly typed.)
+ *
+ * See `matchingZodObject` comment for more details.
+ */
+export function matchingZodObjectLoose(shape) {
+    return z.looseObject(shape);
 }
 //# sourceMappingURL=matchingZodObject.js.map

package/lib/utilities/matchingZodObject.js.map

@@ -1 +1 @@
-{"version":3,"file":"matchingZodObject.js","sourceRoot":"","sources":["../../src/utilities/matchingZodObject.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAYxB;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAC/B,KAAiC;IAEjC,sFAAsF;IACtF,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,EAAiC,CAAC;AACjE,CAAC","sourcesContent":["import { z } from 'zod';\n\n/**\n * Zod shape object matching type `T`, with any optional properties remapped to required properties\n * with type `originalType | undefined`.\n */\ntype MatchingZodShape<T extends object> = {\n  [k in keyof Required<T>]: z.ZodType<T[k]>;\n};\n\ntype MatchingZodObject<T extends object> = z.ZodObject<MatchingZodShape<T>, 'strict', z.ZodTypeAny, T, T>;\n\n/**\n * Get a Zod object that strictly matches the expected type, including any optional properties.\n *\n * Defining TS types first and using this helper to ensure matching zod objects (rather than\n * defining the zod type first and using `infer`) helps reduce type explosion in intellisense\n * and API reports, and allows reusing types that are already defined elsewhere.\n */\nexport function matchingZodObject<Expected extends object>(\n  shape: MatchingZodShape<Expected>,\n): MatchingZodObject<Expected> {\n  // Cast the return value to convert back to the original type with optional properties\n  return z.object(shape).strict() as MatchingZodObject<Expected>;\n}\n"]}
+{"version":3,"file":"matchingZodObject.js","sourceRoot":"","sources":["../../src/utilities/matchingZodObject.ts"],"names":[],"mappings":"AAAA,sEAAsE;AACtE,OAAO,EAAE,CAAC,EAAE,MAAM,aAAa,CAAC;AAehC;;;;;;;GAOG;AACH,MAAM,UAAU,iBAAiB,CAA0B,KAAiC;IAC1F,OAAO,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;AAC/B,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,sBAAsB,CAA0B,KAAiC;IAC/F,OAAO,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC9B,CAAC","sourcesContent":["/* eslint-disable @typescript-eslint/explicit-module-boundary-types */\nimport { z } from 'zod/v4-mini';\n\n/**\n * Zod shape object matching type `T`, with any optional properties remapped to required properties\n * with type `originalType | undefined`.\n */\nexport type MatchingZodShape<T extends object> = {\n  // Use Required<T> in the mapping to ensure that all properties (including optional) are\n  // included in the input zod shape.\n  [K in keyof Required<T>]: Omit<T, K> extends T\n    ? // If K is optional in T, make it a ZodOptional\n      z.ZodMiniOptional<z.ZodMiniType<T[K], T[K]>>\n    : z.ZodMiniType<T[K], T[K]>;\n};\n\n/**\n * Get a Zod object that strictly matches the expected type, including any optional properties.\n * (Does not provide the same guarantee for nested object types.)\n *\n * Using this helper instead of `const ZodFoo = z.object({...}); type Foo = z.infer<typeof ZodFoo>;`\n * is recommended in cases where the original type is defined elsewhere (such as in `common-types`),\n * to ensure all the properties stay in sync.\n */\nexport function matchingZodObject<Expected extends object>(shape: MatchingZodShape<Expected>) {\n  return z.strictObject(shape);\n}\n\n/**\n * Like `matchingZodObject`, but pass through any extra properties that aren't defined in the shape.\n * (The return type omits the index signature to ensure that the shape is still strictly typed.)\n *\n * See `matchingZodObject` comment for more details.\n */\nexport function matchingZodObjectLoose<Expected extends object>(shape: MatchingZodShape<Expected>) {\n  return z.looseObject(shape);\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"notifyReload.d.ts","sourceRoot":"","sources":["../../src/utilities/notifyReload.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D;;GAEG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EAC3B,OAAO,EAAE,cAAc,CAAC,KAAK,GAAG,iBAAiB,EAAE,UAAU,CAAC,GAC7D,OAAO,CAAC,IAAI,CAAC,CAWf"}
+{"version":3,"file":"notifyReload.d.ts","sourceRoot":"","sources":["../../src/utilities/notifyReload.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D;;GAEG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EAC3B,OAAO,EAAE,cAAc,CAAC,KAAK,GAAG,iBAAiB,EAAE,UAAU,CAAC,GAC7D,OAAO,CAAC,IAAI,CAAC,CAYf"}

package/lib/utilities/notifyReload.js

@@ -8,7 +8,8 @@ export async function notifyReload(options, context) {
     await telemetryClient.tracer.startActiveSpan('NOTIFY_RELOAD', (span) => {
         session.sequence++;
         span.setAttributes({ sequence: session.sequence, reason });
-        bus.publish(reloadCountSource, session.sequence);
+        // Publish using .path for easier testing
+        bus.publish(reloadCountSource.path, session.sequence);
     });
 }
 //# sourceMappingURL=notifyReload.js.map

package/lib/utilities/notifyReload.js.map

@@ -1 +1 @@
-{"version":3,"file":"notifyReload.js","sourceRoot":"","sources":["../../src/utilities/notifyReload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAG1D;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,OAA2B,EAC3B,OAA8D;IAE9D,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;IAElD,MAAM,eAAe,CAAC,MAAM,CAAC,eAAe,CAAC,eAAe,EAAE,CAAC,IAAI,EAAE,EAAE;QACrE,OAAO,CAAC,QAAQ,EAAE,CAAC;QAEnB,IAAI,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QAE3D,GAAG,CAAC,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;AACL,CAAC","sourcesContent":["import { reloadCountSource } from '../data/busSources.js';\nimport type { PartialContext } from '../types/Context.js';\n\n/**\n * Notifies clients that a reload is needed by incrementing the session version.\n */\nexport async function notifyReload(\n  options: { reason: string },\n  context: PartialContext<'bus' | 'telemetryClient', 'sequence'>,\n): Promise<void> {\n  const { reason } = options;\n  const { bus, session, telemetryClient } = context;\n\n  await telemetryClient.tracer.startActiveSpan('NOTIFY_RELOAD', (span) => {\n    session.sequence++;\n\n    span.setAttributes({ sequence: session.sequence, reason });\n\n    bus.publish(reloadCountSource, session.sequence);\n  });\n}\n"]}
+{"version":3,"file":"notifyReload.js","sourceRoot":"","sources":["../../src/utilities/notifyReload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAG1D;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,OAA2B,EAC3B,OAA8D;IAE9D,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;IAElD,MAAM,eAAe,CAAC,MAAM,CAAC,eAAe,CAAC,eAAe,EAAE,CAAC,IAAI,EAAE,EAAE;QACrE,OAAO,CAAC,QAAQ,EAAE,CAAC;QAEnB,IAAI,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QAE3D,yCAAyC;QACzC,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;AACL,CAAC","sourcesContent":["import { reloadCountSource } from '../data/busSources.js';\nimport type { PartialContext } from '../types/Context.js';\n\n/**\n * Notifies clients that a reload is needed by incrementing the session version.\n */\nexport async function notifyReload(\n  options: { reason: string },\n  context: PartialContext<'bus' | 'telemetryClient', 'sequence'>,\n): Promise<void> {\n  const { reason } = options;\n  const { bus, session, telemetryClient } = context;\n\n  await telemetryClient.tracer.startActiveSpan('NOTIFY_RELOAD', (span) => {\n    session.sequence++;\n\n    span.setAttributes({ sequence: session.sequence, reason });\n\n    // Publish using .path for easier testing\n    bus.publish(reloadCountSource.path, session.sequence);\n  });\n}\n"]}

package/lib/utilities/waitForBusData.d.ts

@@ -1,4 +1,4 @@
-import type z from 'zod';
+import type { z } from 'zod/v4-mini';
 import type { DataBus, DataBusPath } from '@ms-cloudpack/data-bus';
 /**
  * Waits for data to be published on a specific bus path, with a timeout.
@@ -7,7 +7,7 @@ export declare function waitForBusData<T>(params: {
     /** Data bus to listen on */
     bus: DataBus;
     /** Path to subscribe to */
-    source: DataBusPath<z.ZodType>;
+    source: DataBusPath<z.ZodMiniType>;
     /** Timeout in milliseconds */
     timeoutMs?: number;
 }): Promise<T>;

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

@@ -1 +1 @@
-{"version":3,"file":"waitForBusData.d.ts","sourceRoot":"","sources":["../../src/utilities/waitForBusData.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAEnE;;GAEG;AACH,wBAAsB,cAAc,CAAC,CAAC,EAAE,MAAM,EAAE;IAC9C,4BAA4B;IAC5B,GAAG,EAAE,OAAO,CAAC;IACb,2BAA2B;IAC3B,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAC/B,8BAA8B;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,CAAC,CAAC,CAgBb"}
+{"version":3,"file":"waitForBusData.d.ts","sourceRoot":"","sources":["../../src/utilities/waitForBusData.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAEnE;;GAEG;AACH,wBAAsB,cAAc,CAAC,CAAC,EAAE,MAAM,EAAE;IAC9C,4BAA4B;IAC5B,GAAG,EAAE,OAAO,CAAC;IACb,2BAA2B;IAC3B,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IACnC,8BAA8B;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,CAAC,CAAC,CAgBb"}

package/lib/utilities/waitForBusData.js.map

@@ -1 +1 @@
-{"version":3,"file":"waitForBusData.js","sourceRoot":"","sources":["../../src/utilities/waitForBusData.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAI,MAOvC;IACC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,GAAG,MAAM,EAAE,GAAG,MAAM,CAAC;IACnD,OAAO,IAAI,OAAO,CAAI,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACjC,sCAAsC;QACtC,MAAM,WAAW,GAAe,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,KAAc,EAAE,EAAE;YACvE,YAAY,CAAC,SAAS,CAAC,CAAC;YACxB,GAAG,CAAC,KAAU,CAAC,CAAC;YAChB,WAAW,EAAE,CAAC;QAChB,CAAC,CAAC,CAAC;QAEH,iBAAiB;QACjB,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE;YAChC,WAAW,EAAE,CAAC;YACd,GAAG,CAAC,IAAI,KAAK,CAAC,wCAAwC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QAClF,CAAC,EAAE,SAAS,CAAC,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC","sourcesContent":["import type z from 'zod';\nimport type { DataBus, DataBusPath } from '@ms-cloudpack/data-bus';\n\n/**\n * Waits for data to be published on a specific bus path, with a timeout.\n */\nexport async function waitForBusData<T>(params: {\n  /** Data bus to listen on */\n  bus: DataBus;\n  /** Path to subscribe to */\n  source: DataBusPath<z.ZodType>;\n  /** Timeout in milliseconds */\n  timeoutMs?: number;\n}): Promise<T> {\n  const { bus, source, timeoutMs = 120000 } = params;\n  return new Promise<T>((res, rej) => {\n    // Set up subscription to the bus path\n    const unsubscribe: () => void = bus.subscribe(source, (value: unknown) => {\n      clearTimeout(timeoutId);\n      res(value as T);\n      unsubscribe();\n    });\n\n    // Set up timeout\n    const timeoutId = setTimeout(() => {\n      unsubscribe();\n      rej(new Error(`Timeout waiting for bus data on path ${source.path.join('.')}`));\n    }, timeoutMs);\n  });\n}\n"]}
+{"version":3,"file":"waitForBusData.js","sourceRoot":"","sources":["../../src/utilities/waitForBusData.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAI,MAOvC;IACC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,GAAG,MAAM,EAAE,GAAG,MAAM,CAAC;IACnD,OAAO,IAAI,OAAO,CAAI,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACjC,sCAAsC;QACtC,MAAM,WAAW,GAAe,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,KAAc,EAAE,EAAE;YACvE,YAAY,CAAC,SAAS,CAAC,CAAC;YACxB,GAAG,CAAC,KAAU,CAAC,CAAC;YAChB,WAAW,EAAE,CAAC;QAChB,CAAC,CAAC,CAAC;QAEH,iBAAiB;QACjB,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE;YAChC,WAAW,EAAE,CAAC;YACd,GAAG,CAAC,IAAI,KAAK,CAAC,wCAAwC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QAClF,CAAC,EAAE,SAAS,CAAC,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC","sourcesContent":["import type { z } from 'zod/v4-mini';\nimport type { DataBus, DataBusPath } from '@ms-cloudpack/data-bus';\n\n/**\n * Waits for data to be published on a specific bus path, with a timeout.\n */\nexport async function waitForBusData<T>(params: {\n  /** Data bus to listen on */\n  bus: DataBus;\n  /** Path to subscribe to */\n  source: DataBusPath<z.ZodMiniType>;\n  /** Timeout in milliseconds */\n  timeoutMs?: number;\n}): Promise<T> {\n  const { bus, source, timeoutMs = 120000 } = params;\n  return new Promise<T>((res, rej) => {\n    // Set up subscription to the bus path\n    const unsubscribe: () => void = bus.subscribe(source, (value: unknown) => {\n      clearTimeout(timeoutId);\n      res(value as T);\n      unsubscribe();\n    });\n\n    // Set up timeout\n    const timeoutId = setTimeout(() => {\n      unsubscribe();\n      rej(new Error(`Timeout waiting for bus data on path ${source.path.join('.')}`));\n    }, timeoutMs);\n  });\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/api-server",
-  "version": "0.63.10",
+  "version": "0.64.0",
   "description": "An implementation of the API server that does interacts with a task scheduler.",
   "license": "MIT",
   "type": "module",
@@ -23,23 +23,23 @@
     }
   },
   "dependencies": {
-    "@ms-cloudpack/bundler": "^0.25.12",
-    "@ms-cloudpack/common-types": "^0.24.20",
-    "@ms-cloudpack/config": "^0.35.9",
-    "@ms-cloudpack/create-express-app": "^1.10.34",
-    "@ms-cloudpack/data-bus": "^0.4.3",
+    "@ms-cloudpack/bundler": "^0.25.14",
+    "@ms-cloudpack/common-types": "^0.25.0",
+    "@ms-cloudpack/config": "^0.35.11",
+    "@ms-cloudpack/create-express-app": "^1.10.36",
+    "@ms-cloudpack/data-bus": "^0.5.0",
     "@ms-cloudpack/environment": "^0.1.1",
-    "@ms-cloudpack/esm-stub-utilities": "^0.14.36",
-    "@ms-cloudpack/file-watcher": "^0.3.5",
-    "@ms-cloudpack/import-map": "^0.10.27",
+    "@ms-cloudpack/esm-stub-utilities": "^0.15.0",
+    "@ms-cloudpack/file-watcher": "^0.3.7",
+    "@ms-cloudpack/import-map": "^0.10.29",
     "@ms-cloudpack/json-utilities": "^0.1.10",
-    "@ms-cloudpack/package-hashes": "^0.8.10",
-    "@ms-cloudpack/package-utilities": "^12.3.11",
+    "@ms-cloudpack/package-hashes": "^0.8.12",
+    "@ms-cloudpack/package-utilities": "^12.3.13",
     "@ms-cloudpack/path-string-parsing": "^1.2.7",
-    "@ms-cloudpack/path-utilities": "^3.1.5",
-    "@ms-cloudpack/remote-cache": "^0.11.21",
-    "@ms-cloudpack/task-reporter": "^0.17.0",
-    "@ms-cloudpack/telemetry": "^0.11.23",
+    "@ms-cloudpack/path-utilities": "^3.1.7",
+    "@ms-cloudpack/remote-cache": "^0.11.23",
+    "@ms-cloudpack/task-reporter": "^0.17.1",
+    "@ms-cloudpack/telemetry": "^0.11.25",
     "@trpc/client": "^11.1.1",
     "@trpc/server": "^11.1.1",
     "cors": "^2.8.5",
@@ -50,7 +50,7 @@
     "p-queue": "^8.0.1",
     "source-map": "^0.7.0",
     "ws": "^8.16.0",
-    "zod": "^3.21.4"
+    "zod": "^3.25.0"
   },
   "devDependencies": {
     "@ms-cloudpack/eslint-plugin-internal": "^0.0.1",

package/lib/types/TaskEndDescription.d.ts

@@ -1,26 +0,0 @@
-import z from 'zod';
-export declare const ZodTaskEndDescription: z.ZodObject<{
-    id: z.ZodString;
-    errors: z.ZodOptional<z.ZodArray<z.ZodObject<{
-        text: z.ZodType<string, z.ZodTypeDef, string>;
-        source: z.ZodType<string, z.ZodTypeDef, string>;
-        location: z.ZodType<import("@ms-cloudpack/common-types").BundleMessageLocation | undefined, z.ZodTypeDef, import("@ms-cloudpack/common-types").BundleMessageLocation | undefined>;
-        notes: z.ZodType<import("@ms-cloudpack/common-types").BundleMessageNote[] | undefined, z.ZodTypeDef, import("@ms-cloudpack/common-types").BundleMessageNote[] | undefined>;
-    }, "strict", z.ZodTypeAny, import("@ms-cloudpack/common-types").BundleMessage, import("@ms-cloudpack/common-types").BundleMessage>, "many">>;
-    warnings: z.ZodOptional<z.ZodArray<z.ZodObject<{
-        text: z.ZodType<string, z.ZodTypeDef, string>;
-        source: z.ZodType<string, z.ZodTypeDef, string>;
-        location: z.ZodType<import("@ms-cloudpack/common-types").BundleMessageLocation | undefined, z.ZodTypeDef, import("@ms-cloudpack/common-types").BundleMessageLocation | undefined>;
-        notes: z.ZodType<import("@ms-cloudpack/common-types").BundleMessageNote[] | undefined, z.ZodTypeDef, import("@ms-cloudpack/common-types").BundleMessageNote[] | undefined>;
-    }, "strict", z.ZodTypeAny, import("@ms-cloudpack/common-types").BundleMessage, import("@ms-cloudpack/common-types").BundleMessage>, "many">>;
-}, "strip", z.ZodTypeAny, {
-    id: string;
-    errors?: import("@ms-cloudpack/common-types").BundleMessage[] | undefined;
-    warnings?: import("@ms-cloudpack/common-types").BundleMessage[] | undefined;
-}, {
-    id: string;
-    errors?: import("@ms-cloudpack/common-types").BundleMessage[] | undefined;
-    warnings?: import("@ms-cloudpack/common-types").BundleMessage[] | undefined;
-}>;
-export type TaskEndDescription = z.infer<typeof ZodTaskEndDescription>;
-//# sourceMappingURL=TaskEndDescription.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"TaskEndDescription.d.ts","sourceRoot":"","sources":["../../src/types/TaskEndDescription.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAC;AAGpB,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;EAIhC,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC"}

package/lib/types/TaskEndDescription.js

@@ -1,8 +0,0 @@
-import z from 'zod';
-import { ZodTaskMessage } from './TaskMessage.js';
-export const ZodTaskEndDescription = z.object({
-    id: z.string(),
-    errors: z.array(ZodTaskMessage).optional(),
-    warnings: z.array(ZodTaskMessage).optional(),
-});
-//# sourceMappingURL=TaskEndDescription.js.map

package/lib/types/TaskEndDescription.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"TaskEndDescription.js","sourceRoot":"","sources":["../../src/types/TaskEndDescription.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAC;AACpB,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC5C,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;IACd,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE;IAC1C,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE;CAC7C,CAAC,CAAC","sourcesContent":["import z from 'zod';\nimport { ZodTaskMessage } from './TaskMessage.js';\n\nexport const ZodTaskEndDescription = z.object({\n  id: z.string(),\n  errors: z.array(ZodTaskMessage).optional(),\n  warnings: z.array(ZodTaskMessage).optional(),\n});\n\nexport type TaskEndDescription = z.infer<typeof ZodTaskEndDescription>;\n"]}

package/lib/types/TaskStartDescription.d.ts

@@ -1,19 +0,0 @@
-import z from 'zod';
-export declare const ZodTaskStartDescription: z.ZodObject<{
-    id: z.ZodString;
-    name: z.ZodOptional<z.ZodString>;
-    inputPath: z.ZodOptional<z.ZodString>;
-    outputPath: z.ZodOptional<z.ZodString>;
-}, "strip", z.ZodTypeAny, {
-    id: string;
-    name?: string | undefined;
-    inputPath?: string | undefined;
-    outputPath?: string | undefined;
-}, {
-    id: string;
-    name?: string | undefined;
-    inputPath?: string | undefined;
-    outputPath?: string | undefined;
-}>;
-export type TaskStartDescription = z.infer<typeof ZodTaskStartDescription>;
-//# sourceMappingURL=TaskStartDescription.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"TaskStartDescription.d.ts","sourceRoot":"","sources":["../../src/types/TaskStartDescription.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAC;AAEpB,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;EAKlC,CAAC;AAEH,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC"}

package/lib/types/TaskStartDescription.js

@@ -1,8 +0,0 @@
-import z from 'zod';
-export const ZodTaskStartDescription = z.object({
-    id: z.string(),
-    name: z.string().optional(),
-    inputPath: z.string().optional(),
-    outputPath: z.string().optional(),
-});
-//# sourceMappingURL=TaskStartDescription.js.map

package/lib/types/TaskStartDescription.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"TaskStartDescription.js","sourceRoot":"","sources":["../../src/types/TaskStartDescription.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAC;AAEpB,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9C,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;IACd,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAChC,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAClC,CAAC,CAAC","sourcesContent":["import z from 'zod';\n\nexport const ZodTaskStartDescription = z.object({\n  id: z.string(),\n  name: z.string().optional(),\n  inputPath: z.string().optional(),\n  outputPath: z.string().optional(),\n});\n\nexport type TaskStartDescription = z.infer<typeof ZodTaskStartDescription>;\n"]}