@cedarjs/cli 1.0.0-canary.13134 → 1.0.0-canary.13136

package/dist/commands/dev/apiDebugFlag.js

@@ -0,0 +1,18 @@
+import { argv } from "node:process";
+import { getConfig } from "@cedarjs/project-config";
+const defaultApiDebugPort = 18911;
+function getApiDebugFlag(apiDebugPort) {
+  if (apiDebugPort) {
+    return `--debug-port ${apiDebugPort}`;
+  } else if (argv.includes("--apiDebugPort")) {
+    return `--debug-port ${defaultApiDebugPort}`;
+  }
+  const apiDebugPortInConfig = getConfig().api.debugPort;
+  if (apiDebugPortInConfig) {
+    return `--debug-port ${apiDebugPortInConfig}`;
+  }
+  return "";
+}
+export {
+  getApiDebugFlag
+};

package/dist/commands/dev/devHandler.js

@@ -1,6 +1,5 @@
 import fs from "node:fs";
 import path from "node:path";
-import { argv } from "node:process";
 import concurrently from "concurrently";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { shutdownPort } from "@cedarjs/internal/dist/dev";
@@ -12,9 +11,10 @@ import { generatePrismaClient } from "../../lib/generatePrismaClient.js";
 import { getPaths } from "../../lib/index.js";
 import { getFreePort } from "../../lib/ports.js";
 import { serverFileExists } from "../../lib/project.js";
-const defaultApiDebugPort = 18911;
+import { getApiDebugFlag } from "./apiDebugFlag.js";
+import { getPackageWatchCommands } from "./packageWatchCommands.js";
 const handler = async ({
-  workspace = ["api", "web"],
+  workspace = ["api", "web", "packages/*"],
   forward = "",
   generate = true,
   apiDebugPort
@@ -114,18 +114,6 @@ const handler = async ({
       );
     }
   }
-  const getApiDebugFlag = () => {
-    if (apiDebugPort) {
-      return `--debug-port ${apiDebugPort}`;
-    } else if (argv.includes("--apiDebugPort")) {
-      return `--debug-port ${defaultApiDebugPort}`;
-    }
-    const apiDebugPortInToml = getConfig().api.debugPort;
-    if (apiDebugPortInToml) {
-      return `--debug-port ${apiDebugPortInToml}`;
-    }
-    return "";
-  };
   const cedarConfigPath = getConfigPath();
   const streamingSsrEnabled = getConfig().experimental?.streamingSsr?.enabled;
   process.env.VITE_CJS_IGNORE_WARNING = "true";
@@ -133,13 +121,15 @@ const handler = async ({
   if (streamingSsrEnabled) {
     webCommand = `yarn cross-env NODE_ENV=development rw-dev-fe ${forward}`;
   }
+  const rootPackageJsonPath = path.join(cedarPaths.base, "package.json");
   const rootPackageJson = JSON.parse(
-    fs.readFileSync(path.join(cedarPaths.base, "package.json"), "utf8")
+    fs.readFileSync(rootPackageJsonPath, "utf8")
   );
   const isEsm = rootPackageJson.type === "module";
   const serverWatchCommand = isEsm ? `cedarjs-api-server-watch` : `rw-api-server-watch`;
-  const jobs = {
-    api: {
+  const jobs = [];
+  if (workspace.includes("api")) {
+    jobs.push({
       name: "api",
       command: [
         "yarn nodemon",
@@ -147,7 +137,7 @@ const handler = async ({
         `  --watch "${cedarConfigPath}"`,
         `  --exec "yarn ${serverWatchCommand}`,
         `    --port ${apiAvailablePort}`,
-        `    ${getApiDebugFlag()}`,
+        `    ${getApiDebugFlag(apiDebugPort)}`,
         '    | rw-log-formatter"'
       ].join(" ").replace(/\s+/g, " "),
       env: {
@@ -156,39 +146,42 @@ const handler = async ({
       },
       prefixColor: "cyan",
       runWhen: () => fs.existsSync(cedarPaths.api.src)
-    },
-    web: {
+    });
+  }
+  if (workspace.includes("web")) {
+    jobs.push({
       name: "web",
       command: webCommand,
       prefixColor: "blue",
       cwd: cedarPaths.web.base,
       runWhen: () => fs.existsSync(cedarPaths.web.src)
-    },
-    gen: {
+    });
+  }
+  if (generate) {
+    jobs.push({
       name: "gen",
       command: "yarn rw-gen-watch",
-      prefixColor: "green",
-      runWhen: () => generate
-    }
-  };
-  const mappedJobs = Object.keys(jobs).map((job) => {
-    if (workspace.includes(job) || job === "gen") {
-      return jobs[job];
+      prefixColor: "green"
+    });
+  }
+  const packageWorkspaces = workspace.filter(
+    (w) => w !== "api" && w !== "web" && w !== "gen"
+  );
+  if (packageWorkspaces.length > 0) {
+    const hasPackageJsonWorkspaces = Array.isArray(rootPackageJson.workspaces) && rootPackageJson.workspaces.some(
+      (workspace2) => workspace2.startsWith("packages/")
+    );
+    if (hasPackageJsonWorkspaces && fs.existsSync(cedarPaths.packages)) {
+      const pkgCommands = await getPackageWatchCommands(packageWorkspaces);
+      jobs.push(...pkgCommands);
     }
-    return {
-      name: "",
-      command: "",
-      runWhen: () => false
-    };
+  }
+  const filteredJobs = jobs.filter((job) => !job.runWhen || job.runWhen());
+  const { result } = concurrently(filteredJobs, {
+    prefix: "{name} |",
+    timestampFormat: "HH:mm:ss",
+    handleInput: true
   });
-  const { result } = concurrently(
-    mappedJobs.filter((job) => job.runWhen()),
-    {
-      prefix: "{name} |",
-      timestampFormat: "HH:mm:ss",
-      handleInput: true
-    }
-  );
   result.catch((e) => {
     if (e?.message) {
       errorTelemetry(

package/dist/commands/dev/packageWatchCommands.js

@@ -0,0 +1,54 @@
+import fs from "node:fs";
+import path from "node:path";
+import { importStatementPath } from "@cedarjs/project-config";
+import c from "../../lib/colors.js";
+import { getPaths } from "../../lib/index.js";
+async function getPackageWatchCommands(packageWorkspaces) {
+  const cedarPaths = getPaths();
+  const globPattern = path.join(cedarPaths.packages, "*").replaceAll("\\", "/");
+  const workspacePaths = packageWorkspaces.some((w) => w === "packages/*") ? await Array.fromAsync(fs.promises.glob(globPattern)) : packageWorkspaces.map((w) => {
+    const packageFolderName = w.split("/").at(-1);
+    if (!packageFolderName) {
+      throw new Error(`Invalid package workspace: ${w}`);
+    }
+    const workspacePath = path.join(cedarPaths.packages, packageFolderName);
+    if (!fs.existsSync(workspacePath)) {
+      throw new Error(`Workspace not found: ${workspacePath}`);
+    }
+    return importStatementPath(workspacePath);
+  });
+  const watchablePackages = [];
+  const packagesWithoutWatch = [];
+  for (const workspacePath of workspacePaths) {
+    const packageJsonPath = path.join(workspacePath, "package.json");
+    if (!fs.existsSync(packageJsonPath)) {
+      continue;
+    }
+    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
+    const packageName = workspacePath.split("/").at(-1);
+    if (packageJson.scripts?.watch) {
+      watchablePackages.push(workspacePath);
+    } else {
+      packagesWithoutWatch.push(packageName);
+    }
+  }
+  if (packagesWithoutWatch.length > 0) {
+    console.warn(
+      `${c.warning("Warning: ")} The following package(s) do not have a "watch" script and will be skipped: ` + packagesWithoutWatch.join(", ")
+    );
+  }
+  return watchablePackages.map((workspacePath) => {
+    const name = workspacePath.split("/").at(-1);
+    if (!name) {
+      throw new Error(`Invalid package path: ${workspacePath}`);
+    }
+    return {
+      name,
+      command: "yarn watch",
+      cwd: workspacePath
+    };
+  });
+}
+export {
+  getPackageWatchCommands
+};

package/dist/commands/dev.js

@@ -1,13 +1,13 @@
 import { terminalLink } from "termi-link";
 import c from "../lib/colors.js";
+import { workspaces } from "../lib/project.js";
 import { checkNodeVersion } from "../middleware/checkNodeVersion.js";
 const command = "dev [workspace..]";
-const description = "Start development servers for api, and web";
+const description = "Start development servers for api, web, and packages";
 const builder = (yargs) => {
   yargs.positional("workspace", {
-    choices: ["api", "web"],
-    default: ["api", "web"],
-    description: "Which dev server(s) to start",
+    default: ["api", "web", "packages/*"],
+    description: "Which dev server(s) to start. Valid values: api, web, packages/*, <package-name>",
     type: "string",
     array: true
   }).option("forward", {
@@ -31,6 +31,22 @@ const builder = (yargs) => {
     }
     console.warn(`${c.warning("Warning")}: ${check.message}
 `);
+  }).check((argv) => {
+    const workspaceArg = argv.workspace;
+    if (!Array.isArray(workspaceArg)) {
+      return "Workspace must be an array";
+    }
+    const filtered = workspaceArg.filter(
+      (item) => item !== "api" && item !== "web" && item !== "packages/*"
+    );
+    if (filtered.length === 0) {
+      return true;
+    }
+    const workspaceNames = workspaces({ includePackages: true });
+    if (!filtered.every((item) => workspaceNames.includes(item))) {
+      return c.error(`Unknown workspace(s) ${filtered.join(" ")}`) + "\n\nValid values are: " + workspaceNames.join(", ");
+    }
+    return true;
   }).epilogue(
     `Also see the ${terminalLink(
       "CedarJS CLI Reference",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "1.0.0-canary.13134+7e7f5cf31",
+  "version": "1.0.0-canary.13136+34a904f10",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -32,15 +32,15 @@
   "dependencies": {
     "@babel/preset-typescript": "7.28.5",
     "@babel/runtime-corejs3": "7.28.4",
-    "@cedarjs/api-server": "1.0.0-canary.13134",
-    "@cedarjs/cli-helpers": "1.0.0-canary.13134",
-    "@cedarjs/fastify-web": "1.0.0-canary.13134",
-    "@cedarjs/internal": "1.0.0-canary.13134",
-    "@cedarjs/prerender": "1.0.0-canary.13134",
-    "@cedarjs/project-config": "1.0.0-canary.13134",
-    "@cedarjs/structure": "1.0.0-canary.13134",
-    "@cedarjs/telemetry": "1.0.0-canary.13134",
-    "@cedarjs/web-server": "1.0.0-canary.13134",
+    "@cedarjs/api-server": "1.0.0-canary.13136",
+    "@cedarjs/cli-helpers": "1.0.0-canary.13136",
+    "@cedarjs/fastify-web": "1.0.0-canary.13136",
+    "@cedarjs/internal": "1.0.0-canary.13136",
+    "@cedarjs/prerender": "1.0.0-canary.13136",
+    "@cedarjs/project-config": "1.0.0-canary.13136",
+    "@cedarjs/structure": "1.0.0-canary.13136",
+    "@cedarjs/telemetry": "1.0.0-canary.13136",
+    "@cedarjs/web-server": "1.0.0-canary.13136",
     "@listr2/prompt-adapter-enquirer": "2.0.16",
     "@opentelemetry/api": "1.8.0",
     "@opentelemetry/core": "1.22.0",
@@ -102,5 +102,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7e7f5cf31b29fd812e0eee4a44512d1525ccf8dd"
+  "gitHead": "34a904f109f3c42ded3b22a768f7e768c66ef504"
 }