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

package/dist/commands/deploy/serverlessHandler.js

@@ -6,24 +6,40 @@ import { config } from "dotenv-defaults";
 import execa from "execa";
 import { Listr } from "listr2";
 import prompts from "prompts";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
-import c from "../../lib/colors.js";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
+import {
+  formatAddRootPackagesCommand,
+  formatRunBinCommand
+} from "@cedarjs/cli-helpers/packageManager/display";
+import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { getPaths } from "../../lib/index.js";
 const preRequisites = () => [
   {
     title: "Checking if Serverless framework is installed...",
-    command: ["yarn serverless", ["--version"]],
-    errorMessage: [
-      "Looks like Serverless is not installed.",
-      "Please run yarn add -W --dev serverless."
-    ]
+    task: async () => {
+      try {
+        await runBin("serverless", ["--version"], { shell: true });
+      } catch (error) {
+        const msg = error instanceof Error ? error.message : String(error);
+        throw new Error(
+          `${msg}
+Looks like Serverless is not installed.
+Please run ${formatAddRootPackagesCommand(["serverless"], true)}.`
+        );
+      }
+    }
   }
 ];
-const buildCommands = ({ sides }) => {
+const buildCommands = ({
+  sides
+}) => {
   return [
     {
       title: `Building ${sides.join(" & ")}...`,
-      command: ["yarn", ["cedar", "build", ...sides]]
+      task: async () => {
+        await runBin("cedar", ["build", ...sides], { shell: true });
+      }
     },
     {
       title: "Packing Functions...",
@@ -35,13 +51,18 @@ const buildCommands = ({ sides }) => {
     }
   ];
 };
-const deployCommands = ({ stage, sides, firstRun, packOnly }) => {
+const deployCommands = ({
+  stage,
+  sides,
+  firstRun,
+  packOnly
+}) => {
   const slsStage = stage ? ["--stage", stage] : [];
   return sides.map((side) => {
     return {
       title: `Deploying ${side}....`,
       task: async () => {
-        await execa("yarn", ["serverless", "deploy", ...slsStage], {
+        await runBin("serverless", ["deploy", ...slsStage], {
           cwd: path.join(getPaths().base, side),
           shell: true,
           stdio: "inherit",
@@ -55,6 +76,7 @@ const deployCommands = ({ stage, sides, firstRun, packOnly }) => {
         if (packOnly) {
           return "Finishing early due to --pack-only flag. Your Redwood project is packaged and ready to deploy";
         }
+        return false;
       }
     };
   });
@@ -79,13 +101,13 @@ const handler = async (yargs) => {
   loadDotEnvForStage(dotEnvPath);
   const tasks = new Listr(
     [
-      ...preRequisites(yargs).map(mapCommandsToListr),
+      ...preRequisites().map(mapCommandsToListr),
       ...buildCommands(yargs).map(mapCommandsToListr),
       ...deployCommands(yargs).map(mapCommandsToListr)
     ],
     {
       exitOnError: true,
-      renderer: yargs.verbose && "verbose"
+      renderer: yargs.verbose ? "verbose" : void 0
     }
   );
   try {
@@ -94,14 +116,21 @@ const handler = async (yargs) => {
       const SETUP_MARKER = ansis.bgBlue.black("First Setup ");
       console.log();
       console.log(SETUP_MARKER, c.success("Starting first setup wizard..."));
-      const { stdout: slsInfo } = await execa(
-        `yarn serverless info --verbose --stage=${yargs.stage}`,
+      const { stdout: slsInfo } = await runBin(
+        "serverless",
+        ["info", "--verbose", `--stage=${yargs.stage}`],
         {
           shell: true,
           cwd: getPaths().api.base
         }
       );
-      const deployedApiUrl = slsInfo.match(/HttpApiUrl: (https:\/\/.*)/)[1];
+      const apiMatch = slsInfo.match(/HttpApiUrl: (https:\/\/.*)/);
+      if (!apiMatch) {
+        throw new Error(
+          "Could not find HttpApiUrl in serverless info output. Deploy may have failed."
+        );
+      }
+      const deployedApiUrl = apiMatch[1];
       console.log();
       console.log(SETUP_MARKER, `Found ${c.success(deployedApiUrl)}`);
       console.log();
@@ -125,7 +154,7 @@ const handler = async (yargs) => {
         const webDeployTasks = new Listr(
           [
             // Rebuild web with the new API_URL
-            ...buildCommands({ ...yargs, sides: ["web"], firstRun: false }).map(
+            ...buildCommands({ ...yargs, sides: ["web"] }).map(
               mapCommandsToListr
             ),
             ...deployCommands({
@@ -136,25 +165,32 @@ const handler = async (yargs) => {
           ],
           {
             exitOnError: true,
-            renderer: yargs.verbose && "verbose"
+            renderer: yargs.verbose ? "verbose" : void 0
           }
         );
         await webDeployTasks.run();
-        const { stdout: slsInfo2 } = await execa(
-          `yarn serverless info --verbose --stage=${yargs.stage}`,
+        const { stdout: webSlsInfo } = await runBin(
+          "serverless",
+          ["info", "--verbose", `--stage=${yargs.stage}`],
           {
             shell: true,
             cwd: getPaths().web.base
           }
         );
-        const deployedWebUrl = slsInfo2.match(/url: (https:\/\/.*)/)[1];
+        const webMatch = webSlsInfo.match(/url: (https:\/\/.*)/);
+        if (!webMatch) {
+          throw new Error(
+            "Could not find url in serverless info output. Deploy may have failed."
+          );
+        }
+        const deployedWebUrl = webMatch[1];
         const message = [
           c.bold("Successful first deploy!"),
           "",
           `View your deployed site at: ${c.success(deployedWebUrl)}`,
           "",
           "You can use serverless.com CI/CD by connecting/creating an app",
-          "To do this run `yarn serverless` on each of the sides, and connect your account",
+          `To do this run \`${formatRunBinCommand("serverless")}\` on each of the sides, and connect your account`,
           "",
           "Find more information in our docs:",
           c.underline("https://cedarjs.com/docs/deploy#serverless")
@@ -169,8 +205,9 @@ const handler = async (yargs) => {
       }
     }
   } catch (e) {
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
+    console.error(c.error(e instanceof Error ? e.message : String(e)));
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    process.exit(exitCode);
   }
 };
 const mapCommandsToListr = ({
@@ -186,14 +223,19 @@ const mapCommandsToListr = ({
     title,
     task: task ? task : async () => {
       try {
-        const executingCommand = execa(...command, {
+        if (!command) {
+          throw new Error(
+            "No command or task provided to mapCommandsToListr"
+          );
+        }
+        const executingCommand = execa(command[0], command[1], {
           cwd: cwd || getPaths().base,
           shell: true
         });
-        executingCommand.stdout.pipe(process.stdout);
+        executingCommand.stdout?.pipe(process.stdout);
         await executingCommand;
       } catch (error) {
-        if (errorMessage) {
+        if (errorMessage && error instanceof Error) {
           error.message = error.message + "\n" + errorMessage.join(" ");
         }
         throw error;

package/dist/commands/deploy/vercel.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { deployBuilder } from "./helpers/deployBuilder.js";
 const command = "vercel [...commands]";
 const description = "Build command for Vercel deploy";

package/dist/commands/destroy/component/component.js

@@ -1,6 +1,6 @@
 import { createHandler, createYargsForComponentDestroy } from "../helpers.js";
 const description = "Destroy a component";
-const { command, builder, tasks } = createYargsForComponentDestroy({
+const { command, builder } = createYargsForComponentDestroy({
   componentName: "component"
 });
 const handler = createHandler("component");
@@ -8,6 +8,5 @@ export {
   builder,
   command,
   description,
-  handler,
-  tasks
+  handler
 };

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

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

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/function/function.js

@@ -1,4 +1,3 @@
-import { files as functionFiles } from "../../generate/function/functionHandler.js";
 import { createYargsForComponentDestroy, createHandler } from "../helpers.js";
 const description = "Destroy a Function";
 const builder = (yargs) => {
@@ -8,8 +7,7 @@ const builder = (yargs) => {
   });
 };
 const { command } = createYargsForComponentDestroy({
-  componentName: "function",
-  filesFn: functionFiles
+  componentName: "function"
 });
 const handler = createHandler("function");
 export {

package/dist/commands/destroy/handlerHelpers.js

@@ -1,18 +1,20 @@
 import { Listr } from "listr2";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 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,
@@ -20,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/destroy/helpers.js

@@ -1,4 +1,6 @@
-const createYargsForComponentDestroy = ({ componentName }) => {
+const createYargsForComponentDestroy = ({
+  componentName
+}) => {
   return {
     command: `${componentName} <name>`,
     description: `Destroy a ${componentName} component`,
@@ -12,7 +14,11 @@ const createYargsForComponentDestroy = ({ componentName }) => {
 };
 function createHandler(componentName) {
   return async (argv) => {
-    const importedHandler = await import(`./${componentName}/${componentName}Handler.js`);
+    const { existsSync } = await import("node:fs");
+    const tsPath = `./${componentName}/${componentName}Handler.ts`;
+    const jsPath = `./${componentName}/${componentName}Handler.js`;
+    const resolvedPath = existsSync(new URL(tsPath, import.meta.url)) ? tsPath : jsPath;
+    const importedHandler = await import(resolvedPath);
     const fn = importedHandler.default ?? importedHandler.handler ?? importedHandler;
     return typeof fn === "function" ? fn(argv) : fn;
   };

package/dist/commands/destroy/layout/layout.js

@@ -1,7 +1,6 @@
-import { files as layoutFiles } from "../../generate/layout/layoutHandler.js";
 import { createYargsForComponentDestroy, createHandler } from "../helpers.js";
 const { command, description, builder } = createYargsForComponentDestroy(
-  { componentName: "layout", filesFn: layoutFiles }
+  { componentName: "layout" }
 );
 const handler = createHandler("layout");
 export {

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

@@ -1,7 +1,7 @@
 import camelcase from "camelcase";
 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 {
   deleteFilesTask,
   removeRoutesFromRouterTask
@@ -42,7 +42,7 @@ const handler = async ({ name, path }) => {
   try {
     await t.run();
   } catch (e) {
-    console.log(c.error(e.message));
+    console.log(c.error(e instanceof Error ? e.message : String(e)));
   }
 };
 export {

package/dist/commands/destroy/scaffold/scaffoldHandler.js

@@ -1,8 +1,8 @@
 import { Listr } from "listr2";
 import pascalcase from "pascalcase";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
-import { pluralize } from "../../../lib/cedarPluralize.js";
-import c from "../../../lib/colors.js";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { pluralize } from "@cedarjs/utils/cedarPluralize";
 import {
   deleteFilesTask,
   getPaths,
@@ -16,7 +16,11 @@ import {
   routes as scaffoldRoutes,
   splitPathAndModel
 } from "../../generate/scaffold/scaffoldHandler.js";
-const removeRoutesWithSet = async ({ model, path, nestScaffoldByModel }) => {
+const removeRoutesWithSet = async ({
+  model,
+  path,
+  nestScaffoldByModel
+}) => {
   const routes = await scaffoldRoutes({ model, path, nestScaffoldByModel });
   const routeNames = routes.map(extractRouteName);
   const pluralPascalName = pascalcase(pluralize(model));
@@ -29,18 +33,25 @@ const removeSetImport = () => {
   if (routesContent.match("<Set")) {
     return "Skipping removal of Set import in Routes.{jsx,tsx}";
   }
-  const [redwoodRouterImport] = routesContent.match(
+  const cedarRouterImportMatch = routesContent.match(
     /import {[^]*} from '@cedarjs\/router'/
   );
-  const removedSetImport = redwoodRouterImport.replace(/,*\s*Set,*/, "");
+  if (!cedarRouterImportMatch) {
+    return "No @cedarjs/router import found in Routes.{jsx,tsx}";
+  }
+  const [cedarRouterImport] = cedarRouterImportMatch;
+  const removedSetImport = cedarRouterImport.replace(/,*\s*Set,*/, "");
   const newRoutesContent = routesContent.replace(
-    redwoodRouterImport,
+    cedarRouterImport,
     removedSetImport
   );
   writeFile(routesPath, newRoutesContent, { overwriteExisting: true });
   return "Removed Set import in Routes.{jsx,tsx}";
 };
-const removeLayoutImport = ({ model: name, path: scaffoldPath = "" }) => {
+const removeLayoutImport = ({
+  model: name,
+  path: scaffoldPath = ""
+}) => {
   const pluralPascalName = pascalcase(pluralize(name));
   const pascalScaffoldPath = scaffoldPath === "" ? scaffoldPath : scaffoldPath.split("/").map(pascalcase).join("/") + "/";
   const layoutName = `${pluralPascalName}Layout`;
@@ -54,7 +65,12 @@ const removeLayoutImport = ({ model: name, path: scaffoldPath = "" }) => {
   writeFile(routesPath, newRoutesContent, { overwriteExisting: true });
   return "Removed layout import from Routes.{jsx,tsx}";
 };
-const tasks = ({ model, path, tests, nestScaffoldByModel }) => new Listr(
+const tasks = ({
+  model,
+  path,
+  tests,
+  nestScaffoldByModel
+}) => new Listr(
   [
     {
       title: "Destroying scaffold files...",
@@ -92,12 +108,15 @@ const handler = async ({ model: modelArg }) => {
     const { name } = await verifyModelName({ name: model, isDestroyer: true });
     await tasks({ model: name, path }).run();
   } catch (e) {
-    console.log(c.error(e.message));
+    console.log(c.error(e instanceof Error ? e.message : String(e)));
   }
 };
 const extractRouteName = (route) => {
-  const { groups } = route.match(/.*name="?(?<routeName>\w+)"?/);
-  return groups.routeName;
+  const match = route.match(/.*name="?(?<routeName>\w+)"?/);
+  if (!match?.groups?.routeName) {
+    throw new Error(`Could not extract route name from route: ${route}`);
+  }
+  return match.groups.routeName;
 };
 export {
   handler,

package/dist/commands/destroy/sdl/sdlHandler.js

@@ -1,6 +1,6 @@
 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 { deleteFilesTask } from "../../../lib/index.js";
 import { verifyModelName } from "../../../lib/schemaHelpers.js";
 import { files } from "../../generate/sdl/sdlHandler.js";
@@ -24,7 +24,7 @@ const handler = async ({ model }) => {
     const { name } = await verifyModelName({ name: model, isDestroyer: true });
     await tasks({ model: name }).run();
   } catch (e) {
-    console.log(c.error(e.message));
+    console.log(c.error(e instanceof Error ? e.message : String(e)));
   }
 };
 export {

package/dist/commands/dev/apiDebugFlag.js

@@ -1,17 +1,18 @@
 import { argv } from "node:process";
 import { getConfig } from "@cedarjs/project-config";
-const defaultApiDebugPort = 18911;
-function getApiDebugFlag(apiDebugPort) {
+function getApiDebugFlag(apiDebugPort, apiAvailablePort) {
   if (apiDebugPort) {
     return `--debug-port ${apiDebugPort}`;
   } else if (argv.includes("--apiDebugPort")) {
-    return `--debug-port ${defaultApiDebugPort}`;
+    return `--debug-port ${"1" + apiAvailablePort}`;
   }
   const apiDebugPortInConfig = getConfig().api.debugPort;
   if (apiDebugPortInConfig) {
     return `--debug-port ${apiDebugPortInConfig}`;
+  } else if (apiDebugPortInConfig === false) {
+    return "";
   }
-  return "";
+  return `--debug-port ${"1" + apiAvailablePort}`;
 }
 export {
   getApiDebugFlag