@elliemae/pui-cli 7.27.0-beta.2 → 7.27.1

package/dist/esm/commands/lint.js

@@ -1,12 +1,7 @@
 import path from "node:path";
 import yargs from "yargs";
-import {
-  exec,
-  logError,
-  logSuccess,
-  getCIEnv,
-  isTypeScriptEnabled
-} from "./utils.js";
+import { exec, logError, logSuccess, getCIEnv } from "./utils.js";
+import { isTypeScriptEnabled } from "../utils.cjs";
 const lintCSS = async (fix = false) => {
   const fixIssues = fix ? "--fix" : "";
   await exec(
@@ -22,23 +17,6 @@ const lintJS = async (fix = false) => {
     `eslint ${!getCIEnv() ? "--color" : "--no-color"} ${fixIssues}  .`
   );
 };
-const cmdArgs = {
-  css: {
-    boolean: true,
-    alias: "css",
-    default: true
-  },
-  js: {
-    boolean: true,
-    alias: "js",
-    default: true
-  },
-  fix: {
-    boolean: true,
-    alias: "fix",
-    default: false
-  }
-};
 const lintCmd = {
   handler: async (argv) => {
     if (argv.js) {
@@ -51,7 +29,7 @@ const lintCmd = {
       } catch (err) {
         logError("JS linting failed");
         yargs().exit(-1, err);
-        return;
+        return -1;
       }
     }
     if (argv.css) {
@@ -62,12 +40,30 @@ const lintCmd = {
       } catch (err) {
         logError("CSS linting failed");
         yargs().exit(-1, err);
+        return -1;
       }
     }
+    return 0;
   },
   command: "lint [options]",
-  desc: "lints application code",
-  builder: (yargsRef) => yargsRef.options(cmdArgs).help()
+  describe: "lints application code",
+  builder: {
+    css: {
+      alias: "css",
+      type: "boolean",
+      default: true
+    },
+    js: {
+      alias: "js",
+      type: "boolean",
+      default: true
+    },
+    fix: {
+      alias: "fix",
+      type: "boolean",
+      default: false
+    }
+  }
 };
 export {
   lintCmd

package/dist/esm/commands/pack.js

@@ -1,14 +1,8 @@
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import yargs from "yargs";
-import {
-  exec,
-  logInfo,
-  logError,
-  logSuccess,
-  getCIEnv,
-  isTypeScriptEnabled
-} from "./utils.js";
+import { exec, logInfo, logError, logSuccess, getCIEnv } from "./utils.js";
+import { isTypeScriptEnabled } from "../utils.cjs";
 import { esBuild } from "../transpile/esbuild.js";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const compileTypeScript = async () => {
@@ -32,11 +26,7 @@ const webBuild = async (productionBuild) => {
   );
   logInfo("Building source files for browser environment completed...");
 };
-const pack = async ({
-  production,
-  target,
-  srcPath
-}) => {
+const pack = async ({ production, target, srcPath }) => {
   logInfo("Build in-progress...");
   await exec("rimraf ./dist");
   if (isTypeScriptEnabled()) {
@@ -50,23 +40,6 @@ const pack = async ({
     logInfo("Building source files for nodejs environment completed.");
   }
 };
-const cmdArgs = {
-  production: {
-    boolean: true,
-    alias: "p",
-    default: false
-  },
-  target: {
-    string: true,
-    alias: "t",
-    default: "",
-    description: "target environment where this library will be used. allowed values are web, node. by default libraries will be compiled for both web and nodejs environments"
-  },
-  srcPath: {
-    string: true,
-    default: "./lib"
-  }
-};
 const packCmd = {
   handler: async (argv) => {
     try {
@@ -78,8 +51,23 @@ const packCmd = {
     }
   },
   command: "pack",
-  desc: "builds library",
-  builder: (yargsRef) => yargsRef.options(cmdArgs).help()
+  describe: "builds library",
+  builder: {
+    production: {
+      alias: "p",
+      type: "boolean",
+      default: false
+    },
+    target: {
+      alias: "t",
+      type: "string",
+      description: "target environment where this library will be used. allowed values are web, node. by default libraries will be compiled for both web and nodejs environments"
+    },
+    srcPath: {
+      type: "string",
+      default: "./lib"
+    }
+  }
 };
 export {
   packCmd

package/dist/esm/commands/start.js

@@ -5,9 +5,9 @@ import { exec, logError, logSuccess, isApp } from "./utils.js";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const startProdServer = async () => {
   await exec(
-    `cross-env NODE_ENV=production ts-node --esm ${path.resolve(
+    `cross-env NODE_ENV=production ts-node ${path.resolve(
       __dirname,
-      "../server.ts"
+      "../server"
     )} --color always`
   );
 };
@@ -20,13 +20,6 @@ const startDevServer = async () => {
     )}`
   );
 };
-const cmdArgs = {
-  prod: {
-    boolean: true,
-    alias: "p",
-    default: false
-  }
-};
 const startCmd = {
   handler: async (argv) => {
     try {
@@ -42,8 +35,14 @@ const startCmd = {
     }
   },
   command: "start [options]",
-  desc: "starts local web server to test the application",
-  builder: (yargsRef) => yargsRef.options(cmdArgs).help()
+  describe: "starts local web server to test the application",
+  builder: {
+    prod: {
+      alias: "p",
+      default: false,
+      type: "boolean"
+    }
+  }
 };
 export {
   startCmd

package/dist/esm/commands/storybook.js

@@ -8,25 +8,9 @@ const buildStoryBook = async (outputDir = "demo", isDoc = false) => {
 };
 const startStoryBook = async (isDoc = false) => {
   await exec(
-    `cross-env NODE_ENV=development STORYBOOK_BUILD=true start-storybook ${isDoc ? "--docs" : ""} -p 11000 --quiet`
+    `cross-env NODE_ENV=development STORYBOOK_BUILD=true start-storybook ${isDoc && "--docs"} -p 11000 --quiet`
   );
 };
-const cmdArgs = {
-  build: {
-    boolean: true,
-    alias: "b",
-    default: false
-  },
-  docs: {
-    boolean: true,
-    default: false
-  },
-  output: {
-    string: true,
-    alias: "o",
-    default: "demo"
-  }
-};
 const storybookCmd = {
   handler: async (argv) => {
     try {
@@ -43,8 +27,23 @@ const storybookCmd = {
     }
   },
   command: "storybook [options]",
-  desc: "story book application code",
-  builder: (yargsRef) => yargsRef.options(cmdArgs).help()
+  describe: "story book application code",
+  builder: {
+    build: {
+      alias: "b",
+      type: "boolean",
+      default: false
+    },
+    docs: {
+      type: "boolean",
+      default: false
+    },
+    output: {
+      alias: "o",
+      type: "string",
+      default: "demo"
+    }
+  }
 };
 export {
   storybookCmd

package/dist/esm/commands/test.js

@@ -8,38 +8,6 @@ const debugTest = async () => {
     `node --inspect-brk ./node_modules/jest-cli/bin/jest.js --runInBand --watch`
   );
 };
-const cmdArgs = {
-  fix: {
-    boolean: true,
-    alias: "f",
-    default: false
-  },
-  watch: {
-    boolean: true,
-    alias: "w",
-    default: false
-  },
-  debug: {
-    boolean: true,
-    alias: "d",
-    default: false
-  },
-  passWithNoTests: {
-    boolean: true,
-    alias: "p",
-    default: false
-  },
-  findReleatedTests: {
-    boolean: true,
-    alias: "r",
-    default: false
-  },
-  silent: {
-    boolean: true,
-    alias: "s",
-    default: false
-  }
-};
 const testCmd = {
   // eslint-disable-next-line max-statements
   handler: async (argv) => {
@@ -50,11 +18,11 @@ const testCmd = {
       commandOptions = "--watchAll";
     if (getCIEnv())
       commandOptions += " --ci --no-colors";
-    if (argv.passWithNoTests)
+    if (argv.p)
       commandOptions += " --passWithNoTests";
-    if (argv.findReleatedTests)
+    if (argv.r)
       commandOptions += " --bail --findRelatedTests";
-    if (argv.silent)
+    if (argv.s)
       commandOptions += " --silent";
     try {
       if (getCIEnv()) {
@@ -69,11 +37,37 @@ const testCmd = {
     } catch (err) {
       logError("Unit test execution failed", err);
       yargs().exit(-1, err);
+      return -1;
     }
+    return 0;
   },
   command: "test [options]",
-  desc: "unit tests application code",
-  builder: (yargsRef) => yargsRef.options(cmdArgs).help()
+  describe: "unit tests application code",
+  builder: {
+    fix: {
+      alias: "f",
+      type: "boolean"
+    },
+    watch: {
+      alias: "w",
+      type: "boolean"
+    },
+    debug: {
+      type: "boolean"
+    },
+    passWithNoTests: {
+      alias: "p",
+      type: "boolean"
+    },
+    findReleatedTests: {
+      alias: "r",
+      type: "boolean"
+    },
+    silent: {
+      alias: "s",
+      type: "boolean"
+    }
+  }
 };
 export {
   testCmd

package/dist/esm/commands/tscheck.js

@@ -5,7 +5,7 @@ import { exec, logInfo, logError } from "./utils.js";
 const randomChars = () => Math.random().toString(36).slice(2);
 const validateTypescript = async (files = []) => {
   const tsconfigPath = path.join(process.cwd(), "tsconfig.json");
-  const tsconfig = JSON.parse(fs.readFileSync(tsconfigPath).toString());
+  const tsconfig = JSON.parse(fs.readFileSync(tsconfigPath));
   const tmpTsconfigPath = path.join(
     process.cwd(),
     `tsconfig.${randomChars()}.json`
@@ -32,12 +32,6 @@ const validateTypescript = async (files = []) => {
     fs.unlinkSync(tmpTsconfigPath);
   }
 };
-const cmdArgs = {
-  files: {
-    array: true,
-    default: []
-  }
-};
 const tscheckCmd = {
   handler: async ({ files }) => {
     try {
@@ -49,8 +43,13 @@ const tscheckCmd = {
     }
   },
   command: "tscheck [options]",
-  desc: "validate typescript file(s)",
-  builder: (yargsRef) => yargsRef.options(cmdArgs).help()
+  describe: "validate typescript file(s)",
+  builder: {
+    files: {
+      type: "array",
+      default: []
+    }
+  }
 };
 export {
   tscheckCmd

package/dist/esm/commands/utils.js

@@ -1,5 +1,5 @@
 import path from "node:path";
-import fs, { constants } from "node:fs";
+import { constants } from "fs";
 import {
   readFile,
   writeFile,
@@ -44,7 +44,7 @@ const getSupportedBrowsers = async () => {
   const { stdout } = await exec("npx --no-install browserslist", {
     stdout: "pipe"
   });
-  const browserVersions = stdout?.toString()?.split("\n") || [];
+  const browserVersions = stdout && stdout.split("\n") || [];
   return browserVersions.reduce((acc, nameVersion) => {
     const [name, version] = nameVersion.split(" ");
     const versionRange = version.split("-");
@@ -88,18 +88,15 @@ const writeAppInfo = async () => {
   [
     path.join(versionedPath, "info.json"),
     path.join(process.cwd(), "build", "public", "info.json")
-  ].forEach((infoPath) => {
-    writeFile(infoPath, infoJSON).then(() => {
-    }).catch((err) => console.error(err));
-  });
+  ].forEach(async (infoPath) => writeFile(infoPath, infoJSON));
 };
 const copyDir = async (src, dest) => {
   const entries = await readdir(src, {
     withFileTypes: true
   });
   await mkdir(dest);
-  await Promise.all(
-    entries.map(async (entry) => {
+  return Promise.all(
+    entries.map((entry) => {
       const srcPath = path.join(src, entry.name);
       const destPath = path.join(dest, entry.name);
       if (entry.isDirectory()) {
@@ -135,14 +132,12 @@ 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"));
 export {
   copyBuildAssetsToVersionedFolder,
   exec,
   getCIEnv,
   isApp,
   isPathExist,
-  isTypeScriptEnabled,
   logError,
   logInfo,
   logSuccess,

package/dist/esm/commands/version.js

@@ -8,29 +8,11 @@ const version = async (lernaOptions = "") => {
     `cross-env NODE_ENV=production lerna version --conventional-commits --exact --create-release github --force-publish --yes ${lernaOptions}`
   );
 };
-const cmdArgs = {
-  deleteTags: {
-    boolean: true,
-    default: false
-  },
-  useRegistry: {
-    boolean: true,
-    default: false
-  },
-  useWorkspace: {
-    boolean: true,
-    default: false
-  },
-  lernaOptions: {
-    string: true,
-    default: ""
-  }
-};
 const versionCmd = {
   handler: async (argv) => {
     try {
       if (argv.deleteTags) {
-        deleteMergedTags();
+        await deleteMergedTags();
       } else if (argv.useRegistry) {
         await setRegistryVersion();
       } else if (argv.useWorkspace) {
@@ -44,8 +26,24 @@ const versionCmd = {
     }
   },
   command: "version [options]",
-  desc: "version monorepo",
-  builder: (yargsRef) => yargsRef.options(cmdArgs).help()
+  describe: "version monorepo",
+  builder: {
+    deleteTags: {
+      type: "boolean",
+      default: false
+    },
+    useRegistry: {
+      type: "boolean",
+      default: false
+    },
+    useWorkspace: {
+      type: "boolean",
+      default: false
+    },
+    lernaOptions: {
+      type: "string"
+    }
+  }
 };
 export {
   versionCmd

package/dist/esm/commands/vitest.js

@@ -3,33 +3,6 @@ import { exec, logError, logSuccess, getCIEnv } from "./utils.js";
 const test = async (commandOptions) => {
   await exec(`vitest ${commandOptions}`);
 };
-const cmdArgs = {
-  fix: {
-    boolean: true,
-    alias: "f",
-    default: false
-  },
-  watch: {
-    boolean: true,
-    alias: "w",
-    default: false
-  },
-  passWithNoTests: {
-    boolean: true,
-    alias: "p",
-    default: false
-  },
-  findReleatedTests: {
-    boolean: true,
-    alias: "r",
-    default: false
-  },
-  silent: {
-    boolean: true,
-    alias: "s",
-    default: false
-  }
-};
 const vitestCmd = {
   // eslint-disable-next-line max-statements
   handler: async (argv) => {
@@ -38,11 +11,11 @@ const vitestCmd = {
       commandOptions = "-u";
     else if (argv.watch)
       commandOptions = "--watch";
-    if (argv.passWithNoTests)
+    if (argv.p)
       commandOptions += " --passWithNoTests";
-    if (argv.findReleatedTests)
+    if (argv.r)
       commandOptions += " --related";
-    if (argv.silent)
+    if (argv.s)
       commandOptions += " --silent";
     try {
       if (getCIEnv()) {
@@ -53,11 +26,34 @@ const vitestCmd = {
     } catch (err) {
       logError("Unit test execution failed", err);
       yargs().exit(-1, err);
+      return -1;
     }
+    return 0;
   },
   command: "vitest [options]",
-  desc: "unit tests application code using vitest",
-  builder: (yargsRef) => yargsRef.options(cmdArgs).help()
+  describe: "unit tests application code using vitest",
+  builder: {
+    fix: {
+      alias: "f",
+      type: "boolean"
+    },
+    watch: {
+      alias: "w",
+      type: "boolean"
+    },
+    passWithNoTests: {
+      alias: "p",
+      type: "boolean"
+    },
+    related: {
+      alias: "r",
+      type: "boolean"
+    },
+    silent: {
+      alias: "s",
+      type: "boolean"
+    }
+  }
 };
 export {
   vitestCmd

package/dist/esm/index.cjs

@@ -10,6 +10,7 @@ const { prettierConfig } = require('./lint-config/prettier.config.cjs');
 const { commitlintConfig } = require('./lint-config/commitlint.config.cjs');
 const { jestConfig } = require('./testing/jest.config.cjs');
 const { jestNodeConfig } = require('./testing/jest.node.config.cjs');
+const { loadRoutes } = require('./server/app-routes.cjs');
 
 module.exports = {
   babelConfig,
@@ -20,4 +21,5 @@ module.exports = {
   commitlintConfig,
   jestConfig,
   jestNodeConfig,
+  loadRoutes,
 };

package/dist/esm/index.js

@@ -8,7 +8,7 @@ import { jestConfig } from "./testing/jest.config.cjs";
 import { vitestConfig } from "./testing/vitest.config.js";
 import { jestNodeConfig } from "./testing/jest.node.config.cjs";
 import { lintStagedConfig } from "./lint-config/lint-staged.config.js";
-import { loadRoutes } from "./server/appRoutes.js";
+import { loadRoutes } from "./server/app-routes.cjs";
 export {
   babelConfig,
   commitlintConfig,

package/dist/esm/monorepo/delete-merged-tags.js

@@ -17,7 +17,7 @@ const deleteTags = (cmd, filter) => {
   const tags = result.toString().split("\n").join(" ");
   execSync(`git tag -d ${filter ? filter(tags) : tags}`, { cwd });
 };
-const tagsFromOtherBranches = (tags) => {
+const tagsFromOtherBranches = (tags = []) => {
   const regex = branchTags[branchName] || branchTags.master;
   return tags.split(" ").filter((tagName) => isSemVersion(tagName) && !regex.test(tagName)).join(" ");
 };

package/dist/esm/monorepo/set-registry-version.js

@@ -1,7 +1,7 @@
 import { readFile, writeFile } from "node:fs/promises";
 import fg from "fast-glob";
 import normalizePath from "normalize-path";
-import { findMonoRepoRoot } from "./utils.js";
+import { findMonoRepoRoot } from "./utils.cjs";
 const monorepoRoot = normalizePath(findMonoRepoRoot() || "");
 const setRegistryVersion = async () => {
   const files = await fg([
@@ -9,7 +9,7 @@ const setRegistryVersion = async () => {
     `${monorepoRoot}/apps/*/package.json`,
     `${monorepoRoot}/package.json`
   ]);
-  await Promise.all(
+  Promise.all(
     files.map(async (file) => {
       let pkgJSONData = await readFile(file, "utf8");
       const pkgVersion = JSON.parse(pkgJSONData).version;

package/dist/esm/monorepo/set-workspace-version.js

@@ -1,7 +1,7 @@
 import { readFile, writeFile } from "node:fs/promises";
 import fg from "fast-glob";
 import normalizePath from "normalize-path";
-import { findMonoRepoRoot } from "./utils.js";
+import { findMonoRepoRoot } from "./utils.cjs";
 const monorepoRoot = normalizePath(findMonoRepoRoot() || "");
 const setWorkspaceVersion = async () => {
   const files = await fg([
@@ -9,7 +9,7 @@ const setWorkspaceVersion = async () => {
     `${monorepoRoot}/apps/*/package.json`,
     `${monorepoRoot}/package.json`
   ]);
-  await Promise.all(
+  Promise.all(
     files.map(async (file) => {
       let pkgJSONData = await readFile(file, "utf8");
       const pkgVersion = JSON.parse(pkgJSONData).version;

package/dist/esm/server/app-routes.cjs

@@ -0,0 +1,42 @@
+const fs = require('fs');
+const path = require('path');
+
+const allJS = /\.js$/;
+
+const serviceEndpoints = /\.endpoint\.js$/;
+
+const getFilesMatching = (filePattern) => {
+  const getFiles = (dir) => {
+    let routeFiles = [];
+    if (!fs.existsSync(dir)) return routeFiles;
+    fs.readdirSync(dir).forEach((file) => {
+      const fullPath = path.join(dir, file);
+      if (fs.lstatSync(fullPath).isDirectory()) {
+        routeFiles = routeFiles.concat(getFiles(fullPath));
+      } else if (filePattern.test(fullPath)) routeFiles.push(fullPath);
+    });
+    return routeFiles;
+  };
+  return getFiles;
+};
+
+const getServerRouteFiles = getFilesMatching(allJS);
+const getServiceEndpoints = getFilesMatching(serviceEndpoints);
+
+exports.loadRoutes = (app) => {
+  const routeFiles = getServerRouteFiles(
+    path.join(process.cwd(), 'server/routes'),
+  );
+  routeFiles.push(...getServiceEndpoints(path.join(process.cwd(), 'app')));
+  routeFiles.push(...getServiceEndpoints(path.join(process.cwd(), 'lib')));
+  routeFiles.forEach((routeFile) => {
+    // eslint-disable-next-line global-require
+    const init = require(routeFile);
+    try {
+      init(app);
+    } catch (err) {
+      // eslint-disable-next-line no-console
+      console.error(`unable to load routes from ${routeFile}. ${err.message}`);
+    }
+  });
+};