@ms-cloudpack/cli 0.39.10 → 0.39.12

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

@@ -1,3 +1,6 @@
 import type { BundleOptions } from './types/BundleOptions.js';
-export declare function bundle(options?: BundleOptions): Promise<void>;
+import type { TaskReporter } from '@ms-cloudpack/task-reporter';
+export declare function bundle(options: BundleOptions, { reporter }: {
+    reporter: TaskReporter;
+}): Promise<void>;
 //# sourceMappingURL=bundle.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../../src/commands/bundle/bundle.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAK9D,wBAAsB,MAAM,CAAC,OAAO,CAAC,EAAE,aAAa,iBAwBnD"}
+{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../../src/commands/bundle/bundle.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAG9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,wBAAsB,MAAM,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE,QAAQ,EAAE,EAAE;IAAE,QAAQ,EAAE,YAAY,CAAA;CAAE,iBAyB5F"}

package/lib/commands/bundle/bundle.js

@@ -1,8 +1,7 @@
 import { bundleTask } from '../../tasks/bundleTask.js';
 import path from 'path';
 import { PackageDefinitions } from '@ms-cloudpack/package-utilities';
-import { reporter } from '../../reporter.js';
-export async function bundle(options) {
+export async function bundle(options, { reporter }) {
     const { bundler: bundlerType, outdir = 'dist/browser-esm', disableSourceMaps } = options || {};
     const packagePath = process.cwd();
     const definition = await PackageDefinitions.getInstance().get(packagePath);

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

@@ -1 +1 @@
-{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../../src/commands/bundle/bundle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAG7C,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,OAAuB;IAClD,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,GAAG,kBAAkB,EAAE,iBAAiB,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IAC/F,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAClC,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC3E,MAAM,EAAE,IAAI,GAAG,SAAS,EAAE,OAAO,GAAG,OAAO,EAAE,GAAG,UAAU,IAAI,EAAE,CAAC;IACjE,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IACrD,MAAM,aAAa,GAAkB;QACnC,EAAE,EAAE,QAAQ;QACZ,WAAW,EAAE,IAAI;QACjB,OAAO;QACP,WAAW;QACX,UAAU;QACV,UAAU,EAAE,IAAI;QAChB,WAAW;QACX,iBAAiB;KAClB,CAAC;IAEF,MAAM,UAAU,CAAC;QACf,aAAa;QACb,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;KACzB,CAAC,CAAC;IAEH,QAAQ,CAAC,QAAQ,EAAE,CAAC;IACpB,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACnE,CAAC","sourcesContent":["import { bundleTask } from '../../tasks/bundleTask.js';\nimport path from 'path';\nimport type { BundleOptions } from './types/BundleOptions.js';\nimport { PackageDefinitions } from '@ms-cloudpack/package-utilities';\nimport { reporter } from '../../reporter.js';\nimport type { BundleRequest } from '../../types/BundleRequest.js';\n\nexport async function bundle(options?: BundleOptions) {\n  const { bundler: bundlerType, outdir = 'dist/browser-esm', disableSourceMaps } = options || {};\n  const packagePath = process.cwd();\n  const definition = await PackageDefinitions.getInstance().get(packagePath);\n  const { name = 'unknown', version = '0.0.0' } = definition || {};\n  const outputPath = path.resolve(packagePath, outdir);\n  const bundleRequest: BundleRequest = {\n    id: 'bundle',\n    packageName: name,\n    version,\n    packagePath,\n    outputPath,\n    isExternal: true,\n    bundlerType,\n    disableSourceMaps,\n  };\n\n  await bundleTask({\n    bundleRequest,\n    options: { force: true },\n  });\n\n  reporter.complete();\n  process.exit(bundleRequest.result?.errors?.length === 0 ? 0 : 1);\n}\n"]}
+{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../../src/commands/bundle/bundle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAIrE,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,OAAsB,EAAE,EAAE,QAAQ,EAA8B;IAC3F,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,GAAG,kBAAkB,EAAE,iBAAiB,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IAC/F,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAClC,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC3E,MAAM,EAAE,IAAI,GAAG,SAAS,EAAE,OAAO,GAAG,OAAO,EAAE,GAAG,UAAU,IAAI,EAAE,CAAC;IACjE,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IACrD,MAAM,aAAa,GAAkB;QACnC,EAAE,EAAE,QAAQ;QACZ,WAAW,EAAE,IAAI;QACjB,OAAO;QACP,WAAW;QACX,UAAU;QACV,UAAU,EAAE,IAAI;QAChB,WAAW;QACX,iBAAiB;KAClB,CAAC;IAEF,MAAM,UAAU,CAAC;QACf,aAAa;QACb,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;KACzB,CAAC,CAAC;IAEH,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAEpB,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACnE,CAAC","sourcesContent":["import { bundleTask } from '../../tasks/bundleTask.js';\nimport path from 'path';\nimport type { BundleOptions } from './types/BundleOptions.js';\nimport { PackageDefinitions } from '@ms-cloudpack/package-utilities';\nimport type { BundleRequest } from '../../types/BundleRequest.js';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\n\nexport async function bundle(options: BundleOptions, { reporter }: { reporter: TaskReporter }) {\n  const { bundler: bundlerType, outdir = 'dist/browser-esm', disableSourceMaps } = options || {};\n  const packagePath = process.cwd();\n  const definition = await PackageDefinitions.getInstance().get(packagePath);\n  const { name = 'unknown', version = '0.0.0' } = definition || {};\n  const outputPath = path.resolve(packagePath, outdir);\n  const bundleRequest: BundleRequest = {\n    id: 'bundle',\n    packageName: name,\n    version,\n    packagePath,\n    outputPath,\n    isExternal: true,\n    bundlerType,\n    disableSourceMaps,\n  };\n\n  await bundleTask({\n    bundleRequest,\n    options: { force: true },\n  });\n\n  reporter.complete();\n\n  process.exit(bundleRequest.result?.errors?.length === 0 ? 0 : 1);\n}\n"]}

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

@@ -1,3 +1,3 @@
-import type { Command } from 'commander';
-export declare function init(command: Command): void;
+import type { CommandFunction } from '../../types/CommandFunction.js';
+export declare const init: CommandFunction;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/bundle/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIzC,wBAAgB,IAAI,CAAC,OAAO,EAAE,OAAO,QAOpC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/bundle/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEtE,eAAO,MAAM,IAAI,EAAE,eAOlB,CAAC"}

package/lib/commands/bundle/index.js

@@ -1,10 +1,10 @@
 import { bundle } from './bundle.js';
-export function init(command) {
+export const init = ({ command, reporter }) => {
     command
         .command('bundle')
         .option('--bundler <name>', 'Forces use of a specific bundler.')
         .option('--outdir <path>', 'Path to drop the bundle output, relative to current path.')
         .description('Bundles a package.')
-        .action((options) => bundle(options));
-}
+        .action((bundleOptions) => bundle(bundleOptions, { reporter }));
+};
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/bundle/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAGrC,MAAM,UAAU,IAAI,CAAC,OAAgB;IACnC,OAAO;SACJ,OAAO,CAAC,QAAQ,CAAC;SACjB,MAAM,CAAC,kBAAkB,EAAE,mCAAmC,CAAC;SAC/D,MAAM,CAAC,iBAAiB,EAAE,2DAA2D,CAAC;SACtF,WAAW,CAAC,oBAAoB,CAAC;SACjC,MAAM,CAAC,CAAC,OAAsB,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;AACzD,CAAC","sourcesContent":["import type { Command } from 'commander';\nimport { bundle } from './bundle.js';\nimport type { BundleOptions } from './types/BundleOptions.js';\n\nexport function init(command: Command) {\n  command\n    .command('bundle')\n    .option('--bundler <name>', 'Forces use of a specific bundler.')\n    .option('--outdir <path>', 'Path to drop the bundle output, relative to current path.')\n    .description('Bundles a package.')\n    .action((options: BundleOptions) => bundle(options));\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/bundle/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAIrC,MAAM,CAAC,MAAM,IAAI,GAAoB,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC7D,OAAO;SACJ,OAAO,CAAC,QAAQ,CAAC;SACjB,MAAM,CAAC,kBAAkB,EAAE,mCAAmC,CAAC;SAC/D,MAAM,CAAC,iBAAiB,EAAE,2DAA2D,CAAC;SACtF,WAAW,CAAC,oBAAoB,CAAC;SACjC,MAAM,CAAC,CAAC,aAA4B,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;AACnF,CAAC,CAAC","sourcesContent":["import { bundle } from './bundle.js';\nimport type { BundleOptions } from './types/BundleOptions.js';\nimport type { CommandFunction } from '../../types/CommandFunction.js';\n\nexport const init: CommandFunction = ({ command, reporter }) => {\n  command\n    .command('bundle')\n    .option('--bundler <name>', 'Forces use of a specific bundler.')\n    .option('--outdir <path>', 'Path to drop the bundle output, relative to current path.')\n    .description('Bundles a package.')\n    .action((bundleOptions: BundleOptions) => bundle(bundleOptions, { reporter }));\n};\n"]}

package/lib/commands/dashboard/index.d.ts

@@ -1,3 +1,3 @@
-import type { Command } from 'commander';
-export declare function init(command: Command): void;
+import type { CommandFunction } from '../../types/CommandFunction.js';
+export declare const init: CommandFunction;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/dashboard/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,wBAAgB,IAAI,CAAC,OAAO,EAAE,OAAO,QAKpC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/dashboard/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEtE,eAAO,MAAM,IAAI,EAAE,eAKlB,CAAC"}

package/lib/commands/dashboard/index.js

@@ -1,7 +1,7 @@
-export function init(command) {
+export const init = ({ command }) => {
     command
         .command('dashboard')
         .description('Shows the dashboard.')
         .action(() => console.log('i am showing the dashboard.'));
-}
+};
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/dashboard/index.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,IAAI,CAAC,OAAgB;IACnC,OAAO;SACJ,OAAO,CAAC,WAAW,CAAC;SACpB,WAAW,CAAC,sBAAsB,CAAC;SACnC,MAAM,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC,CAAC;AAC9D,CAAC","sourcesContent":["import type { Command } from 'commander';\n\nexport function init(command: Command) {\n  command\n    .command('dashboard')\n    .description('Shows the dashboard.')\n    .action(() => console.log('i am showing the dashboard.'));\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/dashboard/index.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,IAAI,GAAoB,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;IACnD,OAAO;SACJ,OAAO,CAAC,WAAW,CAAC;SACpB,WAAW,CAAC,sBAAsB,CAAC;SACnC,MAAM,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC,CAAC;AAC9D,CAAC,CAAC","sourcesContent":["import type { CommandFunction } from '../../types/CommandFunction.js';\n\nexport const init: CommandFunction = ({ command }) => {\n  command\n    .command('dashboard')\n    .description('Shows the dashboard.')\n    .action(() => console.log('i am showing the dashboard.'));\n};\n"]}

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

@@ -1,9 +1,11 @@
 import type { PackageJson, PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';
+import { type TaskReporter } from '@ms-cloudpack/task-reporter';
 /**
  * Bundle the package and return the imports it depends on.
  */
 export declare function bundleAndGetImports(options: {
     packages: PackageDefinitionsCache;
+    reporter: TaskReporter;
     packagePath: string;
     definition: PackageJson;
 }): Promise<{

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

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

package/lib/commands/init/bundleAndGetImports.js

@@ -3,14 +3,13 @@ import { getEntriesMapFromPackage } from '@ms-cloudpack/bundler';
 import { getBundleDetails } from '../../common/getBundleDetails.js';
 import { findImports } from './findImports.js';
 import { prepareOutputPath } from '../../common/prepareOutputPath.js';
-import { reporter } from '../../reporter.js';
 import { bundleTask } from '../../tasks/bundleTask.js';
 import { bulletedList, formatPackageName, plural } from '@ms-cloudpack/task-reporter';
 /**
  * Bundle the package and return the imports it depends on.
  */
 export async function bundleAndGetImports(options) {
-    const { packagePath, definition, packages } = options;
+    const { packagePath, definition, packages, reporter } = options;
     const { outputPath, isExternal } = await getBundleDetails(packagePath);
     if (!isExternal && !definition.exports) {
         console.debug(`${path.join(packagePath, 'package.json')} does not have an "exports" field.`);

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

@@ -1 +1 @@
-{"version":3,"file":"bundleAndGetImports.js","sourceRoot":"","sources":["../../../src/commands/init/bundleAndGetImports.ts"],"names":[],"mappings":"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","sourcesContent":["import path from 'path';\nimport { getEntriesMapFromPackage } from '@ms-cloudpack/bundler';\nimport { getBundleDetails } from '../../common/getBundleDetails.js';\nimport { findImports } from './findImports.js';\nimport { prepareOutputPath } from '../../common/prepareOutputPath.js';\nimport type { PackageJson, PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport { reporter } from '../../reporter.js';\nimport type { BundleRequest } from '../../types/BundleRequest.js';\nimport { bundleTask } from '../../tasks/bundleTask.js';\nimport { bulletedList, formatPackageName, plural } from '@ms-cloudpack/task-reporter';\n\n/**\n * Bundle the package and return the imports it depends on.\n */\nexport async function bundleAndGetImports(options: {\n  packages: PackageDefinitionsCache;\n  packagePath: string;\n  definition: PackageJson;\n}): Promise<{\n  hasWarnings: boolean;\n  hasErrors: boolean;\n  /** Map from package name to set of required relative paths */\n  imports?: Map<string, Set<string>>;\n}> {\n  const { packagePath, definition, packages } = options;\n  const { outputPath, isExternal } = await getBundleDetails(packagePath);\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({\n    inputPath: packagePath,\n    packages,\n  });\n\n  if (!Object.keys(entriesMap).length) {\n    console.warn(\n      `${path.join(packagePath, 'package.json')} does not specify any entry points.`,\n      isExternal\n        ? ''\n        : 'If this package contains code imported by other packages, please consider adding an \"exports\" field.',\n    );\n    return { hasWarnings: true, hasErrors: false };\n  }\n\n  const bundleRequest: BundleRequest = {\n    id: packagePath,\n    packageName: definition.name || '',\n    version: definition.version || '',\n    packagePath,\n    outputPath,\n    isExternal,\n    packages,\n  };\n\n  await bundleTask({ bundleRequest, options: { force: true } });\n\n  // For each outputFile, find all imports.\n  let imports: Map<string, Set<string>> | undefined;\n\n  await reporter.runTask(`Evaluate ${formatPackageName(definition)}`, async () => {\n    imports = new Map(\n      Object.entries(\n        (await findImports(\n          bundleRequest.result?.outputFiles?.map((file) => path.resolve(outputPath, file.outputPath)) || [],\n        )) || {},\n      ),\n    );\n\n    const importCount = imports.size;\n\n    return {\n      status: 'complete',\n      message: importCount ? `Found ${plural(importCount, 'imported package')}` : undefined,\n      details: importCount ? `${bulletedList(getImportsList(imports))}` : undefined,\n    };\n  });\n\n  return {\n    hasWarnings: !!bundleRequest.result?.warnings?.length,\n    hasErrors: !!bundleRequest.result?.errors?.length,\n    imports,\n  };\n}\n\nfunction getImportsList(imports: Map<string, Set<string>>): string[] {\n  return Array.from(imports.keys()).reduce((list, packageName) => {\n    return list.concat(\n      Array.from(imports.get(packageName) || []).map(\n        (importPath) => `${packageName}${importPath === '.' ? '' : `/${importPath}`}`,\n      ),\n    );\n  }, [] as string[]);\n}\n"]}
+{"version":3,"file":"bundleAndGetImports.js","sourceRoot":"","sources":["../../../src/commands/init/bundleAndGetImports.ts"],"names":[],"mappings":"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","sourcesContent":["import path from 'path';\nimport { getEntriesMapFromPackage } from '@ms-cloudpack/bundler';\nimport { getBundleDetails } from '../../common/getBundleDetails.js';\nimport { findImports } from './findImports.js';\nimport { prepareOutputPath } from '../../common/prepareOutputPath.js';\nimport type { PackageJson, PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { BundleRequest } from '../../types/BundleRequest.js';\nimport { bundleTask } from '../../tasks/bundleTask.js';\nimport { type TaskReporter, bulletedList, formatPackageName, plural } from '@ms-cloudpack/task-reporter';\n\n/**\n * Bundle the package and return the imports it depends on.\n */\nexport async function bundleAndGetImports(options: {\n  packages: PackageDefinitionsCache;\n  reporter: TaskReporter;\n  packagePath: string;\n  definition: PackageJson;\n}): Promise<{\n  hasWarnings: boolean;\n  hasErrors: boolean;\n  /** Map from package name to set of required relative paths */\n  imports?: Map<string, Set<string>>;\n}> {\n  const { packagePath, definition, packages, reporter } = options;\n  const { outputPath, isExternal } = await getBundleDetails(packagePath);\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({\n    inputPath: packagePath,\n    packages,\n  });\n\n  if (!Object.keys(entriesMap).length) {\n    console.warn(\n      `${path.join(packagePath, 'package.json')} does not specify any entry points.`,\n      isExternal\n        ? ''\n        : 'If this package contains code imported by other packages, please consider adding an \"exports\" field.',\n    );\n    return { hasWarnings: true, hasErrors: false };\n  }\n\n  const bundleRequest: BundleRequest = {\n    id: packagePath,\n    packageName: definition.name || '',\n    version: definition.version || '',\n    packagePath,\n    outputPath,\n    isExternal,\n    packages,\n  };\n\n  await bundleTask({ bundleRequest, options: { force: true } });\n\n  // For each outputFile, find all imports.\n  let imports: Map<string, Set<string>> | undefined;\n\n  await reporter.runTask(`Evaluate ${formatPackageName(definition)}`, async () => {\n    imports = new Map(\n      Object.entries(\n        (await findImports(\n          bundleRequest.result?.outputFiles?.map((file) => path.resolve(outputPath, file.outputPath)) || [],\n        )) || {},\n      ),\n    );\n\n    const importCount = imports.size;\n\n    return {\n      status: 'complete',\n      message: importCount ? `Found ${plural(importCount, 'imported package')}` : undefined,\n      details: importCount ? `${bulletedList(getImportsList(imports))}` : undefined,\n    };\n  });\n\n  return {\n    hasWarnings: !!bundleRequest.result?.warnings?.length,\n    hasErrors: !!bundleRequest.result?.errors?.length,\n    imports,\n  };\n}\n\nfunction getImportsList(imports: Map<string, Set<string>>): string[] {\n  return Array.from(imports.keys()).reduce((list, packageName) => {\n    return list.concat(\n      Array.from(imports.get(packageName) || []).map(\n        (importPath) => `${packageName}${importPath === '.' ? '' : `/${importPath}`}`,\n      ),\n    );\n  }, [] as string[]);\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"findImports.d.ts","sourceRoot":"","sources":["../../../src/commands/init/findImports.ts"],"names":[],"mappings":"AAMA;;;GAGG;AACH,wBAAsB,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CA2D3F"}
+{"version":3,"file":"findImports.d.ts","sourceRoot":"","sources":["../../../src/commands/init/findImports.ts"],"names":[],"mappings":"AAUA;;;GAGG;AACH,wBAAsB,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAoE3F"}

package/lib/commands/init/findImports.js

@@ -2,7 +2,10 @@ import { parse } from 'es-module-lexer';
 import fsPromises from 'fs/promises';
 import path from 'path';
 import { parseImportString } from '@ms-cloudpack/path-string-parsing';
+import { sourceExtensions } from '@ms-cloudpack/path-utilities';
 import { builtinModules } from 'module';
+/** Treat files with no extension as JS for purposes below */
+const allSourceExtensions = [...sourceExtensions, ''];
 /**
  * Returns a dictionary where key is the package name and value is a set of required paths.
  * Eg. `{ '@fluentui/react': new Set([ '.', './lib/Button' ]) }`
@@ -13,11 +16,21 @@ export async function findImports(filePaths) {
     const pathsToParse = [...filePaths];
     while (pathsToParse.length) {
         const filePath = pathsToParse.shift();
-        if (!filePath) {
+        // Ignore any non-JS/TS files such as SVGs
+        if (!filePath || !allSourceExtensions.includes(path.extname(filePath))) {
             continue;
         }
         const source = await fsPromises.readFile(filePath, 'utf-8');
-        const [rawImports] = parse(source);
+        let rawImports;
+        try {
+            [rawImports] = parse(source);
+        }
+        catch (err) {
+            // This could happen if the source file isn't valid JS
+            // (unlikely after adding the check above to only attempt parsing JS/TS files)
+            console.warn(`Failed to parse ${filePath}:`, err);
+            continue;
+        }
         const imports = Array.from(new Set(rawImports))
             .map((i) => {
             // The es-module-lexer returns entries where the "n" property equals the import source.

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

@@ -1 +1 @@
-{"version":3,"file":"findImports.js","sourceRoot":"","sources":["../../../src/commands/init/findImports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,UAAU,MAAM,aAAa,CAAC;AACrC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAA2B,MAAM,mCAAmC,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAExC;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,SAAmB;IACnD,MAAM,eAAe,GAAgC,EAAE,CAAC;IACxD,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;IACxC,MAAM,YAAY,GAAa,CAAC,GAAG,SAAS,CAAC,CAAC;IAE9C,OAAO,YAAY,CAAC,MAAM,EAAE;QAC1B,MAAM,QAAQ,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC;QACtC,IAAI,CAAC,QAAQ,EAAE;YACb,SAAS;SACV;QAED,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC5D,MAAM,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;aAC5C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACT,uFAAuF;YACvF,sEAAsE;YACtE,EAAE;YACF,yDAAyD;YACzD,EAAE;YACF,0DAA0D;YAC1D,4EAA4E;YAC5E,0EAA0E;YAC1E,2EAA2E;YAC3E,gEAAgE;YAChE,EAAE;YACF,0EAA0E;YAC1E,6EAA6E;YAC7E,yEAAyE;YACzE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;gBACR,OAAO,CAAC,KAAK,CACX,4DAA4D,QAAQ,gBAAgB,MAAM,CAAC,KAAK,CAC9F,CAAC,CAAC,CAAC,EACH,CAAC,CAAC,CAAC,CACJ,EAAE,CACJ,CAAC;gBACF,OAAO,SAAS,CAAC;aAClB;YAED,OAAO,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAChC,CAAC,CAAC;aACD,MAAM,CAAC,OAAO,CAAyB,CAAC;QAE3C,KAAK,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,OAAO,EAAE;YACjD,IAAI,WAAW,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE;gBAChC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,WAAW,EAAE,UAAU,IAAI,EAAE,CAAC,CAAC;gBAEtF,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;oBAChC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;oBAC5B,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;iBAC9B;aACF;iBAAM,IAAI,WAAW,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;gBACnG,eAAe,CAAC,WAAW,MAA3B,eAAe,CAAC,WAAW,IAAM,IAAI,GAAG,EAAE,EAAC;gBAC3C,eAAe,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC;aACrD;SACF;KACF;IAED,OAAO,eAAe,CAAC;AACzB,CAAC","sourcesContent":["import { parse } from 'es-module-lexer';\nimport fsPromises from 'fs/promises';\nimport path from 'path';\nimport { parseImportString, type ImportStringResult } from '@ms-cloudpack/path-string-parsing';\nimport { builtinModules } from 'module';\n\n/**\n * Returns a dictionary where key is the package name and value is a set of required paths.\n * Eg. `{ '@fluentui/react': new Set([ '.', './lib/Button' ]) }`\n */\nexport async function findImports(filePaths: string[]): Promise<Record<string, Set<string>>> {\n  const requiredExports: Record<string, Set<string>> = {};\n  const visitedPaths = new Set(filePaths);\n  const pathsToParse: string[] = [...filePaths];\n\n  while (pathsToParse.length) {\n    const filePath = pathsToParse.shift();\n    if (!filePath) {\n      continue;\n    }\n\n    const source = await fsPromises.readFile(filePath, 'utf-8');\n    const [rawImports] = parse(source);\n    const imports = Array.from(new Set(rawImports))\n      .map((i) => {\n        // The es-module-lexer returns entries where the \"n\" property equals the import source.\n        // This includes the package name and path. For example, in this case:\n        //\n        //   import { Button } from '@fluentui/react/lib/Button';\n        //\n        // The \"n\" property would be \"@fluentui/react/lib/Button\".\n        // The \"s\" and \"e\" properties represent the start/end character positions of\n        // the import source. The \"ss\" and \"se\" properties represent the start/end\n        // character positions of the import specifier starting with \"import\". This\n        // may be useful for determining if the import is sync or async.\n        //\n        // Currently when the import source is a backtick string, the \"n\" property\n        // is undefined. This is a bug in es-module-lexer. We may need to handle this\n        // at the javascript layer and expand it into multiple potential imports.\n        if (!i.n) {\n          console.debug(\n            `Found an import that didn't parse correctly:\\nFilename:\\n${filePath}\\n\\nImport:\\n${source.slice(\n              i.s,\n              i.e,\n            )}`,\n          );\n          return undefined;\n        }\n\n        return parseImportString(i.n);\n      })\n      .filter(Boolean) as ImportStringResult[];\n\n    for (const { packageName, importPath } of imports) {\n      if (packageName?.startsWith('.')) {\n        const localPath = path.resolve(path.dirname(filePath), packageName, importPath || '');\n\n        if (!visitedPaths.has(localPath)) {\n          visitedPaths.add(localPath);\n          pathsToParse.push(localPath);\n        }\n      } else if (packageName && !packageName.startsWith('node:') && !builtinModules.includes(packageName)) {\n        requiredExports[packageName] ||= new Set();\n        requiredExports[packageName].add(importPath || '.');\n      }\n    }\n  }\n\n  return requiredExports;\n}\n"]}
+{"version":3,"file":"findImports.js","sourceRoot":"","sources":["../../../src/commands/init/findImports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,UAAU,MAAM,aAAa,CAAC;AACrC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAA2B,MAAM,mCAAmC,CAAC;AAC/F,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAExC,6DAA6D;AAC7D,MAAM,mBAAmB,GAAG,CAAC,GAAG,gBAAgB,EAAE,EAAE,CAAC,CAAC;AAEtD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,SAAmB;IACnD,MAAM,eAAe,GAAgC,EAAE,CAAC;IACxD,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;IACxC,MAAM,YAAY,GAAa,CAAC,GAAG,SAAS,CAAC,CAAC;IAE9C,OAAO,YAAY,CAAC,MAAM,EAAE;QAC1B,MAAM,QAAQ,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC;QACtC,0CAA0C;QAC1C,IAAI,CAAC,QAAQ,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE;YACtE,SAAS;SACV;QAED,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC5D,IAAI,UAAuC,CAAC;QAC5C,IAAI;YACF,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;SAC9B;QAAC,OAAO,GAAG,EAAE;YACZ,sDAAsD;YACtD,8EAA8E;YAC9E,OAAO,CAAC,IAAI,CAAC,mBAAmB,QAAQ,GAAG,EAAE,GAAG,CAAC,CAAC;YAClD,SAAS;SACV;QACD,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;aAC5C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACT,uFAAuF;YACvF,sEAAsE;YACtE,EAAE;YACF,yDAAyD;YACzD,EAAE;YACF,0DAA0D;YAC1D,4EAA4E;YAC5E,0EAA0E;YAC1E,2EAA2E;YAC3E,gEAAgE;YAChE,EAAE;YACF,0EAA0E;YAC1E,6EAA6E;YAC7E,yEAAyE;YACzE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;gBACR,OAAO,CAAC,KAAK,CACX,4DAA4D,QAAQ,gBAAgB,MAAM,CAAC,KAAK,CAC9F,CAAC,CAAC,CAAC,EACH,CAAC,CAAC,CAAC,CACJ,EAAE,CACJ,CAAC;gBACF,OAAO,SAAS,CAAC;aAClB;YAED,OAAO,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAChC,CAAC,CAAC;aACD,MAAM,CAAC,OAAO,CAAyB,CAAC;QAE3C,KAAK,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,OAAO,EAAE;YACjD,IAAI,WAAW,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE;gBAChC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,WAAW,EAAE,UAAU,IAAI,EAAE,CAAC,CAAC;gBAEtF,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;oBAChC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;oBAC5B,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;iBAC9B;aACF;iBAAM,IAAI,WAAW,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;gBACnG,eAAe,CAAC,WAAW,MAA3B,eAAe,CAAC,WAAW,IAAM,IAAI,GAAG,EAAE,EAAC;gBAC3C,eAAe,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC;aACrD;SACF;KACF;IAED,OAAO,eAAe,CAAC;AACzB,CAAC","sourcesContent":["import { parse } from 'es-module-lexer';\nimport fsPromises from 'fs/promises';\nimport path from 'path';\nimport { parseImportString, type ImportStringResult } from '@ms-cloudpack/path-string-parsing';\nimport { sourceExtensions } from '@ms-cloudpack/path-utilities';\nimport { builtinModules } from 'module';\n\n/** Treat files with no extension as JS for purposes below */\nconst allSourceExtensions = [...sourceExtensions, ''];\n\n/**\n * Returns a dictionary where key is the package name and value is a set of required paths.\n * Eg. `{ '@fluentui/react': new Set([ '.', './lib/Button' ]) }`\n */\nexport async function findImports(filePaths: string[]): Promise<Record<string, Set<string>>> {\n  const requiredExports: Record<string, Set<string>> = {};\n  const visitedPaths = new Set(filePaths);\n  const pathsToParse: string[] = [...filePaths];\n\n  while (pathsToParse.length) {\n    const filePath = pathsToParse.shift();\n    // Ignore any non-JS/TS files such as SVGs\n    if (!filePath || !allSourceExtensions.includes(path.extname(filePath))) {\n      continue;\n    }\n\n    const source = await fsPromises.readFile(filePath, 'utf-8');\n    let rawImports: ReturnType<typeof parse>[0];\n    try {\n      [rawImports] = parse(source);\n    } catch (err) {\n      // This could happen if the source file isn't valid JS\n      // (unlikely after adding the check above to only attempt parsing JS/TS files)\n      console.warn(`Failed to parse ${filePath}:`, err);\n      continue;\n    }\n    const imports = Array.from(new Set(rawImports))\n      .map((i) => {\n        // The es-module-lexer returns entries where the \"n\" property equals the import source.\n        // This includes the package name and path. For example, in this case:\n        //\n        //   import { Button } from '@fluentui/react/lib/Button';\n        //\n        // The \"n\" property would be \"@fluentui/react/lib/Button\".\n        // The \"s\" and \"e\" properties represent the start/end character positions of\n        // the import source. The \"ss\" and \"se\" properties represent the start/end\n        // character positions of the import specifier starting with \"import\". This\n        // may be useful for determining if the import is sync or async.\n        //\n        // Currently when the import source is a backtick string, the \"n\" property\n        // is undefined. This is a bug in es-module-lexer. We may need to handle this\n        // at the javascript layer and expand it into multiple potential imports.\n        if (!i.n) {\n          console.debug(\n            `Found an import that didn't parse correctly:\\nFilename:\\n${filePath}\\n\\nImport:\\n${source.slice(\n              i.s,\n              i.e,\n            )}`,\n          );\n          return undefined;\n        }\n\n        return parseImportString(i.n);\n      })\n      .filter(Boolean) as ImportStringResult[];\n\n    for (const { packageName, importPath } of imports) {\n      if (packageName?.startsWith('.')) {\n        const localPath = path.resolve(path.dirname(filePath), packageName, importPath || '');\n\n        if (!visitedPaths.has(localPath)) {\n          visitedPaths.add(localPath);\n          pathsToParse.push(localPath);\n        }\n      } else if (packageName && !packageName.startsWith('node:') && !builtinModules.includes(packageName)) {\n        requiredExports[packageName] ||= new Set();\n        requiredExports[packageName].add(importPath || '.');\n      }\n    }\n  }\n\n  return requiredExports;\n}\n"]}

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

@@ -1,3 +1,3 @@
-import type { Command } from 'commander';
-export declare function init(command: Command): void;
+import type { CommandFunction } from '../../types/CommandFunction.js';
+export declare const init: CommandFunction;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/init/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQzC,wBAAgB,IAAI,CAAC,OAAO,EAAE,OAAO,QAkDpC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/init/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAGtE,eAAO,MAAM,IAAI,EAAE,eAkDlB,CAAC"}

package/lib/commands/init/index.js

@@ -1,22 +1,21 @@
-import { reporter } from '../../reporter.js';
 import { plural, red, yellow } from '@ms-cloudpack/task-reporter';
 import { configFileName } from '@ms-cloudpack/config';
 import { stopTelemetry } from '../../initTelemetry.js';
 /* Defines the "init" verb. */
-export function init(command) {
+export const init = ({ command, reporter }) => {
     command
         .command('init')
         .description('Initializes a given app project and defines the necessary configuration overrides to make an existing app compatible with Cloudpack.')
         .option('--fix', 'Applies fixes to all identified issues in internal packages.')
         .option('--reset', 'Ignores existing overrides when determining all entries.')
         .option('--check', 'Fails if any package exports are missing.')
-        .action(async (options) => {
+        .action(async (options, context) => {
         const { init } = await import('./init.js');
         let completeReason;
         let hasErrors = false;
         let hasWarnings = false;
         try {
-            const { changeCount, errorPkgCount, warningPkgCount, successPkgCount } = await init(options);
+            const { changeCount, errorPkgCount, warningPkgCount, successPkgCount } = await init(options, context);
             hasErrors = errorPkgCount > 0;
             hasWarnings = warningPkgCount > 0;
             const totalCount = errorPkgCount + warningPkgCount + successPkgCount;
@@ -46,5 +45,5 @@ export function init(command) {
         reporter.complete(hasErrors ? red(completeReason) : hasWarnings ? yellow(completeReason) : completeReason);
         process.exit(hasErrors ? 1 : 0);
     });
-}
+};
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/init/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD,8BAA8B;AAC9B,MAAM,UAAU,IAAI,CAAC,OAAgB;IACnC,OAAO;SACJ,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CACV,sIAAsI,CACvI;SACA,MAAM,CAAC,OAAO,EAAE,8DAA8D,CAAC;SAC/E,MAAM,CAAC,SAAS,EAAE,0DAA0D,CAAC;SAC7E,MAAM,CAAC,SAAS,EAAE,2CAA2C,CAAC;SAC9D,MAAM,CAAC,KAAK,EAAE,OAAoB,EAAE,EAAE;QACrC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;QAE3C,IAAI,cAAkC,CAAC;QACvC,IAAI,SAAS,GAAG,KAAK,CAAC;QACtB,IAAI,WAAW,GAAG,KAAK,CAAC;QACxB,IAAI;YACF,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,eAAe,EAAE,eAAe,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,CAAC;YAE7F,SAAS,GAAG,aAAa,GAAG,CAAC,CAAC;YAC9B,WAAW,GAAG,eAAe,GAAG,CAAC,CAAC;YAElC,MAAM,UAAU,GAAG,aAAa,GAAG,eAAe,GAAG,eAAe,CAAC;YAErE,IAAI,SAAS,IAAI,WAAW,EAAE;gBAC5B,MAAM,UAAU,GAAG,CAAC,CAAC,eAAe,GAAG,UAAU,CAAC,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;gBACrE,cAAc;oBACZ;wBACE,GAAG,eAAe,IAAI,UAAU,KAAK,UAAU,kCAAkC;wBACjF,SAAS,IAAI,GAAG,aAAa,uBAAuB;wBACpD,WAAW,IAAI,GAAG,eAAe,yBAAyB;qBAC3D;yBACE,MAAM,CAAC,OAAO,CAAC;yBACf,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;aACxB;iBAAM;gBACL,cAAc,GAAG,OAAO,UAAU,gCAAgC,CAAC;aACpE;YAED,IAAI,WAAW,EAAE;gBACf,cAAc,IAAI,gBAAgB,cAAc,UAAU,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG,CAAC;aAC5F;SACF;QAAC,OAAO,KAAK,EAAE;YACd,SAAS,GAAG,IAAI,CAAC;YACjB,cAAc,GAAG,qBAAsB,KAAe,CAAC,OAAO,IAAI,KAAK,EAAE,CAAC;SAC3E;QAED,MAAM,aAAa,EAAE,CAAC;QACtB,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;QAE3G,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;AACP,CAAC","sourcesContent":["import type { Command } from 'commander';\nimport type { InitOptions } from './types/InitOptions.js';\nimport { reporter } from '../../reporter.js';\nimport { plural, red, yellow } from '@ms-cloudpack/task-reporter';\nimport { configFileName } from '@ms-cloudpack/config';\nimport { stopTelemetry } from '../../initTelemetry.js';\n\n/* Defines the \"init\" verb. */\nexport function init(command: Command) {\n  command\n    .command('init')\n    .description(\n      'Initializes a given app project and defines the necessary configuration overrides to make an existing app compatible with Cloudpack.',\n    )\n    .option('--fix', 'Applies fixes to all identified issues in internal packages.')\n    .option('--reset', 'Ignores existing overrides when determining all entries.')\n    .option('--check', 'Fails if any package exports are missing.')\n    .action(async (options: InitOptions) => {\n      const { init } = await import('./init.js');\n\n      let completeReason: string | undefined;\n      let hasErrors = false;\n      let hasWarnings = false;\n      try {\n        const { changeCount, errorPkgCount, warningPkgCount, successPkgCount } = await init(options);\n\n        hasErrors = errorPkgCount > 0;\n        hasWarnings = warningPkgCount > 0;\n\n        const totalCount = errorPkgCount + warningPkgCount + successPkgCount;\n\n        if (hasErrors || hasWarnings) {\n          const successPct = ((successPkgCount / totalCount) * 100).toFixed(1);\n          completeReason =\n            [\n              `${successPkgCount}/${totalCount} (${successPct}%) packages bundled successfully`,\n              hasErrors && `${errorPkgCount} packages with errors`,\n              hasWarnings && `${warningPkgCount} packages with warnings`,\n            ]\n              .filter(Boolean)\n              .join('\\n') + '\\n';\n        } else {\n          completeReason = `All ${totalCount} packages bundled successfully`;\n        }\n\n        if (changeCount) {\n          completeReason += `\\n\\nUpdated \"${configFileName}\" with ${plural(changeCount, 'change')}.`;\n        }\n      } catch (error) {\n        hasErrors = true;\n        completeReason = `Unexpected error: ${(error as Error).message || error}`;\n      }\n\n      await stopTelemetry();\n      reporter.complete(hasErrors ? red(completeReason) : hasWarnings ? yellow(completeReason) : completeReason);\n\n      process.exit(hasErrors ? 1 : 0);\n    });\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/init/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAqB,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AACrF,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAGvD,8BAA8B;AAC9B,MAAM,CAAC,MAAM,IAAI,GAAoB,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC7D,OAAO;SACJ,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CACV,sIAAsI,CACvI;SACA,MAAM,CAAC,OAAO,EAAE,8DAA8D,CAAC;SAC/E,MAAM,CAAC,SAAS,EAAE,0DAA0D,CAAC;SAC7E,MAAM,CAAC,SAAS,EAAE,2CAA2C,CAAC;SAC9D,MAAM,CAAC,KAAK,EAAE,OAAoB,EAAE,OAAmC,EAAE,EAAE;QAC1E,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;QAE3C,IAAI,cAAkC,CAAC;QACvC,IAAI,SAAS,GAAG,KAAK,CAAC;QACtB,IAAI,WAAW,GAAG,KAAK,CAAC;QACxB,IAAI;YACF,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,eAAe,EAAE,eAAe,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAEtG,SAAS,GAAG,aAAa,GAAG,CAAC,CAAC;YAC9B,WAAW,GAAG,eAAe,GAAG,CAAC,CAAC;YAElC,MAAM,UAAU,GAAG,aAAa,GAAG,eAAe,GAAG,eAAe,CAAC;YAErE,IAAI,SAAS,IAAI,WAAW,EAAE;gBAC5B,MAAM,UAAU,GAAG,CAAC,CAAC,eAAe,GAAG,UAAU,CAAC,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;gBACrE,cAAc;oBACZ;wBACE,GAAG,eAAe,IAAI,UAAU,KAAK,UAAU,kCAAkC;wBACjF,SAAS,IAAI,GAAG,aAAa,uBAAuB;wBACpD,WAAW,IAAI,GAAG,eAAe,yBAAyB;qBAC3D;yBACE,MAAM,CAAC,OAAO,CAAC;yBACf,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;aACxB;iBAAM;gBACL,cAAc,GAAG,OAAO,UAAU,gCAAgC,CAAC;aACpE;YAED,IAAI,WAAW,EAAE;gBACf,cAAc,IAAI,gBAAgB,cAAc,UAAU,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG,CAAC;aAC5F;SACF;QAAC,OAAO,KAAK,EAAE;YACd,SAAS,GAAG,IAAI,CAAC;YACjB,cAAc,GAAG,qBAAsB,KAAe,CAAC,OAAO,IAAI,KAAK,EAAE,CAAC;SAC3E;QAED,MAAM,aAAa,EAAE,CAAC;QACtB,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;QAE3G,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;AACP,CAAC,CAAC","sourcesContent":["import type { InitOptions } from './types/InitOptions.js';\nimport { type TaskReporter, plural, red, yellow } from '@ms-cloudpack/task-reporter';\nimport { configFileName } from '@ms-cloudpack/config';\nimport { stopTelemetry } from '../../initTelemetry.js';\nimport type { CommandFunction } from '../../types/CommandFunction.js';\n\n/* Defines the \"init\" verb. */\nexport const init: CommandFunction = ({ command, reporter }) => {\n  command\n    .command('init')\n    .description(\n      'Initializes a given app project and defines the necessary configuration overrides to make an existing app compatible with Cloudpack.',\n    )\n    .option('--fix', 'Applies fixes to all identified issues in internal packages.')\n    .option('--reset', 'Ignores existing overrides when determining all entries.')\n    .option('--check', 'Fails if any package exports are missing.')\n    .action(async (options: InitOptions, context: { reporter: TaskReporter }) => {\n      const { init } = await import('./init.js');\n\n      let completeReason: string | undefined;\n      let hasErrors = false;\n      let hasWarnings = false;\n      try {\n        const { changeCount, errorPkgCount, warningPkgCount, successPkgCount } = await init(options, context);\n\n        hasErrors = errorPkgCount > 0;\n        hasWarnings = warningPkgCount > 0;\n\n        const totalCount = errorPkgCount + warningPkgCount + successPkgCount;\n\n        if (hasErrors || hasWarnings) {\n          const successPct = ((successPkgCount / totalCount) * 100).toFixed(1);\n          completeReason =\n            [\n              `${successPkgCount}/${totalCount} (${successPct}%) packages bundled successfully`,\n              hasErrors && `${errorPkgCount} packages with errors`,\n              hasWarnings && `${warningPkgCount} packages with warnings`,\n            ]\n              .filter(Boolean)\n              .join('\\n') + '\\n';\n        } else {\n          completeReason = `All ${totalCount} packages bundled successfully`;\n        }\n\n        if (changeCount) {\n          completeReason += `\\n\\nUpdated \"${configFileName}\" with ${plural(changeCount, 'change')}.`;\n        }\n      } catch (error) {\n        hasErrors = true;\n        completeReason = `Unexpected error: ${(error as Error).message || error}`;\n      }\n\n      await stopTelemetry();\n      reporter.complete(hasErrors ? red(completeReason) : hasWarnings ? yellow(completeReason) : completeReason);\n\n      process.exit(hasErrors ? 1 : 0);\n    });\n};\n"]}

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

@@ -1,6 +1,9 @@
 import type { InitOptions } from './types/InitOptions.js';
+import type { TaskReporter } from '@ms-cloudpack/task-reporter';
 /** Given the path, updates the Cloudpack config with overrides and project settings. */
-export declare function init(options: InitOptions): Promise<{
+export declare function init(options: InitOptions, { reporter }: {
+    reporter: TaskReporter;
+}): Promise<{
     changeCount: number;
     errorPkgCount: number;
     warningPkgCount: number;

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":"AAUA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE1D,wFAAwF;AACxF,wBAAsB,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC;IACxD,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC,CAiHD"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,wFAAwF;AACxF,wBAAsB,IAAI,CACxB,OAAO,EAAE,WAAW,EACpB,EAAE,QAAQ,EAAE,EAAE;IAAE,QAAQ,EAAE,YAAY,CAAA;CAAE,GACvC,OAAO,CAAC;IACT,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC,CAiHD"}

package/lib/commands/init/init.js

@@ -7,7 +7,7 @@ import { evaluateImportsForOverrides } from './evaluateImportsForOverrides.js';
 import { bundleAndGetImports } from './bundleAndGetImports.js';
 import { patchAllInternalPackageExports } from './patchAllInternalPackageExports.js';
 /** Given the path, updates the Cloudpack config with overrides and project settings. */
-export async function init(options) {
+export async function init(options, { reporter }) {
     if (options.check && options.fix) {
         throw Error('Cannot use --check and --fix together.');
     }
@@ -20,7 +20,7 @@ export async function init(options) {
     const packages = new PackageDefinitions();
     packages.registerTransform(createPackageOverrideTransform({ packageOverrides }));
     // Try to resolve dependencies.
-    const resolveMap = (await resolveDependenciesTask({ appPath, packages }));
+    const resolveMap = (await resolveDependenciesTask({ appPath, packages }, { reporter }));
     if (!resolveMap) {
         throw new Error("Couldn't resolve dependencies.");
     }
@@ -46,7 +46,7 @@ export async function init(options) {
             continue;
         }
         // Bundle the package and find the imports it depends on.
-        const bundleResult = await bundleAndGetImports({ packagePath, definition, packages });
+        const bundleResult = await bundleAndGetImports({ packagePath, definition, packages, reporter });
         if (!bundleResult.imports) {
             // This is expected if the package just doesn't import anything else.
             console.info(`${packagePath} has no additional imports to evaluate.`);

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 { PackageOverride } from '@ms-cloudpack/config';\nimport { generatedConfigFileName, readConfig, writeGeneratedConfig } from '@ms-cloudpack/config';\nimport type { ResolveMap } from '@ms-cloudpack/package-utilities';\nimport { PackageDefinitions } from '@ms-cloudpack/package-utilities';\nimport { createPackageOverrideTransform } from '../../common/createPackageOverrideTransform.js';\nimport { rootSpan } from '../../initTelemetry.js';\nimport { resolveDependenciesTask } from '../../tasks/resolveDependenciesTask.js';\nimport { evaluateImportsForOverrides } from './evaluateImportsForOverrides.js';\nimport { bundleAndGetImports } from './bundleAndGetImports.js';\nimport { patchAllInternalPackageExports } from './patchAllInternalPackageExports.js';\nimport type { InitOptions } from './types/InitOptions.js';\n\n/** Given the path, updates the Cloudpack config with overrides and project settings. */\nexport async function init(options: InitOptions): Promise<{\n  changeCount: number;\n  errorPkgCount: number;\n  warningPkgCount: number;\n  successPkgCount: number;\n}> {\n  if (options.check && options.fix) {\n    throw Error('Cannot use --check and --fix together.');\n  }\n\n  if (options.check && options.reset) {\n    throw Error('Cannot use --check and --reset together.');\n  }\n\n  const appPath = options.cwd || process.cwd();\n  const config = await readConfig(appPath);\n  const packageOverrides: PackageOverride[] = (!options.reset && config.packageOverrides) || [];\n  const packages = new PackageDefinitions();\n\n  packages.registerTransform(createPackageOverrideTransform({ packageOverrides }));\n\n  // Try to resolve dependencies.\n  const resolveMap = (await resolveDependenciesTask({ appPath, packages })) as ResolveMap;\n\n  if (!resolveMap) {\n    throw new Error(\"Couldn't resolve dependencies.\");\n  }\n\n  const packagePathsToEvaluate = new Set<string>([appPath]);\n  const evaluatedPackages = new Set<string>();\n  let changeCount = 0;\n  let errorPkgCount = 0;\n  let warningPkgCount = 0;\n  let successPkgCount = 0;\n\n  while (packagePathsToEvaluate.size) {\n    const packagePath = packagePathsToEvaluate.values().next().value as string;\n\n    packagePathsToEvaluate.delete(packagePath);\n\n    // Skip already-visited packages.\n    if (!packagePath || evaluatedPackages.has(packagePath)) {\n      continue;\n    }\n\n    evaluatedPackages.add(packagePath);\n\n    const definition = await packages.get(packagePath, { refresh: true });\n\n    if (!definition) {\n      // This is very weird and probably won't happen.\n      console.error(`Skipping ${packagePath} evaluation because the package.json was not found or not readable.`);\n      errorPkgCount++;\n      continue;\n    }\n\n    // Bundle the package and find the imports it depends on.\n    const bundleResult = await bundleAndGetImports({ packagePath, definition, packages });\n\n    if (!bundleResult.imports) {\n      // This is expected if the package just doesn't import anything else.\n      console.info(`${packagePath} has no additional imports to evaluate.`);\n      bundleResult.hasErrors ? errorPkgCount++ : bundleResult.hasWarnings ? warningPkgCount++ : successPkgCount++;\n      continue;\n    }\n\n    // Given the package imports, find the missing exports maps and update packageOverrides.\n    const overridesResult = await evaluateImportsForOverrides({\n      definition,\n      packages,\n      packagePathsToEvaluate,\n      evaluatedPackages,\n      imports: bundleResult.imports,\n      packageOverrides,\n      resolveMap,\n    });\n\n    if (options.check && (overridesResult.changeCount || overridesResult.errors.length)) {\n      rootSpan?.addEvent('INIT_CHECK_FAILED', {\n        reason: overridesResult.changeCount ? 'Config needs to be updated.' : overridesResult.errors,\n      });\n      throw Error(\n        overridesResult.changeCount\n          ? 'Run \"cloudpack init --reset\" to update the config.'\n          : overridesResult.errors.map((e) => e).join('\\n'),\n      );\n    }\n\n    changeCount += overridesResult.changeCount;\n\n    bundleResult.hasErrors || overridesResult.errors.length\n      ? errorPkgCount++\n      : bundleResult.hasWarnings\n      ? warningPkgCount++\n      : successPkgCount++;\n  }\n\n  if (options.fix) {\n    await patchAllInternalPackageExports({ resolveMap, packageOverrides });\n  }\n\n  if (changeCount) {\n    // Log the results to a file.\n    console.log(\n      `Writing updates to \"${generatedConfigFileName}\". If you're in a git repo, this file should be committed with your project.`,\n    );\n\n    if (packageOverrides.length) {\n      await writeGeneratedConfig({ packageOverrides }, appPath);\n    }\n  }\n\n  return {\n    changeCount,\n    errorPkgCount,\n    warningPkgCount,\n    successPkgCount,\n  };\n}\n"]}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PackageOverride } from '@ms-cloudpack/config';\nimport { generatedConfigFileName, readConfig, writeGeneratedConfig } from '@ms-cloudpack/config';\nimport type { ResolveMap } from '@ms-cloudpack/package-utilities';\nimport { PackageDefinitions } from '@ms-cloudpack/package-utilities';\nimport { createPackageOverrideTransform } from '../../common/createPackageOverrideTransform.js';\nimport { rootSpan } from '../../initTelemetry.js';\nimport { resolveDependenciesTask } from '../../tasks/resolveDependenciesTask.js';\nimport { evaluateImportsForOverrides } from './evaluateImportsForOverrides.js';\nimport { bundleAndGetImports } from './bundleAndGetImports.js';\nimport { patchAllInternalPackageExports } from './patchAllInternalPackageExports.js';\nimport type { InitOptions } from './types/InitOptions.js';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\n\n/** Given the path, updates the Cloudpack config with overrides and project settings. */\nexport async function init(\n  options: InitOptions,\n  { reporter }: { reporter: TaskReporter },\n): Promise<{\n  changeCount: number;\n  errorPkgCount: number;\n  warningPkgCount: number;\n  successPkgCount: number;\n}> {\n  if (options.check && options.fix) {\n    throw Error('Cannot use --check and --fix together.');\n  }\n\n  if (options.check && options.reset) {\n    throw Error('Cannot use --check and --reset together.');\n  }\n\n  const appPath = options.cwd || process.cwd();\n  const config = await readConfig(appPath);\n  const packageOverrides: PackageOverride[] = (!options.reset && config.packageOverrides) || [];\n  const packages = new PackageDefinitions();\n\n  packages.registerTransform(createPackageOverrideTransform({ packageOverrides }));\n\n  // Try to resolve dependencies.\n  const resolveMap = (await resolveDependenciesTask({ appPath, packages }, { reporter })) as ResolveMap;\n\n  if (!resolveMap) {\n    throw new Error(\"Couldn't resolve dependencies.\");\n  }\n\n  const packagePathsToEvaluate = new Set<string>([appPath]);\n  const evaluatedPackages = new Set<string>();\n  let changeCount = 0;\n  let errorPkgCount = 0;\n  let warningPkgCount = 0;\n  let successPkgCount = 0;\n\n  while (packagePathsToEvaluate.size) {\n    const packagePath = packagePathsToEvaluate.values().next().value as string;\n\n    packagePathsToEvaluate.delete(packagePath);\n\n    // Skip already-visited packages.\n    if (!packagePath || evaluatedPackages.has(packagePath)) {\n      continue;\n    }\n\n    evaluatedPackages.add(packagePath);\n\n    const definition = await packages.get(packagePath, { refresh: true });\n\n    if (!definition) {\n      // This is very weird and probably won't happen.\n      console.error(`Skipping ${packagePath} evaluation because the package.json was not found or not readable.`);\n      errorPkgCount++;\n      continue;\n    }\n\n    // Bundle the package and find the imports it depends on.\n    const bundleResult = await bundleAndGetImports({ packagePath, definition, packages, reporter });\n\n    if (!bundleResult.imports) {\n      // This is expected if the package just doesn't import anything else.\n      console.info(`${packagePath} has no additional imports to evaluate.`);\n      bundleResult.hasErrors ? errorPkgCount++ : bundleResult.hasWarnings ? warningPkgCount++ : successPkgCount++;\n      continue;\n    }\n\n    // Given the package imports, find the missing exports maps and update packageOverrides.\n    const overridesResult = await evaluateImportsForOverrides({\n      definition,\n      packages,\n      packagePathsToEvaluate,\n      evaluatedPackages,\n      imports: bundleResult.imports,\n      packageOverrides,\n      resolveMap,\n    });\n\n    if (options.check && (overridesResult.changeCount || overridesResult.errors.length)) {\n      rootSpan?.addEvent('INIT_CHECK_FAILED', {\n        reason: overridesResult.changeCount ? 'Config needs to be updated.' : overridesResult.errors,\n      });\n      throw Error(\n        overridesResult.changeCount\n          ? 'Run \"cloudpack init --reset\" to update the config.'\n          : overridesResult.errors.map((e) => e).join('\\n'),\n      );\n    }\n\n    changeCount += overridesResult.changeCount;\n\n    bundleResult.hasErrors || overridesResult.errors.length\n      ? errorPkgCount++\n      : bundleResult.hasWarnings\n      ? warningPkgCount++\n      : successPkgCount++;\n  }\n\n  if (options.fix) {\n    await patchAllInternalPackageExports({ resolveMap, packageOverrides });\n  }\n\n  if (changeCount) {\n    // Log the results to a file.\n    console.log(\n      `Writing updates to \"${generatedConfigFileName}\". If you're in a git repo, this file should be committed with your project.`,\n    );\n\n    if (packageOverrides.length) {\n      await writeGeneratedConfig({ packageOverrides }, appPath);\n    }\n  }\n\n  return {\n    changeCount,\n    errorPkgCount,\n    warningPkgCount,\n    successPkgCount,\n  };\n}\n"]}

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

@@ -1,5 +1,6 @@
 import type { BundleServer } from '../../../types/BundleServer.js';
 import type { PackageJson } from '@ms-cloudpack/bundler-types';
+import { type TaskReporter } from '@ms-cloudpack/task-reporter';
 import type { CloudpackConfig } from '@ms-cloudpack/config';
 import type { ApiServer, Session } from '@ms-cloudpack/api-server';
 /**
@@ -10,12 +11,13 @@ import type { ApiServer, Session } from '@ms-cloudpack/api-server';
  * can support whichever routes the app needs, while the bundle server can provide package
  * assets in various forms using its own routing.
  */
-export declare function startAppServer({ session, bundleServer, apiServer, definition, config, }: {
+export declare function startAppServer({ session, bundleServer, apiServer, definition, config, reporter, }: {
     session: Session;
     definition: PackageJson;
     bundleServer: BundleServer;
     apiServer: ApiServer;
     config: CloudpackConfig;
+    reporter: TaskReporter;
 }): Promise<{
     close: () => Promise<void>;
     port: number;

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

@@ -1 +1 @@
-{"version":3,"file":"startAppServer.d.ts","sourceRoot":"","sources":["../../../../src/commands/start/appServer/startAppServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAK/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnE;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAAC,EACnC,OAAO,EACP,YAAY,EACZ,SAAS,EACT,UAAU,EACV,MAA8B,GAC/B,EAAE;IACD,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,YAAY,EAAE,YAAY,CAAC;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,eAAe,CAAC;CACzB;;;;GA6CA"}
+{"version":3,"file":"startAppServer.d.ts","sourceRoot":"","sources":["../../../../src/commands/start/appServer/startAppServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAG/D,OAAO,EAAE,KAAK,YAAY,EAAQ,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnE;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAAC,EACnC,OAAO,EACP,YAAY,EACZ,SAAS,EACT,UAAU,EACV,MAA8B,EAC9B,QAAQ,GACT,EAAE;IACD,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,YAAY,EAAE,YAAY,CAAC;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,YAAY,CAAC;CACxB;;;;GA6CA"}

package/lib/commands/start/appServer/startAppServer.js

@@ -1,7 +1,6 @@
 import { createExpressApp } from '@ms-cloudpack/create-express-app';
 import { createRoutes } from './createRoutes.js';
 import { exitIfPortUnavailable } from './exitIfPortUnavailable.js';
-import { reporter } from '../../../reporter.js';
 import { cyan } from '@ms-cloudpack/task-reporter';
 /**
  * The app server hosts the appropriate routes for the web app, primarily returning html content
@@ -11,7 +10,7 @@ import { cyan } from '@ms-cloudpack/task-reporter';
  * can support whichever routes the app needs, while the bundle server can provide package
  * assets in various forms using its own routing.
  */
-export async function startAppServer({ session, bundleServer, apiServer, definition, config = {}, }) {
+export async function startAppServer({ session, bundleServer, apiServer, definition, config = {}, reporter, }) {
     const { devServer = {} } = config || {};
     // Read the port from the config file or default to array of ports.
     const requireSpecifiedPort = devServer?.port !== undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"startAppServer.js","sourceRoot":"","sources":["../../../../src/commands/start/appServer/startAppServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAInD;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EACnC,OAAO,EACP,YAAY,EACZ,SAAS,EACT,UAAU,EACV,MAAM,GAAG,EAAqB,GAO/B;IACC,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,MAAM,IAAK,EAAsB,CAAC;IAE7D,mEAAmE;IACnE,MAAM,oBAAoB,GAAG,SAAS,EAAE,IAAI,KAAK,SAAS,CAAC;IAC3D,MAAM,KAAK,GAAG,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAE1D,mEAAmE;IACnE,+EAA+E;IAC/E,oEAAoE;IAEpE,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAErD,IAAI;QACF,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,gBAAgB,CAAC;YAClD,SAAS,EAAE,KAAK;YAChB,oBAAoB;YACpB,QAAQ,EAAE,SAAS,EAAE,MAAM;YAC3B,UAAU,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK;YACnC,cAAc;YACd,aAAa,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAC1B,YAAY,CAAC;gBACX,GAAG;gBACH,GAAG;gBACH,OAAO;gBACP,UAAU;gBACV,YAAY;gBACZ,SAAS;gBACT,MAAM;aACP,CAAC;SACL,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,eAAe,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAExE,OAAO;YACL,KAAK;YACL,IAAI;YACJ,GAAG;SACJ,CAAC;KACH;IAAC,OAAO,GAAY,EAAE;QACrB,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,4BAA4B,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1F,qBAAqB,CAAC,GAAG,EAAE,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAEvD,MAAM,GAAG,CAAC;KACX;AACH,CAAC","sourcesContent":["import { createExpressApp } from '@ms-cloudpack/create-express-app';\nimport type { BundleServer } from '../../../types/BundleServer.js';\nimport type { PackageJson } from '@ms-cloudpack/bundler-types';\nimport { createRoutes } from './createRoutes.js';\nimport { exitIfPortUnavailable } from './exitIfPortUnavailable.js';\nimport { reporter } from '../../../reporter.js';\nimport { cyan } from '@ms-cloudpack/task-reporter';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\nimport type { ApiServer, Session } from '@ms-cloudpack/api-server';\n\n/**\n * The app server hosts the appropriate routes for the web app, primarily returning html content\n * which loads resources from the bundle server.\n *\n * Separating the app server from the bundle service keeps the routes separate - the app server\n * can support whichever routes the app needs, while the bundle server can provide package\n * assets in various forms using its own routing.\n */\nexport async function startAppServer({\n  session,\n  bundleServer,\n  apiServer,\n  definition,\n  config = {} as CloudpackConfig,\n}: {\n  session: Session;\n  definition: PackageJson;\n  bundleServer: BundleServer;\n  apiServer: ApiServer;\n  config: CloudpackConfig;\n}) {\n  const { devServer = {} } = config || ({} as CloudpackConfig);\n\n  // Read the port from the config file or default to array of ports.\n  const requireSpecifiedPort = devServer?.port !== undefined;\n  const ports = devServer?.port ?? [5000, 5001, 5002, 5003];\n\n  // Directory to serve as plain static assets. Defaults to \"public\".\n  // Can be overridden by setting the 'publicDir' option in the cloudpack config.\n  // const publicDir = path.resolve(devServer.publicPath ?? 'public');\n\n  const task = reporter.addTask('Starting app server');\n\n  try {\n    const { close, port, url } = await createExpressApp({\n      portRange: ports,\n      requireSpecifiedPort,\n      hostname: devServer?.domain,\n      sslOptions: config.devServer?.https,\n      //  publicDir,\n      setupCallback: (app, url) =>\n        createRoutes({\n          app,\n          url,\n          session,\n          definition,\n          bundleServer,\n          apiServer,\n          config,\n        }),\n    });\n\n    task.complete({ message: `Available @ ${cyan(url)}`, forceShow: true });\n\n    return {\n      close,\n      port,\n      url,\n    };\n  } catch (err: unknown) {\n    task.complete({ status: 'fail', message: 'Failed to start app server', forceShow: true });\n    exitIfPortUnavailable(err, session.projectName, ports);\n\n    throw err;\n  }\n}\n"]}
+{"version":3,"file":"startAppServer.js","sourceRoot":"","sources":["../../../../src/commands/start/appServer/startAppServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAqB,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAItE;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EACnC,OAAO,EACP,YAAY,EACZ,SAAS,EACT,UAAU,EACV,MAAM,GAAG,EAAqB,EAC9B,QAAQ,GAQT;IACC,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,MAAM,IAAK,EAAsB,CAAC;IAE7D,mEAAmE;IACnE,MAAM,oBAAoB,GAAG,SAAS,EAAE,IAAI,KAAK,SAAS,CAAC;IAC3D,MAAM,KAAK,GAAG,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAE1D,mEAAmE;IACnE,+EAA+E;IAC/E,oEAAoE;IAEpE,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAErD,IAAI;QACF,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,gBAAgB,CAAC;YAClD,SAAS,EAAE,KAAK;YAChB,oBAAoB;YACpB,QAAQ,EAAE,SAAS,EAAE,MAAM;YAC3B,UAAU,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK;YACnC,cAAc;YACd,aAAa,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAC1B,YAAY,CAAC;gBACX,GAAG;gBACH,GAAG;gBACH,OAAO;gBACP,UAAU;gBACV,YAAY;gBACZ,SAAS;gBACT,MAAM;aACP,CAAC;SACL,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,eAAe,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAExE,OAAO;YACL,KAAK;YACL,IAAI;YACJ,GAAG;SACJ,CAAC;KACH;IAAC,OAAO,GAAY,EAAE;QACrB,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,4BAA4B,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1F,qBAAqB,CAAC,GAAG,EAAE,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAEvD,MAAM,GAAG,CAAC;KACX;AACH,CAAC","sourcesContent":["import { createExpressApp } from '@ms-cloudpack/create-express-app';\nimport type { BundleServer } from '../../../types/BundleServer.js';\nimport type { PackageJson } from '@ms-cloudpack/bundler-types';\nimport { createRoutes } from './createRoutes.js';\nimport { exitIfPortUnavailable } from './exitIfPortUnavailable.js';\nimport { type TaskReporter, cyan } from '@ms-cloudpack/task-reporter';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\nimport type { ApiServer, Session } from '@ms-cloudpack/api-server';\n\n/**\n * The app server hosts the appropriate routes for the web app, primarily returning html content\n * which loads resources from the bundle server.\n *\n * Separating the app server from the bundle service keeps the routes separate - the app server\n * can support whichever routes the app needs, while the bundle server can provide package\n * assets in various forms using its own routing.\n */\nexport async function startAppServer({\n  session,\n  bundleServer,\n  apiServer,\n  definition,\n  config = {} as CloudpackConfig,\n  reporter,\n}: {\n  session: Session;\n  definition: PackageJson;\n  bundleServer: BundleServer;\n  apiServer: ApiServer;\n  config: CloudpackConfig;\n  reporter: TaskReporter;\n}) {\n  const { devServer = {} } = config || ({} as CloudpackConfig);\n\n  // Read the port from the config file or default to array of ports.\n  const requireSpecifiedPort = devServer?.port !== undefined;\n  const ports = devServer?.port ?? [5000, 5001, 5002, 5003];\n\n  // Directory to serve as plain static assets. Defaults to \"public\".\n  // Can be overridden by setting the 'publicDir' option in the cloudpack config.\n  // const publicDir = path.resolve(devServer.publicPath ?? 'public');\n\n  const task = reporter.addTask('Starting app server');\n\n  try {\n    const { close, port, url } = await createExpressApp({\n      portRange: ports,\n      requireSpecifiedPort,\n      hostname: devServer?.domain,\n      sslOptions: config.devServer?.https,\n      //  publicDir,\n      setupCallback: (app, url) =>\n        createRoutes({\n          app,\n          url,\n          session,\n          definition,\n          bundleServer,\n          apiServer,\n          config,\n        }),\n    });\n\n    task.complete({ message: `Available @ ${cyan(url)}`, forceShow: true });\n\n    return {\n      close,\n      port,\n      url,\n    };\n  } catch (err: unknown) {\n    task.complete({ status: 'fail', message: 'Failed to start app server', forceShow: true });\n    exitIfPortUnavailable(err, session.projectName, ports);\n\n    throw err;\n  }\n}\n"]}

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

@@ -1,9 +1,10 @@
 import type { BundleTaskOptions } from '../../types/BundleTaskOptions.js';
 import type { BundleRequest } from '../../types/BundleRequest.js';
 import type { Task } from '@ms-cloudpack/api-server';
+import type { TaskReporter } from '@ms-cloudpack/task-reporter';
 /**
  * Creates a bundle task tracked in the task runner of the api server. This allows active tasks to be tracked
  * remotely (e.g. in the browser) and allows the user to cancel tasks.
  */
-export declare function createBundleTask(bundleRequest: BundleRequest, options?: BundleTaskOptions): Task<BundleRequest>;
+export declare function createBundleTask(bundleRequest: BundleRequest, options?: BundleTaskOptions, reporter?: TaskReporter): Task<BundleRequest>;
 //# sourceMappingURL=createBundleTask.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"createBundleTask.d.ts","sourceRoot":"","sources":["../../../src/commands/start/createBundleTask.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EAAE,IAAI,EAAiC,MAAM,0BAA0B,CAAC;AAKpF;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC,CAoC/G"}
+{"version":3,"file":"createBundleTask.d.ts","sourceRoot":"","sources":["../../../src/commands/start/createBundleTask.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EAAE,IAAI,EAAiC,MAAM,0BAA0B,CAAC;AAIpF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,aAAa,EAAE,aAAa,EAC5B,OAAO,CAAC,EAAE,iBAAiB,EAC3B,QAAQ,CAAC,EAAE,YAAY,GACtB,IAAI,CAAC,aAAa,CAAC,CAoCrB"}

package/lib/commands/start/createBundleTask.js

@@ -5,7 +5,7 @@ import { bundleTask } from '../../tasks/bundleTask.js';
  * Creates a bundle task tracked in the task runner of the api server. This allows active tasks to be tracked
  * remotely (e.g. in the browser) and allows the user to cancel tasks.
  */
-export function createBundleTask(bundleRequest, options) {
+export function createBundleTask(bundleRequest, options, reporter) {
     const { id, packageName, version, outputPath, packagePath, isExternal } = bundleRequest;
     return {
         name: `Bundle ${packageName}@${version}`,
@@ -13,7 +13,7 @@ export function createBundleTask(bundleRequest, options) {
         dir: `${path.join(packagePath, 'src')}`,
         watch: !isExternal,
         async execute() {
-            await bundleTask({ bundleRequest, options });
+            await bundleTask({ bundleRequest, options, reporter });
             return bundleRequest;
         },
         clear: () => {

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

@@ -1 +1 @@
-{"version":3,"file":"createBundleTask.js","sourceRoot":"","sources":["../../../src/commands/start/createBundleTask.ts"],"names":[],"mappings":"AAGA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAAC,aAA4B,EAAE,OAA2B;IACxF,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,aAAa,CAAC;IAExF,OAAO;QACL,IAAI,EAAE,UAAU,WAAW,IAAI,OAAO,EAAE;QACxC,EAAE;QACF,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,EAAE;QACvC,KAAK,EAAE,CAAC,UAAU;QAClB,KAAK,CAAC,OAAO;YACX,MAAM,UAAU,CAAC,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC,CAAC;YAE7C,OAAO,aAAa,CAAC;QACvB,CAAC;QACD,KAAK,EAAE,GAAG,EAAE;YACV,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC;YAClC,aAAa,CAAC,MAAM,GAAG,SAAS,CAAC;YACjC,gFAAgF;YAChF,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,CAAC;QACD,SAAS,EAAE,GAAG,EAAE;YACd,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC;QACpC,CAAC;QACD,SAAS,EAAE,GAAG,EAAE,CAAW,aAAa,CAAC,MAAM,EAAE,MAAsB;QACvE,mBAAmB,EAAE,GAAG,EAAE,CAAC,CAAC;YAC1B,EAAE;YACF,IAAI,EAAE,UAAU,WAAW,IAAI,OAAO,EAAE;YACxC,SAAS,EAAE,WAAW,IAAI,EAAE;YAC5B,UAAU;SACX,CAAC;QACF,iBAAiB,EAAE,CAAC,UAAU,EAAE,EAAE,CAChC,CAAC;YACC,EAAE;YACF,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM;YAClC,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ;SAChB,CAAA;KAC3B,CAAC;AACJ,CAAC","sourcesContent":["import type { BundleTaskOptions } from '../../types/BundleTaskOptions.js';\nimport type { BundleRequest } from '../../types/BundleRequest.js';\nimport type { Task, TaskEndDescription, TaskError } from '@ms-cloudpack/api-server';\nimport path from 'path';\nimport fs from 'fs';\nimport { bundleTask } from '../../tasks/bundleTask.js';\n\n/**\n * Creates a bundle task tracked in the task runner of the api server. This allows active tasks to be tracked\n * remotely (e.g. in the browser) and allows the user to cancel tasks.\n */\nexport function createBundleTask(bundleRequest: BundleRequest, options?: BundleTaskOptions): Task<BundleRequest> {\n  const { id, packageName, version, outputPath, packagePath, isExternal } = bundleRequest;\n\n  return {\n    name: `Bundle ${packageName}@${version}`,\n    id,\n    dir: `${path.join(packagePath, 'src')}`,\n    watch: !isExternal,\n    async execute(): Promise<BundleRequest> {\n      await bundleTask({ bundleRequest, options });\n\n      return bundleRequest;\n    },\n    clear: () => {\n      bundleRequest.result?.dispose?.();\n      bundleRequest.result = undefined;\n      // eslint-disable-next-line no-restricted-syntax -- this function can't be async\n      fs.rmSync(outputPath, { recursive: true, force: true });\n    },\n    onDispose: () => {\n      bundleRequest.result?.dispose?.();\n    },\n    getErrors: () => (<unknown>bundleRequest.result?.errors) as TaskError[],\n    getStartDescription: () => ({\n      id,\n      name: `Bundle ${packageName}@${version}`,\n      inputPath: packagePath || '',\n      outputPath,\n    }),\n    getEndDescription: (taskResult) =>\n      ({\n        id,\n        errors: taskResult?.result?.errors,\n        warnings: taskResult?.result?.warnings,\n      } as TaskEndDescription),\n  };\n}\n"]}
+{"version":3,"file":"createBundleTask.js","sourceRoot":"","sources":["../../../src/commands/start/createBundleTask.ts"],"names":[],"mappings":"AAGA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAGvD;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAC9B,aAA4B,EAC5B,OAA2B,EAC3B,QAAuB;IAEvB,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,aAAa,CAAC;IAExF,OAAO;QACL,IAAI,EAAE,UAAU,WAAW,IAAI,OAAO,EAAE;QACxC,EAAE;QACF,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,EAAE;QACvC,KAAK,EAAE,CAAC,UAAU;QAClB,KAAK,CAAC,OAAO;YACX,MAAM,UAAU,CAAC,EAAE,aAAa,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;YAEvD,OAAO,aAAa,CAAC;QACvB,CAAC;QACD,KAAK,EAAE,GAAG,EAAE;YACV,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC;YAClC,aAAa,CAAC,MAAM,GAAG,SAAS,CAAC;YACjC,gFAAgF;YAChF,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,CAAC;QACD,SAAS,EAAE,GAAG,EAAE;YACd,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC;QACpC,CAAC;QACD,SAAS,EAAE,GAAG,EAAE,CAAW,aAAa,CAAC,MAAM,EAAE,MAAsB;QACvE,mBAAmB,EAAE,GAAG,EAAE,CAAC,CAAC;YAC1B,EAAE;YACF,IAAI,EAAE,UAAU,WAAW,IAAI,OAAO,EAAE;YACxC,SAAS,EAAE,WAAW,IAAI,EAAE;YAC5B,UAAU;SACX,CAAC;QACF,iBAAiB,EAAE,CAAC,UAAU,EAAE,EAAE,CAChC,CAAC;YACC,EAAE;YACF,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM;YAClC,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ;SAChB,CAAA;KAC3B,CAAC;AACJ,CAAC","sourcesContent":["import type { BundleTaskOptions } from '../../types/BundleTaskOptions.js';\nimport type { BundleRequest } from '../../types/BundleRequest.js';\nimport type { Task, TaskEndDescription, TaskError } from '@ms-cloudpack/api-server';\nimport path from 'path';\nimport fs from 'fs';\nimport { bundleTask } from '../../tasks/bundleTask.js';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\n\n/**\n * Creates a bundle task tracked in the task runner of the api server. This allows active tasks to be tracked\n * remotely (e.g. in the browser) and allows the user to cancel tasks.\n */\nexport function createBundleTask(\n  bundleRequest: BundleRequest,\n  options?: BundleTaskOptions,\n  reporter?: TaskReporter,\n): Task<BundleRequest> {\n  const { id, packageName, version, outputPath, packagePath, isExternal } = bundleRequest;\n\n  return {\n    name: `Bundle ${packageName}@${version}`,\n    id,\n    dir: `${path.join(packagePath, 'src')}`,\n    watch: !isExternal,\n    async execute(): Promise<BundleRequest> {\n      await bundleTask({ bundleRequest, options, reporter });\n\n      return bundleRequest;\n    },\n    clear: () => {\n      bundleRequest.result?.dispose?.();\n      bundleRequest.result = undefined;\n      // eslint-disable-next-line no-restricted-syntax -- this function can't be async\n      fs.rmSync(outputPath, { recursive: true, force: true });\n    },\n    onDispose: () => {\n      bundleRequest.result?.dispose?.();\n    },\n    getErrors: () => (<unknown>bundleRequest.result?.errors) as TaskError[],\n    getStartDescription: () => ({\n      id,\n      name: `Bundle ${packageName}@${version}`,\n      inputPath: packagePath || '',\n      outputPath,\n    }),\n    getEndDescription: (taskResult) =>\n      ({\n        id,\n        errors: taskResult?.result?.errors,\n        warnings: taskResult?.result?.warnings,\n      } as TaskEndDescription),\n  };\n}\n"]}

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

@@ -1,8 +1,11 @@
 import type { Session } from '@ms-cloudpack/api-server';
 import type { CloudpackConfig } from '@ms-cloudpack/config';
+import type { TaskReporter } from '@ms-cloudpack/task-reporter';
 export interface SessionOptions {
     appPath: string;
     config: CloudpackConfig;
 }
-export declare function createSession(options: SessionOptions): Promise<Session>;
+export declare function createSession(options: SessionOptions, context: {
+    reporter: TaskReporter;
+}): Promise<Session>;
 //# sourceMappingURL=createSession.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"createSession.d.ts","sourceRoot":"","sources":["../../../src/commands/start/createSession.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAY5D,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,eAAe,CAAC;CACzB;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,CAsD7E"}
+{"version":3,"file":"createSession.d.ts","sourceRoot":"","sources":["../../../src/commands/start/createSession.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAQ5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAKhE,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,eAAe,CAAC;CACzB;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE;IAAE,QAAQ,EAAE,YAAY,CAAA;CAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAyDlH"}

package/lib/commands/start/createSession.js

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