@elliemae/pui-cli 9.0.0-next.21 → 9.0.0-next.22

package/dist/cjs/commands/test.js

@@ -33,14 +33,6 @@ __export(test_exports, {
 module.exports = __toCommonJS(test_exports);
 var import_yargs = __toESM(require("yargs"), 1);
 var import_utils = require("./utils.js");
-const test = async (commandOptions) => {
-  await (0, import_utils.exec)(`cross-env NODE_ENV=test jest ${commandOptions}`);
-};
-const debugTest = async () => {
-  await (0, import_utils.exec)(
-    `node --inspect-brk ./node_modules/jest-cli/bin/jest.js --runInBand --watch`
-  );
-};
 const cmdArgs = {
   fix: {
     boolean: true,
@@ -71,24 +63,59 @@ const cmdArgs = {
     boolean: true,
     alias: "s",
     default: false
+  },
+  coverage: {
+    string: true,
+    // we want to support "CI" | "false" | "true"
+    default: "true"
+  },
+  maxWorkers: {
+    string: true,
+    default: "50%"
   }
 };
+const getJestFlags = (argv) => {
+  const flagsArray = [argv.maxWorkers];
+  const isCi = (0, import_utils.getCIEnv)();
+  switch (`${argv.coverage}`) {
+    case "CI":
+      if (isCi) {
+        flagsArray.push("--coverage");
+      }
+      break;
+    case "false":
+      break;
+    case "true":
+    default:
+      flagsArray.push("--coverage");
+      break;
+  }
+  if (argv.fix)
+    flagsArray.push("-u");
+  else if (argv.watch)
+    flagsArray.push("--watchAll");
+  if (argv.passWithNoTests)
+    flagsArray.push("--passWithNoTests");
+  if (argv.findReleatedTests)
+    flagsArray.push("--bail --findRelatedTests");
+  if (argv.silent)
+    flagsArray.push("--silent");
+  if (isCi)
+    flagsArray.push("--ci --no-colors");
+  return flagsArray.join(" ");
+};
+const test = async (argv) => {
+  const jestFlags = getJestFlags(argv);
+  await (0, import_utils.exec)(`cross-env NODE_ENV=test jest ${jestFlags}`);
+};
+const debugTest = async () => {
+  await (0, import_utils.exec)(
+    `node --inspect-brk ./node_modules/jest-cli/bin/jest.js --runInBand --watch`
+  );
+};
 const testCmd = {
   // eslint-disable-next-line max-statements
   handler: async (argv) => {
-    let commandOptions = "--coverage --maxWorkers=50%";
-    if (argv.fix)
-      commandOptions += " -u";
-    else if (argv.watch)
-      commandOptions += " --watchAll";
-    if ((0, import_utils.getCIEnv)())
-      commandOptions += " --ci --no-colors";
-    if (argv.passWithNoTests)
-      commandOptions += " --passWithNoTests";
-    if (argv.findReleatedTests)
-      commandOptions += " --bail --findRelatedTests";
-    if (argv.silent)
-      commandOptions += " --silent";
     try {
       if ((0, import_utils.getCIEnv)()) {
         await (0, import_utils.exec)("rimraf ./reports");
@@ -96,7 +123,7 @@ const testCmd = {
       if (argv.debug) {
         await debugTest();
       } else {
-        await test(commandOptions);
+        await test(argv);
       }
       (0, import_utils.logSuccess)("Unit test execution completed");
     } catch (err) {

package/dist/cjs/commands/utils.js

@@ -31,6 +31,7 @@ __export(utils_exports, {
   copyBuildAssetsToVersionedFolder: () => copyBuildAssetsToVersionedFolder,
   exec: () => exec,
   getCIEnv: () => getCIEnv,
+  getUnspecifiedOptions: () => getUnspecifiedOptions,
   isApp: () => isApp,
   isPathExist: () => isPathExist,
   isTypeScriptEnabled: () => isTypeScriptEnabled,
@@ -208,3 +209,29 @@ const isPathExist = async (pathToCheck) => {
 const isApp = async () => isPathExist(import_node_path.default.join(process.cwd(), "app"));
 const getCIEnv = () => process.env.CI === "true";
 const isTypeScriptEnabled = () => import_node_fs.default.existsSync(import_node_path.default.join(process.cwd(), "tsconfig.json"));
+const getUnspecifiedOptions = (options, command) => {
+  const rawArgs = process.argv.slice(2);
+  const rawArgsMap = /* @__PURE__ */ new Map();
+  rawArgs.forEach((arg) => {
+    const [key, value] = arg.split("=");
+    const keyWithoutPrefix = key.replace(/^-{1,2}/, "");
+    rawArgsMap.set(keyWithoutPrefix, value || true);
+  });
+  const expectedOptionsMap = /* @__PURE__ */ new Map();
+  Object.entries(options).forEach(([key, value]) => {
+    expectedOptionsMap.set(key, value);
+    if (value.alias)
+      expectedOptionsMap.set(value.alias, value);
+  });
+  const unspecifiedOptions = {};
+  rawArgsMap.forEach((value, key) => {
+    if (key === command)
+      return;
+    if (key === "")
+      return;
+    if (!expectedOptionsMap.has(key)) {
+      unspecifiedOptions[key] = value;
+    }
+  });
+  return unspecifiedOptions;
+};

package/dist/esm/commands/test.js

@@ -1,13 +1,5 @@
 import yargs from "yargs";
 import { exec, logError, logSuccess, getCIEnv } from "./utils.js";
-const test = async (commandOptions) => {
-  await exec(`cross-env NODE_ENV=test jest ${commandOptions}`);
-};
-const debugTest = async () => {
-  await exec(
-    `node --inspect-brk ./node_modules/jest-cli/bin/jest.js --runInBand --watch`
-  );
-};
 const cmdArgs = {
   fix: {
     boolean: true,
@@ -38,24 +30,59 @@ const cmdArgs = {
     boolean: true,
     alias: "s",
     default: false
+  },
+  coverage: {
+    string: true,
+    // we want to support "CI" | "false" | "true"
+    default: "true"
+  },
+  maxWorkers: {
+    string: true,
+    default: "50%"
   }
 };
+const getJestFlags = (argv) => {
+  const flagsArray = [argv.maxWorkers];
+  const isCi = getCIEnv();
+  switch (`${argv.coverage}`) {
+    case "CI":
+      if (isCi) {
+        flagsArray.push("--coverage");
+      }
+      break;
+    case "false":
+      break;
+    case "true":
+    default:
+      flagsArray.push("--coverage");
+      break;
+  }
+  if (argv.fix)
+    flagsArray.push("-u");
+  else if (argv.watch)
+    flagsArray.push("--watchAll");
+  if (argv.passWithNoTests)
+    flagsArray.push("--passWithNoTests");
+  if (argv.findReleatedTests)
+    flagsArray.push("--bail --findRelatedTests");
+  if (argv.silent)
+    flagsArray.push("--silent");
+  if (isCi)
+    flagsArray.push("--ci --no-colors");
+  return flagsArray.join(" ");
+};
+const test = async (argv) => {
+  const jestFlags = getJestFlags(argv);
+  await exec(`cross-env NODE_ENV=test jest ${jestFlags}`);
+};
+const debugTest = async () => {
+  await exec(
+    `node --inspect-brk ./node_modules/jest-cli/bin/jest.js --runInBand --watch`
+  );
+};
 const testCmd = {
   // eslint-disable-next-line max-statements
   handler: async (argv) => {
-    let commandOptions = "--coverage --maxWorkers=50%";
-    if (argv.fix)
-      commandOptions += " -u";
-    else if (argv.watch)
-      commandOptions += " --watchAll";
-    if (getCIEnv())
-      commandOptions += " --ci --no-colors";
-    if (argv.passWithNoTests)
-      commandOptions += " --passWithNoTests";
-    if (argv.findReleatedTests)
-      commandOptions += " --bail --findRelatedTests";
-    if (argv.silent)
-      commandOptions += " --silent";
     try {
       if (getCIEnv()) {
         await exec("rimraf ./reports");
@@ -63,7 +90,7 @@ const testCmd = {
       if (argv.debug) {
         await debugTest();
       } else {
-        await test(commandOptions);
+        await test(argv);
       }
       logSuccess("Unit test execution completed");
     } catch (err) {

package/dist/esm/commands/utils.js

@@ -177,10 +177,37 @@ const isPathExist = async (pathToCheck) => {
 const isApp = async () => isPathExist(path.join(process.cwd(), "app"));
 const getCIEnv = () => process.env.CI === "true";
 const isTypeScriptEnabled = () => fs.existsSync(path.join(process.cwd(), "tsconfig.json"));
+const getUnspecifiedOptions = (options, command) => {
+  const rawArgs = process.argv.slice(2);
+  const rawArgsMap = /* @__PURE__ */ new Map();
+  rawArgs.forEach((arg) => {
+    const [key, value] = arg.split("=");
+    const keyWithoutPrefix = key.replace(/^-{1,2}/, "");
+    rawArgsMap.set(keyWithoutPrefix, value || true);
+  });
+  const expectedOptionsMap = /* @__PURE__ */ new Map();
+  Object.entries(options).forEach(([key, value]) => {
+    expectedOptionsMap.set(key, value);
+    if (value.alias)
+      expectedOptionsMap.set(value.alias, value);
+  });
+  const unspecifiedOptions = {};
+  rawArgsMap.forEach((value, key) => {
+    if (key === command)
+      return;
+    if (key === "")
+      return;
+    if (!expectedOptionsMap.has(key)) {
+      unspecifiedOptions[key] = value;
+    }
+  });
+  return unspecifiedOptions;
+};
 export {
   copyBuildAssetsToVersionedFolder,
   exec,
   getCIEnv,
+  getUnspecifiedOptions,
   isApp,
   isPathExist,
   isTypeScriptEnabled,

package/dist/types/commands/test.d.ts

@@ -6,6 +6,8 @@ interface Arguments {
     passWithNoTests: boolean;
     findReleatedTests: boolean;
     silent: boolean;
+    coverage: string;
+    maxWorkers: string;
 }
 export declare const testCmd: CommandModule<Record<string, never>, Arguments>;
 export {};

package/dist/types/commands/utils.d.ts

@@ -16,3 +16,24 @@ export declare const isPathExist: (pathToCheck: string) => Promise<boolean>;
 export declare const isApp: () => Promise<boolean>;
 export declare const getCIEnv: () => boolean;
 export declare const isTypeScriptEnabled: () => boolean;
+/**
+ * argv will generate an object with many assumptions based on the library own functionality.
+ * some of those assumptions make it hard to use the ...rest operator to get the options,
+ * this function is meant to get the options that are not specificially expected.
+ * @param {object} options - the options the command is specifically expecting
+ * @param {string} command - the raw command (without the prefix nor tag)
+ * @returns {object} - options that were not specifically expected by the command, key are camelCase, values are forced to be strings
+ * @example
+ * // options {
+ * //   someOption: { alias: 'my-test', string: true, default:'foo' },
+ * //   'hello-world': { boolean: true, default:'bar' },
+ * // }
+ * // command "test"
+ * // user's args string
+ * // "test       --hello-world     -my-test='is-working'    --orMaybe=\"it isn't\" is_it='? '--a"
+ * //   ^ command ^ expected option ^ expected option(alias) | unspecified options...
+ * // returns { orMaybe: "it isn't", is_it: '? ', a: true }
+ * // note that the unspecified options are forced to be strings, unless boolean (without '=')
+ * @see {@link https://stackblitz.com/edit/node-gqcdb4?file=package.json stackblitz test}
+ */
+export declare const getUnspecifiedOptions: (options: Record<string, Record<string, unknown>>, command: string) => Record<string, string | boolean>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elliemae/pui-cli",
-  "version": "9.0.0-next.21",
+  "version": "9.0.0-next.22",
   "description": "ICE MT UI Platform CLI",
   "sideEffects": false,
   "type": "module",