@ms-cloudpack/cli 0.43.1 → 0.44.0

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;AAM9D,wBAAsB,MAAM,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,WAAW,iBAsBxE"}
+{"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"}

package/lib/commands/bundle/bundle.js

@@ -1,20 +1,25 @@
 import { setupReporting } from '../../setupReporting.js';
-import { createApiServer } from '../../common/createApiServer.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 { apiServer, packages } = await createApiServer(context);
-    const definition = await packages.get(packagePath);
-    const result = await apiServer.ensurePackageBundled({
-        name: definition?.name ?? '<unknown>',
-        version: definition?.version ?? '0.0.0',
-        outputPath: path.resolve(packagePath, outdir),
-        bundlerType,
-        disableSourceMaps,
+    const ctx = await createPartialApiContext(context, ['packages', 'watcher', 'session', 'taskRunner', 'bus']);
+    const definition = await ctx.packages.get(packagePath);
+    const { result } = await ensurePackageBundled({
+        input: {
+            name: definition?.name ?? '<unknown>',
+            version: definition?.version ?? '0.0.0',
+            outputPath: path.resolve(packagePath, outdir),
+            bundlerType,
+            disableSourceMaps,
+        },
+        ctx,
     });
+    await ctx.dispose();
     await stopTelemetry();
     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,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD,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,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;IAE/D,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAEnD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,oBAAoB,CAAC;QAClD,IAAI,EAAE,UAAU,EAAE,IAAI,IAAI,WAAW;QACrC,OAAO,EAAE,UAAU,EAAE,OAAO,IAAI,OAAO;QACvC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC;QAC7C,WAAW;QACX,iBAAiB;KAClB,CAAC,CAAC;IAEH,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 { createApiServer } from '../../common/createApiServer.js';\nimport path from 'path';\nimport { stopTelemetry } from '../../initTelemetry.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 { apiServer, packages } = await createApiServer(context);\n\n  const definition = await packages.get(packagePath);\n\n  const result = await apiServer.ensurePackageBundled({\n    name: definition?.name ?? '<unknown>',\n    version: definition?.version ?? '0.0.0',\n    outputPath: path.resolve(packagePath, outdir),\n    bundlerType,\n    disableSourceMaps,\n  });\n\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,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"]}

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

@@ -1,6 +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';
 /**
  * Bundle the package and return the imports it depends on.
  */
@@ -10,6 +11,7 @@ export declare function bundleAndGetImports(options: {
     reporter: TaskReporter;
     packagePath: string;
     definition: PackageJson;
+    ctx: EnsurePackageBundledContext;
 }): 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":"AAIA,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;AAE5D;;GAEG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE;IACjD,QAAQ,EAAE,uBAAuB,CAAC;IAClC,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,YAAY,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,WAAW,CAAC;CACzB,GAAG,OAAO,CAAC;IACV,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,CAiED"}
+{"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"}

package/lib/commands/init/bundleAndGetImports.js

@@ -1,20 +1,22 @@
 import path from 'path';
 import { getEntriesMapFromPackage } from '@ms-cloudpack/bundler';
-import { bundleTask, getBundleDetails, findImports } from '@ms-cloudpack/api-server';
-import { prepareOutputPath } from '../../common/prepareOutputPath.js';
+import { getBundleDetails, findImports } from '@ms-cloudpack/api-server';
 import { formatPackageName } from '@ms-cloudpack/task-reporter';
+import { ensurePackageBundled } from '@ms-cloudpack/api-server/apis';
 /**
  * Bundle the package and return the imports it depends on.
  */
 export async function bundleAndGetImports(options) {
-    const { packagePath, definition, packages, reporter, config } = options;
+    const { packagePath, definition, packages, reporter, ctx } = options;
     const { outputLocation, isExternal } = await getBundleDetails({ packagePath }, { packages });
     const outputPath = outputLocation.path;
     if (!isExternal && !definition.exports) {
         console.debug(`${path.join(packagePath, 'package.json')} does not have an "exports" field.`);
     }
-    // Ensure outputPath exists and is empty.
-    await prepareOutputPath(outputPath);
+    const { name, version } = definition;
+    if (!name || !version) {
+        throw new Error(`Package at "${packagePath}" does not have a name or version.`);
+    }
     // Determine entries.
     const entriesMap = await getEntriesMapFromPackage({ inputPath: packagePath }, { packages });
     if (!Object.keys(entriesMap).length) {
@@ -28,28 +30,24 @@ export async function bundleAndGetImports(options) {
             ],
         };
     }
-    const bundleRequest = {
-        id: packagePath,
-        packageName: definition.name || '',
-        version: definition.version || '',
-        packagePath,
-        outputPath,
-        isExternal,
-        packages,
-        config,
-    };
-    await bundleTask({ bundleRequest, reporter, options: { force: true } });
+    const { result } = await ensurePackageBundled({
+        input: {
+            name,
+            version,
+        },
+        ctx,
+    });
     // For each outputFile, find all imports.
     let imports;
     await reporter.runTask(`Evaluate ${formatPackageName(definition)}`, async () => {
-        imports = new Map(Object.entries((await findImports(bundleRequest.result?.outputFiles?.map((file) => path.resolve(outputPath, file.outputPath)) || [])) || {}));
+        imports = new Map(Object.entries((await findImports(result?.outputFiles?.map((file) => path.resolve(outputPath, file.outputPath)) || [])) || {}));
         return {
             status: 'complete',
         };
     });
     return {
-        warnings: bundleRequest.result?.warnings || [],
-        errors: bundleRequest.result?.errors || [],
+        warnings: result?.warnings || [],
+        errors: result?.errors || [],
         imports: imports || new Map(),
     };
 }

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,UAAU,EAAE,gBAAgB,EAAE,WAAW,EAAsB,MAAM,0BAA0B,CAAC;AACzG,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAEtE,OAAO,EAAqB,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAGnF;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,OAMzC;IAMC,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACxE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,GAAG,MAAM,gBAAgB,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC7F,MAAM,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC;IAEvC,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE;QACtC,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,oCAAoC,CAAC,CAAC;KAC9F;IAED,yCAAyC;IACzC,MAAM,iBAAiB,CAAC,UAAU,CAAC,CAAC;IAEpC,qBAAqB;IACrB,MAAM,UAAU,GAAG,MAAM,wBAAwB,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IAE5F,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,EAAE;QACnC,OAAO;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,aAAa,GAAkB;QACnC,EAAE,EAAE,WAAW;QACf,WAAW,EAAE,UAAU,CAAC,IAAI,IAAI,EAAE;QAClC,OAAO,EAAE,UAAU,CAAC,OAAO,IAAI,EAAE;QACjC,WAAW;QACX,UAAU;QACV,UAAU;QACV,QAAQ;QACR,MAAM;KACP,CAAC;IAEF,MAAM,UAAU,CAAC,EAAE,aAAa,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IAExE,yCAAyC;IACzC,IAAI,OAA6C,CAAC;IAElD,MAAM,QAAQ,CAAC,OAAO,CAAC,YAAY,iBAAiB,CAAC,UAAU,CAAC,EAAE,EAAE,KAAK,IAAI,EAAE;QAC7E,OAAO,GAAG,IAAI,GAAG,CACf,MAAM,CAAC,OAAO,CACZ,CAAC,MAAM,WAAW,CAChB,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAClG,CAAC,IAAI,EAAE,CACT,CACF,CAAC;QAEF,OAAO;YACL,MAAM,EAAE,UAAU;SACnB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,QAAQ,EAAE,aAAa,CAAC,MAAM,EAAE,QAAQ,IAAI,EAAE;QAC9C,MAAM,EAAE,aAAa,CAAC,MAAM,EAAE,MAAM,IAAI,EAAE;QAC1C,OAAO,EAAE,OAAO,IAAI,IAAI,GAAG,EAAuB;KACnD,CAAC;AACJ,CAAC","sourcesContent":["import path from 'path';\nimport { getEntriesMapFromPackage } from '@ms-cloudpack/bundler';\nimport { bundleTask, getBundleDetails, findImports, type BundleRequest } from '@ms-cloudpack/api-server';\nimport { prepareOutputPath } from '../../common/prepareOutputPath.js';\nimport type { PackageJson, PackageDefinitionsCache, BundleMessage } from '@ms-cloudpack/bundler-types';\nimport { type TaskReporter, formatPackageName } from '@ms-cloudpack/task-reporter';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\n\n/**\n * Bundle the package and return the imports it depends on.\n */\nexport async function bundleAndGetImports(options: {\n  packages: PackageDefinitionsCache;\n  config: CloudpackConfig;\n  reporter: TaskReporter;\n  packagePath: string;\n  definition: PackageJson;\n}): Promise<{\n  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, config } = options;\n  const { outputLocation, isExternal } = await getBundleDetails({ packagePath }, { packages });\n  const outputPath = outputLocation.path;\n\n  if (!isExternal && !definition.exports) {\n    console.debug(`${path.join(packagePath, 'package.json')} does not have an \"exports\" field.`);\n  }\n\n  // Ensure outputPath exists and is empty.\n  await prepareOutputPath(outputPath);\n\n  // Determine entries.\n  const entriesMap = await getEntriesMapFromPackage({ inputPath: packagePath }, { packages });\n\n  if (!Object.keys(entriesMap).length) {\n    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 bundleRequest: BundleRequest = {\n    id: packagePath,\n    packageName: definition.name || '',\n    version: definition.version || '',\n    packagePath,\n    outputPath,\n    isExternal,\n    packages,\n    config,\n  };\n\n  await bundleTask({ bundleRequest, reporter, options: { force: true } });\n\n  // For each outputFile, find all imports.\n  let imports: Map<string, Set<string>> | undefined;\n\n  await reporter.runTask(`Evaluate ${formatPackageName(definition)}`, async () => {\n    imports = new Map(\n      Object.entries(\n        (await findImports(\n          bundleRequest.result?.outputFiles?.map((file) => path.resolve(outputPath, file.outputPath)) || [],\n        )) || {},\n      ),\n    );\n\n    return {\n      status: 'complete',\n    };\n  });\n\n  return {\n    warnings: bundleRequest.result?.warnings || [],\n    errors: bundleRequest.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,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"]}

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

package/lib/commands/init/init.js

@@ -1,7 +1,7 @@
-import { createPackageDefinitions, readConfig, writeGeneratedConfig } from '@ms-cloudpack/config';
+import { createPartialApiContext } from '../../common/createPartialApiContext.js';
+import { writeGeneratedConfig } from '@ms-cloudpack/config';
 import { rootSpan, stopTelemetry } from '../../initTelemetry.js';
 import { setupReporting } from '../../setupReporting.js';
-import { resolveDependenciesTask } from '../../tasks/resolveDependenciesTask.js';
 import { bundleAndGetImports } from './bundleAndGetImports.js';
 import { InitSummaryData } from './InitSummaryData.js';
 import { evaluateImportsForOverrides } from './evaluateImportsForOverrides.js';
@@ -30,91 +30,93 @@ export async function init(options, context) {
 export async function initInternal(options, context) {
     const { appPath, reporter } = context;
     const summaryData = new InitSummaryData();
-    if (options.check && options.reset) {
-        throw Error('Cannot use --check and --reset together.');
-    }
-    const config = await readConfig(appPath);
-    // If --reset is specified we ignore generated config.
-    if (options.reset) {
-        config.generated = {};
-    }
-    const packages = createPackageDefinitions({ config });
-    const generatedConfig = config.generated;
-    generatedConfig.packageSettings ??= [];
-    // Try to resolve dependencies.
-    const resolveMap = await resolveDependenciesTask({ appPath }, { packages, reporter });
-    if (!resolveMap) {
-        throw new Error("Couldn't resolve dependencies.");
-    }
-    const packagePathsToEvaluate = new Set([appPath]);
-    const evaluatedPackages = new Set();
-    let totalChangeCount = 0;
-    while (packagePathsToEvaluate.size) {
-        const packagePath = packagePathsToEvaluate.values().next().value;
-        packagePathsToEvaluate.delete(packagePath);
-        // Skip already-visited packages.
-        if (!packagePath || evaluatedPackages.has(packagePath)) {
-            continue;
+    const ctx = await createPartialApiContext(context, ['bus', 'taskRunner', 'watcher', 'packages', 'session']);
+    const { packages, session } = ctx;
+    const { resolveMap, config } = session;
+    try {
+        if (options.check && options.reset) {
+            throw Error('Cannot use --check and --reset together.');
         }
-        evaluatedPackages.add(packagePath);
-        const definition = await packages.get(packagePath, { refresh: true });
-        if (!definition) {
-            // This is very weird and probably won't happen.
-            console.error(`Skipping ${packagePath} evaluation because the package.json was not found or not readable.`);
-            continue;
+        // If --reset is specified we ignore generated config.
+        if (options.reset) {
+            config.generated = {};
         }
-        // Bundle the package and find the imports it depends on.
-        const { errors, warnings, imports } = await bundleAndGetImports({
-            packagePath,
-            definition,
-            packages,
-            reporter,
-            config,
-        });
-        // Record the results for the summary.
-        const resultIdentifier = {
-            name: definition.name || '',
-            version: definition.version || '',
-            path: packagePath,
-        };
-        summaryData.recordResult({
-            ...resultIdentifier,
-            errors,
-            warnings,
-        });
-        // If no errors came from the bundle attempt, move on to evaluating the imports.
-        if (errors.length === 0) {
-            // Given the package imports, find the missing exports maps and update packageOverrides.
-            const { changes, errors: evalErrors } = await evaluateImportsForOverrides({
-                definition,
+        const generatedConfig = config.generated;
+        generatedConfig.packageSettings ??= [];
+        const packagePathsToEvaluate = new Set([appPath]);
+        const evaluatedPackages = new Set();
+        let totalChangeCount = 0;
+        while (packagePathsToEvaluate.size) {
+            const packagePath = packagePathsToEvaluate.values().next().value;
+            packagePathsToEvaluate.delete(packagePath);
+            // Skip already-visited packages.
+            if (!packagePath || evaluatedPackages.has(packagePath)) {
+                continue;
+            }
+            evaluatedPackages.add(packagePath);
+            const definition = await packages.get(packagePath, { refresh: true });
+            if (!definition) {
+                // This is very weird and probably won't happen.
+                console.error(`Skipping ${packagePath} evaluation because the package.json was not found or not readable.`);
+                continue;
+            }
+            // Bundle the package and find the imports it depends on.
+            const { errors, warnings, imports } = await bundleAndGetImports({
                 packagePath,
+                definition,
                 packages,
-                packagePathsToEvaluate,
-                evaluatedPackages,
-                imports,
-                generatedConfig,
-                resolveMap,
+                reporter,
+                config,
+                ctx,
             });
-            if (evalErrors.length) {
-                summaryData.recordResult({
-                    ...resultIdentifier,
-                    errors: evalErrors.map((text) => ({ text })),
-                });
-            }
-            else {
-                summaryData.recordGeneratedChanges(changes);
-            }
-            if (options.check && (changes.length || evalErrors.length)) {
-                rootSpan?.addEvent('INIT_CHECK_FAILED', {
-                    reason: changes.length ? 'Config needs to be updated.' : evalErrors,
+            // Record the results for the summary.
+            const resultIdentifier = {
+                name: definition.name || '',
+                version: definition.version || '',
+                path: packagePath,
+            };
+            summaryData.recordResult({
+                ...resultIdentifier,
+                errors,
+                warnings,
+            });
+            // If no errors came from the bundle attempt, move on to evaluating the imports.
+            if (errors.length === 0) {
+                // Given the package imports, find the missing exports maps and update packageOverrides.
+                const { changes, errors: evalErrors } = await evaluateImportsForOverrides({
+                    definition,
+                    packagePath,
+                    packages,
+                    packagePathsToEvaluate,
+                    evaluatedPackages,
+                    imports,
+                    generatedConfig,
+                    resolveMap,
                 });
-                return summaryData.summarize();
+                if (evalErrors.length) {
+                    summaryData.recordResult({
+                        ...resultIdentifier,
+                        errors: evalErrors.map((text) => ({ text })),
+                    });
+                }
+                else {
+                    summaryData.recordGeneratedChanges(changes);
+                }
+                if (options.check && (changes.length || evalErrors.length)) {
+                    rootSpan?.addEvent('INIT_CHECK_FAILED', {
+                        reason: changes.length ? 'Config needs to be updated.' : evalErrors,
+                    });
+                    return summaryData.summarize();
+                }
+                totalChangeCount += changes.length;
             }
-            totalChangeCount += changes.length;
+        }
+        if (totalChangeCount && generatedConfig.packageSettings?.length) {
+            await writeGeneratedConfig(generatedConfig, appPath);
         }
     }
-    if (totalChangeCount && generatedConfig.packageSettings?.length) {
-        await writeGeneratedConfig(generatedConfig, appPath);
+    finally {
+        await ctx.dispose?.();
     }
     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 { createPackageDefinitions, readConfig, writeGeneratedConfig } from '@ms-cloudpack/config';\nimport { rootSpan, stopTelemetry } from '../../initTelemetry.js';\nimport { setupReporting } from '../../setupReporting.js';\nimport { resolveDependenciesTask } from '../../tasks/resolveDependenciesTask.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\n  if (options.check && options.reset) {\n    throw Error('Cannot use --check and --reset together.');\n  }\n\n  const config = await readConfig(appPath);\n\n  // If --reset is specified we ignore generated config.\n  if (options.reset) {\n    config.generated = {};\n  }\n\n  const packages = createPackageDefinitions({ config });\n  const generatedConfig = config.generated;\n\n  generatedConfig.packageSettings ??= [];\n\n  // Try to resolve dependencies.\n  const resolveMap = await resolveDependenciesTask({ appPath }, { packages, reporter });\n\n  if (!resolveMap) {\n    throw new Error(\"Couldn't resolve dependencies.\");\n  }\n\n  const packagePathsToEvaluate = new Set<string>([appPath]);\n  const evaluatedPackages = new Set<string>();\n  let 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    });\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\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 { 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"]}

package/lib/commands/start/start.js

@@ -67,7 +67,7 @@ export async function start(options, context) {
             throw new Error(`The package.json at "${appPath}" did not have a name and/or version.`);
         }
         // Initialize session definition.
-        const session = await createSession({ appPath, config }, { reporter, packages });
+        const session = await createSession({ appPath, config, includeOverlay: true }, { reporter, packages });
         // Set shared telemetry attributes which will be sent with all telemetry events.
         telemetryClient.setSharedSpanAttribute('sessionId', session.id);
         if (options.logResolveMap) {

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

@@ -1 +1 @@
-{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/commands/start/start.ts"],"names":[],"mappings":"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","sourcesContent":["import { writeJson } from '@ms-cloudpack/json-utilities';\nimport { findResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport path from 'path';\nimport { createSession } from '../../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 }, { 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 { 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"]}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/sync/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAGtE,+BAA+B;AAC/B,eAAO,MAAM,IAAI,EAAE,eAWlB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/sync/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAGtE,+BAA+B;AAC/B,eAAO,MAAM,IAAI,EAAE,eAYlB,CAAC"}

package/lib/commands/sync/index.js

@@ -4,6 +4,7 @@ export const init = (command, context) => {
         .command('sync')
         .description('Syncs the packages from/to the remote cache. If the package is not in the local cache, it will be downloaded.')
         .option('--upload', 'Uploads the packages to the remote cache.')
+        .option('--non-interactive-login', 'Disables interactive login prompts for authentication.')
         .action(async (options) => {
         const { sync } = await import('./sync.js');
         await sync(options, context);

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/sync/index.ts"],"names":[],"mappings":"AAGA,+BAA+B;AAC/B,MAAM,CAAC,MAAM,IAAI,GAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;IACxD,OAAO;SACJ,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CACV,+GAA+G,CAChH;SACA,MAAM,CAAC,UAAU,EAAE,2CAA2C,CAAC;SAC/D,MAAM,CAAC,KAAK,EAAE,OAAoB,EAAE,EAAE;QACrC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;QAC3C,MAAM,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;AACP,CAAC,CAAC","sourcesContent":["import type { CommandFunction } from '../../types/CommandFunction.js';\nimport type { SyncOptions } from './types/SyncOptions.js';\n\n/** Defines the \"sync\" verb. */\nexport const init: CommandFunction = (command, context) => {\n  command\n    .command('sync')\n    .description(\n      'Syncs the packages from/to the remote cache. If the package is not in the local cache, it will be downloaded.',\n    )\n    .option('--upload', 'Uploads the packages to the remote cache.')\n    .action(async (options: SyncOptions) => {\n      const { sync } = await import('./sync.js');\n      await sync(options, context);\n    });\n};\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/sync/index.ts"],"names":[],"mappings":"AAGA,+BAA+B;AAC/B,MAAM,CAAC,MAAM,IAAI,GAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;IACxD,OAAO;SACJ,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CACV,+GAA+G,CAChH;SACA,MAAM,CAAC,UAAU,EAAE,2CAA2C,CAAC;SAC/D,MAAM,CAAC,yBAAyB,EAAE,wDAAwD,CAAC;SAC3F,MAAM,CAAC,KAAK,EAAE,OAAoB,EAAE,EAAE;QACrC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;QAC3C,MAAM,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;AACP,CAAC,CAAC","sourcesContent":["import type { CommandFunction } from '../../types/CommandFunction.js';\nimport type { SyncOptions } from './types/SyncOptions.js';\n\n/** Defines the \"sync\" verb. */\nexport const init: CommandFunction = (command, context) => {\n  command\n    .command('sync')\n    .description(\n      'Syncs the packages from/to the remote cache. If the package is not in the local cache, it will be downloaded.',\n    )\n    .option('--upload', 'Uploads the packages to the remote cache.')\n    .option('--non-interactive-login', 'Disables interactive login prompts for authentication.')\n    .action(async (options: SyncOptions) => {\n      const { sync } = await import('./sync.js');\n      await sync(options, context);\n    });\n};\n"]}

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

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

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

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

package/lib/commands/sync/sync.js

@@ -1,24 +1,35 @@
 import { red } from '@ms-cloudpack/task-reporter';
 import { stopTelemetry } from '../../initTelemetry.js';
 import { setupReporting } from '../../setupReporting.js';
-import { createApiServer } from '../../common/createApiServer.js';
-export async function sync({ upload }, context) {
+import { syncDownload, syncUpload } from '@ms-cloudpack/api-server/apis';
+import { createPartialApiContext } from '../../common/createPartialApiContext.js';
+import { isCIBuild } from '../../utilities/isCIBuild.js';
+export async function sync({ upload, nonInteractiveLogin }, context) {
     let hasErrors = false;
     let message = '';
     try {
         await setupReporting(context);
-        const config = context.config.remoteCache;
-        if (!config) {
+        const { config } = context;
+        const remoteCacheConfig = config.remoteCache;
+        if (!remoteCacheConfig) {
             console.warn('Remote cache is not configured. Please add remoteCache to your cloudpack.config.json file to use this feature.');
             return;
         }
-        const { apiServer } = await createApiServer(context);
+        const input = {
+            isInteractiveLogin: !(isCIBuild() || nonInteractiveLogin),
+        };
+        let disposeContext = undefined;
         if (upload) {
-            await apiServer.syncUpload(undefined);
+            const ctx = await createPartialApiContext(context, ['bus', 'taskRunner', 'watcher', 'packages', 'session']);
+            disposeContext = ctx.dispose;
+            await syncUpload({ input, ctx });
         }
         else {
-            await apiServer.syncDownload(undefined);
+            const ctx = await createPartialApiContext(context, ['packages', 'session']);
+            disposeContext = ctx.dispose;
+            await syncDownload({ input, ctx });
         }
+        await disposeContext?.();
         hasErrors = context.reporter.hasErrors();
     }
     catch (error) {

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

@@ -1 +1 @@
-{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../../src/commands/sync/sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,6BAA6B,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAGvD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAElE,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,EAAE,MAAM,EAAe,EAAE,OAAoB;IACtE,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,IAAI,OAAO,GAAW,EAAE,CAAC;IACzB,IAAI;QACF,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC;QAC9B,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC;QAC1C,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,CAAC,IAAI,CACV,gHAAgH,CACjH,CAAC;YACF,OAAO;SACR;QAED,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;QAErD,IAAI,MAAM,EAAE;YACV,MAAM,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;SACvC;aAAM;YACL,MAAM,SAAS,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;SACzC;QAED,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;KAC1C;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,iBAAiB,CAAC;QACrE,SAAS,GAAG,IAAI,CAAC;KAClB;YAAS;QACR,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAC9D,MAAM,aAAa,EAAE,CAAC;QACtB,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACjC;AACH,CAAC","sourcesContent":["import { red } from '@ms-cloudpack/task-reporter';\nimport { stopTelemetry } from '../../initTelemetry.js';\nimport type { TaskContext } from '../../types/TaskContext.js';\nimport type { SyncOptions } from './types/SyncOptions.js';\nimport { setupReporting } from '../../setupReporting.js';\nimport { createApiServer } from '../../common/createApiServer.js';\n\nexport async function sync({ upload }: SyncOptions, context: TaskContext) {\n  let hasErrors = false;\n  let message: string = '';\n  try {\n    await setupReporting(context);\n    const config = context.config.remoteCache;\n    if (!config) {\n      console.warn(\n        'Remote cache is not configured. Please add remoteCache to your cloudpack.config.json file to use this feature.',\n      );\n      return;\n    }\n\n    const { apiServer } = await createApiServer(context);\n\n    if (upload) {\n      await apiServer.syncUpload(undefined);\n    } else {\n      await apiServer.syncDownload(undefined);\n    }\n\n    hasErrors = context.reporter.hasErrors();\n  } catch (error) {\n    message = error instanceof Error ? error.message : '<Unknown error>';\n    hasErrors = true;\n  } finally {\n    context.reporter.complete(hasErrors ? red(message) : message);\n    await stopTelemetry();\n    process.exit(hasErrors ? 1 : 0);\n  }\n}\n"]}
+{"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,GAAW,EAAE,CAAC;IACzB,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 = '';\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"]}

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

@@ -1,4 +1,5 @@
 export interface SyncOptions {
     upload: boolean;
+    nonInteractiveLogin: boolean;
 }
 //# sourceMappingURL=SyncOptions.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"SyncOptions.d.ts","sourceRoot":"","sources":["../../../../src/commands/sync/types/SyncOptions.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,OAAO,CAAC;CACjB"}
+{"version":3,"file":"SyncOptions.d.ts","sourceRoot":"","sources":["../../../../src/commands/sync/types/SyncOptions.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,OAAO,CAAC;IAChB,mBAAmB,EAAE,OAAO,CAAC;CAC9B"}

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

@@ -1 +1 @@
-{"version":3,"file":"SyncOptions.js","sourceRoot":"","sources":["../../../../src/commands/sync/types/SyncOptions.ts"],"names":[],"mappings":"","sourcesContent":["export interface SyncOptions {\n  upload: boolean;\n}\n"]}
+{"version":3,"file":"SyncOptions.js","sourceRoot":"","sources":["../../../../src/commands/sync/types/SyncOptions.ts"],"names":[],"mappings":"","sourcesContent":["export interface SyncOptions {\n  upload: boolean;\n  nonInteractiveLogin: boolean;\n}\n"]}

package/lib/common/createPartialApiContext.d.ts

@@ -0,0 +1,4 @@
+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>;
+//# sourceMappingURL=createPartialApiContext.d.ts.map

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

@@ -0,0 +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"}

package/lib/common/createPartialApiContext.js

@@ -0,0 +1,102 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var _LazyApiContext_bus, _LazyApiContext_watcher, _LazyApiContext_packages, _LazyApiContext_taskRunner, _LazyApiContext_session;
+import { rootSpan } from '../initTelemetry.js';
+class LazyApiContext {
+    constructor(context) {
+        this.context = context;
+        _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 bus() {
+        if (!__classPrivateFieldGet(this, _LazyApiContext_bus, "f")) {
+            const createDataBusLazy = async () => {
+                const { createDataBus } = await import('@ms-cloudpack/data-bus');
+                return createDataBus();
+            };
+            __classPrivateFieldSet(this, _LazyApiContext_bus, createDataBusLazy(), "f");
+        }
+        return __classPrivateFieldGet(this, _LazyApiContext_bus, "f");
+    }
+    get watcher() {
+        if (!__classPrivateFieldGet(this, _LazyApiContext_watcher, "f")) {
+            const createWatcherLazy = async () => {
+                const { createWatcher } = await import('@ms-cloudpack/file-watcher');
+                return createWatcher();
+            };
+            __classPrivateFieldSet(this, _LazyApiContext_watcher, createWatcherLazy(), "f");
+        }
+        return __classPrivateFieldGet(this, _LazyApiContext_watcher, "f");
+    }
+    get reporter() {
+        return Promise.resolve(this.context.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 });
+            };
+            __classPrivateFieldSet(this, _LazyApiContext_packages, createPackageDefinitionsLazy(), "f");
+        }
+        return __classPrivateFieldGet(this, _LazyApiContext_packages, "f");
+    }
+    get taskRunner() {
+        if (!__classPrivateFieldGet(this, _LazyApiContext_taskRunner, "f")) {
+            const createTaskRunnerLazy = async () => {
+                const { TaskRunner } = await import('@ms-cloudpack/api-server');
+                return new TaskRunner();
+            };
+            __classPrivateFieldSet(this, _LazyApiContext_taskRunner, createTaskRunnerLazy(), "f");
+        }
+        return __classPrivateFieldGet(this, _LazyApiContext_taskRunner, "f");
+    }
+    get session() {
+        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 });
+            };
+            __classPrivateFieldSet(this, _LazyApiContext_session, createSessionLazy(), "f");
+        }
+        return __classPrivateFieldGet(this, _LazyApiContext_session, "f");
+    }
+    async dispose() {
+        if (__classPrivateFieldGet(this, _LazyApiContext_watcher, "f")) {
+            const watcher = await __classPrivateFieldGet(this, _LazyApiContext_watcher, "f");
+            await watcher.unwatchAll();
+        }
+    }
+}
+_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);
+    const result = {
+        reporter,
+        rootSpan,
+        dispose: () => {
+            return lazyContext.dispose();
+        },
+    };
+    for (const item of items) {
+        result[item] = (await lazyContext[item]);
+    }
+    return result;
+}
+//# sourceMappingURL=createPartialApiContext.js.map

package/lib/common/createPartialApiContext.js.map

@@ -0,0 +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"]}

package/lib/common/createSession.d.ts

@@ -5,6 +5,7 @@ import type { CloudpackConfig } from '@ms-cloudpack/config';
 export declare function createSession(options: {
     appPath: string;
     config: CloudpackConfig;
+    includeOverlay?: boolean;
 }, context: {
     reporter: TaskReporter;
     packages: PackageDefinitionsCache;

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

@@ -1 +1 @@
-{"version":3,"file":"createSession.d.ts","sourceRoot":"","sources":["../../src/common/createSession.ts"],"names":[],"mappings":"AACA,OAAO,EAAqB,KAAK,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAO3E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAC3E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAK5D,wBAAsB,aAAa,CACjC,OAAO,EAAE;IACP,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,eAAe,CAAC;CACzB,EACD,OAAO,EAAE;IAAE,QAAQ,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,uBAAuB,CAAA;CAAE,GACrE,OAAO,CAAC,OAAO,CAAC,CA0DlB"}
+{"version":3,"file":"createSession.d.ts","sourceRoot":"","sources":["../../src/common/createSession.ts"],"names":[],"mappings":"AACA,OAAO,EAAqB,KAAK,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAO3E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAC3E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAK5D,wBAAsB,aAAa,CACjC,OAAO,EAAE;IACP,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,eAAe,CAAC;IACxB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,EACD,OAAO,EAAE;IAAE,QAAQ,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,uBAAuB,CAAA;CAAE,GACrE,OAAO,CAAC,OAAO,CAAC,CA0DlB"}

package/lib/common/createSession.js

@@ -6,15 +6,15 @@ import fsExtra from 'fs-extra';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import { resolveDependenciesTask } from '../tasks/resolveDependenciesTask.js';
-const dashboardPackageName = '@ms-cloudpack/overlay';
-const dashboardPackagePath = (await resolve(dashboardPackageName, path.dirname(fileURLToPath(import.meta.url)))) || '';
+const overlayPackageName = '@ms-cloudpack/overlay';
+const overlayPackagePath = (await resolve(overlayPackageName, path.dirname(fileURLToPath(import.meta.url)))) || '';
 export async function createSession(options, context) {
-    const { appPath, config } = options;
+    const { appPath, config, includeOverlay } = options;
     const projectName = path.basename(appPath);
     const id = uuid();
     const resolveMap = await resolveDependenciesTask({
         appPath,
-        additionalPaths: [dashboardPackagePath],
+        additionalPaths: includeOverlay ? [overlayPackagePath] : [],
     }, context);
     if (!resolveMap) {
         throw new Error('Could not resolve dependencies.');

package/lib/common/createSession.js.map

@@ -1 +1 @@
-{"version":3,"file":"createSession.js","sourceRoot":"","sources":["../../src/common/createSession.ts"],"names":[],"mappings":"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","sourcesContent":["import { v4 as uuid } from 'uuid';\nimport { getLocalCachePath, type Session } from '@ms-cloudpack/api-server';\nimport { resolve, type ImportMap } from '@ms-cloudpack/package-utilities';\nimport fs from 'fs';\nimport fsExtra from 'fs-extra';\nimport path from 'path';\nimport { fileURLToPath } from 'url';\nimport { resolveDependenciesTask } from '../tasks/resolveDependenciesTask.js';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\n\nconst dashboardPackageName = '@ms-cloudpack/overlay';\nconst dashboardPackagePath = (await resolve(dashboardPackageName, path.dirname(fileURLToPath(import.meta.url)))) || '';\n\nexport async function createSession(\n  options: {\n    appPath: string;\n    config: CloudpackConfig;\n  },\n  context: { reporter: TaskReporter; packages: PackageDefinitionsCache },\n): Promise<Session> {\n  const { appPath, config } = options;\n\n  const projectName = path.basename(appPath);\n  const id = uuid();\n  const resolveMap = await resolveDependenciesTask(\n    {\n      appPath,\n      additionalPaths: [dashboardPackagePath],\n    },\n    context,\n  );\n\n  if (!resolveMap) {\n    throw new Error('Could not resolve dependencies.');\n  }\n\n  let importMap: ImportMap | undefined = undefined;\n  let sessionVersion = 0;\n\n  await fsExtra.ensureDir(getLocalCachePath(appPath));\n  const targetVersionsPath = path.join(getLocalCachePath(appPath), 'targetVersions.json');\n  const fileExists = await fsExtra.pathExists(targetVersionsPath);\n  if (!fileExists) {\n    await fsExtra.writeJson(targetVersionsPath, {}, { spaces: 2 });\n  }\n  const targetVersions = (await fsExtra.readJSON(targetVersionsPath)) as Record<string, number>;\n\n  return {\n    id,\n    appPath,\n    config,\n    projectName,\n    type: 'web-app',\n    mode: 'library',\n    resolveMap,\n    sequence: 0,\n    targetVersions,\n    getSessionVersion: () => sessionVersion,\n    incrementSessionVersion: (version?: number) => {\n      if (version === undefined || version > sessionVersion) {\n        sessionVersion = version ?? sessionVersion + 1;\n        importMap = undefined;\n      }\n    },\n    incrementTargetVersion: (inputPath: string) => {\n      targetVersions[inputPath] ??= 0;\n      targetVersions[inputPath]++;\n      importMap = undefined;\n      // eslint-disable-next-line no-restricted-syntax -- this function can't be async\n      fs.writeFileSync(targetVersionsPath, JSON.stringify(targetVersions, null, 2));\n    },\n    getImportMap: () => importMap,\n    setImportMap: (newImportMap: ImportMap) => {\n      importMap = newImportMap;\n      return importMap;\n    },\n  };\n}\n"]}
+{"version":3,"file":"createSession.js","sourceRoot":"","sources":["../../src/common/createSession.ts"],"names":[],"mappings":"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","sourcesContent":["import { v4 as uuid } from 'uuid';\nimport { getLocalCachePath, type Session } from '@ms-cloudpack/api-server';\nimport { resolve, type ImportMap } from '@ms-cloudpack/package-utilities';\nimport fs from 'fs';\nimport fsExtra from 'fs-extra';\nimport path from 'path';\nimport { fileURLToPath } from 'url';\nimport { resolveDependenciesTask } from '../tasks/resolveDependenciesTask.js';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\n\nconst overlayPackageName = '@ms-cloudpack/overlay';\nconst overlayPackagePath = (await resolve(overlayPackageName, path.dirname(fileURLToPath(import.meta.url)))) || '';\n\nexport async function createSession(\n  options: {\n    appPath: string;\n    config: CloudpackConfig;\n    includeOverlay?: boolean;\n  },\n  context: { reporter: TaskReporter; packages: PackageDefinitionsCache },\n): Promise<Session> {\n  const { appPath, config, includeOverlay } = options;\n\n  const projectName = path.basename(appPath);\n  const id = uuid();\n  const resolveMap = await resolveDependenciesTask(\n    {\n      appPath,\n      additionalPaths: includeOverlay ? [overlayPackagePath] : [],\n    },\n    context,\n  );\n\n  if (!resolveMap) {\n    throw new Error('Could not resolve dependencies.');\n  }\n\n  let importMap: ImportMap | undefined = undefined;\n  let sessionVersion = 0;\n\n  await fsExtra.ensureDir(getLocalCachePath(appPath));\n  const targetVersionsPath = path.join(getLocalCachePath(appPath), 'targetVersions.json');\n  const fileExists = await fsExtra.pathExists(targetVersionsPath);\n  if (!fileExists) {\n    await fsExtra.writeJson(targetVersionsPath, {}, { spaces: 2 });\n  }\n  const targetVersions = (await fsExtra.readJSON(targetVersionsPath)) as Record<string, number>;\n\n  return {\n    id,\n    appPath,\n    config,\n    projectName,\n    type: 'web-app',\n    mode: 'library',\n    resolveMap,\n    sequence: 0,\n    targetVersions,\n    getSessionVersion: () => sessionVersion,\n    incrementSessionVersion: (version?: number) => {\n      if (version === undefined || version > sessionVersion) {\n        sessionVersion = version ?? sessionVersion + 1;\n        importMap = undefined;\n      }\n    },\n    incrementTargetVersion: (inputPath: string) => {\n      targetVersions[inputPath] ??= 0;\n      targetVersions[inputPath]++;\n      importMap = undefined;\n      // eslint-disable-next-line no-restricted-syntax -- this function can't be async\n      fs.writeFileSync(targetVersionsPath, JSON.stringify(targetVersions, null, 2));\n    },\n    getImportMap: () => importMap,\n    setImportMap: (newImportMap: ImportMap) => {\n      importMap = newImportMap;\n      return importMap;\n    },\n  };\n}\n"]}

package/lib/setupReporting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setupReporting.d.ts","sourceRoot":"","sources":["../src/setupReporting.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAmB1D,wBAAsB,cAAc,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,WAAW,8DA6B9E"}
+{"version":3,"file":"setupReporting.d.ts","sourceRoot":"","sources":["../src/setupReporting.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAoB1D,wBAAsB,cAAc,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,WAAW,8DA6B9E"}

package/lib/setupReporting.js

@@ -3,6 +3,7 @@ import { initTelemetry } from './initTelemetry.js';
 import { bold, defaultLoggingConfig, verboseLoggingConfig, debugLoggingConfig, } from '@ms-cloudpack/task-reporter';
 import { readJson } from '@ms-cloudpack/json-utilities';
 import path from 'path';
+import { isCIBuild } from './utilities/isCIBuild.js';
 const { argv } = process;
 const useDebugLogging = argv.includes('--debug') || argv.includes('-d');
 const verb = argv[2];
@@ -26,7 +27,7 @@ export async function setupReporting({ reporter, config, appPath }) {
         sharedSpanAttributes: {
             verb,
             arguments: argv.slice(3).join(' '),
-            environment: process.env.CI || process.env.TF_BUILD ? 'ci' : 'local',
+            environment: isCIBuild() ? 'ci' : 'local',
             appName: definition?.name || '<unknown>',
         },
     }, reporter);

package/lib/setupReporting.js.map

@@ -1 +1 @@
-{"version":3,"file":"setupReporting.js","sourceRoot":"","sources":["../src/setupReporting.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EACL,IAAI,EACJ,oBAAoB,EACpB,oBAAoB,EAEpB,kBAAkB,GACnB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;AACzB,MAAM,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AACxE,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;AACrB,MAAM,iBAAiB,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,QAAQ,CAAC;AACjG,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAE5C,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAe;IAC7E,QAAQ,CAAC,UAAU,CAAC;QAClB,WAAW,EAAE,WAAW;QACxB,OAAO;QACP,WAAW,EAAE,GAAG,EAAE,CAAC,YAAY,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG;QAC/D,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,GAAG,oBAAoB;QACvB,GAAG,CAAC,iBAAiB,IAAI,oBAAoB,CAAC;QAC9C,GAAG,CAAC,eAAe,IAAI,kBAAkB,CAAC;KACpB,CAAC,CAAC;IAE1B,MAAM,UAAU,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAgB,CAAC;IAEvF,MAAM,eAAe,GAAG,MAAM,aAAa,CACzC;QACE,eAAe;QACf,iBAAiB;QACjB,eAAe,EAAE,MAAM,CAAC,SAAS;QACjC,oBAAoB,EAAE;YACpB,IAAI;YACJ,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;YAClC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO;YACpE,OAAO,EAAE,UAAU,EAAE,IAAI,IAAI,WAAW;SACzC;KACF,EACD,QAAQ,CACT,CAAC;IAEF,OAAO,eAAe,CAAC;AACzB,CAAC","sourcesContent":["import { getVersion } from '@ms-cloudpack/package-utilities';\nimport type { TaskContext } from './types/TaskContext.js';\nimport { initTelemetry } from './initTelemetry.js';\nimport {\n  bold,\n  defaultLoggingConfig,\n  verboseLoggingConfig,\n  type TaskReporterOptions,\n  debugLoggingConfig,\n} from '@ms-cloudpack/task-reporter';\nimport { readJson } from '@ms-cloudpack/json-utilities';\nimport path from 'path';\nimport type { PackageJson } from '@ms-cloudpack/bundler-types';\n\nconst { argv } = process;\nconst useDebugLogging = argv.includes('--debug') || argv.includes('-d');\nconst verb = argv[2];\nconst useVerboseLogging = argv.includes('--verbose') || argv.includes('-v') || verb === 'bundle';\nconst version = getVersion(import.meta.url);\n\nexport async function setupReporting({ reporter, config, appPath }: TaskContext) {\n  reporter.setOptions({\n    productName: 'Cloudpack',\n    version,\n    description: () => `Running \"${bold(argv.slice(2).join(' '))}\"`,\n    helpMessage: config.helpMessage,\n    ...defaultLoggingConfig,\n    ...(useVerboseLogging && verboseLoggingConfig),\n    ...(useDebugLogging && debugLoggingConfig),\n  } as TaskReporterOptions);\n\n  const definition = (await readJson(path.join(appPath, 'package.json'))) as PackageJson;\n\n  const telemetryClient = await initTelemetry(\n    {\n      useDebugLogging,\n      useVerboseLogging,\n      telemetryConfig: config.telemetry,\n      sharedSpanAttributes: {\n        verb,\n        arguments: argv.slice(3).join(' '),\n        environment: process.env.CI || process.env.TF_BUILD ? 'ci' : 'local',\n        appName: definition?.name || '<unknown>',\n      },\n    },\n    reporter,\n  );\n\n  return telemetryClient;\n}\n"]}
+{"version":3,"file":"setupReporting.js","sourceRoot":"","sources":["../src/setupReporting.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EACL,IAAI,EACJ,oBAAoB,EACpB,oBAAoB,EAEpB,kBAAkB,GACnB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAErD,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;AACzB,MAAM,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AACxE,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;AACrB,MAAM,iBAAiB,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,QAAQ,CAAC;AACjG,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAE5C,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAe;IAC7E,QAAQ,CAAC,UAAU,CAAC;QAClB,WAAW,EAAE,WAAW;QACxB,OAAO;QACP,WAAW,EAAE,GAAG,EAAE,CAAC,YAAY,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG;QAC/D,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,GAAG,oBAAoB;QACvB,GAAG,CAAC,iBAAiB,IAAI,oBAAoB,CAAC;QAC9C,GAAG,CAAC,eAAe,IAAI,kBAAkB,CAAC;KACpB,CAAC,CAAC;IAE1B,MAAM,UAAU,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAgB,CAAC;IAEvF,MAAM,eAAe,GAAG,MAAM,aAAa,CACzC;QACE,eAAe;QACf,iBAAiB;QACjB,eAAe,EAAE,MAAM,CAAC,SAAS;QACjC,oBAAoB,EAAE;YACpB,IAAI;YACJ,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;YAClC,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO;YACzC,OAAO,EAAE,UAAU,EAAE,IAAI,IAAI,WAAW;SACzC;KACF,EACD,QAAQ,CACT,CAAC;IAEF,OAAO,eAAe,CAAC;AACzB,CAAC","sourcesContent":["import { getVersion } from '@ms-cloudpack/package-utilities';\nimport type { TaskContext } from './types/TaskContext.js';\nimport { initTelemetry } from './initTelemetry.js';\nimport {\n  bold,\n  defaultLoggingConfig,\n  verboseLoggingConfig,\n  type TaskReporterOptions,\n  debugLoggingConfig,\n} from '@ms-cloudpack/task-reporter';\nimport { readJson } from '@ms-cloudpack/json-utilities';\nimport path from 'path';\nimport type { PackageJson } from '@ms-cloudpack/bundler-types';\nimport { isCIBuild } from './utilities/isCIBuild.js';\n\nconst { argv } = process;\nconst useDebugLogging = argv.includes('--debug') || argv.includes('-d');\nconst verb = argv[2];\nconst useVerboseLogging = argv.includes('--verbose') || argv.includes('-v') || verb === 'bundle';\nconst version = getVersion(import.meta.url);\n\nexport async function setupReporting({ reporter, config, appPath }: TaskContext) {\n  reporter.setOptions({\n    productName: 'Cloudpack',\n    version,\n    description: () => `Running \"${bold(argv.slice(2).join(' '))}\"`,\n    helpMessage: config.helpMessage,\n    ...defaultLoggingConfig,\n    ...(useVerboseLogging && verboseLoggingConfig),\n    ...(useDebugLogging && debugLoggingConfig),\n  } as TaskReporterOptions);\n\n  const definition = (await readJson(path.join(appPath, 'package.json'))) as PackageJson;\n\n  const telemetryClient = await initTelemetry(\n    {\n      useDebugLogging,\n      useVerboseLogging,\n      telemetryConfig: config.telemetry,\n      sharedSpanAttributes: {\n        verb,\n        arguments: argv.slice(3).join(' '),\n        environment: isCIBuild() ? 'ci' : 'local',\n        appName: definition?.name || '<unknown>',\n      },\n    },\n    reporter,\n  );\n\n  return telemetryClient;\n}\n"]}

package/lib/utilities/isCIBuild.d.ts

@@ -0,0 +1,5 @@
+/**
+ * @returns true if the current process is running in a CI environment
+ */
+export declare function isCIBuild(): string | undefined;
+//# sourceMappingURL=isCIBuild.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"isCIBuild.d.ts","sourceRoot":"","sources":["../../src/utilities/isCIBuild.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,wBAAgB,SAAS,uBAExB"}

package/lib/utilities/isCIBuild.js

@@ -0,0 +1,7 @@
+/**
+ * @returns true if the current process is running in a CI environment
+ */
+export function isCIBuild() {
+    return process.env.CI || process.env.TF_BUILD;
+}
+//# sourceMappingURL=isCIBuild.js.map

package/lib/utilities/isCIBuild.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"isCIBuild.js","sourceRoot":"","sources":["../../src/utilities/isCIBuild.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,UAAU,SAAS;IACvB,OAAO,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;AAChD,CAAC","sourcesContent":["/**\n * @returns true if the current process is running in a CI environment\n */\nexport function isCIBuild() {\n  return process.env.CI || process.env.TF_BUILD;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/cli",
-  "version": "0.43.1",
+  "version": "0.44.0",
   "description": "The Cloudpack command line interface - a tool for managing fast inner and outer looping in web apps.",
   "license": "MIT",
   "type": "module",
@@ -11,13 +11,15 @@
   },
   "dependencies": {
     "@lage-run/target-graph": "^0.8.6",
-    "@ms-cloudpack/api-server": "^0.13.3",
-    "@ms-cloudpack/bundler": "^0.14.8",
-    "@ms-cloudpack/config": "^0.11.1",
+    "@ms-cloudpack/api-server": "^0.14.0",
+    "@ms-cloudpack/bundler": "^0.14.9",
+    "@ms-cloudpack/config": "^0.11.2",
     "@ms-cloudpack/create-express-app": "^1.3.9",
+    "@ms-cloudpack/data-bus": "^0.4.0",
+    "@ms-cloudpack/file-watcher": "^0.0.3",
     "@ms-cloudpack/json-utilities": "^0.0.7",
-    "@ms-cloudpack/overlay": "^0.14.7",
-    "@ms-cloudpack/package-utilities": "^5.1.1",
+    "@ms-cloudpack/overlay": "^0.14.9",
+    "@ms-cloudpack/package-utilities": "^5.1.2",
     "@ms-cloudpack/path-string-parsing": "^1.0.3",
     "@ms-cloudpack/path-utilities": "^2.3.2",
     "@ms-cloudpack/task-reporter": "^0.7.2",

package/lib/common/createApiServer.d.ts

@@ -1,122 +0,0 @@
-import type { TaskContext } from '../types/TaskContext.js';
-export declare function createApiServer(context: TaskContext): Promise<{
-    apiServer: {
-        url: string;
-        port: number;
-        ctx: {
-            session: import("@ms-cloudpack/api-server").Session;
-            bus: import("@ms-cloudpack/data-bus").DataBus;
-            rootSpan: import("@opentelemetry/api").Span | undefined;
-            reporter: import("@ms-cloudpack/task-reporter").TaskReporter;
-            watcher: {
-                watch({ path, watchPaths, }: {
-                    path: string;
-                    watchPaths?: string[] | undefined;
-                }, onPackageChanged: () => void): () => Promise<void>;
-                unwatchAll(): Promise<void>;
-            };
-            packages: import("@ms-cloudpack/bundler-types").PackageDefinitionsCache;
-            taskRunner: import("@ms-cloudpack/api-server").TaskRunner;
-            dispose(): Promise<void>;
-        };
-        close: () => Promise<void>;
-        addPackageOverride: (options: {
-            packageName: string;
-            importPath: string;
-            filename?: string | undefined;
-        }) => Promise<void>;
-        getData: (options: {
-            path: string[];
-        }) => any;
-        getSessionId: (options: unknown) => string | undefined;
-        onDataChanged: (options: {
-            path: string[];
-        }) => any;
-        openCodeEditor: (options: {
-            rootPath: string;
-            relativePath?: string | undefined;
-            line?: number | undefined;
-            column?: number | undefined;
-        }) => Promise<void>;
-        openConfigEditor: (options: unknown) => Promise<void>;
-        openFilePath: (options: {
-            rootPath: string;
-            relativePath?: string | undefined;
-        }) => Promise<void>;
-        reportMetric: (options: {
-            metric: string;
-            value: number;
-        }) => void;
-        validatePackageOverride: (options: {
-            packageName: string;
-            importPath: string;
-        }) => Promise<{
-            fixable: boolean;
-        }>;
-        syncDownload: (options: unknown) => Promise<void>;
-        syncUpload: (options: unknown) => Promise<void>;
-        ensurePackageBundled: (options: {
-            name: string;
-            version: string;
-            outputPath?: string | undefined;
-            bundlerType?: string | undefined;
-            disableSourceMaps?: boolean | undefined;
-            shouldRerun?: boolean | undefined;
-            shouldWatch?: boolean | undefined;
-            shouldForce?: boolean | undefined;
-        }) => Promise<{
-            bundlerName?: string | undefined;
-            inputPath?: string | undefined;
-            outputPath?: string | undefined;
-            entries?: Record<string, string> | undefined;
-            dependencies?: string[] | undefined;
-            hash?: string | undefined;
-            outputFiles?: {
-                outputPath: string;
-                entryPoint?: string | undefined;
-                exports?: string[] | undefined;
-            }[] | undefined;
-            errors?: {
-                text: string;
-                pluginName?: string | undefined;
-                type?: string | undefined;
-                location?: {
-                    line: number;
-                    column: number;
-                    file: string;
-                } | undefined;
-                notes?: {
-                    text?: string | undefined;
-                    location?: {
-                        line: number;
-                        column: number;
-                        file: string;
-                    } | undefined;
-                }[] | undefined;
-            }[] | undefined;
-            warnings?: {
-                text: string;
-                pluginName?: string | undefined;
-                type?: string | undefined;
-                location?: {
-                    line: number;
-                    column: number;
-                    file: string;
-                } | undefined;
-                notes?: {
-                    text?: string | undefined;
-                    location?: {
-                        line: number;
-                        column: number;
-                        file: string;
-                    } | undefined;
-                }[] | undefined;
-            }[] | undefined;
-            rawInput?: Record<string, unknown> | undefined;
-            rawOutput?: Record<string, unknown> | undefined;
-        }>;
-    };
-    packages: import("@ms-cloudpack/bundler-types").PackageDefinitionsCache;
-    session: import("@ms-cloudpack/api-server").Session;
-}>;
-//# sourceMappingURL=createApiServer.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"createApiServer.d.ts","sourceRoot":"","sources":["../../src/common/createApiServer.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG3D,wBAAsB,eAAe,CAAC,OAAO,EAAE,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkBzD"}

package/lib/common/createApiServer.js

@@ -1,18 +0,0 @@
-import { rootSpan } from '../initTelemetry.js';
-import { createPackageDefinitions } from '@ms-cloudpack/config';
-import { createSession } from './createSession.js';
-export async function createApiServer(context) {
-    const { appPath, config, reporter } = context;
-    // Initialize package overrides.
-    const packages = createPackageDefinitions({ config });
-    // Initialize session definition.
-    const session = await createSession({ appPath, config }, { reporter, packages });
-    const { createCloudpackServer } = await import('@ms-cloudpack/api-server');
-    const apiServer = await createCloudpackServer({ session, rootSpan, reporter, packages });
-    return {
-        apiServer,
-        packages,
-        session,
-    };
-}
-//# sourceMappingURL=createApiServer.js.map

package/lib/common/createApiServer.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"createApiServer.js","sourceRoot":"","sources":["../../src/common/createApiServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAEhE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,OAAoB;IACxD,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAE9C,gCAAgC;IAChC,MAAM,QAAQ,GAAG,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAEtD,iCAAiC;IACjC,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEjF,MAAM,EAAE,qBAAqB,EAAE,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC;IAE3E,MAAM,SAAS,GAAG,MAAM,qBAAqB,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEzF,OAAO;QACL,SAAS;QACT,QAAQ;QACR,OAAO;KACR,CAAC;AACJ,CAAC","sourcesContent":["import { rootSpan } from '../initTelemetry.js';\nimport { createPackageDefinitions } from '@ms-cloudpack/config';\nimport type { TaskContext } from '../types/TaskContext.js';\nimport { createSession } from './createSession.js';\n\nexport async function createApiServer(context: TaskContext) {\n  const { appPath, config, reporter } = context;\n\n  // Initialize package overrides.\n  const packages = createPackageDefinitions({ config });\n\n  // Initialize session definition.\n  const session = await createSession({ appPath, config }, { reporter, packages });\n\n  const { createCloudpackServer } = await import('@ms-cloudpack/api-server');\n\n  const apiServer = await createCloudpackServer({ session, rootSpan, reporter, packages });\n\n  return {\n    apiServer,\n    packages,\n    session,\n  };\n}\n"]}