@cedarjs/cli 5.0.0-canary.2482 → 5.0.0-canary.2486

package/dist/commands/destroy/helpers.js

@@ -14,7 +14,11 @@ const createYargsForComponentDestroy = ({
 };
 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/experimental/setupInngest.js

@@ -2,7 +2,7 @@ import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { getEpilogue } from "./util.js";
 const command = "setup-inngest";
 const description = "Setup Inngest for background, scheduled, delayed, multi-step, and fan-out jobs";
-const EXPERIMENTAL_TOPIC_ID = 4866;
+const EXPERIMENTAL_TOPIC_ID = "4866";
 const builder = (yargs) => {
   yargs.option("force", {
     alias: "f",

package/dist/commands/experimental/setupInngestHandler.js

@@ -36,9 +36,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);
+    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/experimental/setupOpentelemetry.js

@@ -2,7 +2,7 @@ import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { getEpilogue } from "./util.js";
 const command = "setup-opentelemetry";
 const description = "Setup OpenTelemetry within the API side";
-const EXPERIMENTAL_TOPIC_ID = 4772;
+const EXPERIMENTAL_TOPIC_ID = "4772";
 const builder = (yargs) => {
   yargs.option("force", {
     alias: "f",

package/dist/commands/experimental/setupReactCompiler.js

@@ -2,7 +2,7 @@ import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { getEpilogue } from "./util.js";
 const command = "setup-react-compiler";
 const description = "Enable the experimental React Compiler";
-const EXPERIMENTAL_TOPIC_ID = 7128;
+const EXPERIMENTAL_TOPIC_ID = "7128";
 const builder = (yargs) => {
   yargs.option("force", {
     alias: "f",

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

@@ -2,7 +2,7 @@ import pascalcase from "pascalcase";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { generate as generateTypes } from "@cedarjs/internal/dist/generate/generate";
 import { isPlural, singularize } from "@cedarjs/utils/cedarPluralize";
-import { nameVariants, transformTSToJS } from "../../../lib/index.js";
+import { nameVariants, transformTSToJSMap } from "../../../lib/index.js";
 import { isWordPluralizable } from "../../../lib/pluralHelpers.js";
 import { addFunctionToRollback } from "../../../lib/rollback.js";
 import { getSchema } from "../../../lib/schemaHelpers.js";
@@ -19,8 +19,12 @@ import {
   uniqueOperationName
 } from "./utils/utils.js";
 const COMPONENT_SUFFIX = "Cell";
-const REDWOOD_WEB_PATH_NAME = "components";
-const files = async ({ name, typescript, ...argv }) => {
+const CEDAR_WEB_PATH_NAME = "components";
+const files = async ({
+  name,
+  typescript = false,
+  ...argv
+}) => {
   let cellName = removeGeneratorName(name, "cell");
   let idName = "id";
   let idType;
@@ -58,7 +62,7 @@ const files = async ({ name, typescript, ...argv }) => {
     name: cellName,
     suffix: COMPONENT_SUFFIX,
     extension,
-    webPathSection: REDWOOD_WEB_PATH_NAME,
+    webPathSection: CEDAR_WEB_PATH_NAME,
     generator: "cell",
     templatePath: `cell${templateNameSuffix}.tsx.template`,
     templateVars: {
@@ -71,7 +75,7 @@ const files = async ({ name, typescript, ...argv }) => {
     name: cellName,
     suffix: COMPONENT_SUFFIX,
     extension: `.test${extension}`,
-    webPathSection: REDWOOD_WEB_PATH_NAME,
+    webPathSection: CEDAR_WEB_PATH_NAME,
     generator: "cell",
     templatePath: "test.js.template",
     templateVars: {
@@ -83,7 +87,7 @@ const files = async ({ name, typescript, ...argv }) => {
     name: cellName,
     suffix: COMPONENT_SUFFIX,
     extension: `.stories${extension}`,
-    webPathSection: REDWOOD_WEB_PATH_NAME,
+    webPathSection: CEDAR_WEB_PATH_NAME,
     generator: "cell",
     templatePath: "stories.tsx.template"
   });
@@ -91,7 +95,7 @@ const files = async ({ name, typescript, ...argv }) => {
     name: cellName,
     suffix: COMPONENT_SUFFIX,
     extension: typescript ? ".mock.ts" : ".mock.js",
-    webPathSection: REDWOOD_WEB_PATH_NAME,
+    webPathSection: CEDAR_WEB_PATH_NAME,
     generator: "cell",
     templatePath: `mock${templateNameSuffix}.ts.template`,
     templateVars: {
@@ -110,14 +114,7 @@ const files = async ({ name, typescript, ...argv }) => {
   if (argv.stories || argv.tests) {
     files2.push(mockFile);
   }
-  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: "cell",

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

@@ -4,14 +4,19 @@ 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({
@@ -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/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/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/page/pageHandler.js

@@ -8,7 +8,7 @@ import { getConfig } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {
   addRoutesToRouterTask,
-  transformTSToJS,
+  transformTSToJSMap,
   writeFilesTask
 } from "../../../lib/index.js";
 import {
@@ -21,10 +21,12 @@ import {
   removeGeneratorName,
   validateName
 } from "../helpers.js";
-import { templateForComponentFile } from "../yargsHandlerHelpers.js";
+import {
+  templateForComponentFile
+} from "../yargsHandlerHelpers.js";
 const COMPONENT_SUFFIX = "Page";
-const REDWOOD_WEB_PATH_NAME = "pages";
-const mapRouteParamTypeToDefaultValue = (paramType) => {
+const CEDAR_WEB_PATH_NAME = "pages";
+function mapRouteParamTypeToDefaultValue(paramType) {
   switch (paramType) {
     case "Int":
       return 42;
@@ -35,7 +37,7 @@ const mapRouteParamTypeToDefaultValue = (paramType) => {
     default:
       return "42";
   }
-};
+}
 const paramVariants = (path) => {
   const param = path?.match(/(\{[\w:]+\})/)?.[1];
   const paramName = param?.replace(/:[^}]+/, "").slice(1, -1);
@@ -62,13 +64,19 @@ const paramVariants = (path) => {
     paramType: mapRouteParamTypeToTsType(routeParamType)
   };
 };
-const files = async ({ name, tests, stories, typescript, ...rest }) => {
+const files = async ({
+  name,
+  tests,
+  stories,
+  typescript = false,
+  ...rest
+}) => {
   const extension = typescript ? ".tsx" : ".jsx";
   const pageFile = await templateForComponentFile({
     name,
     suffix: COMPONENT_SUFFIX,
     extension,
-    webPathSection: REDWOOD_WEB_PATH_NAME,
+    webPathSection: CEDAR_WEB_PATH_NAME,
     generator: "page",
     templatePath: "page.tsx.template",
     templateVars: {
@@ -80,7 +88,7 @@ const files = async ({ name, tests, stories, typescript, ...rest }) => {
     name,
     suffix: COMPONENT_SUFFIX,
     extension: `.test${extension}`,
-    webPathSection: REDWOOD_WEB_PATH_NAME,
+    webPathSection: CEDAR_WEB_PATH_NAME,
     generator: "page",
     templatePath: "test.tsx.template",
     templateVars: rest
@@ -89,7 +97,7 @@ const files = async ({ name, tests, stories, typescript, ...rest }) => {
     name,
     suffix: COMPONENT_SUFFIX,
     extension: `.stories${extension}`,
-    webPathSection: REDWOOD_WEB_PATH_NAME,
+    webPathSection: CEDAR_WEB_PATH_NAME,
     generator: "page",
     templatePath: rest.paramName !== "" ? "stories.tsx.parameters.template" : "stories.tsx.template",
     templateVars: rest
@@ -101,16 +109,12 @@ const files = async ({ name, tests, stories, typescript, ...rest }) => {
   if (stories) {
     files2.push(storiesFile);
   }
-  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 routes = ({ name, path }) => {
+const routes = ({
+  name,
+  path
+}) => {
   return [
     `<Route path="${path}" page={${pascalcase(name)}Page} name="${camelcase(
       name
@@ -191,7 +195,7 @@ const handler = async ({
       },
       {
         title: "One more thing...",
-        task: (ctx, task) => {
+        task: (_ctx, task) => {
           task.title = `One more thing...
 
    ${c.warning("Page created! A note about <Metadata>:")}
@@ -213,9 +217,11 @@ const handler = async ({
     }
     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/yargsCommandHelpers.js

@@ -74,7 +74,11 @@ function createBuilder({
 }
 function createHandler(componentName) {
   return async function handler(argv) {
-    const { handler: 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 { handler: importedHandler } = await import(resolvedPath);
     return importedHandler(argv);
   };
 }

package/dist/commands/generate/yargsHandlerHelpers.js

@@ -45,8 +45,8 @@ const templateForFile = async ({
   templatePath,
   templateVars
 }) => {
-  const sideBase = getPaths()[side];
-  const basePath = sidePathSection ? sideBase[sidePathSection] : sideBase;
+  const paths = getPaths();
+  const basePath = side === "scripts" ? paths.scripts : side === "web" ? sidePathSection ? paths.web[sidePathSection] : paths.web.base : side === "packages" ? paths.packages : sidePathSection ? paths.api[sidePathSection] : paths.api.base;
   if (typeof basePath !== "string") {
     throw new Error(`Invalid path section: "${sidePathSection}"`);
   }

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

@@ -1,6 +1,10 @@
 function createHandler(componentName) {
   return async function handler(argv) {
-    const { handler: importedHandler } = await import(`../providers/${componentName}Handler.js`);
+    const { existsSync } = await import("node:fs");
+    const tsPath = `../providers/${componentName}Handler.ts`;
+    const jsPath = `../providers/${componentName}Handler.js`;
+    const resolvedPath = existsSync(new URL(tsPath, import.meta.url)) ? tsPath : jsPath;
+    const { handler: importedHandler } = await import(resolvedPath);
     return importedHandler(argv);
   };
 }

package/dist/commands/setup/ui/helpers/helpers.js

@@ -1,6 +1,10 @@
 function createHandler(componentName) {
   return async function handler(argv) {
-    const { handler: importedHandler } = await import(`../libraries/${componentName}Handler.js`);
+    const { existsSync } = await import("node:fs");
+    const tsPath = `../libraries/${componentName}Handler.ts`;
+    const jsPath = `../libraries/${componentName}Handler.js`;
+    const resolvedPath = existsSync(new URL(tsPath, import.meta.url)) ? tsPath : jsPath;
+    const { handler: importedHandler } = await import(resolvedPath);
     return importedHandler(argv);
   };
 }

package/dist/lib/index.js

@@ -25,7 +25,7 @@ import {
 } from "@cedarjs/project-config";
 import { pluralize, singularize } from "@cedarjs/utils/cedarPluralize";
 import { addFileToRollback } from "./rollback.js";
-const nameVariants = (name) => {
+function nameVariants(name) {
   const normalizedName = pascalcase(paramCase(singularize(name)));
   return {
     pascalName: pascalcase(paramCase(name)),
@@ -39,8 +39,8 @@ const nameVariants = (name) => {
     singularConstantName: decamelize(normalizedName).toUpperCase(),
     pluralConstantName: decamelize(pluralize(normalizedName)).toUpperCase()
   };
-};
-const generateTemplate = (templateFilename, { name, ...rest }) => {
+}
+function generateTemplate(templateFilename, { name, ...rest }) {
   try {
     const templateFn = template(readFile(templateFilename).toString());
     const renderedTemplate = templateFn({
@@ -50,19 +50,22 @@ const generateTemplate = (templateFilename, { name, ...rest }) => {
     });
     return prettify(templateFilename, renderedTemplate);
   } catch (error) {
-    ;
-    error.message = `Error applying template at ${templateFilename} for ${name}: ${error.message}`;
-    throw error;
+    const originalMessage = error instanceof Error ? error.message : String(error);
+    const wrappedError = new Error(
+      `Error applying template at ${templateFilename} for ${name}: ` + originalMessage
+    );
+    throw wrappedError;
   }
-};
+}
 const prettify = async (templateFilename, renderedTemplate) => {
-  const parser = {
+  const parserMap = {
     ".css": "css",
     ".js": "babel",
     ".jsx": "babel",
     ".ts": "babel-ts",
     ".tsx": "babel-ts"
-  }[path.extname(templateFilename.replace(".template", ""))];
+  };
+  const parser = parserMap[path.extname(templateFilename.replace(".template", ""))];
   if (typeof parser === "undefined") {
     return renderedTemplate;
   }
@@ -132,8 +135,10 @@ async function getInstalledCedarVersion() {
   try {
     const packageJson = await import("../../package.json", { with: { type: "json" } });
     return packageJson.default.version;
-  } catch {
+  } catch (e) {
+    const message = e instanceof Error ? e.message : String(e);
     console.error(c.error("Could not find installed Cedar version"));
+    console.error(c.error(message));
     process.exit(1);
   }
 }
@@ -148,10 +153,19 @@ const _getPaths = () => {
 };
 const getPaths = memoize(_getPaths);
 const resolveFile = internalResolveFile;
-const getGraphqlPath = () => resolveFile(path.join(getPaths().api.functions, "graphql"));
+const getGraphqlPath = () => {
+  const functionsDir = getPaths().api.functions;
+  if (!functionsDir) {
+    throw new Error("Could not resolve the API functions directory");
+  }
+  return resolveFile(path.join(functionsDir, "graphql"));
+};
 const graphFunctionDoesExist = () => {
   const graphqlPath = getGraphqlPath();
-  return graphqlPath ? fs.existsSync(graphqlPath) : false;
+  if (!graphqlPath) {
+    return false;
+  }
+  return fs.existsSync(graphqlPath);
 };
 const getConfig = () => {
   try {
@@ -209,10 +223,27 @@ const transformTSToJS = async (filename, content) => {
     ],
     retainLines: true
   });
-  const code = result?.code ?? "";
-  return prettify(filename.replace(/\.ts(x)?$/, ".js$1"), code);
+  if (result?.code == null) {
+    throw new Error(
+      `Could not transform ${filename} from TypeScript to JavaScript`
+    );
+  }
+  return prettify(filename.replace(/\.ts(x)?$/, ".js$1"), result.code);
 };
-const writeFilesTask = (files, options) => {
+const transformTSToJSMap = async (files, typescript) => {
+  return files.reduce(
+    async (accP, [outputPath, content]) => {
+      const acc = await accP;
+      const template2 = typescript ? content : await transformTSToJS(outputPath, content);
+      return {
+        [outputPath]: template2,
+        ...acc
+      };
+    },
+    Promise.resolve({})
+  );
+};
+const writeFilesTask = (files, options = {}) => {
   const { base } = getPaths();
   return new Listr(
     Object.keys(files).map((file) => {
@@ -274,7 +305,7 @@ const cleanupEmptyDirsTask = (files) => {
     })
   );
 };
-const wrapWithSet = (routesContent, layout, routes, newLineAndIndent, props = {}) => {
+function wrapWithSet(routesContent, layout, routes, newLineAndIndent, props = {}) {
   const [_, indentOne, indentTwo] = routesContent.match(
     /([ \t]*)<Router.*?>[^<]*[\r\n]+([ \t]+)/
   ) || ["", "", ""];
@@ -286,15 +317,17 @@ const wrapWithSet = (routesContent, layout, routes, newLineAndIndent, props = {}
     ...newRoutesWithExtraIndent,
     `</Set>`
   ].join(newLineAndIndent);
-};
+}
 function addRoutesToRouterTask(routes, layout, setProps = {}) {
   const cedarPaths = getPaths();
   const routesContent = readFile(cedarPaths.web.routes).toString();
   let newRoutes = routes.filter((route) => !routesContent.match(route));
   if (newRoutes.length) {
-    const [routerStart, routerParams, newLineAndIndent] = routesContent.match(
-      /\s*<Router(.*?)>(\s*)/s
-    );
+    const routerMatch = routesContent.match(/\s*<Router(.*?)>(\s*)/s);
+    if (!routerMatch) {
+      throw new Error("Could not find a <Router> element in the routes file");
+    }
+    const [routerStart, routerParams, newLineAndIndent] = routerMatch;
     if (/trailingSlashes={?(["'])always\1}?/.test(routerParams)) {
       newRoutes = newRoutes.map((route) => {
         if (route.length > 2e3) {
@@ -337,7 +370,9 @@ function removeEmtpySet(routesContent, layout) {
   const setWithLayoutReg = new RegExp(
     `\\s*<Set[^>]*wrap={${layout}}[^<]*>([^<]*)</Set>`
   );
-  const [matchedSet, childContent] = routesContent.match(setWithLayoutReg) || [];
+  const match = routesContent.match(setWithLayoutReg);
+  const matchedSet = match?.[0] ?? "";
+  const childContent = match?.[1] ?? "";
   if (!matchedSet) {
     return routesContent;
   }
@@ -387,20 +422,22 @@ const addPackagesTask = async ({
     }
   };
 };
-const runCommandTask = async (commands, { verbose, silent }) => {
+const runCommandTask = async (commands, { verbose, silent } = {}) => {
   const tasks = new Listr(
-    commands.map(({ title, cmd, args, opts = {}, cwd = getPaths().base }) => ({
-      title,
-      task: async () => {
-        return execa(cmd, args, {
-          cwd,
-          stdio: verbose && !silent ? "inherit" : "pipe",
-          extendEnv: true,
-          cleanup: true,
-          ...opts
-        });
-      }
-    })),
+    commands.map(
+      ({ title, cmd, args = [], opts = {}, cwd = getPaths().base }) => ({
+        title,
+        task: async () => {
+          return execa(cmd, args, {
+            cwd,
+            stdio: verbose && !silent ? "inherit" : "pipe",
+            extendEnv: true,
+            cleanup: true,
+            ...opts
+          });
+        }
+      })
+    ),
     {
       renderer: silent ? "silent" : verbose ? "verbose" : "default",
       rendererOptions: { collapseSubtasks: false }
@@ -410,7 +447,8 @@ const runCommandTask = async (commands, { verbose, silent }) => {
     await tasks.run();
     return true;
   } catch (e) {
-    console.log(c.error(e.message));
+    const message = e instanceof Error ? e.message : String(e);
+    console.log(c.error(message));
     return false;
   }
 };
@@ -470,6 +508,7 @@ export {
   runCommandTask,
   saveRemoteFileToDisk,
   transformTSToJS,
+  transformTSToJSMap,
   usingVSCode,
   writeFile,
   writeFilesTask

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "5.0.0-canary.2482",
+  "version": "5.0.0-canary.2486",
   "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.2482",
-    "@cedarjs/cli-helpers": "5.0.0-canary.2482",
-    "@cedarjs/fastify-web": "5.0.0-canary.2482",
-    "@cedarjs/internal": "5.0.0-canary.2482",
-    "@cedarjs/prerender": "5.0.0-canary.2482",
-    "@cedarjs/project-config": "5.0.0-canary.2482",
-    "@cedarjs/structure": "5.0.0-canary.2482",
-    "@cedarjs/telemetry": "5.0.0-canary.2482",
-    "@cedarjs/utils": "5.0.0-canary.2482",
-    "@cedarjs/vite": "5.0.0-canary.2482",
-    "@cedarjs/web-server": "5.0.0-canary.2482",
+    "@cedarjs/api-server": "5.0.0-canary.2486",
+    "@cedarjs/cli-helpers": "5.0.0-canary.2486",
+    "@cedarjs/fastify-web": "5.0.0-canary.2486",
+    "@cedarjs/internal": "5.0.0-canary.2486",
+    "@cedarjs/prerender": "5.0.0-canary.2486",
+    "@cedarjs/project-config": "5.0.0-canary.2486",
+    "@cedarjs/structure": "5.0.0-canary.2486",
+    "@cedarjs/telemetry": "5.0.0-canary.2486",
+    "@cedarjs/utils": "5.0.0-canary.2486",
+    "@cedarjs/vite": "5.0.0-canary.2486",
+    "@cedarjs/web-server": "5.0.0-canary.2486",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "1.30.1",
@@ -101,7 +101,7 @@
     "ts-dedent": "2.2.0",
     "tsx": "4.21.0",
     "typescript": "5.9.3",
-    "vitest": "3.2.4"
+    "vitest": "3.2.6"
   },
   "engines": {
     "node": ">=24"