@cedarjs/cli 4.2.0 → 4.2.1-next.258

package/dist/commands/generate/dbAuth/dbAuthHandler.js

@@ -2,10 +2,11 @@ import fs from "node:fs";
 import path from "node:path";
 import { ListrEnquirerPromptAdapter } from "@listr2/prompt-adapter-enquirer";
 import { camelCase } from "camel-case";
-import execa from "execa";
 import { Listr } from "listr2";
 import { titleCase } from "title-case";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
+import { runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
 import {
   addRoutesToRouterTask,
   addScaffoldImport,
@@ -36,7 +37,11 @@ function getPostInstallMessage(isDbAuthSetup2) {
     "   logged in. Also take a look in the onSubmit() functions in ForgotPasswordPage",
     "   and ResetPasswordPage to change where the user redirects to after submitting",
     "   those forms.\n",
-    !isDbAuthSetup2 && "   Oh, and if you haven't already, add the necessary dbAuth functions and\n   app setup by running:\n\n     yarn cedar setup auth dbAuth\n",
+    !isDbAuthSetup2 && `   Oh, and if you haven't already, add the necessary dbAuth functions and
+   app setup by running:
+
+     ${formatCedarCommand(["setup", "auth", "dbAuth"])}
+`,
     "   Happy authenticating!"
   ].filter(Boolean).join("\n");
 }
@@ -55,12 +60,15 @@ function getPostInstallWebauthnMessage(isDbAuthSetup2) {
     "   logged in. Also take a look in the onSubmit() functions in ForgotPasswordPage",
     "   and ResetPasswordPage to change where the user redirects to after submitting",
     "   those forms.\n",
-    !isDbAuthSetup2 && "   Oh, and if you haven't already, add the necessary dbAuth functions and\n   app setup by running:\n\n     yarn cedar setup auth dbAuth\n",
+    !isDbAuthSetup2 && `   Oh, and if you haven't already, add the necessary dbAuth functions and
+   app setup by running:
+
+     ${formatCedarCommand(["setup", "auth", "dbAuth"])}
+`,
     "   Happy authenticating!"
   ].filter(Boolean).join("\n");
 }
 const files = async ({
-  _tests,
   typescript,
   skipForgot,
   skipLogin,
@@ -70,7 +78,7 @@ const files = async ({
   usernameLabel,
   passwordLabel
 }) => {
-  const files2 = [];
+  const filesList = [];
   usernameLabel = usernameLabel || "username";
   passwordLabel = passwordLabel || "password";
   const templateVars = {
@@ -82,7 +90,7 @@ const files = async ({
     passwordTitleCase: titleCase(passwordLabel)
   };
   if (!skipForgot) {
-    files2.push(
+    filesList.push(
       await templateForComponentFile({
         name: "ForgotPassword",
         suffix: "Page",
@@ -95,7 +103,7 @@ const files = async ({
     );
   }
   if (!skipLogin) {
-    files2.push(
+    filesList.push(
       await templateForComponentFile({
         name: "Login",
         suffix: "Page",
@@ -108,7 +116,7 @@ const files = async ({
     );
   }
   if (!skipReset) {
-    files2.push(
+    filesList.push(
       await templateForComponentFile({
         name: "ResetPassword",
         suffix: "Page",
@@ -121,7 +129,7 @@ const files = async ({
     );
   }
   if (!skipSignup) {
-    files2.push(
+    filesList.push(
       await templateForComponentFile({
         name: "Signup",
         suffix: "Page",
@@ -133,7 +141,7 @@ const files = async ({
       })
     );
   }
-  if (files2.length === 0) {
+  if (filesList.length === 0) {
     console.info(c.error("\nNo files to generate.\n"));
     process.exit(0);
   }
@@ -146,25 +154,27 @@ const files = async ({
       ),
       { name: "scaffold" }
     );
-    files2.push([scaffoldOutputPath, scaffoldTemplate]);
+    filesList.push([scaffoldOutputPath, scaffoldTemplate]);
   }
-  return files2.reduce(async (accP, [outputPath, content]) => {
-    const acc = await accP;
-    let template = content;
-    if (outputPath.match(/\.[jt]sx?/) && !typescript) {
-      template = await transformTSToJS(outputPath, content);
-    }
-    return {
-      [outputPath]: template,
-      ...acc
-    };
-  }, Promise.resolve({}));
+  return filesList.reduce(
+    async (accP, [outputPath, content]) => {
+      const acc = await accP;
+      let template = content;
+      if (outputPath.match(/\.[jt]sx?/) && !typescript) {
+        template = await transformTSToJS(outputPath, content);
+      }
+      return {
+        [outputPath]: template,
+        ...acc
+      };
+    },
+    Promise.resolve({})
+  );
 };
 const tasks = ({
   enquirer,
   listr2,
   force,
-  tests,
   typescript,
   skipForgot,
   skipLogin,
@@ -275,7 +285,6 @@ const tasks = ({
         title: "Creating pages...",
         task: async () => {
           const filesObj = await files({
-            tests,
             typescript,
             skipForgot,
             skipLogin,
@@ -303,7 +312,7 @@ const tasks = ({
       {
         title: "Generate types...",
         task: () => {
-          execa.commandSync("yarn cedar g types");
+          runBinSync("cedar", ["g", "types"]);
         }
       },
       {
@@ -313,7 +322,7 @@ const tasks = ({
       }
     ],
     {
-      silentRendererCondition: () => listr2?.silentRendererCondition,
+      silentRendererCondition: () => listr2?.silentRendererCondition ?? false,
       rendererOptions: { collapseSubtasks: false },
       ctx: { enquirer },
       exitOnError: true
@@ -327,7 +336,7 @@ const handler = async (yargs) => {
     skipLogin: yargs.skipLogin,
     skipReset: yargs.skipReset,
     skipSignup: yargs.skipSignup,
-    webauthn: yargs.webauthn,
+    webauthn: yargs.webauthn ?? void 0,
     force: yargs.force,
     rollback: yargs.rollback
   });
@@ -339,10 +348,11 @@ const handler = async (yargs) => {
     await t.run();
     console.log("");
     console.log(
-      yargs.webauthn || t.ctx.webauthn ? getPostInstallWebauthnMessage(isDbAuthSetup()) : getPostInstallMessage(isDbAuthSetup())
+      yargs.webauthn || t.ctx?.webauthn ? getPostInstallWebauthnMessage(isDbAuthSetup()) : getPostInstallMessage(isDbAuthSetup())
     );
   } catch (e) {
-    console.log(c.error(e.message));
+    const msg = e instanceof Error ? e.message : String(e);
+    console.log(c.error(msg));
   }
 };
 function isDbAuthSetup() {
@@ -356,7 +366,7 @@ function isDbAuthSetup() {
       "auth." + webAuthExtension
     );
     return /^import (.*) from ['"]@cedarjs\/auth-dbauth-web['"]/m.test(
-      fs.readFileSync(webAuthPath)
+      fs.readFileSync(webAuthPath, "utf-8")
     );
   }
   return false;

package/dist/commands/generate/directive/directiveHandler.js

@@ -1,17 +1,22 @@
 import camelcase from "camelcase";
-import execa from "execa";
 import { Listr } from "listr2";
 import prompts from "prompts";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
 import { getConfig } from "@cedarjs/project-config";
-import { writeFilesTask, transformTSToJS } from "../../../lib/index.js";
+import { writeFilesTask, transformTSToJSMap } from "../../../lib/index.js";
 import {
   prepareForRollback,
   addFunctionToRollback
 } from "../../../lib/rollback.js";
 import { validateName } from "../helpers.js";
 import { templateForComponentFile } from "../yargsHandlerHelpers.js";
-const files = async ({ name, typescript = false, type, tests }) => {
+const files = async ({
+  name,
+  typescript = false,
+  type,
+  tests
+}) => {
   if (tests === void 0) {
     tests = getConfig().generate.tests;
   }
@@ -40,14 +45,7 @@ const files = async ({ name, typescript = false, type, tests }) => {
     });
     files2.push(testFile);
   }
-  return files2.reduce(async (accP, [outputPath, content]) => {
-    const acc = await accP;
-    const template = typescript ? content : await transformTSToJS(outputPath, content);
-    return {
-      [outputPath]: template,
-      ...acc
-    };
-  }, Promise.resolve({}));
+  return transformTSToJSMap(files2, typescript);
 };
 const handler = async (args) => {
   recordTelemetryAttributes({
@@ -109,9 +107,9 @@ const handler = async (args) => {
         title: "Generating TypeScript definitions and GraphQL schemas ...",
         task: () => {
           addFunctionToRollback(async () => {
-            await execa("yarn", ["cedar-gen"], { stdio: "pipe" });
+            await runBin("cedar-gen", [], { stdio: "pipe" });
           }, true);
-          return execa("yarn", ["cedar-gen"], { stdio: "inherit" });
+          return runBin("cedar-gen", [], { stdio: "inherit" });
         }
       },
       {
@@ -132,7 +130,7 @@ const handler = async (args) => {
       console.log(notes);
     }
   } catch (e) {
-    console.log(c.error(e.message));
+    console.log(c.error(e instanceof Error ? e.message : String(e)));
     process.exit(1);
   }
 };

package/dist/commands/generate/function/function.js

@@ -19,6 +19,7 @@ const builder = (yargs) => {
   Object.entries(getYargsDefaults()).forEach(([option, config]) => {
     yargs.option(option, config);
   });
+  return yargs;
 };
 const handler = createHandler("function");
 export {

package/dist/commands/generate/function/functionHandler.js

@@ -2,17 +2,17 @@ import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { errorTelemetry } from "@cedarjs/telemetry";
-import { transformTSToJS, writeFilesTask } from "../../../lib/index.js";
+import { transformTSToJSMap, writeFilesTask } from "../../../lib/index.js";
 import { prepareForRollback } from "../../../lib/rollback.js";
 import { validateName } from "../helpers.js";
 import { templateForComponentFile } from "../yargsHandlerHelpers.js";
 const files = async ({
   name,
-  typescript: generateTypescript = false,
-  tests: generateTests = true,
+  typescript = false,
+  tests = true,
   ...rest
 }) => {
-  const extension = generateTypescript ? ".ts" : ".js";
+  const extension = typescript ? ".ts" : ".js";
   const outputFiles = [];
   const functionFiles = await templateForComponentFile({
     name,
@@ -20,10 +20,10 @@ const files = async ({
     apiPathSection: "functions",
     generator: "function",
     templatePath: "function.ts.template",
-    templateVars: { ...rest, typescript: generateTypescript }
+    templateVars: { ...rest, typescript }
   });
   outputFiles.push(functionFiles);
-  if (generateTests) {
+  if (tests) {
     const testFile = await templateForComponentFile({
       name,
       extension: `.test${extension}`,
@@ -43,14 +43,7 @@ const files = async ({
     outputFiles.push(testFile);
     outputFiles.push(scenarioFile);
   }
-  return outputFiles.reduce(async (accP, [outputPath, content]) => {
-    const acc = await accP;
-    const template = generateTypescript ? content : await transformTSToJS(outputPath, content);
-    return {
-      [outputPath]: template,
-      ...acc
-    };
-  }, Promise.resolve({}));
+  return transformTSToJSMap(outputFiles, typescript);
 };
 const handler = async ({ name, force, ...rest }) => {
   recordTelemetryAttributes({
@@ -94,9 +87,11 @@ const handler = async ({ name, force, ...rest }) => {
     );
     console.info("");
   } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
+    const message = e instanceof Error ? e.message : String(e);
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    errorTelemetry(process.argv, message);
+    console.error(c.error(message));
+    process.exit(exitCode);
   }
 };
 export {

package/dist/commands/generate/helpers.js

@@ -24,7 +24,7 @@ const validateName = (name) => {
   }
 };
 const relationsForModel = (model) => {
-  return model.fields.filter((f) => f.relationName).map((field) => {
+  return model?.fields.filter((f) => f.relationName).map((field) => {
     return field.name;
   });
 };
@@ -37,26 +37,26 @@ const forcePluralizeWord = (word) => {
   }
   return pluralize(word);
 };
+const routeParamToTsType = {
+  Int: "number",
+  Float: "number",
+  Boolean: "boolean",
+  String: "string"
+};
 const mapRouteParamTypeToTsType = (paramType) => {
-  const routeParamToTsType = {
-    Int: "number",
-    Float: "number",
-    Boolean: "boolean",
-    String: "string"
-  };
   return routeParamToTsType[paramType] || "unknown";
 };
+const prismaScalarToTsType = {
+  String: "string",
+  Boolean: "boolean",
+  Int: "number",
+  BigInt: "number",
+  Float: "number",
+  Decimal: "number",
+  DateTime: "string",
+  Bytes: "Uint8Array"
+};
 const mapPrismaScalarToPagePropTsType = (scalarType) => {
-  const prismaScalarToTsType = {
-    String: "string",
-    Boolean: "boolean",
-    Int: "number",
-    BigInt: "number",
-    Float: "number",
-    Decimal: "number",
-    DateTime: "string",
-    Bytes: "Uint8Array"
-  };
   return prismaScalarToTsType[scalarType] || "unknown";
 };
 export {

package/dist/commands/generate/job/job.js

@@ -29,6 +29,7 @@ const builder = (yargs) => {
   Object.entries(getYargsDefaults()).forEach(([option, config]) => {
     yargs.option(option, config);
   });
+  return yargs;
 };
 const handler = createHandler("job");
 export {

package/dist/commands/generate/job/jobHandler.js

@@ -1,13 +1,13 @@
 import path from "node:path";
 import { pathToFileURL } from "node:url";
 import * as changeCase from "change-case";
-import execa from "execa";
 import { Listr } from "listr2";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {
   getPaths,
-  transformTSToJS,
+  transformTSToJSMap,
   writeFilesTask
 } from "../../../lib/index.js";
 import { prepareForRollback } from "../../../lib/rollback.js";
@@ -64,16 +64,13 @@ const files = async ({
     outputFiles.push(testFile);
     outputFiles.push(scenarioFile);
   }
-  return outputFiles.reduce(async (accP, [outputPath, content]) => {
-    const acc = await accP;
-    const template = typescript ? content : await transformTSToJS(outputPath, content);
-    return {
-      [outputPath]: template,
-      ...acc
-    };
-  }, Promise.resolve({}));
+  return transformTSToJSMap(outputFiles, typescript);
 };
-const handler = async ({ name, force, ...rest }) => {
+const handler = async ({
+  name,
+  force,
+  ...rest
+}) => {
   recordTelemetryAttributes({
     command: "generate job",
     force,
@@ -85,7 +82,7 @@ const handler = async ({ name, force, ...rest }) => {
     const jobsManagerFile = getPaths().api.distJobsConfig;
     const jobManager = await import(pathToFileURL(jobsManagerFile).href);
     queueName = jobManager.jobs?.queues[0] ?? "default";
-  } catch (_e) {
+  } catch {
   }
   let jobFiles = {};
   const tasks = new Listr(
@@ -100,8 +97,7 @@ const handler = async ({ name, force, ...rest }) => {
       {
         title: "Cleaning up...",
         task: () => {
-          execa.sync("yarn", [
-            "eslint",
+          runBinSync("eslint", [
             "--fix",
             "--config",
             `${getPaths().base}/node_modules/@cedarjs/eslint-config/shared.js`,
@@ -119,9 +115,11 @@ const handler = async ({ name, force, ...rest }) => {
     }
     await tasks.run();
   } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
+    const message = e instanceof Error ? e.message : String(e);
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    errorTelemetry(process.argv, message);
+    console.error(c.error(message));
+    process.exit(exitCode);
   }
 };
 export {

package/dist/commands/generate/layout/layoutHandler.js

@@ -1,18 +1,22 @@
-import { transformTSToJS } from "../../../lib/index.js";
+import { transformTSToJSMap } from "../../../lib/index.js";
 import { removeGeneratorName } from "../helpers.js";
 import {
-  templateForComponentFile,
-  createHandler
+  createHandler,
+  templateForComponentFile
 } from "../yargsHandlerHelpers.js";
 const COMPONENT_SUFFIX = "Layout";
-const REDWOOD_WEB_PATH_NAME = "layouts";
-const files = async ({ name, typescript = false, ...options }) => {
+const CEDAR_WEB_PATH_NAME = "layouts";
+const files = async ({
+  name,
+  typescript = false,
+  ...options
+}) => {
   const layoutName = removeGeneratorName(name, "layout");
   const extension = typescript ? ".tsx" : ".jsx";
   const layoutFile = await templateForComponentFile({
     name: layoutName,
     suffix: COMPONENT_SUFFIX,
-    webPathSection: REDWOOD_WEB_PATH_NAME,
+    webPathSection: CEDAR_WEB_PATH_NAME,
     extension,
     generator: "layout",
     templatePath: options.skipLink ? "layout.tsx.a11y.template" : "layout.tsx.template"
@@ -21,7 +25,7 @@ const files = async ({ name, typescript = false, ...options }) => {
     name: layoutName,
     suffix: COMPONENT_SUFFIX,
     extension: `.test${extension}`,
-    webPathSection: REDWOOD_WEB_PATH_NAME,
+    webPathSection: CEDAR_WEB_PATH_NAME,
     generator: "layout",
     templatePath: "test.tsx.template"
   });
@@ -29,7 +33,7 @@ const files = async ({ name, typescript = false, ...options }) => {
     name: layoutName,
     suffix: COMPONENT_SUFFIX,
     extension: `.stories${extension}`,
-    webPathSection: REDWOOD_WEB_PATH_NAME,
+    webPathSection: CEDAR_WEB_PATH_NAME,
     generator: "layout",
     templatePath: "stories.tsx.template"
   });
@@ -40,14 +44,7 @@ const files = async ({ name, typescript = false, ...options }) => {
   if (options.tests) {
     files2.push(testFile);
   }
-  return files2.reduce(async (accP, [outputPath, content]) => {
-    const acc = await accP;
-    const template = typescript ? content : await transformTSToJS(outputPath, content);
-    return {
-      [outputPath]: template,
-      ...acc
-    };
-  }, Promise.resolve({}));
+  return transformTSToJSMap(files2, typescript);
 };
 const handler = createHandler({
   componentName: "layout",

package/dist/commands/generate/model/model.js

@@ -19,6 +19,7 @@ const builder = (yargs) => {
   Object.entries(getYargsDefaults()).forEach(([option, config]) => {
     yargs.option(option, config);
   });
+  return yargs;
 };
 const handler = createHandler("model");
 export {

package/dist/commands/generate/model/modelHandler.js

@@ -14,14 +14,20 @@ const TEMPLATE_PATH = path.resolve(
   "templates",
   "model.js.template"
 );
-const files = async ({ name, typescript = false }) => {
+const files = async ({
+  name,
+  typescript = false
+}) => {
   const outputFilename = `${name}.${typescript ? "ts" : "js"}`;
   const outputPath = path.join(getPaths().api.models, outputFilename);
   return {
     [outputPath]: await generateTemplate(TEMPLATE_PATH, { name })
   };
 };
-const handler = async ({ force, ...args }) => {
+const handler = async ({
+  force,
+  ...args
+}) => {
   recordTelemetryAttributes({
     command: "generate model",
     force,
@@ -53,7 +59,7 @@ const handler = async ({ force, ...args }) => {
     }
     await tasks.run();
   } catch (e) {
-    console.log(c.error(e.message));
+    console.log(c.error(e instanceof Error ? e.message : String(e)));
     process.exit(1);
   }
 };

package/dist/commands/generate/ogImage/ogImage.js

@@ -32,6 +32,7 @@ const builder = (yargs) => {
     type: "boolean",
     default: true
   });
+  return yargs;
 };
 const handler = createHandler("ogImage");
 export {

package/dist/commands/generate/ogImage/ogImageHandler.js

@@ -13,7 +13,10 @@ import {
 } from "../../../lib/index.js";
 import { prepareForRollback } from "../../../lib/rollback.js";
 import { customOrDefaultTemplatePath } from "../yargsHandlerHelpers.js";
-const files = async ({ pagePath, typescript = false }) => {
+const files = async ({
+  pagePath,
+  typescript = false
+}) => {
   const extension = typescript ? ".tsx" : ".jsx";
   const componentOutputPath = path.join(
     getPaths().web.pages,
@@ -73,6 +76,10 @@ const handler = async (options) => {
   const extension = options.typescript ? "tsx" : "jsx";
   try {
     await validatePath(normalizedPagePath, extension);
+    const listrOptions = {
+      exitOnError: true,
+      ...options.verbose ? { renderer: "verbose" } : { rendererOptions: { collapseSubtasks: false } }
+    };
     const tasks = new Listr(
       [
         {
@@ -86,22 +93,22 @@ const handler = async (options) => {
           }
         }
       ],
-      {
-        rendererOptions: { collapseSubtasks: false },
-        exitOnError: true,
-        renderer: options.verbose && "verbose"
-      }
+      listrOptions
     );
     if (options.rollback && !options.force) {
       prepareForRollback(tasks);
     }
     await tasks.run();
   } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
+    const message = e instanceof Error ? e.message : String(e);
+    errorTelemetry(process.argv, message);
+    console.error(c.error(message));
+    process.exit(errorExitCode(e));
   }
 };
+function errorExitCode(e) {
+  return typeof e === "object" && e !== null && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+}
 export {
   files,
   handler,