@ms-cloudpack/cli 0.26.5 → 0.27.0

package/lib/index.js

@@ -1,8 +1,10 @@
+import { bold, debugLoggingConfig, defaultLoggingConfig, gradient, verboseLoggingConfig, } from '@ms-cloudpack/task-reporter';
 import { Command } from 'commander';
 import glob from 'glob';
 import path from 'path';
 import { fileURLToPath, pathToFileURL } from 'url';
 import { getVersion } from './getVersion.js';
+import { initReporter } from './reporter.js';
 const currentPath = path.dirname(fileURLToPath(import.meta.url));
 /**
  * Entry point for the cloudpack CLI. Resolves all commands defined
@@ -10,12 +12,28 @@ const currentPath = path.dirname(fileURLToPath(import.meta.url));
  */
 export async function start() {
     const program = new Command();
-    program.name('cloudpack').version(getVersion()).usage('<command> [options]');
+    const version = getVersion();
+    // the name "Cloudpack" preceed by an emoji representing sun behind cloud
+    const productName = gradient(`Cloudpack`);
+    const useDebugLogging = process.argv.includes('--debug') || process.argv.includes('-d');
+    const verb = process.argv[2];
+    const useVerboseLogging = process.argv.includes('--verbose') || process.argv.includes('-v') || verb === 'bundle';
+    program.name(productName).version(version).usage('<command> [options]');
+    initReporter({
+        productName,
+        version,
+        description: `Running "${bold(process.argv.slice(2).join(' '))}"`,
+        ...defaultLoggingConfig,
+        ...(useVerboseLogging && verboseLoggingConfig),
+        ...(useDebugLogging && debugLoggingConfig),
+    });
     const commands = glob.sync('commands/*/index.js', { cwd: currentPath });
     for (const commandPath of commands) {
         const command = (await import(pathToFileURL(path.resolve(currentPath, commandPath)).toString()));
         command.init(program);
     }
+    program.option('-v, --verbose', 'Show additional details about the running tasks. (default: false)');
+    program.option('-d, --debug', 'Show debug information (superset of --verbose). (default: false)');
     program.parse(process.argv);
     if (program.args.length === 0) {
         program.help();

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAEjE;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,KAAK;IACzB,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAE9B,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAE7E,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC,CAAC;IAExE,KAAK,MAAM,WAAW,IAAI,QAAQ,EAAE;QAClC,MAAM,OAAO,GAAG,CAAC,MAAM,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAE9F,CAAC;QAEF,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;KACvB;IAED,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5B,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QAC7B,OAAO,CAAC,IAAI,EAAE,CAAC;KAChB;AACH,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,kBAAkB,EAClB,oBAAoB,EACpB,QAAQ,EACR,oBAAoB,GACrB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAEjE;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,KAAK;IACzB,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAC9B,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAC7B,yEAAyE;IACzE,MAAM,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC1C,MAAM,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACxF,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC7B,MAAM,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,QAAQ,CAAC;IAEjH,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAExE,YAAY,CAAC;QACX,WAAW;QACX,OAAO;QACP,WAAW,EAAE,YAAY,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG;QACjE,GAAG,oBAAoB;QACvB,GAAG,CAAC,iBAAiB,IAAI,oBAAoB,CAAC;QAC9C,GAAG,CAAC,eAAe,IAAI,kBAAkB,CAAC;KAC3C,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC,CAAC;IAExE,KAAK,MAAM,WAAW,IAAI,QAAQ,EAAE;QAClC,MAAM,OAAO,GAAG,CAAC,MAAM,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAE9F,CAAC;QAEF,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;KACvB;IAED,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,mEAAmE,CAAC,CAAC;IACrG,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,kEAAkE,CAAC,CAAC;IAElG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5B,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QAC7B,OAAO,CAAC,IAAI,EAAE,CAAC;KAChB;AACH,CAAC"}

package/lib/reporter.d.ts

@@ -0,0 +1,4 @@
+import { TaskReporter, type TaskReporterOptions } from '@ms-cloudpack/task-reporter';
+export declare const reporter: TaskReporter;
+export declare function initReporter(options: TaskReporterOptions): void;
+export { noLoggingConfig, defaultLoggingConfig, verboseLoggingConfig, debugLoggingConfig, } from '@ms-cloudpack/task-reporter';

package/lib/reporter.js

@@ -0,0 +1,7 @@
+import { TaskReporter } from '@ms-cloudpack/task-reporter';
+export const reporter = new TaskReporter();
+export function initReporter(options) {
+    reporter.setOptions(options);
+}
+export { noLoggingConfig, defaultLoggingConfig, verboseLoggingConfig, debugLoggingConfig, } from '@ms-cloudpack/task-reporter';
+//# sourceMappingURL=reporter.js.map

package/lib/reporter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"reporter.js","sourceRoot":"","sources":["../src/reporter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA4B,MAAM,6BAA6B,CAAC;AAErF,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,YAAY,EAAE,CAAC;AAE3C,MAAM,UAAU,YAAY,CAAC,OAA4B;IACvD,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AAC/B,CAAC;AAED,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,6BAA6B,CAAC"}

package/lib/tasks/bundleTask.d.ts

@@ -0,0 +1,5 @@
+import type { BundleRequest, BundleTaskOptions } from '../types.js';
+export declare function bundleTask({ bundleRequest, options, }: {
+    bundleRequest: BundleRequest;
+    options?: BundleTaskOptions;
+}): Promise<BundleRequest>;

package/lib/tasks/bundleTask.js

@@ -0,0 +1,80 @@
+import { bundlePackage } from '@ms-cloudpack/bundler';
+import { bulletedList, formatPackageName } from '@ms-cloudpack/task-reporter';
+import { readJson, writeJson } from '@ms-cloudpack/json-utilities';
+import path from 'path';
+import { formatBundleErrors } from './formatBundleErrors.js';
+import { prepareOutputPath } from '../common/prepareOutputPath.js';
+import { reporter } from '../reporter.js';
+export async function bundleTask({ bundleRequest, options = {}, }) {
+    const { packageName, version } = bundleRequest;
+    const { force } = options || {};
+    // If force is set, dispose the existing result.
+    if (force && bundleRequest?.result?.dispose) {
+        bundleRequest.result.dispose();
+        bundleRequest.result = undefined;
+    }
+    const { rebuild } = bundleRequest?.result || {};
+    const taskName = `${rebuild ? `Re-bundle` : `Bundle`} ${formatPackageName({ name: packageName, version })}`;
+    await reporter.runTask(taskName, async () => {
+        if (rebuild) {
+            bundleRequest.result = await rebuild();
+        }
+        else {
+            await bundle(bundleRequest, force);
+        }
+        const result = (bundleRequest.result || (bundleRequest.result = {}));
+        result.outputFiles || (result.outputFiles = []);
+        result.errors || (result.errors = []);
+        result.warnings || (result.warnings = []);
+        if (!result.outputFiles.length) {
+            result.warnings.push({
+                text: `No output files were found for "${packageName}" in "${bundleRequest.outputPath}"`,
+            });
+        }
+        return {
+            status: result.errors.length ? 'fail' : 'complete',
+            ...formatBundleErrors(result.errors),
+            extended: bulletedList([
+                `Bundler: ${result.bundlerName || 'unknown'}`,
+                `Input path: ${bundleRequest.packagePath}`,
+                `Entries:\n${bulletedList(Object.keys(result.entries || {}), 2)}`,
+                `Output path: ${bundleRequest.outputPath}`,
+                ...(result.outputFiles.length
+                    ? [
+                        `Output files:`,
+                        result.outputFiles.map((file) => path.relative(bundleRequest.outputPath, file.outputPath)),
+                    ]
+                    : []),
+            ]),
+        };
+    });
+    return bundleRequest;
+}
+async function bundle(bundleRequest, force) {
+    const { packagePath, outputPath, isExternal } = bundleRequest;
+    // Rehydrate the result if not incremental.
+    if (isExternal && !force) {
+        bundleRequest.result = (await readJson(path.join(outputPath, 'result.json')));
+    }
+    if (bundleRequest.result?.errors?.length === 0) {
+        bundleRequest.resultFromCache = true;
+    }
+    else {
+        bundleRequest.resultFromCache = false;
+        // Only use cached result if it's successful.
+        await prepareOutputPath(outputPath);
+        bundleRequest.result = await bundlePackage({
+            inputPath: packagePath,
+            outputPath,
+            incremental: !isExternal,
+            packages: bundleRequest.packages,
+        });
+        // Write the result to disk.
+        if (isExternal) {
+            bundleRequest.result.rawInput = bundleRequest.result.rawOutput = undefined;
+            await writeJson(path.join(outputPath, 'result.json'), bundleRequest.result);
+        }
+    }
+    return bundleRequest;
+}
+//# sourceMappingURL=bundleTask.js.map

package/lib/tasks/bundleTask.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bundleTask.js","sourceRoot":"","sources":["../../src/tasks/bundleTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAA+B,MAAM,6BAA6B,CAAC;AAC3G,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,EAC/B,aAAa,EACb,OAAO,GAAG,EAAE,GAIb;IACC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC;IAC/C,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IAEhC,gDAAgD;IAChD,IAAI,KAAK,IAAI,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE;QAC3C,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QAC/B,aAAa,CAAC,MAAM,GAAG,SAAS,CAAC;KAClC;IAED,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,EAAE,MAAM,IAAI,EAAE,CAAC;IAChD,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,IAAI,iBAAiB,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;IAE5G,MAAM,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,IAAqC,EAAE;QAC3E,IAAI,OAAO,EAAE;YACX,aAAa,CAAC,MAAM,GAAG,MAAM,OAAO,EAAE,CAAC;SACxC;aAAM;YACL,MAAM,MAAM,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;SACpC;QAED,MAAM,MAAM,GAAG,CAAC,aAAa,CAAC,MAAM,KAApB,aAAa,CAAC,MAAM,GAAK,EAAE,EAAC,CAAC;QAE7C,MAAM,CAAC,WAAW,KAAlB,MAAM,CAAC,WAAW,GAAK,EAAE,EAAC;QAC1B,MAAM,CAAC,MAAM,KAAb,MAAM,CAAC,MAAM,GAAK,EAAE,EAAC;QACrB,MAAM,CAAC,QAAQ,KAAf,MAAM,CAAC,QAAQ,GAAK,EAAE,EAAC;QAEvB,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE;YAC9B,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;gBACnB,IAAI,EAAE,mCAAmC,WAAW,SAAS,aAAa,CAAC,UAAU,GAAG;aACzF,CAAC,CAAC;SACJ;QAED,OAAO;YACL,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU;YAClD,GAAG,kBAAkB,CAAC,MAAM,CAAC,MAAM,CAAC;YACpC,QAAQ,EAAE,YAAY,CAAC;gBACrB,YAAY,MAAM,CAAC,WAAW,IAAI,SAAS,EAAE;gBAC7C,eAAe,aAAa,CAAC,WAAW,EAAE;gBAC1C,aAAa,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE;gBACjE,gBAAgB,aAAa,CAAC,UAAU,EAAE;gBAC1C,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM;oBAC3B,CAAC,CAAC;wBACE,eAAe;wBACf,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;qBAC3F;oBACH,CAAC,CAAC,EAAE,CAAC;aACR,CAAC;SACH,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,KAAK,UAAU,MAAM,CAAC,aAA4B,EAAE,KAAe;IACjE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,aAAa,CAAC;IAE9D,2CAA2C;IAC3C,IAAI,UAAU,IAAI,CAAC,KAAK,EAAE;QACxB,aAAa,CAAC,MAAM,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC,CAAiB,CAAC;KAC/F;IAED,IAAI,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC,EAAE;QAC9C,aAAa,CAAC,eAAe,GAAG,IAAI,CAAC;KACtC;SAAM;QACL,aAAa,CAAC,eAAe,GAAG,KAAK,CAAC;QAEtC,6CAA6C;QAC7C,MAAM,iBAAiB,CAAC,UAAU,CAAC,CAAC;QAEpC,aAAa,CAAC,MAAM,GAAG,MAAM,aAAa,CAAC;YACzC,SAAS,EAAE,WAAW;YACtB,UAAU;YACV,WAAW,EAAE,CAAC,UAAU;YACxB,QAAQ,EAAE,aAAa,CAAC,QAAQ;SACjC,CAAC,CAAC;QAEH,4BAA4B;QAC5B,IAAI,UAAU,EAAE;YACd,aAAa,CAAC,MAAM,CAAC,QAAQ,GAAG,aAAa,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;YAC3E,MAAM,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;SAC7E;KACF;IAED,OAAO,aAAa,CAAC;AACvB,CAAC"}

package/lib/tasks/formatBundleErrors.d.ts

@@ -0,0 +1,8 @@
+import type { BundleMessage } from '@ms-cloudpack/bundler-types';
+export declare function formatBundleErrors(errors: BundleMessage[] | undefined): {
+    message?: undefined;
+    details?: undefined;
+} | {
+    message: string;
+    details: string;
+};

package/lib/tasks/formatBundleErrors.js

@@ -0,0 +1,19 @@
+import { darkGrey, red, bulletedList } from '@ms-cloudpack/task-reporter';
+export function formatBundleErrors(errors) {
+    if (!errors?.length)
+        return {};
+    return {
+        message: `${errors.length} ${errors.length === 1 ? 'error' : 'errors'} found`,
+        details: bulletedList(errors.map((error) => formatError(error))),
+    };
+}
+function formatError(error) {
+    const { location } = error;
+    return [
+        location && darkGrey(`${location.file}:${location.line}:${location.column}:`),
+        red(error.text ? error.text : JSON.stringify(error, null, 2)),
+    ]
+        .filter(Boolean)
+        .join(' ');
+}
+//# sourceMappingURL=formatBundleErrors.js.map

package/lib/tasks/formatBundleErrors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"formatBundleErrors.js","sourceRoot":"","sources":["../../src/tasks/formatBundleErrors.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE1E,MAAM,UAAU,kBAAkB,CAAC,MAAmC;IACpE,IAAI,CAAC,MAAM,EAAE,MAAM;QAAE,OAAO,EAAE,CAAC;IAE/B,OAAO;QACL,OAAO,EAAE,GAAG,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,QAAQ;QAC7E,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;KACjE,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,KAAoB;IACvC,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAE3B,OAAO;QACL,QAAQ,IAAI,QAAQ,CAAC,GAAG,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC;QAC7E,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;KAC9D;SACE,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;AACf,CAAC"}

package/lib/tasks/resolveDependenciesTask.d.ts

@@ -0,0 +1,10 @@
+import { type ResolveMap, type PackageDefinitions } from '@ms-cloudpack/package-utilities';
+/**
+ * Resolves the locations of dependencies and returns the resolve map, logging results
+ * to the task reporter.
+ */
+export declare function resolveDependenciesTask({ appPath, additionalPaths, packages, }: {
+    appPath: string;
+    additionalPaths?: string[];
+    packages?: PackageDefinitions;
+}): Promise<ResolveMap | undefined>;

package/lib/tasks/resolveDependenciesTask.js

@@ -0,0 +1,57 @@
+import { createResolveMap, } from '@ms-cloudpack/package-utilities';
+import { cyan, yellow, bulletedList, bold } from '@ms-cloudpack/task-reporter';
+import { reporter } from '../reporter.js';
+/**
+ * Resolves the locations of dependencies and returns the resolve map, logging results
+ * to the task reporter.
+ */
+export async function resolveDependenciesTask({ appPath, additionalPaths, packages, }) {
+    let resolveMap;
+    // Grab the installed dependency locations.
+    await reporter?.runTask('Resolving dependencies', async () => {
+        resolveMap = await createResolveMap({ appPath, additionalPaths, strictVersioning: false, packages });
+        const { allPackages, duplicatedPackages } = getPackagesFromResolveMap(resolveMap);
+        const message = `Found ${cyan(allPackages.size)} total packages, ${duplicatedPackages.size ? `${yellow(duplicatedPackages.size)} with multiple versions.` : `no duplicates.`}`;
+        const extended = bulletedList(Array.from(duplicatedPackages.entries()).map(([name, versions]) => `${bold(name)}: ${Array.from(versions).join(', ')}`));
+        return {
+            message,
+            extended,
+            forceShow: true,
+        };
+    });
+    return resolveMap;
+}
+/**
+ * Given a resolveMap, returns a map of all packages and a map of packages with multiple versions.
+ * This is used to log the results of the resolve task.
+ */
+function getPackagesFromResolveMap(resolveMap) {
+    const allPackages = new Map();
+    const duplicatedPackages = new Map();
+    function addEntry(entry) {
+        if (allPackages.has(entry.name)) {
+            if (!duplicatedPackages.has(entry.name)) {
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                duplicatedPackages.set(entry.name, new Set([allPackages.get(entry.name).version]));
+            }
+            const dupeSet = duplicatedPackages.get(entry.name);
+            dupeSet?.add(entry.version);
+        }
+        else {
+            allPackages.set(entry.name, entry);
+        }
+    }
+    for (const currentEntry of Object.values(resolveMap)) {
+        addEntry(currentEntry);
+        if (currentEntry.scopedVersions) {
+            for (const scopedEntry of Object.values(currentEntry.scopedVersions)) {
+                addEntry(scopedEntry);
+            }
+        }
+    }
+    return {
+        allPackages,
+        duplicatedPackages,
+    };
+}
+//# sourceMappingURL=resolveDependenciesTask.js.map

package/lib/tasks/resolveDependenciesTask.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolveDependenciesTask.js","sourceRoot":"","sources":["../../src/tasks/resolveDependenciesTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,gBAAgB,GAGjB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,EAC5C,OAAO,EACP,eAAe,EACf,QAAQ,GAKT;IACC,IAAI,UAAkC,CAAC;IAEvC,2CAA2C;IAC3C,MAAM,QAAQ,EAAE,OAAO,CAAC,wBAAwB,EAAE,KAAK,IAAI,EAAE;QAC3D,UAAU,GAAG,MAAM,gBAAgB,CAAC,EAAE,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;QAErG,MAAM,EAAE,WAAW,EAAE,kBAAkB,EAAE,GAAG,yBAAyB,CAAC,UAAU,CAAC,CAAC;QAClF,MAAM,OAAO,GAAG,SAAS,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,oBAC7C,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC,CAAC,gBAC3F,EAAE,CAAC;QACH,MAAM,QAAQ,GAAG,YAAY,CAC3B,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAC1C,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC1E,CACF,CAAC;QAEF,OAAO;YACL,OAAO;YACP,QAAQ;YACR,SAAS,EAAE,IAAI;SAChB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,UAAU,CAAC;AACpB,CAAC;AAED;;;GAGG;AACH,SAAS,yBAAyB,CAAC,UAAsB;IACvD,MAAM,WAAW,GAAG,IAAI,GAAG,EAA2B,CAAC;IACvD,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAuB,CAAC;IAE1D,SAAS,QAAQ,CAAC,KAAsB;QACtC,IAAI,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YAC/B,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;gBACvC,oEAAoE;gBACpE,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;aACrF;YACD,MAAM,OAAO,GAAG,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAEnD,OAAO,EAAE,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SAC7B;aAAM;YACL,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;SACpC;IACH,CAAC;IAED,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;QACpD,QAAQ,CAAC,YAAY,CAAC,CAAC;QAEvB,IAAI,YAAY,CAAC,cAAc,EAAE;YAC/B,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE;gBACpE,QAAQ,CAAC,WAAW,CAAC,CAAC;aACvB;SACF;KACF;IAED,OAAO;QACL,WAAW;QACX,kBAAkB;KACnB,CAAC;AACJ,CAAC"}

package/lib/types.d.ts

@@ -1,5 +1,5 @@
 import type { ImportMap, ResolveMap } from '@ms-cloudpack/package-utilities';
-import type { BundleResult, PackageJson } from '@ms-cloudpack/bundler-types';
+import type { BundleResult, PackageJson, PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';
 import type { HttpsConfig } from '@ms-cloudpack/create-express-app';
 export interface Session {
     /**
@@ -74,8 +74,11 @@ export interface BundleRequest {
     packagePath: string;
     outputPath: string;
     isExternal: boolean;
+    bundlerType?: string;
     result?: BundleResult;
+    resultFromCache?: boolean;
     isRebuildRequired?: boolean;
+    packages?: PackageDefinitionsCache;
 }
 export interface BundleTaskOptions {
     force?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/cli",
-  "version": "0.26.5",
+  "version": "0.27.0",
   "description": "The Cloudpack command line interface - a tool for managing fast inner and outer looping in web apps.",
   "license": "MIT",
   "type": "module",
@@ -16,14 +16,15 @@
     "cloudpack": "./bin/cloudpack.js"
   },
   "dependencies": {
-    "@ms-cloudpack/bundler": "^0.9.14",
+    "@ms-cloudpack/bundler": "^0.11.0",
     "@ms-cloudpack/create-express-app": "^1.2.4",
     "@ms-cloudpack/data-bus": "^0.1.1",
     "@ms-cloudpack/json-utilities": "^0.0.5",
     "@ms-cloudpack/overlay": "^0.11.3",
-    "@ms-cloudpack/package-utilities": "^2.3.6",
+    "@ms-cloudpack/package-utilities": "^2.3.8",
     "@ms-cloudpack/path-utilities": "^2.1.1",
     "@ms-cloudpack/path-string-parsing": "^1.0.1",
+    "@ms-cloudpack/task-reporter": "^0.1.1",
     "chokidar": "^3.5.3",
     "commander": "^10.0.0",
     "es-module-lexer": "^1.0.3",

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

@@ -1,11 +0,0 @@
-export interface Log {
-    messages: {
-        errors: string[];
-        warnings: string[];
-    };
-    error: (message: string, error?: Error) => void;
-    warn: (message: string, error?: Error) => void;
-    info: (message: string) => void;
-    task: <TReturn>(task: string | string[], execute: () => Promise<TReturn>) => Promise<TReturn>;
-}
-export declare function createLog(): Log;

package/lib/commands/init/createLog.js

@@ -1,25 +0,0 @@
-export function createLog() {
-    const messages = { errors: [], warnings: [] };
-    return {
-        messages,
-        error: (message, error) => {
-            messages.errors.push(message + (error ? `\n${error.toString?.() || String(error)}` : ''));
-        },
-        warn: (message) => {
-            messages.warnings.push(message);
-        },
-        info: (message) => {
-            console.log(message);
-        },
-        task: async (task, execute) => {
-            const [taskType, taskDetails] = Array.isArray(task) ? task : [task, undefined];
-            console.log(`>>> [Start: ${taskType}]${taskDetails ? ` ${taskDetails}` : ''}`);
-            const start = Date.now();
-            const result = await execute();
-            const end = Date.now();
-            console.log(`<<< [End: ${taskType}]${taskDetails ? ` ${taskDetails}` : ''} (${end - start}ms)`);
-            return result;
-        },
-    };
-}
-//# sourceMappingURL=createLog.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"createLog.js","sourceRoot":"","sources":["../../../src/commands/init/createLog.ts"],"names":[],"mappings":"AAQA,MAAM,UAAU,SAAS;IACvB,MAAM,QAAQ,GAAoB,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IAE/D,OAAO;QACL,QAAQ;QACR,KAAK,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;YACxB,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,QAAQ,EAAE,EAAE,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC5F,CAAC;QACD,IAAI,EAAE,CAAC,OAAe,EAAE,EAAE;YACxB,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAClC,CAAC;QACD,IAAI,EAAE,CAAC,OAAe,EAAE,EAAE;YACxB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACvB,CAAC;QACD,IAAI,EAAE,KAAK,EAAW,IAAuB,EAAE,OAA+B,EAAE,EAAE;YAChF,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YAC/E,OAAO,CAAC,GAAG,CAAC,eAAe,QAAQ,IAAI,WAAW,CAAC,CAAC,CAAC,IAAI,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAE/E,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACzB,MAAM,MAAM,GAAG,MAAM,OAAO,EAAE,CAAC;YAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAEvB,OAAO,CAAC,GAAG,CAAC,aAAa,QAAQ,IAAI,WAAW,CAAC,CAAC,CAAC,IAAI,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,GAAG,GAAG,KAAK,KAAK,CAAC,CAAC;YAEhG,OAAO,MAAM,CAAC;QAChB,CAAC;KACF,CAAC;AACJ,CAAC"}