@cedarjs/cli 5.0.0-canary.2340 → 5.0.0-canary.2343

package/dist/commands/experimental/live-queries/liveQueriesHandler.js

@@ -1,7 +1,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 {
+  addApiPackages,
+  addWebPackages,
+  colors as c
+} from "@cedarjs/cli-helpers";
 import {
   getConfigPath,
   getMigrationsPath,
@@ -14,6 +18,10 @@ function getApiPackageJson() {
   const apiPackageJsonPath = path.join(getPaths().api.base, "package.json");
   return JSON.parse(fs.readFileSync(apiPackageJsonPath, "utf-8"));
 }
+function getWebPackageJson() {
+  const webPackageJsonPath = path.join(getPaths().web.base, "package.json");
+  return JSON.parse(fs.readFileSync(webPackageJsonPath, "utf-8"));
+}
 function hasPackage(packageJson, packageName) {
   return Boolean(
     packageJson.dependencies?.[packageName] || packageJson.devDependencies?.[packageName]
@@ -147,12 +155,88 @@ function addLiveQueryListenerToGraphqlHandler({ force }) {
     skipped: false
   };
 }
+function addConfigureGqlormToApp({ force }) {
+  const appPath = getPaths().web.app;
+  if (!fs.existsSync(appPath)) {
+    return {
+      skipped: true,
+      reason: `${path.basename(appPath)} not found`
+    };
+  }
+  const content = fs.readFileSync(appPath, "utf-8");
+  const contentLines = content.split("\n");
+  const hasGqlormImport = contentLines.some(
+    (line) => line.includes("from '@cedarjs/gqlorm/setup'")
+  );
+  const hasSchemaImport = contentLines.some(
+    (line) => line.includes("from '../../.cedar/gqlorm-schema.json'")
+  );
+  const hasConfigureCall = contentLines.some(
+    (line) => line.includes("configureGqlorm({ schema })")
+  );
+  if (hasGqlormImport && hasSchemaImport && hasConfigureCall && !force) {
+    return {
+      skipped: true,
+      reason: "configureGqlorm is already wired into App"
+    };
+  }
+  if (!hasGqlormImport) {
+    const redwoodWebImportIndex = contentLines.findIndex(
+      (line) => line.includes("from '@cedarjs/web'")
+    );
+    if (redwoodWebImportIndex === -1) {
+      return {
+        skipped: true,
+        reason: "Unexpected syntax. Could not find @cedarjs/web import to insert gqlorm import"
+      };
+    }
+    contentLines.splice(
+      redwoodWebImportIndex,
+      0,
+      "import { configureGqlorm } from '@cedarjs/gqlorm/setup'"
+    );
+  }
+  if (!hasSchemaImport) {
+    const fatalErrorPageIndex = contentLines.findIndex(
+      (line) => line.includes("import FatalErrorPage from 'src/pages/FatalErrorPage'")
+    );
+    if (fatalErrorPageIndex === -1) {
+      return {
+        skipped: true,
+        reason: "Unexpected syntax. Could not find FatalErrorPage import to insert schema import"
+      };
+    }
+    contentLines.splice(
+      fatalErrorPageIndex + 1,
+      0,
+      "import schema from '../../.cedar/gqlorm-schema.json' with { type: 'json' }"
+    );
+  }
+  if (!hasConfigureCall) {
+    const appComponentIndex = contentLines.findIndex(
+      (line) => /^const App\s*=/.test(line)
+    );
+    if (appComponentIndex === -1) {
+      return {
+        skipped: true,
+        reason: "Unexpected syntax. Could not find `const App =` to insert configureGqlorm call"
+      };
+    }
+    contentLines.splice(appComponentIndex, 0, "configureGqlorm({ schema })", "");
+  }
+  fs.writeFileSync(appPath, contentLines.join("\n"));
+  return {
+    skipped: false
+  };
+}
 async function handler({ force, verbose }) {
   const projectIsTypescript = isTypeScriptProject();
   const apiPackageJson = getApiPackageJson();
   const migrationsPath = await getMigrationsPath(getPaths().api.prismaConfig);
   const hasRealtimeDependency = hasPackage(apiPackageJson, "@cedarjs/realtime");
   const hasPgDependency = hasPackage(apiPackageJson, "pg");
+  const webPackageJson = getWebPackageJson();
+  const hasGqlormDependency = hasPackage(webPackageJson, "@cedarjs/gqlorm");
   const ext = projectIsTypescript ? "ts" : "js";
   const migrationTemplatePath = path.resolve(
     import.meta.dirname,
@@ -244,7 +328,7 @@ async function handler({ force, verbose }) {
       },
       {
         ...addApiPackages(["pg@^8.18.0"]),
-        title: "Adding pg dependency to your api side...",
+        title: "Adding pg dependency to your api workspace...",
         skip: () => {
           if (hasPgDependency) {
             return "pg is already installed";
@@ -297,6 +381,25 @@ async function handler({ force, verbose }) {
           }
         }
       },
+      {
+        ...addWebPackages(["@cedarjs/gqlorm"]),
+        title: "Adding @cedarjs/gqlorm to your web workspace...",
+        skip: () => {
+          if (hasGqlormDependency) {
+            return "@cedarjs/gqlorm is already installed";
+          }
+          return false;
+        }
+      },
+      {
+        title: "Wiring configureGqlorm into App.tsx...",
+        task: (_ctx, task) => {
+          const result = addConfigureGqlormToApp({ force });
+          if (result.skipped) {
+            task.skip(result.reason);
+          }
+        }
+      },
       {
         title: "One more thing...",
         task: (_ctx, task) => {

package/package.json

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