@cedarjs/cli 5.0.0-canary.2480 → 5.0.0-canary.2481

package/dist/commands/experimental/setupReactCompilerHandler.js

@@ -13,19 +13,16 @@ import {
   EXPERIMENTAL_TOPIC_ID
 } from "./setupReactCompiler.js";
 import { printTaskEpilogue } from "./util.js";
-const handler = async ({
-  force,
-  verbose
-}) => {
+const handler = async (options) => {
   const rwPaths = getPaths();
   const configTomlPath = getConfigPath();
   const configFileName = path.basename(configTomlPath);
   const configContent = fs.readFileSync(configTomlPath, "utf-8");
-  const tasks = new Listr(
-    [
+  function buildTaskData() {
+    return [
       {
         title: "Check prerequisites",
-        skip: force,
+        skip: options.force,
         task: () => {
           if (!rwPaths.web.entryClient || !rwPaths.web.viteConfig) {
             throw new Error(
@@ -62,7 +59,7 @@ const handler = async ({
               }
             );
           } else {
-            if (force) {
+            if (options.force) {
               task.output = `Overwriting config in ${configFileName}`;
               writeFile(
                 configTomlPath,
@@ -82,11 +79,10 @@ const handler = async ({
               );
             }
           }
-        },
-        rendererOptions: { persistentOutput: true }
+        }
       },
-      // We are using two different yarn commands here which is fine because they're operating on different
-      // workspaces - web and the root
+      // We are using two different yarn commands here which is fine because
+      // they're operating on different workspaces - web and the root
       {
         title: "Installing eslint-plugin-react-compiler",
         task: async () => {
@@ -112,14 +108,26 @@ const handler = async ({
           printTaskEpilogue(command, description, EXPERIMENTAL_TOPIC_ID);
         }
       }
-    ],
-    {
-      rendererOptions: { collapseSubtasks: false, persistentOutput: true },
-      renderer: verbose ? "verbose" : "default"
-    }
-  );
+    ];
+  }
   try {
-    await tasks.run();
+    if (options.verbose) {
+      await new Listr(buildTaskData(), {
+        exitOnError: true,
+        renderer: "verbose"
+      }).run();
+    } else {
+      await new Listr(
+        buildTaskData().map((t) => ({
+          ...t,
+          rendererOptions: { persistentOutput: true }
+        })),
+        {
+          exitOnError: true,
+          rendererOptions: { collapseSubtasks: false }
+        }
+      ).run();
+    }
   } catch (e) {
     const message = e instanceof Error ? e.message : String(e);
     const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;

package/dist/commands/experimental/setupStreamingSsr.js

@@ -2,7 +2,7 @@ import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { getEpilogue } from "./util.js";
 const command = "setup-streaming-ssr";
 const description = "Enable React Streaming and Server Side Rendering (SSR)";
-const EXPERIMENTAL_TOPIC_ID = 5052;
+const EXPERIMENTAL_TOPIC_ID = "5052";
 const builder = (yargs) => {
   yargs.option("force", {
     alias: "f",

package/dist/commands/experimental/setupStreamingSsrHandler.js

@@ -13,21 +13,18 @@ import {
   EXPERIMENTAL_TOPIC_ID
 } from "./setupStreamingSsr.js";
 import { printTaskEpilogue } from "./util.js";
-const handler = async ({
-  force,
-  verbose
-}) => {
-  const rwPaths = getPaths();
+const handler = async (options) => {
+  const cedarPaths = getPaths();
   const configPath = getConfigPath();
   const configContent = fs.readFileSync(configPath, "utf-8");
   const ts = isTypeScriptProject();
-  const ext = path.extname(rwPaths.web.entryClient || "");
-  const tasks = new Listr(
-    [
+  const ext = path.extname(cedarPaths.web.entryClient || "");
+  function buildTaskData() {
+    return [
       {
         title: "Check prerequisites",
         task: () => {
-          if (!rwPaths.web.entryClient || !rwPaths.web.viteConfig) {
+          if (!cedarPaths.web.entryClient || !cedarPaths.web.viteConfig) {
             throw new Error(
               "Vite needs to be setup before you can enable Streaming SSR"
             );
@@ -52,7 +49,7 @@ const handler = async ({
               }
             );
           } else {
-            if (force) {
+            if (options.force) {
               task.output = "Overwriting config in cedar.toml";
               writeFile(
                 configPath,
@@ -78,8 +75,7 @@ const handler = async ({
               );
             }
           }
-        },
-        rendererOptions: { persistentOutput: true }
+        }
       },
       {
         title: `Adding entry.client${ext}...`,
@@ -93,10 +89,13 @@ const handler = async ({
             ),
             "utf-8"
           );
-          let entryClientPath = rwPaths.web.entryClient;
+          let entryClientPath = cedarPaths.web.entryClient;
+          if (!entryClientPath) {
+            throw new Error("entryClient is not set");
+          }
           const entryClientContent = ts ? entryClientTemplate : await transformTSToJS(entryClientPath, entryClientTemplate);
-          let overwriteExisting = force;
-          if (!force) {
+          let overwriteExisting = options.force;
+          if (!options.force) {
             const prompt = task.prompt(ListrEnquirerPromptAdapter);
             overwriteExisting = await prompt.run({
               type: "Confirm",
@@ -109,8 +108,7 @@ You'll manually need to merge it with your existing entry.client${ext} file.`;
             }
           }
           writeFile(entryClientPath, entryClientContent, { overwriteExisting });
-        },
-        rendererOptions: { persistentOutput: true }
+        }
       },
       {
         title: `Adding entry.server${ext}...`,
@@ -125,12 +123,12 @@ You'll manually need to merge it with your existing entry.client${ext} file.`;
             "utf-8"
           );
           const entryServerPath = path.join(
-            rwPaths.web.src,
+            cedarPaths.web.src,
             `entry.server${ext}`
           );
           const entryServerContent = ts ? entryServerTemplate : await transformTSToJS(entryServerPath, entryServerTemplate);
           writeFile(entryServerPath, entryServerContent, {
-            overwriteExisting: force
+            overwriteExisting: options.force
           });
         }
       },
@@ -146,10 +144,10 @@ You'll manually need to merge it with your existing entry.client${ext} file.`;
             ),
             "utf-8"
           );
-          const documentPath = path.join(rwPaths.web.src, `Document${ext}`);
+          const documentPath = path.join(cedarPaths.web.src, `Document${ext}`);
           const documentContent = ts ? documentTemplate : await transformTSToJS(documentPath, documentTemplate);
           writeFile(documentPath, documentContent, {
-            overwriteExisting: force
+            overwriteExisting: options.force
           });
         }
       },
@@ -166,18 +164,18 @@ You'll manually need to merge it with your existing entry.client${ext} file.`;
             "utf-8"
           );
           const tsconfigPath = path.join(
-            rwPaths.web.base,
+            cedarPaths.web.base,
             ts ? "tsconfig.json" : "jsconfig.json"
           );
           writeFile(tsconfigPath, tsconfigTemplate, {
-            overwriteExisting: force
+            overwriteExisting: options.force
           });
         }
       },
       {
         title: 'Adding resolution for "@apollo/client-react-streaming/superjson"',
         task: () => {
-          const pkgJsonPath = path.join(rwPaths.base, "package.json");
+          const pkgJsonPath = path.join(cedarPaths.base, "package.json");
           const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf-8"));
           const resolutions = pkgJson.resolutions || {};
           resolutions["@apollo/client-react-streaming/superjson"] = "^1.12.2";
@@ -191,14 +189,26 @@ You'll manually need to merge it with your existing entry.client${ext} file.`;
           printTaskEpilogue(command, description, EXPERIMENTAL_TOPIC_ID);
         }
       }
-    ],
-    {
-      rendererOptions: { collapseSubtasks: false, persistentOutput: true },
-      renderer: verbose ? "verbose" : "default"
-    }
-  );
+    ];
+  }
   try {
-    await tasks.run();
+    if (options.verbose) {
+      await new Listr(buildTaskData(), {
+        exitOnError: true,
+        renderer: "verbose"
+      }).run();
+    } else {
+      await new Listr(
+        buildTaskData().map((t) => ({
+          ...t,
+          rendererOptions: { persistentOutput: true }
+        })),
+        {
+          exitOnError: true,
+          rendererOptions: { collapseSubtasks: false }
+        }
+      ).run();
+    }
   } catch (e) {
     const message = e instanceof Error ? e.message : String(e);
     const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;

package/dist/commands/generate/realtime/realtimeHandler.js

@@ -66,8 +66,8 @@ async function handler({
     });
     functionType = response.functionType;
   }
-  const tasks = new Listr(
-    [
+  function buildTaskData() {
+    return [
       {
         title: "Checking for realtime environment prerequisites ...",
         task: () => {
@@ -207,14 +207,31 @@ async function handler({
           );
         }
       }
-    ],
-    {
-      rendererOptions: { collapseSubtasks: false, persistentOutput: true },
-      renderer: silent ? "silent" : verbose ? "verbose" : "default"
-    }
-  );
+    ];
+  }
   try {
-    await tasks.run();
+    if (silent) {
+      await new Listr(buildTaskData(), {
+        exitOnError: true,
+        renderer: "silent"
+      }).run();
+    } else if (verbose) {
+      await new Listr(buildTaskData(), {
+        exitOnError: true,
+        renderer: "verbose"
+      }).run();
+    } else {
+      await new Listr(
+        buildTaskData().map((t) => ({
+          ...t,
+          rendererOptions: { persistentOutput: true }
+        })),
+        {
+          exitOnError: true,
+          rendererOptions: { collapseSubtasks: false }
+        }
+      ).run();
+    }
   } catch (e) {
     const message = e instanceof Error ? e.message : String(e);
     const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;

package/dist/lib/index.js

@@ -1,6 +1,6 @@
-import https from "https";
 import fs from "node:fs";
-import path from "path";
+import https from "node:https";
+import path from "node:path";
 import * as babel from "@babel/core";
 import boxen from "boxen";
 import camelcase from "camelcase";
@@ -18,8 +18,8 @@ import {
   addWorkspacePackages
 } from "@cedarjs/cli-helpers/packageManager/packages";
 import {
-  getConfig as getRedwoodConfig,
-  getPaths as getRedwoodPaths,
+  getConfig as getCedarConfig,
+  getPaths as getCedarPaths,
   resolveFile as internalResolveFile,
   findUp
 } from "@cedarjs/project-config";
@@ -50,6 +50,7 @@ const generateTemplate = (templateFilename, { name, ...rest }) => {
     });
     return prettify(templateFilename, renderedTemplate);
   } catch (error) {
+    ;
     error.message = `Error applying template at ${templateFilename} for ${name}: ${error.message}`;
     throw error;
   }
@@ -131,17 +132,17 @@ async function getInstalledCedarVersion() {
   try {
     const packageJson = await import("../../package.json", { with: { type: "json" } });
     return packageJson.default.version;
-  } catch (e) {
+  } catch {
     console.error(c.error("Could not find installed Cedar version"));
     process.exit(1);
   }
 }
-const bytes = (contents) => Buffer.byteLength(contents, "utf8");
 const _getPaths = () => {
   try {
-    return getRedwoodPaths();
+    return getCedarPaths();
   } catch (e) {
-    console.error(c.error(e.message));
+    const message = e instanceof Error ? e.message : String(e);
+    console.error(c.error(message));
     process.exit(1);
   }
 };
@@ -149,13 +150,15 @@ const getPaths = memoize(_getPaths);
 const resolveFile = internalResolveFile;
 const getGraphqlPath = () => resolveFile(path.join(getPaths().api.functions, "graphql"));
 const graphFunctionDoesExist = () => {
-  return fs.existsSync(getGraphqlPath());
+  const graphqlPath = getGraphqlPath();
+  return graphqlPath ? fs.existsSync(graphqlPath) : false;
 };
 const getConfig = () => {
   try {
-    return getRedwoodConfig();
+    return getCedarConfig();
   } catch (e) {
-    console.error(c.error(e.message));
+    const message = e instanceof Error ? e.message : String(e);
+    console.error(c.error(message));
     process.exit(1);
   }
 };
@@ -166,7 +169,7 @@ const getPrettierOptions = async () => {
     const prettierConfigPath = fs.existsSync(cjsPath) ? cjsPath : mjsPath;
     const { default: prettierOptions } = await import(`file://${prettierConfigPath}`);
     return prettierOptions;
-  } catch (e) {
+  } catch {
     if (process.env.VITEST_POOL_ID !== void 0) {
       return {
         trailingComma: "es5",
@@ -189,10 +192,10 @@ const getPrettierOptions = async () => {
   }
 };
 const transformTSToJS = async (filename, content) => {
-  const { code } = babel.transform(content, {
+  const result = babel.transform(content, {
     filename,
-    // If you ran `yarn cedar generate` in `./web` transformSync would import the `.babelrc.js` file,
-    // in `./web`? despite us setting `configFile: false`.
+    // If you ran `yarn cedar generate` in `./web` transformSync would import
+    // the `.babelrc.js` file, in `./web` despite us setting `configFile: false`
     cwd: process.env.NODE_ENV === "test" ? void 0 : getPaths().base,
     configFile: false,
     plugins: [
@@ -206,6 +209,7 @@ const transformTSToJS = async (filename, content) => {
     ],
     retainLines: true
   });
+  const code = result?.code ?? "";
   return prettify(filename.replace(/\.ts(x)?$/, ".js$1"), code);
 };
 const writeFilesTask = (files, options) => {
@@ -215,7 +219,7 @@ const writeFilesTask = (files, options) => {
       const contents = files[file];
       return {
         title: `...waiting to write file \`./${path.relative(base, file)}\`...`,
-        task: (ctx, task) => writeFile(file, contents, options, task)
+        task: (_ctx, task) => writeFile(file, contents, options, task)
       };
     })
   );
@@ -273,7 +277,7 @@ const cleanupEmptyDirsTask = (files) => {
 const wrapWithSet = (routesContent, layout, routes, newLineAndIndent, props = {}) => {
   const [_, indentOne, indentTwo] = routesContent.match(
     /([ \t]*)<Router.*?>[^<]*[\r\n]+([ \t]+)/
-  ) || ["", 0, 2];
+  ) || ["", "", ""];
   const oneLevelIndent = indentTwo.slice(0, indentTwo.length - indentOne.length);
   const newRoutesWithExtraIndent = routes.map((route) => oneLevelIndent + route);
   const propsString = Object.entries(props).map((values) => `${values[0]}="${values[1]}"`).join(" ");
@@ -283,7 +287,7 @@ const wrapWithSet = (routesContent, layout, routes, newLineAndIndent, props = {}
     `</Set>`
   ].join(newLineAndIndent);
 };
-const addRoutesToRouterTask = (routes, layout, setProps = {}) => {
+function addRoutesToRouterTask(routes, layout, setProps = {}) {
   const cedarPaths = getPaths();
   const routesContent = readFile(cedarPaths.web.routes).toString();
   let newRoutes = routes.filter((route) => !routesContent.match(route));
@@ -315,7 +319,7 @@ ${route}`);
       overwriteExisting: true
     });
   }
-};
+}
 const addScaffoldImport = () => {
   const appJsPath = getPaths().web.app;
   let appJsContents = readFile(appJsPath).toString();
@@ -329,7 +333,7 @@ const addScaffoldImport = () => {
   writeFile(appJsPath, appJsContents, { overwriteExisting: true });
   return "Added scaffold import to App.{jsx,tsx}";
 };
-const removeEmtpySet = (routesContent, layout) => {
+function removeEmtpySet(routesContent, layout) {
   const setWithLayoutReg = new RegExp(
     `\\s*<Set[^>]*wrap={${layout}}[^<]*>([^<]*)</Set>`
   );
@@ -342,8 +346,8 @@ const removeEmtpySet = (routesContent, layout) => {
     return routesContent;
   }
   return routesContent.replace(setWithLayoutReg, "");
-};
-const removeRoutesFromRouterTask = (routes, layout) => {
+}
+function removeRoutesFromRouterTask(routes, layout) {
   const cedarPaths = getPaths();
   const routesContent = readFile(cedarPaths.web.routes).toString();
   const newRoutesContent = routes.reduce((content, route) => {
@@ -354,7 +358,7 @@ const removeRoutesFromRouterTask = (routes, layout) => {
   writeFile(cedarPaths.web.routes, routesWithoutEmptySet, {
     overwriteExisting: true
   });
-};
+}
 const addPackagesTask = async ({
   packages,
   side = "project",
@@ -399,7 +403,7 @@ const runCommandTask = async (commands, { verbose, silent }) => {
     })),
     {
       renderer: silent ? "silent" : verbose ? "verbose" : "default",
-      rendererOptions: { collapseSubtasks: false, dateFormat: false }
+      rendererOptions: { collapseSubtasks: false }
     }
   );
   try {
@@ -433,7 +437,7 @@ const printSetupNotes = (notes) => {
  ${boxen(notes.join("\n"), {
         padding: { top: 1, bottom: 1, right: 1, left: 1 },
         margin: 1,
-        borderColour: "gray"
+        borderColor: "gray"
       })}  
 `;
     }
@@ -444,7 +448,6 @@ export {
   addPackagesTask,
   addRoutesToRouterTask,
   addScaffoldImport,
-  bytes,
   cleanupEmptyDirsTask,
   deleteFile,
   deleteFilesTask,

package/dist/lib/plugin.js

@@ -51,16 +51,23 @@ const PLUGIN_CACHE_BUILTIN = [
   "tc",
   "upgrade"
 ];
+function isErrorWithCode(error, code) {
+  return typeof error === "object" && error !== null && "code" in error && error.code === code;
+}
 function loadCommandCache() {
-  let pluginCommandCache = PLUGIN_CACHE_DEFAULT;
+  let pluginCommandCache = { ...PLUGIN_CACHE_DEFAULT };
   const commandCachePath = path.join(
     getPaths().generated.base,
     PLUGIN_CACHE_FILENAME
   );
   try {
-    const localCommandCache = JSON.parse(fs.readFileSync(commandCachePath));
+    const localCommandCache = JSON.parse(
+      fs.readFileSync(commandCachePath, "utf8")
+    );
     let valid = true;
-    for (const [key, value] of Object.entries(localCommandCache)) {
+    for (const [key, value] of Object.entries(
+      localCommandCache
+    )) {
       if (key === "_builtin") {
         continue;
       }
@@ -73,7 +80,7 @@ function loadCommandCache() {
       };
     }
   } catch (error) {
-    if (error.code !== "ENOENT") {
+    if (!isErrorWithCode(error, "ENOENT")) {
       console.error(`Error loading plugin command cache at ${commandCachePath}`);
       console.error(error);
     }
@@ -162,7 +169,7 @@ async function installPluginPackage(packageName, packageVersion) {
       console.log(
         "The following error occurred while checking plugin compatibility for automatic installation:"
       );
-      const errorMessage = error.message ?? error;
+      const errorMessage = error instanceof Error ? error.message : String(error);
       console.log(errorMessage);
       if (errorMessage.includes("does not have a tag") || errorMessage.includes("does not have a version")) {
         process.exit(1);

package/dist/plugin.js

@@ -59,8 +59,6 @@ async function loadPlugins(yargs) {
         yargs.command({
           command: `${namespace} <command>`,
           describe: `Commands from ${namespace}`,
-          builder: () => {
-          },
           handler: () => {
           }
         });
@@ -97,6 +95,7 @@ async function loadPlugins(yargs) {
           describe: `Commands from ${namespaceInUse}`,
           builder: (yargs2) => {
             yargs2.command(commands).demandCommand();
+            return yargs2;
           },
           handler: () => {
           }
@@ -108,13 +107,11 @@ async function loadPlugins(yargs) {
   }
   const packagesToLoad = /* @__PURE__ */ new Set();
   for (const [packageName, cacheEntry] of Object.entries(pluginCommandCache)) {
-    if (packageName === "_builtin") {
+    if (packageName === "_builtin" || Array.isArray(cacheEntry)) {
       continue;
     }
     const commandFirstWords = [];
-    for (const [command, info] of Object.entries(
-      cacheEntry
-    )) {
+    for (const [command, info] of Object.entries(cacheEntry)) {
       commandFirstWords.push(command.split(" ")[0]);
       commandFirstWords.push(
         ...info.aliases?.map((a) => a.split(" ")[0]) ?? []
@@ -136,6 +133,9 @@ async function loadPlugins(yargs) {
   const commandsToRegister = [];
   if (foundMatchingPackage) {
     const packageToLoad = packagesToLoad.values().next().value;
+    if (!packageToLoad) {
+      throw new Error(`Invalid first value in ${packagesToLoad}`);
+    }
     const commands = await loadCommandsFromCacheOrPackage(
       packageToLoad,
       pluginCommandCache,
@@ -162,6 +162,7 @@ async function loadPlugins(yargs) {
       describe: `Commands from ${namespaceInUse}`,
       builder: (yargs2) => {
         yargs2.command(commandsToRegister).demandCommand();
+        return yargs2;
       },
       handler: () => {
       }
@@ -175,8 +176,6 @@ async function loadPlugins(yargs) {
       yargs.command({
         command: `${namespace} <command>`,
         describe: `Commands from ${namespace}`,
-        builder: () => {
-        },
         handler: () => {
         }
       });
@@ -187,8 +186,11 @@ async function loadPlugins(yargs) {
 }
 async function loadCommandsFromCacheOrPackage(packageName, cache, autoInstall, readFromCache) {
   let cacheEntry = void 0;
-  if (readFromCache) {
-    cacheEntry = cache !== void 0 ? cache[packageName] : void 0;
+  if (readFromCache && cache) {
+    const entry = cache[packageName];
+    if (entry && !Array.isArray(entry)) {
+      cacheEntry = entry;
+    }
   }
   if (cacheEntry !== void 0) {
     const commands = Object.entries(cacheEntry).map(([command, info]) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "5.0.0-canary.2480",
+  "version": "5.0.0-canary.2481",
   "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.2480",
-    "@cedarjs/cli-helpers": "5.0.0-canary.2480",
-    "@cedarjs/fastify-web": "5.0.0-canary.2480",
-    "@cedarjs/internal": "5.0.0-canary.2480",
-    "@cedarjs/prerender": "5.0.0-canary.2480",
-    "@cedarjs/project-config": "5.0.0-canary.2480",
-    "@cedarjs/structure": "5.0.0-canary.2480",
-    "@cedarjs/telemetry": "5.0.0-canary.2480",
-    "@cedarjs/utils": "5.0.0-canary.2480",
-    "@cedarjs/vite": "5.0.0-canary.2480",
-    "@cedarjs/web-server": "5.0.0-canary.2480",
+    "@cedarjs/api-server": "5.0.0-canary.2481",
+    "@cedarjs/cli-helpers": "5.0.0-canary.2481",
+    "@cedarjs/fastify-web": "5.0.0-canary.2481",
+    "@cedarjs/internal": "5.0.0-canary.2481",
+    "@cedarjs/prerender": "5.0.0-canary.2481",
+    "@cedarjs/project-config": "5.0.0-canary.2481",
+    "@cedarjs/structure": "5.0.0-canary.2481",
+    "@cedarjs/telemetry": "5.0.0-canary.2481",
+    "@cedarjs/utils": "5.0.0-canary.2481",
+    "@cedarjs/vite": "5.0.0-canary.2481",
+    "@cedarjs/web-server": "5.0.0-canary.2481",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "1.30.1",