@ms-cloudpack/api-server 0.61.4 → 0.61.5

package/lib/apis/ensurePackageBundled.js

@@ -90,7 +90,6 @@ async function ensurePackageBundledInternal(params, ctx) {
         }
     }
     const bundleRequest = {
-        // TODO: David had this as follows--think about what it should be
         id: hash ?? `${packageEntry.path}--env:${targetEnvironment}`,
         packagePath: packageEntry.path,
         packageName: name,

package/lib/apis/ensurePackageBundled.js.map

@@ -1 +1 @@
-{"version":3,"file":"ensurePackageBundled.js","sourceRoot":"","sources":["../../src/apis/ensurePackageBundled.ts"],"names":[],"mappings":"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","sourcesContent":["import { findResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport { notifyReload } from '../utilities/notifyReload.js';\nimport type { BundleRequest } from '../types/BundleRequest.js';\nimport { createBundleTask } from '../utilities/createBundleTask.js';\nimport type { Context } from '../types/Context.js';\nimport type { WatchOptions } from '@ms-cloudpack/file-watcher';\nimport { getConsumedDependencies } from '../utilities/getConsumedDependencies.js';\nimport type { TargetEnvironment, WithOptional } from '@ms-cloudpack/common-types';\n\n/**\n * Input for `ensurePackageBundled`.\n */\nexport interface EnsurePackageBundledInput\n  extends Pick<BundleRequest, 'outputPath' | 'version' | 'disableSourceMaps' | 'shouldGetBundleInfo'> {\n  /** Package name */\n  name: string;\n  /**\n   * Target environment for the bundle.\n   * @default 'browser'\n   */\n  targetEnvironment?: TargetEnvironment;\n  /** Whether to also ensure dependencies are bundled */\n  enqueueDependencies?: boolean;\n  /** Whether to re-run the bundle task */\n  shouldRerun?: boolean;\n  /**\n   * Whether to watch for changes (internal packages only).\n   * NOTE: requires `ctx.bus` and `ctx.watcher` to be set.\n   */\n  shouldWatch?: boolean;\n  /** Whether to force re-bundling */\n  shouldForce?: boolean;\n  /** Whether to disable caching. */\n  disableCache?: boolean;\n  /** Whether to support incremental rebuilds. Defaults to true for internal libraries. */\n  isIncremental?: boolean;\n  /**\n   * Whether to use a hash as the bundle id instead of the path.\n   * Reduces performance when used with shouldForce as it hashes twice,\n   * but eliminates task cache artifacts when handling many apps.\n   */\n  useHashAsId?: boolean;\n  /** Priority for bundling. Greater priority will be scheduled first (defaults to 0). */\n  priority?: number;\n}\n\n/**\n * Result of ensuring a single package is bundled.\n */\nexport interface EnsurePackageBundledResult\n  extends Omit<NonNullable<BundleRequest['result']>, 'rebuild' | 'dispose' | 'bundlerName' | 'inputPath'> {\n  /** Package name */\n  name: string;\n  /** Package version */\n  version: string;\n  /** Package dependency names (prod and peer) */\n  dependencies?: string[];\n  /** Whether the package is external (not defined in this repo). Unset if it's not found. */\n  isExternal?: boolean;\n  /** Absolute path of the package. Will be unset if the package couldn't be found. */\n  inputPath?: string;\n}\n\n/**\n * Complete output for `ensurePackageBundled`.\n */\nexport interface EnsurePackageBundledOutput {\n  /** Result of bundling this package */\n  result: EnsurePackageBundledResult;\n  /** Results of bundling dependencies */\n  dependencies: Promise<EnsurePackageBundledResult[]>;\n}\n\n/**\n * Context for `ensurePackageBundled`. `bus` and `watcher` are only needed if `shouldWatch` is true.\n */\nexport type EnsurePackageBundledContext = WithOptional<Context, 'bus' | 'watcher'>;\n\n/**\n * Checks if the package is bundled or needs bundling, and returns the result.\n * For internal packages, we also notify the watcher to monitor for code changes.\n */\nexport async function ensurePackageBundled(\n  input: EnsurePackageBundledInput,\n  ctx: EnsurePackageBundledContext,\n): Promise<EnsurePackageBundledOutput> {\n  const results: EnsurePackageBundledResult[] = [];\n  const visited = new Set<`${string}@${string}`>();\n\n  // Bundle the package itself\n  let result: EnsurePackageBundledResult;\n  let mainDependencies: EnsurePackageBundledInput[];\n  try {\n    ({ result, dependencyInputs: mainDependencies } = await ensurePackageBundledInternal({ ...input, visited }, ctx));\n  } catch (err) {\n    return {\n      result: getErrorResult(input, err),\n      dependencies: Promise.resolve([]),\n    };\n  }\n\n  // Enqueue main dependencies\n  // TODO: should processing this queue have a rate limit? right now if enqueueDependencies is enabled,\n  // `await dependencies` will fire off all deps at once.\n  let pending = 0;\n  const dependencies = new Promise<EnsurePackageBundledResult[]>((resolve) => {\n    const enqueue = (dependencyInputs: EnsurePackageBundledInput[]) => {\n      for (const dependencyInput of dependencyInputs) {\n        pending++;\n\n        void ensurePackageBundledInternal({ ...dependencyInput, visited }, ctx)\n          .then((dependencyBundleResult) => {\n            // Save result and enqueue this dep's deps\n            results.push(dependencyBundleResult.result);\n            enqueue(dependencyBundleResult.dependencyInputs);\n          })\n          .catch((err) => {\n            // If there's an error (most likely that the dependency wasn't found in the resolve map),\n            // save it in a result instead of throwing. This generally gives better logging.\n            results.push(getErrorResult(dependencyInput, err));\n          })\n          .then(() => {\n            pending--;\n            if (!pending) {\n              resolve(results);\n            }\n          });\n      }\n    };\n\n    enqueue(mainDependencies);\n  });\n\n  return {\n    result,\n    dependencies,\n  };\n}\n\nasync function ensurePackageBundledInternal(\n  params: EnsurePackageBundledInput & {\n    visited: Set<`${string}@${string}`>;\n  },\n  ctx: EnsurePackageBundledContext,\n): Promise<{ result: EnsurePackageBundledResult; dependencyInputs: EnsurePackageBundledInput[] }> {\n  const { taskRunner, session, watcher, packageHashes, bus, telemetryClient } = ctx;\n  const { resolveMap, config } = session;\n  const {\n    name,\n    version,\n    shouldWatch,\n    disableSourceMaps = config.features?.disableSourceMaps,\n    enqueueDependencies = config.features?.enqueueDependencies,\n    outputPath,\n    shouldGetBundleInfo,\n    shouldRerun,\n    shouldForce,\n    disableCache,\n    isIncremental,\n    useHashAsId,\n    priority,\n    targetEnvironment = 'browser',\n    visited,\n  } = params;\n\n  const dependencyInputs: EnsurePackageBundledInput[] = [];\n\n  visited.add(`${name}@${version}`);\n\n  // First, we find the resolve map entry. This helps us resolve the physical location of the package\n  // according to the resolveMap used in the session. (This can change based on linking.)\n  const packageEntry = findResolveMapEntry({ packageName: name, version, resolveMap });\n\n  if (!packageEntry) {\n    throw new Error(`Could not find package ${name} in the resolve map.`);\n  }\n\n  const isExternal = !!packageEntry.isExternal;\n\n  let hash: string | undefined;\n  let sourceHash: string | undefined;\n\n  if (useHashAsId) {\n    // If we are using the hash as the task id, we need to calculate it once and pass it to the task\n    // to prevent a race condition in which we get a different hash than the one used in the task id.\n    hash = await packageHashes.get({\n      packagePath: packageEntry.path,\n      isSourceHashingEnabled: false,\n      shouldRecalculate: true,\n      targetEnvironment,\n    });\n\n    if (!packageEntry.isExternal) {\n      // We only need the source hash for internal packages for cache validation.\n      sourceHash = await packageHashes.get({\n        packagePath: packageEntry.path,\n        isSourceHashingEnabled: true,\n        shouldRecalculate: true,\n        targetEnvironment,\n      });\n    }\n  }\n\n  const bundleRequest: BundleRequest = {\n    // TODO: David had this as follows--think about what it should be\n    id: hash ?? `${packageEntry.path}--env:${targetEnvironment}`,\n    packagePath: packageEntry.path,\n    packageName: name,\n    targetEnvironment,\n    isExternal,\n    isIncremental,\n    outputPath,\n    version,\n    disableSourceMaps,\n    shouldGetBundleInfo: shouldGetBundleInfo || enqueueDependencies,\n    disableCache,\n    mode: config.mode,\n  };\n\n  // Make priority negative to have retry count set to positive values.\n  const retryCount = priority ? -1 * priority : undefined;\n\n  const task = createBundleTask({ bundleRequest, force: shouldForce, hash, sourceHash, retryCount }, ctx);\n\n  // TODO: Add lage scheduling back.\n  const { result } = await taskRunner.add<BundleRequest>(task, { rerun: shouldRerun, priority });\n\n  if (!result) {\n    throw new Error('Bundle failed, no result');\n  }\n\n  // For internal packages, make sure we're watching the source to re-trigger bundling.\n  if (shouldWatch && !isExternal) {\n    if (!bus || !watcher) {\n      throw new Error('bus and watcher must be provided in context if shouldWatch is true (this is a bug).');\n    }\n\n    const definition = await ctx.packages.get(packageEntry.path);\n    const watchOptions: WatchOptions = {\n      id: bundleRequest.id,\n      path: packageEntry.path,\n      watchPaths: definition.cloudpack?.inputPaths,\n    };\n\n    const onPackageChange = async () => {\n      const watchedResult = await taskRunner.add<BundleRequest>(task, { rerun: true });\n\n      // If the result was successful, notify potential clients for reload.\n      if (watchedResult.result?.errors?.length === 0) {\n        await notifyReload({ reason: 'on-package-change' }, { bus, session, telemetryClient });\n      }\n    };\n    watcher.watch(watchOptions, () => {\n      void onPackageChange();\n    });\n  }\n\n  // If enabled, enqueue dependencies.\n  if (enqueueDependencies && result.info) {\n    for (const dependencyName of getConsumedDependencies(result.info)) {\n      const dependencyVersion = packageEntry.dependencies[dependencyName];\n\n      // If we've already visited this package from another package, skip it.\n      if (visited.has(`${dependencyName}@${dependencyVersion}`)) {\n        continue;\n      }\n\n      dependencyInputs.push({\n        name: dependencyName,\n        version: dependencyVersion,\n        shouldWatch,\n        enqueueDependencies,\n      });\n    }\n  }\n\n  return {\n    result: {\n      version,\n      name,\n      isExternal,\n      ...result,\n    },\n    dependencyInputs,\n  };\n}\n\nfunction getErrorResult(input: EnsurePackageBundledInput, error: unknown): EnsurePackageBundledResult {\n  const text = `Error thrown while bundling: ${error instanceof Error ? error.stack || error.message : error}`;\n  return {\n    name: input.name,\n    version: input.version,\n    errors: [{ text, source: 'ensurePackageBundled' }],\n  };\n}\n\n// This function doesn't have an attached procedure because it's never called via the TRPC server.\n"]}
+{"version":3,"file":"ensurePackageBundled.js","sourceRoot":"","sources":["../../src/apis/ensurePackageBundled.ts"],"names":[],"mappings":"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","sourcesContent":["import { findResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport { notifyReload } from '../utilities/notifyReload.js';\nimport type { BundleRequest } from '../types/BundleRequest.js';\nimport { createBundleTask } from '../utilities/createBundleTask.js';\nimport type { Context } from '../types/Context.js';\nimport type { WatchOptions } from '@ms-cloudpack/file-watcher';\nimport { getConsumedDependencies } from '../utilities/getConsumedDependencies.js';\nimport type { TargetEnvironment, WithOptional } from '@ms-cloudpack/common-types';\n\n/**\n * Input for `ensurePackageBundled`.\n */\nexport interface EnsurePackageBundledInput\n  extends Pick<BundleRequest, 'outputPath' | 'version' | 'disableSourceMaps' | 'shouldGetBundleInfo'> {\n  /** Package name */\n  name: string;\n  /**\n   * Target environment for the bundle.\n   * @default 'browser'\n   */\n  targetEnvironment?: TargetEnvironment;\n  /** Whether to also ensure dependencies are bundled */\n  enqueueDependencies?: boolean;\n  /** Whether to re-run the bundle task */\n  shouldRerun?: boolean;\n  /**\n   * Whether to watch for changes (internal packages only).\n   * NOTE: requires `ctx.bus` and `ctx.watcher` to be set.\n   */\n  shouldWatch?: boolean;\n  /** Whether to force re-bundling */\n  shouldForce?: boolean;\n  /** Whether to disable caching. */\n  disableCache?: boolean;\n  /** Whether to support incremental rebuilds. Defaults to true for internal libraries. */\n  isIncremental?: boolean;\n  /**\n   * Whether to use a hash as the bundle id instead of the path.\n   * Reduces performance when used with shouldForce as it hashes twice,\n   * but eliminates task cache artifacts when handling many apps.\n   */\n  useHashAsId?: boolean;\n  /** Priority for bundling. Greater priority will be scheduled first (defaults to 0). */\n  priority?: number;\n}\n\n/**\n * Result of ensuring a single package is bundled.\n */\nexport interface EnsurePackageBundledResult\n  extends Omit<NonNullable<BundleRequest['result']>, 'rebuild' | 'dispose' | 'bundlerName' | 'inputPath'> {\n  /** Package name */\n  name: string;\n  /** Package version */\n  version: string;\n  /** Package dependency names (prod and peer) */\n  dependencies?: string[];\n  /** Whether the package is external (not defined in this repo). Unset if it's not found. */\n  isExternal?: boolean;\n  /** Absolute path of the package. Will be unset if the package couldn't be found. */\n  inputPath?: string;\n}\n\n/**\n * Complete output for `ensurePackageBundled`.\n */\nexport interface EnsurePackageBundledOutput {\n  /** Result of bundling this package */\n  result: EnsurePackageBundledResult;\n  /** Results of bundling dependencies */\n  dependencies: Promise<EnsurePackageBundledResult[]>;\n}\n\n/**\n * Context for `ensurePackageBundled`. `bus` and `watcher` are only needed if `shouldWatch` is true.\n */\nexport type EnsurePackageBundledContext = WithOptional<Context, 'bus' | 'watcher'>;\n\n/**\n * Checks if the package is bundled or needs bundling, and returns the result.\n * For internal packages, we also notify the watcher to monitor for code changes.\n */\nexport async function ensurePackageBundled(\n  input: EnsurePackageBundledInput,\n  ctx: EnsurePackageBundledContext,\n): Promise<EnsurePackageBundledOutput> {\n  const results: EnsurePackageBundledResult[] = [];\n  const visited = new Set<`${string}@${string}`>();\n\n  // Bundle the package itself\n  let result: EnsurePackageBundledResult;\n  let mainDependencies: EnsurePackageBundledInput[];\n  try {\n    ({ result, dependencyInputs: mainDependencies } = await ensurePackageBundledInternal({ ...input, visited }, ctx));\n  } catch (err) {\n    return {\n      result: getErrorResult(input, err),\n      dependencies: Promise.resolve([]),\n    };\n  }\n\n  // Enqueue main dependencies\n  // TODO: should processing this queue have a rate limit? right now if enqueueDependencies is enabled,\n  // `await dependencies` will fire off all deps at once.\n  let pending = 0;\n  const dependencies = new Promise<EnsurePackageBundledResult[]>((resolve) => {\n    const enqueue = (dependencyInputs: EnsurePackageBundledInput[]) => {\n      for (const dependencyInput of dependencyInputs) {\n        pending++;\n\n        void ensurePackageBundledInternal({ ...dependencyInput, visited }, ctx)\n          .then((dependencyBundleResult) => {\n            // Save result and enqueue this dep's deps\n            results.push(dependencyBundleResult.result);\n            enqueue(dependencyBundleResult.dependencyInputs);\n          })\n          .catch((err) => {\n            // If there's an error (most likely that the dependency wasn't found in the resolve map),\n            // save it in a result instead of throwing. This generally gives better logging.\n            results.push(getErrorResult(dependencyInput, err));\n          })\n          .then(() => {\n            pending--;\n            if (!pending) {\n              resolve(results);\n            }\n          });\n      }\n    };\n\n    enqueue(mainDependencies);\n  });\n\n  return {\n    result,\n    dependencies,\n  };\n}\n\nasync function ensurePackageBundledInternal(\n  params: EnsurePackageBundledInput & {\n    visited: Set<`${string}@${string}`>;\n  },\n  ctx: EnsurePackageBundledContext,\n): Promise<{ result: EnsurePackageBundledResult; dependencyInputs: EnsurePackageBundledInput[] }> {\n  const { taskRunner, session, watcher, packageHashes, bus, telemetryClient } = ctx;\n  const { resolveMap, config } = session;\n  const {\n    name,\n    version,\n    shouldWatch,\n    disableSourceMaps = config.features?.disableSourceMaps,\n    enqueueDependencies = config.features?.enqueueDependencies,\n    outputPath,\n    shouldGetBundleInfo,\n    shouldRerun,\n    shouldForce,\n    disableCache,\n    isIncremental,\n    useHashAsId,\n    priority,\n    targetEnvironment = 'browser',\n    visited,\n  } = params;\n\n  const dependencyInputs: EnsurePackageBundledInput[] = [];\n\n  visited.add(`${name}@${version}`);\n\n  // First, we find the resolve map entry. This helps us resolve the physical location of the package\n  // according to the resolveMap used in the session. (This can change based on linking.)\n  const packageEntry = findResolveMapEntry({ packageName: name, version, resolveMap });\n\n  if (!packageEntry) {\n    throw new Error(`Could not find package ${name} in the resolve map.`);\n  }\n\n  const isExternal = !!packageEntry.isExternal;\n\n  let hash: string | undefined;\n  let sourceHash: string | undefined;\n\n  if (useHashAsId) {\n    // If we are using the hash as the task id, we need to calculate it once and pass it to the task\n    // to prevent a race condition in which we get a different hash than the one used in the task id.\n    hash = await packageHashes.get({\n      packagePath: packageEntry.path,\n      isSourceHashingEnabled: false,\n      shouldRecalculate: true,\n      targetEnvironment,\n    });\n\n    if (!packageEntry.isExternal) {\n      // We only need the source hash for internal packages for cache validation.\n      sourceHash = await packageHashes.get({\n        packagePath: packageEntry.path,\n        isSourceHashingEnabled: true,\n        shouldRecalculate: true,\n        targetEnvironment,\n      });\n    }\n  }\n\n  const bundleRequest: BundleRequest = {\n    id: hash ?? `${packageEntry.path}--env:${targetEnvironment}`,\n    packagePath: packageEntry.path,\n    packageName: name,\n    targetEnvironment,\n    isExternal,\n    isIncremental,\n    outputPath,\n    version,\n    disableSourceMaps,\n    shouldGetBundleInfo: shouldGetBundleInfo || enqueueDependencies,\n    disableCache,\n    mode: config.mode,\n  };\n\n  // Make priority negative to have retry count set to positive values.\n  const retryCount = priority ? -1 * priority : undefined;\n\n  const task = createBundleTask({ bundleRequest, force: shouldForce, hash, sourceHash, retryCount }, ctx);\n\n  // TODO: Add lage scheduling back.\n  const { result } = await taskRunner.add<BundleRequest>(task, { rerun: shouldRerun, priority });\n\n  if (!result) {\n    throw new Error('Bundle failed, no result');\n  }\n\n  // For internal packages, make sure we're watching the source to re-trigger bundling.\n  if (shouldWatch && !isExternal) {\n    if (!bus || !watcher) {\n      throw new Error('bus and watcher must be provided in context if shouldWatch is true (this is a bug).');\n    }\n\n    const definition = await ctx.packages.get(packageEntry.path);\n    const watchOptions: WatchOptions = {\n      id: bundleRequest.id,\n      path: packageEntry.path,\n      watchPaths: definition.cloudpack?.inputPaths,\n    };\n\n    const onPackageChange = async () => {\n      const watchedResult = await taskRunner.add<BundleRequest>(task, { rerun: true });\n\n      // If the result was successful, notify potential clients for reload.\n      if (watchedResult.result?.errors?.length === 0) {\n        await notifyReload({ reason: 'on-package-change' }, { bus, session, telemetryClient });\n      }\n    };\n    watcher.watch(watchOptions, () => {\n      void onPackageChange();\n    });\n  }\n\n  // If enabled, enqueue dependencies.\n  if (enqueueDependencies && result.info) {\n    for (const dependencyName of getConsumedDependencies(result.info)) {\n      const dependencyVersion = packageEntry.dependencies[dependencyName];\n\n      // If we've already visited this package from another package, skip it.\n      if (visited.has(`${dependencyName}@${dependencyVersion}`)) {\n        continue;\n      }\n\n      dependencyInputs.push({\n        name: dependencyName,\n        version: dependencyVersion,\n        shouldWatch,\n        enqueueDependencies,\n      });\n    }\n  }\n\n  return {\n    result: {\n      version,\n      name,\n      isExternal,\n      ...result,\n    },\n    dependencyInputs,\n  };\n}\n\nfunction getErrorResult(input: EnsurePackageBundledInput, error: unknown): EnsurePackageBundledResult {\n  const text = `Error thrown while bundling: ${error instanceof Error ? error.stack || error.message : error}`;\n  return {\n    name: input.name,\n    version: input.version,\n    errors: [{ text, source: 'ensurePackageBundled' }],\n  };\n}\n\n// This function doesn't have an attached procedure because it's never called via the TRPC server.\n"]}

package/lib/common/createMockContext.d.ts

@@ -0,0 +1,35 @@
+import type { Context, PartialContext } from '../types/Context.js';
+import { type CreateSessionOptions } from './createSession.js';
+import { type TelemetryClient } from '@ms-cloudpack/telemetry';
+import type { Session, WithOptional } from '@ms-cloudpack/common-types';
+import { type CreateMockSessionOptions } from './createMockSession.js';
+/**
+ * Create a mock context using info from the real filesystem.
+ * This is suitable for most tests using `ensurePackageBundled` and other scenarios.
+ * It will never include a file watcher, and only includes a data bus if `createDataBus` is true.
+ */
+export declare function createMockContext(params: {
+    appPath: string;
+    sessionOptions?: Partial<Omit<CreateSessionOptions, 'config'>>;
+    /** No-op telemetry client. You might want to create this only once and pass it in. */
+    telemetryClient?: TelemetryClient;
+    /** If true, create a data bus and connect it to the task runner. */
+    dataBus?: boolean;
+}): Promise<WithOptional<Context, 'bus' | 'watcher' | 'dispose' | 'remoteCacheClient'>>;
+type AllowedContextKeys = Exclude<keyof Context, 'watcher' | 'dispose' | 'remoteCacheClient'>;
+/**
+ * Initialize only the requested context keys (plus `'session'`) using info from the real filesystem.
+ *
+ * The returned `Session` object contains:
+ * - `config` from the filesystem (with defaults if there is no config)
+ * - `cachePath` set to `appPath/.cache` to prevent interference with the real cache or other tests
+ * - `resolveMap` will be an empty object unless `params.createResolveMap` is true
+ * - Basic mocks of other properties which can be updated as needed
+ */
+export declare function createPartialMockContext<TContextKeys extends AllowedContextKeys>(params: CreateMockSessionOptions & {
+    context: TContextKeys[];
+    /** No-op telemetry client. You might want to create this only once and pass it in. */
+    telemetryClient?: TelemetryClient;
+}): Promise<PartialContext<TContextKeys, keyof Session>>;
+export {};
+//# sourceMappingURL=createMockContext.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"createMockContext.d.ts","sourceRoot":"","sources":["../../src/common/createMockContext.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAiB,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAA6B,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAI1F,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAGxE,OAAO,EAAqB,KAAK,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAE1F;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,EAAE;IAC9C,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC/D,sFAAsF;IACtF,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,oEAAoE;IACpE,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GAAG,OAAO,CAAC,YAAY,CAAC,OAAO,EAAE,KAAK,GAAG,SAAS,GAAG,SAAS,GAAG,mBAAmB,CAAC,CAAC,CAuBtF;AAED,KAAK,kBAAkB,GAAG,OAAO,CAAC,MAAM,OAAO,EAAE,SAAS,GAAG,SAAS,GAAG,mBAAmB,CAAC,CAAC;AAE9F;;;;;;;;GAQG;AACH,wBAAsB,wBAAwB,CAAC,YAAY,SAAS,kBAAkB,EACpF,MAAM,EAAE,wBAAwB,GAAG;IACjC,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,sFAAsF;IACtF,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,GACA,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE,MAAM,OAAO,CAAC,CAAC,CAgDtD"}

package/lib/common/createMockContext.js

@@ -0,0 +1,87 @@
+import { createPackageDefinitions, readConfig } from '@ms-cloudpack/config';
+import { createSession } from './createSession.js';
+import { createNoOpTelemetryClient } from '@ms-cloudpack/telemetry';
+import { noLoggingConfig, TaskReporter } from '@ms-cloudpack/task-reporter';
+import { TaskRunner } from '../utilities/TaskRunner.js';
+import { PackageHashes } from '@ms-cloudpack/package-hashes';
+import { createDataBus } from '@ms-cloudpack/data-bus';
+import path from 'path';
+import { createMockSession } from './createMockSession.js';
+/**
+ * Create a mock context using info from the real filesystem.
+ * This is suitable for most tests using `ensurePackageBundled` and other scenarios.
+ * It will never include a file watcher, and only includes a data bus if `createDataBus` is true.
+ */
+export async function createMockContext(params) {
+    const { appPath, sessionOptions, telemetryClient = createNoOpTelemetryClient() } = params;
+    const config = await readConfig(appPath);
+    const packages = createPackageDefinitions({ config });
+    const reporter = new TaskReporter(noLoggingConfig);
+    const session = await createSession({ config, cachePath: path.join(appPath, '.cache'), ...sessionOptions }, { reporter, packages, telemetryClient });
+    const taskRunner = new TaskRunner();
+    const packageHashes = new PackageHashes({
+        cwd: appPath,
+        context: { config, packages, resolveMap: session.resolveMap },
+    });
+    let bus;
+    if (params.dataBus) {
+        bus = createDataBus();
+        taskRunner.connectToBus(bus);
+    }
+    return { reporter, taskRunner, telemetryClient, packageHashes, packages, session, bus };
+}
+/**
+ * Initialize only the requested context keys (plus `'session'`) using info from the real filesystem.
+ *
+ * The returned `Session` object contains:
+ * - `config` from the filesystem (with defaults if there is no config)
+ * - `cachePath` set to `appPath/.cache` to prevent interference with the real cache or other tests
+ * - `resolveMap` will be an empty object unless `params.createResolveMap` is true
+ * - Basic mocks of other properties which can be updated as needed
+ */
+export async function createPartialMockContext(params) {
+    const { appPath } = params;
+    const contextKeys = params.context;
+    const config = await readConfig(appPath);
+    const packages = createPackageDefinitions({ config });
+    // Pass through the real config and package definitions when creating the session,
+    // to allow creating a real resolve map if needed.
+    const session = await createMockSession(params, { config, packages });
+    // Only create a reporter (which overrides console logging) if requested
+    const reporter = contextKeys.includes('reporter') ? new TaskReporter(noLoggingConfig) : undefined;
+    const context = { session };
+    for (const key of contextKeys) {
+        switch (key) {
+            case 'bus':
+                context.taskRunner ??= new TaskRunner();
+                context.bus = createDataBus();
+                context.taskRunner.connectToBus(context.bus);
+                break;
+            case 'reporter':
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                context.reporter = reporter;
+                break;
+            case 'taskRunner':
+                context.taskRunner ??= new TaskRunner();
+                break;
+            case 'packageHashes':
+                context.packageHashes = new PackageHashes({
+                    cwd: appPath,
+                    context: { config, packages, resolveMap: session.resolveMap },
+                });
+                break;
+            case 'packages':
+                context.packages = packages;
+                break;
+            case 'telemetryClient':
+                context.telemetryClient = params.telemetryClient || createNoOpTelemetryClient();
+                break;
+            case 'session':
+                break;
+            default:
+                throw new Error(`Unsupported context key: ${key}`);
+        }
+    }
+    return context;
+}
+//# sourceMappingURL=createMockContext.js.map

package/lib/common/createMockContext.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createMockContext.js","sourceRoot":"","sources":["../../src/common/createMockContext.ts"],"names":[],"mappings":"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","sourcesContent":["import { createPackageDefinitions, readConfig } from '@ms-cloudpack/config';\nimport type { Context, PartialContext } from '../types/Context.js';\nimport { createSession, type CreateSessionOptions } from './createSession.js';\nimport { createNoOpTelemetryClient, type TelemetryClient } from '@ms-cloudpack/telemetry';\nimport { noLoggingConfig, TaskReporter } from '@ms-cloudpack/task-reporter';\nimport { TaskRunner } from '../utilities/TaskRunner.js';\nimport { PackageHashes } from '@ms-cloudpack/package-hashes';\nimport type { Session, WithOptional } from '@ms-cloudpack/common-types';\nimport { createDataBus, type DataBus } from '@ms-cloudpack/data-bus';\nimport path from 'path';\nimport { createMockSession, type CreateMockSessionOptions } from './createMockSession.js';\n\n/**\n * Create a mock context using info from the real filesystem.\n * This is suitable for most tests using `ensurePackageBundled` and other scenarios.\n * It will never include a file watcher, and only includes a data bus if `createDataBus` is true.\n */\nexport async function createMockContext(params: {\n  appPath: string;\n  sessionOptions?: Partial<Omit<CreateSessionOptions, 'config'>>;\n  /** No-op telemetry client. You might want to create this only once and pass it in. */\n  telemetryClient?: TelemetryClient;\n  /** If true, create a data bus and connect it to the task runner. */\n  dataBus?: boolean;\n}): Promise<WithOptional<Context, 'bus' | 'watcher' | 'dispose' | 'remoteCacheClient'>> {\n  const { appPath, sessionOptions, telemetryClient = createNoOpTelemetryClient() } = params;\n\n  const config = await readConfig(appPath);\n  const packages = createPackageDefinitions({ config });\n  const reporter = new TaskReporter(noLoggingConfig);\n  const session = await createSession(\n    { config, cachePath: path.join(appPath, '.cache'), ...sessionOptions },\n    { reporter, packages, telemetryClient },\n  );\n  const taskRunner = new TaskRunner();\n  const packageHashes = new PackageHashes({\n    cwd: appPath,\n    context: { config, packages, resolveMap: session.resolveMap },\n  });\n\n  let bus: DataBus | undefined;\n  if (params.dataBus) {\n    bus = createDataBus();\n    taskRunner.connectToBus(bus);\n  }\n\n  return { reporter, taskRunner, telemetryClient, packageHashes, packages, session, bus };\n}\n\ntype AllowedContextKeys = Exclude<keyof Context, 'watcher' | 'dispose' | 'remoteCacheClient'>;\n\n/**\n * Initialize only the requested context keys (plus `'session'`) using info from the real filesystem.\n *\n * The returned `Session` object contains:\n * - `config` from the filesystem (with defaults if there is no config)\n * - `cachePath` set to `appPath/.cache` to prevent interference with the real cache or other tests\n * - `resolveMap` will be an empty object unless `params.createResolveMap` is true\n * - Basic mocks of other properties which can be updated as needed\n */\nexport async function createPartialMockContext<TContextKeys extends AllowedContextKeys>(\n  params: CreateMockSessionOptions & {\n    context: TContextKeys[];\n    /** No-op telemetry client. You might want to create this only once and pass it in. */\n    telemetryClient?: TelemetryClient;\n  },\n): Promise<PartialContext<TContextKeys, keyof Session>> {\n  const { appPath } = params;\n  const contextKeys = params.context as AllowedContextKeys[];\n\n  const config = await readConfig(appPath);\n  const packages = createPackageDefinitions({ config });\n  // Pass through the real config and package definitions when creating the session,\n  // to allow creating a real resolve map if needed.\n  const session = await createMockSession(params, { config, packages });\n  // Only create a reporter (which overrides console logging) if requested\n  const reporter = contextKeys.includes('reporter' as TContextKeys) ? new TaskReporter(noLoggingConfig) : undefined;\n\n  const context = { session } as Pick<Context, AllowedContextKeys>;\n\n  for (const key of contextKeys) {\n    switch (key) {\n      case 'bus':\n        context.taskRunner ??= new TaskRunner();\n        context.bus = createDataBus();\n        context.taskRunner.connectToBus(context.bus);\n        break;\n      case 'reporter':\n        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n        context.reporter = reporter!;\n        break;\n      case 'taskRunner':\n        context.taskRunner ??= new TaskRunner();\n        break;\n      case 'packageHashes':\n        context.packageHashes = new PackageHashes({\n          cwd: appPath,\n          context: { config, packages, resolveMap: session.resolveMap },\n        });\n        break;\n      case 'packages':\n        context.packages = packages;\n        break;\n      case 'telemetryClient':\n        context.telemetryClient = params.telemetryClient || createNoOpTelemetryClient();\n        break;\n      case 'session':\n        break;\n      default:\n        throw new Error(`Unsupported context key: ${key}`);\n    }\n  }\n\n  return context;\n}\n"]}

package/lib/common/createMockSession.d.ts

@@ -0,0 +1,26 @@
+import type { CloudpackConfig, PackageDefinitionsCache, Session } from '@ms-cloudpack/common-types';
+export interface CreateMockSessionOptions {
+    appPath: string;
+    /** Custom cache path. Defaults to `appPath/.cache`. */
+    cachePath?: string;
+    /** Whether to create a real resolve map. */
+    createResolveMap?: boolean;
+    /** Session ID. Defaults to a random UUID. */
+    sessionId?: string;
+}
+/**
+ * Create a mock session without reading anything from the filesystem.
+ */
+export declare function createMockSessionNoFS(params: Omit<CreateMockSessionOptions, 'resolveMap'>): Session;
+/**
+ * Create a mock session. The returned object contains:
+ * - `config` from the filesystem (with defaults if there is no config)
+ * - `cachePath` set to `appPath/.cache` to prevent interference with the real cache or other tests
+ * - `resolveMap` will be an empty object unless `params.createResolveMap` is true
+ * - Basic mocks of other properties which can be updated as needed
+ */
+export declare function createMockSession(params: CreateMockSessionOptions, context?: {
+    config?: CloudpackConfig;
+    packages?: PackageDefinitionsCache;
+}): Promise<Session>;
+//# sourceMappingURL=createMockSession.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"createMockSession.d.ts","sourceRoot":"","sources":["../../src/common/createMockSession.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAMpG,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,uDAAuD;IACvD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,4CAA4C;IAC5C,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,6CAA6C;IAC7C,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,IAAI,CAAC,wBAAwB,EAAE,YAAY,CAAC,GAAG,OAAO,CAqBnG;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,wBAAwB,EAChC,OAAO,CAAC,EAAE;IACR,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,QAAQ,CAAC,EAAE,uBAAuB,CAAC;CACpC,GACA,OAAO,CAAC,OAAO,CAAC,CAWlB"}

package/lib/common/createMockSession.js

@@ -0,0 +1,49 @@
+import { readConfig } from '@ms-cloudpack/config';
+import { createResolveMap } from '@ms-cloudpack/package-utilities';
+import { randomUUID } from 'crypto';
+import path from 'path';
+/**
+ * Create a mock session without reading anything from the filesystem.
+ */
+export function createMockSessionNoFS(params) {
+    const { appPath, sessionId = randomUUID(), cachePath = path.join(appPath, '.cache') } = params;
+    const session = {
+        id: sessionId,
+        cachePath,
+        config: { appPath, mode: 'library', generated: {} },
+        projectName: path.basename(appPath),
+        resolveMap: {},
+        sequence: 0,
+        urls: {},
+        targetVersions: {},
+        sessionVersion: 1,
+        incrementSessionVersion: () => { },
+        incrementTargetVersion: () => { },
+        importMap: undefined,
+        packageImportPaths: new Map(),
+        linkedPaths: [],
+        addLinkedPath: () => Promise.resolve(session),
+        removeLinkedPath: () => Promise.resolve(session),
+    };
+    return session;
+}
+/**
+ * Create a mock session. The returned object contains:
+ * - `config` from the filesystem (with defaults if there is no config)
+ * - `cachePath` set to `appPath/.cache` to prevent interference with the real cache or other tests
+ * - `resolveMap` will be an empty object unless `params.createResolveMap` is true
+ * - Basic mocks of other properties which can be updated as needed
+ */
+export async function createMockSession(params, context) {
+    const { appPath } = params;
+    const session = createMockSessionNoFS(params);
+    session.config = context?.config || (await readConfig(appPath));
+    if (params.createResolveMap) {
+        if (!context?.packages) {
+            throw new Error('Cannot create a real resolve map without packages');
+        }
+        session.resolveMap = await createResolveMap({ appPath, rootPath: appPath }, { packages: context.packages });
+    }
+    return session;
+}
+//# sourceMappingURL=createMockSession.js.map

package/lib/common/createMockSession.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createMockSession.js","sourceRoot":"","sources":["../../src/common/createMockSession.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AAYxB;;GAEG;AACH,MAAM,UAAU,qBAAqB,CAAC,MAAoD;IACxF,MAAM,EAAE,OAAO,EAAE,SAAS,GAAG,UAAU,EAAE,EAAE,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,GAAG,MAAM,CAAC;IAC/F,MAAM,OAAO,GAAY;QACvB,EAAE,EAAE,SAAS;QACb,SAAS;QACT,MAAM,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,EAAE;QACnD,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;QACnC,UAAU,EAAE,EAAE;QACd,QAAQ,EAAE,CAAC;QACX,IAAI,EAAE,EAAE;QACR,cAAc,EAAE,EAAE;QAClB,cAAc,EAAE,CAAC;QACjB,uBAAuB,EAAE,GAAG,EAAE,GAAE,CAAC;QACjC,sBAAsB,EAAE,GAAG,EAAE,GAAE,CAAC;QAChC,SAAS,EAAE,SAAS;QACpB,kBAAkB,EAAE,IAAI,GAAG,EAAE;QAC7B,WAAW,EAAE,EAAE;QACf,aAAa,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;QAC7C,gBAAgB,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;KACjD,CAAC;IACF,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,MAAgC,EAChC,OAGC;IAED,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAC3B,MAAM,OAAO,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC;IAC9C,OAAO,CAAC,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,CAAC,MAAM,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;IAChE,IAAI,MAAM,CAAC,gBAAgB,EAAE,CAAC;QAC5B,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACvE,CAAC;QACD,OAAO,CAAC,UAAU,GAAG,MAAM,gBAAgB,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9G,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC","sourcesContent":["import type { CloudpackConfig, PackageDefinitionsCache, Session } from '@ms-cloudpack/common-types';\nimport { readConfig } from '@ms-cloudpack/config';\nimport { createResolveMap } from '@ms-cloudpack/package-utilities';\nimport { randomUUID } from 'crypto';\nimport path from 'path';\n\nexport interface CreateMockSessionOptions {\n  appPath: string;\n  /** Custom cache path. Defaults to `appPath/.cache`. */\n  cachePath?: string;\n  /** Whether to create a real resolve map. */\n  createResolveMap?: boolean;\n  /** Session ID. Defaults to a random UUID. */\n  sessionId?: string;\n}\n\n/**\n * Create a mock session without reading anything from the filesystem.\n */\nexport function createMockSessionNoFS(params: Omit<CreateMockSessionOptions, 'resolveMap'>): Session {\n  const { appPath, sessionId = randomUUID(), cachePath = path.join(appPath, '.cache') } = params;\n  const session: Session = {\n    id: sessionId,\n    cachePath,\n    config: { appPath, mode: 'library', generated: {} },\n    projectName: path.basename(appPath),\n    resolveMap: {},\n    sequence: 0,\n    urls: {},\n    targetVersions: {},\n    sessionVersion: 1,\n    incrementSessionVersion: () => {},\n    incrementTargetVersion: () => {},\n    importMap: undefined,\n    packageImportPaths: new Map(),\n    linkedPaths: [],\n    addLinkedPath: () => Promise.resolve(session),\n    removeLinkedPath: () => Promise.resolve(session),\n  };\n  return session;\n}\n\n/**\n * Create a mock session. The returned object contains:\n * - `config` from the filesystem (with defaults if there is no config)\n * - `cachePath` set to `appPath/.cache` to prevent interference with the real cache or other tests\n * - `resolveMap` will be an empty object unless `params.createResolveMap` is true\n * - Basic mocks of other properties which can be updated as needed\n */\nexport async function createMockSession(\n  params: CreateMockSessionOptions,\n  context?: {\n    config?: CloudpackConfig;\n    packages?: PackageDefinitionsCache;\n  },\n): Promise<Session> {\n  const { appPath } = params;\n  const session = createMockSessionNoFS(params);\n  session.config = context?.config || (await readConfig(appPath));\n  if (params.createResolveMap) {\n    if (!context?.packages) {\n      throw new Error('Cannot create a real resolve map without packages');\n    }\n    session.resolveMap = await createResolveMap({ appPath, rootPath: appPath }, { packages: context.packages });\n  }\n  return session;\n}\n"]}

package/lib/index.d.ts

@@ -16,6 +16,8 @@ export { getActiveSessionsPath } from './utilities/getActiveSessionsPath.js';
 export { getConsumedDependencies } from './utilities/getConsumedDependencies.js';
 export { getConsumedPaths } from './utilities/getConsumedPaths.js';
 export { createApiContext, createPartialApiContext, type CreateApiContextOptions } from './common/createApiContext.js';
+export { createMockContext, createPartialMockContext } from './common/createMockContext.js';
+export { createMockSession, createMockSessionNoFS } from './common/createMockSession.js';
 export { addPackageOverride } from './apis/addPackageOverride.js';
 export { ensurePackageBundled } from './apis/ensurePackageBundled.js';
 export { syncDownload } from './apis/syncDownload.js';

package/lib/index.d.ts.map

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

package/lib/index.js

@@ -7,6 +7,8 @@ export { getConsumedDependencies } from './utilities/getConsumedDependencies.js'
 export { getConsumedPaths } from './utilities/getConsumedPaths.js';
 // Utilities
 export { createApiContext, createPartialApiContext } from './common/createApiContext.js';
+export { createMockContext, createPartialMockContext } from './common/createMockContext.js';
+export { createMockSession, createMockSessionNoFS } from './common/createMockSession.js';
 // API methods directly used outside this package
 export { addPackageOverride } from './apis/addPackageOverride.js';
 export { ensurePackageBundled } from './apis/ensurePackageBundled.js';

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACzF,OAAO,EAAE,qBAAqB,EAAwB,MAAM,iCAAiC,CAAC;AAC9F,OAAO,EAAE,qBAAqB,EAAwB,MAAM,iCAAiC,CAAC;AAC9F,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,YAAY;AACZ,OAAO,EAAE,gBAAgB,EAAE,uBAAuB,EAAgC,MAAM,8BAA8B,CAAC;AAEvH,iDAAiD;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC","sourcesContent":["export type { Context, PartialContext } from './types/Context.js';\nexport type { BundleInfo, BundleEntryInfo, BundleEntryConsumes } from './types/BundleInfo.js';\nexport type { TaskStats } from './types/TaskStats.js';\nexport type { Task } from './types/Task.js';\nexport type { TaskDescription } from './types/TaskDescription.js';\nexport type { TaskEndDescription } from './types/TaskEndDescription.js';\nexport type { TaskList } from './types/TaskList.js';\nexport type { TaskMessage } from './types/TaskMessage.js';\nexport type { TaskStartDescription } from './types/TaskStartDescription.js';\nexport type { EnsurePackageBundledContext, EnsurePackageBundledResult } from './apis/ensurePackageBundled.js';\n\nexport { TaskRunner } from './utilities/TaskRunner.js';\nexport { taskListSource, taskStatsSource, errorEntrySource } from './data/busSources.js';\nexport { createCloudpackClient, type CloudpackClient } from './trpc/createCloudpackClient.js';\nexport { createCloudpackServer, type CloudpackServer } from './trpc/createCloudpackServer.js';\nexport { getActiveSessionsPath } from './utilities/getActiveSessionsPath.js';\nexport { getConsumedDependencies } from './utilities/getConsumedDependencies.js';\nexport { getConsumedPaths } from './utilities/getConsumedPaths.js';\n\n// Utilities\nexport { createApiContext, createPartialApiContext, type CreateApiContextOptions } from './common/createApiContext.js';\n\n// API methods directly used outside this package\nexport { addPackageOverride } from './apis/addPackageOverride.js';\nexport { ensurePackageBundled } from './apis/ensurePackageBundled.js';\nexport { syncDownload } from './apis/syncDownload.js';\nexport { syncUpload } from './apis/syncUpload.js';\nexport type { SyncResult } from './types/SyncResult.js';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACzF,OAAO,EAAE,qBAAqB,EAAwB,MAAM,iCAAiC,CAAC;AAC9F,OAAO,EAAE,qBAAqB,EAAwB,MAAM,iCAAiC,CAAC;AAC9F,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,YAAY;AACZ,OAAO,EAAE,gBAAgB,EAAE,uBAAuB,EAAgC,MAAM,8BAA8B,CAAC;AACvH,OAAO,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAC5F,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAEzF,iDAAiD;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC","sourcesContent":["export type { Context, PartialContext } from './types/Context.js';\nexport type { BundleInfo, BundleEntryInfo, BundleEntryConsumes } from './types/BundleInfo.js';\nexport type { TaskStats } from './types/TaskStats.js';\nexport type { Task } from './types/Task.js';\nexport type { TaskDescription } from './types/TaskDescription.js';\nexport type { TaskEndDescription } from './types/TaskEndDescription.js';\nexport type { TaskList } from './types/TaskList.js';\nexport type { TaskMessage } from './types/TaskMessage.js';\nexport type { TaskStartDescription } from './types/TaskStartDescription.js';\nexport type { EnsurePackageBundledContext, EnsurePackageBundledResult } from './apis/ensurePackageBundled.js';\n\nexport { TaskRunner } from './utilities/TaskRunner.js';\nexport { taskListSource, taskStatsSource, errorEntrySource } from './data/busSources.js';\nexport { createCloudpackClient, type CloudpackClient } from './trpc/createCloudpackClient.js';\nexport { createCloudpackServer, type CloudpackServer } from './trpc/createCloudpackServer.js';\nexport { getActiveSessionsPath } from './utilities/getActiveSessionsPath.js';\nexport { getConsumedDependencies } from './utilities/getConsumedDependencies.js';\nexport { getConsumedPaths } from './utilities/getConsumedPaths.js';\n\n// Utilities\nexport { createApiContext, createPartialApiContext, type CreateApiContextOptions } from './common/createApiContext.js';\nexport { createMockContext, createPartialMockContext } from './common/createMockContext.js';\nexport { createMockSession, createMockSessionNoFS } from './common/createMockSession.js';\n\n// API methods directly used outside this package\nexport { addPackageOverride } from './apis/addPackageOverride.js';\nexport { ensurePackageBundled } from './apis/ensurePackageBundled.js';\nexport { syncDownload } from './apis/syncDownload.js';\nexport { syncUpload } from './apis/syncUpload.js';\nexport type { SyncResult } from './types/SyncResult.js';\n"]}

package/lib/task-scheduler/TaskScheduler.js

@@ -1,15 +1,3 @@
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _TaskScheduler_scheduler;
 import targetGraph from '@lage-run/target-graph';
 import { createRequire } from 'node:module';
 import { createSimpleScheduler } from './createSimpleScheduler.js';
@@ -19,9 +7,9 @@ export const require = createRequire(import.meta.url);
  * A class to abstract the creation of the lage scheduler and scheduling tasks
  */
 export class TaskScheduler {
+    #scheduler;
     constructor(options) {
-        _TaskScheduler_scheduler.set(this, void 0);
-        __classPrivateFieldSet(this, _TaskScheduler_scheduler, createSimpleScheduler(options), "f");
+        this.#scheduler = createSimpleScheduler(options);
     }
     // Schedules task to be run according to the bundle request that came through from the bundler server
     // TODO: from a bundle request, we should be able to determine if we need to auto add several targets into the graph
@@ -31,12 +19,11 @@ export class TaskScheduler {
         targetGraphBuilder.addTarget(target);
         const graph = targetGraphBuilder.build();
         try {
-            await __classPrivateFieldGet(this, _TaskScheduler_scheduler, "f").run(target.cwd, graph, options.rerun);
+            await this.#scheduler.run(target.cwd, graph, options.rerun);
         }
         catch (e) {
             console.error(e.stack || e);
         }
     }
 }
-_TaskScheduler_scheduler = new WeakMap();
 //# sourceMappingURL=TaskScheduler.js.map

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

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

package/lib/trpc/common.d.ts

@@ -1,20 +1,12 @@
 import type { Context } from '../types/Context.js';
 export type CreateContext = () => Promise<Context>;
 /** Reusable TRPC router helper. */
-export declare const createRouter: {
-    <TInput extends import("@trpc/server").RouterRecord>(input: TInput): import("@trpc/server/unstable-core-do-not-import").BuiltRouter<{
-        ctx: Context;
-        meta: object;
-        errorShape: import("@trpc/server/unstable-core-do-not-import").DefaultErrorShape;
-        transformer: false;
-    }, TInput>;
-    <TInput extends import("@trpc/server/unstable-core-do-not-import").CreateRouterOptions>(input: TInput): import("@trpc/server/unstable-core-do-not-import").BuiltRouter<{
-        ctx: Context;
-        meta: object;
-        errorShape: import("@trpc/server/unstable-core-do-not-import").DefaultErrorShape;
-        transformer: false;
-    }, import("@trpc/server/unstable-core-do-not-import").DecorateCreateRouterOptions<TInput>>;
-};
+export declare const createRouter: <TInput extends import("@trpc/server/unstable-core-do-not-import").CreateRouterOptions>(input: TInput) => import("@trpc/server/unstable-core-do-not-import").BuiltRouter<{
+    ctx: Context;
+    meta: object;
+    errorShape: import("@trpc/server/unstable-core-do-not-import").DefaultErrorShape;
+    transformer: false;
+}, import("@trpc/server/unstable-core-do-not-import").DecorateCreateRouterOptions<TInput>>;
 /** Reusable TRPC procedure helper. */
 export declare const publicProcedure: import("@trpc/server/unstable-core-do-not-import").ProcedureBuilder<Context, object, object, typeof import("@trpc/server/unstable-core-do-not-import").unsetMarker, typeof import("@trpc/server/unstable-core-do-not-import").unsetMarker, typeof import("@trpc/server/unstable-core-do-not-import").unsetMarker, typeof import("@trpc/server/unstable-core-do-not-import").unsetMarker, false>;
 //# sourceMappingURL=common.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/trpc/common.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD,MAAM,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;AAKnD,mCAAmC;AACnC,eAAO,MAAM,YAAY;2BAI46E,cAAU;;;;;;2BAAoa,0CAAU;;;;;;CAJz1F,CAAC;AAErC,sCAAsC;AACtC,eAAO,MAAM,eAAe,iYAAc,CAAC"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/trpc/common.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD,MAAM,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;AAKnD,mCAAmC;AACnC,eAAO,MAAM,YAAY,yBAI85E,0CAAU;;;;;0FAJ75E,CAAC;AAErC,sCAAsC;AACtC,eAAO,MAAM,eAAe,iYAAc,CAAC"}

package/lib/trpc/connectBusToClient.d.ts

@@ -1,8 +1,8 @@
 import type { DataBus } from '@ms-cloudpack/data-bus';
-import type { CreateTRPCClient } from '@trpc/client';
+import type { TRPCClient } from '@trpc/client';
 import type { AppRouter } from '../types/AppRouter.js';
-export declare function connectBusToClient({ bus, client }: {
+export declare function connectBusToClient(params: {
     bus: DataBus;
-    client: CreateTRPCClient<AppRouter>;
+    client: TRPCClient<AppRouter>;
 }): void;
 //# sourceMappingURL=connectBusToClient.d.ts.map

package/lib/trpc/connectBusToClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connectBusToClient.d.ts","sourceRoot":"","sources":["../../src/trpc/connectBusToClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAErD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEvD,wBAAgB,kBAAkB,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;IAAE,GAAG,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAA;CAAE,GAAG,IAAI,CAgC/G"}
+{"version":3,"file":"connectBusToClient.d.ts","sourceRoot":"","sources":["../../src/trpc/connectBusToClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEvD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE;IAAE,GAAG,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,UAAU,CAAC,SAAS,CAAC,CAAA;CAAE,GAAG,IAAI,CA4BhG"}

package/lib/trpc/connectBusToClient.js

@@ -1,22 +1,20 @@
-export function connectBusToClient({ bus, client }) {
+export function connectBusToClient(params) {
+    const { bus, client } = params;
     const subIds = {};
     bus.addProvider({
         path: [],
         onActivate: ({ path }) => {
             const id = path.join('/');
+            const onData = (value) => {
+                bus.publish(path, value);
+            };
             client.getData
                 .query({ path })
-                .then((value) => {
-                bus.publish(path, value);
-            })
+                .then(onData)
                 .catch(() => {
                 /* no-op */
             });
-            subIds[id] = client.onDataChanged.subscribe({ path }, {
-                onData(value) {
-                    bus.publish(path, value);
-                },
-            });
+            subIds[id] = client.onDataChanged.subscribe({ path }, { onData });
         },
         onDeactivate: ({ path }) => {
             const id = path.join('/');

package/lib/trpc/connectBusToClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"connectBusToClient.js","sourceRoot":"","sources":["../../src/trpc/connectBusToClient.ts"],"names":[],"mappings":"AAKA,MAAM,UAAU,kBAAkB,CAAC,EAAE,GAAG,EAAE,MAAM,EAAyD;IACvG,MAAM,MAAM,GAAmC,EAAE,CAAC;IAElD,GAAG,CAAC,WAAW,CAAC;QACd,IAAI,EAAE,EAAE;QACR,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;YACvB,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAE1B,MAAM,CAAC,OAAO;iBACX,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;iBACf,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;gBACd,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAC3B,CAAC,CAAC;iBACD,KAAK,CAAC,GAAG,EAAE;gBACV,WAAW;YACb,CAAC,CAAC,CAAC;YAEL,MAAM,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,aAAa,CAAC,SAAS,CACzC,EAAE,IAAI,EAAE,EACR;gBACE,MAAM,CAAC,KAAK;oBACV,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBAC3B,CAAC;aACF,CACF,CAAC;QACJ,CAAC;QACD,YAAY,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;YACzB,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC1B,MAAM,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;YACzB,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC;QACpB,CAAC;KACF,CAAC,CAAC;AACL,CAAC","sourcesContent":["import type { DataBus } from '@ms-cloudpack/data-bus';\nimport type { CreateTRPCClient } from '@trpc/client';\nimport type { Unsubscribable } from '@trpc/server/observable';\nimport type { AppRouter } from '../types/AppRouter.js';\n\nexport function connectBusToClient({ bus, client }: { bus: DataBus; client: CreateTRPCClient<AppRouter> }): void {\n  const subIds: Record<string, Unsubscribable> = {};\n\n  bus.addProvider({\n    path: [],\n    onActivate: ({ path }) => {\n      const id = path.join('/');\n\n      client.getData\n        .query({ path })\n        .then((value) => {\n          bus.publish(path, value);\n        })\n        .catch(() => {\n          /* no-op */\n        });\n\n      subIds[id] = client.onDataChanged.subscribe(\n        { path },\n        {\n          onData(value) {\n            bus.publish(path, value);\n          },\n        },\n      );\n    },\n    onDeactivate: ({ path }) => {\n      const id = path.join('/');\n      subIds[id].unsubscribe();\n      delete subIds[id];\n    },\n  });\n}\n"]}
+{"version":3,"file":"connectBusToClient.js","sourceRoot":"","sources":["../../src/trpc/connectBusToClient.ts"],"names":[],"mappings":"AAKA,MAAM,UAAU,kBAAkB,CAAC,MAAuD;IACxF,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAC/B,MAAM,MAAM,GAAmC,EAAE,CAAC;IAElD,GAAG,CAAC,WAAW,CAAC;QACd,IAAI,EAAE,EAAE;QACR,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;YACvB,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAE1B,MAAM,MAAM,GAAG,CAAC,KAAc,EAAE,EAAE;gBAChC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAC3B,CAAC,CAAC;YAEF,MAAM,CAAC,OAAO;iBACX,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;iBACf,IAAI,CAAC,MAAM,CAAC;iBACZ,KAAK,CAAC,GAAG,EAAE;gBACV,WAAW;YACb,CAAC,CAAC,CAAC;YAEL,MAAM,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QACpE,CAAC;QACD,YAAY,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;YACzB,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC1B,MAAM,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;YACzB,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC;QACpB,CAAC;KACF,CAAC,CAAC;AACL,CAAC","sourcesContent":["import type { DataBus } from '@ms-cloudpack/data-bus';\nimport type { TRPCClient } from '@trpc/client';\nimport type { Unsubscribable } from '@trpc/server/observable';\nimport type { AppRouter } from '../types/AppRouter.js';\n\nexport function connectBusToClient(params: { bus: DataBus; client: TRPCClient<AppRouter> }): void {\n  const { bus, client } = params;\n  const subIds: Record<string, Unsubscribable> = {};\n\n  bus.addProvider({\n    path: [],\n    onActivate: ({ path }) => {\n      const id = path.join('/');\n\n      const onData = (value: unknown) => {\n        bus.publish(path, value);\n      };\n\n      client.getData\n        .query({ path })\n        .then(onData)\n        .catch(() => {\n          /* no-op */\n        });\n\n      subIds[id] = client.onDataChanged.subscribe({ path }, { onData });\n    },\n    onDeactivate: ({ path }) => {\n      const id = path.join('/');\n      subIds[id].unsubscribe();\n      delete subIds[id];\n    },\n  });\n}\n"]}

package/lib/trpc/createCloudpackClient.d.ts

@@ -1,7 +1,7 @@
 import type { TaskReporter } from '@ms-cloudpack/task-reporter';
-import type { CreateTRPCClient } from '@trpc/client';
+import type { TRPCClient } from '@trpc/client';
 import type { AppRouter } from '../types/AppRouter.js';
-export type CloudpackClient = CreateTRPCClient<AppRouter> & {
+export type CloudpackClient = TRPCClient<AppRouter> & {
     close: () => Promise<void>;
 };
 /**

package/lib/trpc/createCloudpackClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createCloudpackClient.d.ts","sourceRoot":"","sources":["../../src/trpc/createCloudpackClient.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAIrD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEvD,MAAM,MAAM,eAAe,GAAG,gBAAgB,CAAC,SAAS,CAAC,GAAG;IAC1D,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B,CAAC;AAEF;;GAEG;AACH,wBAAsB,qBAAqB,CAAC,OAAO,EAAE;IACnD,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB,GAAG,OAAO,CAAC,eAAe,CAAC,CAmD3B"}
+{"version":3,"file":"createCloudpackClient.d.ts","sourceRoot":"","sources":["../../src/trpc/createCloudpackClient.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAI/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEvD,MAAM,MAAM,eAAe,GAAG,UAAU,CAAC,SAAS,CAAC,GAAG;IACpD,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B,CAAC;AAEF;;GAEG;AACH,wBAAsB,qBAAqB,CAAC,OAAO,EAAE;IACnD,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB,GAAG,OAAO,CAAC,eAAe,CAAC,CAgD3B"}

package/lib/trpc/createCloudpackClient.js

@@ -10,7 +10,6 @@ export async function createCloudpackClient(options) {
     await ensureWebsocketDefined();
     ignoreSelfSignedCertErrors({ reporter: options.reporter });
     // Create the client.
-    // eslint-disable-next-line etc/no-deprecated -- see https://github.com/trpc/trpc/issues/6109
     const wsClient = createWSClient(options);
     const tempUrl = makeUrl(options.url);
     // Replace the protocol with http so that we can use the same url for http requests.
@@ -23,7 +22,6 @@ export async function createCloudpackClient(options) {
                 condition(op) {
                     return op.type === 'subscription';
                 },
-                // eslint-disable-next-line etc/no-deprecated -- see https://github.com/trpc/trpc/issues/6109
                 true: wsLink({
                     client: wsClient,
                 }),
@@ -33,12 +31,13 @@ export async function createCloudpackClient(options) {
             }),
         ],
     });
+    const close = async () => {
+        await wsClient.close();
+    };
     // Ugh. This is a hack to get around the fact that the client is a proxy.
-    return new Proxy({
-        close: () => {
-            wsClient.close();
-        },
-    }, {
+    // Make another proxy which defines the close method and passes through everything else
+    // to the original client.
+    return new Proxy({ close }, {
         get(target, prop) {
             // eslint-disable-next-line no-prototype-builtins
             if (target.hasOwnProperty(prop)) {

package/lib/trpc/createCloudpackClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"createCloudpackClient.js","sourceRoot":"","sources":["../../src/trpc/createCloudpackClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAG5D,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAClG,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,0BAA0B,EAAE,MAAM,4CAA4C,CAAC;AAOxF;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,OAG3C;IACC,4CAA4C;IAC5C,MAAM,sBAAsB,EAAE,CAAC;IAE/B,0BAA0B,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IAE3D,qBAAqB;IACrB,6FAA6F;IAC7F,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IACzC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAErC,oFAAoF;IACpF,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,KAAK,MAAM,CAAC;IAC1C,OAAO,CAAC,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC;IAE9C,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG,gBAAgB,CAAY;QACzC,KAAK,EAAE;YACL,SAAS,CAAC;gBACR,SAAS,CAAC,EAAE;oBACV,OAAO,EAAE,CAAC,IAAI,KAAK,cAAc,CAAC;gBACpC,CAAC;gBACD,6FAA6F;gBAC7F,IAAI,EAAE,MAAM,CAAC;oBACX,MAAM,EAAE,QAAQ;iBACjB,CAAC;gBACF,KAAK,EAAE,aAAa,CAAC;oBACnB,GAAG;iBACJ,CAAC;aACH,CAAC;SACH;KACF,CAA+B,CAAC;IAEjC,yEAAyE;IACzE,OAAO,IAAI,KAAK,CACd;QACE,KAAK,EAAE,GAAG,EAAE;YACV,QAAQ,CAAC,KAAK,EAAE,CAAC;QACnB,CAAC;KACF,EACD;QACE,GAAG,CAAC,MAAM,EAAE,IAAI;YACd,iDAAiD;YACjD,IAAI,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;gBAChC,OAAO,MAAM,CAAC,IAA2B,CAAC,CAAC;YAC7C,CAAC;YAED,OAAO,MAAM,CAAC,IAA6B,CAAC,CAAC;QAC/C,CAAC;KACF,CACiB,CAAC;AACvB,CAAC","sourcesContent":["import { makeUrl } from '@ms-cloudpack/path-string-parsing';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport type { CreateTRPCClient } from '@trpc/client';\nimport { createTRPCClient, createWSClient, httpBatchLink, splitLink, wsLink } from '@trpc/client';\nimport { ensureWebsocketDefined } from '../utilities/ensureWebsocketDefined.js';\nimport { ignoreSelfSignedCertErrors } from '../utilities/ignoreSelfSignedCertErrors.js';\nimport type { AppRouter } from '../types/AppRouter.js';\n\nexport type CloudpackClient = CreateTRPCClient<AppRouter> & {\n  close: () => Promise<void>;\n};\n\n/**\n * Creates a cloudpack client that can be used to communicate with the cloudpack server using trpc.\n */\nexport async function createCloudpackClient(options: {\n  url: string;\n  reporter?: TaskReporter;\n}): Promise<CloudpackClient> {\n  // We polyfill websocket in node conditions.\n  await ensureWebsocketDefined();\n\n  ignoreSelfSignedCertErrors({ reporter: options.reporter });\n\n  // Create the client.\n  // eslint-disable-next-line etc/no-deprecated -- see https://github.com/trpc/trpc/issues/6109\n  const wsClient = createWSClient(options);\n  const tempUrl = makeUrl(options.url);\n\n  // Replace the protocol with http so that we can use the same url for http requests.\n  const isSSL = tempUrl.protocol === 'wss:';\n  tempUrl.protocol = isSSL ? 'https:' : 'http:';\n\n  const url = tempUrl.toString().replace(/\\/$/, '');\n  const client = createTRPCClient<AppRouter>({\n    links: [\n      splitLink({\n        condition(op) {\n          return op.type === 'subscription';\n        },\n        // eslint-disable-next-line etc/no-deprecated -- see https://github.com/trpc/trpc/issues/6109\n        true: wsLink({\n          client: wsClient,\n        }),\n        false: httpBatchLink({\n          url,\n        }),\n      }),\n    ],\n  }) as unknown as CloudpackClient;\n\n  // Ugh. This is a hack to get around the fact that the client is a proxy.\n  return new Proxy(\n    {\n      close: () => {\n        wsClient.close();\n      },\n    },\n    {\n      get(target, prop) {\n        // eslint-disable-next-line no-prototype-builtins\n        if (target.hasOwnProperty(prop)) {\n          return target[prop as keyof typeof target];\n        }\n\n        return client[prop as keyof CloudpackClient];\n      },\n    },\n  ) as CloudpackClient;\n}\n"]}
+{"version":3,"file":"createCloudpackClient.js","sourceRoot":"","sources":["../../src/trpc/createCloudpackClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAG5D,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAClG,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,0BAA0B,EAAE,MAAM,4CAA4C,CAAC;AAOxF;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,OAG3C;IACC,4CAA4C;IAC5C,MAAM,sBAAsB,EAAE,CAAC;IAE/B,0BAA0B,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IAE3D,qBAAqB;IACrB,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IACzC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAErC,oFAAoF;IACpF,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,KAAK,MAAM,CAAC;IAC1C,OAAO,CAAC,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC;IAE9C,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG,gBAAgB,CAAY;QACzC,KAAK,EAAE;YACL,SAAS,CAAC;gBACR,SAAS,CAAC,EAAE;oBACV,OAAO,EAAE,CAAC,IAAI,KAAK,cAAc,CAAC;gBACpC,CAAC;gBACD,IAAI,EAAE,MAAM,CAAC;oBACX,MAAM,EAAE,QAAQ;iBACjB,CAAC;gBACF,KAAK,EAAE,aAAa,CAAC;oBACnB,GAAG;iBACJ,CAAC;aACH,CAAC;SACH;KACF,CAAC,CAAC;IAEH,MAAM,KAAK,GAA6B,KAAK,IAAI,EAAE;QACjD,MAAM,QAAQ,CAAC,KAAK,EAAE,CAAC;IACzB,CAAC,CAAC;IAEF,yEAAyE;IACzE,uFAAuF;IACvF,0BAA0B;IAC1B,OAAO,IAAI,KAAK,CAAkB,EAAE,KAAK,EAAqB,EAAE;QAC9D,GAAG,CAAC,MAAM,EAAE,IAAI;YACd,iDAAiD;YACjD,IAAI,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;gBAChC,OAAO,MAAM,CAAC,IAA2B,CAAC,CAAC;YAC7C,CAAC;YAED,OAAO,MAAM,CAAC,IAA+C,CAAC,CAAC;QACjE,CAAC;KACF,CAAC,CAAC;AACL,CAAC","sourcesContent":["import { makeUrl } from '@ms-cloudpack/path-string-parsing';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport type { TRPCClient } from '@trpc/client';\nimport { createTRPCClient, createWSClient, httpBatchLink, splitLink, wsLink } from '@trpc/client';\nimport { ensureWebsocketDefined } from '../utilities/ensureWebsocketDefined.js';\nimport { ignoreSelfSignedCertErrors } from '../utilities/ignoreSelfSignedCertErrors.js';\nimport type { AppRouter } from '../types/AppRouter.js';\n\nexport type CloudpackClient = TRPCClient<AppRouter> & {\n  close: () => Promise<void>;\n};\n\n/**\n * Creates a cloudpack client that can be used to communicate with the cloudpack server using trpc.\n */\nexport async function createCloudpackClient(options: {\n  url: string;\n  reporter?: TaskReporter;\n}): Promise<CloudpackClient> {\n  // We polyfill websocket in node conditions.\n  await ensureWebsocketDefined();\n\n  ignoreSelfSignedCertErrors({ reporter: options.reporter });\n\n  // Create the client.\n  const wsClient = createWSClient(options);\n  const tempUrl = makeUrl(options.url);\n\n  // Replace the protocol with http so that we can use the same url for http requests.\n  const isSSL = tempUrl.protocol === 'wss:';\n  tempUrl.protocol = isSSL ? 'https:' : 'http:';\n\n  const url = tempUrl.toString().replace(/\\/$/, '');\n  const client = createTRPCClient<AppRouter>({\n    links: [\n      splitLink({\n        condition(op) {\n          return op.type === 'subscription';\n        },\n        true: wsLink({\n          client: wsClient,\n        }),\n        false: httpBatchLink({\n          url,\n        }),\n      }),\n    ],\n  });\n\n  const close: CloudpackClient['close'] = async () => {\n    await wsClient.close();\n  };\n\n  // Ugh. This is a hack to get around the fact that the client is a proxy.\n  // Make another proxy which defines the close method and passes through everything else\n  // to the original client.\n  return new Proxy<CloudpackClient>({ close } as CloudpackClient, {\n    get(target, prop) {\n      // eslint-disable-next-line no-prototype-builtins\n      if (target.hasOwnProperty(prop)) {\n        return target[prop as keyof typeof target];\n      }\n\n      return client[prop as Exclude<keyof CloudpackClient, 'close'>];\n    },\n  });\n}\n"]}

package/lib/types/BundleRequest.d.ts

@@ -18,7 +18,7 @@ export interface BundleRequest {
     isExternal: boolean;
     /** Whether we should force the incremental flag. */
     isIncremental?: boolean;
-    /** Bundle mode */
+    /** Bundle mode (copied from the config) */
     mode: BundleMode;
     /** Target environment for the bundle. */
     targetEnvironment: TargetEnvironment;

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

@@ -1 +1 @@
-{"version":3,"file":"BundleRequest.d.ts","sourceRoot":"","sources":["../../src/types/BundleRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC9F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,0FAA0F;IAC1F,EAAE,EAAE,MAAM,CAAC;IAEX,iCAAiC;IACjC,WAAW,EAAE,MAAM,CAAC;IAEpB,oCAAoC;IACpC,OAAO,EAAE,MAAM,CAAC;IAEhB,mCAAmC;IACnC,WAAW,EAAE,MAAM,CAAC;IAEpB,0CAA0C;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,4DAA4D;IAC5D,UAAU,EAAE,OAAO,CAAC;IAEpB,oDAAoD;IACpD,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,kBAAkB;IAClB,IAAI,EAAE,UAAU,CAAC;IAEjB,yCAAyC;IACzC,iBAAiB,EAAE,iBAAiB,CAAC;IAErC,yBAAyB;IACzB,MAAM,CAAC,EAAE,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,GAAG;QACzC,4FAA4F;QAC5F,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,UAAU,CAAC;QAClB,YAAY,CAAC,EAAE,cAAc,GAAG,aAAa,GAAG,SAAS,CAAC;KAC3D,CAAC;IAEF,2EAA2E;IAE3E,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,qCAAqC;IACrC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B,+DAA+D;IAC/D,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B,iCAAiC;IACjC,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB"}
+{"version":3,"file":"BundleRequest.d.ts","sourceRoot":"","sources":["../../src/types/BundleRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC9F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,0FAA0F;IAC1F,EAAE,EAAE,MAAM,CAAC;IAEX,iCAAiC;IACjC,WAAW,EAAE,MAAM,CAAC;IAEpB,oCAAoC;IACpC,OAAO,EAAE,MAAM,CAAC;IAEhB,mCAAmC;IACnC,WAAW,EAAE,MAAM,CAAC;IAEpB,0CAA0C;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,4DAA4D;IAC5D,UAAU,EAAE,OAAO,CAAC;IAEpB,oDAAoD;IACpD,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,2CAA2C;IAC3C,IAAI,EAAE,UAAU,CAAC;IAEjB,yCAAyC;IACzC,iBAAiB,EAAE,iBAAiB,CAAC;IAErC,yBAAyB;IACzB,MAAM,CAAC,EAAE,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,GAAG;QACzC,4FAA4F;QAC5F,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,UAAU,CAAC;QAClB,YAAY,CAAC,EAAE,cAAc,GAAG,aAAa,GAAG,SAAS,CAAC;KAC3D,CAAC;IAEF,2EAA2E;IAE3E,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,qCAAqC;IACrC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B,+DAA+D;IAC/D,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B,iCAAiC;IACjC,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB"}

package/lib/types/BundleRequest.js.map

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

package/lib/utilities/TaskRunner.js

@@ -8,6 +8,14 @@ import { taskListSource, taskStatsSource } from '../index.browser.js';
  * `createApiContext` does this with the `taskRunner` passed in.
  */
 export class TaskRunner {
+    _bus;
+    _queue;
+    _taskStats;
+    _pendingTasks;
+    _completedTasks;
+    _requiresRerun;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    _prevTasks;
     constructor() {
         this._queue = new PQueue({ concurrency: 10 });
         this._taskStats = getDefaultTaskStats();

package/lib/utilities/TaskRunner.js.map

@@ -1 +1 @@
-{"version":3,"file":"TaskRunner.js","sourceRoot":"","sources":["../../src/utilities/TaskRunner.ts"],"names":[],"mappings":"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","sourcesContent":["import type { TaskStartDescription } from '../types/TaskStartDescription.js';\nimport type { TaskEndDescription } from '../types/TaskEndDescription.js';\nimport type { Task } from '../types/Task.js';\nimport type { TaskStats } from '../types/TaskStats.js';\nimport type { TaskList } from '../types/TaskList.js';\nimport PQueue from 'p-queue';\nimport { taskListSource, taskStatsSource, type TaskDescription } from '../index.browser.js';\nimport type { DataBus } from '@ms-cloudpack/data-bus';\n\n/**\n * TaskRunner tracks the status of tasks, manages concurrency, allows reusing task results,\n * and sends notifications about task status to the data bus (currently just used for `start`).\n *\n * NOTE: To enable data bus notifications, you must call `connectToBus()`.\n * `createApiContext` does this with the `taskRunner` passed in.\n */\nexport class TaskRunner {\n  private _bus: DataBus | undefined;\n  private _queue: PQueue;\n  private _taskStats: TaskStats;\n  private _pendingTasks: Map<string, Promise<unknown>>;\n  private _completedTasks: Map<string, unknown>;\n  private _requiresRerun: Set<string>;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private _prevTasks: Map<string, Task<any>>;\n\n  constructor() {\n    this._queue = new PQueue({ concurrency: 10 });\n    this._taskStats = getDefaultTaskStats();\n    this._pendingTasks = new Map();\n    this._completedTasks = new Map();\n    this._requiresRerun = new Set();\n    this._prevTasks = new Map();\n  }\n\n  /**\n   * Connects the TaskRunner to the data bus. Tasks will still run without this, but they won't\n   * send any notifications to a client (which only matters if a client is listening, e.g.\n   * the browser while running `start`).\n   */\n  public connectToBus(bus: DataBus): void {\n    this._bus = bus;\n  }\n\n  /**\n   * Enqueue a task and return its result promise.\n   *\n   * If a task with the same `id` was already added, it returns either the previous result\n   * (if completed) or the promise (if pending). Pass `options.rerun` to force re-running.\n   */\n  add<TReturn>(\n    task: Task<TReturn>,\n    options?: {\n      rerun?: boolean;\n      priority?: number;\n    },\n  ): Promise<TReturn> {\n    const { name, id, execute } = task;\n    const { rerun, priority } = options || {};\n\n    if (!this._prevTasks.get(id)) {\n      this._prevTasks.set(id, task);\n    }\n\n    // Check if we are already completed the task with that id.\n    const action = this._completedTasks.get(id) as TReturn | undefined;\n    if (action !== undefined && !rerun) {\n      return Promise.resolve(action);\n    }\n\n    // Check if we are already running the task with that id.\n    const pending = this._pendingTasks.get(id) as Promise<TReturn> | undefined;\n    if (pending !== undefined) {\n      if (rerun) {\n        this._requiresRerun.add(id);\n      }\n      return pending;\n    }\n\n    const resultPromise: Promise<TReturn> = (async () => {\n      let taskResult: TReturn | undefined;\n\n      do {\n        // Delete from rerun list (if present).\n        this._requiresRerun.delete(id);\n\n        taskResult = await this._queue.add(\n          execute,\n          // Removes void from return type.\n          // Read more on: https://github.com/sindresorhus/p-queue/issues/175\n          { throwOnTimeout: true, priority },\n        );\n      } while (this._requiresRerun.has(id));\n\n      // Delete from pending list.\n      this._pendingTasks.delete(id);\n      if (task.getEndDescription) {\n        this._reportEnd(id, task.getEndDescription(taskResult));\n      }\n\n      // Extra check to ensure that the task returned a value.\n      // It should never throw, if it does we have a bug.\n      if (taskResult === undefined) {\n        throw new Error(`Task \"${name}:${id}\" returned undefined, without throwing an error, which was unexpected.`);\n      }\n\n      // Update finished Tasks.\n      this._completedTasks.set(id, taskResult);\n\n      return taskResult;\n    })();\n\n    this._pendingTasks.set(id, resultPromise);\n    this._completedTasks.delete(id);\n    if (task.getStartDescription) {\n      this._reportStart(id, task.getStartDescription());\n    }\n\n    return resultPromise;\n  }\n\n  /**\n   * The remove method disposes a task if available\n   * and then removes it from the TaskRunner.\n   *\n   * This is useful when the state of a task needs to be cleared.\n   *\n   * It is intended to be used by the api server\n   * to clear the TaskRunner's state before reloading the page.\n   */\n  remove(id: string): void {\n    this._prevTasks\n      .get(id)\n      ?.dispose?.()\n      .catch(() => {\n        console.debug(`Error disposing task: ${id}`);\n      });\n    this._prevTasks.get(id)?.onDispose?.();\n    this._prevTasks.delete(id);\n    this._requiresRerun.delete(id);\n    if (this._pendingTasks.has(id)) {\n      this._pendingTasks.delete(id);\n      this._taskStats.remainingTasks = this._pendingTasks.size;\n    }\n    this._completedTasks.delete(id);\n  }\n  /**\n   * The clear method disposes all tasks and clears the TaskRunner.\n   */\n  clear(): void {\n    this._taskStats = getDefaultTaskStats();\n    this._bus?.publish(taskListSource, { tasks: [] });\n\n    for (const id of this._prevTasks.keys()) {\n      this.remove(id);\n    }\n  }\n\n  /** Pauses the TaskRunner (for testing). */\n  _pause(): void {\n    this._queue.pause();\n  }\n\n  /** Starts or resumes the TaskRunner (for testing). */\n  _start(): void {\n    this._queue.start();\n  }\n\n  /**\n   * Internal method to report the start of a task to the bus.\n   */\n  private _reportStart(id: string, description: TaskStartDescription): void {\n    if (!this._bus) return;\n\n    const bus = this._bus;\n    const { tasks } = bus.getData<TaskList>(taskListSource.path) || { tasks: [] };\n    const index = tasks.findIndex((t) => t.id === id);\n    const previousDescription = tasks[index];\n    const now = new Date().getTime();\n\n    if (!previousDescription) {\n      this._taskStats.totalTasks++;\n    }\n\n    if (previousDescription?.status === 'complete') {\n      this._taskStats.totalErrors -= previousDescription.errors?.length || 0;\n      this._taskStats.totalWarnings -= previousDescription.warnings?.length || 0;\n    }\n\n    this._taskStats.remainingTasks = this._pendingTasks.size;\n    this._taskStats.status = 'pending';\n\n    const task: TaskDescription = {\n      ...description,\n      status: 'pending',\n      startTime: now,\n    };\n    if (index === -1) {\n      tasks.push(task);\n    } else {\n      tasks[index] = task;\n    }\n\n    bus.publish(taskStatsSource, this._taskStats);\n    bus.publish(taskListSource, { tasks });\n  }\n\n  /**\n   * Internal method to report the end of a task to the bus.\n   */\n  private _reportEnd(id: string, description: TaskEndDescription): void {\n    if (!this._bus) return;\n\n    const bus = this._bus;\n    const { tasks } = bus.getData<TaskList>(taskListSource.path) || { tasks: [] };\n    const index = tasks.findIndex((t) => t.id === id);\n    const previousDescription = tasks[index];\n    const now = new Date().getTime();\n\n    if (previousDescription) {\n      this._taskStats.remainingTasks = this._pendingTasks.size;\n      this._taskStats.totalErrors += description?.errors?.length || 0;\n      this._taskStats.totalWarnings += description?.warnings?.length || 0;\n\n      tasks[index] = {\n        ...previousDescription,\n        ...description,\n        status: 'complete',\n        durationMilliseconds: now - previousDescription.startTime,\n        lastUpdated: now,\n      };\n\n      if (this._taskStats.remainingTasks === 0) {\n        this._taskStats.status = 'idle';\n      }\n\n      bus.publish(taskStatsSource, this._taskStats);\n      bus.publish(taskListSource, { tasks });\n    }\n  }\n}\n\nconst getDefaultTaskStats: () => TaskStats = () => ({\n  status: 'idle',\n  remainingTasks: 0,\n  totalTasks: 0,\n  totalErrors: 0,\n  totalWarnings: 0,\n});\n"]}
+{"version":3,"file":"TaskRunner.js","sourceRoot":"","sources":["../../src/utilities/TaskRunner.ts"],"names":[],"mappings":"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","sourcesContent":["import type { TaskStartDescription } from '../types/TaskStartDescription.js';\nimport type { TaskEndDescription } from '../types/TaskEndDescription.js';\nimport type { Task } from '../types/Task.js';\nimport type { TaskStats } from '../types/TaskStats.js';\nimport type { TaskList } from '../types/TaskList.js';\nimport PQueue from 'p-queue';\nimport { taskListSource, taskStatsSource, type TaskDescription } from '../index.browser.js';\nimport type { DataBus } from '@ms-cloudpack/data-bus';\n\n/**\n * TaskRunner tracks the status of tasks, manages concurrency, allows reusing task results,\n * and sends notifications about task status to the data bus (currently just used for `start`).\n *\n * NOTE: To enable data bus notifications, you must call `connectToBus()`.\n * `createApiContext` does this with the `taskRunner` passed in.\n */\nexport class TaskRunner {\n  private _bus: DataBus | undefined;\n  private _queue: PQueue;\n  private _taskStats: TaskStats;\n  private _pendingTasks: Map<string, Promise<unknown>>;\n  private _completedTasks: Map<string, unknown>;\n  private _requiresRerun: Set<string>;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private _prevTasks: Map<string, Task<any>>;\n\n  constructor() {\n    this._queue = new PQueue({ concurrency: 10 });\n    this._taskStats = getDefaultTaskStats();\n    this._pendingTasks = new Map();\n    this._completedTasks = new Map();\n    this._requiresRerun = new Set();\n    this._prevTasks = new Map();\n  }\n\n  /**\n   * Connects the TaskRunner to the data bus. Tasks will still run without this, but they won't\n   * send any notifications to a client (which only matters if a client is listening, e.g.\n   * the browser while running `start`).\n   */\n  public connectToBus(bus: DataBus): void {\n    this._bus = bus;\n  }\n\n  /**\n   * Enqueue a task and return its result promise.\n   *\n   * If a task with the same `id` was already added, it returns either the previous result\n   * (if completed) or the promise (if pending). Pass `options.rerun` to force re-running.\n   */\n  add<TReturn>(\n    task: Task<TReturn>,\n    options?: {\n      rerun?: boolean;\n      priority?: number;\n    },\n  ): Promise<TReturn> {\n    const { name, id, execute } = task;\n    const { rerun, priority } = options || {};\n\n    if (!this._prevTasks.get(id)) {\n      this._prevTasks.set(id, task);\n    }\n\n    // Check if we are already completed the task with that id.\n    const action = this._completedTasks.get(id) as TReturn | undefined;\n    if (action !== undefined && !rerun) {\n      return Promise.resolve(action);\n    }\n\n    // Check if we are already running the task with that id.\n    const pending = this._pendingTasks.get(id) as Promise<TReturn> | undefined;\n    if (pending !== undefined) {\n      if (rerun) {\n        this._requiresRerun.add(id);\n      }\n      return pending;\n    }\n\n    const resultPromise: Promise<TReturn> = (async () => {\n      let taskResult: TReturn | undefined;\n\n      do {\n        // Delete from rerun list (if present).\n        this._requiresRerun.delete(id);\n\n        taskResult = await this._queue.add(\n          execute,\n          // Removes void from return type.\n          // Read more on: https://github.com/sindresorhus/p-queue/issues/175\n          { throwOnTimeout: true, priority },\n        );\n      } while (this._requiresRerun.has(id));\n\n      // Delete from pending list.\n      this._pendingTasks.delete(id);\n      if (task.getEndDescription) {\n        this._reportEnd(id, task.getEndDescription(taskResult));\n      }\n\n      // Extra check to ensure that the task returned a value.\n      // It should never throw, if it does we have a bug.\n      if (taskResult === undefined) {\n        throw new Error(`Task \"${name}:${id}\" returned undefined, without throwing an error, which was unexpected.`);\n      }\n\n      // Update finished Tasks.\n      this._completedTasks.set(id, taskResult);\n\n      return taskResult;\n    })();\n\n    this._pendingTasks.set(id, resultPromise);\n    this._completedTasks.delete(id);\n    if (task.getStartDescription) {\n      this._reportStart(id, task.getStartDescription());\n    }\n\n    return resultPromise;\n  }\n\n  /**\n   * The remove method disposes a task if available\n   * and then removes it from the TaskRunner.\n   *\n   * This is useful when the state of a task needs to be cleared.\n   *\n   * It is intended to be used by the api server\n   * to clear the TaskRunner's state before reloading the page.\n   */\n  remove(id: string): void {\n    this._prevTasks\n      .get(id)\n      ?.dispose?.()\n      .catch(() => {\n        console.debug(`Error disposing task: ${id}`);\n      });\n    this._prevTasks.get(id)?.onDispose?.();\n    this._prevTasks.delete(id);\n    this._requiresRerun.delete(id);\n    if (this._pendingTasks.has(id)) {\n      this._pendingTasks.delete(id);\n      this._taskStats.remainingTasks = this._pendingTasks.size;\n    }\n    this._completedTasks.delete(id);\n  }\n  /**\n   * The clear method disposes all tasks and clears the TaskRunner.\n   */\n  clear(): void {\n    this._taskStats = getDefaultTaskStats();\n    this._bus?.publish(taskListSource, { tasks: [] });\n\n    for (const id of this._prevTasks.keys()) {\n      this.remove(id);\n    }\n  }\n\n  /** Pauses the TaskRunner (for testing). */\n  _pause(): void {\n    this._queue.pause();\n  }\n\n  /** Starts or resumes the TaskRunner (for testing). */\n  _start(): void {\n    this._queue.start();\n  }\n\n  /**\n   * Internal method to report the start of a task to the bus.\n   */\n  private _reportStart(id: string, description: TaskStartDescription): void {\n    if (!this._bus) return;\n\n    const bus = this._bus;\n    const { tasks } = bus.getData<TaskList>(taskListSource.path) || { tasks: [] };\n    const index = tasks.findIndex((t) => t.id === id);\n    const previousDescription = tasks[index];\n    const now = new Date().getTime();\n\n    if (!previousDescription) {\n      this._taskStats.totalTasks++;\n    }\n\n    if (previousDescription?.status === 'complete') {\n      this._taskStats.totalErrors -= previousDescription.errors?.length || 0;\n      this._taskStats.totalWarnings -= previousDescription.warnings?.length || 0;\n    }\n\n    this._taskStats.remainingTasks = this._pendingTasks.size;\n    this._taskStats.status = 'pending';\n\n    const task: TaskDescription = {\n      ...description,\n      status: 'pending',\n      startTime: now,\n    };\n    if (index === -1) {\n      tasks.push(task);\n    } else {\n      tasks[index] = task;\n    }\n\n    bus.publish(taskStatsSource, this._taskStats);\n    bus.publish(taskListSource, { tasks });\n  }\n\n  /**\n   * Internal method to report the end of a task to the bus.\n   */\n  private _reportEnd(id: string, description: TaskEndDescription): void {\n    if (!this._bus) return;\n\n    const bus = this._bus;\n    const { tasks } = bus.getData<TaskList>(taskListSource.path) || { tasks: [] };\n    const index = tasks.findIndex((t) => t.id === id);\n    const previousDescription = tasks[index];\n    const now = new Date().getTime();\n\n    if (previousDescription) {\n      this._taskStats.remainingTasks = this._pendingTasks.size;\n      this._taskStats.totalErrors += description?.errors?.length || 0;\n      this._taskStats.totalWarnings += description?.warnings?.length || 0;\n\n      tasks[index] = {\n        ...previousDescription,\n        ...description,\n        status: 'complete',\n        durationMilliseconds: now - previousDescription.startTime,\n        lastUpdated: now,\n      };\n\n      if (this._taskStats.remainingTasks === 0) {\n        this._taskStats.status = 'idle';\n      }\n\n      bus.publish(taskStatsSource, this._taskStats);\n      bus.publish(taskListSource, { tasks });\n    }\n  }\n}\n\nconst getDefaultTaskStats: () => TaskStats = () => ({\n  status: 'idle',\n  remainingTasks: 0,\n  totalTasks: 0,\n  totalErrors: 0,\n  totalWarnings: 0,\n});\n"]}

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,CA4DrB"}
+{"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"}

package/lib/utilities/createBundleTask.js

@@ -40,7 +40,12 @@ export function createBundleTask(options, context) {
                 return;
             }
             bundleRequest.result.dispose?.();
-            fs.rmSync(bundleRequest.result.outputPath, { recursive: true, force: true });
+            try {
+                fs.rmSync(bundleRequest.result.outputPath, { recursive: true, force: true });
+            }
+            catch {
+                console.warn(`Error clearing bundle output path (likely due to a file lock): ${bundleRequest.result.outputPath}`);
+            }
             bundleRequest.result = undefined;
         },
         onDispose: () => {

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      fs.rmSync(bundleRequest.result.outputPath, { recursive: true, force: true });\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":"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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"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/api-server",
-  "version": "0.61.4",
+  "version": "0.61.5",
   "description": "An implementation of the API server that does interacts with a task scheduler.",
   "license": "MIT",
   "type": "module",
@@ -27,7 +27,7 @@
     "@lage-run/logger": "^1.3.0",
     "@lage-run/scheduler": "^1.2.1",
     "@lage-run/target-graph": "^0.11.0",
-    "@ms-cloudpack/bundler": "^0.24.3",
+    "@ms-cloudpack/bundler": "^0.24.4",
     "@ms-cloudpack/common-types": "^0.24.10",
     "@ms-cloudpack/config": "^0.33.19",
     "@ms-cloudpack/create-express-app": "^1.10.22",
@@ -43,8 +43,8 @@
     "@ms-cloudpack/remote-cache": "^0.10.15",
     "@ms-cloudpack/task-reporter": "^0.15.1",
     "@ms-cloudpack/telemetry": "^0.10.18",
-    "@trpc/client": "11.0.0-rc.682",
-    "@trpc/server": "11.0.0-rc.682",
+    "@trpc/client": "11.0.0-rc.814",
+    "@trpc/server": "11.0.0-rc.814",
     "cors": "^2.8.5",
     "es-module-lexer": "^1.4.1",
     "filenamify": "^6.0.0",