@cedarjs/cli 2.5.2-next.0 → 2.5.2-next.25

package/README.md

@@ -101,7 +101,7 @@ how to do this you'll know how to modify one too.
 CedarJS CLI is usually run in a project, this is problematic for contributors,
 because the transpiled files are not in a project, but in the CedarJS framework
 repo. Luckily the path can be modified at run-time via an env-var:
-`RWJS_CWD=../path/to/project`.
+`CEDAR_CWD=../path/to/project`.
 
 We've added a handy yarn alias to test your modified changes to the Cedar CLI
 against the "example-todo-main" fixture (`__fixtures__/example-todo-main`) you

package/dist/cfw.js

@@ -22,7 +22,7 @@ if (!fs.existsSync(CFW_PATH)) {
 const absCfwPath = path.resolve(process.cwd(), CFW_PATH);
 config.set("CFW_PATH", absCfwPath);
 const projectPath = path.dirname(
-  getConfigPath(process.env.RWJS_CWD ?? process.cwd())
+  getConfigPath(process.env.CEDAR_CWD ?? process.env.RWJS_CWD ?? process.cwd())
 );
 console.log("Cedar Framework Tools Path:", terminalLink(absCfwPath, absCfwPath));
 let command = process.argv.slice(2);
@@ -35,7 +35,7 @@ try {
     stdio: "inherit",
     cwd: absCfwPath,
     env: {
-      RWJS_CWD: projectPath
+      CEDAR_CWD: projectPath
     }
   });
 } catch (e) {

package/dist/commands/lint.js

@@ -58,10 +58,10 @@ function showLegacyEslintDeprecationWarning(legacyFiles) {
   console.warn("   See more here: https://github.com/cedarjs/cedar/pull/629");
   console.warn("");
 }
-const command = "lint [path..]";
+const command = "lint [paths..]";
 const description = "Lint your files";
 const builder = (yargs) => {
-  yargs.positional("path", {
+  yargs.positional("paths", {
     description: "Specify file(s) or directory(ies) to lint relative to project root",
     type: "array"
   }).option("fix", {
@@ -79,7 +79,7 @@ const builder = (yargs) => {
     )}`
   );
 };
-const handler = async ({ path: path2, fix, format }) => {
+const handler = async ({ paths, fix, format }) => {
   recordTelemetryAttributes({ command: "lint", fix, format });
   const config = getConfig();
   const legacyConfigFiles = detectLegacyEslintConfig();
@@ -87,21 +87,18 @@ const handler = async ({ path: path2, fix, format }) => {
     showLegacyEslintDeprecationWarning(legacyConfigFiles);
   }
   try {
-    const pathString = path2?.join(" ");
     const sbPath = getPaths().web.storybook;
-    const args = [
-      "eslint",
-      fix && "--fix",
-      "--format",
-      format,
-      !pathString && fs.existsSync(getPaths().web.src) && "web/src",
-      !pathString && fs.existsSync(getPaths().web.config) && "web/config",
-      !pathString && fs.existsSync(sbPath) && "web/.storybook",
-      !pathString && fs.existsSync(getPaths().scripts) && "scripts",
-      !pathString && fs.existsSync(getPaths().api.src) && "api/src",
-      pathString
-    ].filter(Boolean);
-    const result = await execa("yarn", args, {
+    const args = ["eslint", fix && "--fix", "--format", format, ...paths];
+    if (paths.length === 0) {
+      args.push(
+        fs.existsSync(getPaths().web.src) && "web/src",
+        fs.existsSync(getPaths().web.config) && "web/config",
+        fs.existsSync(sbPath) && "web/.storybook",
+        fs.existsSync(getPaths().scripts) && "scripts",
+        fs.existsSync(getPaths().api.src) && "api/src"
+      );
+    }
+    const result = await execa("yarn", args.filter(Boolean), {
       cwd: getPaths().base,
       stdio: "inherit"
     });

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/dist/commands/setup/realtime/templates/liveQueries/auctions/auctions.sdl.ts.template

@@ -1,5 +1,3 @@
-// api/src/graphql/auctions.sdl.ts
-
 export const schema = gql`
   type Query {
     auction(id: ID!): Auction @requireAuth

package/dist/commands/setup/realtime/templates/liveQueries/auctions/auctions.ts.template

@@ -1,4 +1,3 @@
-// api/src/services/auctions/auctions.ts
 import type { LiveQueryStorageMechanism } from '@cedarjs/realtime'
 
 import { logger } from 'src/lib/logger'

package/dist/commands/setup/realtime/templates/realtime.ts.template

@@ -1,4 +1,4 @@
-import { RedwoodRealtimeOptions } from '@cedarjs/realtime'
+import { CedarRealtimeOptions } from '@cedarjs/realtime'
 
 import subscriptions from 'src/subscriptions/**/*.{js,ts}'
 
@@ -14,21 +14,23 @@ import subscriptions from 'src/subscriptions/**/*.{js,ts}'
  *
  * Realtime supports Live Queries and Subscriptions over GraphQL SSE.
  *
- * Live Queries are GraphQL queries that are automatically re-run when the data they depend on changes.
+ * Live Queries are GraphQL queries that are automatically re-run when the data
+ * they depend on changes.
  *
- * Subscriptions are GraphQL queries that are run when a client subscribes to a channel.
+ * Subscriptions are GraphQL queries that are run when a client subscribes to a
+ * channel.
  *
  * CedarJS Realtime
  *  - uses a publish/subscribe model to broadcast data to clients.
  *  - uses a store to persist Live Query and Subscription data.
- *  - and enable defer and stream directives to improve latency
- *    for clients by sending data the most important data as soon as it's ready.
+ *  - and enable defer and stream directives to improve latency for clients by
+ *    sending data the most important data as soon as it's ready.
  *
  * CedarJS Realtime supports in-memory and Redis stores:
  * - In-memory stores are useful for development and testing.
  * - Redis stores are useful for production.
  */
-export const realtime: RedwoodRealtimeOptions = {
+export const realtime: CedarRealtimeOptions = {
   subscriptions: {
     subscriptions,
     store: 'in-memory',

package/dist/index.js

@@ -5,7 +5,7 @@ import { trace, SpanStatusCode } from "@opentelemetry/api";
 import { hideBin, Parser } from "yargs/helpers";
 import yargs from "yargs/yargs";
 import { loadEnvFiles, recordTelemetryAttributes } from "@cedarjs/cli-helpers";
-import { projectIsEsm, getConfigPath } from "@cedarjs/project-config";
+import { findUp, projectIsEsm, getConfigPath } from "@cedarjs/project-config";
 import { telemetryMiddleware } from "@cedarjs/telemetry";
 import * as buildCommand from "./commands/build.js";
 import * as checkCommand from "./commands/check.js";
@@ -32,7 +32,6 @@ import * as typeCheckCommand from "./commands/type-check.js";
 import * as upgradeCommand from "./commands/upgrade/upgrade.js";
 import c from "./lib/colors.js";
 import { exitWithError } from "./lib/exit.js";
-import { findUp } from "./lib/index.js";
 import * as updateCheck from "./lib/updateCheck.js";
 import { loadPlugins } from "./plugin.js";
 import { startTelemetry, shutdownTelemetry } from "./telemetry/index.js";
@@ -45,8 +44,10 @@ let { cwd, telemetry, help, version } = Parser(hideBin(process.argv), {
     telemetry: process.env.REDWOOD_DISABLE_TELEMETRY === void 0 || process.env.REDWOOD_DISABLE_TELEMETRY === ""
   }
 });
+cwd ??= process.env.CEDAR_CWD;
 cwd ??= process.env.RWJS_CWD;
 cwd = getTomlDir(cwd);
+process.env.CEDAR_CWD = cwd;
 process.env.RWJS_CWD = cwd;
 if (process.argv[1]?.endsWith("redwood.js")) {
   const tomlPath = getConfigPath(cwd);
@@ -148,13 +149,13 @@ function getTomlDir(cwd2) {
   let tomlDir = "";
   try {
     if (cwd2) {
-      const found = configFiles.some((f) => fs.existsSync(path.join(cwd2, f)));
+      const absCwd = path.resolve(process.cwd(), cwd2);
+      const found = configFiles.some((f) => fs.existsSync(path.join(absCwd, f)));
       if (!found) {
-        throw new Error(
-          `Couldn't find a "cedar.toml" or "redwood.toml" file in ${cwd2}`
-        );
+        const tomls = configFiles.join('" or "');
+        throw new Error(`Couldn't find a "${tomls}" file in ${absCwd}`);
       }
-      tomlDir = cwd2;
+      tomlDir = absCwd;
     } else {
       const configTomlPath = findUp("cedar.toml", process.cwd()) || findUp("redwood.toml", process.cwd());
       if (!configTomlPath) {

package/dist/lib/exec.js

@@ -8,7 +8,9 @@ import {
   cedarCellTransform,
   cedarjsDirectoryNamedImportPlugin,
   cedarjsJobPathInjectorPlugin,
-  cedarSwapApolloProvider
+  cedarSwapApolloProvider,
+  cedarImportDirPlugin,
+  cedarAutoImportsPlugin
 } from "@cedarjs/vite";
 async function runScriptFunction({
   path: scriptPath,
@@ -72,7 +74,9 @@ async function runScriptFunction({
       cedarjsDirectoryNamedImportPlugin(),
       cedarCellTransform(),
       cedarjsJobPathInjectorPlugin(),
-      cedarSwapApolloProvider()
+      cedarSwapApolloProvider(),
+      cedarImportDirPlugin(),
+      cedarAutoImportsPlugin()
     ]
   });
   if (Number(viteVersion.split(".")[0]) < 6) {

package/dist/lib/runTransform.js

@@ -23,8 +23,9 @@ const runTransform = async ({
   parser = "tsx",
   options = {}
 }) => {
-  if (process.env.NODE_ENV === "test" && process.env.RWJS_CWD) {
-    process.chdir(process.env.RWJS_CWD);
+  const cedarCwd = process.env.CEDAR_CWD || process.env.RWJS_CWD;
+  if (process.env.NODE_ENV === "test" && cedarCwd) {
+    process.chdir(cedarCwd);
   }
   const { output, stdoutWrite } = patchStdoutWrite();
   const result = await jscodeshift.run(transformPath, targetPaths, {

package/dist/testLib/runTransform.js

@@ -20,8 +20,9 @@ const runTransform = async ({
   options = {}
 }) => {
   try {
-    if (process.env.NODE_ENV === "test" && process.env.RWJS_CWD) {
-      process.chdir(process.env.RWJS_CWD);
+    const cedarCwd = process.env.CEDAR_CWD || process.env.RWJS_CWD;
+    if (process.env.NODE_ENV === "test" && cedarCwd) {
+      process.chdir(cedarCwd);
     }
     await jscodeshift.run(transformPath, targetPaths, {
       ...defaultJscodeshiftOpts,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "2.5.2-next.0+0a4a79421",
+  "version": "2.5.2-next.25+a9fdb4b80",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -24,24 +24,25 @@
     "build:pack": "yarn pack -o cedarjs-cli.tgz",
     "build:types": "tsc --build --verbose ./tsconfig.build.json",
     "build:watch": "nodemon --watch src --ext \"js,jsx,ts,tsx,template\" --ignore dist --exec \"yarn build && yarn fix:permissions\"",
-    "dev": "RWJS_CWD=../../__fixtures__/example-todo-main node dist/index.js",
+    "dev": "CEDAR_CWD=../../test-project node dist/index.js",
     "fix:permissions": "chmod +x dist/index.js dist/cfw.js",
     "prepublishOnly": "yarn build",
     "test": "vitest run",
     "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": "2.5.2-next.0+0a4a79421",
-    "@cedarjs/cli-helpers": "2.5.2-next.0+0a4a79421",
-    "@cedarjs/fastify-web": "2.5.2-next.0+0a4a79421",
-    "@cedarjs/internal": "2.5.2-next.0+0a4a79421",
-    "@cedarjs/prerender": "2.5.2-next.0+0a4a79421",
-    "@cedarjs/project-config": "2.5.2-next.0+0a4a79421",
-    "@cedarjs/structure": "2.5.2-next.0+0a4a79421",
-    "@cedarjs/telemetry": "2.5.2-next.0+0a4a79421",
-    "@cedarjs/web-server": "2.5.2-next.0+0a4a79421",
+    "@cedarjs/api-server": "2.5.2-next.25+a9fdb4b80",
+    "@cedarjs/cli-helpers": "2.5.2-next.25+a9fdb4b80",
+    "@cedarjs/fastify-web": "2.5.2-next.25+a9fdb4b80",
+    "@cedarjs/internal": "2.5.2-next.25+a9fdb4b80",
+    "@cedarjs/prerender": "2.5.2-next.25+a9fdb4b80",
+    "@cedarjs/project-config": "2.5.2-next.25+a9fdb4b80",
+    "@cedarjs/structure": "2.5.2-next.25+a9fdb4b80",
+    "@cedarjs/telemetry": "2.5.2-next.25+a9fdb4b80",
+    "@cedarjs/web-server": "2.5.2-next.25+a9fdb4b80",
     "@listr2/prompt-adapter-enquirer": "2.0.16",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/core": "1.30.1",
@@ -78,8 +79,9 @@
     "prettier": "3.8.1",
     "prisma": "6.19.2",
     "prompts": "2.4.2",
+    "recast": "0.23.11",
     "rimraf": "6.1.2",
-    "semver": "7.7.3",
+    "semver": "7.7.4",
     "smol-toml": "1.6.0",
     "string-env-interpolation": "1.0.1",
     "systeminformation": "5.30.7",
@@ -104,5 +106,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0a4a794219bb74bfe5cadf2fa8d4072999444ec4"
+  "gitHead": "a9fdb4b803326e5d49329f3ac990c4af74bf1f50"
 }