@komaci/cli 240.1.5 → 242.1.1

package/build/cmds/modgen/index.js

@@ -35,6 +35,18 @@ export default {
             type: Boolean,
             defaultValue: false,
         },
+        {
+            name: 'raw',
+            alias: 'r',
+            type: Boolean,
+            defaultValue: false,
+        },
+        {
+            name: 'withExceptions',
+            alias: 'e',
+            type: Boolean,
+            defaultValue: false,
+        },
     ],
     run,
 };

package/build/cmds/modgen/lib/readAndParseBundle.d.ts

@@ -1,4 +1,4 @@
-import { BundleConfig } from '@lwc/metadata';
+import { BundleConfig } from '@lwc-platform/lwc-metadata-next';
 import { ParsedBundle } from '../types';
 /**
  * typeof BundleConfig.file
@@ -22,5 +22,14 @@ export declare function readBundle(path: string): BundleFile[];
  * @returns ParsedBundle that includes the BundleConfig & GeneratorInput inputs, and BundleMetadata and generated module output
  */
 export declare function readAndParseBundle(path: string, configOverrides: Partial<BundleConfig>): ParsedBundle;
+/**
+ * Takes the directory path of an LWC module bundle and an optional set of config overrides. Returns the ParsedBundle, including
+ * the bundle's 1) LWC Metadata and 2) Komaci / Resolvable module.
+ * NOTE: This function allows an exception to be thrown in the generation process for us to consume instead of creating an error adg function.
+ * @param path
+ * @param configOverrides
+ * @returns ParsedBundle that includes the BundleConfig & GeneratorInput inputs, and BundleMetadata and generated module output
+ */
+export declare function readAndParseBundleWithExceptions(path: string, configOverrides: Partial<BundleConfig>): string;
 export {};
 //# sourceMappingURL=readAndParseBundle.d.ts.map

package/build/cmds/modgen/lib/readAndParseBundle.js

@@ -1,7 +1,7 @@
 import { readdirSync, existsSync, readFileSync } from 'fs';
 import { basename, dirname, extname, resolve } from 'path';
-import { collectBundleMetadata } from '@lwc/metadata';
-import { generateKomaciModule } from '@komaci/esm-generator';
+import { collectBundleMetadata } from '@lwc-platform/lwc-metadata-next';
+import { generateKomaciModule, processGeneratorInputAndState } from '@komaci/esm-generator';
 /**
  * Finds all .js, .mjs, .css, and .html files within the given directory, reads their contents, and combines them into a bundle,
  * and returning the array of BundleFile containing the file's fileName and source
@@ -66,4 +66,42 @@ export function readAndParseBundle(path, configOverrides) {
         output: { modGenOutput, metadata },
     };
 }
+/**
+ * Takes the directory path of an LWC module bundle and an optional set of config overrides. Returns the ParsedBundle, including
+ * the bundle's 1) LWC Metadata and 2) Komaci / Resolvable module.
+ * NOTE: This function allows an exception to be thrown in the generation process for us to consume instead of creating an error adg function.
+ * @param path
+ * @param configOverrides
+ * @returns ParsedBundle that includes the BundleConfig & GeneratorInput inputs, and BundleMetadata and generated module output
+ */
+export function readAndParseBundleWithExceptions(path, configOverrides) {
+    const files = readBundle(path);
+    const name = basename(path);
+    const namespace = basename(dirname(path));
+    const bundleConfig = {
+        namespace,
+        name,
+        type: 'internal',
+        namespaceMapping: {},
+        files,
+        enableKomaci: true,
+        ...configOverrides,
+    };
+    const metadata = collectBundleMetadata(bundleConfig);
+    // Create input to module generator.
+    const srcFileMap = files.reduce((map, { fileName, source }) => ({ ...map, [fileName]: source }), {});
+    const inputFiles = Object.fromEntries(metadata.files
+        .map(({ fileName, komaciDoc }) => [fileName, komaciDoc])
+        .filter(([, komaciDoc]) => !!komaciDoc));
+    const input = {
+        moduleInfo: {
+            name,
+            namespace: bundleConfig.namespace,
+            type: 'bundle',
+            files: inputFiles,
+        },
+        srcFileMap,
+    };
+    return processGeneratorInputAndState(input);
+}
 //# sourceMappingURL=readAndParseBundle.js.map

package/build/cmds/modgen/lib/run.js

@@ -1,4 +1,4 @@
-import { readAndParseBundle } from './readAndParseBundle.js';
+import { readAndParseBundle, readAndParseBundleWithExceptions } from './readAndParseBundle.js';
 import logger, { serialize } from '../../../lib/log.js';
 const { log, warn } = logger;
 /**
@@ -8,13 +8,30 @@ const { log, warn } = logger;
 export function run(cmdOptions) {
     const { paths = [], disableKomaci = false, bundleType: type } = cmdOptions;
     if (paths.length) {
-        const parsedBundles = paths.map((path) => readAndParseBundle(path, { enableKomaci: !disableKomaci, type }));
-        for (const parsedBundle of parsedBundles) {
-            const { input: { bundleConfig = null } = {}, output } = parsedBundle || {};
-            const { type, namespace, name, namespaceMapping = {}, enableKomaci = false, files = [], } = bundleConfig || {};
-            const fileNames = files.map(({ fileName }) => fileName);
-            const toPrint = { type, namespace, name, namespaceMapping, enableKomaci, fileNames, output };
-            printOutput(cmdOptions, toPrint);
+        if (cmdOptions.withExceptions) {
+            const errors = [];
+            paths.map((path) => {
+                try {
+                    readAndParseBundleWithExceptions(path, { enableKomaci: !disableKomaci, type });
+                }
+                catch (e) {
+                    errors.push({ path: path, error: e });
+                }
+            });
+            log('Total Errors: ' + errors.length);
+            errors.forEach((ec) => {
+                log(ec);
+            });
+        }
+        else {
+            const parsedBundles = paths.map((path) => readAndParseBundle(path, { enableKomaci: !disableKomaci, type }));
+            for (const parsedBundle of parsedBundles) {
+                const { input: { bundleConfig = null } = {}, output } = parsedBundle || {};
+                const { type, namespace, name, namespaceMapping = {}, enableKomaci = false, files = [], } = bundleConfig || {};
+                const fileNames = files.map(({ fileName }) => fileName);
+                const toPrint = { type, namespace, name, namespaceMapping, enableKomaci, fileNames, output };
+                printOutput(cmdOptions, toPrint);
+            }
         }
     }
     else {
@@ -28,10 +45,11 @@ export function run(cmdOptions) {
  */
 function printOutput(cmdOptions, toPrint) {
     const { output: { metadata, modGenOutput } = {} } = toPrint;
-    const { json, only = [] } = cmdOptions;
+    const { json, only = [], raw } = cmdOptions;
+    const prettyOutput = !json && !raw;
     if (only.includes('lwc')) {
-        log('===== LWC Metadata =====');
-        log(serialize(metadata, !json));
+        raw || log('===== LWC Metadata =====');
+        log(serialize(metadata, prettyOutput));
     }
     if (only.includes('doc')) {
         const files = (metadata?.files ?? []);
@@ -39,13 +57,13 @@ function printOutput(cmdOptions, toPrint) {
             .filter(({ fileType }) => ['js', 'html'].includes(fileType))
             .map((file) => [file.fileName, file.komaciDoc]);
         for (const [fileName, doc] of docs) {
-            log('===== Komaci Document =====');
-            log(`===== ${fileName} =====`);
-            log(serialize(doc, !json));
+            raw || log('===== Komaci Document =====');
+            raw || log(`===== ${fileName} =====`);
+            log(serialize(doc, prettyOutput));
         }
     }
     if (only.includes('mod')) {
-        log('===== Komaci Module =====');
+        raw || log('===== Komaci Module =====');
         log(modGenOutput);
     }
 }

package/build/cmds/modgen/types.d.ts

@@ -18,5 +18,6 @@ export interface ModGenOptions extends CommandLineOptions {
     disableKomaci: boolean;
     bundleType: BundleType;
     json: boolean;
+    withExceptions: boolean;
 }
 //# sourceMappingURL=types.d.ts.map

package/build/index.js

@@ -2,12 +2,10 @@ import commandLineArgs from 'command-line-args';
 import { modgen } from './cmds/index.js';
 import { commander } from './lib/commander.js';
 import logger from './lib/log.js';
-import chalk from 'chalk';
-const { info, error } = logger;
+const { error } = logger;
 const optionDefinitions = [{ name: 'command', defaultOption: true }];
 const mainCommand = commandLineArgs(optionDefinitions, { stopAtFirstUnknown: true });
 const { command, _unknown: argv = [] } = mainCommand;
-info(chalk.cyan(`Command: ${chalk.bgCyan(chalk.black(command))}.`));
 if (!commander(command, argv, [modgen])) {
     error(`No command "${command}" found`);
     process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@komaci/cli",
-    "version": "240.1.5",
+    "version": "242.1.1",
     "description": "CLI utility that enables developers to use komaci from the command line.",
     "license": "MIT",
     "type": "module",
@@ -24,8 +24,9 @@
         "url": "https://github.com/AndrewHuffman/komaci/issues"
     },
     "dependencies": {
-        "@komaci/esm-generator": "240.1.5",
-        "@lwc/metadata": "2.19.0",
+        "@komaci/esm-generator": "242.1.1",
+        "@lwc/metadata": "2.22.0-0",
+        "@lwc/sfdc-compiler-utils": "2.22.0-0",
         "chalk": "^5.0.1",
         "command-line-args": "^5.2.1"
     },