@cedarjs/cli 5.0.0-canary.2560 → 5.0.0-canary.2561

package/dist/commands/deploy/baremetal.js

@@ -78,7 +78,7 @@ const builder = (yargs) => {
   });
   yargs.epilogue(
     `Also see the ${terminalLink(
-      "Redwood Baremetal Deploy Reference",
+      "Cedar Baremetal Deploy Reference",
       "https://cedarjs.com/docs/cli-commands#deploy"
     )}
 `
@@ -100,7 +100,10 @@ async function handler(yargs) {
     verbose: yargs.verbose,
     gitCheck: yargs.gitCheck
   });
-  const { handler: baremetalHandler } = await import("./baremetal/baremetalHandler.js");
+  const { handler: baremetalHandler } = (
+    // @ts-expect-error - baremetalHandler.js has no type declarations yet
+    await import("./baremetal/baremetalHandler.js")
+  );
   return baremetalHandler(yargs);
 }
 export {

package/dist/commands/deploy/packing/nft.js

@@ -52,10 +52,9 @@ async function packageSingleFunction(functionFile) {
     recursive: true,
     force: true
   });
-  return;
 }
 function nftPack() {
-  const filesToBePacked = findApiDistFunctions();
+  const filesToBePacked = findApiDistFunctions({ cwd: getPaths().api.base });
   return Promise.all(filesToBePacked.map(nftPacker.packageSingleFunction));
 }
 export {

package/dist/commands/deploy/serverlessHandler.js

@@ -30,7 +30,9 @@ Please run ${formatAddRootPackagesCommand(["serverless"], true)}.`
     }
   }
 ];
-const buildCommands = ({ sides }) => {
+const buildCommands = ({
+  sides
+}) => {
   return [
     {
       title: `Building ${sides.join(" & ")}...`,
@@ -48,7 +50,12 @@ 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 {
@@ -68,6 +75,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;
       }
     };
   });
@@ -92,13 +100,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 {
@@ -115,7 +123,13 @@ const handler = async (yargs) => {
           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();
@@ -139,7 +153,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({
@@ -150,11 +164,11 @@ const handler = async (yargs) => {
           ],
           {
             exitOnError: true,
-            renderer: yargs.verbose && "verbose"
+            renderer: yargs.verbose ? "verbose" : void 0
           }
         );
         await webDeployTasks.run();
-        const { stdout: slsInfo2 } = await runBin(
+        const { stdout: webSlsInfo } = await runBin(
           "serverless",
           ["info", "--verbose", `--stage=${yargs.stage}`],
           {
@@ -162,7 +176,13 @@ const handler = async (yargs) => {
             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!"),
           "",
@@ -184,8 +204,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 = ({
@@ -201,14 +222,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/setup/deploy/providers/baremetalHandler.js

@@ -72,9 +72,11 @@ const handler = async ({ force }) => {
   try {
     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));
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    process.exit(exitCode);
   }
 };
 export {

package/dist/commands/setup/deploy/providers/serverlessHandler.js

@@ -132,9 +132,11 @@ const handler = async ({ force }) => {
   try {
     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));
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    process.exit(exitCode);
   }
 };
 export {

package/dist/commands/setup/jobs/jobsHandler.js

@@ -54,6 +54,7 @@ const tasks = async ({ force }) => {
           if (modelExists) {
             return "BackgroundJob model exists, skipping";
           }
+          return false;
         }
       },
       {
@@ -113,7 +114,7 @@ const tasks = async ({ force }) => {
         }
       }
     ],
-    { rendererOptions: { collapseSubtasks: false }, errorOnExist: true }
+    { rendererOptions: { collapseSubtasks: false }, exitOnError: true }
   );
 };
 const handler = async ({ force }) => {
@@ -121,7 +122,7 @@ const handler = async ({ force }) => {
   try {
     await t.run();
   } catch (e) {
-    console.error(c.error(e.message));
+    console.error(c.error(e instanceof Error ? e.message : String(e)));
   }
 };
 export {

package/dist/commands/setup/ui/libraries/chakra-uiHandler.js

@@ -10,7 +10,10 @@ const CHAKRA_THEME_AND_COMMENTS = `// This object will be used to override Chakr
 const theme = {}
 export default theme
 `;
-async function handler({ force, install }) {
+async function handler({
+  force,
+  install
+}) {
   recordTelemetryAttributes({
     command: "setup ui chakra-ui",
     force,
@@ -90,8 +93,9 @@ async function handler({ force, install }) {
   try {
     await tasks.run();
   } 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);
   }
 }
 export {

package/dist/commands/setup/ui/libraries/mantineHandler.js

@@ -30,7 +30,11 @@ const theme = {}
 
 export default createTheme(theme)
 `;
-async function handler({ force, install, packages }) {
+async function handler({
+  force,
+  install,
+  packages
+}) {
   recordTelemetryAttributes({
     command: "setup ui mantine",
     force,
@@ -113,7 +117,10 @@ async function handler({ force, install, packages }) {
       },
       {
         title: "Configure Storybook...",
-        skip: () => fileIncludes(cedarPaths.web.storybookPreviewConfig, "withMantine"),
+        skip: () => {
+          const previewConfig = cedarPaths.web.storybookPreviewConfig;
+          return previewConfig != null ? fileIncludes(previewConfig, "withMantine") : false;
+        },
         task: async () => await extendStorybookConfiguration(
           path.join(
             import.meta.dirname,
@@ -129,8 +136,9 @@ async function handler({ force, install, packages }) {
   try {
     await tasks.run();
   } 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);
   }
 }
 export {

package/dist/lib/merge/index.js

@@ -8,9 +8,6 @@ import { forEachFunctionOn, nodeIs } from "./algorithms.js";
 import { semanticIdentity } from "./semanticIdentity.js";
 import { isOpaque } from "./strategy.js";
 function extractProperty(property, fromObject) {
-  if (property === void 0) {
-    return void 0;
-  }
   const tmp = fromObject[property];
   delete fromObject[property];
   return tmp;
@@ -29,7 +26,7 @@ function getProgramPath(ast) {
   return programPath;
 }
 function skipChildren(path) {
-  for (const key of VISITOR_KEYS[path.type]) {
+  for (const key of VISITOR_KEYS[path.type] ?? []) {
     path.skipKey(key);
   }
 }
@@ -46,6 +43,7 @@ function makeProxy(path) {
       if (property === "path") {
         throw new Error("You can't set a path on a proxy!");
       } else {
+        ;
         target.node[property] = value;
         return true;
       }
@@ -59,7 +57,7 @@ function expressionUses(exp, ...ids) {
   let result = false;
   exp.traverse({
     Identifier(path) {
-      if (!path.parentPath.isNodeType("VariableDeclarator") && ids.includes(path.node.name)) {
+      if (!path.parentPath?.isNodeType("VariableDeclarator") && ids.includes(path.node.name)) {
         result = true;
         return;
       }
@@ -69,23 +67,36 @@ function expressionUses(exp, ...ids) {
 }
 function insertBeforeFirstUsage(expression, program) {
   const body = program.get("body");
-  const pos = body.findIndex(
-    (exp) => expressionUses(exp, ...Object.keys(expression.getBindingIdentifiers()))
+  const bindingIds = Object.keys(
+    expression.getBindingIdentifiers()
   );
-  return pos !== -1 ? body[pos].insertBefore(expression.node) : program.pushContainer("body", expression.node);
+  const pos = body.findIndex((exp) => expressionUses(exp, ...bindingIds));
+  if (pos !== -1) {
+    return body[pos].insertBefore(expression.node);
+  } else {
+    return program.pushContainer("body", expression.node);
+  }
 }
 function insertAfterLastImport(expression, program) {
   const body = program.get("body");
-  return body[body.findLastIndex((bodyExpr) => bodyExpr.isNodeType("ImportDeclaration"))].insertAfter(expression.node);
+  let lastImportIdx = -1;
+  for (let i = 0; i < body.length; i++) {
+    if (body[i].isNodeType("ImportDeclaration")) {
+      lastImportIdx = i;
+    }
+  }
+  return body[lastImportIdx].insertAfter(expression.node);
 }
 function prune(path) {
-  switch (path.parentPath.type) {
+  switch (path.parentPath?.type) {
     // If pruning 'path' would yield an ill-formed parent (e.g, '{foo:}' or 'const x;'), prune it.
     case "ObjectProperty":
     case "VariableDeclarator":
       return path.parentPath.remove();
     default:
-      console.log(`Warning: default prune strategy for ${path.parentPath.type}`);
+      console.log(
+        `Warning: default prune strategy for ${path.parentPath?.type}`
+      );
     // eslint-disable-next-line no-fallthrough
     case "Program":
     case "ArrayExpression":
@@ -95,6 +106,7 @@ function prune(path) {
 function stripTrailingCommentsStrategy() {
   return {
     enter(path) {
+      ;
       path.node.trailingComments = [];
     }
   };
@@ -104,48 +116,71 @@ function mergeAST(baseAST, extAST, strategy = {}) {
   const identities = {};
   const baseVisitor = { ...stripTrailingCommentsStrategy() };
   const extVisitor = { ...stripTrailingCommentsStrategy() };
-  forEachFunctionOn(strategy, (typename, strat) => {
-    extVisitor[typename] = {
-      enter(path) {
-        const id = identity(path);
-        id && (identities[id] ||= []).push(path);
-      }
-    };
-    baseVisitor[typename] = {
-      enter(path) {
-        if (isOpaque(strat)) {
-          skipChildren(path);
+  forEachFunctionOn(
+    strategy,
+    (typename, strat) => {
+      extVisitor[typename] = {
+        enter(path) {
+          const id = identity(path);
+          if (id) {
+            ;
+            (identities[id] ||= []).push(path);
+          }
         }
-      },
-      exit(path) {
-        const exts = extractProperty(identity(path), identities);
-        if (exts) {
-          const proxyPath = makeProxy(path);
-          exts.map(makeProxy).forEach((ext) => {
-            strat(proxyPath, ext);
-            prune(ext.path);
-          });
+      };
+      baseVisitor[typename] = {
+        enter(path) {
+          if (isOpaque(strat)) {
+            skipChildren(path);
+          }
+        },
+        exit(path) {
+          const exts = extractProperty(identity(path), identities);
+          if (exts) {
+            const proxyPath = makeProxy(path);
+            exts.map(makeProxy).forEach((ext) => {
+              ;
+              strat(proxyPath, ext);
+              prune(ext.path);
+            });
+          }
         }
-      }
-    };
-  });
-  traverse(extAST, extVisitor);
-  traverse(baseAST, baseVisitor);
+      };
+    }
+  );
+  traverse(
+    extAST,
+    extVisitor
+  );
+  traverse(
+    baseAST,
+    baseVisitor
+  );
   const baseProgram = getProgramPath(baseAST);
+  const body = getProgramPath(extAST).get("body");
   const [imports, others] = partition(
-    getProgramPath(extAST).get("body"),
-    nodeIs("ImportDeclaration")
+    body,
+    // nodeIs returns (node: Node) => boolean; here we have NodePaths, so we
+    // check path.node to stay type-safe.
+    (path) => nodeIs("ImportDeclaration")(path.node)
   );
   imports.forEach((exp) => insertAfterLastImport(exp, baseProgram));
-  forEachRight(others, (exp) => insertBeforeFirstUsage(exp, baseProgram));
+  forEachRight(
+    others,
+    (exp) => insertBeforeFirstUsage(exp, baseProgram)
+  );
 }
 async function merge(base, extension, strategy) {
   function parseReact(code2) {
-    return parse(code2, {
-      filename: "merged.tsx",
+    const result = parse(code2, {
       // required to prevent babel error. The .tsx is relevant
+      filename: "merged.tsx",
       presets: ["@babel/preset-typescript"]
     });
+    if (result === null) {
+      throw new Error("Failed to parse code");
+    }
+    return result;
   }
   const baseAST = parseReact(base);
   const extAST = parseReact(extension);

package/package.json

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