@ms-cloudpack/api-server 0.41.0 → 0.42.1

package/lib/types/Session.d.ts

@@ -37,6 +37,14 @@ export interface Session {
      * up to date with the latest changes.
      */
     sequence: number;
+    /**
+     * Urls of the active servers hosting this session.
+     */
+    urls: {
+        appServer: string;
+        bundleServer: string;
+        apiServer: string;
+    };
     /**
      * Used to force a hard refresh on the client.
      */

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

@@ -1 +1 @@
-{"version":3,"file":"Session.d.ts","sourceRoot":"","sources":["../../src/types/Session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAElE,MAAM,WAAW,OAAO;IACtB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,MAAM,EAAE,eAAe,CAAC;IAExB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;OAIG;IACH,IAAI,EAAE,SAAS,GAAG,SAAS,CAAC;IAE5B;;;;;;OAMG;IACH,IAAI,EAAE,SAAS,GAAG,aAAa,GAAG,YAAY,CAAC;IAE/C;;OAEG;IACH,UAAU,EAAE,UAAU,CAAC;IAEvB;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;OAEG;IACH,uBAAuB,EAAE,MAAM,IAAI,CAAC;IAEpC;;;OAGG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEvC;;OAEG;IACH,sBAAsB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAEpD;;OAEG;IACH,SAAS,EAAE,SAAS,GAAG,SAAS,CAAC;CAClC"}
+{"version":3,"file":"Session.d.ts","sourceRoot":"","sources":["../../src/types/Session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAElE,MAAM,WAAW,OAAO;IACtB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,MAAM,EAAE,eAAe,CAAC;IAExB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;OAIG;IACH,IAAI,EAAE,SAAS,GAAG,SAAS,CAAC;IAE5B;;;;;;OAMG;IACH,IAAI,EAAE,SAAS,GAAG,aAAa,GAAG,YAAY,CAAC;IAE/C;;OAEG;IACH,UAAU,EAAE,UAAU,CAAC;IAEvB;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,IAAI,EAAE;QACJ,SAAS,EAAE,MAAM,CAAC;QAClB,YAAY,EAAE,MAAM,CAAC;QACrB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IAEF;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;OAEG;IACH,uBAAuB,EAAE,MAAM,IAAI,CAAC;IAEpC;;;OAGG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEvC;;OAEG;IACH,sBAAsB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAEpD;;OAEG;IACH,SAAS,EAAE,SAAS,GAAG,SAAS,CAAC;CAClC"}

package/lib/types/Session.js.map

@@ -1 +1 @@
-{"version":3,"file":"Session.js","sourceRoot":"","sources":["../../src/types/Session.ts"],"names":[],"mappings":"","sourcesContent":["import type { ImportMap } from '@ms-cloudpack/import-map';\nimport type { ResolveMap } from '@ms-cloudpack/package-utilities';\nimport type { CloudpackConfig } from '@ms-cloudpack/common-types';\n\nexport interface Session {\n  /**\n   * The session id, used for identifying\n   */\n  id: string;\n\n  /**\n   * The config used by the session.\n   */\n  config: CloudpackConfig;\n\n  /**\n   * The primary application path to monitor.\n   */\n  appPath: string;\n\n  /**\n   * The type of session controls how the code is served via start.\n   * Web apps require app server and asset hosting, while libraries\n   * only need a bundle service.\n   */\n  type: 'web-app' | 'library';\n\n  /**\n   * The mode of the session controls how the code is bundled. Library\n   * mode bundles each package in isolation, while development and\n   * production modes bundle the full app graph together. Library\n   * mode is fastest but packages must be complaint for loading in\n   * the browser.\n   */\n  mode: 'library' | 'development' | 'production';\n\n  /**\n   * Used to resolve packages in the dependency graph.\n   */\n  resolveMap: ResolveMap;\n\n  /**\n   * Reload sequence to ensure that the client is always\n   * up to date with the latest changes.\n   */\n  sequence: number;\n\n  /**\n   * Used to force a hard refresh on the client.\n   */\n  sessionVersion: number;\n\n  /**\n   * Used to increment the session version by 1.\n   */\n  incrementSessionVersion: () => void;\n\n  /**\n   * The name of the project folder.\n   * Used to differentiate between multiple projects.\n   */\n  projectName: string;\n\n  /**\n   * The version of each target.\n   * Used to force a client cache refresh on a single target.\n   */\n  targetVersions: Record<string, number>;\n\n  /**\n   * Increments the version for the given target.\n   */\n  incrementTargetVersion: (inputPath: string) => void;\n\n  /**\n   * The import map for the session.\n   */\n  importMap: ImportMap | undefined;\n}\n"]}
+{"version":3,"file":"Session.js","sourceRoot":"","sources":["../../src/types/Session.ts"],"names":[],"mappings":"","sourcesContent":["import type { ImportMap } from '@ms-cloudpack/import-map';\nimport type { ResolveMap } from '@ms-cloudpack/package-utilities';\nimport type { CloudpackConfig } from '@ms-cloudpack/common-types';\n\nexport interface Session {\n  /**\n   * The session id, used for identifying\n   */\n  id: string;\n\n  /**\n   * The config used by the session.\n   */\n  config: CloudpackConfig;\n\n  /**\n   * The primary application path to monitor.\n   */\n  appPath: string;\n\n  /**\n   * The type of session controls how the code is served via start.\n   * Web apps require app server and asset hosting, while libraries\n   * only need a bundle service.\n   */\n  type: 'web-app' | 'library';\n\n  /**\n   * The mode of the session controls how the code is bundled. Library\n   * mode bundles each package in isolation, while development and\n   * production modes bundle the full app graph together. Library\n   * mode is fastest but packages must be complaint for loading in\n   * the browser.\n   */\n  mode: 'library' | 'development' | 'production';\n\n  /**\n   * Used to resolve packages in the dependency graph.\n   */\n  resolveMap: ResolveMap;\n\n  /**\n   * Reload sequence to ensure that the client is always\n   * up to date with the latest changes.\n   */\n  sequence: number;\n\n  /**\n   * Urls of the active servers hosting this session.\n   */\n  urls: {\n    appServer: string;\n    bundleServer: string;\n    apiServer: string;\n  };\n\n  /**\n   * Used to force a hard refresh on the client.\n   */\n  sessionVersion: number;\n\n  /**\n   * Used to increment the session version by 1.\n   */\n  incrementSessionVersion: () => void;\n\n  /**\n   * The name of the project folder.\n   * Used to differentiate between multiple projects.\n   */\n  projectName: string;\n\n  /**\n   * The version of each target.\n   * Used to force a client cache refresh on a single target.\n   */\n  targetVersions: Record<string, number>;\n\n  /**\n   * Increments the version for the given target.\n   */\n  incrementTargetVersion: (inputPath: string) => void;\n\n  /**\n   * The import map for the session.\n   */\n  importMap: ImportMap | undefined;\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"addOverride.d.ts","sourceRoot":"","sources":["../../src/utilities/addOverride.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,KAAK,eAAe,EACrB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAGnE;;;GAGG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,GAAG,SAAS,CAAC,GAC7C,OAAO,CAAC;IACT,kDAAkD;IAClD,aAAa,EAAE,OAAO,CAAC;IACvB,sEAAsE;IACtE,KAAK,CAAC,EAAE,eAAe,CAAC;CACzB,CAAC,CAwHD"}
+{"version":3,"file":"addOverride.d.ts","sourceRoot":"","sources":["../../src/utilities/addOverride.ts"],"names":[],"mappings":"AAEA,OAAO,EAKL,KAAK,eAAe,EACrB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAEnE;;;GAGG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,GAAG,SAAS,CAAC,GAC7C,OAAO,CAAC;IACT,kDAAkD;IAClD,aAAa,EAAE,OAAO,CAAC;IACvB,sEAAsE;IACtE,KAAK,CAAC,EAAE,eAAe,CAAC;CACzB,CAAC,CAwHD"}

package/lib/utilities/addOverride.js

@@ -1,7 +1,7 @@
 import { checkMatch, readGeneratedConfig, writeGeneratedConfig } from '@ms-cloudpack/config';
+import { parseRequestInfo } from '@ms-cloudpack/import-map';
 import { addExportsMapEntry, findResolveMapEntry, flattenExportsMap, getExportsMap, } from '@ms-cloudpack/package-utilities';
-import { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';
-import { parseRequestUrl } from './parseRequestUrl.js';
+import { makeUrl, normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';
 /**
  * The addOverride method is triggered by a user action in the overlay, when we detect new usage of an import path
  * that isn't recognized. When the user triggers this override, we write it to the cloudpack generated config.
@@ -12,7 +12,7 @@ export async function addOverride(options, context) {
     let addedOverride = false;
     let requiredBy = undefined;
     if (issuerUrl) {
-        const { packageName: issuerName, version: issuerVersion } = parseRequestUrl(issuerUrl);
+        const { packageName: issuerName, version: issuerVersion } = parseRequestInfo(makeUrl(issuerUrl).pathname);
         requiredBy = { name: issuerName, version: issuerVersion };
     }
     const entry = findResolveMapEntry({

package/lib/utilities/addOverride.js.map

@@ -1 +1 @@
-{"version":3,"file":"addOverride.js","sourceRoot":"","sources":["../../src/utilities/addOverride.ts"],"names":[],"mappings":"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","sourcesContent":["import { checkMatch, readGeneratedConfig, writeGeneratedConfig } from '@ms-cloudpack/config';\nimport {\n  addExportsMapEntry,\n  findResolveMapEntry,\n  flattenExportsMap,\n  getExportsMap,\n  type ResolveMapEntry,\n} from '@ms-cloudpack/package-utilities';\nimport { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport type { Context } from '../types/Context.js';\nimport type { OverrideOptions } from '../types/OverrideOptions.js';\nimport { parseRequestUrl } from './parseRequestUrl.js';\n\n/**\n * The addOverride method is triggered by a user action in the overlay, when we detect new usage of an import path\n * that isn't recognized. When the user triggers this override, we write it to the cloudpack generated config.\n */\nexport async function addOverride(\n  options: OverrideOptions,\n  context: Pick<Context, 'packages' | 'session'>,\n): Promise<{\n  /** Whether the override was successfully added */\n  addedOverride: boolean;\n  /** The entry (if any) in the resolve map the override was added to */\n  entry?: ResolveMapEntry;\n}> {\n  const { packageName, importPath, version, issuerUrl } = options;\n  const { session, packages } = context;\n  let addedOverride = false;\n  let requiredBy = undefined;\n\n  if (issuerUrl) {\n    const { packageName: issuerName, version: issuerVersion } = parseRequestUrl(issuerUrl);\n    requiredBy = { name: issuerName, version: issuerVersion };\n  }\n\n  const entry = findResolveMapEntry({\n    packageName,\n    resolveMap: session.resolveMap,\n    definition: requiredBy,\n    version,\n  });\n\n  if (!entry) {\n    console.error(`Could not find entry of package \"${packageName}\" in resolve map`);\n    return { addedOverride, entry };\n  }\n\n  const packagePath = entry.path;\n\n  // Get current exports. We want to add an additional entry to what's there - not replace the default exports,\n  // so we need the full map for the package.\n  const exports = await getExportsMap({ packagePath }, { packages, config: session.config });\n  const flattenedExports = flattenExportsMap(exports, { packagePath });\n\n  // Return false if the import path already exists in the exports map.\n  if (flattenedExports[normalizeRelativePath(importPath)]) {\n    console.debug(`The import path \"${importPath}\" already exists in the exports map for \"${packageName}\".`);\n    return { addedOverride, entry };\n  }\n\n  const addedExports = {};\n\n  // Add the single new exports entry to the exports map.\n  addedOverride = await addExportsMapEntry(\n    {\n      // This is required as addExportsMapEntry assumes addedExports is a record.\n      exports: addedExports,\n      packagePath,\n      importPath,\n    },\n    { packages, config: session.config },\n  );\n\n  if (!addedOverride) {\n    console.warn(\n      `Unable to add override for package \"${packageName}\" to \"cloudpack.config.json\". The file \"${normalizeRelativePath(\n        importPath,\n      )}\" could not be found. Please check the import path and try again.`,\n    );\n    return { addedOverride, entry };\n  }\n\n  if (Array.isArray(exports)) {\n    exports.push(addedExports);\n  } else {\n    const definition = await packages.get(packagePath);\n    if (!definition) {\n      console.error(`Could not find definition of package \"${packageName}\" in the cache`);\n      return { addedOverride, entry };\n    }\n    definition.exports = [exports, addedExports];\n  }\n\n  // Parse the user config if it exists.\n  const config = await readGeneratedConfig(session.appPath);\n\n  // Ensure packageSettings exist.\n  config.packageSettings ??= [];\n\n  const configMatches = config.packageSettings.filter(({ match }) =>\n    checkMatch({ name: packageName, version: entry.version, match, exactMatch: true }),\n  );\n\n  if (!configMatches.length) {\n    config.packageSettings.push({\n      match: {\n        name: packageName,\n        version: `^${entry.version}`,\n      },\n      exports: addedExports,\n    });\n  } else {\n    if (configMatches.length > 1) {\n      console.debug(\n        `Found multiple matches for package \"${packageName}\" in cloudpack.config.json. Using the first match.`,\n      );\n    }\n\n    // Use the first match and ensure exports exist\n    configMatches[0].exports ??= {};\n\n    const flattenedMatchExports = flattenExportsMap(configMatches[0].exports, { packagePath });\n\n    // Return false if the import path already exists in the match exports map.\n    if (flattenedMatchExports[normalizeRelativePath(importPath)]) {\n      console.debug(`The import path \"${importPath}\" already exists in the config exports map for \"${packageName}\".`);\n      return { addedOverride: false, entry };\n    }\n\n    // Add the single new exports entry to the match exports map.\n    await addExportsMapEntry(\n      {\n        exports: configMatches[0].exports,\n        packagePath,\n        importPath,\n      },\n      { packages, config: session.config },\n    );\n  }\n\n  await writeGeneratedConfig(config, session.appPath);\n  console.debug(`Added override for \"${packageName}\" to \"cloudpack.config.json\".`);\n\n  return { addedOverride, entry };\n}\n"]}
+{"version":3,"file":"addOverride.js","sourceRoot":"","sources":["../../src/utilities/addOverride.ts"],"names":[],"mappings":"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","sourcesContent":["import { checkMatch, readGeneratedConfig, writeGeneratedConfig } from '@ms-cloudpack/config';\nimport { parseRequestInfo } from '@ms-cloudpack/import-map';\nimport {\n  addExportsMapEntry,\n  findResolveMapEntry,\n  flattenExportsMap,\n  getExportsMap,\n  type ResolveMapEntry,\n} from '@ms-cloudpack/package-utilities';\nimport { makeUrl, normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport type { Context } from '../types/Context.js';\nimport type { OverrideOptions } from '../types/OverrideOptions.js';\n\n/**\n * The addOverride method is triggered by a user action in the overlay, when we detect new usage of an import path\n * that isn't recognized. When the user triggers this override, we write it to the cloudpack generated config.\n */\nexport async function addOverride(\n  options: OverrideOptions,\n  context: Pick<Context, 'packages' | 'session'>,\n): Promise<{\n  /** Whether the override was successfully added */\n  addedOverride: boolean;\n  /** The entry (if any) in the resolve map the override was added to */\n  entry?: ResolveMapEntry;\n}> {\n  const { packageName, importPath, version, issuerUrl } = options;\n  const { session, packages } = context;\n  let addedOverride = false;\n  let requiredBy = undefined;\n\n  if (issuerUrl) {\n    const { packageName: issuerName, version: issuerVersion } = parseRequestInfo(makeUrl(issuerUrl).pathname);\n    requiredBy = { name: issuerName, version: issuerVersion };\n  }\n\n  const entry = findResolveMapEntry({\n    packageName,\n    resolveMap: session.resolveMap,\n    definition: requiredBy,\n    version,\n  });\n\n  if (!entry) {\n    console.error(`Could not find entry of package \"${packageName}\" in resolve map`);\n    return { addedOverride, entry };\n  }\n\n  const packagePath = entry.path;\n\n  // Get current exports. We want to add an additional entry to what's there - not replace the default exports,\n  // so we need the full map for the package.\n  const exports = await getExportsMap({ packagePath }, { packages, config: session.config });\n  const flattenedExports = flattenExportsMap(exports, { packagePath });\n\n  // Return false if the import path already exists in the exports map.\n  if (flattenedExports[normalizeRelativePath(importPath)]) {\n    console.debug(`The import path \"${importPath}\" already exists in the exports map for \"${packageName}\".`);\n    return { addedOverride, entry };\n  }\n\n  const addedExports = {};\n\n  // Add the single new exports entry to the exports map.\n  addedOverride = await addExportsMapEntry(\n    {\n      // This is required as addExportsMapEntry assumes addedExports is a record.\n      exports: addedExports,\n      packagePath,\n      importPath,\n    },\n    { packages, config: session.config },\n  );\n\n  if (!addedOverride) {\n    console.warn(\n      `Unable to add override for package \"${packageName}\" to \"cloudpack.config.json\". The file \"${normalizeRelativePath(\n        importPath,\n      )}\" could not be found. Please check the import path and try again.`,\n    );\n    return { addedOverride, entry };\n  }\n\n  if (Array.isArray(exports)) {\n    exports.push(addedExports);\n  } else {\n    const definition = await packages.get(packagePath);\n    if (!definition) {\n      console.error(`Could not find definition of package \"${packageName}\" in the cache`);\n      return { addedOverride, entry };\n    }\n    definition.exports = [exports, addedExports];\n  }\n\n  // Parse the user config if it exists.\n  const config = await readGeneratedConfig(session.appPath);\n\n  // Ensure packageSettings exist.\n  config.packageSettings ??= [];\n\n  const configMatches = config.packageSettings.filter(({ match }) =>\n    checkMatch({ name: packageName, version: entry.version, match, exactMatch: true }),\n  );\n\n  if (!configMatches.length) {\n    config.packageSettings.push({\n      match: {\n        name: packageName,\n        version: `^${entry.version}`,\n      },\n      exports: addedExports,\n    });\n  } else {\n    if (configMatches.length > 1) {\n      console.debug(\n        `Found multiple matches for package \"${packageName}\" in cloudpack.config.json. Using the first match.`,\n      );\n    }\n\n    // Use the first match and ensure exports exist\n    configMatches[0].exports ??= {};\n\n    const flattenedMatchExports = flattenExportsMap(configMatches[0].exports, { packagePath });\n\n    // Return false if the import path already exists in the match exports map.\n    if (flattenedMatchExports[normalizeRelativePath(importPath)]) {\n      console.debug(`The import path \"${importPath}\" already exists in the config exports map for \"${packageName}\".`);\n      return { addedOverride: false, entry };\n    }\n\n    // Add the single new exports entry to the match exports map.\n    await addExportsMapEntry(\n      {\n        exports: configMatches[0].exports,\n        packagePath,\n        importPath,\n      },\n      { packages, config: session.config },\n    );\n  }\n\n  await writeGeneratedConfig(config, session.appPath);\n  console.debug(`Added override for \"${packageName}\" to \"cloudpack.config.json\".`);\n\n  return { addedOverride, entry };\n}\n"]}

package/lib/utilities/bundleTask.d.ts

@@ -1,20 +1,12 @@
-import type { CloudpackConfig, PackageDefinitionsCache } from '@ms-cloudpack/common-types';
-import type { PackageHashes } from '@ms-cloudpack/package-hashes';
-import { type ResolveMap } from '@ms-cloudpack/package-utilities';
-import { type TaskReporter } from '@ms-cloudpack/task-reporter';
-import type { TelemetryClient } from '@ms-cloudpack/telemetry';
 import type { BundleRequest } from '../types/BundleRequest.js';
 import type { BundleTaskOptions } from '../types/BundleTaskOptions.js';
-export declare function bundleTask(params: {
+import type { PartialContext } from '../types/Context.js';
+export type BundleTaskInternalOptions = BundleTaskOptions & {
     bundleRequest: BundleRequest;
-    options?: BundleTaskOptions;
-    context: {
-        packages: PackageDefinitionsCache;
-        config: CloudpackConfig;
-        resolveMap: ResolveMap;
-        packageHashes: PackageHashes;
-        reporter?: TaskReporter;
-        telemetryClient?: TelemetryClient;
-    };
-}): Promise<BundleRequest>;
+};
+export type BundleTaskInternalContext = PartialContext<'packages' | 'packageHashes' | 'reporter' | 'telemetryClient', 'resolveMap' | 'config'>;
+/**
+ * Create and run a TaskReporter task which calls `bundle()` from `@ms-cloudpack/bundler` and formats the result.
+ */
+export declare function bundleTask(options: BundleTaskInternalOptions, context: BundleTaskInternalContext): Promise<void>;
 //# sourceMappingURL=bundleTask.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"bundleTask.d.ts","sourceRoot":"","sources":["../../src/utilities/bundleTask.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAiB,eAAe,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAC1G,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAGlE,OAAO,EAAiB,KAAK,UAAU,EAAE,MAAM,iCAAiC,CAAC;AACjF,OAAO,EAAqB,KAAK,YAAY,EAA+B,MAAM,6BAA6B,CAAC;AAChH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAG/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AASvE,wBAAsB,UAAU,CAAC,MAAM,EAAE;IACvC,aAAa,EAAE,aAAa,CAAC;IAC7B,OAAO,CAAC,EAAE,iBAAiB,CAAC;IAC5B,OAAO,EAAE;QACP,QAAQ,EAAE,uBAAuB,CAAC;QAClC,MAAM,EAAE,eAAe,CAAC;QACxB,UAAU,EAAE,UAAU,CAAC;QACvB,aAAa,EAAE,aAAa,CAAC;QAC7B,QAAQ,CAAC,EAAE,YAAY,CAAC;QACxB,eAAe,CAAC,EAAE,eAAe,CAAC;KACnC,CAAC;CACH,GAAG,OAAO,CAAC,aAAa,CAAC,CA8BzB"}
+{"version":3,"file":"bundleTask.d.ts","sourceRoot":"","sources":["../../src/utilities/bundleTask.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAQvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,MAAM,MAAM,yBAAyB,GAAG,iBAAiB,GAAG;IAAE,aAAa,EAAE,aAAa,CAAA;CAAE,CAAC;AAC7F,MAAM,MAAM,yBAAyB,GAAG,cAAc,CACpD,UAAU,GAAG,eAAe,GAAG,UAAU,GAAG,iBAAiB,EAC7D,YAAY,GAAG,QAAQ,CACxB,CAAC;AAEF;;GAEG;AACH,wBAAsB,UAAU,CAC9B,OAAO,EAAE,yBAAyB,EAClC,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,IAAI,CAAC,CAmIf"}

package/lib/utilities/bundleTask.js

@@ -1,4 +1,4 @@
-import { bundle as bundleInternal, getEntriesMapFromPackage, getExternalsFromPackage } from '@ms-cloudpack/bundler';
+import { bundle, getEntriesMapFromPackage, getExternalsFromPackage } from '@ms-cloudpack/bundler';
 import { getPackageSettings } from '@ms-cloudpack/config';
 import { writeJson } from '@ms-cloudpack/json-utilities';
 import { getExportsMap } from '@ms-cloudpack/package-utilities';
@@ -12,127 +12,117 @@ import { isCachedResultValid } from './isCachedResultValid.js';
 import { readResultFromCache } from './readResultFromCache.js';
 import { saveResultToCache } from './saveResultToCache.js';
 import { formatBundleTaskResult } from './formatBundleTaskResult.js';
-export async function bundleTask(params) {
-    const { bundleRequest, options = {}, context } = params;
+/**
+ * Create and run a TaskReporter task which calls `bundle()` from `@ms-cloudpack/bundler` and formats the result.
+ */
+export async function bundleTask(options, context) {
+    const { bundleRequest, force, hash, sourceHash } = options;
     const { packageName, version } = bundleRequest;
-    const { reporter, telemetryClient } = context;
+    const { reporter, telemetryClient, packageHashes, packages, session } = context;
+    const { config } = session;
     const { retryCount } = options;
     telemetryClient?.performance.registerAggregator(diskCacheRatioMetricEventAggregator);
-    const executeBundle = async () => {
-        await bundle({ bundleRequest, context, options });
-        diskCacheRatioMetricEventAggregator?.record({
-            isCacheHit: !!bundleRequest.resultFromCache,
-            isExternal: bundleRequest.isExternal,
-        });
-        return formatBundleTaskResult(bundleRequest);
-    };
-    if (reporter) {
-        const taskName = `Bundle ${formatPackageName({
-            name: packageName,
-            version,
-        })}${retryCount ? ` (retry ${retryCount})` : ''}`;
-        await reporter.runTask(taskName, executeBundle);
-    }
-    else {
-        await executeBundle();
-    }
-    return bundleRequest;
-}
-async function bundle(params) {
-    const { bundleRequest, context, options = {} } = params;
-    const { config, packageHashes } = context;
-    const { force, hash, sourceHash } = options;
-    // If force is set, dispose the existing result.
-    if (force && bundleRequest?.result?.dispose) {
-        bundleRequest.result.dispose();
-        bundleRequest.result = undefined;
-    }
-    const { packagePath, isExternal, isIncremental, disableSourceMaps, shouldGetBundleInfo } = bundleRequest;
-    const outputPath = bundleRequest.outputPath ??
-        (await getBundleLocation({ packagePath, shouldRecalculate: force, hash }, context)).path;
-    // Rehydrate the result if not incremental.
-    if (bundleRequest.result === undefined && !force) {
-        bundleRequest.result = await readResultFromCache(outputPath, {
-            inputPath: packagePath,
-        });
-    }
-    const cacheValidationHash = !isExternal
-        ? sourceHash || (await packageHashes.get({ packagePath, isSourceHashingEnabled: true, shouldRecalculate: true }))
-        : undefined;
-    // if the cached result is valid, use it.
-    if (!force && isCachedResultValid({ bundleRequest, hash: cacheValidationHash })) {
-        console.debug(`Using cached result for ${bundleRequest.packageName}@${bundleRequest.version}`);
-        bundleRequest.resultFromCache = true;
-    }
-    else {
-        bundleRequest.resultFromCache = false;
-        // Only use cached result if it's successful.
-        await prepareOutputPath(outputPath);
-        if (bundleRequest.result?.rebuild) {
-            bundleRequest.result = {
-                ...(await bundleRequest.result.rebuild()),
-                outputPath: bundleRequest.result.outputPath,
-                hash: cacheValidationHash,
-            };
+    const taskName = `Bundle ${formatPackageName({
+        name: packageName,
+        version,
+    })}${retryCount ? ` (retry ${retryCount})` : ''}`;
+    await reporter.runTask(taskName, async () => {
+        // If force is set, dispose the existing result.
+        if (force && bundleRequest?.result?.dispose) {
+            bundleRequest.result.dispose();
+            bundleRequest.result = undefined;
         }
-        else {
-            const { userPackageSettings, generatedPackageSettings } = getPackageSettings({
-                name: bundleRequest.packageName,
-                version: bundleRequest.version,
-                config,
-            }) || {};
-            const { bundlerType, bundlerOptions } = userPackageSettings || {};
-            const inlinedDependencies = [
-                ...(userPackageSettings?.inlinedDependencies || []),
-                ...(generatedPackageSettings?.inlinedDependencies || []),
-            ];
-            // These are only used by the bundler-plugin-ori.
-            const dynamicImports = [
-                ...(userPackageSettings?.dynamicImports || []),
-                ...(generatedPackageSettings?.dynamicImports || []),
-            ];
-            const bundleOptions = {
-                bundlerType: bundleRequest.bundlerType || bundlerType,
-                overrideOptions: bundlerOptions,
+        const { packagePath, isExternal, isIncremental, disableSourceMaps, shouldGetBundleInfo } = bundleRequest;
+        const outputPath = bundleRequest.outputPath ??
+            (await getBundleLocation({ packagePath, shouldRecalculate: force, hash }, context)).path;
+        // Rehydrate the result if not incremental.
+        if (bundleRequest.result === undefined && !force) {
+            bundleRequest.result = await readResultFromCache(outputPath, {
                 inputPath: packagePath,
+            });
+        }
+        const cacheValidationHash = !isExternal
+            ? sourceHash || (await packageHashes.get({ packagePath, isSourceHashingEnabled: true, shouldRecalculate: true }))
+            : undefined;
+        // if the cached result is valid, use it.
+        if (!force && isCachedResultValid({ bundleRequest, hash: cacheValidationHash })) {
+            console.debug(`Using cached result for ${bundleRequest.packageName}@${bundleRequest.version}`);
+            bundleRequest.resultFromCache = true;
+        }
+        else {
+            bundleRequest.resultFromCache = false;
+            // Only use cached result if it's successful.
+            await prepareOutputPath(outputPath);
+            if (bundleRequest.result?.rebuild) {
+                bundleRequest.result = {
+                    ...(await bundleRequest.result.rebuild()),
+                    outputPath: bundleRequest.result.outputPath,
+                    hash: cacheValidationHash,
+                };
+            }
+            else {
+                const { userPackageSettings, generatedPackageSettings } = getPackageSettings({
+                    name: bundleRequest.packageName,
+                    version: bundleRequest.version,
+                    config: session.config,
+                }) || {};
+                const { bundlerType, bundlerOptions } = userPackageSettings || {};
+                const inlinedDependencies = [
+                    ...(userPackageSettings?.inlinedDependencies || []),
+                    ...(generatedPackageSettings?.inlinedDependencies || []),
+                ];
+                // These are only used by the bundler-plugin-ori.
+                const dynamicImports = [
+                    ...(userPackageSettings?.dynamicImports || []),
+                    ...(generatedPackageSettings?.dynamicImports || []),
+                ];
+                const bundleOptions = {
+                    bundlerType: bundleRequest.bundlerType || bundlerType,
+                    overrideOptions: bundlerOptions,
+                    inputPath: packagePath,
+                    outputPath,
+                    incremental: isIncremental !== undefined ? isIncremental : false,
+                    sourcemap: disableSourceMaps ? undefined : 'linked',
+                    entries: await getEntriesMapFromPackage({ inputPath: packagePath }, { packages, config }),
+                    inlined: inlinedDependencies,
+                    external: await getExternalsFromPackage({ inputPath: packagePath }, { packages, config }),
+                    dynamicImports,
+                };
+                const bundleInternalResult = await bundle(bundleOptions, { config });
+                bundleRequest.result = {
+                    ...bundleInternalResult,
+                    outputPath: bundleOptions.outputPath ?? outputPath,
+                    hash: cacheValidationHash,
+                };
+            }
+            // Write the result to disk.
+            await saveResultToCache(bundleRequest.result);
+        }
+        // If we should find required imports and exports per bundle
+        if (shouldGetBundleInfo && !bundleRequest.result?.errors?.length && bundleRequest.result?.outputFiles?.length) {
+            const bundleInfoPath = path.join(outputPath, 'bundle-info.json');
+            // Exports map is needed to find the bundle info per entry we intend to bundle.
+            // Exports map is used instead of bundleRequest.entries since it is easier to use
+            // because it contains the paths other packages use to import the entry and
+            // the relative location of the bundled files.
+            const exportsMap = await getExportsMap({ packagePath }, { packages, config });
+            const bundleInfo = await getBundleInfo({
                 outputPath,
-                incremental: isIncremental !== undefined ? isIncremental : false,
-                sourcemap: disableSourceMaps ? undefined : 'linked',
-                entries: await getEntriesMapFromPackage({ inputPath: packagePath }, context),
-                inlined: inlinedDependencies,
-                external: await getExternalsFromPackage({ inputPath: packagePath }, context),
-                dynamicImports,
-            };
-            const bundleInternalResult = await bundleInternal(bundleOptions, { config });
-            bundleRequest.result = {
-                ...bundleInternalResult,
-                outputPath: bundleOptions.outputPath ?? outputPath,
-                hash: cacheValidationHash,
-            };
+                outputFiles: bundleRequest.result.outputFiles,
+                exportsMap,
+                isExternal,
+                packagePath,
+            });
+            bundleRequest.result.info = bundleInfo;
+            // Write to cache for future use. (Ignore the promise result.)
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises
+            writeJson(bundleInfoPath, bundleInfo);
         }
-        // Write the result to disk.
-        await saveResultToCache(bundleRequest.result);
-    }
-    // If we should find required imports and exports per bundle
-    if (shouldGetBundleInfo && !bundleRequest.result?.errors?.length && bundleRequest.result?.outputFiles?.length) {
-        const bundleInfoPath = path.join(outputPath, 'bundle-info.json');
-        // Exports map is needed to find the bundle info per entry we intend to bundle.
-        // Exports map is used instead of bundleRequest.entries since it is easier to use
-        // because it contains the paths other packages use to import the entry and
-        // the relative location of the bundled files.
-        const exportsMap = await getExportsMap({ packagePath }, context);
-        const bundleInfo = await getBundleInfo({
-            outputPath,
-            outputFiles: bundleRequest.result.outputFiles,
-            exportsMap,
-            isExternal,
-            packagePath,
+        diskCacheRatioMetricEventAggregator?.record({
+            isCacheHit: !!bundleRequest.resultFromCache,
+            isExternal: bundleRequest.isExternal,
         });
-        bundleRequest.result.info = bundleInfo;
-        // Write to cache for future use. (Ignore the promise result.)
-        // eslint-disable-next-line @typescript-eslint/no-floating-promises
-        writeJson(bundleInfoPath, bundleInfo);
-    }
-    return bundleRequest;
+        return formatBundleTaskResult(bundleRequest);
+    });
 }
 //# sourceMappingURL=bundleTask.js.map

package/lib/utilities/bundleTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"bundleTask.js","sourceRoot":"","sources":["../../src/utilities/bundleTask.ts"],"names":[],"mappings":"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","sourcesContent":["import { bundle as bundleInternal, getEntriesMapFromPackage, getExternalsFromPackage } from '@ms-cloudpack/bundler';\nimport type { BundleOptions, CloudpackConfig, PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport type { PackageHashes } from '@ms-cloudpack/package-hashes';\nimport { getPackageSettings } from '@ms-cloudpack/config';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport { getExportsMap, type ResolveMap } from '@ms-cloudpack/package-utilities';\nimport { formatPackageName, type TaskReporter, type TaskReporterTaskResult } from '@ms-cloudpack/task-reporter';\nimport type { TelemetryClient } from '@ms-cloudpack/telemetry';\nimport path from 'path';\nimport { prepareOutputPath } from '../common/prepareOutputPath.js';\nimport type { BundleRequest } from '../types/BundleRequest.js';\nimport type { BundleTaskOptions } from '../types/BundleTaskOptions.js';\nimport { diskCacheRatioMetricEventAggregator } from './diskCacheRatioMetricEventAggregator.js';\nimport { getBundleInfo } from './getBundleInfo.js';\nimport { getBundleLocation } from './getBundleLocation.js';\nimport { isCachedResultValid } from './isCachedResultValid.js';\nimport { readResultFromCache } from './readResultFromCache.js';\nimport { saveResultToCache } from './saveResultToCache.js';\nimport { formatBundleTaskResult } from './formatBundleTaskResult.js';\n\nexport async function bundleTask(params: {\n  bundleRequest: BundleRequest;\n  options?: BundleTaskOptions;\n  context: {\n    packages: PackageDefinitionsCache;\n    config: CloudpackConfig;\n    resolveMap: ResolveMap;\n    packageHashes: PackageHashes;\n    reporter?: TaskReporter;\n    telemetryClient?: TelemetryClient;\n  };\n}): Promise<BundleRequest> {\n  const { bundleRequest, options = {}, context } = params;\n  const { packageName, version } = bundleRequest;\n  const { reporter, telemetryClient } = context;\n  const { retryCount } = options;\n\n  telemetryClient?.performance.registerAggregator(diskCacheRatioMetricEventAggregator);\n\n  const executeBundle = async (): Promise<TaskReporterTaskResult> => {\n    await bundle({ bundleRequest, context, options });\n\n    diskCacheRatioMetricEventAggregator?.record({\n      isCacheHit: !!bundleRequest.resultFromCache,\n      isExternal: bundleRequest.isExternal,\n    });\n\n    return formatBundleTaskResult(bundleRequest);\n  };\n\n  if (reporter) {\n    const taskName = `Bundle ${formatPackageName({\n      name: packageName,\n      version,\n    })}${retryCount ? ` (retry ${retryCount})` : ''}`;\n    await reporter.runTask(taskName, executeBundle);\n  } else {\n    await executeBundle();\n  }\n\n  return bundleRequest;\n}\n\nasync function bundle(params: {\n  bundleRequest: BundleRequest;\n  context: {\n    packages: PackageDefinitionsCache;\n    config: CloudpackConfig;\n    packageHashes: PackageHashes;\n  };\n  options?: BundleTaskOptions;\n}): Promise<BundleRequest> {\n  const { bundleRequest, context, options = {} } = params;\n  const { config, packageHashes } = context;\n  const { force, hash, sourceHash } = options;\n\n  // If force is set, dispose the existing result.\n  if (force && bundleRequest?.result?.dispose) {\n    bundleRequest.result.dispose();\n    bundleRequest.result = undefined;\n  }\n\n  const { packagePath, isExternal, isIncremental, disableSourceMaps, shouldGetBundleInfo } = bundleRequest;\n\n  const outputPath =\n    bundleRequest.outputPath ??\n    (await getBundleLocation({ packagePath, shouldRecalculate: force, hash }, context)).path;\n\n  // Rehydrate the result if not incremental.\n  if (bundleRequest.result === undefined && !force) {\n    bundleRequest.result = await readResultFromCache(outputPath, {\n      inputPath: packagePath,\n    });\n  }\n\n  const cacheValidationHash = !isExternal\n    ? sourceHash || (await packageHashes.get({ packagePath, isSourceHashingEnabled: true, shouldRecalculate: true }))\n    : undefined;\n\n  // if the cached result is valid, use it.\n  if (!force && isCachedResultValid({ bundleRequest, hash: cacheValidationHash })) {\n    console.debug(`Using cached result for ${bundleRequest.packageName}@${bundleRequest.version}`);\n    bundleRequest.resultFromCache = true;\n  } else {\n    bundleRequest.resultFromCache = false;\n\n    // Only use cached result if it's successful.\n    await prepareOutputPath(outputPath);\n\n    if (bundleRequest.result?.rebuild) {\n      bundleRequest.result = {\n        ...(await bundleRequest.result.rebuild()),\n        outputPath: bundleRequest.result.outputPath,\n        hash: cacheValidationHash,\n      };\n    } else {\n      const { userPackageSettings, generatedPackageSettings } =\n        getPackageSettings({\n          name: bundleRequest.packageName,\n          version: bundleRequest.version,\n          config,\n        }) || {};\n      const { bundlerType, bundlerOptions } = userPackageSettings || {};\n\n      const inlinedDependencies = [\n        ...(userPackageSettings?.inlinedDependencies || []),\n        ...(generatedPackageSettings?.inlinedDependencies || []),\n      ];\n\n      // These are only used by the bundler-plugin-ori.\n      const dynamicImports = [\n        ...(userPackageSettings?.dynamicImports || []),\n        ...(generatedPackageSettings?.dynamicImports || []),\n      ];\n\n      const bundleOptions: BundleOptions = {\n        bundlerType: bundleRequest.bundlerType || bundlerType,\n        overrideOptions: bundlerOptions,\n        inputPath: packagePath,\n        outputPath,\n        incremental: isIncremental !== undefined ? isIncremental : false,\n        sourcemap: disableSourceMaps ? undefined : 'linked',\n        entries: await getEntriesMapFromPackage({ inputPath: packagePath }, context),\n        inlined: inlinedDependencies,\n        external: await getExternalsFromPackage({ inputPath: packagePath }, context),\n        dynamicImports,\n      };\n\n      const bundleInternalResult = await bundleInternal(bundleOptions, { config });\n      bundleRequest.result = {\n        ...bundleInternalResult,\n        outputPath: bundleOptions.outputPath ?? outputPath,\n        hash: cacheValidationHash,\n      };\n    }\n\n    // Write the result to disk.\n    await saveResultToCache(bundleRequest.result);\n  }\n\n  // If we should find required imports and exports per bundle\n  if (shouldGetBundleInfo && !bundleRequest.result?.errors?.length && bundleRequest.result?.outputFiles?.length) {\n    const bundleInfoPath = path.join(outputPath, 'bundle-info.json');\n\n    // Exports map is needed to find the bundle info per entry we intend to bundle.\n    // Exports map is used instead of bundleRequest.entries since it is easier to use\n    // because it contains the paths other packages use to import the entry and\n    // the relative location of the bundled files.\n    const exportsMap = await getExportsMap({ packagePath }, context);\n\n    const bundleInfo = await getBundleInfo({\n      outputPath,\n      outputFiles: bundleRequest.result.outputFiles,\n      exportsMap,\n      isExternal,\n      packagePath,\n    });\n\n    bundleRequest.result.info = bundleInfo;\n\n    // Write to cache for future use. (Ignore the promise result.)\n    // eslint-disable-next-line @typescript-eslint/no-floating-promises\n    writeJson(bundleInfoPath, bundleInfo);\n  }\n\n  return bundleRequest;\n}\n"]}
+{"version":3,"file":"bundleTask.js","sourceRoot":"","sources":["../../src/utilities/bundleTask.ts"],"names":[],"mappings":"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","sourcesContent":["import { bundle, getEntriesMapFromPackage, getExternalsFromPackage } from '@ms-cloudpack/bundler';\nimport type { BundleOptions } from '@ms-cloudpack/common-types';\nimport { getPackageSettings } from '@ms-cloudpack/config';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport { getExportsMap } from '@ms-cloudpack/package-utilities';\nimport { formatPackageName } from '@ms-cloudpack/task-reporter';\nimport path from 'path';\nimport { prepareOutputPath } from '../common/prepareOutputPath.js';\nimport type { BundleRequest } from '../types/BundleRequest.js';\nimport type { BundleTaskOptions } from '../types/BundleTaskOptions.js';\nimport { diskCacheRatioMetricEventAggregator } from './diskCacheRatioMetricEventAggregator.js';\nimport { getBundleInfo } from './getBundleInfo.js';\nimport { getBundleLocation } from './getBundleLocation.js';\nimport { isCachedResultValid } from './isCachedResultValid.js';\nimport { readResultFromCache } from './readResultFromCache.js';\nimport { saveResultToCache } from './saveResultToCache.js';\nimport { formatBundleTaskResult } from './formatBundleTaskResult.js';\nimport type { PartialContext } from '../types/Context.js';\n\nexport type BundleTaskInternalOptions = BundleTaskOptions & { bundleRequest: BundleRequest };\nexport type BundleTaskInternalContext = PartialContext<\n  'packages' | 'packageHashes' | 'reporter' | 'telemetryClient',\n  'resolveMap' | 'config'\n>;\n\n/**\n * Create and run a TaskReporter task which calls `bundle()` from `@ms-cloudpack/bundler` and formats the result.\n */\nexport async function bundleTask(\n  options: BundleTaskInternalOptions,\n  context: BundleTaskInternalContext,\n): Promise<void> {\n  const { bundleRequest, force, hash, sourceHash } = options;\n  const { packageName, version } = bundleRequest;\n  const { reporter, telemetryClient, packageHashes, packages, session } = context;\n  const { config } = session;\n  const { retryCount } = options;\n\n  telemetryClient?.performance.registerAggregator(diskCacheRatioMetricEventAggregator);\n\n  const taskName = `Bundle ${formatPackageName({\n    name: packageName,\n    version,\n  })}${retryCount ? ` (retry ${retryCount})` : ''}`;\n\n  await reporter.runTask(taskName, async () => {\n    // If force is set, dispose the existing result.\n    if (force && bundleRequest?.result?.dispose) {\n      bundleRequest.result.dispose();\n      bundleRequest.result = undefined;\n    }\n\n    const { packagePath, isExternal, isIncremental, disableSourceMaps, shouldGetBundleInfo } = bundleRequest;\n\n    const outputPath =\n      bundleRequest.outputPath ??\n      (await getBundleLocation({ packagePath, shouldRecalculate: force, hash }, context)).path;\n\n    // Rehydrate the result if not incremental.\n    if (bundleRequest.result === undefined && !force) {\n      bundleRequest.result = await readResultFromCache(outputPath, {\n        inputPath: packagePath,\n      });\n    }\n\n    const cacheValidationHash = !isExternal\n      ? sourceHash || (await packageHashes.get({ packagePath, isSourceHashingEnabled: true, shouldRecalculate: true }))\n      : undefined;\n\n    // if the cached result is valid, use it.\n    if (!force && isCachedResultValid({ bundleRequest, hash: cacheValidationHash })) {\n      console.debug(`Using cached result for ${bundleRequest.packageName}@${bundleRequest.version}`);\n      bundleRequest.resultFromCache = true;\n    } else {\n      bundleRequest.resultFromCache = false;\n\n      // Only use cached result if it's successful.\n      await prepareOutputPath(outputPath);\n\n      if (bundleRequest.result?.rebuild) {\n        bundleRequest.result = {\n          ...(await bundleRequest.result.rebuild()),\n          outputPath: bundleRequest.result.outputPath,\n          hash: cacheValidationHash,\n        };\n      } else {\n        const { userPackageSettings, generatedPackageSettings } =\n          getPackageSettings({\n            name: bundleRequest.packageName,\n            version: bundleRequest.version,\n            config: session.config,\n          }) || {};\n        const { bundlerType, bundlerOptions } = userPackageSettings || {};\n\n        const inlinedDependencies = [\n          ...(userPackageSettings?.inlinedDependencies || []),\n          ...(generatedPackageSettings?.inlinedDependencies || []),\n        ];\n\n        // These are only used by the bundler-plugin-ori.\n        const dynamicImports = [\n          ...(userPackageSettings?.dynamicImports || []),\n          ...(generatedPackageSettings?.dynamicImports || []),\n        ];\n\n        const bundleOptions: BundleOptions = {\n          bundlerType: bundleRequest.bundlerType || bundlerType,\n          overrideOptions: bundlerOptions,\n          inputPath: packagePath,\n          outputPath,\n          incremental: isIncremental !== undefined ? isIncremental : false,\n          sourcemap: disableSourceMaps ? undefined : 'linked',\n          entries: await getEntriesMapFromPackage({ inputPath: packagePath }, { packages, config }),\n          inlined: inlinedDependencies,\n          external: await getExternalsFromPackage({ inputPath: packagePath }, { packages, config }),\n          dynamicImports,\n        };\n\n        const bundleInternalResult = await bundle(bundleOptions, { config });\n        bundleRequest.result = {\n          ...bundleInternalResult,\n          outputPath: bundleOptions.outputPath ?? outputPath,\n          hash: cacheValidationHash,\n        };\n      }\n\n      // Write the result to disk.\n      await saveResultToCache(bundleRequest.result);\n    }\n\n    // If we should find required imports and exports per bundle\n    if (shouldGetBundleInfo && !bundleRequest.result?.errors?.length && bundleRequest.result?.outputFiles?.length) {\n      const bundleInfoPath = path.join(outputPath, 'bundle-info.json');\n\n      // Exports map is needed to find the bundle info per entry we intend to bundle.\n      // Exports map is used instead of bundleRequest.entries since it is easier to use\n      // because it contains the paths other packages use to import the entry and\n      // the relative location of the bundled files.\n      const exportsMap = await getExportsMap({ packagePath }, { packages, config });\n\n      const bundleInfo = await getBundleInfo({\n        outputPath,\n        outputFiles: bundleRequest.result.outputFiles,\n        exportsMap,\n        isExternal,\n        packagePath,\n      });\n\n      bundleRequest.result.info = bundleInfo;\n\n      // Write to cache for future use. (Ignore the promise result.)\n      // eslint-disable-next-line @typescript-eslint/no-floating-promises\n      writeJson(bundleInfoPath, bundleInfo);\n    }\n\n    diskCacheRatioMetricEventAggregator?.record({\n      isCacheHit: !!bundleRequest.resultFromCache,\n      isExternal: bundleRequest.isExternal,\n    });\n\n    return formatBundleTaskResult(bundleRequest);\n  });\n}\n"]}

package/lib/utilities/createBundleTask.d.ts

@@ -1,26 +1,10 @@
-import type { BundleTaskOptions } from '../types/BundleTaskOptions.js';
 import type { BundleRequest } from '../types/BundleRequest.js';
 import type { Task } from '../types/Task.js';
-import type { TaskReporter } from '@ms-cloudpack/task-reporter';
-import type { Session } from '../types/Session.js';
-import type { TelemetryClient } from '@ms-cloudpack/telemetry';
-import type { PackageImportPaths } from '@ms-cloudpack/import-map';
-import type { PackageDefinitionsCache } from '@ms-cloudpack/common-types';
-import type { PackageHashes } from '@ms-cloudpack/package-hashes';
+import { type BundleTaskInternalContext, type BundleTaskInternalOptions } from './bundleTask.js';
+import type { PartialContext } from '../types/Context.js';
 /**
- * Creates a bundle task tracked in the task runner of the api server. This allows active tasks to be tracked
- * remotely (e.g. in the browser) and allows the user to cancel tasks.
+ * Create a bundle task (internally calls `bundleTask()`) that can be executed by the server's TaskRunner.
+ * This allows active tasks to be tracked remotely (e.g. in the browser) and allows the user to cancel tasks.
  */
-export declare function createBundleTask(params: {
-    bundleRequest: BundleRequest;
-    context: {
-        session: Session;
-        packages: PackageDefinitionsCache;
-        packageHashes: PackageHashes;
-        packageImportPaths: PackageImportPaths;
-        reporter?: TaskReporter;
-        telemetryClient?: TelemetryClient;
-    };
-    options?: BundleTaskOptions;
-}): Task<BundleRequest>;
+export declare function createBundleTask(options: BundleTaskInternalOptions, context: BundleTaskInternalContext & PartialContext<'packageHashes' | 'packageImportPaths', keyof BundleTaskInternalContext['session'] | 'importMap'>): Task<BundleRequest>;
 //# sourceMappingURL=createBundleTask.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"createBundleTask.d.ts","sourceRoot":"","sources":["../../src/utilities/createBundleTask.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAK7C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE;IACvC,aAAa,EAAE,aAAa,CAAC;IAC7B,OAAO,EAAE;QACP,OAAO,EAAE,OAAO,CAAC;QACjB,QAAQ,EAAE,uBAAuB,CAAC;QAClC,aAAa,EAAE,aAAa,CAAC;QAC7B,kBAAkB,EAAE,kBAAkB,CAAC;QACvC,QAAQ,CAAC,EAAE,YAAY,CAAC;QACxB,eAAe,CAAC,EAAE,eAAe,CAAC;KACnC,CAAC;IACF,OAAO,CAAC,EAAE,iBAAiB,CAAC;CAC7B,GAAG,IAAI,CAAC,aAAa,CAAC,CAuEtB"}
+{"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,yBAAyB,EAAE,KAAK,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAC7G,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,yBAAyB,EAClC,OAAO,EAAE,yBAAyB,GAChC,cAAc,CAAC,eAAe,GAAG,oBAAoB,EAAE,MAAM,yBAAyB,CAAC,SAAS,CAAC,GAAG,WAAW,CAAC,GACjH,IAAI,CAAC,aAAa,CAAC,CAqDrB"}

package/lib/utilities/createBundleTask.js

@@ -1,16 +1,15 @@
-import path from 'path';
+import { addImportMapHash } from '@ms-cloudpack/import-map';
 import fs from 'fs';
+import path from 'path';
 import { bundleTask } from './bundleTask.js';
-import { addImportMapHash } from '@ms-cloudpack/import-map';
 /**
- * Creates a bundle task tracked in the task runner of the api server. This allows active tasks to be tracked
- * remotely (e.g. in the browser) and allows the user to cancel tasks.
+ * Create a bundle task (internally calls `bundleTask()`) that can be executed by the server's TaskRunner.
+ * This allows active tasks to be tracked remotely (e.g. in the browser) and allows the user to cancel tasks.
  */
-export function createBundleTask(params) {
-    const { bundleRequest, context, options = {} } = params;
+export function createBundleTask(options, context) {
+    const { bundleRequest } = options;
     const { id, packageName, version, packagePath, isExternal } = bundleRequest;
-    const { session, reporter, telemetryClient, packageImportPaths, packages, packageHashes } = context;
-    const { config, resolveMap } = session;
+    const { packageHashes, session } = context;
     const { hash, sourceHash } = options;
     const name = `Bundle ${packageName}@${version}`;
     return {
@@ -20,23 +19,10 @@ export function createBundleTask(params) {
         dir: `${path.join(packagePath, 'src')}`,
         watch: !isExternal,
         async execute() {
-            await bundleTask({
-                bundleRequest,
-                options,
-                context: {
-                    packages,
-                    config,
-                    resolveMap,
-                    packageHashes,
-                    reporter,
-                    telemetryClient,
-                },
-            });
+            await bundleTask(options, context);
             try {
                 const importMapHash = sourceHash || hash || (await packageHashes.get({ packagePath, isSourceHashingEnabled: !isExternal }));
-                addImportMapHash({ packageName, version, importMap: session.importMap, resolveMap, hash: importMapHash }, {
-                    packageImportPaths,
-                });
+                addImportMapHash({ packageName, version, hash: importMapHash }, { ...context, ...session });
             }
             catch (e) {
                 console.error(`Error adding hash to import map for ${bundleRequest.packagePath}:`, e.stack || e);

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 type { BundleTaskOptions } from '../types/BundleTaskOptions.js';\nimport type { BundleRequest } from '../types/BundleRequest.js';\nimport type { Task } from '../types/Task.js';\nimport type { TaskEndDescription } from '../types/TaskEndDescription.js';\nimport path from 'path';\nimport fs from 'fs';\nimport { bundleTask } from './bundleTask.js';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport { addImportMapHash } from '@ms-cloudpack/import-map';\nimport type { Session } from '../types/Session.js';\nimport type { TelemetryClient } from '@ms-cloudpack/telemetry';\nimport type { PackageImportPaths } from '@ms-cloudpack/import-map';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport type { PackageHashes } from '@ms-cloudpack/package-hashes';\n\n/**\n * Creates a bundle task tracked in the task runner of the api server. This allows active tasks to be tracked\n * remotely (e.g. in the browser) and allows the user to cancel tasks.\n */\nexport function createBundleTask(params: {\n  bundleRequest: BundleRequest;\n  context: {\n    session: Session;\n    packages: PackageDefinitionsCache;\n    packageHashes: PackageHashes;\n    packageImportPaths: PackageImportPaths;\n    reporter?: TaskReporter;\n    telemetryClient?: TelemetryClient;\n  };\n  options?: BundleTaskOptions;\n}): Task<BundleRequest> {\n  const { bundleRequest, context, options = {} } = params;\n  const { id, packageName, version, packagePath, isExternal } = bundleRequest;\n  const { session, reporter, telemetryClient, packageImportPaths, packages, packageHashes } = context;\n  const { config, resolveMap } = session;\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({\n        bundleRequest,\n        options,\n        context: {\n          packages,\n          config,\n          resolveMap,\n          packageHashes,\n          reporter,\n          telemetryClient,\n        },\n      });\n      try {\n        const importMapHash =\n          sourceHash || hash || (await packageHashes.get({ packagePath, isSourceHashingEnabled: !isExternal }));\n        addImportMapHash(\n          { packageName, version, importMap: session.importMap, resolveMap, hash: importMapHash },\n          {\n            packageImportPaths,\n          },\n        );\n      } catch (e) {\n        console.error(`Error adding hash to import map for ${bundleRequest.packagePath}:`, (e as Error).stack || e);\n      }\n      return bundleRequest;\n    },\n    clear: () => {\n      if (!bundleRequest.result) {\n        return;\n      }\n\n      bundleRequest.result.dispose?.();\n\n      // eslint-disable-next-line @ms-cloudpack/internal/no-sync-filesystem -- this function can't be async\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      ({\n        id,\n        errors: taskResult?.result?.errors,\n        warnings: taskResult?.result?.warnings,\n        outputPath: bundleRequest.result?.outputPath || '',\n      }) as TaskEndDescription,\n  };\n}\n"]}
+{"version":3,"file":"createBundleTask.js","sourceRoot":"","sources":["../../src/utilities/createBundleTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,OAAO,EAAE,UAAU,EAAkE,MAAM,iBAAiB,CAAC;AAG7G;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAC9B,OAAkC,EAClC,OACkH;IAElH,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAClC,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,aAAa,CAAC;IAC5E,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC3C,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IACrC,MAAM,IAAI,GAAG,UAAU,WAAW,IAAI,OAAO,EAAE,CAAC;IAEhD,OAAO;QACL,gCAAgC;QAChC,IAAI;QACJ,EAAE;QACF,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,EAAE;QACvC,KAAK,EAAE,CAAC,UAAU;QAClB,KAAK,CAAC,OAAO;YACX,MAAM,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACnC,IAAI,CAAC;gBACH,MAAM,aAAa,GACjB,UAAU,IAAI,IAAI,IAAI,CAAC,MAAM,aAAa,CAAC,GAAG,CAAC,EAAE,WAAW,EAAE,sBAAsB,EAAE,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;gBACxG,gBAAgB,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,EAAE,GAAG,OAAO,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;YAC9F,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,KAAK,CAAC,uCAAuC,aAAa,CAAC,WAAW,GAAG,EAAG,CAAW,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;YAC9G,CAAC;YACD,OAAO,aAAa,CAAC;QACvB,CAAC;QACD,KAAK,EAAE,GAAG,EAAE;YACV,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;gBAC1B,OAAO;YACT,CAAC;YAED,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;YAEjC,qGAAqG;YACrG,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAE7E,aAAa,CAAC,MAAM,GAAG,SAAS,CAAC;QACnC,CAAC;QACD,SAAS,EAAE,GAAG,EAAE;YACd,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC;QACpC,CAAC;QACD,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM;QAC7C,mBAAmB,EAAE,GAAG,EAAE,CAAC,CAAC;YAC1B,EAAE;YACF,kCAAkC;YAClC,IAAI;YACJ,SAAS,EAAE,WAAW,IAAI,EAAE;SAC7B,CAAC;QACF,iBAAiB,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YAClC,EAAE;YACF,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM;YAClC,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ;YACtC,UAAU,EAAE,aAAa,CAAC,MAAM,EAAE,UAAU,IAAI,EAAE;SACnD,CAAC;KACH,CAAC;AACJ,CAAC","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 BundleTaskInternalContext, type BundleTaskInternalOptions } 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: BundleTaskInternalOptions,\n  context: BundleTaskInternalContext &\n    PartialContext<'packageHashes' | 'packageImportPaths', keyof BundleTaskInternalContext['session'] | 'importMap'>,\n): Task<BundleRequest> {\n  const { bundleRequest } = options;\n  const { id, packageName, version, packagePath, isExternal } = 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      try {\n        const importMapHash =\n          sourceHash || hash || (await packageHashes.get({ packagePath, isSourceHashingEnabled: !isExternal }));\n        addImportMapHash({ packageName, version, hash: importMapHash }, { ...context, ...session });\n      } catch (e) {\n        console.error(`Error adding hash to import map for ${bundleRequest.packagePath}:`, (e as Error).stack || e);\n      }\n      return bundleRequest;\n    },\n    clear: () => {\n      if (!bundleRequest.result) {\n        return;\n      }\n\n      bundleRequest.result.dispose?.();\n\n      // eslint-disable-next-line @ms-cloudpack/internal/no-sync-filesystem -- this function can't be async\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"]}

package/lib/utilities/getSessionPath.d.ts

@@ -0,0 +1,3 @@
+import type { Session } from '../types/Session.js';
+export declare function getSessionPath(session: Session): string;
+//# sourceMappingURL=getSessionPath.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"getSessionPath.d.ts","sourceRoot":"","sources":["../../src/utilities/getSessionPath.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,UAE9C"}

package/lib/utilities/getSessionPath.js

@@ -0,0 +1,6 @@
+import path from 'path';
+import { getCachePath } from './getCachePath.js';
+export function getSessionPath(session) {
+    return path.join(getCachePath(), 'active-sessions', `${session.id}.json`);
+}
+//# sourceMappingURL=getSessionPath.js.map

package/lib/utilities/getSessionPath.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getSessionPath.js","sourceRoot":"","sources":["../../src/utilities/getSessionPath.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGjD,MAAM,UAAU,cAAc,CAAC,OAAgB;IAC7C,OAAO,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;AAC5E,CAAC","sourcesContent":["import path from 'path';\nimport { getCachePath } from './getCachePath.js';\nimport type { Session } from '../types/Session.js';\n\nexport function getSessionPath(session: Session) {\n  return path.join(getCachePath(), 'active-sessions', `${session.id}.json`);\n}\n"]}

package/lib/utilities/resolveDependenciesTask.d.ts

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