@ms-cloudpack/cli 0.45.2 → 0.45.3

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":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAO9D,wBAAsB,MAAM,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,WAAW,iBA0BxE"}
+{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../../src/commands/bundle/bundle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAM9D,wBAAsB,MAAM,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,WAAW,iBA8BxE"}

package/lib/commands/bundle/bundle.js

@@ -1,13 +1,16 @@
 import { setupReporting } from '../../setupReporting.js';
 import { ensurePackageBundled } from '@ms-cloudpack/api-server/apis';
 import path from 'path';
-import { stopTelemetry } from '../../initTelemetry.js';
 import { createPartialApiContext } from '../../common/createPartialApiContext.js';
 export async function bundle(options, context) {
     const { bundler: bundlerType, outdir = 'dist/browser-esm', disableSourceMaps } = options;
     const { reporter, appPath: packagePath } = context;
-    await setupReporting(context);
-    const ctx = await createPartialApiContext(context, ['packages', 'watcher', 'session', 'taskRunner', 'bus']);
+    const telemetryClient = await setupReporting(context);
+    const ctx = await createPartialApiContext({
+        ...context,
+        telemetryClient,
+        items: ['packages', 'watcher', 'session', 'taskRunner', 'bus'],
+    });
     const definition = await ctx.packages.get(packagePath);
     const { result } = await ensurePackageBundled({
         input: {
@@ -20,7 +23,7 @@ export async function bundle(options, context) {
         ctx,
     });
     await ctx.dispose();
-    await stopTelemetry();
+    await telemetryClient.shutdown();
     reporter.complete();
     process.exit(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":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAElF,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,OAAsB,EAAE,OAAoB;IACvE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,GAAG,kBAAkB,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC;IACzF,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAEnD,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC;IAE9B,MAAM,GAAG,GAAG,MAAM,uBAAuB,CAAC,OAAO,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC,CAAC;IAE5G,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAEvD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,oBAAoB,CAAC;QAC5C,KAAK,EAAE;YACL,IAAI,EAAE,UAAU,EAAE,IAAI,IAAI,WAAW;YACrC,OAAO,EAAE,UAAU,EAAE,OAAO,IAAI,OAAO;YACvC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC;YAC7C,WAAW;YACX,iBAAiB;SAClB;QACD,GAAG;KACJ,CAAC,CAAC;IAEH,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;IACpB,MAAM,aAAa,EAAE,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAEpB,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC;AAED,uBAAuB","sourcesContent":["import type { BundleOptions } from './types/BundleOptions.js';\nimport type { TaskContext } from '../../types/TaskContext.js';\nimport { setupReporting } from '../../setupReporting.js';\nimport { ensurePackageBundled } from '@ms-cloudpack/api-server/apis';\nimport path from 'path';\nimport { stopTelemetry } from '../../initTelemetry.js';\nimport { createPartialApiContext } from '../../common/createPartialApiContext.js';\n\nexport async function bundle(options: BundleOptions, context: TaskContext) {\n  const { bundler: bundlerType, outdir = 'dist/browser-esm', disableSourceMaps } = options;\n  const { reporter, appPath: packagePath } = context;\n\n  await setupReporting(context);\n\n  const ctx = await createPartialApiContext(context, ['packages', 'watcher', 'session', 'taskRunner', 'bus']);\n\n  const definition = await ctx.packages.get(packagePath);\n\n  const { result } = await ensurePackageBundled({\n    input: {\n      name: definition?.name ?? '<unknown>',\n      version: definition?.version ?? '0.0.0',\n      outputPath: path.resolve(packagePath, outdir),\n      bundlerType,\n      disableSourceMaps,\n    },\n    ctx,\n  });\n\n  await ctx.dispose();\n  await stopTelemetry();\n  reporter.complete();\n\n  process.exit(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":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAElF,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,OAAsB,EAAE,OAAoB;IACvE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,GAAG,kBAAkB,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC;IACzF,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAEnD,MAAM,eAAe,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC;IAEtD,MAAM,GAAG,GAAG,MAAM,uBAAuB,CAAC;QACxC,GAAG,OAAO;QACV,eAAe;QACf,KAAK,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,KAAK,CAAC;KAC/D,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAEvD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,oBAAoB,CAAC;QAC5C,KAAK,EAAE;YACL,IAAI,EAAE,UAAU,EAAE,IAAI,IAAI,WAAW;YACrC,OAAO,EAAE,UAAU,EAAE,OAAO,IAAI,OAAO;YACvC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC;YAC7C,WAAW;YACX,iBAAiB;SAClB;QACD,GAAG;KACJ,CAAC,CAAC;IAEH,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;IACpB,MAAM,eAAe,CAAC,QAAQ,EAAE,CAAC;IACjC,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAEpB,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC;AAED,uBAAuB","sourcesContent":["import type { BundleOptions } from './types/BundleOptions.js';\nimport type { TaskContext } from '../../types/TaskContext.js';\nimport { setupReporting } from '../../setupReporting.js';\nimport { ensurePackageBundled } from '@ms-cloudpack/api-server/apis';\nimport path from 'path';\nimport { createPartialApiContext } from '../../common/createPartialApiContext.js';\n\nexport async function bundle(options: BundleOptions, context: TaskContext) {\n  const { bundler: bundlerType, outdir = 'dist/browser-esm', disableSourceMaps } = options;\n  const { reporter, appPath: packagePath } = context;\n\n  const telemetryClient = await setupReporting(context);\n\n  const ctx = await createPartialApiContext({\n    ...context,\n    telemetryClient,\n    items: ['packages', 'watcher', 'session', 'taskRunner', 'bus'],\n  });\n\n  const definition = await ctx.packages.get(packagePath);\n\n  const { result } = await ensurePackageBundled({\n    input: {\n      name: definition?.name ?? '<unknown>',\n      version: definition?.version ?? '0.0.0',\n      outputPath: path.resolve(packagePath, outdir),\n      bundlerType,\n      disableSourceMaps,\n    },\n    ctx,\n  });\n\n  await ctx.dispose();\n  await telemetryClient.shutdown();\n  reporter.complete();\n\n  process.exit(result?.errors?.length === 0 ? 0 : 1);\n}\n\n// cspell:ignore outdir\n"]}

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

@@ -1,7 +1,7 @@
 import type { PackageJson, PackageDefinitionsCache, BundleMessage } from '@ms-cloudpack/bundler-types';
 import { type TaskReporter } from '@ms-cloudpack/task-reporter';
 import type { CloudpackConfig } from '@ms-cloudpack/config';
-import { type EnsurePackageBundledContext } from '@ms-cloudpack/api-server/apis';
+import { ensurePackageBundled } from '@ms-cloudpack/api-server/apis';
 /**
  * Bundle the package and return the imports it depends on.
  */
@@ -11,7 +11,7 @@ export declare function bundleAndGetImports(options: {
     reporter: TaskReporter;
     packagePath: string;
     definition: PackageJson;
-    ctx: EnsurePackageBundledContext;
+    ctx: Parameters<typeof ensurePackageBundled>[0]['ctx'];
 }): Promise<{
     warnings: BundleMessage[];
     errors: BundleMessage[];

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":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,uBAAuB,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACvG,OAAO,EAAE,KAAK,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AACnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAwB,KAAK,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAEvG;;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;IACxB,GAAG,EAAE,2BAA2B,CAAC;CAClC,GAAG,OAAO,CAAC;IACV,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,8DAA8D;IAC9D,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;CACnC,CAAC,CA6DD"}
+{"version":3,"file":"bundleAndGetImports.d.ts","sourceRoot":"","sources":["../../../src/commands/init/bundleAndGetImports.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,uBAAuB,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACvG,OAAO,EAAE,KAAK,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AACnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAErE;;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;IACxB,GAAG,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;CACxD,GAAG,OAAO,CAAC;IACV,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,8DAA8D;IAC9D,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;CACnC,CAAC,CA6DD"}

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,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEzE,OAAO,EAAqB,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAEnF,OAAO,EAAE,oBAAoB,EAAoC,MAAM,+BAA+B,CAAC;AAEvG;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,OAOzC;IAMC,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IACrE,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,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;IAErC,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE;QACrB,MAAM,IAAI,KAAK,CAAC,eAAe,WAAW,oCAAoC,CAAC,CAAC;KACjF;IAED,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;YACL,OAAO,EAAE,IAAI,GAAG,EAAuB;YACvC,MAAM,EAAE,EAAE;YACV,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,oDAAoD,IAAI,CAAC,IAAI,CACjE,WAAW,EACX,cAAc,CACf,oFAAoF;iBACtF;aACF;SACF,CAAC;KACH;IAED,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,oBAAoB,CAAC;QAC5C,KAAK,EAAE;YACL,IAAI;YACJ,OAAO;SACR;QACD,GAAG;KACJ,CAAC,CAAC;IAEH,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,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,CAAC,CAAC,IAAI,EAAE,CAC/G,CACF,CAAC;QAEF,OAAO;YACL,MAAM,EAAE,UAAU;SACnB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,QAAQ,EAAE,MAAM,EAAE,QAAQ,IAAI,EAAE;QAChC,MAAM,EAAE,MAAM,EAAE,MAAM,IAAI,EAAE;QAC5B,OAAO,EAAE,OAAO,IAAI,IAAI,GAAG,EAAuB;KACnD,CAAC;AACJ,CAAC","sourcesContent":["import path from 'path';\nimport { getEntriesMapFromPackage } from '@ms-cloudpack/bundler';\nimport { getBundleDetails, findImports } from '@ms-cloudpack/api-server';\nimport type { PackageJson, PackageDefinitionsCache, BundleMessage } from '@ms-cloudpack/bundler-types';\nimport { type TaskReporter, formatPackageName } from '@ms-cloudpack/task-reporter';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\nimport { ensurePackageBundled, type EnsurePackageBundledContext } from '@ms-cloudpack/api-server/apis';\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  ctx: EnsurePackageBundledContext;\n}): Promise<{\n  warnings: BundleMessage[];\n  errors: BundleMessage[];\n  /** Map from package name to set of required relative paths */\n  imports: Map<string, Set<string>>;\n}> {\n  const { packagePath, definition, packages, reporter, ctx } = 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  const { name, version } = definition;\n\n  if (!name || !version) {\n    throw new Error(`Package at \"${packagePath}\" does not have a name or version.`);\n  }\n\n  // Determine entries.\n  const entriesMap = await getEntriesMapFromPackage({ inputPath: packagePath }, { packages });\n\n  if (!Object.keys(entriesMap).length) {\n    return {\n      imports: new Map<string, Set<string>>(),\n      errors: [],\n      warnings: [\n        {\n          text: `No valid entry points were found when evaluating ${path.join(\n            packagePath,\n            'package.json',\n          )}. Check that has an exports, main, or module entry and the referenced files exist.`,\n        },\n      ],\n    };\n  }\n\n  const { result } = await ensurePackageBundled({\n    input: {\n      name,\n      version,\n    },\n    ctx,\n  });\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(result?.outputFiles?.map((file) => path.resolve(outputPath, file.outputPath)) || [])) || {},\n      ),\n    );\n\n    return {\n      status: 'complete',\n    };\n  });\n\n  return {\n    warnings: result?.warnings || [],\n    errors: result?.errors || [],\n    imports: imports || new Map<string, Set<string>>(),\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,gBAAgB,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEzE,OAAO,EAAqB,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAEnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAErE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,OAOzC;IAMC,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IACrE,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,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;IAErC,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE;QACrB,MAAM,IAAI,KAAK,CAAC,eAAe,WAAW,oCAAoC,CAAC,CAAC;KACjF;IAED,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;YACL,OAAO,EAAE,IAAI,GAAG,EAAuB;YACvC,MAAM,EAAE,EAAE;YACV,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,oDAAoD,IAAI,CAAC,IAAI,CACjE,WAAW,EACX,cAAc,CACf,oFAAoF;iBACtF;aACF;SACF,CAAC;KACH;IAED,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,oBAAoB,CAAC;QAC5C,KAAK,EAAE;YACL,IAAI;YACJ,OAAO;SACR;QACD,GAAG;KACJ,CAAC,CAAC;IAEH,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,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,CAAC,CAAC,IAAI,EAAE,CAC/G,CACF,CAAC;QAEF,OAAO;YACL,MAAM,EAAE,UAAU;SACnB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,QAAQ,EAAE,MAAM,EAAE,QAAQ,IAAI,EAAE;QAChC,MAAM,EAAE,MAAM,EAAE,MAAM,IAAI,EAAE;QAC5B,OAAO,EAAE,OAAO,IAAI,IAAI,GAAG,EAAuB;KACnD,CAAC;AACJ,CAAC","sourcesContent":["import path from 'path';\nimport { getEntriesMapFromPackage } from '@ms-cloudpack/bundler';\nimport { getBundleDetails, findImports } from '@ms-cloudpack/api-server';\nimport type { PackageJson, PackageDefinitionsCache, BundleMessage } from '@ms-cloudpack/bundler-types';\nimport { type TaskReporter, formatPackageName } from '@ms-cloudpack/task-reporter';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\nimport { ensurePackageBundled } from '@ms-cloudpack/api-server/apis';\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  ctx: Parameters<typeof ensurePackageBundled>[0]['ctx'];\n}): Promise<{\n  warnings: BundleMessage[];\n  errors: BundleMessage[];\n  /** Map from package name to set of required relative paths */\n  imports: Map<string, Set<string>>;\n}> {\n  const { packagePath, definition, packages, reporter, ctx } = 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  const { name, version } = definition;\n\n  if (!name || !version) {\n    throw new Error(`Package at \"${packagePath}\" does not have a name or version.`);\n  }\n\n  // Determine entries.\n  const entriesMap = await getEntriesMapFromPackage({ inputPath: packagePath }, { packages });\n\n  if (!Object.keys(entriesMap).length) {\n    return {\n      imports: new Map<string, Set<string>>(),\n      errors: [],\n      warnings: [\n        {\n          text: `No valid entry points were found when evaluating ${path.join(\n            packagePath,\n            'package.json',\n          )}. Check that has an exports, main, or module entry and the referenced files exist.`,\n        },\n      ],\n    };\n  }\n\n  const { result } = await ensurePackageBundled({\n    input: {\n      name,\n      version,\n    },\n    ctx,\n  });\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(result?.outputFiles?.map((file) => path.resolve(outputPath, file.outputPath)) || [])) || {},\n      ),\n    );\n\n    return {\n      status: 'complete',\n    };\n  });\n\n  return {\n    warnings: result?.warnings || [],\n    errors: result?.errors || [],\n    imports: imports || new Map<string, Set<string>>(),\n  };\n}\n"]}

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

@@ -1,11 +1,12 @@
 import type { TaskContext } from '../../types/TaskContext.js';
 import type { InitOptions } from './types/InitOptions.js';
 import type { InitSummary } from './types/InitSummary.js';
+import type { TelemetryClient } from '@ms-cloudpack/telemetry';
 /** Given the path, updates the Cloudpack config with overrides and project settings. */
 export declare function init(options: InitOptions, context: TaskContext): Promise<void>;
 /**
  * Actual init operation (minus the completion logging).
  * Exported for testing only.
  */
-export declare function initInternal(options: InitOptions, context: TaskContext): Promise<InitSummary>;
+export declare function initInternal(options: InitOptions, context: TaskContext, telemetryClient: TelemetryClient): Promise<InitSummary>;
 //# sourceMappingURL=init.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAW1D,wFAAwF;AACxF,wBAAsB,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBpF;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CA+GnG"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAS1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,wFAAwF;AACxF,wBAAsB,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBpF;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,WAAW,EACpB,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,WAAW,CAAC,CAmHtB"}

package/lib/commands/init/init.js

@@ -1,6 +1,5 @@
 import { createPartialApiContext } from '../../common/createPartialApiContext.js';
 import { writeGeneratedConfig } from '@ms-cloudpack/config';
-import { rootSpan, stopTelemetry } from '../../initTelemetry.js';
 import { setupReporting } from '../../setupReporting.js';
 import { bundleAndGetImports } from './bundleAndGetImports.js';
 import { InitSummaryData } from './InitSummaryData.js';
@@ -10,9 +9,9 @@ import { formatInitSummary } from './formatInitSummary.js';
 export async function init(options, context) {
     const { reporter } = context;
     let hasErrors = false;
-    await setupReporting(context);
+    const telemetryClient = await setupReporting(context);
     try {
-        const summary = await initInternal(options, context);
+        const summary = await initInternal(options, context, telemetryClient);
         reporter.complete(formatInitSummary(summary, options));
         hasErrors = summary.totalErrors > 0;
     }
@@ -20,17 +19,21 @@ export async function init(options, context) {
         reporter.complete(`Unexpected error: ${error.stack || error}`);
         hasErrors = true;
     }
-    await stopTelemetry();
+    await telemetryClient.shutdown();
     process.exit(hasErrors ? 1 : 0);
 }
 /**
  * Actual init operation (minus the completion logging).
  * Exported for testing only.
  */
-export async function initInternal(options, context) {
+export async function initInternal(options, context, telemetryClient) {
     const { appPath, reporter } = context;
     const summaryData = new InitSummaryData();
-    const ctx = await createPartialApiContext(context, ['bus', 'taskRunner', 'watcher', 'packages', 'session']);
+    const ctx = await createPartialApiContext({
+        ...context,
+        telemetryClient,
+        items: ['bus', 'taskRunner', 'watcher', 'packages', 'session'],
+    });
     const { packages, session } = ctx;
     const { resolveMap, config } = session;
     try {
@@ -103,7 +106,7 @@ export async function initInternal(options, context) {
                     summaryData.recordGeneratedChanges(changes);
                 }
                 if (options.check && (changes.length || evalErrors.length)) {
-                    rootSpan?.addEvent('INIT_CHECK_FAILED', {
+                    telemetryClient.rootSpan.addEvent('INIT_CHECK_FAILED', {
                         reason: changes.length ? 'Config needs to be updated.' : evalErrors,
                     });
                     return summaryData.summarize();

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 type { TaskContext } from '../../types/TaskContext.js';\nimport type { InitOptions } from './types/InitOptions.js';\nimport type { InitSummary } from './types/InitSummary.js';\n\nimport { createPartialApiContext } from '../../common/createPartialApiContext.js';\nimport { writeGeneratedConfig } from '@ms-cloudpack/config';\nimport { rootSpan, stopTelemetry } from '../../initTelemetry.js';\nimport { setupReporting } from '../../setupReporting.js';\nimport { bundleAndGetImports } from './bundleAndGetImports.js';\nimport { InitSummaryData } from './InitSummaryData.js';\nimport { evaluateImportsForOverrides } from './evaluateImportsForOverrides.js';\nimport { formatInitSummary } from './formatInitSummary.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  let hasErrors = false;\n\n  await setupReporting(context);\n\n  try {\n    const summary = await initInternal(options, context);\n\n    reporter.complete(formatInitSummary(summary, options));\n    hasErrors = summary.totalErrors > 0;\n  } catch (error) {\n    reporter.complete(`Unexpected error: ${(error as Error).stack || error}`);\n    hasErrors = true;\n  }\n\n  await stopTelemetry();\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(options: InitOptions, context: TaskContext): Promise<InitSummary> {\n  const { appPath, reporter } = context;\n  const summaryData = new InitSummaryData();\n  const ctx = await createPartialApiContext(context, ['bus', 'taskRunner', 'watcher', 'packages', 'session']);\n  const { packages, session } = ctx;\n  const { resolveMap, config } = session;\n\n  try {\n    if (options.check && options.reset) {\n      throw Error('Cannot use --check and --reset together.');\n    }\n\n    // If --reset is specified we ignore generated config.\n    if (options.reset) {\n      config.generated = {};\n    }\n\n    const generatedConfig = config.generated;\n\n    generatedConfig.packageSettings ??= [];\n\n    const packagePathsToEvaluate = new Set<string>([appPath]);\n    const evaluatedPackages = new Set<string>();\n    let totalChangeCount = 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        continue;\n      }\n\n      // Bundle the package and find the imports it depends on.\n      const { errors, warnings, imports } = await bundleAndGetImports({\n        packagePath,\n        definition,\n        packages,\n        reporter,\n        config,\n        ctx,\n      });\n\n      // Record the results for the summary.\n      const resultIdentifier = {\n        name: definition.name || '',\n        version: definition.version || '',\n        path: packagePath,\n      };\n\n      summaryData.recordResult({\n        ...resultIdentifier,\n        errors,\n        warnings,\n      });\n\n      // If no errors came from the bundle attempt, move on to evaluating the imports.\n      if (errors.length === 0) {\n        // Given the package imports, find the missing exports maps and update packageOverrides.\n        const { changes, errors: evalErrors } = await evaluateImportsForOverrides({\n          definition,\n          packagePath,\n          packages,\n          packagePathsToEvaluate,\n          evaluatedPackages,\n          imports,\n          generatedConfig,\n          resolveMap,\n        });\n\n        if (evalErrors.length) {\n          summaryData.recordResult({\n            ...resultIdentifier,\n            errors: evalErrors.map((text) => ({ text })),\n          });\n        } else {\n          summaryData.recordGeneratedChanges(changes);\n        }\n\n        if (options.check && (changes.length || evalErrors.length)) {\n          rootSpan?.addEvent('INIT_CHECK_FAILED', {\n            reason: changes.length ? 'Config needs to be updated.' : evalErrors,\n          });\n\n          return summaryData.summarize();\n        }\n\n        totalChangeCount += changes.length;\n      }\n    }\n\n    if (totalChangeCount && generatedConfig.packageSettings?.length) {\n      await writeGeneratedConfig(generatedConfig, appPath);\n    }\n  } finally {\n    await ctx.dispose?.();\n  }\n\n  return summaryData.summarize();\n}\n"]}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"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","sourcesContent":["import type { TaskContext } from '../../types/TaskContext.js';\nimport type { InitOptions } from './types/InitOptions.js';\nimport type { InitSummary } from './types/InitSummary.js';\n\nimport { createPartialApiContext } from '../../common/createPartialApiContext.js';\nimport { writeGeneratedConfig } from '@ms-cloudpack/config';\nimport { setupReporting } from '../../setupReporting.js';\nimport { bundleAndGetImports } from './bundleAndGetImports.js';\nimport { InitSummaryData } from './InitSummaryData.js';\nimport { evaluateImportsForOverrides } from './evaluateImportsForOverrides.js';\nimport { formatInitSummary } from './formatInitSummary.js';\nimport type { TelemetryClient } from '@ms-cloudpack/telemetry';\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  let hasErrors = false;\n\n  const telemetryClient = await setupReporting(context);\n\n  try {\n    const summary = await initInternal(options, context, telemetryClient);\n\n    reporter.complete(formatInitSummary(summary, options));\n    hasErrors = summary.totalErrors > 0;\n  } catch (error) {\n    reporter.complete(`Unexpected error: ${(error as Error).stack || error}`);\n    hasErrors = true;\n  }\n\n  await telemetryClient.shutdown();\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  telemetryClient: TelemetryClient,\n): Promise<InitSummary> {\n  const { appPath, reporter } = context;\n  const summaryData = new InitSummaryData();\n  const ctx = await createPartialApiContext({\n    ...context,\n    telemetryClient,\n    items: ['bus', 'taskRunner', 'watcher', 'packages', 'session'],\n  });\n  const { packages, session } = ctx;\n  const { resolveMap, config } = session;\n\n  try {\n    if (options.check && options.reset) {\n      throw Error('Cannot use --check and --reset together.');\n    }\n\n    // If --reset is specified we ignore generated config.\n    if (options.reset) {\n      config.generated = {};\n    }\n\n    const generatedConfig = config.generated;\n\n    generatedConfig.packageSettings ??= [];\n\n    const packagePathsToEvaluate = new Set<string>([appPath]);\n    const evaluatedPackages = new Set<string>();\n    let totalChangeCount = 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        continue;\n      }\n\n      // Bundle the package and find the imports it depends on.\n      const { errors, warnings, imports } = await bundleAndGetImports({\n        packagePath,\n        definition,\n        packages,\n        reporter,\n        config,\n        ctx,\n      });\n\n      // Record the results for the summary.\n      const resultIdentifier = {\n        name: definition.name || '',\n        version: definition.version || '',\n        path: packagePath,\n      };\n\n      summaryData.recordResult({\n        ...resultIdentifier,\n        errors,\n        warnings,\n      });\n\n      // If no errors came from the bundle attempt, move on to evaluating the imports.\n      if (errors.length === 0) {\n        // Given the package imports, find the missing exports maps and update packageOverrides.\n        const { changes, errors: evalErrors } = await evaluateImportsForOverrides({\n          definition,\n          packagePath,\n          packages,\n          packagePathsToEvaluate,\n          evaluatedPackages,\n          imports,\n          generatedConfig,\n          resolveMap,\n        });\n\n        if (evalErrors.length) {\n          summaryData.recordResult({\n            ...resultIdentifier,\n            errors: evalErrors.map((text) => ({ text })),\n          });\n        } else {\n          summaryData.recordGeneratedChanges(changes);\n        }\n\n        if (options.check && (changes.length || evalErrors.length)) {\n          telemetryClient.rootSpan.addEvent('INIT_CHECK_FAILED', {\n            reason: changes.length ? 'Config needs to be updated.' : evalErrors,\n          });\n\n          return summaryData.summarize();\n        }\n\n        totalChangeCount += changes.length;\n      }\n    }\n\n    if (totalChangeCount && generatedConfig.packageSettings?.length) {\n      await writeGeneratedConfig(generatedConfig, appPath);\n    }\n  } finally {\n    await ctx.dispose?.();\n  }\n\n  return summaryData.summarize();\n}\n"]}

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

@@ -1,5 +1,4 @@
-import type { CreateHtmlResult } from '../../../types/CreateHtmlResult.js';
-import type { CreateHtmlOptions } from '../../../types/CreateHtmlOptions.js';
+import type { CreateHtmlResult, CreateHtmlOptions } from '@ms-cloudpack/api-server';
 /**
  * Return the default HTML response.
  */

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

@@ -1 +1 @@
-{"version":3,"file":"getDefaultHtmlResponse.d.ts","sourceRoot":"","sources":["../../../../src/commands/start/appServer/getDefaultHtmlResponse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAE7E;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,UAAU,EAAE,EAAE,iBAAiB,GAAG,gBAAgB,CAc1F"}
+{"version":3,"file":"getDefaultHtmlResponse.d.ts","sourceRoot":"","sources":["../../../../src/commands/start/appServer/getDefaultHtmlResponse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAEpF;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,UAAU,EAAE,EAAE,iBAAiB,GAAG,gBAAgB,CAc1F"}

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

@@ -1 +1 @@
-{"version":3,"file":"getDefaultHtmlResponse.js","sourceRoot":"","sources":["../../../../src/commands/start/appServer/getDefaultHtmlResponse.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,UAAU,sBAAsB,CAAC,EAAE,UAAU,EAAqB;IACtE,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC;IAE5B,OAAO;QACL,iBAAiB;QACjB,kBAAkB;QAClB,QAAQ;QACR,YAAY,IAAI,UAAU;QAC1B,SAAS;QACT,QAAQ;QACR,uBAAuB;QACvB,SAAS;QACT,SAAS;KACV,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC","sourcesContent":["import type { CreateHtmlResult } from '../../../types/CreateHtmlResult.js';\nimport type { CreateHtmlOptions } from '../../../types/CreateHtmlOptions.js';\n\n/**\n * Return the default HTML response.\n */\nexport function getDefaultHtmlResponse({ definition }: CreateHtmlOptions): CreateHtmlResult {\n  const { name } = definition;\n\n  return [\n    `<!DOCTYPE html>`,\n    `<html lang=\"en\">`,\n    `<head>`,\n    `  <title>${name}</title>`,\n    `</head>`,\n    `<body>`,\n    `<div id=\"root\"></div>`,\n    `</body>`,\n    `</html>`,\n  ].join('\\n');\n}\n"]}
+{"version":3,"file":"getDefaultHtmlResponse.js","sourceRoot":"","sources":["../../../../src/commands/start/appServer/getDefaultHtmlResponse.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,UAAU,sBAAsB,CAAC,EAAE,UAAU,EAAqB;IACtE,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC;IAE5B,OAAO;QACL,iBAAiB;QACjB,kBAAkB;QAClB,QAAQ;QACR,YAAY,IAAI,UAAU;QAC1B,SAAS;QACT,QAAQ;QACR,uBAAuB;QACvB,SAAS;QACT,SAAS;KACV,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC","sourcesContent":["import type { CreateHtmlResult, CreateHtmlOptions } from '@ms-cloudpack/api-server';\n\n/**\n * Return the default HTML response.\n */\nexport function getDefaultHtmlResponse({ definition }: CreateHtmlOptions): CreateHtmlResult {\n  const { name } = definition;\n\n  return [\n    `<!DOCTYPE html>`,\n    `<html lang=\"en\">`,\n    `<head>`,\n    `  <title>${name}</title>`,\n    `</head>`,\n    `<body>`,\n    `<div id=\"root\"></div>`,\n    `</body>`,\n    `</html>`,\n  ].join('\\n');\n}\n"]}

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

@@ -1,5 +1,4 @@
-import type { CreateHtmlResult, CustomHtmlResult } from '../../../types/CreateHtmlResult.js';
-import type { CreateHtmlOptions } from '../../../types/CreateHtmlOptions.js';
+import type { CreateHtmlResult, CustomHtmlResult, CreateHtmlOptions } from '@ms-cloudpack/api-server';
 /**
  * Get the HTML response for the given route. If the route has a custom render script, use that.
  */

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

@@ -1 +1 @@
-{"version":3,"file":"getHtmlResponse.d.ts","sourceRoot":"","sources":["../../../../src/commands/start/appServer/getHtmlResponse.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAC7F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAU7E;;GAEG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,OAAO,CAAC,gBAAgB,EAAE,MAAM,GAAG,gBAAgB,CAAC,CAAC,CAyF/D"}
+{"version":3,"file":"getHtmlResponse.d.ts","sourceRoot":"","sources":["../../../../src/commands/start/appServer/getHtmlResponse.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAGV,gBAAgB,EAChB,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,0BAA0B,CAAC;AAUlC;;GAEG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,OAAO,CAAC,gBAAgB,EAAE,MAAM,GAAG,gBAAgB,CAAC,CAAC,CAyF/D"}

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

@@ -1 +1 @@
-{"version":3,"file":"getHtmlResponse.js","sourceRoot":"","sources":["../../../../src/commands/start/appServer/getHtmlResponse.ts"],"names":[],"mappings":"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","sourcesContent":["import path from 'path';\nimport { pathToFileURL } from 'url';\nimport type { CreateHtmlScript } from '../../../types/CreateHtmlScript.js';\nimport type { CreateHtmlFunction } from '../../../types/CreateHtmlFunction.js';\nimport type { CreateHtmlResult, CustomHtmlResult } from '../../../types/CreateHtmlResult.js';\nimport type { CreateHtmlOptions } from '../../../types/CreateHtmlOptions.js';\nimport { getDefaultHtmlResponse } from './getDefaultHtmlResponse.js';\nimport { JSDOM } from 'jsdom';\nimport fsPromises from 'fs/promises';\n\nfunction isCustomHtmlResult(result: CreateHtmlResult): result is CustomHtmlResult {\n  const customResult = result as CustomHtmlResult;\n  return (customResult.type === 'static-html' || customResult.type === 'js') && !!customResult.content;\n}\n\n/**\n * Get the HTML response for the given route. If the route has a custom render script, use that.\n */\nexport async function getHtmlResponse(\n  options: CreateHtmlOptions,\n): Promise<Exclude<CreateHtmlResult, string | CustomHtmlResult>> {\n  const { route, session, overlayScript, entryScript, inlineScripts } = options;\n  let createHtml: CreateHtmlFunction = getDefaultHtmlResponse;\n\n  if (route.renderScript) {\n    const renderScriptPath = path.resolve(session.appPath, route.renderScript);\n    let cacheBreakerQueryParam = `?t=${Date.now()}`;\n\n    try {\n      const { mtime } = await fsPromises.stat(path.resolve(session.appPath, route.renderScript));\n\n      cacheBreakerQueryParam = `?t=${mtime.getTime()}`;\n    } catch {\n      /* no-op */\n    }\n\n    if (isHtml(renderScriptPath)) {\n      createHtml = readStaticHtml;\n    } else {\n      // Get the html factory function from a script default export.\n      const renderScriptUrl = pathToFileURL(renderScriptPath).toString();\n\n      // Note: because there isn't a way to purge the require cache, we need to add a cache breaker query param to the\n      // script path to ensure we get the latest version of the script. This could be improved by using the git hash of\n      // the file if it exists, or a hash of the content, or even the timestamp of the file.\n      try {\n        createHtml = ((await import(renderScriptUrl + cacheBreakerQueryParam)) as CreateHtmlScript).default;\n      } catch (e) {\n        console.error(`Error importing render script at \"${renderScriptUrl}\":`, e);\n      }\n    }\n\n    if (!createHtml) {\n      console.error(`The render script at \"${renderScriptPath}\" does not export a default function.`);\n    }\n  }\n\n  let html = '';\n  let resultType = 'html';\n  let statusCode = 200;\n\n  const htmlResult = await createHtml(options);\n\n  if (typeof htmlResult === 'string') {\n    html = htmlResult;\n  } else if (isCustomHtmlResult(htmlResult)) {\n    html = htmlResult.content;\n    resultType = htmlResult.type;\n  } else {\n    html = htmlResult.html;\n    statusCode = htmlResult.statusCode;\n  }\n\n  if (resultType === 'html') {\n    try {\n      const htmlDocument = new JSDOM(html);\n      const { document } = htmlDocument.window;\n\n      // inject the import map.\n      if (entryScript || overlayScript) {\n        const script = document.createElement('script');\n        script.type = 'importmap';\n        script.innerHTML = JSON.stringify(session.getImportMap(), null, 2);\n        document.head.prepend(script);\n      }\n\n      for (const inlineScript of inlineScripts) {\n        const script = document.createElement('script');\n        script.type = 'module';\n        script.innerHTML = inlineScript;\n        document.head.appendChild(script);\n      }\n\n      // inject the overlay script.\n      addScript(document.head, overlayScript);\n\n      // inject the entry script.\n      addScript(document.head, entryScript);\n\n      html = htmlDocument.serialize();\n    } catch (e) {\n      console.error(`Error parsing html response for rendering route \"${route.match}\"`, e);\n    }\n  }\n\n  return {\n    html,\n    statusCode,\n  };\n}\n\n/**\n * Helper function to add a script to the document.\n */\nfunction addScript(parentElement: HTMLElement, url: string | undefined) {\n  if (url) {\n    const script = parentElement.ownerDocument.createElement('script');\n\n    script.type = 'module';\n    script.src = url;\n    parentElement.appendChild(script);\n  }\n}\n\nfunction isHtml(scriptPath: string): boolean {\n  // path has an .htm or .html extension; case insensitive.\n  return scriptPath.toLowerCase().match(/\\.htm(l)?$/) !== null;\n}\n\nasync function readStaticHtml(options: CreateHtmlOptions): Promise<string> {\n  const { route } = options;\n  let html = '';\n\n  if (route.renderScript) {\n    const htmlPath = path.resolve(options.session.appPath, route.renderScript);\n\n    try {\n      html = (await fsPromises.readFile(htmlPath, 'utf8')) || '';\n    } catch (e) {\n      console.error(`Error reading HTML file at \"${htmlPath}\".`, e);\n    }\n  }\n\n  return html;\n}\n"]}
+{"version":3,"file":"getHtmlResponse.js","sourceRoot":"","sources":["../../../../src/commands/start/appServer/getHtmlResponse.ts"],"names":[],"mappings":"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","sourcesContent":["import path from 'path';\nimport { pathToFileURL } from 'url';\nimport type {\n  CreateHtmlScript,\n  CreateHtmlFunction,\n  CreateHtmlResult,\n  CustomHtmlResult,\n  CreateHtmlOptions,\n} from '@ms-cloudpack/api-server';\nimport { getDefaultHtmlResponse } from './getDefaultHtmlResponse.js';\nimport { JSDOM } from 'jsdom';\nimport fsPromises from 'fs/promises';\n\nfunction isCustomHtmlResult(result: CreateHtmlResult): result is CustomHtmlResult {\n  const customResult = result as CustomHtmlResult;\n  return (customResult.type === 'static-html' || customResult.type === 'js') && !!customResult.content;\n}\n\n/**\n * Get the HTML response for the given route. If the route has a custom render script, use that.\n */\nexport async function getHtmlResponse(\n  options: CreateHtmlOptions,\n): Promise<Exclude<CreateHtmlResult, string | CustomHtmlResult>> {\n  const { route, session, overlayScript, entryScript, inlineScripts } = options;\n  let createHtml: CreateHtmlFunction = getDefaultHtmlResponse;\n\n  if (route.renderScript) {\n    const renderScriptPath = path.resolve(session.appPath, route.renderScript);\n    let cacheBreakerQueryParam = `?t=${Date.now()}`;\n\n    try {\n      const { mtime } = await fsPromises.stat(path.resolve(session.appPath, route.renderScript));\n\n      cacheBreakerQueryParam = `?t=${mtime.getTime()}`;\n    } catch {\n      /* no-op */\n    }\n\n    if (isHtml(renderScriptPath)) {\n      createHtml = readStaticHtml;\n    } else {\n      // Get the html factory function from a script default export.\n      const renderScriptUrl = pathToFileURL(renderScriptPath).toString();\n\n      // Note: because there isn't a way to purge the require cache, we need to add a cache breaker query param to the\n      // script path to ensure we get the latest version of the script. This could be improved by using the git hash of\n      // the file if it exists, or a hash of the content, or even the timestamp of the file.\n      try {\n        createHtml = ((await import(renderScriptUrl + cacheBreakerQueryParam)) as CreateHtmlScript).default;\n      } catch (e) {\n        console.error(`Error importing render script at \"${renderScriptUrl}\":`, e);\n      }\n    }\n\n    if (!createHtml) {\n      console.error(`The render script at \"${renderScriptPath}\" does not export a default function.`);\n    }\n  }\n\n  let html = '';\n  let resultType = 'html';\n  let statusCode = 200;\n\n  const htmlResult = await createHtml(options);\n\n  if (typeof htmlResult === 'string') {\n    html = htmlResult;\n  } else if (isCustomHtmlResult(htmlResult)) {\n    html = htmlResult.content;\n    resultType = htmlResult.type;\n  } else {\n    html = htmlResult.html;\n    statusCode = htmlResult.statusCode;\n  }\n\n  if (resultType === 'html') {\n    try {\n      const htmlDocument = new JSDOM(html);\n      const { document } = htmlDocument.window;\n\n      // inject the import map.\n      if (entryScript || overlayScript) {\n        const script = document.createElement('script');\n        script.type = 'importmap';\n        script.innerHTML = JSON.stringify(session.getImportMap(), null, 2);\n        document.head.prepend(script);\n      }\n\n      for (const inlineScript of inlineScripts) {\n        const script = document.createElement('script');\n        script.type = 'module';\n        script.innerHTML = inlineScript;\n        document.head.appendChild(script);\n      }\n\n      // inject the overlay script.\n      addScript(document.head, overlayScript);\n\n      // inject the entry script.\n      addScript(document.head, entryScript);\n\n      html = htmlDocument.serialize();\n    } catch (e) {\n      console.error(`Error parsing html response for rendering route \"${route.match}\"`, e);\n    }\n  }\n\n  return {\n    html,\n    statusCode,\n  };\n}\n\n/**\n * Helper function to add a script to the document.\n */\nfunction addScript(parentElement: HTMLElement, url: string | undefined) {\n  if (url) {\n    const script = parentElement.ownerDocument.createElement('script');\n\n    script.type = 'module';\n    script.src = url;\n    parentElement.appendChild(script);\n  }\n}\n\nfunction isHtml(scriptPath: string): boolean {\n  // path has an .htm or .html extension; case insensitive.\n  return scriptPath.toLowerCase().match(/\\.htm(l)?$/) !== null;\n}\n\nasync function readStaticHtml(options: CreateHtmlOptions): Promise<string> {\n  const { route } = options;\n  let html = '';\n\n  if (route.renderScript) {\n    const htmlPath = path.resolve(options.session.appPath, route.renderScript);\n\n    try {\n      html = (await fsPromises.readFile(htmlPath, 'utf8')) || '';\n    } catch (e) {\n      console.error(`Error reading HTML file at \"${htmlPath}\".`, e);\n    }\n  }\n\n  return html;\n}\n"]}

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;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"}
+{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../../src/commands/start/start.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAQ5D,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,7 +5,6 @@ import { createSession } from '../../common/createSession.js';
 import { openBrowser } from './openBrowser.js';
 import { createPackageDefinitions, readConfig } from '@ms-cloudpack/config';
 import { PerfMarkerCliEntry, PerfMeasurementOpenBrowser } from '../../performance/markers.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';
@@ -78,7 +77,7 @@ export async function start(options, context) {
         // Start api server for tracking status and handling remote requests.
         const apiServer = await startApiServer({
             session,
-            rootSpan,
+            telemetryClient,
             reporter,
             packages,
         });
@@ -115,7 +114,7 @@ export async function start(options, context) {
             // Complete the reporting and list pending tasks as aborted.
             reporter.complete();
             // Flush and close telemetry.
-            await stopTelemetry();
+            await telemetryClient.shutdown();
         };
         cleanupFunctions.push(cleanup);
         // Setup cleanup and close things on completion.

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

@@ -1 +1 @@
-{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/commands/start/start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C,OAAO,EAAE,wBAAwB,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAE5E,OAAO,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC9F,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,6BAA6B,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC3F,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAGrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,IAAI,gBAAgB,GAA+B,EAAE,CAAC;AAEtD,wDAAwD;AACxD,MAAM,CAAC,KAAK,UAAU,WAAW;IAC/B,KAAK,MAAM,IAAI,IAAI,gBAAgB,EAAE;QACnC,MAAM,IAAI,EAAE,CAAC;KACd;IACD,gBAAgB,GAAG,EAAE,CAAC;AACxB,CAAC;AAED,KAAK,UAAU,mBAAmB,CAChC,OAAgC,EAChC,OAAyF;IAEzF,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAChC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,YAAY,GAAG,mBAAmB,CAAC;QACvC,WAAW;QACX,UAAU,EAAE,OAAO,CAAC,UAAU;KAC/B,CAAC,CAAC;IAEH,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,0BAA0B,WAAW,sBAAsB,CAAC,CAAC;KAC9E;IACD,MAAM,aAAa,GAAG,MAAM,6BAA6B,CAAC,EAAE,YAAY,EAAE,EAAE,OAAO,CAAC,CAAC;IAErF,OAAO,gBAAgB,CAAC,aAAa,CAAC,CAAC;AACzC,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,OAAqB,EAAE,OAAoB;IACrE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAClD,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,CAAC;IAEzC,MAAM,eAAe,GAAG,MAAM,cAAc,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IAE5E,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IAE1C,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAEvB,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAE5B,IAAI;QACF,0DAA0D;QAC1D,MAAM,CAAC,QAAQ,GAAG,aAAa,CAAC;YAC9B,cAAc,EAAE,MAAM,CAAC,QAAQ;YAC/B,mBAAmB,EAAE,OAAO,CAAC,QAAQ;SACtC,CAAC,CAAC;QAEH,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC;aACxD,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC;aAC5B,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;QAEvB,IAAI,mBAAmB,CAAC,MAAM,EAAE;YAC9B,OAAO,CAAC,GAAG,CAAC,qBAAqB,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAC1F;QAED,gCAAgC;QAChC,MAAM,QAAQ,GAAG,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QAEtD,gDAAgD;QAChD,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAE/C,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,KAAK,CAAC,yCAAyC,OAAO,IAAI,CAAC,CAAC;SACvE;QAED,IAAI,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE;YAC3C,MAAM,IAAI,KAAK,CAAC,wBAAwB,OAAO,uCAAuC,CAAC,CAAC;SACzF;QAED,iCAAiC;QACjC,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;QAEvG,gFAAgF;QAChF,eAAe,CAAC,sBAAsB,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;QAEhE,IAAI,OAAO,CAAC,aAAa,EAAE;YACzB,iCAAiC;YACjC,MAAM,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,kBAAkB,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;SAC7E;QAED,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC;QAEpE,qEAAqE;QACrE,MAAM,SAAS,GAAG,MAAM,cAAc,CAAC;YACrC,OAAO;YACP,QAAQ;YACR,QAAQ;YACR,QAAQ;SACT,CAAC,CAAC;QAEH,gEAAgE;QAChE,KAAK,SAAS,CAAC,OAAO,CAAC,MAAM,mBAAmB,CAAC,EAAE,WAAW,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;QAEnH,yDAAyD;QACzD,MAAM,EAAE,iBAAiB,EAAE,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,CAAC;QACrE,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;QAEzF,gCAAgC;QAChC,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,MAAM,CAAC,+BAA+B,CAAC,CAAC;QACzE,MAAM,SAAS,GAAG,MAAM,cAAc,CAAC;YACrC,OAAO;YACP,UAAU;YACV,YAAY;YACZ,SAAS;YACT,MAAM;YACN,QAAQ;YACR,QAAQ;SACT,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE;YACzB,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI;gBAC3B,CAAC,WAAW,EAAE,SAAS,CAAU;gBACjC,CAAC,WAAW,EAAE,SAAS,CAAU;gBACjC,CAAC,cAAc,EAAE,YAAY,CAAU;aACxC,EAAE;gBACD,OAAO,CAAC,IAAI,CAAC,WAAW,IAAI,KAAK,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;gBAC/C,IAAI;oBACF,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;iBACtB;gBAAC,OAAO,GAAG,EAAE;oBACZ,OAAO,CAAC,IAAI,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC;iBAC5C;aACF;YAED,4DAA4D;YAC5D,QAAQ,CAAC,QAAQ,EAAE,CAAC;YAEpB,6BAA6B;YAC7B,MAAM,aAAa,EAAE,CAAC;QACxB,CAAC,CAAC;QAEF,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE/B,gDAAgD;QAChD,IAAI,WAAW,GAAG,CAAC,CAAC;QAEpB,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YACxB,WAAW,EAAE,CAAC;YACd,IAAI,WAAW,GAAG,CAAC,EAAE;gBACnB,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;gBAC9B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;YAED,6FAA6F;YAC7F,OAAO,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE;gBACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,oBAAoB;QACpB,MAAM,GAAG,GAAG,SAAS,CAAC,GAAG,CAAC;QAE1B,WAAW,CAAC,OAAO,CAAC,0BAA0B,EAAE,kBAAkB,CAAC,CAAC;QACpE,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YAC7B,sEAAsE;YACtE,OAAO,CAAC,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE,KAAK,IAAI,GAAG,CAAC,CAAC;YAC1D,OAAO,CAAC,IAAI,CAAC,sCAAsC,EAAE,GAAG,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;KACJ;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACpB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC;AAED,wBAAwB","sourcesContent":["import { writeJson } from '@ms-cloudpack/json-utilities';\nimport { findResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport path from 'path';\nimport { createSession } from '../../common/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, includeOverlay: true }, { 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"]}
+{"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 '../../common/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 { 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, includeOverlay: true }, { 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      telemetryClient,\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 telemetryClient.shutdown();\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/sync/sync.d.ts.map

@@ -1 +1 @@
-{"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;AAO1D,wBAAsB,IAAI,CAAC,EAAE,MAAM,EAAE,mBAAmB,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,iBAwC5F"}
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../../src/commands/sync/sync.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAQ1D,wBAAsB,IAAI,CAAC,EAAE,MAAM,EAAE,mBAAmB,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,iBAiD5F"}

package/lib/commands/sync/sync.js

@@ -1,5 +1,4 @@
 import { red } from '@ms-cloudpack/task-reporter';
-import { stopTelemetry } from '../../initTelemetry.js';
 import { setupReporting } from '../../setupReporting.js';
 import { syncDownload, syncUpload } from '@ms-cloudpack/api-server/apis';
 import { createPartialApiContext } from '../../common/createPartialApiContext.js';
@@ -7,8 +6,10 @@ import { isCIBuild } from '../../utilities/isCIBuild.js';
 export async function sync({ upload, nonInteractiveLogin }, context) {
     let hasErrors = false;
     let message = undefined;
+    let telemetryClient;
+    let disposeContext = undefined;
     try {
-        await setupReporting(context);
+        telemetryClient = await setupReporting(context);
         const { config } = context;
         const remoteCacheConfig = config.remoteCache;
         if (!remoteCacheConfig) {
@@ -18,18 +19,24 @@ export async function sync({ upload, nonInteractiveLogin }, context) {
         const input = {
             isInteractiveLogin: !(isCIBuild() || nonInteractiveLogin),
         };
-        let disposeContext = undefined;
         if (upload) {
-            const ctx = await createPartialApiContext(context, ['bus', 'taskRunner', 'watcher', 'packages', 'session']);
+            const ctx = await createPartialApiContext({
+                ...context,
+                telemetryClient,
+                items: ['bus', 'taskRunner', 'watcher', 'packages', 'session'],
+            });
             disposeContext = ctx.dispose;
             await syncUpload({ input, ctx });
         }
         else {
-            const ctx = await createPartialApiContext(context, ['packages', 'session']);
+            const ctx = await createPartialApiContext({
+                ...context,
+                telemetryClient,
+                items: ['packages', 'session'],
+            });
             disposeContext = ctx.dispose;
             await syncDownload({ input, ctx });
         }
-        await disposeContext?.();
         hasErrors = context.reporter.hasErrors();
     }
     catch (error) {
@@ -37,8 +44,9 @@ export async function sync({ upload, nonInteractiveLogin }, context) {
         hasErrors = true;
     }
     finally {
+        await disposeContext?.();
         context.reporter.complete(hasErrors ? red(message) : message);
-        await stopTelemetry();
+        await telemetryClient?.shutdown();
         process.exit(hasErrors ? 1 : 0);
     }
 }

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;AAGvD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAElF,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,EAAE,MAAM,EAAE,mBAAmB,EAAe,EAAE,OAAoB;IAC3F,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,IAAI,OAAO,GAAuB,SAAS,CAAC;IAC5C,IAAI;QACF,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC;QAC9B,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAC3B,MAAM,iBAAiB,GAAG,MAAM,CAAC,WAAW,CAAC;QAC7C,IAAI,CAAC,iBAAiB,EAAE;YACtB,OAAO,CAAC,IAAI,CACV,gHAAgH,CACjH,CAAC;YACF,OAAO;SACR;QAED,MAAM,KAAK,GAAG;YACZ,kBAAkB,EAAE,CAAC,CAAC,SAAS,EAAE,IAAI,mBAAmB,CAAC;SAC1D,CAAC;QAEF,IAAI,cAAc,GAAmC,SAAS,CAAC;QAE/D,IAAI,MAAM,EAAE;YACV,MAAM,GAAG,GAAG,MAAM,uBAAuB,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC;YAC5G,cAAc,GAAG,GAAG,CAAC,OAAO,CAAC;YAC7B,MAAM,UAAU,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;SAClC;aAAM;YACL,MAAM,GAAG,GAAG,MAAM,uBAAuB,CAAC,OAAO,EAAE,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC;YAC5E,cAAc,GAAG,GAAG,CAAC,OAAO,CAAC;YAC7B,MAAM,YAAY,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;SACpC;QAED,MAAM,cAAc,EAAE,EAAE,CAAC;QACzB,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 type { TaskContext } from '../../types/TaskContext.js';\nimport type { SyncOptions } from './types/SyncOptions.js';\nimport { setupReporting } from '../../setupReporting.js';\nimport { syncDownload, syncUpload } from '@ms-cloudpack/api-server/apis';\nimport { createPartialApiContext } from '../../common/createPartialApiContext.js';\nimport type { Context } from '@ms-cloudpack/api-server';\nimport { isCIBuild } from '../../utilities/isCIBuild.js';\n\nexport async function sync({ upload, nonInteractiveLogin }: SyncOptions, context: TaskContext) {\n  let hasErrors = false;\n  let message: string | undefined = undefined;\n  try {\n    await setupReporting(context);\n    const { config } = context;\n    const remoteCacheConfig = config.remoteCache;\n    if (!remoteCacheConfig) {\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 input = {\n      isInteractiveLogin: !(isCIBuild() || nonInteractiveLogin),\n    };\n\n    let disposeContext: Context['dispose'] | undefined = undefined;\n\n    if (upload) {\n      const ctx = await createPartialApiContext(context, ['bus', 'taskRunner', 'watcher', 'packages', 'session']);\n      disposeContext = ctx.dispose;\n      await syncUpload({ input, ctx });\n    } else {\n      const ctx = await createPartialApiContext(context, ['packages', 'session']);\n      disposeContext = ctx.dispose;\n      await syncDownload({ input, ctx });\n    }\n\n    await disposeContext?.();\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;AAGlD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAElF,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAGzD,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,EAAE,MAAM,EAAE,mBAAmB,EAAe,EAAE,OAAoB;IAC3F,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,IAAI,OAAO,GAAuB,SAAS,CAAC;IAC5C,IAAI,eAA4C,CAAC;IACjD,IAAI,cAAc,GAAmC,SAAS,CAAC;IAE/D,IAAI;QACF,eAAe,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAC3B,MAAM,iBAAiB,GAAG,MAAM,CAAC,WAAW,CAAC;QAC7C,IAAI,CAAC,iBAAiB,EAAE;YACtB,OAAO,CAAC,IAAI,CACV,gHAAgH,CACjH,CAAC;YACF,OAAO;SACR;QAED,MAAM,KAAK,GAAG;YACZ,kBAAkB,EAAE,CAAC,CAAC,SAAS,EAAE,IAAI,mBAAmB,CAAC;SAC1D,CAAC;QAEF,IAAI,MAAM,EAAE;YACV,MAAM,GAAG,GAAG,MAAM,uBAAuB,CAAC;gBACxC,GAAG,OAAO;gBACV,eAAe;gBACf,KAAK,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,CAAC;aAC/D,CAAC,CAAC;YACH,cAAc,GAAG,GAAG,CAAC,OAAO,CAAC;YAC7B,MAAM,UAAU,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;SAClC;aAAM;YACL,MAAM,GAAG,GAAG,MAAM,uBAAuB,CAAC;gBACxC,GAAG,OAAO;gBACV,eAAe;gBACf,KAAK,EAAE,CAAC,UAAU,EAAE,SAAS,CAAC;aAC/B,CAAC,CAAC;YACH,cAAc,GAAG,GAAG,CAAC,OAAO,CAAC;YAC7B,MAAM,YAAY,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;SACpC;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,MAAM,cAAc,EAAE,EAAE,CAAC;QACzB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAC9D,MAAM,eAAe,EAAE,QAAQ,EAAE,CAAC;QAClC,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 type { TaskContext } from '../../types/TaskContext.js';\nimport type { SyncOptions } from './types/SyncOptions.js';\nimport { setupReporting } from '../../setupReporting.js';\nimport { syncDownload, syncUpload } from '@ms-cloudpack/api-server/apis';\nimport { createPartialApiContext } from '../../common/createPartialApiContext.js';\nimport type { Context } from '@ms-cloudpack/api-server';\nimport { isCIBuild } from '../../utilities/isCIBuild.js';\nimport type { TelemetryClient } from '@ms-cloudpack/telemetry';\n\nexport async function sync({ upload, nonInteractiveLogin }: SyncOptions, context: TaskContext) {\n  let hasErrors = false;\n  let message: string | undefined = undefined;\n  let telemetryClient: TelemetryClient | undefined;\n  let disposeContext: Context['dispose'] | undefined = undefined;\n\n  try {\n    telemetryClient = await setupReporting(context);\n    const { config } = context;\n    const remoteCacheConfig = config.remoteCache;\n    if (!remoteCacheConfig) {\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 input = {\n      isInteractiveLogin: !(isCIBuild() || nonInteractiveLogin),\n    };\n\n    if (upload) {\n      const ctx = await createPartialApiContext({\n        ...context,\n        telemetryClient,\n        items: ['bus', 'taskRunner', 'watcher', 'packages', 'session'],\n      });\n      disposeContext = ctx.dispose;\n      await syncUpload({ input, ctx });\n    } else {\n      const ctx = await createPartialApiContext({\n        ...context,\n        telemetryClient,\n        items: ['packages', 'session'],\n      });\n      disposeContext = ctx.dispose;\n      await syncDownload({ input, ctx });\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    await disposeContext?.();\n    context.reporter.complete(hasErrors ? red(message) : message);\n    await telemetryClient?.shutdown();\n    process.exit(hasErrors ? 1 : 0);\n  }\n}\n"]}

package/lib/common/createPartialApiContext.d.ts

@@ -1,4 +1,14 @@
 import type { Context } from '@ms-cloudpack/api-server';
-import type { TaskContext } from '../types/TaskContext.js';
-export declare function createPartialApiContext<TKeys extends Exclude<keyof Context, 'dispose'>, TReturn extends Pick<Context, TKeys | 'dispose' | 'reporter' | 'rootSpan'>>(context: TaskContext, items: TKeys[]): Promise<TReturn>;
+import type { TaskReporter } from '@ms-cloudpack/task-reporter';
+import type { TelemetryClient } from '@ms-cloudpack/telemetry';
+import type { CloudpackConfig } from '@ms-cloudpack/config';
+export interface LazyApiContextOptions {
+    reporter: TaskReporter;
+    appPath: string;
+    config: CloudpackConfig;
+    telemetryClient: TelemetryClient;
+}
+export declare function createPartialApiContext<TKeys extends Exclude<keyof Context, 'dispose'>, TReturn extends Pick<Context, TKeys | 'dispose' | 'reporter' | 'telemetryClient'>>(options: LazyApiContextOptions & {
+    items: TKeys[];
+}): Promise<TReturn>;
 //# sourceMappingURL=createPartialApiContext.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"createPartialApiContext.d.ts","sourceRoot":"","sources":["../../src/common/createPartialApiContext.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAuB,MAAM,0BAA0B,CAAC;AAC7E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AA8F3D,wBAAsB,uBAAuB,CAC3C,KAAK,SAAS,OAAO,CAAC,MAAM,OAAO,EAAE,SAAS,CAAC,EAC/C,OAAO,SAAS,IAAI,CAAC,OAAO,EAAE,KAAK,GAAG,SAAS,GAAG,UAAU,GAAG,UAAU,CAAC,EAC1E,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAiBxD"}
+{"version":3,"file":"createPartialApiContext.d.ts","sourceRoot":"","sources":["../../src/common/createPartialApiContext.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAuB,MAAM,0BAA0B,CAAC;AAC7E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAM5D,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,YAAY,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,eAAe,CAAC;IACxB,eAAe,EAAE,eAAe,CAAC;CAClC;AAsFD,wBAAsB,uBAAuB,CAC3C,KAAK,SAAS,OAAO,CAAC,MAAM,OAAO,EAAE,SAAS,CAAC,EAC/C,OAAO,SAAS,IAAI,CAAC,OAAO,EAAE,KAAK,GAAG,SAAS,GAAG,UAAU,GAAG,iBAAiB,CAAC,EACjF,OAAO,EAAE,qBAAqB,GAAG;IAAE,KAAK,EAAE,KAAK,EAAE,CAAA;CAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAiBvE"}

package/lib/common/createPartialApiContext.js

@@ -10,18 +10,17 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
 var _LazyApiContext_bus, _LazyApiContext_watcher, _LazyApiContext_packages, _LazyApiContext_taskRunner, _LazyApiContext_session;
-import { rootSpan } from '../initTelemetry.js';
 class LazyApiContext {
-    constructor(context) {
-        this.context = context;
+    constructor(options) {
+        this.options = options;
         _LazyApiContext_bus.set(this, void 0);
         _LazyApiContext_watcher.set(this, void 0);
         _LazyApiContext_packages.set(this, void 0);
         _LazyApiContext_taskRunner.set(this, void 0);
         _LazyApiContext_session.set(this, void 0);
     }
-    get rootSpan() {
-        return Promise.resolve(rootSpan);
+    get telemetryClient() {
+        return Promise.resolve(this.options.telemetryClient);
     }
     get bus() {
         if (!__classPrivateFieldGet(this, _LazyApiContext_bus, "f")) {
@@ -44,13 +43,13 @@ class LazyApiContext {
         return __classPrivateFieldGet(this, _LazyApiContext_watcher, "f");
     }
     get reporter() {
-        return Promise.resolve(this.context.reporter);
+        return Promise.resolve(this.options.reporter);
     }
     get packages() {
         if (!__classPrivateFieldGet(this, _LazyApiContext_packages, "f")) {
             const createPackageDefinitionsLazy = async () => {
                 const { createPackageDefinitions } = await import('@ms-cloudpack/config');
-                return createPackageDefinitions({ config: this.context.config });
+                return createPackageDefinitions({ config: this.options.config });
             };
             __classPrivateFieldSet(this, _LazyApiContext_packages, createPackageDefinitionsLazy(), "f");
         }
@@ -70,7 +69,7 @@ class LazyApiContext {
         if (!__classPrivateFieldGet(this, _LazyApiContext_session, "f")) {
             const createSessionLazy = async () => {
                 const { createSession } = await import('./createSession.js');
-                return createSession(this.context, { reporter: await this.reporter, packages: await this.packages });
+                return createSession(this.options, { reporter: await this.reporter, packages: await this.packages });
             };
             __classPrivateFieldSet(this, _LazyApiContext_session, createSessionLazy(), "f");
         }
@@ -84,12 +83,12 @@ class LazyApiContext {
     }
 }
 _LazyApiContext_bus = new WeakMap(), _LazyApiContext_watcher = new WeakMap(), _LazyApiContext_packages = new WeakMap(), _LazyApiContext_taskRunner = new WeakMap(), _LazyApiContext_session = new WeakMap();
-export async function createPartialApiContext(context, items) {
-    const { reporter } = context;
-    const lazyContext = new LazyApiContext(context);
+export async function createPartialApiContext(options) {
+    const { reporter, telemetryClient, items } = options;
+    const lazyContext = new LazyApiContext(options);
     const result = {
         reporter,
-        rootSpan,
+        telemetryClient,
         dispose: () => {
             return lazyContext.dispose();
         },

package/lib/common/createPartialApiContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"createPartialApiContext.js","sourceRoot":"","sources":["../../src/common/createPartialApiContext.ts"],"names":[],"mappings":"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","sourcesContent":["import type { DataBus } from '@ms-cloudpack/data-bus';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { Context, Session, TaskRunner } from '@ms-cloudpack/api-server';\nimport type { TaskContext } from '../types/TaskContext.js';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport type { Watcher } from '@ms-cloudpack/file-watcher';\nimport { rootSpan } from '../initTelemetry.js';\nimport type { Span } from '@ms-cloudpack/telemetry';\n\ntype PromisifyProperties<T> = {\n  [K in keyof T]: T[K] extends (...args: unknown[]) => unknown ? T[K] : Promise<T[K]>;\n};\n\nclass LazyApiContext implements PromisifyProperties<Context> {\n  #bus: Promise<DataBus> | undefined;\n  #watcher: Promise<Watcher> | undefined;\n  #packages: Promise<PackageDefinitionsCache> | undefined;\n  #taskRunner: Promise<TaskRunner> | undefined;\n  #session: Promise<Session> | undefined;\n\n  constructor(private readonly context: TaskContext) {}\n\n  public get rootSpan(): Promise<Span | undefined> {\n    return Promise.resolve(rootSpan);\n  }\n\n  public get bus(): Promise<DataBus> {\n    if (!this.#bus) {\n      const createDataBusLazy = async () => {\n        const { createDataBus } = await import('@ms-cloudpack/data-bus');\n        return createDataBus();\n      };\n      this.#bus = createDataBusLazy();\n    }\n\n    return this.#bus;\n  }\n\n  public get watcher(): Promise<Watcher> {\n    if (!this.#watcher) {\n      const createWatcherLazy = async () => {\n        const { createWatcher } = await import('@ms-cloudpack/file-watcher');\n        return createWatcher();\n      };\n      this.#watcher = createWatcherLazy();\n    }\n\n    return this.#watcher;\n  }\n\n  public get reporter(): Promise<TaskReporter> {\n    return Promise.resolve(this.context.reporter);\n  }\n\n  public get packages(): Promise<PackageDefinitionsCache> {\n    if (!this.#packages) {\n      const createPackageDefinitionsLazy = async () => {\n        const { createPackageDefinitions } = await import('@ms-cloudpack/config');\n        return createPackageDefinitions({ config: this.context.config });\n      };\n      this.#packages = createPackageDefinitionsLazy();\n    }\n\n    return this.#packages;\n  }\n\n  public get taskRunner(): Promise<TaskRunner> {\n    if (!this.#taskRunner) {\n      const createTaskRunnerLazy = async () => {\n        const { TaskRunner } = await import('@ms-cloudpack/api-server');\n        return new TaskRunner();\n      };\n      this.#taskRunner = createTaskRunnerLazy();\n    }\n    return this.#taskRunner;\n  }\n\n  public get session(): Promise<Session> {\n    if (!this.#session) {\n      const createSessionLazy = async () => {\n        const { createSession } = await import('./createSession.js');\n        return createSession(this.context, { reporter: await this.reporter, packages: await this.packages });\n      };\n      this.#session = createSessionLazy();\n    }\n\n    return this.#session;\n  }\n\n  public async dispose() {\n    if (this.#watcher) {\n      const watcher = await this.#watcher;\n      await watcher.unwatchAll();\n    }\n  }\n}\n\nexport async function createPartialApiContext<\n  TKeys extends Exclude<keyof Context, 'dispose'>,\n  TReturn extends Pick<Context, TKeys | 'dispose' | 'reporter' | 'rootSpan'>,\n>(context: TaskContext, items: TKeys[]): Promise<TReturn> {\n  const { reporter } = context;\n  const lazyContext = new LazyApiContext(context);\n\n  const result = {\n    reporter,\n    rootSpan,\n    dispose: () => {\n      return lazyContext.dispose();\n    },\n  } as TReturn;\n\n  for (const item of items) {\n    result[item] = (await lazyContext[item]) as TReturn[TKeys];\n  }\n\n  return result;\n}\n"]}
+{"version":3,"file":"createPartialApiContext.js","sourceRoot":"","sources":["../../src/common/createPartialApiContext.ts"],"names":[],"mappings":"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","sourcesContent":["import type { DataBus } from '@ms-cloudpack/data-bus';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { Context, Session, TaskRunner } from '@ms-cloudpack/api-server';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport type { Watcher } from '@ms-cloudpack/file-watcher';\nimport type { TelemetryClient } from '@ms-cloudpack/telemetry';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\n\ntype PromisifyProperties<T> = {\n  [K in keyof T]: T[K] extends (...args: unknown[]) => unknown ? T[K] : Promise<T[K]>;\n};\n\nexport interface LazyApiContextOptions {\n  reporter: TaskReporter;\n  appPath: string;\n  config: CloudpackConfig;\n  telemetryClient: TelemetryClient;\n}\n\nclass LazyApiContext implements PromisifyProperties<Context> {\n  #bus: Promise<DataBus> | undefined;\n  #watcher: Promise<Watcher> | undefined;\n  #packages: Promise<PackageDefinitionsCache> | undefined;\n  #taskRunner: Promise<TaskRunner> | undefined;\n  #session: Promise<Session> | undefined;\n\n  constructor(private readonly options: LazyApiContextOptions) {}\n\n  public get telemetryClient(): Promise<TelemetryClient> {\n    return Promise.resolve(this.options.telemetryClient);\n  }\n\n  public get bus(): Promise<DataBus> {\n    if (!this.#bus) {\n      const createDataBusLazy = async () => {\n        const { createDataBus } = await import('@ms-cloudpack/data-bus');\n        return createDataBus();\n      };\n      this.#bus = createDataBusLazy();\n    }\n\n    return this.#bus;\n  }\n\n  public get watcher(): Promise<Watcher> {\n    if (!this.#watcher) {\n      const createWatcherLazy = async () => {\n        const { createWatcher } = await import('@ms-cloudpack/file-watcher');\n        return createWatcher();\n      };\n      this.#watcher = createWatcherLazy();\n    }\n\n    return this.#watcher;\n  }\n\n  public get reporter(): Promise<TaskReporter> {\n    return Promise.resolve(this.options.reporter);\n  }\n\n  public get packages(): Promise<PackageDefinitionsCache> {\n    if (!this.#packages) {\n      const createPackageDefinitionsLazy = async () => {\n        const { createPackageDefinitions } = await import('@ms-cloudpack/config');\n        return createPackageDefinitions({ config: this.options.config });\n      };\n      this.#packages = createPackageDefinitionsLazy();\n    }\n\n    return this.#packages;\n  }\n\n  public get taskRunner(): Promise<TaskRunner> {\n    if (!this.#taskRunner) {\n      const createTaskRunnerLazy = async () => {\n        const { TaskRunner } = await import('@ms-cloudpack/api-server');\n        return new TaskRunner();\n      };\n      this.#taskRunner = createTaskRunnerLazy();\n    }\n    return this.#taskRunner;\n  }\n\n  public get session(): Promise<Session> {\n    if (!this.#session) {\n      const createSessionLazy = async () => {\n        const { createSession } = await import('./createSession.js');\n        return createSession(this.options, { reporter: await this.reporter, packages: await this.packages });\n      };\n      this.#session = createSessionLazy();\n    }\n\n    return this.#session;\n  }\n\n  public async dispose() {\n    if (this.#watcher) {\n      const watcher = await this.#watcher;\n      await watcher.unwatchAll();\n    }\n  }\n}\n\nexport async function createPartialApiContext<\n  TKeys extends Exclude<keyof Context, 'dispose'>,\n  TReturn extends Pick<Context, TKeys | 'dispose' | 'reporter' | 'telemetryClient'>,\n>(options: LazyApiContextOptions & { items: TKeys[] }): Promise<TReturn> {\n  const { reporter, telemetryClient, items } = options;\n  const lazyContext = new LazyApiContext(options);\n\n  const result = {\n    reporter,\n    telemetryClient,\n    dispose: () => {\n      return lazyContext.dispose();\n    },\n  } as TReturn;\n\n  for (const item of items) {\n    result[item] = (await lazyContext[item]) as TReturn[TKeys];\n  }\n\n  return result;\n}\n"]}

package/lib/initTelemetry.d.ts

@@ -1,5 +1,4 @@
 import { type TelemetryConfig } from '@ms-cloudpack/config';
-import { type Span, type TelemetryClient } from '@ms-cloudpack/telemetry';
 import type { TaskReporter } from '@ms-cloudpack/task-reporter';
 export interface TelemetryInitOptions {
     useDebugLogging: boolean;
@@ -7,18 +6,11 @@ export interface TelemetryInitOptions {
     telemetryConfig: TelemetryConfig | undefined;
     sharedSpanAttributes?: Record<string, string>;
 }
-export declare let rootSpan: Span | undefined;
 /**
  * Initialize the telemetry client, create the root span, register performance observers.
  * Telemetry will not be sent if no instrumentation key is found.
  * @param options - options to initialize telemetry
  * @returns
  */
-export declare function initTelemetry(options: TelemetryInitOptions, taskReporter: TaskReporter): Promise<TelemetryClient>;
-/**
- * Ends rootSpan and flushes all telemetry.
- * No-op if telemetry is not initialized.
- * @returns a promise that resolves when telemetry is flushed and shutdown.
- */
-export declare function stopTelemetry(): Promise<void> | undefined;
+export declare function initTelemetry(options: TelemetryInitOptions, taskReporter: TaskReporter): Promise<import("@ms-cloudpack/telemetry").TelemetryClient>;
 //# sourceMappingURL=initTelemetry.d.ts.map

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,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"}
+{"version":3,"file":"initTelemetry.d.ts","sourceRoot":"","sources":["../src/initTelemetry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAI5D,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;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,YAAY,8DA4B5F"}

package/lib/initTelemetry.js

@@ -2,8 +2,6 @@ import {} from '@ms-cloudpack/config';
 import { getVersion } from '@ms-cloudpack/package-utilities';
 import { createTelemetryClient } from '@ms-cloudpack/telemetry';
 import { registerPerformanceObservers } from './performance/registerPerformanceObservers.js';
-let telemetryClient;
-export let rootSpan;
 /**
  * Initialize the telemetry client, create the root span, register performance observers.
  * Telemetry will not be sent if no instrumentation key is found.
@@ -16,33 +14,21 @@ export async function initTelemetry(options, taskReporter) {
     if (!options.useDebugLogging) {
         taskReporter.ignoreLogMessage('ApplicationInsights:');
     }
-    telemetryClient = await createTelemetryClient({
+    const telemetryClient = await createTelemetryClient({
         productVersion: getVersion(import.meta.url),
         instrumentationKey,
         logLevel,
         serviceNamespace: 'cloudpack',
         serviceName: 'cli',
+        rootSpanName: '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);
-    }
+    // Register performance observers to track performance metrics as events of CLI span.
+    registerPerformanceObservers(telemetryClient.rootSpan);
     return telemetryClient;
 }
-/**
- * Ends rootSpan and flushes all telemetry.
- * No-op if telemetry is not initialized.
- * @returns a promise that resolves when telemetry is flushed and shutdown.
- */
-export function stopTelemetry() {
-    rootSpan?.end();
-    return telemetryClient?.shutdown();
-}
 //# sourceMappingURL=initTelemetry.js.map

package/lib/initTelemetry.js.map

@@ -1 +1 @@
-{"version":3,"file":"initTelemetry.js","sourceRoot":"","sources":["../src/initTelemetry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAmC,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AACjG,OAAO,EAAE,4BAA4B,EAAE,MAAM,+CAA+C,CAAC;AAU7F,IAAI,eAA4C,CAAC;AACjD,MAAM,CAAC,IAAI,QAA0B,CAAC;AAEtC;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,OAA6B,EAAE,YAA0B;IAC3F,MAAM,kBAAkB,GACtB,OAAO,CAAC,eAAe,EAAE,kBAAkB,IAAI,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC;IAErG,MAAM,QAAQ,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IACvG,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;QAC5B,YAAY,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;KACvD;IAED,eAAe,GAAG,MAAM,qBAAqB,CAAC;QAC5C,cAAc,EAAE,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;QAC3C,kBAAkB;QAClB,QAAQ;QACR,gBAAgB,EAAE,WAAW;QAC7B,WAAW,EAAE,KAAK;KACnB,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,oBAAoB,EAAE;QAChC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE;YACvE,eAAe,CAAC,sBAAsB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;SACpD;KACF;IAED,iGAAiG;IACjG,QAAQ,GAAG,eAAe,CAAC,SAAS,EAAE,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;IAEzD,IAAI,QAAQ,EAAE;QACZ,qFAAqF;QACrF,4BAA4B,CAAC,QAAQ,CAAC,CAAC;KACxC;IAED,OAAO,eAAe,CAAC;AACzB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,aAAa;IAC3B,QAAQ,EAAE,GAAG,EAAE,CAAC;IAChB,OAAO,eAAe,EAAE,QAAQ,EAAE,CAAC;AACrC,CAAC","sourcesContent":["import { type TelemetryConfig } from '@ms-cloudpack/config';\nimport { getVersion } from '@ms-cloudpack/package-utilities';\nimport { type Span, type TelemetryClient, createTelemetryClient } from '@ms-cloudpack/telemetry';\nimport { registerPerformanceObservers } from './performance/registerPerformanceObservers.js';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\n\nexport interface TelemetryInitOptions {\n  useDebugLogging: boolean;\n  useVerboseLogging: boolean;\n  telemetryConfig: TelemetryConfig | undefined;\n  sharedSpanAttributes?: Record<string, string>;\n}\n\nlet telemetryClient: TelemetryClient | undefined;\nexport let rootSpan: Span | undefined;\n\n/**\n * Initialize the telemetry client, create the root span, register performance observers.\n * Telemetry will not be sent if no instrumentation key is found.\n * @param options - options to initialize telemetry\n * @returns\n */\nexport async function initTelemetry(options: TelemetryInitOptions, taskReporter: TaskReporter) {\n  const instrumentationKey =\n    options.telemetryConfig?.instrumentationKey || process.env.CLOUDPACK_TELEMETRY_INSTRUMENTATION_KEY;\n\n  const logLevel = options.useVerboseLogging ? 'VERBOSE' : options.useDebugLogging ? 'DEBUG' : undefined;\n  if (!options.useDebugLogging) {\n    taskReporter.ignoreLogMessage('ApplicationInsights:');\n  }\n\n  telemetryClient = await createTelemetryClient({\n    productVersion: getVersion(import.meta.url),\n    instrumentationKey,\n    logLevel,\n    serviceNamespace: 'cloudpack',\n    serviceName: 'cli',\n  });\n\n  if (options.sharedSpanAttributes) {\n    for (const [key, value] of Object.entries(options.sharedSpanAttributes)) {\n      telemetryClient.setSharedSpanAttribute(key, value);\n    }\n  }\n\n  // This is the root span for the CLI. It will be used to track the duration of the CLI execution.\n  rootSpan = telemetryClient.getTracer()?.startSpan('CLI');\n\n  if (rootSpan) {\n    // Register performance observers to track performance metrics as events of CLI span.\n    registerPerformanceObservers(rootSpan);\n  }\n\n  return telemetryClient;\n}\n\n/**\n * Ends rootSpan and flushes all telemetry.\n * No-op if telemetry is not initialized.\n * @returns a promise that resolves when telemetry is flushed and shutdown.\n */\nexport function stopTelemetry() {\n  rootSpan?.end();\n  return telemetryClient?.shutdown();\n}\n"]}
+{"version":3,"file":"initTelemetry.js","sourceRoot":"","sources":["../src/initTelemetry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,4BAA4B,EAAE,MAAM,+CAA+C,CAAC;AAU7F;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,OAA6B,EAAE,YAA0B;IAC3F,MAAM,kBAAkB,GACtB,OAAO,CAAC,eAAe,EAAE,kBAAkB,IAAI,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC;IAErG,MAAM,QAAQ,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IACvG,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;QAC5B,YAAY,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;KACvD;IAED,MAAM,eAAe,GAAG,MAAM,qBAAqB,CAAC;QAClD,cAAc,EAAE,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;QAC3C,kBAAkB;QAClB,QAAQ;QACR,gBAAgB,EAAE,WAAW;QAC7B,WAAW,EAAE,KAAK;QAClB,YAAY,EAAE,KAAK;KACpB,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,oBAAoB,EAAE;QAChC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE;YACvE,eAAe,CAAC,sBAAsB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;SACpD;KACF;IAED,qFAAqF;IACrF,4BAA4B,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;IAEvD,OAAO,eAAe,CAAC;AACzB,CAAC","sourcesContent":["import { type TelemetryConfig } from '@ms-cloudpack/config';\nimport { getVersion } from '@ms-cloudpack/package-utilities';\nimport { createTelemetryClient } from '@ms-cloudpack/telemetry';\nimport { registerPerformanceObservers } from './performance/registerPerformanceObservers.js';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\n\nexport interface TelemetryInitOptions {\n  useDebugLogging: boolean;\n  useVerboseLogging: boolean;\n  telemetryConfig: TelemetryConfig | undefined;\n  sharedSpanAttributes?: Record<string, string>;\n}\n\n/**\n * Initialize the telemetry client, create the root span, register performance observers.\n * Telemetry will not be sent if no instrumentation key is found.\n * @param options - options to initialize telemetry\n * @returns\n */\nexport async function initTelemetry(options: TelemetryInitOptions, taskReporter: TaskReporter) {\n  const instrumentationKey =\n    options.telemetryConfig?.instrumentationKey || process.env.CLOUDPACK_TELEMETRY_INSTRUMENTATION_KEY;\n\n  const logLevel = options.useVerboseLogging ? 'VERBOSE' : options.useDebugLogging ? 'DEBUG' : undefined;\n  if (!options.useDebugLogging) {\n    taskReporter.ignoreLogMessage('ApplicationInsights:');\n  }\n\n  const telemetryClient = await createTelemetryClient({\n    productVersion: getVersion(import.meta.url),\n    instrumentationKey,\n    logLevel,\n    serviceNamespace: 'cloudpack',\n    serviceName: 'cli',\n    rootSpanName: 'CLI',\n  });\n\n  if (options.sharedSpanAttributes) {\n    for (const [key, value] of Object.entries(options.sharedSpanAttributes)) {\n      telemetryClient.setSharedSpanAttribute(key, value);\n    }\n  }\n\n  // Register performance observers to track performance metrics as events of CLI span.\n  registerPerformanceObservers(telemetryClient.rootSpan);\n\n  return telemetryClient;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/cli",
-  "version": "0.45.2",
+  "version": "0.45.3",
   "description": "The Cloudpack command line interface - a tool for managing fast inner and outer looping in web apps.",
   "license": "MIT",
   "type": "module",
@@ -11,19 +11,19 @@
   },
   "dependencies": {
     "@lage-run/target-graph": "^0.8.6",
-    "@ms-cloudpack/api-server": "^0.14.4",
+    "@ms-cloudpack/api-server": "^0.15.0",
     "@ms-cloudpack/bundler": "^0.14.11",
     "@ms-cloudpack/config": "^0.12.1",
     "@ms-cloudpack/create-express-app": "^1.3.9",
     "@ms-cloudpack/data-bus": "^0.4.0",
-    "@ms-cloudpack/file-watcher": "^0.0.3",
+    "@ms-cloudpack/file-watcher": "^0.1.0",
     "@ms-cloudpack/json-utilities": "^0.0.7",
-    "@ms-cloudpack/overlay": "^0.14.13",
+    "@ms-cloudpack/overlay": "^0.14.14",
     "@ms-cloudpack/package-utilities": "^5.1.3",
     "@ms-cloudpack/path-string-parsing": "^1.0.3",
     "@ms-cloudpack/path-utilities": "^2.3.2",
     "@ms-cloudpack/task-reporter": "^0.7.2",
-    "@ms-cloudpack/telemetry": "^0.3.6",
+    "@ms-cloudpack/telemetry": "^0.3.7",
     "commander": "^11.0.0",
     "cross-spawn": "^7.0.3",
     "fs-extra": "^11.0.0",

package/lib/types/CreateHtmlFunction.d.ts

@@ -1,7 +0,0 @@
-import type { CreateHtmlOptions } from './CreateHtmlOptions.js';
-import type { CreateHtmlResult } from './CreateHtmlResult.js';
-/**
- * A custom server render function that can be used to override the default HTML response.
- */
-export type CreateHtmlFunction = (options: CreateHtmlOptions) => Promise<CreateHtmlResult> | CreateHtmlResult;
-//# sourceMappingURL=CreateHtmlFunction.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"CreateHtmlFunction.d.ts","sourceRoot":"","sources":["../../src/types/CreateHtmlFunction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAE9D;;GAEG;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,gBAAgB,CAAC,GAAG,gBAAgB,CAAC"}

package/lib/types/CreateHtmlFunction.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=CreateHtmlFunction.js.map

package/lib/types/CreateHtmlFunction.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"CreateHtmlFunction.js","sourceRoot":"","sources":["../../src/types/CreateHtmlFunction.ts"],"names":[],"mappings":"","sourcesContent":["import type { CreateHtmlOptions } from './CreateHtmlOptions.js';\nimport type { CreateHtmlResult } from './CreateHtmlResult.js';\n\n/**\n * A custom server render function that can be used to override the default HTML response.\n */\n\nexport type CreateHtmlFunction = (options: CreateHtmlOptions) => Promise<CreateHtmlResult> | CreateHtmlResult;\n"]}

package/lib/types/CreateHtmlOptions.d.ts

@@ -1,21 +0,0 @@
-import type { ImportMap } from '@ms-cloudpack/package-utilities';
-import type { PackageJson } from '@ms-cloudpack/bundler-types';
-import type { Route } from '@ms-cloudpack/config';
-import type { Session } from '@ms-cloudpack/api-server';
-import type { Request, Response } from '@ms-cloudpack/create-express-app';
-/**
- * The input options for a createHtml custom server render function.
- */
-export type CreateHtmlOptions = {
-    session: Session;
-    route: Route;
-    baseUrl: string;
-    definition: PackageJson;
-    importMap: ImportMap;
-    overlayScript: string | undefined;
-    entryScript: string | undefined;
-    inlineScripts: string[];
-    req: Request;
-    res: Response;
-};
-//# sourceMappingURL=CreateHtmlOptions.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"CreateHtmlOptions.d.ts","sourceRoot":"","sources":["../../src/types/CreateHtmlOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAE1E;;GAEG;AAEH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,WAAW,CAAC;IACxB,SAAS,EAAE,SAAS,CAAC;IACrB,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,QAAQ,CAAC;CACf,CAAC"}

package/lib/types/CreateHtmlOptions.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=CreateHtmlOptions.js.map

package/lib/types/CreateHtmlOptions.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"CreateHtmlOptions.js","sourceRoot":"","sources":["../../src/types/CreateHtmlOptions.ts"],"names":[],"mappings":"","sourcesContent":["import type { ImportMap } from '@ms-cloudpack/package-utilities';\nimport type { PackageJson } from '@ms-cloudpack/bundler-types';\nimport type { Route } from '@ms-cloudpack/config';\nimport type { Session } from '@ms-cloudpack/api-server';\nimport type { Request, Response } from '@ms-cloudpack/create-express-app';\n\n/**\n * The input options for a createHtml custom server render function.\n */\n\nexport type CreateHtmlOptions = {\n  session: Session;\n  route: Route;\n  baseUrl: string;\n  definition: PackageJson;\n  importMap: ImportMap;\n  overlayScript: string | undefined;\n  entryScript: string | undefined;\n  inlineScripts: string[];\n  req: Request;\n  res: Response;\n};\n"]}

package/lib/types/CreateHtmlResult.d.ts

@@ -1,15 +0,0 @@
-/**
- * Represents a custom HtmlResult object returned from running the renderScript for a Route
- */
-export type CustomHtmlResult = {
-    type: 'static-html' | 'js' | 'json';
-    content: string;
-};
-/**
- * The expected result of the createHtml custom server render function.
- */
-export type CreateHtmlResult = string | {
-    html: string;
-    statusCode: number;
-} | CustomHtmlResult;
-//# sourceMappingURL=CreateHtmlResult.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"CreateHtmlResult.d.ts","sourceRoot":"","sources":["../../src/types/CreateHtmlResult.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,aAAa,GAAG,IAAI,GAAG,MAAM,CAAC;IACpC,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,gBAAgB,GACxB,MAAM,GACN;IACE,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB,GACD,gBAAgB,CAAC"}

package/lib/types/CreateHtmlResult.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=CreateHtmlResult.js.map

package/lib/types/CreateHtmlResult.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"CreateHtmlResult.js","sourceRoot":"","sources":["../../src/types/CreateHtmlResult.ts"],"names":[],"mappings":"","sourcesContent":["/**\n * Represents a custom HtmlResult object returned from running the renderScript for a Route\n */\nexport type CustomHtmlResult = {\n  type: 'static-html' | 'js' | 'json';\n  content: string;\n};\n\n/**\n * The expected result of the createHtml custom server render function.\n */\nexport type CreateHtmlResult =\n  | string\n  | {\n      html: string;\n      statusCode: number;\n    }\n  | CustomHtmlResult;\n"]}

package/lib/types/CreateHtmlScript.d.ts

@@ -1,8 +0,0 @@
-import type { CreateHtmlFunction } from './CreateHtmlFunction.js';
-/**
- * The expected shape of the createHtml custom server render function script.
- */
-export type CreateHtmlScript = {
-    default: CreateHtmlFunction;
-};
-//# sourceMappingURL=CreateHtmlScript.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"CreateHtmlScript.d.ts","sourceRoot":"","sources":["../../src/types/CreateHtmlScript.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAAE,OAAO,EAAE,kBAAkB,CAAA;CAAE,CAAC"}

package/lib/types/CreateHtmlScript.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=CreateHtmlScript.js.map

package/lib/types/CreateHtmlScript.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"CreateHtmlScript.js","sourceRoot":"","sources":["../../src/types/CreateHtmlScript.ts"],"names":[],"mappings":"","sourcesContent":["import type { CreateHtmlFunction } from './CreateHtmlFunction.js';\n\n/**\n * The expected shape of the createHtml custom server render function script.\n */\nexport type CreateHtmlScript = { default: CreateHtmlFunction };\n"]}

package/lib/types/Watcher.d.ts

@@ -1,5 +0,0 @@
-import type { BundleRequest } from '@ms-cloudpack/api-server';
-export interface Watcher {
-    watch: (bundleRequest: BundleRequest) => void;
-}
-//# sourceMappingURL=Watcher.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"Watcher.d.ts","sourceRoot":"","sources":["../../src/types/Watcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAE9D,MAAM,WAAW,OAAO;IACtB,KAAK,EAAE,CAAC,aAAa,EAAE,aAAa,KAAK,IAAI,CAAC;CAC/C"}

package/lib/types/Watcher.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=Watcher.js.map

package/lib/types/Watcher.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Watcher.js","sourceRoot":"","sources":["../../src/types/Watcher.ts"],"names":[],"mappings":"","sourcesContent":["import type { BundleRequest } from '@ms-cloudpack/api-server';\n\nexport interface Watcher {\n  watch: (bundleRequest: BundleRequest) => void;\n}\n"]}