@cedarjs/cli 9.0.0-canary.1784 → 9.0.0-canary.3124

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

@@ -1,18 +1,23 @@
 import camelcase from "camelcase";
-import execa from "execa";
 import { Listr } from "listr2";
 import prompts from "prompts";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { getConfig } from "@cedarjs/project-config";
-import c from "../../../lib/colors.js";
-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;
   }
@@ -41,14 +46,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({
@@ -110,9 +108,9 @@ const handler = async (args) => {
         title: "Generating TypeScript definitions and GraphQL schemas ...",
         task: () => {
           addFunctionToRollback(async () => {
-            await execa("yarn", ["rw-gen"], { stdio: "pipe" });
+            await runBin("cedar-gen", [], { stdio: "pipe" });
           }, true);
-          return execa("yarn", ["rw-gen"], { stdio: "inherit" });
+          return runBin("cedar-gen", [], { stdio: "inherit" });
         }
       },
       {
@@ -133,7 +131,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

@@ -1,19 +1,19 @@
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { errorTelemetry } from "@cedarjs/telemetry";
-import c from "../../../lib/colors.js";
-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,
@@ -21,10 +21,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}`,
@@ -44,14 +44,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({
@@ -95,9 +88,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

@@ -1,6 +1,6 @@
 import { paramCase } from "change-case";
 import pascalcase from "pascalcase";
-import { pluralize, isPlural, isSingular } from "../../lib/cedarPluralize.js";
+import { pluralize, isPlural, isSingular } from "@cedarjs/utils/cedarPluralize";
 const pathName = (path, name) => {
   let routePath = path;
   if (path && path.startsWith("{") && path.endsWith("}")) {
@@ -23,8 +23,22 @@ const validateName = (name) => {
     );
   }
 };
+const SENSITIVE_FIELDS = [
+  "hashedPassword",
+  "salt",
+  "resetToken",
+  "resetTokenExpiresAt",
+  "webAuthnChallenge"
+];
+const redactedModelFields = (fieldNames) => {
+  const sensitive = fieldNames.filter((name) => SENSITIVE_FIELDS.includes(name));
+  if (sensitive.length === 1 && sensitive[0] === "salt") {
+    return [];
+  }
+  return sensitive;
+};
 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,34 +51,36 @@ 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 {
+  SENSITIVE_FIELDS,
   forcePluralizeWord,
   intForeignKeysForModel,
   mapPrismaScalarToPagePropTsType,
   mapRouteParamTypeToTsType,
   pathName,
+  redactedModelFields,
   relationsForModel,
   removeGeneratorName,
   validateName

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,14 +1,14 @@
 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 } from "@cedarjs/cli-helpers";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { errorTelemetry } from "@cedarjs/telemetry";
-import c from "../../../lib/colors.js";
 import {
   getPaths,
-  transformTSToJS,
+  transformTSToJSMap,
   writeFilesTask
 } from "../../../lib/index.js";
 import { prepareForRollback } from "../../../lib/rollback.js";
@@ -65,16 +65,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,
@@ -86,7 +83,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(
@@ -101,14 +98,11 @@ const handler = async ({ name, force, ...rest }) => {
       {
         title: "Cleaning up...",
         task: () => {
-          execa.sync("yarn", [
+          runBinSync(
             "eslint",
-            "--fix",
-            "--config",
-            `${getPaths().base}/node_modules/@cedarjs/eslint-config/shared.js`,
-            `${getPaths().api.jobsConfig}`,
-            ...Object.keys(jobFiles)
-          ]);
+            ["--fix", `${getPaths().api.jobsConfig}`, ...Object.keys(jobFiles)],
+            { cwd: getPaths().base }
+          );
         }
       }
     ],
@@ -120,9 +114,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

@@ -1,7 +1,7 @@
 import path from "path";
 import { Listr } from "listr2";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
-import c from "../../../lib/colors.js";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import {
   getPaths,
   writeFilesTask,
@@ -15,14 +15,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,
@@ -54,7 +60,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

@@ -2,10 +2,10 @@ import fs from "node:fs";
 import path from "node:path";
 import fg from "fast-glob";
 import { Listr } from "listr2";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { ensurePosixPath } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
-import c from "../../../lib/colors.js";
 import {
   generateTemplate,
   getPaths,
@@ -14,7 +14,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,
@@ -74,6 +77,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(
       [
         {
@@ -87,22 +94,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,

package/dist/commands/generate/package/filesTask.js

@@ -58,6 +58,15 @@ const files = async ({
       outputPath: path.join(folderName, "src", `${fileName}.test${extension}`)
     });
     outputFiles.push(testFile);
+    const vitestConfigFile = await templateForFile({
+      name,
+      side: "packages",
+      generator: "package",
+      templatePath: "vitest.config.ts.template",
+      templateVars: { folderName, ...rest },
+      outputPath: path.join(folderName, `vitest.config${extension}`)
+    });
+    outputFiles.push(vitestConfigFile);
   }
   return outputFiles.reduce(async (accP, [outputPath, content]) => {
     const acc = await accP;