@cedarjs/cli 1.0.0-canary.13112 → 1.0.0-canary.13113

package/dist/commands/build.js

@@ -6,11 +6,9 @@ import { checkNodeVersion } from "../middleware/checkNodeVersion.js";
 const command = "build [workspace..]";
 const description = "Build for production";
 const builder = (yargs) => {
-  const choices = workspaces();
   yargs.positional("workspace", {
-    choices,
-    default: choices,
-    description: "What workspace(s) to build",
+    default: ["web", "api", "packages/*"],
+    description: "What workspace(s) to build. Valid values are: web, api, packages/*, <package-name>",
     type: "array"
   }).option("verbose", {
     alias: "v",
@@ -35,6 +33,22 @@ const builder = (yargs) => {
       message: `${c.error("Error")}: ${check.message}`,
       includeEpilogue: false
     });
+  }).check((argv) => {
+    const workspacesArg = argv.workspace;
+    if (!Array.isArray(workspacesArg)) {
+      return "Workspace must be an array";
+    }
+    const filtered = workspacesArg.filter(
+      (item) => item !== "api" && item !== "web" && item !== "packages/*"
+    );
+    if (filtered.length === 0) {
+      return true;
+    }
+    const workspaceNames = workspaces({ includePackages: true });
+    if (!workspacesArg.every((item) => workspaceNames.includes(item))) {
+      return c.error(`Unknown workspace(s) ${workspacesArg.join(" ")}`) + "\n\nValid values are: " + workspaceNames.join(", ");
+    }
+    return true;
   }).epilogue(
     `Also see the ${terminalLink(
       "CedarJS CLI Reference",

package/dist/commands/buildHandler.js

@@ -1,6 +1,7 @@
 import fs from "node:fs";
 import { createRequire } from "node:module";
 import path from "node:path";
+import concurrently from "concurrently";
 import execa from "execa";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
@@ -9,11 +10,12 @@ import { buildApi, cleanApiBuild } from "@cedarjs/internal/dist/build/api";
 import { generate } from "@cedarjs/internal/dist/generate/generate";
 import { loadAndValidateSdls } from "@cedarjs/internal/dist/validateSchema";
 import { detectPrerenderRoutes } from "@cedarjs/prerender/detection";
-import { timedTelemetry } from "@cedarjs/telemetry";
+import { timedTelemetry, errorTelemetry } from "@cedarjs/telemetry";
+import { exitWithError } from "../lib/exit.js";
 import { generatePrismaCommand } from "../lib/generatePrismaClient.js";
 import { getPaths, getConfig } from "../lib/index.js";
 const handler = async ({
-  workspace = ["api", "web"],
+  workspace = ["api", "web", "packages/*"],
   verbose = false,
   prisma = true,
   prerender = true
@@ -32,6 +34,10 @@ const handler = async ({
   const prismaSchemaExists = fs.existsSync(cedarPaths.api.prismaConfig);
   const prerenderRoutes = prerender && workspace.includes("web") ? detectPrerenderRoutes() : [];
   const shouldGeneratePrismaClient = prisma && prismaSchemaExists && (workspace.includes("api") || prerenderRoutes.length > 0);
+  const packageJsonPath = path.join(cedarPaths.base, "package.json");
+  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
+  const packageJsonWorkspaces = packageJson.workspaces;
+  const restWorkspaces = Array.isArray(packageJsonWorkspaces) && packageJsonWorkspaces.length > 2 ? workspace.filter((w) => w !== "api" && w !== "web") : [];
   const gqlFeaturesTaskTitle = `Generating types needed for ${[
     useFragments && "GraphQL Fragments",
     useTrustedDocuments && "Trusted Documents"
@@ -47,6 +53,47 @@ const handler = async ({
         });
       }
     },
+    restWorkspaces.length > 0 && {
+      title: "Building Packages...",
+      task: async () => {
+        const globPattern = path.join(cedarPaths.packages, "*").replaceAll("\\", "/");
+        const allPackagePaths = await Array.fromAsync(
+          fs.promises.glob(globPattern)
+        );
+        const workspacePaths = restWorkspaces.some((w) => w === "packages/*") ? allPackagePaths : restWorkspaces.map((w) => {
+          const workspacePath = path.join(
+            cedarPaths.packages,
+            w.split("/").at(-1)
+          );
+          if (!fs.existsSync(workspacePath)) {
+            throw new Error(`Workspace not found: ${workspacePath}`);
+          }
+          return workspacePath;
+        });
+        const { result } = concurrently(
+          workspacePaths.map((workspacePath) => {
+            return {
+              command: `yarn build`,
+              name: workspacePath.split("/").at(-1),
+              cwd: workspacePath
+            };
+          }),
+          {
+            prefix: "{name} |",
+            timestampFormat: "HH:mm:ss"
+          }
+        );
+        await result.catch((e) => {
+          if (e?.message) {
+            errorTelemetry(
+              process.argv,
+              `Error concurrently building sides: ${e.message}`
+            );
+            exitWithError(e);
+          }
+        });
+      }
+    },
     // If using GraphQL Fragments or Trusted Documents, then we need to use
     // codegen to generate the types needed for possible types and the trusted
     // document store hashes

package/dist/lib/project.js

@@ -5,17 +5,31 @@ const isTypeScriptProject = () => {
   const paths = getPaths();
   return fs.existsSync(path.join(paths.web.base, "tsconfig.json")) || fs.existsSync(path.join(paths.api.base, "tsconfig.json"));
 };
-const workspaces = () => {
-  const paths = getPaths();
+function workspaces({ includePackages = false } = {}) {
+  const cedarPaths = getPaths();
   let workspaces2 = [];
-  if (fs.existsSync(path.join(paths.web.base, "package.json"))) {
+  if (fs.existsSync(path.join(cedarPaths.web.base, "package.json"))) {
     workspaces2 = [...workspaces2, "web"];
   }
-  if (fs.existsSync(path.join(paths.api.base, "package.json"))) {
+  if (fs.existsSync(path.join(cedarPaths.api.base, "package.json"))) {
     workspaces2 = [...workspaces2, "api"];
   }
+  if (includePackages) {
+    const globPattern = path.join(cedarPaths.packages, "*").replaceAll("\\", "/");
+    const allPackagePaths = fs.globSync(globPattern);
+    workspaces2 = [
+      ...workspaces2,
+      "packages/*",
+      ...allPackagePaths.map((p) => p.split("/").at(-1)),
+      ...allPackagePaths.map((p) => p.split("/").slice(-2).join("/")),
+      ...allPackagePaths.map((p) => {
+        const packageJsonPath = path.join(p, "package.json");
+        return JSON.parse(fs.readFileSync(packageJsonPath, "utf8")).name;
+      })
+    ];
+  }
   return workspaces2;
-};
+}
 const serverFileExists = () => {
   const serverFilePath = path.join(
     getPaths().api.src,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "1.0.0-canary.13112+0d25e39c5",
+  "version": "1.0.0-canary.13113+fd8038658",
   "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.13112",
-    "@cedarjs/cli-helpers": "1.0.0-canary.13112",
-    "@cedarjs/fastify-web": "1.0.0-canary.13112",
-    "@cedarjs/internal": "1.0.0-canary.13112",
-    "@cedarjs/prerender": "1.0.0-canary.13112",
-    "@cedarjs/project-config": "1.0.0-canary.13112",
-    "@cedarjs/structure": "1.0.0-canary.13112",
-    "@cedarjs/telemetry": "1.0.0-canary.13112",
-    "@cedarjs/web-server": "1.0.0-canary.13112",
+    "@cedarjs/api-server": "1.0.0-canary.13113",
+    "@cedarjs/cli-helpers": "1.0.0-canary.13113",
+    "@cedarjs/fastify-web": "1.0.0-canary.13113",
+    "@cedarjs/internal": "1.0.0-canary.13113",
+    "@cedarjs/prerender": "1.0.0-canary.13113",
+    "@cedarjs/project-config": "1.0.0-canary.13113",
+    "@cedarjs/structure": "1.0.0-canary.13113",
+    "@cedarjs/telemetry": "1.0.0-canary.13113",
+    "@cedarjs/web-server": "1.0.0-canary.13113",
     "@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": "0d25e39c56d22b027dc3851262aa05c1b775d059"
+  "gitHead": "fd8038658b10f1f7cc7c6d9b5ea5e1e6f47350f8"
 }