@cedarjs/cli 4.0.0-canary.13782 → 4.0.0-canary.13784

package/dist/commands/{setup → experimental}/live-queries/liveQueries.js

@@ -1,8 +1,9 @@
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
-const command = "live-queries";
+import { getEpilogue } from "../util.js";
+const command = "setup-live-queries";
 const description = "Setup live query invalidation with Postgres notifications";
 function builder(yargs) {
-  yargs.option("force", {
+  return yargs.option("force", {
     alias: "f",
     default: false,
     description: "Overwrite existing configuration",
@@ -12,11 +13,11 @@ function builder(yargs) {
     default: false,
     description: "Print more logs",
     type: "boolean"
-  });
+  }).epilogue(getEpilogue(command, description));
 }
 async function handler(options) {
   recordTelemetryAttributes({
-    command: "setup live-queries",
+    command: `experimental ${command}`,
     force: options.force,
     verbose: options.verbose
   });

package/dist/commands/{setup → experimental}/live-queries/liveQueriesHandler.js

@@ -2,7 +2,11 @@ import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
 import { addApiPackages, colors as c } from "@cedarjs/cli-helpers";
-import { getMigrationsPath, getSchemaPath } from "@cedarjs/project-config";
+import {
+  getConfigPath,
+  getMigrationsPath,
+  getSchemaPath
+} from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths, transformTSToJS, writeFile } from "../../../lib/index.js";
 import { isTypeScriptProject } from "../../../lib/project.js";
@@ -28,10 +32,10 @@ async function getPrismaProvider() {
     let stat;
     try {
       stat = fs.statSync(schemaPath);
-    } catch (e) {
+    } catch {
       stat = void 0;
     }
-    if (stat && stat.isDirectory()) {
+    if (stat?.isDirectory()) {
       const candidate = path.join(schemaPath, "schema.prisma");
       if (fs.existsSync(candidate)) {
         schemaPath = candidate;
@@ -44,7 +48,7 @@ async function getPrismaProvider() {
     }
     const content = fs.readFileSync(schemaPath, "utf-8");
     const match = content.match(/^\s*provider\s*=\s*["']([^"']+)["']/im);
-    if (match && match[1]) {
+    if (match?.[1]) {
       return match[1].toLowerCase();
     }
     return void 0;
@@ -52,7 +56,7 @@ async function getPrismaProvider() {
     return void 0;
   }
 }
-function findExistingLiveQueryMigration({ migrationsDirectoryPath }) {
+function findExistingLiveQueryMigration(migrationsDirectoryPath) {
   if (!fs.existsSync(migrationsDirectoryPath)) {
     return void 0;
   }
@@ -143,7 +147,7 @@ function addLiveQueryListenerToGraphqlHandler({ force }) {
     skipped: false
   };
 }
-async function handler({ force }) {
+async function handler({ force, verbose }) {
   const projectIsTypescript = isTypeScriptProject();
   const apiPackageJson = getApiPackageJson();
   const migrationsPath = await getMigrationsPath(getPaths().api.prismaConfig);
@@ -160,9 +164,7 @@ async function handler({ force }) {
     "templates",
     "liveQueriesListener.ts.template"
   );
-  const existingMigrationPath = findExistingLiveQueryMigration({
-    migrationsDirectoryPath: migrationsPath
-  });
+  const existingMigrationPath = findExistingLiveQueryMigration(migrationsPath);
   const migrationDirPath = path.join(
     migrationsPath,
     generateMigrationFolderName()
@@ -202,6 +204,44 @@ async function handler({ force }) {
           }
         }
       },
+      {
+        title: "Adding [experimental.gqlorm] config...",
+        task: (_ctx, task) => {
+          const configTomlPath = getConfigPath();
+          const configFileName = path.basename(configTomlPath);
+          const configContent = fs.readFileSync(configTomlPath, "utf-8");
+          if (!configContent.includes("[experimental.gqlorm]")) {
+            writeFile(
+              configTomlPath,
+              configContent.concat(
+                "\n\n[experimental.gqlorm]\n  enabled = true\n"
+              ),
+              {
+                overwriteExisting: true
+              }
+            );
+          } else {
+            if (force) {
+              task.output = `Overwriting config in ${configFileName}`;
+              writeFile(
+                configTomlPath,
+                configContent.replace(
+                  "\n[experimental.gqlorm]\n  enabled = false\n",
+                  "\n[experimental.gqlorm]\n  enabled = true\n"
+                ),
+                {
+                  overwriteExisting: true
+                }
+              );
+            } else {
+              task.skip(
+                `The [experimental.gqlorm] config block already exists in ${configFileName}.`
+              );
+            }
+          }
+        },
+        rendererOptions: { persistentOutput: true }
+      },
       {
         ...addApiPackages(["pg@^8.18.0"]),
         title: "Adding pg dependency to your api side...",
@@ -209,6 +249,7 @@ async function handler({ force }) {
           if (hasPgDependency) {
             return "pg is already installed";
           }
+          return false;
         }
       },
       {
@@ -231,6 +272,7 @@ async function handler({ force }) {
             );
             return `Existing live query migration found: ${migrationPath2}`;
           }
+          return false;
         }
       },
       {
@@ -272,17 +314,29 @@ async function handler({ force }) {
       }
     ],
     {
-      rendererOptions: { collapseSubtasks: false }
+      rendererOptions: { collapseSubtasks: false },
+      renderer: verbose ? "verbose" : "default"
     }
   );
   try {
     await tasks.run();
   } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
+    if (isObject(e) && "message" in e) {
+      errorTelemetry(process.argv, e.message);
+      console.error(c.error(e.message));
+    } else {
+      errorTelemetry(process.argv, e);
+      console.error(c.error(e));
+    }
+    process.exit(isObjectWithExitCode(e) ? e.exitCode : 1);
   }
 }
+function isObject(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function isObjectWithExitCode(value) {
+  return isObject(value) && typeof value.exitCode === "number";
+}
 export {
   handler
 };

package/dist/commands/experimental/util.js

@@ -4,39 +4,40 @@ import ansis from "ansis";
 import { terminalLink } from "termi-link";
 import { getPaths } from "../../lib/index.js";
 import { isTypeScriptProject, serverFileExists } from "../../lib/project.js";
-const link = (topicId, isTerminal = false) => {
+function link(topicId, isTerminal = false) {
   const communityLink = `https://community.redwoodjs.com/t/${topicId}`;
   if (isTerminal) {
     return terminalLink(communityLink, communityLink);
   } else {
     return communityLink;
   }
-};
-const getEpilogue = (command, description, topicId, isTerminal = false) => `This is an experimental feature to: ${description}.
+}
+function getEpilogue(command, description, topicId, isTerminal = false) {
+  let epilogue = `This is an experimental feature to: ${description}.
+
+If you need help with ${command}, please join our Discord community.
+ -> ${terminalLink("", "https://cedarjs.com/discord")}`;
+  if (topicId) {
+    epilogue += `
 
-Please find documentation and links to provide feedback for ${command} at:
- -> ${link(
-  topicId,
-  isTerminal
-)}`;
-const printTaskEpilogue = (command, description, topicId) => {
+You might also be able to find some information at:
+ -> ${link(topicId, isTerminal)}`;
+  }
+  return epilogue;
+}
+function printTaskEpilogue(command, description, topicId) {
+  const orangeLine = ansis.hex("#ff845e")("-".repeat(64));
   console.log(
-    `${ansis.hex("#ff845e")(
-      `------------------------------------------------------------------
- \u{1F9EA} ${ansis.green(
-        "Experimental Feature"
-      )} \u{1F9EA}
-------------------------------------------------------------------`
-    )}`
+    [
+      orangeLine,
+      `\u{1F9EA} ${ansis.green("Experimental Feature")} \u{1F9EA}`,
+      orangeLine
+    ].join("\n")
   );
   console.log(getEpilogue(command, description, topicId, false));
-  console.log(
-    `${ansis.hex("#ff845e")(
-      "------------------------------------------------------------------"
-    )}
-`
-  );
-};
+  console.log(`${orangeLine}
+`);
+}
 const isServerFileSetup = () => {
   if (!serverFileExists()) {
     throw new Error(

package/dist/commands/experimental.js

@@ -1,5 +1,6 @@
 import { terminalLink } from "termi-link";
 import { detectCedarVersion } from "../middleware/detectProjectCedarVersion.js";
+import * as experimentalLiveQueries from "./experimental/live-queries/liveQueries.js";
 import * as experimentalInngest from "./experimental/setupInngest.js";
 import * as experimentalOpenTelemetry from "./experimental/setupOpentelemetry.js";
 import * as experimentalReactCompiler from "./experimental/setupReactCompiler.js";
@@ -8,7 +9,7 @@ import * as experimentalStreamingSsr from "./experimental/setupStreamingSsr.js";
 const command = "experimental <command>";
 const aliases = ["exp"];
 const description = "Run or setup experimental features";
-const builder = (yargs) => yargs.command(experimentalInngest).command(experimentalOpenTelemetry).command(experimentalReactCompiler).command(experimentalRsc).command(experimentalStreamingSsr).demandCommand().middleware(detectCedarVersion).epilogue(
+const builder = (yargs) => yargs.command(experimentalInngest).command(experimentalLiveQueries).command(experimentalOpenTelemetry).command(experimentalReactCompiler).command(experimentalRsc).command(experimentalStreamingSsr).demandCommand().middleware(detectCedarVersion).epilogue(
   `Also see the ${terminalLink(
     "CedarJS CLI Reference",
     "https://cedarjs.com/docs/cli-commands#experimental"

package/dist/commands/setup.js

@@ -8,7 +8,6 @@ import * as setupGenerator from "./setup/generator/generator.js";
 import * as setupGraphql from "./setup/graphql/graphql.js";
 import * as setupI18n from "./setup/i18n/i18n.js";
 import * as setupJobs from "./setup/jobs/jobs.js";
-import * as setupLiveQueries from "./setup/live-queries/liveQueries.js";
 import * as setupMailer from "./setup/mailer/mailer.js";
 import * as setupMiddleware from "./setup/middleware/middleware.js";
 import * as setupMonitoring from "./setup/monitoring/monitoring.js";
@@ -21,7 +20,7 @@ import * as setupUploads from "./setup/uploads/uploads.js";
 import * as setupVite from "./setup/vite/vite.js";
 const command = "setup <command>";
 const description = "Initialize project config and install packages";
-const builder = (yargs) => yargs.command(setupAuth).command(setupCache).command(setupDeploy).command(setupDocker).command(setupGenerator).command(setupGraphql).command(setupI18n).command(setupJobs).command(setupLiveQueries).command(setupMailer).command(setupMiddleware).command(setupMonitoring).command(setupPackage).command(setupRealtime).command(setupServerFile).command(setupTsconfig).command(setupUi).command(setupUploads).command(setupVite).demandCommand().middleware(detectCedarVersion).epilogue(
+const builder = (yargs) => yargs.command(setupAuth).command(setupCache).command(setupDeploy).command(setupDocker).command(setupGenerator).command(setupGraphql).command(setupI18n).command(setupJobs).command(setupMailer).command(setupMiddleware).command(setupMonitoring).command(setupPackage).command(setupRealtime).command(setupServerFile).command(setupTsconfig).command(setupUi).command(setupUploads).command(setupVite).demandCommand().middleware(detectCedarVersion).epilogue(
   `Also see the ${terminalLink(
     "CedarJS CLI Reference",
     "https://cedarjs.com/docs/cli-commands#setup"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "4.0.0-canary.13782+b52a0dc47d",
+  "version": "4.0.0-canary.13784+a1524c1b18",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -33,16 +33,16 @@
   "dependencies": {
     "@babel/parser": "7.29.2",
     "@babel/preset-typescript": "7.28.5",
-    "@cedarjs/api-server": "4.0.0-canary.13782",
-    "@cedarjs/cli-helpers": "4.0.0-canary.13782",
-    "@cedarjs/fastify-web": "4.0.0-canary.13782",
-    "@cedarjs/internal": "4.0.0-canary.13782",
-    "@cedarjs/prerender": "4.0.0-canary.13782",
-    "@cedarjs/project-config": "4.0.0-canary.13782",
-    "@cedarjs/structure": "4.0.0-canary.13782",
-    "@cedarjs/telemetry": "4.0.0-canary.13782",
-    "@cedarjs/utils": "4.0.0-canary.13782",
-    "@cedarjs/web-server": "4.0.0-canary.13782",
+    "@cedarjs/api-server": "4.0.0-canary.13784",
+    "@cedarjs/cli-helpers": "4.0.0-canary.13784",
+    "@cedarjs/fastify-web": "4.0.0-canary.13784",
+    "@cedarjs/internal": "4.0.0-canary.13784",
+    "@cedarjs/prerender": "4.0.0-canary.13784",
+    "@cedarjs/project-config": "4.0.0-canary.13784",
+    "@cedarjs/structure": "4.0.0-canary.13784",
+    "@cedarjs/telemetry": "4.0.0-canary.13784",
+    "@cedarjs/utils": "4.0.0-canary.13784",
+    "@cedarjs/web-server": "4.0.0-canary.13784",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/core": "1.30.1",
@@ -108,5 +108,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b52a0dc47d386c81ea383a7356f34f1cb2ea5f15"
+  "gitHead": "a1524c1b18b1def13c0f4520aa638b13bddf630e"
 }