@cedarjs/cli 5.0.0-canary.2564 → 5.0.0-canary.2566

package/dist/commands/dev/devHandler.js

@@ -20,6 +20,7 @@ const handler = async ({
   forward = "",
   generate = true,
   apiDebugPort,
+  debugBrk,
   ud = false
 }) => {
   recordTelemetryAttributes({
@@ -177,6 +178,7 @@ const handler = async ({
       `  --port ${webAvailablePort}`,
       `  --apiPort ${apiAvailablePort}`,
       getApiDebugFlag(apiDebugPort, apiAvailablePort),
+      debugBrk ? "--debug-brk" : "",
       forward
     ].join(" ").replace(/\s+/g, " ").trim();
   };

package/dist/commands/dev.js

@@ -24,6 +24,9 @@ const builder = (yargs) => {
   }).option("apiDebugPort", {
     type: "number",
     description: "Port on which to expose API server debugger. If you supply the flag with no value it defaults to 1 prepended to the api port (e.g. api port 8913 -> debug port 18913)."
+  }).option("debugBrk", {
+    type: "boolean",
+    description: "Wait for a debugger to connect before starting the API dev server, similar to Node.js --inspect-brk. Only works in --ud mode."
   }).option("ud", {
     type: "boolean",
     default: false,

package/dist/commands/generate/dbAuth/dbAuthHandler.js

@@ -69,7 +69,6 @@ function getPostInstallWebauthnMessage(isDbAuthSetup2) {
   ].filter(Boolean).join("\n");
 }
 const files = async ({
-  _tests,
   typescript,
   skipForgot,
   skipLogin,
@@ -79,7 +78,7 @@ const files = async ({
   usernameLabel,
   passwordLabel
 }) => {
-  const files2 = [];
+  const filesList = [];
   usernameLabel = usernameLabel || "username";
   passwordLabel = passwordLabel || "password";
   const templateVars = {
@@ -91,7 +90,7 @@ const files = async ({
     passwordTitleCase: titleCase(passwordLabel)
   };
   if (!skipForgot) {
-    files2.push(
+    filesList.push(
       await templateForComponentFile({
         name: "ForgotPassword",
         suffix: "Page",
@@ -104,7 +103,7 @@ const files = async ({
     );
   }
   if (!skipLogin) {
-    files2.push(
+    filesList.push(
       await templateForComponentFile({
         name: "Login",
         suffix: "Page",
@@ -117,7 +116,7 @@ const files = async ({
     );
   }
   if (!skipReset) {
-    files2.push(
+    filesList.push(
       await templateForComponentFile({
         name: "ResetPassword",
         suffix: "Page",
@@ -130,7 +129,7 @@ const files = async ({
     );
   }
   if (!skipSignup) {
-    files2.push(
+    filesList.push(
       await templateForComponentFile({
         name: "Signup",
         suffix: "Page",
@@ -142,7 +141,7 @@ const files = async ({
       })
     );
   }
-  if (files2.length === 0) {
+  if (filesList.length === 0) {
     console.info(c.error("\nNo files to generate.\n"));
     process.exit(0);
   }
@@ -155,25 +154,27 @@ const files = async ({
       ),
       { name: "scaffold" }
     );
-    files2.push([scaffoldOutputPath, scaffoldTemplate]);
+    filesList.push([scaffoldOutputPath, scaffoldTemplate]);
   }
-  return files2.reduce(async (accP, [outputPath, content]) => {
-    const acc = await accP;
-    let template = content;
-    if (outputPath.match(/\.[jt]sx?/) && !typescript) {
-      template = await transformTSToJS(outputPath, content);
-    }
-    return {
-      [outputPath]: template,
-      ...acc
-    };
-  }, Promise.resolve({}));
+  return filesList.reduce(
+    async (accP, [outputPath, content]) => {
+      const acc = await accP;
+      let template = content;
+      if (outputPath.match(/\.[jt]sx?/) && !typescript) {
+        template = await transformTSToJS(outputPath, content);
+      }
+      return {
+        [outputPath]: template,
+        ...acc
+      };
+    },
+    Promise.resolve({})
+  );
 };
 const tasks = ({
   enquirer,
   listr2,
   force,
-  tests,
   typescript,
   skipForgot,
   skipLogin,
@@ -284,7 +285,6 @@ const tasks = ({
         title: "Creating pages...",
         task: async () => {
           const filesObj = await files({
-            tests,
             typescript,
             skipForgot,
             skipLogin,
@@ -322,7 +322,7 @@ const tasks = ({
       }
     ],
     {
-      silentRendererCondition: () => listr2?.silentRendererCondition,
+      silentRendererCondition: () => listr2?.silentRendererCondition ?? false,
       rendererOptions: { collapseSubtasks: false },
       ctx: { enquirer },
       exitOnError: true
@@ -336,7 +336,7 @@ const handler = async (yargs) => {
     skipLogin: yargs.skipLogin,
     skipReset: yargs.skipReset,
     skipSignup: yargs.skipSignup,
-    webauthn: yargs.webauthn,
+    webauthn: yargs.webauthn ?? void 0,
     force: yargs.force,
     rollback: yargs.rollback
   });
@@ -348,10 +348,11 @@ const handler = async (yargs) => {
     await t.run();
     console.log("");
     console.log(
-      yargs.webauthn || t.ctx.webauthn ? getPostInstallWebauthnMessage(isDbAuthSetup()) : getPostInstallMessage(isDbAuthSetup())
+      yargs.webauthn || t.ctx?.webauthn ? getPostInstallWebauthnMessage(isDbAuthSetup()) : getPostInstallMessage(isDbAuthSetup())
     );
   } catch (e) {
-    console.log(c.error(e.message));
+    const msg = e instanceof Error ? e.message : String(e);
+    console.log(c.error(msg));
   }
 };
 function isDbAuthSetup() {
@@ -365,7 +366,7 @@ function isDbAuthSetup() {
       "auth." + webAuthExtension
     );
     return /^import (.*) from ['"]@cedarjs\/auth-dbauth-web['"]/m.test(
-      fs.readFileSync(webAuthPath)
+      fs.readFileSync(webAuthPath, "utf-8")
     );
   }
   return false;

package/dist/commands/generate/package/packageHandler.js

@@ -63,7 +63,7 @@ async function updateTsconfig(task) {
         "Failed to parse tsconfig: " + JSON.stringify(error, null, 2)
       );
     }
-    if (!tsconfig?.compilerOptions || typeof tsconfig.compilerOptions.module === "undefined") {
+    if (tsconfig.compilerOptions?.module === void 0) {
       continue;
     }
     const currentModule = typeof tsconfig.compilerOptions.module === "string" ? tsconfig.compilerOptions.module.toLowerCase() : String(tsconfig.compilerOptions.module).toLowerCase();
@@ -129,10 +129,8 @@ async function addDependencyToPackageJson(task, packageJsonPath, packageName) {
   const packageJson = JSON.parse(
     await fs.promises.readFile(packageJsonPath, "utf8")
   );
-  if (!packageJson.dependencies) {
-    packageJson.dependencies = {};
-  }
-  if (packageJson.dependencies[packageName]) {
+  packageJson.dependencies ??= {};
+  if (packageJson?.dependencies[packageName]) {
     task.skip("Dependency already exists");
     return;
   }
@@ -203,7 +201,7 @@ function updateWorkspaceTsconfigReferences(task, folderName, targetWorkspaces) {
             readFile: (p) => {
               try {
                 return fs.readFileSync(p, "utf8");
-              } catch (e) {
+              } catch {
                 return ts.sys.readFile(p);
               }
             },
@@ -216,21 +214,21 @@ function updateWorkspaceTsconfigReferences(task, folderName, targetWorkspaces) {
           },
           path.dirname(ws.tsconfigPath)
         );
-        if (configParseResult.errors && configParseResult.errors.length) {
+        if (configParseResult.errors?.length) {
           console.error("Parse errors:", configParseResult.errors);
         }
         if (!Array.isArray(tsconfig.references)) {
           tsconfig.references = [];
         }
-        const packageDir2 = ws.packageDir || path.join(getPaths().base, "packages", folderName);
-        const referencePath = path.relative(path.dirname(ws.tsconfigPath), packageDir2).split(path.sep).join("/");
+        const wsPackageDir = ws.packageDir || path.join(getPaths().base, "packages", folderName);
+        const referencePath = path.relative(path.dirname(ws.tsconfigPath), wsPackageDir).split(path.sep).join("/");
         const references = tsconfig.references;
-        if (references.some((ref) => ref && ref.path === referencePath)) {
+        if (references.some((ref) => ref?.path === referencePath)) {
           subtask.skip("tsconfig already up to date");
           return;
         }
         const newReferences = references.concat([{ path: referencePath }]);
-        let text = await fs.promises.readFile(ws.tsconfigPath, "utf8");
+        const text = await fs.promises.readFile(ws.tsconfigPath, "utf8");
         const edits = modify(text, ["references"], newReferences, {
           formattingOptions: { insertSpaces: true, tabSize: 2 }
         });
@@ -250,11 +248,15 @@ async function installAndBuild(folderName) {
   await installPackages({ stdio: "inherit", cwd: getPaths().base });
   await runScript("build", [], { stdio: "inherit", cwd: packagePath });
 }
-const handler = async ({ name, force, ...rest }) => {
+const handler = async ({
+  name,
+  force,
+  ...rest
+}) => {
   recordTelemetryAttributes({
     command: "generate package",
     force,
-    rollback: rest.rollback
+    rollback: typeof rest.rollback === "boolean" ? rest.rollback : void 0
   });
   if (name.replaceAll("/", "").length < name.length - 1) {
     throw new Error(
@@ -275,7 +277,6 @@ const handler = async ({ name, force, ...rest }) => {
   }
   let packageFiles = {};
   const tasks = new Listr(
-    /** @type {import('listr2').ListrTask<ListrContext>[]} */
     [
       {
         title: "Parsing package name...",
@@ -307,7 +308,7 @@ const handler = async ({ name, force, ...rest }) => {
               return;
             }
           } catch (e) {
-            throw new Error(e.message);
+            throw new Error(e instanceof Error ? e.message : String(e));
           }
           const prompt = task.prompt(ListrEnquirerPromptAdapter);
           const response = await prompt.run({
@@ -423,9 +424,11 @@ const handler = async ({ name, force, ...rest }) => {
     }
     await tasks.run();
   } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
+    const msg = 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, msg);
+    console.error(c.error(msg));
+    process.exit(exitCode);
   }
 };
 export {

package/dist/commands/setup/auth/auth.js

@@ -198,7 +198,7 @@ async function getAuthSetupHandler(module) {
     } else {
       customRequire = require;
     }
-  } catch (error) {
+  } catch {
     customRequire = require;
   }
   const packageJsonPath = customRequire.resolve("@cedarjs/cli/package.json");
@@ -216,9 +216,14 @@ async function getAuthSetupHandler(module) {
       if (packument.error) {
         throw new Error(packument.error);
       }
-    } catch (error) {
+    } catch (e) {
       throw new Error(
-        `Couldn't fetch packument for ${module}: ${error.message}`
+        `Couldn't fetch packument for ${module}: ${e instanceof Error ? e.message : String(e)}`
+      );
+    }
+    if (!packument.versions || typeof packument.versions !== "object" || Array.isArray(packument.versions)) {
+      throw new Error(
+        `Couldn't fetch packument for ${module}: invalid versions field`
       );
     }
     const versionIsPublished = Object.keys(packument.versions).includes(version);
@@ -255,7 +260,7 @@ function isInstalled(module) {
     return possiblePaths.some((modulePath) => {
       return fs.existsSync(path.join(modulePath, "package.json"));
     });
-  } catch (error) {
+  } catch {
     return false;
   }
 }

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

@@ -41,9 +41,10 @@ const preRequisiteCheckTask = (preRequisites) => {
           task: async () => {
             try {
               await execa(...preReq.command);
-            } catch (error) {
-              error.message = error.message + "\n" + preReq.errorMessage;
-              throw error;
+            } catch (e) {
+              const baseMsg = e instanceof Error ? e.message : String(e);
+              const err = new Error(baseMsg + "\n" + preReq.errorMessage);
+              throw err;
             }
           }
         };
@@ -59,7 +60,7 @@ const addFilesTask = ({
   return {
     title: `${title}...`,
     task: () => {
-      let fileNameToContentMap = {};
+      const fileNameToContentMap = {};
       files.forEach((fileData) => {
         fileNameToContentMap[fileData.path] = fileData.content;
       });
@@ -105,7 +106,7 @@ function resolveConfigObject(arg) {
     }
     if (t.isBlockStatement(arg.body)) {
       const returnStmt = arg.body.body.find((s) => t.isReturnStatement(s));
-      if (returnStmt && t.isObjectExpression(returnStmt.argument)) {
+      if (t.isObjectExpression(returnStmt?.argument)) {
         return returnStmt.argument;
       }
     }
@@ -113,8 +114,8 @@ function resolveConfigObject(arg) {
   }
   if (t.isFunctionExpression(arg)) {
     if (t.isBlockStatement(arg.body)) {
-      const returnStmt = arg.body.body.find((s) => t.isReturnStatement(s));
-      if (returnStmt && t.isObjectExpression(returnStmt.argument)) {
+      const returnStmt = arg.body.body.find(t.isReturnStatement);
+      if (t.isObjectExpression(returnStmt?.argument)) {
         return returnStmt.argument;
       }
     }
@@ -122,7 +123,10 @@ function resolveConfigObject(arg) {
   }
   return null;
 }
-function insertPluginsBeforeCedar({ content, pluginCodes }) {
+function insertPluginsBeforeCedar({
+  content,
+  pluginCodes
+}) {
   const ast = recast.parse(content, {
     parser: {
       parse(source) {
@@ -133,54 +137,63 @@ function insertPluginsBeforeCedar({ content, pluginCodes }) {
       }
     }
   });
-  const defaultExport = ast.program.body.find(
-    (node) => t.isExportDefaultDeclaration(node) && t.isCallExpression(node.declaration) && t.isIdentifier(node.declaration.callee) && node.declaration.callee.name === "defineConfig"
-  );
+  const defaultExport = ast.program.body.find(t.isExportDefaultDeclaration);
   if (!defaultExport) {
     return null;
   }
-  const configArg = resolveConfigObject(defaultExport.declaration.arguments[0]);
+  const declaration = defaultExport.declaration;
+  const configArg = resolveConfigObject(declaration.arguments[0]);
   if (!configArg) {
     return null;
   }
-  const pluginsProp = configArg.properties.find(
-    (prop) => t.isObjectProperty(prop) && t.isIdentifier(prop.key) && prop.key.name === "plugins" && t.isArrayExpression(prop.value)
-  );
-  if (!pluginsProp) {
+  const pluginsProp = configArg.properties.find(t.isObjectProperty);
+  if (!t.isArrayExpression(pluginsProp?.value)) {
     return null;
   }
-  const elements = pluginsProp.value.elements;
+  const arrayExpr = pluginsProp.value;
+  const elements = arrayExpr.elements;
   const cedarIndex = elements.findIndex(
     (el) => t.isCallExpression(el) && t.isIdentifier(el.callee) && el.callee.name === "cedar"
   );
   if (cedarIndex === -1) {
     return null;
   }
-  const cedarNode = elements[cedarIndex];
-  const arrayNode = pluginsProp.value;
-  const isInline = cedarNode.loc.start.line === arrayNode.loc.start.line;
+  const cedarElement = elements[cedarIndex];
+  if (!cedarElement || !t.isCallExpression(cedarElement)) {
+    return null;
+  }
+  const cedarNode = cedarElement;
+  if (!cedarNode.loc || !arrayExpr.loc || !pluginsProp.loc) {
+    return null;
+  }
+  const isInline = cedarNode.loc.start.line === arrayExpr.loc.start.line;
   if (isInline) {
     const startPos = posToIndex(
       content,
-      arrayNode.loc.start.line,
-      arrayNode.loc.start.column
+      arrayExpr.loc.start.line,
+      arrayExpr.loc.start.column
     );
     const endPos = posToIndex(
       content,
-      arrayNode.loc.end.line,
-      arrayNode.loc.end.column
+      arrayExpr.loc.end.line,
+      arrayExpr.loc.end.column
     );
     const precedingText = content.slice(0, startPos);
     const followingText = content.slice(endPos);
-    const existingCodes = elements.map(
-      (el) => content.slice(
-        posToIndex(content, el.loc.start.line, el.loc.start.column),
-        posToIndex(content, el.loc.end.line, el.loc.end.column)
-      )
-    );
+    const existingCodes = elements.flatMap((el) => {
+      if (!el?.loc) {
+        return [];
+      }
+      return [
+        content.slice(
+          posToIndex(content, el.loc.start.line, el.loc.start.column),
+          posToIndex(content, el.loc.end.line, el.loc.end.column)
+        )
+      ];
+    });
     const lines2 = content.split("\n");
     const pluginsLine = pluginsProp.loc.start.line;
-    const pluginsIndent = lines2[pluginsLine - 1].match(/^\s*/)[0];
+    const pluginsIndent = (lines2[pluginsLine - 1].match(/^\s*/) ?? [""])[0];
     const elemIndent = pluginsIndent + "  ";
     const allCodes = [...existingCodes];
     allCodes.splice(cedarIndex, 0, ...pluginCodes);
@@ -194,7 +207,7 @@ function insertPluginsBeforeCedar({ content, pluginCodes }) {
   const cedarLine = cedarNode.loc.start.line;
   const insertPos = posToIndex(content, cedarLine, 0);
   const lines = content.split("\n");
-  const indent = lines[cedarLine - 1].match(/^\s*/)[0];
+  const indent = (lines[cedarLine - 1].match(/^\s*/) ?? [""])[0];
   const insertion = pluginCodes.map((code) => `${indent}${code},
 `).join("");
   return content.slice(0, insertPos) + insertion + content.slice(insertPos);
@@ -206,6 +219,7 @@ const addToGitIgnoreTask = ({ paths }) => {
       if (!fs.existsSync(path.resolve(getPaths().base, ".gitignore"))) {
         return "No gitignore present, skipping.";
       }
+      return void 0;
     },
     task: async (_ctx, task) => {
       const gitIgnore = path.resolve(getPaths().base, ".gitignore");
@@ -224,6 +238,7 @@ const addToDotEnvTask = ({ lines }) => {
       if (!fs.existsSync(path.resolve(getPaths().base, ".env"))) {
         return "No .env present, skipping.";
       }
+      return void 0;
     },
     task: async (_ctx, task) => {
       const env = path.resolve(getPaths().base, ".env");

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

@@ -38,9 +38,11 @@ async function handler({ force }) {
     );
     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);
   }
 }
 async function getAddCoherenceFilesTask(force) {
@@ -50,11 +52,11 @@ async function getAddCoherenceFilesTask(force) {
       content: coherenceFiles.healthCheck
     }
   ];
-  const coherenceConfigFile = {
-    path: path.join(cedarPaths.base, "coherence.yml")
-  };
-  coherenceConfigFile.content = await getCoherenceConfigFileContent();
-  files.push(coherenceConfigFile);
+  const coherenceConfigContent = await getCoherenceConfigFileContent();
+  files.push({
+    path: path.join(cedarPaths.base, "coherence.yml"),
+    content: coherenceConfigContent
+  });
   return addFilesTask({
     title: `Adding coherence.yml and health.${EXTENSION}`,
     files,
@@ -135,13 +137,13 @@ function updateConfigTomlTask() {
       }
       configContent = configContent.replaceAll(
         HOST_REGEXP,
-        (match, spaceBeforeAssign, spaceAfterAssign) => ["host", spaceBeforeAssign, "=", spaceAfterAssign, '"0.0.0.0"'].join(
+        (_match, spaceBeforeAssign, spaceAfterAssign) => ["host", spaceBeforeAssign, "=", spaceAfterAssign, '"0.0.0.0"'].join(
           ""
         )
       );
       configContent = configContent.replace(
         API_URL_REGEXP,
-        (match, spaceBeforeAssign, spaceAfterAssign) => ["apiUrl", spaceBeforeAssign, "=", spaceAfterAssign, '"/api"'].join(
+        (_match, spaceBeforeAssign, spaceAfterAssign) => ["apiUrl", spaceBeforeAssign, "=", spaceAfterAssign, '"/api"'].join(
           ""
         )
       );

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

@@ -48,18 +48,20 @@ const getFlightcontrolJson = async (database) => {
           {
             ...flightcontrolConfig.environments[0],
             services: [
-              ...flightcontrolConfig.environments[0].services.map((service) => {
-                if (service.id === "cedar-api") {
-                  return {
-                    ...service,
-                    envVariables: {
-                      ...service.envVariables,
-                      ...databaseEnvVariables
-                    }
-                  };
+              ...flightcontrolConfig.environments[0].services.map(
+                (service) => {
+                  if (service.id === "cedar-api") {
+                    return {
+                      ...service,
+                      envVariables: {
+                        ...service.envVariables,
+                        ...databaseEnvVariables
+                      }
+                    };
+                  }
+                  return service;
                 }
-                return service;
-              }),
+              ),
               dbService
             ]
           }
@@ -79,7 +81,7 @@ const getFlightcontrolJson = async (database) => {
 const updateGraphQLFunction = () => {
   return {
     title: "Adding CORS config to createGraphQLHandler...",
-    task: (_ctx) => {
+    task: () => {
       const graphqlTsPath = path.join(
         getPaths().base,
         "api/src/functions/graphql.ts"
@@ -127,7 +129,7 @@ const updateGraphQLFunction = () => {
 const updateDbAuth = () => {
   return {
     title: "Updating dbAuth cookie config (if used)...",
-    task: (_ctx) => {
+    task: () => {
       const authTsPath = path.join(getPaths().base, "api/src/functions/auth.ts");
       const authJsPath = path.join(getPaths().base, "api/src/functions/auth.js");
       let authFnPath;
@@ -176,7 +178,7 @@ const updateDbAuth = () => {
 const updateApp = () => {
   return {
     title: "Updating App.jsx fetch config...",
-    task: (_ctx) => {
+    task: () => {
       const appTsPath = path.join(getPaths().base, "web/src/App.tsx");
       const appJsPath = path.join(getPaths().base, "web/src/App.jsx");
       let appPath;
@@ -234,8 +236,9 @@ const addToDotEnvDefaultTask = () => {
         CEDAR_API_URL=${getUserApiUrl()}
         `;
       }
+      return void 0;
     },
-    task: async (_ctx) => {
+    task: async () => {
       const env = path.resolve(getPaths().base, ".env.defaults");
       const apiUrl = getUserApiUrl();
       const line = `
@@ -252,7 +255,10 @@ const notes = [
   "Check out the deployment docs at https://app.flightcontrol.dev/docs for detailed instructions\n",
   "NOTE: If you are using yarn v1, remove the installCommand's from flightcontrol.json"
 ];
-const handler = async ({ force, database }) => {
+const handler = async ({
+  force,
+  database
+}) => {
   recordTelemetryAttributes({
     command: "setup deploy flightcontrol",
     force,
@@ -264,7 +270,7 @@ const handler = async ({ force, database }) => {
         title: "Adding flightcontrol.json",
         task: async () => {
           const fileData = await getFlightcontrolJson(database);
-          let files = {};
+          const files = {};
           files[fileData.path] = JSON.stringify(fileData.content, null, 2);
           return writeFilesTask(files, { overwriteExisting: force });
         }
@@ -281,9 +287,11 @@ const handler = async ({ force, database }) => {
   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/docker/dockerHandler.js

@@ -53,7 +53,7 @@ async function handler({ force }) {
       ...pm === "yarn" ? [
         {
           title: "Adding the official yarn workspace-tools plugin...",
-          task: async (_ctx, task) => {
+          task: async (_, task) => {
             const { stdout } = await execa(
               "yarn",
               ["plugin", "runtime", "--json"],
@@ -61,7 +61,7 @@ async function handler({ force }) {
                 cwd: getPaths().base
               }
             );
-            const hasWorkspaceToolsPlugin = stdout.trim().split("\n").map(JSON.parse).some(
+            const hasWorkspaceToolsPlugin = stdout.trim().split("\n").map((line) => JSON.parse(line)).some(
               ({ name }) => name === "@yarnpkg/plugin-workspace-tools"
             );
             if (hasWorkspaceToolsPlugin) {
@@ -80,7 +80,7 @@ async function handler({ force }) {
         title: "Adding @cedarjs/api-server and @cedarjs/web-server...",
         task: async (_ctx, task) => {
           const apiServerPackageName = "@cedarjs/api-server";
-          const { dependencies: apiDependencies } = JSON.parse(
+          const { dependencies: apiDependencies = {} } = JSON.parse(
             fs.readFileSync(
               path.join(getPaths().api.base, "package.json"),
               "utf-8"
@@ -88,7 +88,7 @@ async function handler({ force }) {
           );
           const hasApiServerPackage = Object.keys(apiDependencies).includes(apiServerPackageName);
           const webServerPackageName = "@cedarjs/web-server";
-          const { dependencies: webDependencies } = JSON.parse(
+          const { dependencies: webDependencies = {} } = JSON.parse(
             fs.readFileSync(
               path.join(getPaths().web.base, "package.json"),
               "utf-8"
@@ -264,9 +264,11 @@ async function handler({ force }) {
       ].join("\n")
     );
   } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
+    const msg = 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, msg);
+    console.error(c.error(msg));
+    process.exit(exitCode);
   }
 }
 async function getVersionOfRedwoodPackageToInstall(module) {
@@ -274,9 +276,21 @@ async function getVersionOfRedwoodPackageToInstall(module) {
   const packageJsonPath = createdRequire.resolve("@cedarjs/cli/package.json", {
     paths: [getPaths().base]
   });
-  let { version } = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
+  let { version = "" } = JSON.parse(
+    fs.readFileSync(packageJsonPath, "utf8")
+  );
   const packumentP = await fetch(`https://registry.npmjs.org/${module}`);
   const packument = await packumentP.json();
+  if (packument.error) {
+    throw new Error(
+      `Couldn't fetch packument for ${module}: ${packument.error}`
+    );
+  }
+  if (!packument.versions || typeof packument.versions !== "object" || Array.isArray(packument.versions)) {
+    throw new Error(
+      `Couldn't fetch packument for ${module}: invalid versions field`
+    );
+  }
   if (version.includes("+")) {
     version = version.split("+")[0];
   }

package/dist/commands/setup/package/packageHandler.js

@@ -3,7 +3,11 @@ import semver from "semver";
 import { getCompatibilityData } from "@cedarjs/cli-helpers";
 import { dlx } from "@cedarjs/cli-helpers/packageManager/exec";
 import { getPaths } from "@cedarjs/project-config";
-async function handler({ npmPackage, force, _: _args }) {
+async function handler({
+  npmPackage,
+  force,
+  _: _args
+}) {
   const isScoped = npmPackage.startsWith("@");
   const packageName = (isScoped ? "@" : "") + npmPackage.split("@")[isScoped ? 1 : 0];
   const packageVersion = npmPackage.split("@")[isScoped ? 2 : 1] ?? "latest";
@@ -24,9 +28,9 @@ async function handler({ npmPackage, force, _: _args }) {
   let compatibilityData;
   try {
     compatibilityData = await getCompatibilityData(packageName, packageVersion);
-  } catch (error) {
+  } catch (e) {
     console.log("The following error occurred while checking compatibility:");
-    const errorMessage = error.message ?? error;
+    const errorMessage = e instanceof Error ? e.message : String(e);
     console.log(errorMessage);
     if (errorMessage.includes("does not have a tag") || errorMessage.includes("does not have a version")) {
       process.exit(1);
@@ -110,8 +114,8 @@ async function runPackage(packageName, version, options = []) {
       stdio: "inherit",
       cwd: getPaths().base
     });
-  } catch (error) {
-    process.exitCode = error.exitCode ?? 1;
+  } catch (e) {
+    process.exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
   }
 }
 async function promptWithChoices(message, choices) {
@@ -122,9 +126,9 @@ async function promptWithChoices(message, choices) {
       choices
     });
     return await prompt.run();
-  } catch (error) {
-    if (error) {
-      throw error;
+  } catch (e) {
+    if (e) {
+      throw e;
     }
   }
   return null;

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

@@ -74,7 +74,10 @@ async function recommendExtensionsToInstall() {
     });
   }
 }
-const handler = async ({ force, install }) => {
+const handler = async ({
+  force,
+  install
+}) => {
   recordTelemetryAttributes({
     command: "setup ui tailwindcss",
     force,
@@ -238,7 +241,7 @@ const handler = async ({ force, install }) => {
             rwPaths.base,
             ".vscode/extensions.json"
           );
-          let originalExtensionsJson = { recommendations: [] };
+          let originalExtensionsJson = {};
           if (fs.existsSync(VS_CODE_EXTENSIONS_PATH)) {
             const originalExtensionsFile = fs.readFileSync(
               VS_CODE_EXTENSIONS_PATH,
@@ -249,7 +252,7 @@ const handler = async ({ force, install }) => {
           const newExtensionsJson = {
             ...originalExtensionsJson,
             recommendations: [
-              ...originalExtensionsJson.recommendations,
+              ...originalExtensionsJson.recommendations ?? [],
               ...recommendedVSCodeExtensions
             ]
           };
@@ -284,7 +287,10 @@ const handler = async ({ force, install }) => {
             const originalSettingsJson = JSON.parse(
               originalSettingsFile || "{}"
             );
-            const originalTwClassAttributesJson = originalSettingsJson["tailwindCSS.classAttributes"] || [];
+            const existingAttributes = originalSettingsJson["tailwindCSS.classAttributes"];
+            const originalTwClassAttributesJson = Array.isArray(
+              existingAttributes
+            ) ? existingAttributes : [];
             const mergedClassAttributes = Array.from(
               /* @__PURE__ */ new Set([...classAttributes, ...originalTwClassAttributesJson])
             );
@@ -346,7 +352,7 @@ const handler = async ({ force, install }) => {
             const pluginsMatch = newPrettierConfig.match(
               /plugins: \[[\sa-z\(\)'\-,]*]/
             );
-            const matched = pluginsMatch && pluginsMatch[0];
+            const matched = pluginsMatch != null ? pluginsMatch[0] : void 0;
             if (matched && (matched.includes("'prettier-plugin-tailwindcss'") || matched.includes('"prettier-plugin-tailwindcss"'))) {
               task.skip(
                 "tailwindcss-plugin-prettier already required in plugins"
@@ -374,9 +380,11 @@ const handler = async ({ force, install }) => {
     await tasks.run();
     await recommendExtensionsToInstall();
   } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
+    const msg = 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, msg);
+    console.error(c.error(msg));
+    process.exit(exitCode);
   }
 };
 export {

package/package.json

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