@cedarjs/cli 5.0.0-canary.2487 → 5.0.0-canary.2489

package/dist/commands/build/buildHandler.js

@@ -278,13 +278,14 @@ Run ` + c.info(formatCedarCommand(["build"])) + " (without specifying a workspac
         return buildUDApiServer({ verbose });
       }
     }
-  ].filter((t) => Boolean(t));
+  ];
   if (apiRootPath !== void 0) {
     process.env.CEDAR_API_ROOT_PATH = apiRootPath;
   }
   try {
     await timedTelemetry(process.argv, { type: "build" }, async () => {
-      const jobs = new Listr(tasks, {
+      const listrTasks = tasks.filter((t) => Boolean(t));
+      const jobs = new Listr(listrTasks, {
         renderer: verbose ? "verbose" : void 0
       });
       await jobs.run();

package/dist/commands/deploy/baremetal/SshExecutor.js

@@ -1,5 +1,15 @@
 import { NodeSSH } from "node-ssh";
+class ExecError extends Error {
+  exitCode;
+  constructor(message, exitCode) {
+    super(message);
+    this.name = "ExecError";
+    this.exitCode = exitCode;
+  }
+}
 class SshExecutor {
+  ssh;
+  verbose;
   constructor(verbose) {
     this.ssh = new NodeSSH();
     this.verbose = verbose;
@@ -20,12 +30,11 @@ class SshExecutor {
       cwd: path
     });
     if (result.code !== 0) {
-      const error = new Error(
+      throw new ExecError(
         `Error while running command \`${sshCommand}\` in ${path}
-` + result.stderr
+` + result.stderr,
+        result.code
       );
-      error.exitCode = result.code;
-      throw error;
     }
     return result;
   }

package/dist/commands/deploy/helpers/deployHandler.js

@@ -2,9 +2,13 @@ import execa from "execa";
 import { colors as c } from "@cedarjs/cli-helpers";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { getPaths } from "@cedarjs/project-config";
-const deployHandler = ({ build, prisma, dm: dataMigrate }) => {
+const deployHandler = ({
+  build,
+  prisma,
+  dm: dataMigrate
+}) => {
   const paths = getPaths();
-  let commandSet = [];
+  const commandSet = [];
   if (build) {
     commandSet.push(formatCedarCommand(["build", "--verbose"]));
   }

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

@@ -1,12 +1,10 @@
 import { files as directiveFiles } from "../../generate/directive/directiveHandler.js";
 import { createHandler } from "../handlerHelpers.js";
-const description = "Destroy a directive";
-const { builder, tasks } = createHandler({
+const { handler, tasks } = createHandler({
   componentName: "directive",
   filesFn: (args) => directiveFiles({ ...args, type: "validator" })
 });
 export {
-  builder,
-  description,
+  handler,
   tasks
 };

package/dist/commands/destroy/handlerHelpers.js

@@ -1,22 +1,20 @@
 import { Listr } from "listr2";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { deleteFilesTask } from "../../lib/index.js";
-const tasks = ({
-  componentName,
-  filesFn,
-  name
-}) => new Listr(
-  [
-    {
-      title: `Destroying ${componentName} files...`,
-      task: async () => {
-        const f = await filesFn({ name, stories: true, tests: true });
-        return deleteFilesTask(f);
+function tasks({ componentName, filesFn, name }) {
+  return new Listr(
+    [
+      {
+        title: `Destroying ${componentName} files...`,
+        task: async () => {
+          const f = await filesFn({ name, stories: true, tests: true });
+          return deleteFilesTask(f);
+        }
       }
-    }
-  ],
-  { rendererOptions: { collapseSubtasks: false }, exitOnError: true }
-);
+    ],
+    { rendererOptions: { collapseSubtasks: false }, exitOnError: true }
+  );
+}
 function createHandler({
   componentName,
   preTasksFn = (options) => options,
@@ -24,11 +22,9 @@ function createHandler({
 }) {
   return {
     handler: async (options) => {
-      recordTelemetryAttributes({
-        command: `destroy ${componentName}`
-      });
-      options = await preTasksFn({ ...options, isDestroyer: true });
-      await tasks({ componentName, filesFn, name: options.name }).run();
+      recordTelemetryAttributes({ command: `destroy ${componentName}` });
+      const { name } = await preTasksFn({ ...options, isDestroyer: true });
+      await tasks({ componentName, filesFn, name }).run();
     },
     tasks
   };

package/dist/commands/generate/cell/cellHandler.js

@@ -23,7 +23,10 @@ const CEDAR_WEB_PATH_NAME = "components";
 const files = async ({
   name,
   typescript = false,
-  ...argv
+  list = false,
+  query,
+  stories,
+  tests
 }) => {
   let cellName = removeGeneratorName(name, "cell");
   let idName = "id";
@@ -32,7 +35,7 @@ const files = async ({
   let model = null;
   let templateNameSuffix = "";
   let typeName = cellName;
-  const shouldGenerateList = (isWordPluralizable(cellName) ? isPlural(cellName) : argv.list) || argv.list;
+  const shouldGenerateList = (isWordPluralizable(cellName) ? isPlural(cellName) : list) || list;
   try {
     model = await getSchema(pascalcase(singularize(cellName)));
     idName = getIdName(model);
@@ -46,7 +49,7 @@ const files = async ({
     cellName = forcePluralizeWord(cellName);
     templateNameSuffix = "List";
   }
-  let operationName = argv.query;
+  let operationName = query;
   if (operationName) {
     const userSpecifiedOperationNameIsUnique = await operationNameIsUnique(operationName);
     if (!userSpecifiedOperationNameIsUnique) {
@@ -105,13 +108,13 @@ const files = async ({
     }
   });
   const files2 = [cellFile];
-  if (argv.stories) {
+  if (stories) {
     files2.push(storiesFile);
   }
-  if (argv.tests) {
+  if (tests) {
     files2.push(testFile);
   }
-  if (argv.stories || argv.tests) {
+  if (stories || tests) {
     files2.push(mockFile);
   }
   return transformTSToJSMap(files2, typescript);

package/dist/commands/generate/component/componentHandler.js

@@ -1,18 +1,19 @@
-import { transformTSToJS } from "../../../lib/index.js";
+import { transformTSToJSMap } from "../../../lib/index.js";
 import {
   createHandler,
   templateForComponentFile
 } from "../yargsHandlerHelpers.js";
-const REDWOOD_WEB_PATH_NAME = "components";
+const CEDAR_WEB_PATH_NAME = "components";
 const files = async ({
   name,
   typescript = false,
-  ...argv
+  stories,
+  tests
 }) => {
   const extension = typescript ? ".tsx" : ".jsx";
   const componentFile = await templateForComponentFile({
     name,
-    webPathSection: REDWOOD_WEB_PATH_NAME,
+    webPathSection: CEDAR_WEB_PATH_NAME,
     extension,
     generator: "component",
     templatePath: "component.tsx.template"
@@ -20,37 +21,27 @@ const files = async ({
   const testFile = await templateForComponentFile({
     name,
     extension: `.test${extension}`,
-    webPathSection: REDWOOD_WEB_PATH_NAME,
+    webPathSection: CEDAR_WEB_PATH_NAME,
     generator: "component",
     templatePath: "test.tsx.template"
   });
   const storiesFile = await templateForComponentFile({
     name,
     extension: `.stories${extension}`,
-    webPathSection: REDWOOD_WEB_PATH_NAME,
+    webPathSection: CEDAR_WEB_PATH_NAME,
     generator: "component",
     // Using two different template files here because we have a TS-specific
     // information in a comment in the .tsx template
     templatePath: typescript ? "stories.tsx.template" : "stories.jsx.template"
   });
   const files2 = [componentFile];
-  if (argv.stories) {
+  if (stories) {
     files2.push(storiesFile);
   }
-  if (argv.tests) {
+  if (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: "component",

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,23 +43,9 @@ 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
-}) => {
+const handler = async ({ name, force, ...rest }) => {
   recordTelemetryAttributes({
     command: "generate function",
     force,

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

@@ -7,7 +7,7 @@ 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,14 +64,7 @@ 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 }) => {
   recordTelemetryAttributes({

package/dist/commands/generate/page/pageHandler.js

@@ -21,9 +21,7 @@ import {
   removeGeneratorName,
   validateName
 } from "../helpers.js";
-import {
-  templateForComponentFile
-} from "../yargsHandlerHelpers.js";
+import { templateForComponentFile } from "../yargsHandlerHelpers.js";
 const COMPONENT_SUFFIX = "Page";
 const CEDAR_WEB_PATH_NAME = "pages";
 function mapRouteParamTypeToDefaultValue(paramType) {
@@ -163,7 +161,6 @@ const handler = async ({
           path = pathName(path, pageName);
           const f = await files({
             name: pageName,
-            path,
             tests,
             stories,
             typescript,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "5.0.0-canary.2487",
+  "version": "5.0.0-canary.2489",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -33,17 +33,17 @@
   "dependencies": {
     "@babel/parser": "7.29.3",
     "@babel/preset-typescript": "7.28.5",
-    "@cedarjs/api-server": "5.0.0-canary.2487",
-    "@cedarjs/cli-helpers": "5.0.0-canary.2487",
-    "@cedarjs/fastify-web": "5.0.0-canary.2487",
-    "@cedarjs/internal": "5.0.0-canary.2487",
-    "@cedarjs/prerender": "5.0.0-canary.2487",
-    "@cedarjs/project-config": "5.0.0-canary.2487",
-    "@cedarjs/structure": "5.0.0-canary.2487",
-    "@cedarjs/telemetry": "5.0.0-canary.2487",
-    "@cedarjs/utils": "5.0.0-canary.2487",
-    "@cedarjs/vite": "5.0.0-canary.2487",
-    "@cedarjs/web-server": "5.0.0-canary.2487",
+    "@cedarjs/api-server": "5.0.0-canary.2489",
+    "@cedarjs/cli-helpers": "5.0.0-canary.2489",
+    "@cedarjs/fastify-web": "5.0.0-canary.2489",
+    "@cedarjs/internal": "5.0.0-canary.2489",
+    "@cedarjs/prerender": "5.0.0-canary.2489",
+    "@cedarjs/project-config": "5.0.0-canary.2489",
+    "@cedarjs/structure": "5.0.0-canary.2489",
+    "@cedarjs/telemetry": "5.0.0-canary.2489",
+    "@cedarjs/utils": "5.0.0-canary.2489",
+    "@cedarjs/vite": "5.0.0-canary.2489",
+    "@cedarjs/web-server": "5.0.0-canary.2489",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "1.30.1",