@cedarjs/cli 4.2.0 → 4.2.1-next.258

package/dist/commands/setup/graphql/features/trustedDocuments/trustedDocumentsHandler.js

@@ -1,9 +1,9 @@
 import fs from "node:fs";
 import path from "node:path";
-import execa from "execa";
 import { Listr } from "listr2";
 import { format } from "prettier";
 import { getPrettierOptions, setTomlSetting } from "@cedarjs/cli-helpers";
+import { runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
 import { getConfig, getPaths, resolveFile } from "@cedarjs/project-config";
 import { runTransform } from "../../../../../lib/runTransform.js";
 async function handler({ force }) {
@@ -28,7 +28,7 @@ async function handler({ force }) {
       {
         title: "Generating Trusted Documents store ...",
         task: () => {
-          execa.commandSync("yarn cedar generate types", { stdio: "ignore" });
+          runBinSync("cedar", ["generate", "types"], { stdio: "ignore" });
         }
       },
       {

package/dist/commands/setup/i18n/i18nHandler.js

@@ -1,22 +1,22 @@
 import fs from "node:fs";
 import path from "path";
-import execa from "execa";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
 import { colors as c } from "@cedarjs/cli-helpers";
+import { addWorkspacePackages } from "@cedarjs/cli-helpers/packageManager/packages";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import extendStorybookConfiguration from "../../../lib/configureStorybook.js";
 import { fileIncludes } from "../../../lib/extendFile.js";
 import { getPaths, writeFile } from "../../../lib/index.js";
 const APP_JS_PATH = getPaths().web.app;
 const i18nImportExist = (appJS) => {
-  let content = appJS.toString();
+  const content = appJS.toString();
   const hasBaseImport = () => /import '.\/i18n'/.test(content);
   return hasBaseImport();
 };
 const addI18nImport = (appJS) => {
-  var content = appJS.toString().split("\n").reverse();
-  const index = content.findIndex((value) => /import/.test(value));
+  const content = appJS.toString().split("\n").reverse();
+  const index = content.findIndex((value) => value.includes("import"));
   content.splice(index, 0, "import './i18n'");
   return content.reverse().join(`
 `);
@@ -39,14 +39,15 @@ const handler = async ({ force }) => {
               {
                 title: "Install i18next, react-i18next and i18next-browser-languagedetector",
                 task: async () => {
-                  await execa("yarn", [
-                    "workspace",
+                  await addWorkspacePackages(
                     "web",
-                    "add",
-                    "i18next",
-                    "react-i18next",
-                    "i18next-browser-languagedetector"
-                  ]);
+                    [
+                      "i18next",
+                      "react-i18next",
+                      "i18next-browser-languagedetector"
+                    ],
+                    { cwd: rwPaths.base }
+                  );
                 }
               }
             ],
@@ -123,7 +124,7 @@ const handler = async ({ force }) => {
       {
         title: "Adding import to App.{jsx,tsx}...",
         task: (_ctx, task) => {
-          let appJS = fs.readFileSync(APP_JS_PATH);
+          const appJS = fs.readFileSync(APP_JS_PATH);
           if (i18nImportExist(appJS)) {
             task.skip("Import already exists in App.js");
           } else {
@@ -160,9 +161,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

@@ -4,6 +4,7 @@ import prismaInternals from "@prisma/internals";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
 import { addApiPackages, colors as c } from "@cedarjs/cli-helpers";
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { getSchemaPath, getPrismaSchemas } from "@cedarjs/project-config";
 import { getPaths, transformTSToJS, writeFile } from "../../../lib/index.js";
 import { isTypeScriptProject } from "../../../lib/project.js";
@@ -53,6 +54,7 @@ const tasks = async ({ force }) => {
           if (modelExists) {
             return "BackgroundJob model exists, skipping";
           }
+          return false;
         }
       },
       {
@@ -97,10 +99,13 @@ const tasks = async ({ force }) => {
           ${c.success("\nBackground jobs configured!\n")}
 
           ${!modelExists ? "Migrate your database to finish setting up jobs:\n" : ""}
-          ${!modelExists ? c.highlight("\n\xA0\xA0yarn cedar prisma migrate dev\n") : ""}
+          ${!modelExists ? c.highlight(`
+\xA0\xA0${formatCedarCommand(["prisma", "migrate", "dev"])}
+`) : ""}
 
-          Generate jobs with: ${c.highlight("yarn cedar g job <name>")}
-          Execute jobs with:  ${c.highlight("yarn cedar jobs work\n")}
+          Generate jobs with: ${c.highlight(formatCedarCommand(["g", "job", "<name>"]))}
+          Execute jobs with:  ${c.highlight(`${formatCedarCommand(["jobs", "work"])}
+`)}
 
           Check out the docs for more info:
           ${terminalLink("", "https://cedarjs.com/docs/background-jobs")}
@@ -109,7 +114,7 @@ const tasks = async ({ force }) => {
         }
       }
     ],
-    { rendererOptions: { collapseSubtasks: false }, errorOnExist: true }
+    { rendererOptions: { collapseSubtasks: false }, exitOnError: true }
   );
 };
 const handler = async ({ force }) => {
@@ -117,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/mailer/mailerHandler.js

@@ -1,18 +1,18 @@
 import fs from "node:fs";
 import path from "node:path";
-import { pathToFileURL } from "node:url";
 import { Listr } from "listr2";
 import { addApiPackages, colors as c } from "@cedarjs/cli-helpers";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths, transformTSToJS, writeFile } from "../../../lib/index.js";
 import { isTypeScriptProject } from "../../../lib/project.js";
-const handler = async ({ force, skipExamples }) => {
+const handler = async ({
+  force,
+  skipExamples
+}) => {
   const projectIsTypescript = isTypeScriptProject();
   const pkgJsonPath = path.join(getPaths().base, "package.json");
-  const { default: pkgJson } = await import(pathToFileURL(pkgJsonPath), {
-    with: { type: "json" }
-  });
-  const cedarVersion = pkgJson.devDependencies["@cedarjs/core"] ?? "latest";
+  const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf-8"));
+  const cedarVersion = pkgJson.devDependencies?.["@cedarjs/core"] ?? "latest";
   const extension = projectIsTypescript ? "ts" : "js";
   const tasks = new Listr(
     [
@@ -99,9 +99,11 @@ const handler = async ({ force, skipExamples }) => {
   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/package/packageHandler.js

@@ -1,9 +1,13 @@
 import enq from "enquirer";
-import execa from "execa";
 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);
@@ -106,12 +110,12 @@ async function runPackage(packageName, version, options = []) {
   const versionString = version === void 0 ? "" : `@${version}`;
   console.log(`Running ${packageName}${versionString}...`);
   try {
-    await execa("yarn", ["dlx", `${packageName}${versionString}`, ...options], {
+    await dlx(`${packageName}${versionString}`, 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/realtime/realtimeHandler.js

@@ -1,9 +1,9 @@
 import fs from "node:fs";
 import path from "path";
-import execa from "execa";
 import { Listr } from "listr2";
 import prompts from "prompts";
 import { addApiPackages, colors as c } from "@cedarjs/cli-helpers";
+import { runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
 import { generate as generateTypes } from "@cedarjs/internal/dist/generate/generate";
 import { projectIsEsm } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
@@ -30,13 +30,13 @@ async function handleExamplesPreference(includeExamples) {
     });
     incl = response.includeExamples;
   }
-  return incl;
+  return incl ?? false;
 }
 async function handler(args) {
-  const redwoodPaths = getPaths();
+  const cedarPaths = getPaths();
   const ts = isTypeScriptProject();
   const realtimeLibFilePath = path.join(
-    redwoodPaths.api.lib,
+    cedarPaths.api.lib,
     `realtime.${isTypeScriptProject() ? "ts" : "js"}`
   );
   const force = args.force || false;
@@ -94,7 +94,7 @@ async function handler(args) {
             );
           }
           const exampleFile = path.join(
-            redwoodPaths.api.subscriptions,
+            cedarPaths.api.subscriptions,
             "countdown",
             `countdown.${isTypeScriptProject() ? "ts" : "js"}`
           );
@@ -124,7 +124,7 @@ async function handler(args) {
             "utf-8"
           );
           const sdlFile = path.join(
-            redwoodPaths.api.graphql,
+            cedarPaths.api.graphql,
             `rooms.sdl.${isTypeScriptProject() ? "ts" : "js"}`
           );
           const sdlContent = ts ? exampleSdlTemplateContent : await transformTSToJS(sdlFile, exampleSdlTemplateContent);
@@ -139,7 +139,7 @@ async function handler(args) {
             "utf-8"
           );
           const serviceFile = path.join(
-            redwoodPaths.api.services,
+            cedarPaths.api.services,
             "rooms",
             `rooms.${isTypeScriptProject() ? "ts" : "js"}`
           );
@@ -161,7 +161,7 @@ async function handler(args) {
             );
           }
           const exampleFile = path.join(
-            redwoodPaths.api.subscriptions,
+            cedarPaths.api.subscriptions,
             "newMessage",
             `newMessage.${isTypeScriptProject() ? "ts" : "js"}`
           );
@@ -197,7 +197,7 @@ async function handler(args) {
             "utf-8"
           );
           const sdlFile = path.join(
-            redwoodPaths.api.graphql,
+            cedarPaths.api.graphql,
             `auctions.sdl.${isTypeScriptProject() ? "ts" : "js"}`
           );
           const sdlContent = ts ? exampleSdlTemplateContent : await transformTSToJS(sdlFile, exampleSdlTemplateContent);
@@ -212,7 +212,7 @@ async function handler(args) {
             "utf-8"
           );
           const serviceFile = path.join(
-            redwoodPaths.api.services,
+            cedarPaths.api.services,
             "auctions",
             `auctions.${isTypeScriptProject() ? "ts" : "js"}`
           );
@@ -242,7 +242,7 @@ async function handler(args) {
             "utf-8"
           );
           const sdlFile = path.join(
-            redwoodPaths.api.graphql,
+            cedarPaths.api.graphql,
             `fastAndSlowFields.sdl.${isTypeScriptProject() ? "ts" : "js"}`
           );
           const sdlContent = ts ? exampleSdlTemplateContent : await transformTSToJS(sdlFile, exampleSdlTemplateContent);
@@ -257,7 +257,7 @@ async function handler(args) {
             "utf-8"
           );
           const serviceFile = path.join(
-            redwoodPaths.api.services,
+            cedarPaths.api.services,
             "fastAndSlowFields",
             `fastAndSlowFields.${isTypeScriptProject() ? "ts" : "js"}`
           );
@@ -287,7 +287,7 @@ async function handler(args) {
             "utf-8"
           );
           const sdlFile = path.join(
-            redwoodPaths.api.graphql,
+            cedarPaths.api.graphql,
             `alphabet.sdl.${isTypeScriptProject() ? "ts" : "js"}`
           );
           const sdlContent = ts ? exampleSdlTemplateContent : await transformTSToJS(sdlFile, exampleSdlTemplateContent);
@@ -302,7 +302,7 @@ async function handler(args) {
             "utf-8"
           );
           const serviceFile = path.join(
-            redwoodPaths.api.services,
+            cedarPaths.api.services,
             "alphabet",
             `alphabet.${isTypeScriptProject() ? "ts" : "js"}`
           );
@@ -333,9 +333,9 @@ async function handler(args) {
             getPaths().api.functions,
             `graphql.${isTypeScriptProject() ? "ts" : "js"}`
           );
-          execa.sync(
-            "yarn",
-            ["cedar", "lint", "--fix", graphqlHandlerPath, realtimeLibFilePath],
+          runBinSync(
+            "cedar",
+            ["lint", "--fix", graphqlHandlerPath, realtimeLibFilePath],
             {
               cwd: getPaths().base,
               // Silently ignore errors
@@ -372,9 +372,11 @@ async function handler(args) {
       );
     }
   } 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/setup/server-file/serverFileHandler.js

@@ -5,13 +5,16 @@ import { addApiPackages, colors as c } from "@cedarjs/cli-helpers";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths, transformTSToJS, writeFile } from "../../../lib/index.js";
 import { isTypeScriptProject } from "../../../lib/project.js";
-const { version } = JSON.parse(
+const packageJson = JSON.parse(
   fs.readFileSync(
     path.resolve(import.meta.dirname, "../../../../package.json"),
     "utf-8"
   )
 );
-function setupServerFileTasks({ force = false } = {}) {
+const { version } = packageJson;
+function setupServerFileTasks({
+  force = false
+} = {}) {
   return [
     {
       title: "Adding the server file...",
@@ -36,17 +39,22 @@ function setupServerFileTasks({ force = false } = {}) {
     addApiPackages([`@cedarjs/api-server@${version}`])
   ];
 }
-async function handler({ force, verbose }) {
-  const tasks = new Listr(setupServerFileTasks({ force }), {
+async function handler({
+  force,
+  verbose
+}) {
+  const listr = new Listr(setupServerFileTasks({ force }), {
     rendererOptions: { collapseSubtasks: false, persistentOutput: true },
     renderer: verbose ? "verbose" : "default"
   });
   try {
-    await tasks.run();
+    await listr.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 = typeof e === "object" && e !== null && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    process.exit(exitCode);
   }
 }
 export {

package/dist/commands/setup/tsconfig/tsconfigHandler.js

@@ -50,9 +50,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/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/commands/setup/ui/libraries/chakra-uiHandler.js

@@ -1,7 +1,7 @@
 import path from "path";
-import execa from "execa";
 import { Listr } from "listr2";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { addWorkspacePackages } from "@cedarjs/cli-helpers/packageManager/packages";
 import extendStorybookConfiguration from "../../../../lib/configureStorybook.js";
 import { extendJSXFile, fileIncludes } from "../../../../lib/extendFile.js";
 import { getPaths, writeFile } from "../../../../lib/index.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,
@@ -34,7 +37,9 @@ async function handler({ force, install }) {
               {
                 title: `Install ${packages.join(", ")}`,
                 task: async () => {
-                  await execa("yarn", ["workspace", "web", "add", ...packages]);
+                  await addWorkspacePackages("web", packages, {
+                    cwd: rwPaths.base
+                  });
                 }
               }
             ],
@@ -88,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

@@ -1,8 +1,8 @@
 import fs from "node:fs";
 import path from "node:path";
-import execa from "execa";
 import { Listr } from "listr2";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { addWorkspacePackages } from "@cedarjs/cli-helpers/packageManager/packages";
 import extendStorybookConfiguration from "../../../../lib/configureStorybook.js";
 import { extendJSXFile, fileIncludes } from "../../../../lib/extendFile.js";
 import { getPaths, writeFile } from "../../../../lib/index.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,
@@ -51,14 +55,14 @@ async function handler({ force, install, packages }) {
               {
                 title: `Install ${installPackages.join(", ")}`,
                 task: async () => {
-                  await execa("yarn", [
-                    "workspace",
-                    "web",
-                    "add",
-                    "-D",
-                    "@emotion/react",
-                    ...installPackages
-                  ]);
+                  await addWorkspacePackages("web", installPackages, {
+                    cwd: cedarPaths.base,
+                    dev: true
+                  });
+                  await addWorkspacePackages("web", ["@emotion/react"], {
+                    cwd: cedarPaths.base,
+                    dev: true
+                  });
                 }
               }
             ],
@@ -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 {