@ms-cloudpack/api-server 0.66.19 → 0.66.21

package/lib/apis/ensurePackageBundled.js

@@ -150,6 +150,7 @@ async function ensurePackageBundledInternal(params, ctx) {
                 version: dependencyVersion,
                 shouldWatch,
                 enqueueDependencies,
+                shouldGetBundleInfo,
             });
         }
     }

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 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';\nimport { notifyHost } from '../utilities/notifyHost.js';\n\n/**\n * Input for `ensurePackageBundled`.\n */\nexport interface EnsurePackageBundledInput extends Pick<\n  BundleRequest,\n  'outputPath' | 'version' | 'disableSourceMaps' | 'shouldGetBundleInfo'\n> {\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 extends Omit<\n  NonNullable<BundleRequest['result']>,\n  'rebuild' | 'dispose' | 'bundlerName' | 'inputPath'\n> {\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 ${version ? `${name}@${version}` : 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(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(task, { rerun: true });\n\n      // If the result was successful, notify clients about the package update (HMR or full reload)\n      if (watchedResult.result?.errors?.length === 0) {\n        await notifyHost(\n          { reason: 'on-package-change', packageEntry, hash: watchedResult.result.hash },\n          { bus, session, telemetryClient },\n        );\n      }\n    };\n    await watcher.watch(watchOptions, (changedPaths) => {\n      // Filter out the configPaths, we don't want to re-bundle on config changes. CLI will restart it instead.\n      const filteredPaths = changedPaths.filter((p) => !config.configPaths?.appConfigPaths.includes(p));\n      if (filteredPaths.length > 0) {\n        void onPackageChange();\n      }\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 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';\nimport { notifyHost } from '../utilities/notifyHost.js';\n\n/**\n * Input for `ensurePackageBundled`.\n */\nexport interface EnsurePackageBundledInput extends Pick<\n  BundleRequest,\n  'outputPath' | 'version' | 'disableSourceMaps' | 'shouldGetBundleInfo'\n> {\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 extends Omit<\n  NonNullable<BundleRequest['result']>,\n  'rebuild' | 'dispose' | 'bundlerName' | 'inputPath'\n> {\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 ${version ? `${name}@${version}` : 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(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(task, { rerun: true });\n\n      // If the result was successful, notify clients about the package update (HMR or full reload)\n      if (watchedResult.result?.errors?.length === 0) {\n        await notifyHost(\n          { reason: 'on-package-change', packageEntry, hash: watchedResult.result.hash },\n          { bus, session, telemetryClient },\n        );\n      }\n    };\n    await watcher.watch(watchOptions, (changedPaths) => {\n      // Filter out the configPaths, we don't want to re-bundle on config changes. CLI will restart it instead.\n      const filteredPaths = changedPaths.filter((p) => !config.configPaths?.appConfigPaths.includes(p));\n      if (filteredPaths.length > 0) {\n        void onPackageChange();\n      }\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        shouldGetBundleInfo,\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/apis/syncUpload.js

@@ -39,7 +39,7 @@ export async function syncUpload(input, ctx) {
     return await telemetryClient.tracer.startActiveSpan(PerfMeasurementSyncUpload, async (span) => {
         const packageJson = await ctx.packages.get(appPath);
         const { name, version, description } = packageJson;
-        const { dependencies, result: bundleResult } = await ensurePackageBundled({ name, version, enqueueDependencies: true }, ctx);
+        const { dependencies, result: bundleResult } = await ensurePackageBundled({ name, version, enqueueDependencies: true, shouldGetBundleInfo: false }, ctx);
         const bundledPackages = [bundleResult, ...(await dependencies)];
         const packagesToUpload = await Promise.all(bundledPackages
             .filter((p) => p.inputPath && (p.isExternal || syncInternalPackages))

package/lib/apis/syncUpload.js.map

@@ -1 +1 @@
-{"version":3,"file":"syncUpload.js","sourceRoot":"","sources":["../../src/apis/syncUpload.ts"],"names":[],"mappings":"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","sourcesContent":["import { ensurePackageBundled, type EnsurePackageBundledContext } from './ensurePackageBundled.js';\nimport { PerfMeasurementSyncUpload } from '../performance/markers.js';\nimport { getRemoteCachePromiseResultCounts } from '../utilities/getRemoteCachePromiseResultCounts.js';\nimport { createRemoteCacheClientOperationOptions } from '../utilities/createRemoteCacheClientOperationOptions.js';\nimport { createUploadTask } from '../utilities/createUploadTask.js';\nimport { isStaticRoute } from '@ms-cloudpack/common-types';\nimport path from 'path';\nimport { getBundleLocation } from '../utilities/getBundleLocation.js';\nimport { cp } from 'fs/promises';\nimport objectHash from 'object-hash';\nimport type { SyncResult } from '../types/SyncResult.js';\nimport { ensureRemoteCacheEnabled } from '../utilities/ensureRemoteCacheEnabled.js';\nimport { getRemoteCachePackageId } from '../utilities/getRemoteCachePackageId.js';\nimport type { LoginMethod } from '@ms-cloudpack/remote-cache';\nimport { createImportMap } from '@ms-cloudpack/import-map';\nimport { serializeContext } from '../utilities/serializeContext.js';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\n\nconst templateAppServerUrl = 'template://app-server-url';\nconst templateBundleServerUrl = 'template://bundle-server-url';\n\n// TODO: don't hardcode this\nconst targetEnvironment = 'browser';\n\n/**\n * Bundle the current app and its dependencies, and upload them to the remote cache.\n */\nexport async function syncUpload(\n  input: { login: LoginMethod },\n  ctx: Omit<EnsurePackageBundledContext, 'bus' | 'watcher'>,\n): Promise<SyncResult> {\n  const { login } = input;\n  const { session, telemetryClient, taskRunner, remoteCacheClient: client } = ctx;\n  const { config } = session;\n  const { appPath } = config;\n  const { remoteCache: remoteCacheConfig } = config;\n  const syncInternalPackages = config?.features?.syncInternalPackages ?? false;\n\n  ensureRemoteCacheEnabled(config);\n\n  if (!client) {\n    throw new Error('Remote cache client is required to sync upload');\n  }\n\n  if (!remoteCacheConfig) {\n    throw new Error('Remote cache configuration is required to sync upload');\n  }\n\n  // Glob pattern for the files to upload.\n  const globMatches = ['**/*', '!**/*-input.json', '!**/*-output.json'];\n\n  return await telemetryClient.tracer.startActiveSpan(PerfMeasurementSyncUpload, async (span) => {\n    const packageJson = await ctx.packages.get(appPath);\n    const { name, version, description } = packageJson;\n\n    const { dependencies, result: bundleResult } = await ensurePackageBundled(\n      { name, version, enqueueDependencies: true },\n      ctx,\n    );\n\n    const bundledPackages = [bundleResult, ...(await dependencies)];\n    const packagesToUpload = await Promise.all(\n      bundledPackages\n        .filter((p) => p.inputPath && (p.isExternal || syncInternalPackages))\n        .map((p) =>\n          createRemoteCacheClientOperationOptions(\n            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- verified above that it's set\n            { packagePath: p.inputPath!, targetEnvironment },\n            ctx,\n          ),\n        ),\n    );\n\n    if (config.features?.enableCloudHosted) {\n      const appBundleLocation = await getBundleLocation({ packagePath: appPath, targetEnvironment }, ctx);\n      const appOutputPath = appBundleLocation.path;\n      const destinationFolder = path.join(appOutputPath, '__cloudpack');\n      const routesPath = path.join(destinationFolder, 'routes');\n      for (const route of config.routes ?? []) {\n        if (isStaticRoute(route)) {\n          const staticPath = path.resolve(appPath, route.staticPath);\n          const routeHash = objectHash(route);\n          const folderPath = path.join(routesPath, routeHash);\n          await cp(staticPath, path.join(folderPath, route.staticPath), { recursive: true });\n        }\n      }\n\n      if (!session.urls.appServer) {\n        // Using template URLs for the app and bundle servers, because they are not known at this point and the will be replaced with the actual URLs at runtime.\n        session.urls.appServer = templateAppServerUrl;\n        session.urls.bundleServer = templateBundleServerUrl;\n      }\n      session.importMap ??= await createImportMap({ targetEnvironment: 'browser' }, ctx);\n      await serializeContext(destinationFolder, ctx);\n\n      await writeJson(path.join(destinationFolder, 'package.json'), packageJson);\n\n      const { createAppRegistryClient } = await import('@ms-cloudpack/remote-cache');\n      const appRegistryClient = await createAppRegistryClient({\n        context: ctx,\n        options: { cachePath: session.cachePath, loginMethod: login },\n      });\n\n      await appRegistryClient.registerApp({\n        name,\n        // Using the current date and time as the version, because most apps are not versioned.\n        version: new Date().toISOString().slice(0, 16).replace('T', ' '),\n        resourceId: await getRemoteCachePackageId({ packagePath: appPath, targetEnvironment }, ctx),\n        storageAccount: remoteCacheConfig.storageAccount,\n        container: remoteCacheConfig.container,\n        tenantId: remoteCacheConfig.tenantId,\n        description,\n        localBundleFolderName: appBundleLocation.folderName,\n      });\n    }\n\n    const uploads = packagesToUpload.map((pkg) =>\n      taskRunner.add(createUploadTask({ client, options: { ...pkg, globMatches } })),\n    );\n\n    // Do not reject if there is a failure. Failed uploads will be logged in the task reporter.\n    const promiseResults = await Promise.allSettled(uploads);\n\n    const result = getRemoteCachePromiseResultCounts(promiseResults);\n    span.setAttributes(result);\n\n    return result;\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":"syncUpload.js","sourceRoot":"","sources":["../../src/apis/syncUpload.ts"],"names":[],"mappings":"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","sourcesContent":["import { ensurePackageBundled, type EnsurePackageBundledContext } from './ensurePackageBundled.js';\nimport { PerfMeasurementSyncUpload } from '../performance/markers.js';\nimport { getRemoteCachePromiseResultCounts } from '../utilities/getRemoteCachePromiseResultCounts.js';\nimport { createRemoteCacheClientOperationOptions } from '../utilities/createRemoteCacheClientOperationOptions.js';\nimport { createUploadTask } from '../utilities/createUploadTask.js';\nimport { isStaticRoute } from '@ms-cloudpack/common-types';\nimport path from 'path';\nimport { getBundleLocation } from '../utilities/getBundleLocation.js';\nimport { cp } from 'fs/promises';\nimport objectHash from 'object-hash';\nimport type { SyncResult } from '../types/SyncResult.js';\nimport { ensureRemoteCacheEnabled } from '../utilities/ensureRemoteCacheEnabled.js';\nimport { getRemoteCachePackageId } from '../utilities/getRemoteCachePackageId.js';\nimport type { LoginMethod } from '@ms-cloudpack/remote-cache';\nimport { createImportMap } from '@ms-cloudpack/import-map';\nimport { serializeContext } from '../utilities/serializeContext.js';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\n\nconst templateAppServerUrl = 'template://app-server-url';\nconst templateBundleServerUrl = 'template://bundle-server-url';\n\n// TODO: don't hardcode this\nconst targetEnvironment = 'browser';\n\n/**\n * Bundle the current app and its dependencies, and upload them to the remote cache.\n */\nexport async function syncUpload(\n  input: { login: LoginMethod },\n  ctx: Omit<EnsurePackageBundledContext, 'bus' | 'watcher'>,\n): Promise<SyncResult> {\n  const { login } = input;\n  const { session, telemetryClient, taskRunner, remoteCacheClient: client } = ctx;\n  const { config } = session;\n  const { appPath } = config;\n  const { remoteCache: remoteCacheConfig } = config;\n  const syncInternalPackages = config?.features?.syncInternalPackages ?? false;\n\n  ensureRemoteCacheEnabled(config);\n\n  if (!client) {\n    throw new Error('Remote cache client is required to sync upload');\n  }\n\n  if (!remoteCacheConfig) {\n    throw new Error('Remote cache configuration is required to sync upload');\n  }\n\n  // Glob pattern for the files to upload.\n  const globMatches = ['**/*', '!**/*-input.json', '!**/*-output.json'];\n\n  return await telemetryClient.tracer.startActiveSpan(PerfMeasurementSyncUpload, async (span) => {\n    const packageJson = await ctx.packages.get(appPath);\n    const { name, version, description } = packageJson;\n\n    const { dependencies, result: bundleResult } = await ensurePackageBundled(\n      { name, version, enqueueDependencies: true, shouldGetBundleInfo: false },\n      ctx,\n    );\n\n    const bundledPackages = [bundleResult, ...(await dependencies)];\n    const packagesToUpload = await Promise.all(\n      bundledPackages\n        .filter((p) => p.inputPath && (p.isExternal || syncInternalPackages))\n        .map((p) =>\n          createRemoteCacheClientOperationOptions(\n            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- verified above that it's set\n            { packagePath: p.inputPath!, targetEnvironment },\n            ctx,\n          ),\n        ),\n    );\n\n    if (config.features?.enableCloudHosted) {\n      const appBundleLocation = await getBundleLocation({ packagePath: appPath, targetEnvironment }, ctx);\n      const appOutputPath = appBundleLocation.path;\n      const destinationFolder = path.join(appOutputPath, '__cloudpack');\n      const routesPath = path.join(destinationFolder, 'routes');\n      for (const route of config.routes ?? []) {\n        if (isStaticRoute(route)) {\n          const staticPath = path.resolve(appPath, route.staticPath);\n          const routeHash = objectHash(route);\n          const folderPath = path.join(routesPath, routeHash);\n          await cp(staticPath, path.join(folderPath, route.staticPath), { recursive: true });\n        }\n      }\n\n      if (!session.urls.appServer) {\n        // Using template URLs for the app and bundle servers, because they are not known at this point and the will be replaced with the actual URLs at runtime.\n        session.urls.appServer = templateAppServerUrl;\n        session.urls.bundleServer = templateBundleServerUrl;\n      }\n      session.importMap ??= await createImportMap({ targetEnvironment: 'browser' }, ctx);\n      await serializeContext(destinationFolder, ctx);\n\n      await writeJson(path.join(destinationFolder, 'package.json'), packageJson);\n\n      const { createAppRegistryClient } = await import('@ms-cloudpack/remote-cache');\n      const appRegistryClient = await createAppRegistryClient({\n        context: ctx,\n        options: { cachePath: session.cachePath, loginMethod: login },\n      });\n\n      await appRegistryClient.registerApp({\n        name,\n        // Using the current date and time as the version, because most apps are not versioned.\n        version: new Date().toISOString().slice(0, 16).replace('T', ' '),\n        resourceId: await getRemoteCachePackageId({ packagePath: appPath, targetEnvironment }, ctx),\n        storageAccount: remoteCacheConfig.storageAccount,\n        container: remoteCacheConfig.container,\n        tenantId: remoteCacheConfig.tenantId,\n        description,\n        localBundleFolderName: appBundleLocation.folderName,\n      });\n    }\n\n    const uploads = packagesToUpload.map((pkg) =>\n      taskRunner.add(createUploadTask({ client, options: { ...pkg, globMatches } })),\n    );\n\n    // Do not reject if there is a failure. Failed uploads will be logged in the task reporter.\n    const promiseResults = await Promise.allSettled(uploads);\n\n    const result = getRemoteCachePromiseResultCounts(promiseResults);\n    span.setAttributes(result);\n\n    return result;\n  });\n}\n\n// This function doesn't have an attached procedure because it's never called via the TRPC server.\n"]}

package/lib/types/BundleRequest.d.ts

@@ -35,7 +35,7 @@ export interface BundleRequest {
     /** Whether to disable source maps */
     disableSourceMaps?: boolean;
     /** Whether to scan the bundled code for imports and exports */
-    shouldGetBundleInfo?: boolean;
+    shouldGetBundleInfo: boolean | undefined;
     /** Whether to disable caching */
     disableCache?: boolean;
 }

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,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"}
+{"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,EAAE,OAAO,GAAG,SAAS,CAAC;IAEzC,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 (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"]}
+{"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 | undefined;\n\n  /** Whether to disable caching */\n  disableCache?: boolean;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/api-server",
-  "version": "0.66.19",
+  "version": "0.66.21",
   "description": "Internal API server for Cloudpack",
   "license": "MIT",
   "type": "module",
@@ -35,7 +35,7 @@
     "test": "cloudpack-scripts test"
   },
   "dependencies": {
-    "@ms-cloudpack/bundler": "^0.27.21",
+    "@ms-cloudpack/bundler": "^0.27.22",
     "@ms-cloudpack/common-types": "^0.33.3",
     "@ms-cloudpack/config": "^0.38.35",
     "@ms-cloudpack/create-express-app": "^1.10.72",