@ms-cloudpack/cli 0.42.1 → 0.42.3

package/lib/commands/bundle/bundle.d.ts

@@ -1,4 +1,4 @@
 import type { BundleOptions } from './types/BundleOptions.js';
 import type { TaskContext } from '../../types/TaskContext.js';
-export declare function bundle(options: BundleOptions, { reporter, appPath: packagePath }: TaskContext): Promise<void>;
+export declare function bundle(options: BundleOptions, context: TaskContext): Promise<void>;
 //# sourceMappingURL=bundle.d.ts.map

package/lib/commands/bundle/bundle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../../src/commands/bundle/bundle.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAI9D,wBAAsB,MAAM,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,WAAW,iBA8BnG"}
+{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../../src/commands/bundle/bundle.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAI9D,wBAAsB,MAAM,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,WAAW,iBAgCxE"}

package/lib/commands/bundle/bundle.js

@@ -1,8 +1,9 @@
-import { bundleTask } from '../../tasks/bundleTask.js';
+import { bundleTask } from '@ms-cloudpack/api-server';
 import path from 'path';
 import { createPackageDefinitions, readConfig } from '@ms-cloudpack/config';
-import { setupReporting } from '../start/setupReporting.js';
-export async function bundle(options, { reporter, appPath: packagePath }) {
+import { setupReporting } from '../../setupReporting.js';
+export async function bundle(options, context) {
+    const { reporter, appPath: packagePath } = context;
     const { bundler: bundlerType, outdir = 'dist/browser-esm', disableSourceMaps } = options;
     const config = await readConfig(packagePath);
     const packages = createPackageDefinitions({ config });
@@ -21,10 +22,11 @@ export async function bundle(options, { reporter, appPath: packagePath }) {
         config,
         packages,
     };
-    await setupReporting({ reporter, config });
+    await setupReporting(context);
     await bundleTask({
         bundleRequest,
         options: { force: true },
+        reporter,
     });
     reporter.complete();
     process.exit(bundleRequest.result?.errors?.length === 0 ? 0 : 1);

package/lib/commands/bundle/bundle.js.map

@@ -1 +1 @@
-{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../../src/commands/bundle/bundle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,IAAI,MAAM,MAAM,CAAC;AAIxB,OAAO,EAAE,wBAAwB,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,OAAsB,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAe;IAClG,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,GAAG,kBAAkB,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC;IACzF,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,CAAC;IAC7C,MAAM,QAAQ,GAAG,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IACtD,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACnD,MAAM,EAAE,IAAI,GAAG,WAAW,EAAE,OAAO,GAAG,OAAO,EAAE,GAAG,UAAU,IAAI,EAAE,CAAC;IACnE,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IACrD,MAAM,aAAa,GAAkB;QACnC,EAAE,EAAE,QAAQ;QACZ,WAAW,EAAE,IAAI;QACjB,OAAO;QACP,WAAW;QACX,UAAU;QACV,UAAU,EAAE,IAAI;QAChB,WAAW;QACX,iBAAiB;QACjB,MAAM;QACN,QAAQ;KACT,CAAC;IAEF,MAAM,cAAc,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;IAE3C,MAAM,UAAU,CAAC;QACf,aAAa;QACb,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;KACzB,CAAC,CAAC;IAEH,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAEpB,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACnE,CAAC;AAED,uBAAuB","sourcesContent":["import { bundleTask } from '../../tasks/bundleTask.js';\nimport path from 'path';\nimport type { BundleOptions } from './types/BundleOptions.js';\nimport type { BundleRequest } from '../../types/BundleRequest.js';\nimport type { TaskContext } from '../../types/TaskContext.js';\nimport { createPackageDefinitions, readConfig } from '@ms-cloudpack/config';\nimport { setupReporting } from '../start/setupReporting.js';\n\nexport async function bundle(options: BundleOptions, { reporter, appPath: packagePath }: TaskContext) {\n  const { bundler: bundlerType, outdir = 'dist/browser-esm', disableSourceMaps } = options;\n  const config = await readConfig(packagePath);\n  const packages = createPackageDefinitions({ config });\n  const definition = await packages.get(packagePath);\n  const { name = '<unknown>', version = '0.0.0' } = definition || {};\n  const outputPath = path.resolve(packagePath, outdir);\n  const bundleRequest: BundleRequest = {\n    id: 'bundle',\n    packageName: name,\n    version,\n    packagePath,\n    outputPath,\n    isExternal: true,\n    bundlerType,\n    disableSourceMaps,\n    config,\n    packages,\n  };\n\n  await setupReporting({ reporter, config });\n\n  await bundleTask({\n    bundleRequest,\n    options: { force: true },\n  });\n\n  reporter.complete();\n\n  process.exit(bundleRequest.result?.errors?.length === 0 ? 0 : 1);\n}\n\n// cspell:ignore outdir\n"]}
+{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../../src/commands/bundle/bundle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAsB,MAAM,0BAA0B,CAAC;AAC1E,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,OAAO,EAAE,wBAAwB,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,OAAsB,EAAE,OAAoB;IACvE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IACnD,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,GAAG,kBAAkB,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC;IACzF,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,CAAC;IAC7C,MAAM,QAAQ,GAAG,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IACtD,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACnD,MAAM,EAAE,IAAI,GAAG,WAAW,EAAE,OAAO,GAAG,OAAO,EAAE,GAAG,UAAU,IAAI,EAAE,CAAC;IACnE,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IACrD,MAAM,aAAa,GAAkB;QACnC,EAAE,EAAE,QAAQ;QACZ,WAAW,EAAE,IAAI;QACjB,OAAO;QACP,WAAW;QACX,UAAU;QACV,UAAU,EAAE,IAAI;QAChB,WAAW;QACX,iBAAiB;QACjB,MAAM;QACN,QAAQ;KACT,CAAC;IAEF,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC;IAE9B,MAAM,UAAU,CAAC;QACf,aAAa;QACb,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;QACxB,QAAQ;KACT,CAAC,CAAC;IAEH,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAEpB,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACnE,CAAC;AAED,uBAAuB","sourcesContent":["import { bundleTask, type BundleRequest } from '@ms-cloudpack/api-server';\nimport path from 'path';\nimport type { BundleOptions } from './types/BundleOptions.js';\nimport type { TaskContext } from '../../types/TaskContext.js';\nimport { createPackageDefinitions, readConfig } from '@ms-cloudpack/config';\nimport { setupReporting } from '../../setupReporting.js';\n\nexport async function bundle(options: BundleOptions, context: TaskContext) {\n  const { reporter, appPath: packagePath } = context;\n  const { bundler: bundlerType, outdir = 'dist/browser-esm', disableSourceMaps } = options;\n  const config = await readConfig(packagePath);\n  const packages = createPackageDefinitions({ config });\n  const definition = await packages.get(packagePath);\n  const { name = '<unknown>', version = '0.0.0' } = definition || {};\n  const outputPath = path.resolve(packagePath, outdir);\n  const bundleRequest: BundleRequest = {\n    id: 'bundle',\n    packageName: name,\n    version,\n    packagePath,\n    outputPath,\n    isExternal: true,\n    bundlerType,\n    disableSourceMaps,\n    config,\n    packages,\n  };\n\n  await setupReporting(context);\n\n  await bundleTask({\n    bundleRequest,\n    options: { force: true },\n    reporter,\n  });\n\n  reporter.complete();\n\n  process.exit(bundleRequest.result?.errors?.length === 0 ? 0 : 1);\n}\n\n// cspell:ignore outdir\n"]}

package/lib/commands/init/bundleAndGetImports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bundleAndGetImports.d.ts","sourceRoot":"","sources":["../../../src/commands/init/bundleAndGetImports.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAGxF,OAAO,EAAE,KAAK,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AACnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D;;GAEG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE;IACjD,QAAQ,EAAE,uBAAuB,CAAC;IAClC,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,YAAY,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,WAAW,CAAC;CACzB,GAAG,OAAO,CAAC;IACV,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE,OAAO,CAAC;IACnB,8DAA8D;IAC9D,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;CACpC,CAAC,CA4DD"}
+{"version":3,"file":"bundleAndGetImports.d.ts","sourceRoot":"","sources":["../../../src/commands/init/bundleAndGetImports.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACxF,OAAO,EAAE,KAAK,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AACnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D;;GAEG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE;IACjD,QAAQ,EAAE,uBAAuB,CAAC;IAClC,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,YAAY,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,WAAW,CAAC;CACzB,GAAG,OAAO,CAAC;IACV,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE,OAAO,CAAC;IACnB,8DAA8D;IAC9D,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;CACpC,CAAC,CA4DD"}

package/lib/commands/init/bundleAndGetImports.js

@@ -1,9 +1,7 @@
 import path from 'path';
 import { getEntriesMapFromPackage } from '@ms-cloudpack/bundler';
-import { getBundleDetails } from '../../common/getBundleDetails.js';
-import { findImports } from './findImports.js';
+import { bundleTask, getBundleDetails, findImports } from '@ms-cloudpack/api-server';
 import { prepareOutputPath } from '../../common/prepareOutputPath.js';
-import { bundleTask } from '../../tasks/bundleTask.js';
 import { formatPackageName } from '@ms-cloudpack/task-reporter';
 /**
  * Bundle the package and return the imports it depends on.
@@ -35,7 +33,7 @@ export async function bundleAndGetImports(options) {
         packages,
         config,
     };
-    await bundleTask({ bundleRequest, options: { force: true } });
+    await bundleTask({ bundleRequest, reporter, options: { force: true } });
     // For each outputFile, find all imports.
     let imports;
     await reporter.runTask(`Evaluate ${formatPackageName(definition)}`, async () => {

package/lib/commands/init/bundleAndGetImports.js.map

@@ -1 +1 @@
-{"version":3,"file":"bundleAndGetImports.js","sourceRoot":"","sources":["../../../src/commands/init/bundleAndGetImports.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAGtE,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAqB,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAGnF;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,OAMzC;IAMC,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACxE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,GAAG,MAAM,gBAAgB,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC7F,MAAM,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC;IAEvC,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE;QACtC,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,oCAAoC,CAAC,CAAC;KAC9F;IAED,yCAAyC;IACzC,MAAM,iBAAiB,CAAC,UAAU,CAAC,CAAC;IAEpC,qBAAqB;IACrB,MAAM,UAAU,GAAG,MAAM,wBAAwB,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IAE5F,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,EAAE;QACnC,OAAO,CAAC,IAAI,CACV,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,qCAAqC,EAC9E,UAAU;YACR,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,sGAAsG,CAC3G,CAAC;QACF,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;KAChD;IAED,MAAM,aAAa,GAAkB;QACnC,EAAE,EAAE,WAAW;QACf,WAAW,EAAE,UAAU,CAAC,IAAI,IAAI,EAAE;QAClC,OAAO,EAAE,UAAU,CAAC,OAAO,IAAI,EAAE;QACjC,WAAW;QACX,UAAU;QACV,UAAU;QACV,QAAQ;QACR,MAAM;KACP,CAAC;IAEF,MAAM,UAAU,CAAC,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IAE9D,yCAAyC;IACzC,IAAI,OAA6C,CAAC;IAElD,MAAM,QAAQ,CAAC,OAAO,CAAC,YAAY,iBAAiB,CAAC,UAAU,CAAC,EAAE,EAAE,KAAK,IAAI,EAAE;QAC7E,OAAO,GAAG,IAAI,GAAG,CACf,MAAM,CAAC,OAAO,CACZ,CAAC,MAAM,WAAW,CAChB,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAClG,CAAC,IAAI,EAAE,CACT,CACF,CAAC;QAEF,OAAO;YACL,MAAM,EAAE,UAAU;SACnB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,WAAW,EAAE,CAAC,CAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM;QACrD,SAAS,EAAE,CAAC,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM;QACjD,OAAO;KACR,CAAC;AACJ,CAAC","sourcesContent":["import path from 'path';\nimport { getEntriesMapFromPackage } from '@ms-cloudpack/bundler';\nimport { getBundleDetails } from '../../common/getBundleDetails.js';\nimport { findImports } from './findImports.js';\nimport { prepareOutputPath } from '../../common/prepareOutputPath.js';\nimport type { PackageJson, PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { BundleRequest } from '../../types/BundleRequest.js';\nimport { bundleTask } from '../../tasks/bundleTask.js';\nimport { type TaskReporter, formatPackageName } from '@ms-cloudpack/task-reporter';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\n\n/**\n * Bundle the package and return the imports it depends on.\n */\nexport async function bundleAndGetImports(options: {\n  packages: PackageDefinitionsCache;\n  config: CloudpackConfig;\n  reporter: TaskReporter;\n  packagePath: string;\n  definition: PackageJson;\n}): Promise<{\n  hasWarnings: boolean;\n  hasErrors: boolean;\n  /** Map from package name to set of required relative paths */\n  imports?: Map<string, Set<string>>;\n}> {\n  const { packagePath, definition, packages, reporter, config } = options;\n  const { outputLocation, isExternal } = await getBundleDetails({ packagePath }, { packages });\n  const outputPath = outputLocation.path;\n\n  if (!isExternal && !definition.exports) {\n    console.debug(`${path.join(packagePath, 'package.json')} does not have an \"exports\" field.`);\n  }\n\n  // Ensure outputPath exists and is empty.\n  await prepareOutputPath(outputPath);\n\n  // Determine entries.\n  const entriesMap = await getEntriesMapFromPackage({ inputPath: packagePath }, { packages });\n\n  if (!Object.keys(entriesMap).length) {\n    console.warn(\n      `${path.join(packagePath, 'package.json')} does not specify any entry points.`,\n      isExternal\n        ? ''\n        : 'If this package contains code imported by other packages, please consider adding an \"exports\" field.',\n    );\n    return { hasWarnings: true, hasErrors: false };\n  }\n\n  const bundleRequest: BundleRequest = {\n    id: packagePath,\n    packageName: definition.name || '',\n    version: definition.version || '',\n    packagePath,\n    outputPath,\n    isExternal,\n    packages,\n    config,\n  };\n\n  await bundleTask({ bundleRequest, options: { force: true } });\n\n  // For each outputFile, find all imports.\n  let imports: Map<string, Set<string>> | undefined;\n\n  await reporter.runTask(`Evaluate ${formatPackageName(definition)}`, async () => {\n    imports = new Map(\n      Object.entries(\n        (await findImports(\n          bundleRequest.result?.outputFiles?.map((file) => path.resolve(outputPath, file.outputPath)) || [],\n        )) || {},\n      ),\n    );\n\n    return {\n      status: 'complete',\n    };\n  });\n\n  return {\n    hasWarnings: !!bundleRequest.result?.warnings?.length,\n    hasErrors: !!bundleRequest.result?.errors?.length,\n    imports,\n  };\n}\n"]}
+{"version":3,"file":"bundleAndGetImports.js","sourceRoot":"","sources":["../../../src/commands/init/bundleAndGetImports.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,WAAW,EAAsB,MAAM,0BAA0B,CAAC;AACzG,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAEtE,OAAO,EAAqB,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAGnF;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,OAMzC;IAMC,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACxE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,GAAG,MAAM,gBAAgB,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC7F,MAAM,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC;IAEvC,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE;QACtC,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,oCAAoC,CAAC,CAAC;KAC9F;IAED,yCAAyC;IACzC,MAAM,iBAAiB,CAAC,UAAU,CAAC,CAAC;IAEpC,qBAAqB;IACrB,MAAM,UAAU,GAAG,MAAM,wBAAwB,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IAE5F,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,EAAE;QACnC,OAAO,CAAC,IAAI,CACV,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,qCAAqC,EAC9E,UAAU;YACR,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,sGAAsG,CAC3G,CAAC;QACF,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;KAChD;IAED,MAAM,aAAa,GAAkB;QACnC,EAAE,EAAE,WAAW;QACf,WAAW,EAAE,UAAU,CAAC,IAAI,IAAI,EAAE;QAClC,OAAO,EAAE,UAAU,CAAC,OAAO,IAAI,EAAE;QACjC,WAAW;QACX,UAAU;QACV,UAAU;QACV,QAAQ;QACR,MAAM;KACP,CAAC;IAEF,MAAM,UAAU,CAAC,EAAE,aAAa,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IAExE,yCAAyC;IACzC,IAAI,OAA6C,CAAC;IAElD,MAAM,QAAQ,CAAC,OAAO,CAAC,YAAY,iBAAiB,CAAC,UAAU,CAAC,EAAE,EAAE,KAAK,IAAI,EAAE;QAC7E,OAAO,GAAG,IAAI,GAAG,CACf,MAAM,CAAC,OAAO,CACZ,CAAC,MAAM,WAAW,CAChB,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAClG,CAAC,IAAI,EAAE,CACT,CACF,CAAC;QAEF,OAAO;YACL,MAAM,EAAE,UAAU;SACnB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,WAAW,EAAE,CAAC,CAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM;QACrD,SAAS,EAAE,CAAC,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM;QACjD,OAAO;KACR,CAAC;AACJ,CAAC","sourcesContent":["import path from 'path';\nimport { getEntriesMapFromPackage } from '@ms-cloudpack/bundler';\nimport { bundleTask, getBundleDetails, findImports, type BundleRequest } from '@ms-cloudpack/api-server';\nimport { prepareOutputPath } from '../../common/prepareOutputPath.js';\nimport type { PackageJson, PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport { type TaskReporter, formatPackageName } from '@ms-cloudpack/task-reporter';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\n\n/**\n * Bundle the package and return the imports it depends on.\n */\nexport async function bundleAndGetImports(options: {\n  packages: PackageDefinitionsCache;\n  config: CloudpackConfig;\n  reporter: TaskReporter;\n  packagePath: string;\n  definition: PackageJson;\n}): Promise<{\n  hasWarnings: boolean;\n  hasErrors: boolean;\n  /** Map from package name to set of required relative paths */\n  imports?: Map<string, Set<string>>;\n}> {\n  const { packagePath, definition, packages, reporter, config } = options;\n  const { outputLocation, isExternal } = await getBundleDetails({ packagePath }, { packages });\n  const outputPath = outputLocation.path;\n\n  if (!isExternal && !definition.exports) {\n    console.debug(`${path.join(packagePath, 'package.json')} does not have an \"exports\" field.`);\n  }\n\n  // Ensure outputPath exists and is empty.\n  await prepareOutputPath(outputPath);\n\n  // Determine entries.\n  const entriesMap = await getEntriesMapFromPackage({ inputPath: packagePath }, { packages });\n\n  if (!Object.keys(entriesMap).length) {\n    console.warn(\n      `${path.join(packagePath, 'package.json')} does not specify any entry points.`,\n      isExternal\n        ? ''\n        : 'If this package contains code imported by other packages, please consider adding an \"exports\" field.',\n    );\n    return { hasWarnings: true, hasErrors: false };\n  }\n\n  const bundleRequest: BundleRequest = {\n    id: packagePath,\n    packageName: definition.name || '',\n    version: definition.version || '',\n    packagePath,\n    outputPath,\n    isExternal,\n    packages,\n    config,\n  };\n\n  await bundleTask({ bundleRequest, reporter, options: { force: true } });\n\n  // For each outputFile, find all imports.\n  let imports: Map<string, Set<string>> | undefined;\n\n  await reporter.runTask(`Evaluate ${formatPackageName(definition)}`, async () => {\n    imports = new Map(\n      Object.entries(\n        (await findImports(\n          bundleRequest.result?.outputFiles?.map((file) => path.resolve(outputPath, file.outputPath)) || [],\n        )) || {},\n      ),\n    );\n\n    return {\n      status: 'complete',\n    };\n  });\n\n  return {\n    hasWarnings: !!bundleRequest.result?.warnings?.length,\n    hasErrors: !!bundleRequest.result?.errors?.length,\n    imports,\n  };\n}\n"]}

package/lib/commands/init/init.js

@@ -4,11 +4,11 @@ import { rootSpan, stopTelemetry } from '../../initTelemetry.js';
 import { resolveDependenciesTask } from '../../tasks/resolveDependenciesTask.js';
 import { evaluateImportsForOverrides } from './evaluateImportsForOverrides.js';
 import { bundleAndGetImports } from './bundleAndGetImports.js';
-import { setupReporting } from '../start/setupReporting.js';
+import { setupReporting } from '../../setupReporting.js';
 /** Given the path, updates the Cloudpack config with overrides and project settings. */
 export async function init(options, context) {
-    const { reporter, config } = context;
-    await setupReporting({ reporter, config });
+    const { reporter } = context;
+    await setupReporting(context);
     let completeReason;
     let hasErrors = false;
     let hasWarnings = false;

package/lib/commands/init/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  createPackageDefinitions,\n  generatedConfigFileName,\n  readConfig,\n  userConfigFileName,\n  writeGeneratedConfig,\n} from '@ms-cloudpack/config';\nimport { plural, red, yellow } from '@ms-cloudpack/task-reporter';\nimport { rootSpan, stopTelemetry } from '../../initTelemetry.js';\nimport { resolveDependenciesTask } from '../../tasks/resolveDependenciesTask.js';\nimport { evaluateImportsForOverrides } from './evaluateImportsForOverrides.js';\nimport { bundleAndGetImports } from './bundleAndGetImports.js';\nimport type { InitOptions } from './types/InitOptions.js';\nimport type { TaskContext } from '../../types/TaskContext.js';\nimport { setupReporting } from '../start/setupReporting.js';\n\n/** Given the path, updates the Cloudpack config with overrides and project settings. */\nexport async function init(options: InitOptions, context: TaskContext): Promise<void> {\n  const { reporter, config } = context;\n\n  await setupReporting({ reporter, config });\n\n  let completeReason: string | undefined;\n  let hasErrors = false;\n  let hasWarnings = false;\n  try {\n    const { changeCount, errorPkgCount, warningPkgCount, successPkgCount } = await initInternal(options, context);\n\n    hasErrors = errorPkgCount > 0;\n    hasWarnings = warningPkgCount > 0;\n\n    const totalCount = errorPkgCount + successPkgCount;\n\n    if (hasErrors || hasWarnings) {\n      const successPct = ((successPkgCount / totalCount) * 100).toFixed(1);\n      completeReason =\n        [\n          `${successPkgCount}/${totalCount} (${successPct}%) packages bundled successfully`,\n          hasErrors && `${errorPkgCount} packages with errors`,\n          hasWarnings && `${warningPkgCount} packages with warnings`,\n        ]\n          .filter(Boolean)\n          .join('\\n') + '\\n';\n    } else {\n      completeReason = `All ${totalCount} packages bundled successfully`;\n    }\n\n    if (changeCount) {\n      completeReason += `\\n\\nUpdated \"${userConfigFileName}\" with ${plural(changeCount, 'change')}.`;\n    }\n  } catch (error) {\n    hasErrors = true;\n    completeReason = `Unexpected error: ${(error as Error).stack || error}`;\n  }\n\n  await stopTelemetry();\n  reporter.complete(hasErrors ? red(completeReason) : hasWarnings ? yellow(completeReason) : completeReason);\n\n  process.exit(hasErrors ? 1 : 0);\n}\n\n/**\n * Actual init operation (minus the completion logging).\n * Exported for testing only.\n */\nexport async function initInternal(\n  options: InitOptions,\n  context: TaskContext,\n): Promise<{\n  changeCount: number;\n  errorPkgCount: number;\n  warningPkgCount: number;\n  successPkgCount: number;\n}> {\n  const { appPath, reporter } = context;\n\n  if (options.check && options.reset) {\n    throw Error('Cannot use --check and --reset together.');\n  }\n\n  const config = await readConfig(appPath);\n\n  // If --reset is specified we ignore generated config.\n  if (options.reset) {\n    config.generated = {};\n  }\n\n  const packages = createPackageDefinitions({ config });\n  const generatedConfig = config.generated;\n\n  generatedConfig.packageSettings ??= [];\n\n  // Try to resolve dependencies.\n  const resolveMap = await resolveDependenciesTask({ appPath }, { packages, reporter });\n\n  if (!resolveMap) {\n    throw new Error(\"Couldn't resolve dependencies.\");\n  }\n\n  const packagePathsToEvaluate = new Set<string>([appPath]);\n  const evaluatedPackages = new Set<string>();\n  let changeCount = 0;\n  let errorPkgCount = 0;\n  let warningPkgCount = 0;\n  let successPkgCount = 0;\n\n  while (packagePathsToEvaluate.size) {\n    const packagePath = packagePathsToEvaluate.values().next().value as string;\n\n    packagePathsToEvaluate.delete(packagePath);\n\n    // Skip already-visited packages.\n    if (!packagePath || evaluatedPackages.has(packagePath)) {\n      continue;\n    }\n\n    evaluatedPackages.add(packagePath);\n\n    const definition = await packages.get(packagePath, { refresh: true });\n\n    if (!definition) {\n      // This is very weird and probably won't happen.\n      console.error(`Skipping ${packagePath} evaluation because the package.json was not found or not readable.`);\n      errorPkgCount++;\n      continue;\n    }\n\n    // Bundle the package and find the imports it depends on.\n    const bundleResult = await bundleAndGetImports({ packagePath, definition, packages, reporter, config });\n\n    if (!bundleResult.imports?.size) {\n      if (bundleResult.hasErrors) {\n        errorPkgCount++;\n      } else {\n        successPkgCount++;\n      }\n\n      if (bundleResult.hasWarnings) {\n        warningPkgCount++;\n      }\n\n      continue;\n    }\n\n    // Given the package imports, find the missing exports maps and update packageOverrides.\n    const overridesResult = await evaluateImportsForOverrides({\n      definition,\n      packages,\n      packagePathsToEvaluate,\n      evaluatedPackages,\n      imports: bundleResult.imports,\n      generatedConfig,\n      resolveMap,\n    });\n\n    if (options.check && (overridesResult.changeCount || overridesResult.errors.length)) {\n      rootSpan?.addEvent('INIT_CHECK_FAILED', {\n        reason: overridesResult.changeCount ? 'Config needs to be updated.' : overridesResult.errors,\n      });\n      throw Error(\n        overridesResult.changeCount\n          ? 'Run \"cloudpack init --reset\" to update the config.'\n          : overridesResult.errors.map((e) => e).join('\\n'),\n      );\n    }\n\n    changeCount += overridesResult.changeCount;\n\n    if (bundleResult.hasErrors || overridesResult.errors.length) {\n      errorPkgCount++;\n    } else {\n      successPkgCount++;\n    }\n    if (bundleResult.hasWarnings) {\n      warningPkgCount++;\n    }\n  }\n\n  if (changeCount) {\n    // Log the results to a file.\n    console.log(\n      `Writing updates to \"${generatedConfigFileName}\". If you're in a git repo, this file should be committed with your project.`,\n    );\n\n    if (generatedConfig.packageSettings?.length) {\n      await writeGeneratedConfig(generatedConfig, appPath);\n    }\n  }\n\n  return {\n    changeCount,\n    errorPkgCount,\n    warningPkgCount,\n    successPkgCount,\n  };\n}\n"]}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  createPackageDefinitions,\n  generatedConfigFileName,\n  readConfig,\n  userConfigFileName,\n  writeGeneratedConfig,\n} from '@ms-cloudpack/config';\nimport { plural, red, yellow } from '@ms-cloudpack/task-reporter';\nimport { rootSpan, stopTelemetry } from '../../initTelemetry.js';\nimport { resolveDependenciesTask } from '../../tasks/resolveDependenciesTask.js';\nimport { evaluateImportsForOverrides } from './evaluateImportsForOverrides.js';\nimport { bundleAndGetImports } from './bundleAndGetImports.js';\nimport type { InitOptions } from './types/InitOptions.js';\nimport type { TaskContext } from '../../types/TaskContext.js';\nimport { setupReporting } from '../../setupReporting.js';\n\n/** Given the path, updates the Cloudpack config with overrides and project settings. */\nexport async function init(options: InitOptions, context: TaskContext): Promise<void> {\n  const { reporter } = context;\n\n  await setupReporting(context);\n\n  let completeReason: string | undefined;\n  let hasErrors = false;\n  let hasWarnings = false;\n  try {\n    const { changeCount, errorPkgCount, warningPkgCount, successPkgCount } = await initInternal(options, context);\n\n    hasErrors = errorPkgCount > 0;\n    hasWarnings = warningPkgCount > 0;\n\n    const totalCount = errorPkgCount + successPkgCount;\n\n    if (hasErrors || hasWarnings) {\n      const successPct = ((successPkgCount / totalCount) * 100).toFixed(1);\n      completeReason =\n        [\n          `${successPkgCount}/${totalCount} (${successPct}%) packages bundled successfully`,\n          hasErrors && `${errorPkgCount} packages with errors`,\n          hasWarnings && `${warningPkgCount} packages with warnings`,\n        ]\n          .filter(Boolean)\n          .join('\\n') + '\\n';\n    } else {\n      completeReason = `All ${totalCount} packages bundled successfully`;\n    }\n\n    if (changeCount) {\n      completeReason += `\\n\\nUpdated \"${userConfigFileName}\" with ${plural(changeCount, 'change')}.`;\n    }\n  } catch (error) {\n    hasErrors = true;\n    completeReason = `Unexpected error: ${(error as Error).stack || error}`;\n  }\n\n  await stopTelemetry();\n  reporter.complete(hasErrors ? red(completeReason) : hasWarnings ? yellow(completeReason) : completeReason);\n\n  process.exit(hasErrors ? 1 : 0);\n}\n\n/**\n * Actual init operation (minus the completion logging).\n * Exported for testing only.\n */\nexport async function initInternal(\n  options: InitOptions,\n  context: TaskContext,\n): Promise<{\n  changeCount: number;\n  errorPkgCount: number;\n  warningPkgCount: number;\n  successPkgCount: number;\n}> {\n  const { appPath, reporter } = context;\n\n  if (options.check && options.reset) {\n    throw Error('Cannot use --check and --reset together.');\n  }\n\n  const config = await readConfig(appPath);\n\n  // If --reset is specified we ignore generated config.\n  if (options.reset) {\n    config.generated = {};\n  }\n\n  const packages = createPackageDefinitions({ config });\n  const generatedConfig = config.generated;\n\n  generatedConfig.packageSettings ??= [];\n\n  // Try to resolve dependencies.\n  const resolveMap = await resolveDependenciesTask({ appPath }, { packages, reporter });\n\n  if (!resolveMap) {\n    throw new Error(\"Couldn't resolve dependencies.\");\n  }\n\n  const packagePathsToEvaluate = new Set<string>([appPath]);\n  const evaluatedPackages = new Set<string>();\n  let changeCount = 0;\n  let errorPkgCount = 0;\n  let warningPkgCount = 0;\n  let successPkgCount = 0;\n\n  while (packagePathsToEvaluate.size) {\n    const packagePath = packagePathsToEvaluate.values().next().value as string;\n\n    packagePathsToEvaluate.delete(packagePath);\n\n    // Skip already-visited packages.\n    if (!packagePath || evaluatedPackages.has(packagePath)) {\n      continue;\n    }\n\n    evaluatedPackages.add(packagePath);\n\n    const definition = await packages.get(packagePath, { refresh: true });\n\n    if (!definition) {\n      // This is very weird and probably won't happen.\n      console.error(`Skipping ${packagePath} evaluation because the package.json was not found or not readable.`);\n      errorPkgCount++;\n      continue;\n    }\n\n    // Bundle the package and find the imports it depends on.\n    const bundleResult = await bundleAndGetImports({ packagePath, definition, packages, reporter, config });\n\n    if (!bundleResult.imports?.size) {\n      if (bundleResult.hasErrors) {\n        errorPkgCount++;\n      } else {\n        successPkgCount++;\n      }\n\n      if (bundleResult.hasWarnings) {\n        warningPkgCount++;\n      }\n\n      continue;\n    }\n\n    // Given the package imports, find the missing exports maps and update packageOverrides.\n    const overridesResult = await evaluateImportsForOverrides({\n      definition,\n      packages,\n      packagePathsToEvaluate,\n      evaluatedPackages,\n      imports: bundleResult.imports,\n      generatedConfig,\n      resolveMap,\n    });\n\n    if (options.check && (overridesResult.changeCount || overridesResult.errors.length)) {\n      rootSpan?.addEvent('INIT_CHECK_FAILED', {\n        reason: overridesResult.changeCount ? 'Config needs to be updated.' : overridesResult.errors,\n      });\n      throw Error(\n        overridesResult.changeCount\n          ? 'Run \"cloudpack init --reset\" to update the config.'\n          : overridesResult.errors.map((e) => e).join('\\n'),\n      );\n    }\n\n    changeCount += overridesResult.changeCount;\n\n    if (bundleResult.hasErrors || overridesResult.errors.length) {\n      errorPkgCount++;\n    } else {\n      successPkgCount++;\n    }\n    if (bundleResult.hasWarnings) {\n      warningPkgCount++;\n    }\n  }\n\n  if (changeCount) {\n    // Log the results to a file.\n    console.log(\n      `Writing updates to \"${generatedConfigFileName}\". If you're in a git repo, this file should be committed with your project.`,\n    );\n\n    if (generatedConfig.packageSettings?.length) {\n      await writeGeneratedConfig(generatedConfig, appPath);\n    }\n  }\n\n  return {\n    changeCount,\n    errorPkgCount,\n    warningPkgCount,\n    successPkgCount,\n  };\n}\n"]}

package/lib/commands/start/start.d.ts

@@ -5,5 +5,5 @@ export declare function stopServers(): Promise<void>;
 /**
  * Defines the "start" verb entry point.
  */
-export declare function start(options: StartOptions, { reporter, appPath: initialCwd }: TaskContext): Promise<void>;
+export declare function start(options: StartOptions, context: TaskContext): Promise<void>;
 //# sourceMappingURL=start.d.ts.map

package/lib/commands/start/start.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../../src/commands/start/start.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAU5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAO9D,wDAAwD;AACxD,wBAAsB,WAAW,kBAKhC;AAqBD;;GAEG;AACH,wBAAsB,KAAK,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,WAAW,iBAsIhG"}
+{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../../src/commands/start/start.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAS5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAO9D,wDAAwD;AACxD,wBAAsB,WAAW,kBAKhC;AAqBD;;GAEG;AACH,wBAAsB,KAAK,CAAC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,iBAuItE"}

package/lib/commands/start/start.js

@@ -5,14 +5,13 @@ import { createSession } from './createSession.js';
 import { openBrowser } from './openBrowser.js';
 import { createPackageDefinitions, readConfig } from '@ms-cloudpack/config';
 import { PerfMarkerCliEntry, PerfMeasurementOpenBrowser } from '../../performance/markers.js';
-import { setSharedTelemetryAttribute, stopTelemetry, rootSpan } from '../../initTelemetry.js';
-import { createBundleRequestForPackage } from './createBundleRequestForPackage.js';
-import { createBundleTask } from './createBundleTask.js';
+import { stopTelemetry, rootSpan } from '../../initTelemetry.js';
+import { createBundleRequestForPackage, createBundleTask } from '@ms-cloudpack/api-server';
 import { mergeFeatures } from './mergeFeatures.js';
 import { yellow } from '@ms-cloudpack/task-reporter';
 import { getStartingAppPath } from './getStartingAppPath.js';
 import { runPrereqs } from './runPrereqs.js';
-import { setupReporting } from './setupReporting.js';
+import { setupReporting } from '../../setupReporting.js';
 let cleanupFunctions = [];
 /** Stop all started cloudpack instances, for testing */
 export async function stopServers() {
@@ -37,10 +36,11 @@ async function createAppBundleTask(options, context) {
 /**
  * Defines the "start" verb entry point.
  */
-export async function start(options, { reporter, appPath: initialCwd }) {
+export async function start(options, context) {
+    const { reporter, appPath: initialCwd } = context;
     const appPath = await getStartingAppPath(initialCwd, options.app);
     const config = await readConfig(appPath);
-    await setupReporting({ reporter, config });
+    const telemetryClient = await setupReporting({ appPath, config, reporter });
     console.log('App path:', yellow(appPath));
     process.chdir(appPath);
     runPrereqs(config, appPath);
@@ -69,7 +69,7 @@ export async function start(options, { reporter, appPath: initialCwd }) {
         // Initialize session definition.
         const session = await createSession({ appPath, config }, { reporter, packages });
         // Set shared telemetry attributes which will be sent with all telemetry events.
-        setSharedTelemetryAttribute('sessionId', session.id);
+        telemetryClient.setSharedSpanAttribute('sessionId', session.id);
         if (options.logResolveMap) {
             // Write the resolve map to disk.
             await writeJson(path.join(appPath, 'resolve-map.json'), session.resolveMap);

package/lib/commands/start/start.js.map

@@ -1 +1 @@
-{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/commands/start/start.ts"],"names":[],"mappings":"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","sourcesContent":["import { writeJson } from '@ms-cloudpack/json-utilities';\nimport { findResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport path from 'path';\nimport { createSession } from './createSession.js';\nimport { openBrowser } from './openBrowser.js';\nimport type { Session } from '@ms-cloudpack/api-server';\nimport type { StartOptions } from './types/StartOptions.js';\nimport { createPackageDefinitions, readConfig } from '@ms-cloudpack/config';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\nimport { PerfMarkerCliEntry, PerfMeasurementOpenBrowser } from '../../performance/markers.js';\nimport { setSharedTelemetryAttribute, stopTelemetry, rootSpan } from '../../initTelemetry.js';\nimport { createBundleRequestForPackage } from './createBundleRequestForPackage.js';\nimport { createBundleTask } from './createBundleTask.js';\nimport { mergeFeatures } from './mergeFeatures.js';\nimport { yellow } from '@ms-cloudpack/task-reporter';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { TaskContext } from '../../types/TaskContext.js';\nimport { getStartingAppPath } from './getStartingAppPath.js';\nimport { runPrereqs } from './runPrereqs.js';\nimport { setupReporting } from './setupReporting.js';\n\nlet cleanupFunctions: Array<() => Promise<void>> = [];\n\n/** Stop all started cloudpack instances, for testing */\nexport async function stopServers() {\n  for (const func of cleanupFunctions) {\n    await func();\n  }\n  cleanupFunctions = [];\n}\n\nasync function createAppBundleTask(\n  options: { packageName: string },\n  context: { session: Session; config: CloudpackConfig; packages: PackageDefinitionsCache },\n) {\n  const { packageName } = options;\n  const { session } = context;\n  const packageEntry = findResolveMapEntry({\n    packageName,\n    resolveMap: session.resolveMap,\n  });\n\n  if (!packageEntry) {\n    throw new Error(`Could not find package ${packageName} in the resolve map.`);\n  }\n  const bundleRequest = await createBundleRequestForPackage({ packageEntry }, context);\n\n  return createBundleTask(bundleRequest);\n}\n\n/**\n * Defines the \"start\" verb entry point.\n */\nexport async function start(options: StartOptions, { reporter, appPath: initialCwd }: TaskContext) {\n  const appPath = await getStartingAppPath(initialCwd, options.app);\n  const config = await readConfig(appPath);\n\n  await setupReporting({ reporter, config });\n\n  console.log('App path:', yellow(appPath));\n\n  process.chdir(appPath);\n\n  runPrereqs(config, appPath);\n\n  try {\n    // Merge in any additional features from the command line.\n    config.features = mergeFeatures({\n      configFeatures: config.features,\n      commandLineFeatures: options.features,\n    });\n\n    const enabledFeatureNames = Object.entries(config.features)\n      .filter(([, value]) => value)\n      .map(([key]) => key);\n\n    if (enabledFeatureNames.length) {\n      console.log(`Enabled features: ${enabledFeatureNames.map((f) => yellow(f)).join(', ')}`);\n    }\n\n    // Initialize package overrides.\n    const packages = createPackageDefinitions({ config });\n\n    // Make sure the package has a valid definition.\n    const definition = await packages.get(appPath);\n\n    if (!definition) {\n      throw new Error(`There was no package.json located at \"${appPath}\".`);\n    }\n\n    if (!definition.name || !definition.version) {\n      throw new Error(`The package.json at \"${appPath}\" did not have a name and/or version.`);\n    }\n\n    // Initialize session definition.\n    const session = await createSession({ appPath, config }, { reporter, packages });\n\n    // Set shared telemetry attributes which will be sent with all telemetry events.\n    setSharedTelemetryAttribute('sessionId', session.id);\n\n    if (options.logResolveMap) {\n      // Write the resolve map to disk.\n      await writeJson(path.join(appPath, 'resolve-map.json'), session.resolveMap);\n    }\n\n    const { startApiServer } = await import('@ms-cloudpack/api-server');\n\n    // Start api server for tracking status and handling remote requests.\n    const apiServer = await startApiServer({\n      session,\n      rootSpan,\n      reporter,\n      packages,\n    });\n\n    // Kick off bundling app package as soon as api server is ready.\n    void apiServer.addTask(await createAppBundleTask({ packageName: definition.name }, { session, config, packages }));\n\n    // Then start bundle and app servers for hosting the app.\n    const { startBundleServer } = await import('./startBundleServer.js');\n    const bundleServer = await startBundleServer({ apiServer, session, reporter, packages });\n\n    // Finally start the app server.\n    const { startAppServer } = await import('./appServer/startAppServer.js');\n    const appServer = await startAppServer({\n      session,\n      definition,\n      bundleServer,\n      apiServer,\n      config,\n      reporter,\n      packages,\n    });\n\n    const cleanup = async () => {\n      for (const [name, server] of [\n        ['appServer', appServer] as const,\n        ['apiServer', apiServer] as const,\n        ['bundleServer', bundleServer] as const,\n      ]) {\n        console.info(`Closing ${name}: ${server.url}`);\n        try {\n          await server.close();\n        } catch (err) {\n          console.warn('Error closing server:', err);\n        }\n      }\n\n      // Complete the reporting and list pending tasks as aborted.\n      reporter.complete();\n\n      // Flush and close telemetry.\n      await stopTelemetry();\n    };\n\n    cleanupFunctions.push(cleanup);\n\n    // Setup cleanup and close things on completion.\n    let sigintCount = 0;\n\n    process.on('SIGINT', () => {\n      sigintCount++;\n      if (sigintCount > 1) {\n        console.debug('Forcing exit');\n        process.exit(1);\n      }\n\n      // eslint-disable-next-line @typescript-eslint/no-floating-promises -- handler can't be async\n      cleanup().finally(() => {\n        process.exit(0);\n      });\n    });\n\n    // Open the browser.\n    const url = appServer.url;\n\n    performance.measure(PerfMeasurementOpenBrowser, PerfMarkerCliEntry);\n    openBrowser(url).catch((err) => {\n      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access\n      console.warn('Error opening browser:', err?.stack || err);\n      console.warn('Please open the browser manually to:', url);\n    });\n  } catch (err) {\n    console.error(err);\n    reporter.complete();\n    process.exit(1);\n  }\n}\n\n// cspell:ignore Prereqs\n"]}
+{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/commands/start/start.ts"],"names":[],"mappings":"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","sourcesContent":["import { writeJson } from '@ms-cloudpack/json-utilities';\nimport { findResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport path from 'path';\nimport { createSession } from './createSession.js';\nimport { openBrowser } from './openBrowser.js';\nimport type { Session } from '@ms-cloudpack/api-server';\nimport type { StartOptions } from './types/StartOptions.js';\nimport { createPackageDefinitions, readConfig } from '@ms-cloudpack/config';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\nimport { PerfMarkerCliEntry, PerfMeasurementOpenBrowser } from '../../performance/markers.js';\nimport { stopTelemetry, rootSpan } from '../../initTelemetry.js';\nimport { createBundleRequestForPackage, createBundleTask } from '@ms-cloudpack/api-server';\nimport { mergeFeatures } from './mergeFeatures.js';\nimport { yellow } from '@ms-cloudpack/task-reporter';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { TaskContext } from '../../types/TaskContext.js';\nimport { getStartingAppPath } from './getStartingAppPath.js';\nimport { runPrereqs } from './runPrereqs.js';\nimport { setupReporting } from '../../setupReporting.js';\n\nlet cleanupFunctions: Array<() => Promise<void>> = [];\n\n/** Stop all started cloudpack instances, for testing */\nexport async function stopServers() {\n  for (const func of cleanupFunctions) {\n    await func();\n  }\n  cleanupFunctions = [];\n}\n\nasync function createAppBundleTask(\n  options: { packageName: string },\n  context: { session: Session; config: CloudpackConfig; packages: PackageDefinitionsCache },\n) {\n  const { packageName } = options;\n  const { session } = context;\n  const packageEntry = findResolveMapEntry({\n    packageName,\n    resolveMap: session.resolveMap,\n  });\n\n  if (!packageEntry) {\n    throw new Error(`Could not find package ${packageName} in the resolve map.`);\n  }\n  const bundleRequest = await createBundleRequestForPackage({ packageEntry }, context);\n\n  return createBundleTask(bundleRequest);\n}\n\n/**\n * Defines the \"start\" verb entry point.\n */\nexport async function start(options: StartOptions, context: TaskContext) {\n  const { reporter, appPath: initialCwd } = context;\n  const appPath = await getStartingAppPath(initialCwd, options.app);\n  const config = await readConfig(appPath);\n\n  const telemetryClient = await setupReporting({ appPath, config, reporter });\n\n  console.log('App path:', yellow(appPath));\n\n  process.chdir(appPath);\n\n  runPrereqs(config, appPath);\n\n  try {\n    // Merge in any additional features from the command line.\n    config.features = mergeFeatures({\n      configFeatures: config.features,\n      commandLineFeatures: options.features,\n    });\n\n    const enabledFeatureNames = Object.entries(config.features)\n      .filter(([, value]) => value)\n      .map(([key]) => key);\n\n    if (enabledFeatureNames.length) {\n      console.log(`Enabled features: ${enabledFeatureNames.map((f) => yellow(f)).join(', ')}`);\n    }\n\n    // Initialize package overrides.\n    const packages = createPackageDefinitions({ config });\n\n    // Make sure the package has a valid definition.\n    const definition = await packages.get(appPath);\n\n    if (!definition) {\n      throw new Error(`There was no package.json located at \"${appPath}\".`);\n    }\n\n    if (!definition.name || !definition.version) {\n      throw new Error(`The package.json at \"${appPath}\" did not have a name and/or version.`);\n    }\n\n    // Initialize session definition.\n    const session = await createSession({ appPath, config }, { reporter, packages });\n\n    // Set shared telemetry attributes which will be sent with all telemetry events.\n    telemetryClient.setSharedSpanAttribute('sessionId', session.id);\n\n    if (options.logResolveMap) {\n      // Write the resolve map to disk.\n      await writeJson(path.join(appPath, 'resolve-map.json'), session.resolveMap);\n    }\n\n    const { startApiServer } = await import('@ms-cloudpack/api-server');\n\n    // Start api server for tracking status and handling remote requests.\n    const apiServer = await startApiServer({\n      session,\n      rootSpan,\n      reporter,\n      packages,\n    });\n\n    // Kick off bundling app package as soon as api server is ready.\n    void apiServer.addTask(await createAppBundleTask({ packageName: definition.name }, { session, config, packages }));\n\n    // Then start bundle and app servers for hosting the app.\n    const { startBundleServer } = await import('./startBundleServer.js');\n    const bundleServer = await startBundleServer({ apiServer, session, reporter, packages });\n\n    // Finally start the app server.\n    const { startAppServer } = await import('./appServer/startAppServer.js');\n    const appServer = await startAppServer({\n      session,\n      definition,\n      bundleServer,\n      apiServer,\n      config,\n      reporter,\n      packages,\n    });\n\n    const cleanup = async () => {\n      for (const [name, server] of [\n        ['appServer', appServer] as const,\n        ['apiServer', apiServer] as const,\n        ['bundleServer', bundleServer] as const,\n      ]) {\n        console.info(`Closing ${name}: ${server.url}`);\n        try {\n          await server.close();\n        } catch (err) {\n          console.warn('Error closing server:', err);\n        }\n      }\n\n      // Complete the reporting and list pending tasks as aborted.\n      reporter.complete();\n\n      // Flush and close telemetry.\n      await stopTelemetry();\n    };\n\n    cleanupFunctions.push(cleanup);\n\n    // Setup cleanup and close things on completion.\n    let sigintCount = 0;\n\n    process.on('SIGINT', () => {\n      sigintCount++;\n      if (sigintCount > 1) {\n        console.debug('Forcing exit');\n        process.exit(1);\n      }\n\n      // eslint-disable-next-line @typescript-eslint/no-floating-promises -- handler can't be async\n      cleanup().finally(() => {\n        process.exit(0);\n      });\n    });\n\n    // Open the browser.\n    const url = appServer.url;\n\n    performance.measure(PerfMeasurementOpenBrowser, PerfMarkerCliEntry);\n    openBrowser(url).catch((err) => {\n      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access\n      console.warn('Error opening browser:', err?.stack || err);\n      console.warn('Please open the browser manually to:', url);\n    });\n  } catch (err) {\n    console.error(err);\n    reporter.complete();\n    process.exit(1);\n  }\n}\n\n// cspell:ignore Prereqs\n"]}

package/lib/commands/start/startBundleServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"startBundleServer.d.ts","sourceRoot":"","sources":["../../../src/commands/start/startBundleServer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAMnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAKhE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAI3E;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE;IAC/C,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,YAAY,CAAC;IACvB,QAAQ,EAAE,uBAAuB,CAAC;CACnC,GAAG,OAAO,CAAC,YAAY,CAAC,CAuBxB"}
+{"version":3,"file":"startBundleServer.d.ts","sourceRoot":"","sources":["../../../src/commands/start/startBundleServer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAMnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAIhE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAI3E;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE;IAC/C,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,YAAY,CAAC;IACvB,QAAQ,EAAE,uBAAuB,CAAC;CACnC,GAAG,OAAO,CAAC,YAAY,CAAC,CAuBxB"}

package/lib/commands/start/startBundleServer.js

@@ -3,8 +3,7 @@ import { isExternalPackage, findResolveMapEntry } from '@ms-cloudpack/package-ut
 import { slash } from '@ms-cloudpack/path-string-parsing';
 import { isFolder } from '@ms-cloudpack/path-utilities';
 import path from 'path';
-import { createBundleRequestForPackage } from './createBundleRequestForPackage.js';
-import { createBundleTask } from './createBundleTask.js';
+import { createBundleTask, createBundleRequestForPackage } from '@ms-cloudpack/api-server';
 import { parseRequestInfo } from './parseRequestInfo.js';
 import { fileURLToPath } from 'url';
 const currentPath = fileURLToPath(import.meta.url);

package/lib/commands/start/startBundleServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"startBundleServer.js","sourceRoot":"","sources":["../../../src/commands/start/startBundleServer.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ApiServer, Session } from '@ms-cloudpack/api-server';\nimport { createExpressApp, type Express, type Request, type Response } from '@ms-cloudpack/create-express-app';\nimport { isExternalPackage, findResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport { isFolder } from '@ms-cloudpack/path-utilities';\nimport path from 'path';\nimport type { BundleServer } from '../../types/BundleServer.js';\nimport { createBundleRequestForPackage } from './createBundleRequestForPackage.js';\nimport { createBundleTask } from './createBundleTask.js';\nimport { parseRequestInfo } from './parseRequestInfo.js';\nimport { fileURLToPath } from 'url';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\n\nconst currentPath = fileURLToPath(import.meta.url);\n\n/**\n * The bundle server handles package requests and returns bundled resources.\n * Resources are bundled on demand and cached locally to avoid re-bundling\n * on each request.\n */\nexport async function startBundleServer(options: {\n  apiServer: ApiServer;\n  session: Session;\n  reporter: TaskReporter;\n  packages: PackageDefinitionsCache;\n}): Promise<BundleServer> {\n  const { apiServer, session, reporter, packages } = options;\n  const { config } = session;\n  const { port, close, url } = await createExpressApp({\n    portRange: [5500, 5501, 5502, 5503],\n    hostname: config.devServer?.domain,\n    sslOptions: config.devServer?.https,\n    setupCallback: (app: Express) => {\n      // Set up the express app routes.\n      app.get('*', (req, res) => {\n        handleRequest({ req, res }, { session, apiServer, reporter, packages }).catch((err) => {\n          console.error((err as Error)?.stack || err);\n          res.status(500).send(`Error bundling: ${err}`);\n        });\n      });\n    },\n  });\n\n  return {\n    close,\n    port,\n    url,\n  };\n}\n\nasync function handleRequest(\n  options: {\n    req: Request;\n    res: Response;\n  },\n  context: {\n    session: Session;\n    apiServer: ApiServer;\n    reporter: TaskReporter;\n    packages: PackageDefinitionsCache;\n  },\n) {\n  const { req, res } = options;\n  const { session, apiServer, reporter, packages } = context;\n  const { resolveMap, config } = session;\n  const { features = {} } = config;\n  const requestPath = slash(req.path.substring(1));\n  const force = req.query.force !== undefined;\n  const { packageName, version, bundled, filePath } = parseRequestInfo(requestPath);\n  const packageEntry = findResolveMapEntry({ packageName, version, resolveMap });\n\n  if (!packageEntry) {\n    // If the package is missing, invalid arguments.\n    console.debug(`Response (404): Unrecognized package \"${packageName}\"`);\n    res.status(404).send(`Unrecognized package \"${packageName}\".`);\n    return;\n  }\n\n  console.debug(`Request: \"${packageName}@${version}${filePath}\"`);\n\n  // If the package is missing, invalid arguments.\n  if (!requestPath || !packageName) {\n    console.debug(`Response (400): \"${packageName}@${version}${filePath}\"`);\n\n    res.status(400).send(`Requests must be in the format \"/{packageName}@{version}/{type}/path/file.ext\".`);\n    return;\n  }\n\n  // If the version is missing, redirect to the primary version.\n  if (!version) {\n    if (!packageEntry) {\n      console.debug(`Response (404): Unrecognized package \"${packageName}\"`);\n\n      res.status(404).send(`Unrecognized package \"${packageName}\".`);\n      return;\n    }\n\n    res.redirect(`/${packageName}@${packageEntry.version}${filePath}`);\n    return;\n  }\n\n  // If it's an unrecognized package, 404.\n  if (!packageEntry) {\n    console.debug(`Response (404): \"${packageName}@${version}${filePath}\"`);\n\n    res\n      .status(404)\n      .send(`The requested package \"${packageName}@${version}${filePath}\" was not found in the resolve map.`);\n\n    return;\n  }\n\n  // If we are accessing a non-bundled asset, return the file directly.\n  if (!bundled) {\n    const fullPath = path.join(packageEntry.path, filePath);\n\n    if (fullPath.length < packageEntry.path.length) {\n      console.debug(`Response (400): \"${packageName}@${version}${filePath}\"`);\n\n      res.status(400).send(`Invalid file path.`);\n      return;\n    }\n\n    console.debug(`Unbundled response returning: \"${packageName}@${version}${filePath}\"`);\n    // If the package is external, set cache headers.\n    if (isExternalPackage(packageEntry.path)) {\n      res.setHeader('Cache-Control', 'public, max-age=31536000');\n    }\n\n    res.sendFile(path.join(packageEntry.path, filePath));\n    return;\n  }\n\n  const bundleRequest = await createBundleRequestForPackage({ packageEntry }, { config, packages });\n\n  // Set up for bundling.\n  const rerun = !(await isFolder(bundleRequest.outputPath)) || force;\n\n  if (features.enableLage) {\n    console.debug(`Trying to bundle \"${packageName}@${version}\" with lage task scheduler`);\n\n    try {\n      await apiServer.scheduleTask(\n        bundleRequest,\n        {\n          // TODO: we may want to have away to let users add more types of tasks here\n          bundle: path.resolve(currentPath, '../../../tasks/bundleTaskWorker.js'),\n        },\n        { rerun },\n      );\n\n      console.debug(`Bundle returning: \"${packageName}@${version}${filePath}\"`);\n      // Try to return the result.\n      if (bundleRequest.isExternal) {\n        res.setHeader('Cache-Control', 'public, max-age=31536000');\n      }\n\n      return res.sendFile(path.join(bundleRequest.outputPath, filePath));\n    } catch (err) {\n      return res.status(500).type('json').send(bundleRequest);\n    }\n  }\n\n  console.debug(`Trying to bundle \"${packageName}@${version}\"`);\n\n  const bundleTask = createBundleTask(bundleRequest, { force }, reporter);\n  await apiServer.addTask(bundleTask, { rerun });\n\n  // At this point we should have a Task completed.\n  if ((bundleRequest.result?.errors?.length || 0) > 0) {\n    res.status(500).type('json').send(bundleRequest);\n  } else {\n    if (features.enqueueDependencies && bundleRequest.result?.dependencies) {\n      // Enqueue all dependencies to be bundled.\n      for (const dependency of bundleRequest.result.dependencies) {\n        const dependencyBundleRequest = await createBundleRequestForPackage(\n          { packageEntry: resolveMap[dependency] },\n          { ...context, config },\n        );\n\n        // No need to await, we don't want to wait until the bundle is completed.\n        void apiServer.addTask(createBundleTask(dependencyBundleRequest, { force }, reporter));\n      }\n    }\n\n    console.debug(`Bundle returning: \"${packageName}@${version}${filePath}\"`);\n    // Try to return the result.\n    if (bundleRequest.isExternal) {\n      res.setHeader('Cache-Control', 'public, max-age=31536000');\n    }\n\n    res.sendFile(path.join(bundleRequest.outputPath, filePath));\n  }\n}\n"]}
+{"version":3,"file":"startBundleServer.js","sourceRoot":"","sources":["../../../src/commands/start/startBundleServer.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ApiServer, Session } from '@ms-cloudpack/api-server';\nimport { createExpressApp, type Express, type Request, type Response } from '@ms-cloudpack/create-express-app';\nimport { isExternalPackage, findResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport { isFolder } from '@ms-cloudpack/path-utilities';\nimport path from 'path';\nimport type { BundleServer } from '../../types/BundleServer.js';\nimport { createBundleTask, createBundleRequestForPackage } from '@ms-cloudpack/api-server';\nimport { parseRequestInfo } from './parseRequestInfo.js';\nimport { fileURLToPath } from 'url';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\n\nconst currentPath = fileURLToPath(import.meta.url);\n\n/**\n * The bundle server handles package requests and returns bundled resources.\n * Resources are bundled on demand and cached locally to avoid re-bundling\n * on each request.\n */\nexport async function startBundleServer(options: {\n  apiServer: ApiServer;\n  session: Session;\n  reporter: TaskReporter;\n  packages: PackageDefinitionsCache;\n}): Promise<BundleServer> {\n  const { apiServer, session, reporter, packages } = options;\n  const { config } = session;\n  const { port, close, url } = await createExpressApp({\n    portRange: [5500, 5501, 5502, 5503],\n    hostname: config.devServer?.domain,\n    sslOptions: config.devServer?.https,\n    setupCallback: (app: Express) => {\n      // Set up the express app routes.\n      app.get('*', (req, res) => {\n        handleRequest({ req, res }, { session, apiServer, reporter, packages }).catch((err) => {\n          console.error((err as Error)?.stack || err);\n          res.status(500).send(`Error bundling: ${err}`);\n        });\n      });\n    },\n  });\n\n  return {\n    close,\n    port,\n    url,\n  };\n}\n\nasync function handleRequest(\n  options: {\n    req: Request;\n    res: Response;\n  },\n  context: {\n    session: Session;\n    apiServer: ApiServer;\n    reporter: TaskReporter;\n    packages: PackageDefinitionsCache;\n  },\n) {\n  const { req, res } = options;\n  const { session, apiServer, reporter, packages } = context;\n  const { resolveMap, config } = session;\n  const { features = {} } = config;\n  const requestPath = slash(req.path.substring(1));\n  const force = req.query.force !== undefined;\n  const { packageName, version, bundled, filePath } = parseRequestInfo(requestPath);\n  const packageEntry = findResolveMapEntry({ packageName, version, resolveMap });\n\n  if (!packageEntry) {\n    // If the package is missing, invalid arguments.\n    console.debug(`Response (404): Unrecognized package \"${packageName}\"`);\n    res.status(404).send(`Unrecognized package \"${packageName}\".`);\n    return;\n  }\n\n  console.debug(`Request: \"${packageName}@${version}${filePath}\"`);\n\n  // If the package is missing, invalid arguments.\n  if (!requestPath || !packageName) {\n    console.debug(`Response (400): \"${packageName}@${version}${filePath}\"`);\n\n    res.status(400).send(`Requests must be in the format \"/{packageName}@{version}/{type}/path/file.ext\".`);\n    return;\n  }\n\n  // If the version is missing, redirect to the primary version.\n  if (!version) {\n    if (!packageEntry) {\n      console.debug(`Response (404): Unrecognized package \"${packageName}\"`);\n\n      res.status(404).send(`Unrecognized package \"${packageName}\".`);\n      return;\n    }\n\n    res.redirect(`/${packageName}@${packageEntry.version}${filePath}`);\n    return;\n  }\n\n  // If it's an unrecognized package, 404.\n  if (!packageEntry) {\n    console.debug(`Response (404): \"${packageName}@${version}${filePath}\"`);\n\n    res\n      .status(404)\n      .send(`The requested package \"${packageName}@${version}${filePath}\" was not found in the resolve map.`);\n\n    return;\n  }\n\n  // If we are accessing a non-bundled asset, return the file directly.\n  if (!bundled) {\n    const fullPath = path.join(packageEntry.path, filePath);\n\n    if (fullPath.length < packageEntry.path.length) {\n      console.debug(`Response (400): \"${packageName}@${version}${filePath}\"`);\n\n      res.status(400).send(`Invalid file path.`);\n      return;\n    }\n\n    console.debug(`Unbundled response returning: \"${packageName}@${version}${filePath}\"`);\n    // If the package is external, set cache headers.\n    if (isExternalPackage(packageEntry.path)) {\n      res.setHeader('Cache-Control', 'public, max-age=31536000');\n    }\n\n    res.sendFile(path.join(packageEntry.path, filePath));\n    return;\n  }\n\n  const bundleRequest = await createBundleRequestForPackage({ packageEntry }, { config, packages });\n\n  // Set up for bundling.\n  const rerun = !(await isFolder(bundleRequest.outputPath)) || force;\n\n  if (features.enableLage) {\n    console.debug(`Trying to bundle \"${packageName}@${version}\" with lage task scheduler`);\n\n    try {\n      await apiServer.scheduleTask(\n        bundleRequest,\n        {\n          // TODO: we may want to have away to let users add more types of tasks here\n          bundle: path.resolve(currentPath, '../../../tasks/bundleTaskWorker.js'),\n        },\n        { rerun },\n      );\n\n      console.debug(`Bundle returning: \"${packageName}@${version}${filePath}\"`);\n      // Try to return the result.\n      if (bundleRequest.isExternal) {\n        res.setHeader('Cache-Control', 'public, max-age=31536000');\n      }\n\n      return res.sendFile(path.join(bundleRequest.outputPath, filePath));\n    } catch (err) {\n      return res.status(500).type('json').send(bundleRequest);\n    }\n  }\n\n  console.debug(`Trying to bundle \"${packageName}@${version}\"`);\n\n  const bundleTask = createBundleTask(bundleRequest, { force }, reporter);\n  await apiServer.addTask(bundleTask, { rerun });\n\n  // At this point we should have a Task completed.\n  if ((bundleRequest.result?.errors?.length || 0) > 0) {\n    res.status(500).type('json').send(bundleRequest);\n  } else {\n    if (features.enqueueDependencies && bundleRequest.result?.dependencies) {\n      // Enqueue all dependencies to be bundled.\n      for (const dependency of bundleRequest.result.dependencies) {\n        const dependencyBundleRequest = await createBundleRequestForPackage(\n          { packageEntry: resolveMap[dependency] },\n          { ...context, config },\n        );\n\n        // No need to await, we don't want to wait until the bundle is completed.\n        void apiServer.addTask(createBundleTask(dependencyBundleRequest, { force }, reporter));\n      }\n    }\n\n    console.debug(`Bundle returning: \"${packageName}@${version}${filePath}\"`);\n    // Try to return the result.\n    if (bundleRequest.isExternal) {\n      res.setHeader('Cache-Control', 'public, max-age=31536000');\n    }\n\n    res.sendFile(path.join(bundleRequest.outputPath, filePath));\n  }\n}\n"]}

package/lib/commands/sync/sync.d.ts

@@ -1,4 +1,4 @@
 import type { TaskContext } from '../../types/TaskContext.js';
 import type { SyncOptions } from './types/SyncOptions.js';
-export declare function sync(options: SyncOptions, context: TaskContext): Promise<void>;
+export declare function sync({ upload }: SyncOptions, context: TaskContext): Promise<void>;
 //# sourceMappingURL=sync.d.ts.map

package/lib/commands/sync/sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../../src/commands/sync/sync.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE1D,wBAAsB,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,iBAcpE"}
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../../src/commands/sync/sync.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAmB1D,wBAAsB,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,iBA8BvE"}

package/lib/commands/sync/sync.js

@@ -1,11 +1,34 @@
 import { red } from '@ms-cloudpack/task-reporter';
-import { stopTelemetry } from '../../initTelemetry.js';
-import { syncInternal } from './syncInternal.js';
-export async function sync(options, context) {
+import { rootSpan, stopTelemetry } from '../../initTelemetry.js';
+import { createSession } from '../start/createSession.js';
+import { createPackageDefinitions } from '@ms-cloudpack/config';
+import { setupReporting } from '../../setupReporting.js';
+async function createApiServer({ appPath, config, reporter }) {
+    // Initialize package overrides.
+    const packages = createPackageDefinitions({ config });
+    // Initialize session definition.
+    const session = await createSession({ appPath, config }, { reporter, packages });
+    const { createCloudpackServer } = await import('@ms-cloudpack/api-server');
+    const server = await createCloudpackServer({ session, rootSpan, reporter, packages });
+    return server;
+}
+export async function sync({ upload }, context) {
     let hasErrors = false;
     let message = '';
     try {
-        await syncInternal(options, context);
+        await setupReporting(context);
+        const config = context.config.remoteCache;
+        if (!config) {
+            console.warn('Remote cache is not configured. Please add remoteCache to your cloudpack.config.json file to use this feature.');
+            return;
+        }
+        const apiServer = await createApiServer(context);
+        if (upload) {
+            await apiServer.syncUpload(undefined);
+        }
+        else {
+            await apiServer.syncDownload(undefined);
+        }
         hasErrors = context.reporter.hasErrors();
     }
     catch (error) {

package/lib/commands/sync/sync.js.map

@@ -1 +1 @@
-{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../../src/commands/sync/sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,6BAA6B,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAIjD,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,OAAoB,EAAE,OAAoB;IACnE,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,IAAI,OAAO,GAAW,EAAE,CAAC;IACzB,IAAI;QACF,MAAM,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACrC,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;KAC1C;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,iBAAiB,CAAC;QACrE,SAAS,GAAG,IAAI,CAAC;KAClB;YAAS;QACR,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAC9D,MAAM,aAAa,EAAE,CAAC;QACtB,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACjC;AACH,CAAC","sourcesContent":["import { red } from '@ms-cloudpack/task-reporter';\nimport { stopTelemetry } from '../../initTelemetry.js';\nimport { syncInternal } from './syncInternal.js';\nimport type { TaskContext } from '../../types/TaskContext.js';\nimport type { SyncOptions } from './types/SyncOptions.js';\n\nexport async function sync(options: SyncOptions, context: TaskContext) {\n  let hasErrors = false;\n  let message: string = '';\n  try {\n    await syncInternal(options, context);\n    hasErrors = context.reporter.hasErrors();\n  } catch (error) {\n    message = error instanceof Error ? error.message : '<Unknown error>';\n    hasErrors = true;\n  } finally {\n    context.reporter.complete(hasErrors ? red(message) : message);\n    await stopTelemetry();\n    process.exit(hasErrors ? 1 : 0);\n  }\n}\n"]}
+{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../../src/commands/sync/sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,6BAA6B,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAGjE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,KAAK,UAAU,eAAe,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAe;IACvE,gCAAgC;IAChC,MAAM,QAAQ,GAAG,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAEtD,iCAAiC;IACjC,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEjF,MAAM,EAAE,qBAAqB,EAAE,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC;IAE3E,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEtF,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,EAAE,MAAM,EAAe,EAAE,OAAoB;IACtE,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,IAAI,OAAO,GAAW,EAAE,CAAC;IACzB,IAAI;QACF,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC;QAC9B,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC;QAC1C,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,CAAC,IAAI,CACV,gHAAgH,CACjH,CAAC;YACF,OAAO;SACR;QAED,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;QAEjD,IAAI,MAAM,EAAE;YACV,MAAM,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;SACvC;aAAM;YACL,MAAM,SAAS,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;SACzC;QAED,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;KAC1C;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,iBAAiB,CAAC;QACrE,SAAS,GAAG,IAAI,CAAC;KAClB;YAAS;QACR,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAC9D,MAAM,aAAa,EAAE,CAAC;QACtB,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACjC;AACH,CAAC","sourcesContent":["import { red } from '@ms-cloudpack/task-reporter';\nimport { rootSpan, stopTelemetry } from '../../initTelemetry.js';\nimport type { TaskContext } from '../../types/TaskContext.js';\nimport type { SyncOptions } from './types/SyncOptions.js';\nimport { createSession } from '../start/createSession.js';\nimport { createPackageDefinitions } from '@ms-cloudpack/config';\nimport { setupReporting } from '../../setupReporting.js';\n\nasync function createApiServer({ appPath, config, reporter }: TaskContext) {\n  // Initialize package overrides.\n  const packages = createPackageDefinitions({ config });\n\n  // Initialize session definition.\n  const session = await createSession({ appPath, config }, { reporter, packages });\n\n  const { createCloudpackServer } = await import('@ms-cloudpack/api-server');\n\n  const server = await createCloudpackServer({ session, rootSpan, reporter, packages });\n\n  return server;\n}\n\nexport async function sync({ upload }: SyncOptions, context: TaskContext) {\n  let hasErrors = false;\n  let message: string = '';\n  try {\n    await setupReporting(context);\n    const config = context.config.remoteCache;\n    if (!config) {\n      console.warn(\n        'Remote cache is not configured. Please add remoteCache to your cloudpack.config.json file to use this feature.',\n      );\n      return;\n    }\n\n    const apiServer = await createApiServer(context);\n\n    if (upload) {\n      await apiServer.syncUpload(undefined);\n    } else {\n      await apiServer.syncDownload(undefined);\n    }\n\n    hasErrors = context.reporter.hasErrors();\n  } catch (error) {\n    message = error instanceof Error ? error.message : '<Unknown error>';\n    hasErrors = true;\n  } finally {\n    context.reporter.complete(hasErrors ? red(message) : message);\n    await stopTelemetry();\n    process.exit(hasErrors ? 1 : 0);\n  }\n}\n"]}

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAcpC;;;GAGG;AACH,wBAAsB,IAAI,CAAC,WAAW,CAAC,EAAE;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,QAAQ,EAAE,YAAY,CAAC;IACvB,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;CAChD,iBAkDA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAWpC;;;GAGG;AACH,wBAAsB,IAAI,CAAC,WAAW,CAAC,EAAE;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,QAAQ,EAAE,YAAY,CAAC;IACvB,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;CAChD,iBAwCA"}

package/lib/index.js

@@ -4,10 +4,8 @@ import { Command } from 'commander';
 import glob from 'glob';
 import path from 'path';
 import { fileURLToPath, pathToFileURL } from 'url';
-import { setSharedTelemetryAttributes } from './initTelemetry.js';
 import { PerfMarkerCliEntry } from './performance/markers.js';
 import { readConfig } from '@ms-cloudpack/config';
-import { readJson } from '@ms-cloudpack/json-utilities';
 const currentFilePath = fileURLToPath(import.meta.url);
 const currentPath = path.dirname(currentFilePath);
 /**
@@ -22,15 +20,7 @@ export async function main(testOptions) {
     const config = await readConfig(appPath);
     const program = new Command();
     const version = getVersion(import.meta.url);
-    const verb = argv[2];
     program.name('cloudpack').version(version).usage('<command> [options]');
-    const definition = (await readJson(path.join(appPath, 'package.json')));
-    setSharedTelemetryAttributes({
-        verb,
-        arguments: argv.slice(3).join(' '),
-        environment: process.env.CI || process.env.TF_BUILD ? 'ci' : 'local',
-        appName: definition?.name || '<unknown>',
-    });
     // Ensure the glob works in tests
     const commandsGlob = `commands/*/index${path.extname(currentFilePath)}`;
     const commands = glob.sync(commandsGlob, { cwd: currentPath });

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { getVersion } from '@ms-cloudpack/package-utilities';\nimport { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport { Command } from 'commander';\nimport glob from 'glob';\nimport path from 'path';\nimport { fileURLToPath, pathToFileURL } from 'url';\nimport { setSharedTelemetryAttributes } from './initTelemetry.js';\nimport { PerfMarkerCliEntry } from './performance/markers.js';\nimport { readConfig } from '@ms-cloudpack/config';\nimport type { CommandFunction } from './types/CommandFunction.js';\nimport { readJson } from '@ms-cloudpack/json-utilities';\nimport type { PackageJson } from '@ms-cloudpack/bundler-types';\n\nconst currentFilePath = fileURLToPath(import.meta.url);\nconst currentPath = path.dirname(currentFilePath);\n\n/**\n * Entry point for the cloudpack CLI.\n * Resolves all commands defined within the \"./commands\" folder.\n */\nexport async function main(testOptions?: {\n  appPath: string;\n  argv: string[];\n  reporter: TaskReporter;\n  preParseOverrides?: (program: Command) => void;\n}) {\n  performance.mark(PerfMarkerCliEntry);\n\n  const argv = testOptions?.argv || process.argv;\n  const appPath = testOptions?.appPath || process.cwd();\n  const reporter = testOptions?.reporter || new TaskReporter();\n  const config = await readConfig(appPath);\n\n  const program = new Command();\n  const version = getVersion(import.meta.url);\n  const verb = argv[2];\n\n  program.name('cloudpack').version(version).usage('<command> [options]');\n\n  const definition = (await readJson(path.join(appPath, 'package.json'))) as PackageJson;\n\n  setSharedTelemetryAttributes({\n    verb,\n    arguments: argv.slice(3).join(' '),\n    environment: process.env.CI || process.env.TF_BUILD ? 'ci' : 'local',\n    appName: definition?.name || '<unknown>',\n  });\n\n  // Ensure the glob works in tests\n  const commandsGlob = `commands/*/index${path.extname(currentFilePath)}`;\n  const commands = glob.sync(commandsGlob, { cwd: currentPath });\n  if (!commands.length) {\n    // There was an issue with the glob above not working in tests, so make sure that doesn't happen again\n    throw new Error(`No commands found under \"${currentPath}\".`);\n  }\n\n  for (const commandPath of commands) {\n    const commandFunction = (await import(pathToFileURL(path.join(currentPath, commandPath)).toString())) as {\n      init: CommandFunction;\n    };\n\n    commandFunction.init(program, { reporter, appPath, config });\n  }\n\n  program.option('-v, --verbose', 'Show additional details about the running tasks. (default: false)');\n  program.option('-d, --debug', 'Show debug information (superset of --verbose). (default: false)');\n  program.option('-n, --no-color', 'Disable colors in the output. (default: false)');\n\n  testOptions?.preParseOverrides?.(program);\n\n  await program.parseAsync(argv);\n\n  if (program.args.length === 0) {\n    program.help();\n  }\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAGlD,MAAM,eAAe,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACvD,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;AAElD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,WAK1B;IACC,WAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAErC,MAAM,IAAI,GAAG,WAAW,EAAE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAC/C,MAAM,OAAO,GAAG,WAAW,EAAE,OAAO,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IACtD,MAAM,QAAQ,GAAG,WAAW,EAAE,QAAQ,IAAI,IAAI,YAAY,EAAE,CAAC;IAC7D,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,CAAC;IAEzC,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAC9B,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE5C,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAExE,iCAAiC;IACjC,MAAM,YAAY,GAAG,mBAAmB,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC;IACxE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC,CAAC;IAC/D,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;QACpB,sGAAsG;QACtG,MAAM,IAAI,KAAK,CAAC,4BAA4B,WAAW,IAAI,CAAC,CAAC;KAC9D;IAED,KAAK,MAAM,WAAW,IAAI,QAAQ,EAAE;QAClC,MAAM,eAAe,GAAG,CAAC,MAAM,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAEnG,CAAC;QAEF,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;KAC9D;IAED,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,mEAAmE,CAAC,CAAC;IACrG,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,kEAAkE,CAAC,CAAC;IAClG,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,gDAAgD,CAAC,CAAC;IAEnF,WAAW,EAAE,iBAAiB,EAAE,CAAC,OAAO,CAAC,CAAC;IAE1C,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAE/B,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QAC7B,OAAO,CAAC,IAAI,EAAE,CAAC;KAChB;AACH,CAAC","sourcesContent":["import { getVersion } from '@ms-cloudpack/package-utilities';\nimport { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport { Command } from 'commander';\nimport glob from 'glob';\nimport path from 'path';\nimport { fileURLToPath, pathToFileURL } from 'url';\nimport { PerfMarkerCliEntry } from './performance/markers.js';\nimport { readConfig } from '@ms-cloudpack/config';\nimport type { CommandFunction } from './types/CommandFunction.js';\n\nconst currentFilePath = fileURLToPath(import.meta.url);\nconst currentPath = path.dirname(currentFilePath);\n\n/**\n * Entry point for the cloudpack CLI.\n * Resolves all commands defined within the \"./commands\" folder.\n */\nexport async function main(testOptions?: {\n  appPath: string;\n  argv: string[];\n  reporter: TaskReporter;\n  preParseOverrides?: (program: Command) => void;\n}) {\n  performance.mark(PerfMarkerCliEntry);\n\n  const argv = testOptions?.argv || process.argv;\n  const appPath = testOptions?.appPath || process.cwd();\n  const reporter = testOptions?.reporter || new TaskReporter();\n  const config = await readConfig(appPath);\n\n  const program = new Command();\n  const version = getVersion(import.meta.url);\n\n  program.name('cloudpack').version(version).usage('<command> [options]');\n\n  // Ensure the glob works in tests\n  const commandsGlob = `commands/*/index${path.extname(currentFilePath)}`;\n  const commands = glob.sync(commandsGlob, { cwd: currentPath });\n  if (!commands.length) {\n    // There was an issue with the glob above not working in tests, so make sure that doesn't happen again\n    throw new Error(`No commands found under \"${currentPath}\".`);\n  }\n\n  for (const commandPath of commands) {\n    const commandFunction = (await import(pathToFileURL(path.join(currentPath, commandPath)).toString())) as {\n      init: CommandFunction;\n    };\n\n    commandFunction.init(program, { reporter, appPath, config });\n  }\n\n  program.option('-v, --verbose', 'Show additional details about the running tasks. (default: false)');\n  program.option('-d, --debug', 'Show debug information (superset of --verbose). (default: false)');\n  program.option('-n, --no-color', 'Disable colors in the output. (default: false)');\n\n  testOptions?.preParseOverrides?.(program);\n\n  await program.parseAsync(argv);\n\n  if (program.args.length === 0) {\n    program.help();\n  }\n}\n"]}

package/lib/initTelemetry.d.ts

@@ -1,10 +1,11 @@
 import { type TelemetryConfig } from '@ms-cloudpack/config';
-import { type Span } from '@ms-cloudpack/telemetry';
+import { type Span, type TelemetryClient } from '@ms-cloudpack/telemetry';
 import type { TaskReporter } from '@ms-cloudpack/task-reporter';
 export interface TelemetryInitOptions {
     useDebugLogging: boolean;
     useVerboseLogging: boolean;
     telemetryConfig: TelemetryConfig | undefined;
+    sharedSpanAttributes?: Record<string, string>;
 }
 export declare let rootSpan: Span | undefined;
 /**
@@ -13,20 +14,7 @@ export declare let rootSpan: Span | undefined;
  * @param options - options to initialize telemetry
  * @returns
  */
-export declare function initTelemetry(options: TelemetryInitOptions, taskReporter: TaskReporter): Promise<void>;
-/**
- * Adds shared attributes to all spans.
- * No-op if telemetry is not initialized.
- * @param attributes - key-value pair
- */
-export declare function setSharedTelemetryAttributes(attributes: Record<string, string>): void;
-/**
- * Adds a shared attribute to all spans.
- * No-op if telemetry is not initialized.
- * @param key - key of the attribute
- * @param value - value of the attribute
- */
-export declare function setSharedTelemetryAttribute(key: string, value: string): void;
+export declare function initTelemetry(options: TelemetryInitOptions, taskReporter: TaskReporter): Promise<TelemetryClient>;
 /**
  * Ends rootSpan and flushes all telemetry.
  * No-op if telemetry is not initialized.

package/lib/initTelemetry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"initTelemetry.d.ts","sourceRoot":"","sources":["../src/initTelemetry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,EAAE,KAAK,IAAI,EAA+C,MAAM,yBAAyB,CAAC;AAEjG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,MAAM,WAAW,oBAAoB;IACnC,eAAe,EAAE,OAAO,CAAC;IACzB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,eAAe,EAAE,eAAe,GAAG,SAAS,CAAC;CAC9C;AAGD,eAAO,IAAI,QAAQ,EAAE,IAAI,GAAG,SAAS,CAAC;AAEtC;;;;;GAKG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,YAAY,iBAwB5F;AAED;;;;GAIG;AACH,wBAAgB,4BAA4B,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,QAI9E;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAErE;AAED;;;;GAIG;AACH,wBAAgB,aAAa,8BAG5B"}
+{"version":3,"file":"initTelemetry.d.ts","sourceRoot":"","sources":["../src/initTelemetry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,EAAE,KAAK,IAAI,EAAE,KAAK,eAAe,EAAyB,MAAM,yBAAyB,CAAC;AAEjG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,MAAM,WAAW,oBAAoB;IACnC,eAAe,EAAE,OAAO,CAAC;IACzB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,eAAe,EAAE,eAAe,GAAG,SAAS,CAAC;IAC7C,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/C;AAGD,eAAO,IAAI,QAAQ,EAAE,IAAI,GAAG,SAAS,CAAC;AAEtC;;;;;GAKG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,YAAY,4BAgC5F;AAED;;;;GAIG;AACH,wBAAgB,aAAa,8BAG5B"}

package/lib/initTelemetry.js

@@ -23,31 +23,18 @@ export async function initTelemetry(options, taskReporter) {
         serviceNamespace: 'cloudpack',
         serviceName: 'cli',
     });
+    if (options.sharedSpanAttributes) {
+        for (const [key, value] of Object.entries(options.sharedSpanAttributes)) {
+            telemetryClient.setSharedSpanAttribute(key, value);
+        }
+    }
     // This is the root span for the CLI. It will be used to track the duration of the CLI execution.
     rootSpan = telemetryClient.getTracer()?.startSpan('CLI');
     if (rootSpan) {
         // Register performance observers to track performance metrics as events of CLI span.
         registerPerformanceObservers(rootSpan);
     }
-}
-/**
- * Adds shared attributes to all spans.
- * No-op if telemetry is not initialized.
- * @param attributes - key-value pair
- */
-export function setSharedTelemetryAttributes(attributes) {
-    for (const [key, value] of Object.entries(attributes)) {
-        telemetryClient?.setSharedSpanAttribute(key, value);
-    }
-}
-/**
- * Adds a shared attribute to all spans.
- * No-op if telemetry is not initialized.
- * @param key - key of the attribute
- * @param value - value of the attribute
- */
-export function setSharedTelemetryAttribute(key, value) {
-    telemetryClient?.setSharedSpanAttribute(key, value);
+    return telemetryClient;
 }
 /**
  * Ends rootSpan and flushes all telemetry.