@cedarjs/cli 3.0.0-canary.13367 → 3.0.0-canary.13370

package/dist/commands/setup/realtime/addRealtimeToGraphql.js

@@ -0,0 +1,68 @@
+import fs from "node:fs";
+import path from "node:path";
+import { isTypeScriptProject } from "@cedarjs/cli-helpers";
+import { getPaths } from "@cedarjs/project-config";
+function addRealtimeToGraphqlHandler(ctx, task, force) {
+  const graphqlHandlerPath = path.join(
+    getPaths().api.functions,
+    `graphql.${isTypeScriptProject() ? "ts" : "js"}`
+  );
+  if (!fs.existsSync(graphqlHandlerPath)) {
+    ctx.realtimeHandlerSkipped = true;
+    task.skip("GraphQL handler not found");
+    return;
+  }
+  const contentLines = fs.readFileSync(graphqlHandlerPath).toString().split("\n");
+  const importLineRegex = /^import {.*realtime.*} from ['"]src\/lib\/realtime['"];?$/;
+  const multilineImportRegex = /^} from ['"]src\/lib\/realtime['"];?$/;
+  const hasRealtimeImport = contentLines.some((line) => {
+    return importLineRegex.test(line) || multilineImportRegex.test(line);
+  });
+  if (hasRealtimeImport && !force) {
+    ctx.realtimeHandlerSkipped = true;
+    task.skip("Realtime import already exists");
+    return;
+  }
+  const handlerIndex = contentLines.findLastIndex(
+    (line) => line === "export const handler = createGraphQLHandler({"
+  );
+  if (handlerIndex === -1) {
+    ctx.realtimeHandlerSkipped = true;
+    task.skip("Unexpected syntax. Handler not found");
+    return;
+  }
+  const handlerLines = contentLines.slice(handlerIndex);
+  const hasRealtimeOption = handlerLines.some(
+    (line) => /^\s*realtime\b/.test(line)
+  );
+  if (hasRealtimeOption && !force) {
+    ctx.realtimeHandlerSkipped = true;
+    task.skip("Realtime option already exists");
+    return;
+  }
+  const lastImportIndex = contentLines.slice(0, handlerIndex).findLastIndex((line) => line.startsWith("import "));
+  if (lastImportIndex === -1) {
+    ctx.realtimeHandlerSkipped = true;
+    task.skip("Unexpected syntax. No imports found");
+    return;
+  }
+  contentLines.splice(
+    lastImportIndex + 1,
+    0,
+    "import { realtime } from 'src/lib/realtime'"
+  );
+  const handlerIndexAfterSplice = handlerIndex + 1;
+  const sdlsIndex = handlerLines.findLastIndex(
+    (line) => /^\s*sdls,$/.test(line)
+  );
+  if (sdlsIndex === -1) {
+    ctx.realtimeHandlerSkipped = true;
+    task.skip("Unexpected syntax. `sdls` option not found");
+    return;
+  }
+  contentLines.splice(handlerIndexAfterSplice + sdlsIndex, 0, "  realtime,");
+  fs.writeFileSync(graphqlHandlerPath, contentLines.join("\n"));
+}
+export {
+  addRealtimeToGraphqlHandler
+};

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

@@ -1,5 +1,6 @@
 import fs from "node:fs";
 import path from "path";
+import execa from "execa";
 import { Listr } from "listr2";
 import { addApiPackages } from "@cedarjs/cli-helpers";
 import { generate as generateTypes } from "@cedarjs/internal/dist/generate/generate";
@@ -9,6 +10,7 @@ import c from "../../../lib/colors.js";
 import { getPaths, transformTSToJS, writeFile } from "../../../lib/index.js";
 import { isTypeScriptProject, serverFileExists } from "../../../lib/project.js";
 import { setupServerFileTasks } from "../server-file/serverFileHandler.js";
+import { addRealtimeToGraphqlHandler } from "./addRealtimeToGraphql.js";
 const { version } = JSON.parse(
   fs.readFileSync(
     path.resolve(import.meta.dirname, "../../../../package.json"),
@@ -26,7 +28,7 @@ async function handler({ force, includeExamples, verbose }) {
     [
       addApiPackages(["ioredis@^5", `@cedarjs/realtime@${version}`]),
       {
-        title: "Adding the realtime api lib ...",
+        title: "Adding the realtime api lib...",
         task: async () => {
           const serverFileTemplateContent = fs.readFileSync(
             path.resolve(
@@ -48,7 +50,13 @@ async function handler({ force, includeExamples, verbose }) {
         }
       },
       {
-        title: "Adding Countdown example subscription ...",
+        title: "Enabling realtime support in the GraphQL handler...",
+        task: (ctx, task) => {
+          addRealtimeToGraphqlHandler(ctx, task, force);
+        }
+      },
+      {
+        title: "Adding Countdown example subscription...",
         enabled: () => includeExamples,
         task: async () => {
           let exampleSubscriptionTemplateContent = fs.readFileSync(
@@ -84,7 +92,7 @@ async function handler({ force, includeExamples, verbose }) {
         }
       },
       {
-        title: "Adding NewMessage example subscription ...",
+        title: "Adding NewMessage example subscription...",
         enabled: () => includeExamples,
         task: async () => {
           const exampleSdlTemplateContent = fs.readFileSync(
@@ -157,7 +165,7 @@ async function handler({ force, includeExamples, verbose }) {
         }
       },
       {
-        title: "Adding Auctions example live query ...",
+        title: "Adding Auctions example live query...",
         enabled: () => includeExamples,
         task: async () => {
           const exampleSdlTemplateContent = fs.readFileSync(
@@ -202,7 +210,7 @@ async function handler({ force, includeExamples, verbose }) {
         }
       },
       {
-        title: "Adding Defer example queries ...",
+        title: "Adding Defer example queries...",
         enabled: () => includeExamples,
         task: async () => {
           const exampleSdlTemplateContent = fs.readFileSync(
@@ -247,7 +255,7 @@ async function handler({ force, includeExamples, verbose }) {
         }
       },
       {
-        title: "Adding Stream example queries ...",
+        title: "Adding Stream example queries...",
         enabled: () => includeExamples,
         task: async () => {
           const exampleSdlTemplateContent = fs.readFileSync(
@@ -292,13 +300,31 @@ async function handler({ force, includeExamples, verbose }) {
         }
       },
       {
-        title: `Generating types ...`,
+        title: `Generating types...`,
         task: async () => {
           await generateTypes();
           console.log(
             "Note: You may need to manually restart GraphQL in VSCode to see the new types take effect.\n\n"
           );
         }
+      },
+      {
+        title: "Cleaning up...",
+        task: () => {
+          const graphqlHandlerPath = path.join(
+            getPaths().api.functions,
+            `graphql.${isTypeScriptProject() ? "ts" : "js"}`
+          );
+          execa.sync(
+            "yarn",
+            ["cedar", "lint", "--fix", graphqlHandlerPath, realtimeLibFilePath],
+            {
+              cwd: getPaths().base,
+              // Silently ignore errors
+              reject: false
+            }
+          );
+        }
       }
     ],
     {
@@ -311,6 +337,22 @@ async function handler({ force, includeExamples, verbose }) {
       tasks.add(setupServerFileTasks({ force }));
     }
     await tasks.run();
+    if (tasks.ctx?.realtimeHandlerSkipped) {
+      const graphqlHandlerPath = path.join(
+        getPaths().api.functions,
+        `graphql.${isTypeScriptProject() ? "ts" : "js"}`
+      );
+      const relativePath = path.relative(getPaths().base, graphqlHandlerPath);
+      console.log();
+      console.log(
+        c.warning(
+          `Note: The setup command skipped adding realtime to your GraphQL handler. Please review ${relativePath}, and manually add it if needed.`
+        )
+      );
+      console.log(
+        "You want to make sure you have an import like `import { realtime } from '@cedarjs/realtime'`, and that you pass `realtime` to the call to `createGraphQLHandler`."
+      );
+    }
   } catch (e) {
     errorTelemetry(process.argv, e.message);
     console.error(c.error(e.message));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "3.0.0-canary.13367+4edbb1ade",
+  "version": "3.0.0-canary.13370+b8841f057",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -31,17 +31,18 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
+    "@babel/parser": "7.29.0",
     "@babel/preset-typescript": "7.28.5",
     "@babel/runtime-corejs3": "7.29.0",
-    "@cedarjs/api-server": "3.0.0-canary.13367",
-    "@cedarjs/cli-helpers": "3.0.0-canary.13367",
-    "@cedarjs/fastify-web": "3.0.0-canary.13367",
-    "@cedarjs/internal": "3.0.0-canary.13367",
-    "@cedarjs/prerender": "3.0.0-canary.13367",
-    "@cedarjs/project-config": "3.0.0-canary.13367",
-    "@cedarjs/structure": "3.0.0-canary.13367",
-    "@cedarjs/telemetry": "3.0.0-canary.13367",
-    "@cedarjs/web-server": "3.0.0-canary.13367",
+    "@cedarjs/api-server": "3.0.0-canary.13370",
+    "@cedarjs/cli-helpers": "3.0.0-canary.13370",
+    "@cedarjs/fastify-web": "3.0.0-canary.13370",
+    "@cedarjs/internal": "3.0.0-canary.13370",
+    "@cedarjs/prerender": "3.0.0-canary.13370",
+    "@cedarjs/project-config": "3.0.0-canary.13370",
+    "@cedarjs/structure": "3.0.0-canary.13370",
+    "@cedarjs/telemetry": "3.0.0-canary.13370",
+    "@cedarjs/web-server": "3.0.0-canary.13370",
     "@listr2/prompt-adapter-enquirer": "2.0.16",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/core": "1.30.1",
@@ -78,6 +79,7 @@
     "prettier": "3.8.1",
     "prisma": "6.19.2",
     "prompts": "2.4.2",
+    "recast": "0.23.11",
     "rimraf": "6.1.2",
     "semver": "7.7.3",
     "smol-toml": "1.6.0",
@@ -104,5 +106,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4edbb1ade15442a45ce47e6b721ae12d5b5ec8be"
+  "gitHead": "b8841f057dc5f352fecc928685b20796636a10b0"
 }