@cedarjs/cli 7.0.0-canary.3107 → 7.0.0-canary.3110

package/dist/commands/setup/tenancy/schemaPrisma.js

@@ -58,13 +58,17 @@ function editSchema(schema, options) {
   if (!hasModel(schema, "User")) {
     throw new Error("CEDAR_TENANCY_ERR_NO_USER_MODEL");
   }
-  const modelsExist = hasModel(schema, "Organization") || hasModel(schema, "Membership");
-  const modelsAreThisCommands = schema.includes(ORGANIZATION_MODEL) && schema.includes(MEMBERSHIP_MODEL);
-  if (modelsExist && !modelsAreThisCommands && !options.force) {
-    throw new Error("CEDAR_TENANCY_ERR_MODELS_EXIST");
+  const organizationIsCustomized = hasModel(schema, "Organization") && !schema.includes(ORGANIZATION_MODEL);
+  const membershipIsCustomized = hasModel(schema, "Membership") && !schema.includes(MEMBERSHIP_MODEL);
+  const modelsCustomized = organizationIsCustomized || membershipIsCustomized;
+  if (modelsCustomized && !options.force) {
+    return { schema: addDataMigrationModel(schema), outcome: "skipped" };
   }
   const withTenancyModels = addTenancyModels(schema);
-  return addDataMigrationModel(withTenancyModels);
+  return {
+    schema: addDataMigrationModel(withTenancyModels),
+    outcome: modelsCustomized ? "forced" : "added"
+  };
 }
 export {
   MEMBERSHIP_MODEL,

package/dist/commands/setup/tenancy/templates/ensureDefaultOrganizations.dataMigration.ts.template

@@ -1,14 +1,13 @@
 import type { PrismaClient } from 'src/lib/db'
-
 import { ensureDefaultOrganization } from 'src/services/organizations/organizations'
 
 const BATCH_SIZE = 100
 
 /**
  * Existing users have no organization until this runs once: `setup tenancy`
- * only wires new signups (via the GraphQL `context` function and, for
- * dbAuth, the signup handler). Every user without a membership gets one, in
- * batches, using the same `ensureDefaultOrganization` new signups use.
+ * only wires new signups (via the GraphQL `context` function and, for dbAuth,
+ * the signup handler). Every user without a membership gets one, in batches,
+ * using the same `ensureDefaultOrganization` new signups use.
  *
  * Run with `__DATA_MIGRATE_UP_COMMAND__`, after
  * `__PRISMA_MIGRATE_DEV_COMMAND__` has applied the
@@ -16,8 +15,9 @@ const BATCH_SIZE = 100
  */
 export default async ({ db }: { db: PrismaClient }) => {
   let cursor: string | undefined
+  let hasMore = true
 
-  for (;;) {
+  while (hasMore) {
     const users = await db.user.findMany({
       take: BATCH_SIZE,
       orderBy: { id: 'asc' },
@@ -25,10 +25,6 @@ export default async ({ db }: { db: PrismaClient }) => {
       include: { memberships: { select: { id: true } } },
     })
 
-    if (users.length === 0) {
-      break
-    }
-
     for (const user of users) {
       if (user.memberships.length === 0) {
         await ensureDefaultOrganization({
@@ -37,10 +33,7 @@ export default async ({ db }: { db: PrismaClient }) => {
       }
     }
 
-    cursor = users[users.length - 1].id
-
-    if (users.length < BATCH_SIZE) {
-      break
-    }
+    cursor = users[users.length - 1]?.id
+    hasMore = users.length === BATCH_SIZE
   }
 }

package/dist/commands/setup/tenancy/tenancyHandler.js

@@ -22,7 +22,12 @@ import {
   hasWebAuthFile,
   noUserModelMessage
 } from "./preflight.js";
-import { editSchema, hasModel } from "./schemaPrisma.js";
+import {
+  editSchema,
+  hasModel,
+  MEMBERSHIP_MODEL,
+  ORGANIZATION_MODEL
+} from "./schemaPrisma.js";
 const DEFAULT_TENANT_FIELD = "organizationId";
 const AUTH_SNIPPET = `
   export const getCurrentUser = async (session) => {
@@ -104,12 +109,12 @@ const handler = async ({ tenantField, force }) => {
       },
       {
         title: "Adding Organization and Membership models to schema.prisma...",
-        task: async () => {
+        task: async (ctx, task) => {
           const schemaPath = await getSchemaPath(paths.api.prismaConfig);
           const schema = fs.readFileSync(schemaPath, "utf-8");
-          let updatedSchema;
+          let editResult;
           try {
-            updatedSchema = editSchema(schema, { force });
+            editResult = editSchema(schema, { force });
           } catch (e) {
             const message = e instanceof Error ? e.message : String(e);
             if (message === "CEDAR_TENANCY_ERR_NO_USER_MODEL") {
@@ -119,14 +124,20 @@ const handler = async ({ tenantField, force }) => {
                 `No \`User\` model found in schema.prisma. Set up authentication first (e.g. \`${authSetup}\`) before running \`${tenancySetup}\`.`
               );
             }
-            if (message === "CEDAR_TENANCY_ERR_MODELS_EXIST") {
-              throw new Error(
-                "`Organization` and/or `Membership` models already exist in schema.prisma. Re-run with --force to keep them as-is and continue with the rest of the setup."
-              );
-            }
             throw e;
           }
-          fs.writeFileSync(schemaPath, updatedSchema);
+          ctx.modelsExistOutcome = editResult.outcome;
+          fs.writeFileSync(schemaPath, editResult.schema);
+          if (editResult.outcome === "skipped") {
+            task.output = `\`Organization\` and/or \`Membership\` models already exist in schema.prisma and were left as-is. Add these fields and relations by hand so tenancy can use them:
+
+${ORGANIZATION_MODEL}
+
+${MEMBERSHIP_MODEL}
+
+Re-run with --force to have this command append its own versions beside them instead, so you can diff and merge rather than retype.`;
+            return;
+          }
           try {
             await runTransitiveBin(
               "prisma",
@@ -134,13 +145,21 @@ const handler = async ({ tenantField, force }) => {
               { cwd: paths.base }
             );
           } catch {
+            if (editResult.outcome === "forced") {
+              task.output = '`prisma format` failed because the appended Organization/Membership clash with your existing ones, as requested by --force. Continuing with the rest of the setup; see "Next steps" for how to merge them.';
+              return;
+            }
             throw new Error(
               "`prisma format` failed, so the `memberships` relation was not added to the `User` model. Add it by hand: `memberships Membership[]` as the last field of `model User { ... }`, then re-run this command."
             );
           }
           const membershipsOccurrences = (schema2) => (schema2.match(/memberships\s+Membership\[\]/g) ?? []).length;
           const formattedSchema = fs.readFileSync(schemaPath, "utf-8");
-          if (membershipsOccurrences(formattedSchema) <= membershipsOccurrences(updatedSchema)) {
+          if (membershipsOccurrences(formattedSchema) <= membershipsOccurrences(editResult.schema)) {
+            if (editResult.outcome === "forced") {
+              task.output = 'The `memberships` relation was not added to the `User` model, likely because of the clash from --force. Continuing with the rest of the setup; see "Next steps" for how to merge the appended models by hand.';
+              return;
+            }
             throw new Error(
               "`prisma format` did not add the `memberships` relation to the `User` model. Add it by hand: `memberships Membership[]` as the last field of `model User { ... }`, then re-run this command."
             );
@@ -340,17 +359,22 @@ ${SIGNUP_SNIPPET}`;
       },
       {
         title: "Next steps...",
-        task: (_ctx, task) => {
+        task: (ctx, task) => {
           const migrateCommand = formatCedarCommand([
             "prisma",
             "migrate",
             "dev"
           ]);
           const dataMigrateCommand = formatCedarCommand(["data-migrate", "up"]);
+          const modelsExistWarning = ctx.modelsExistOutcome === "forced" ? c.error(
+            "\nschema.prisma is currently invalid (as requested by --force): merge the appended Organization/Membership blocks with your existing ones, then run `prisma format`.\n"
+          ) : ctx.modelsExistOutcome === "skipped" ? c.warning(
+            "\nOrganization/Membership already existed and were left as-is: add the fields and relations printed above by hand before continuing.\n"
+          ) : "";
           task.title = `Next steps...
 
           ${c.success("\nMulti-tenancy configured!\n")}
-
+          ${modelsExistWarning}
           1. Run ${c.highlight(migrateCommand)} to create the Organization/Membership
              tables, then ${c.highlight(dataMigrateCommand)} to give every existing
              user a default organization.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "7.0.0-canary.3107",
+  "version": "7.0.0-canary.3110",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -36,17 +36,17 @@
     "@babel/preset-typescript": "7.29.7",
     "@babel/traverse": "7.29.8",
     "@babel/types": "7.29.8",
-    "@cedarjs/api-server": "7.0.0-canary.3107",
-    "@cedarjs/babel-config": "7.0.0-canary.3107",
-    "@cedarjs/cli-helpers": "7.0.0-canary.3107",
-    "@cedarjs/internal": "7.0.0-canary.3107",
-    "@cedarjs/prerender": "7.0.0-canary.3107",
-    "@cedarjs/project-config": "7.0.0-canary.3107",
-    "@cedarjs/structure": "7.0.0-canary.3107",
-    "@cedarjs/telemetry": "7.0.0-canary.3107",
-    "@cedarjs/utils": "7.0.0-canary.3107",
-    "@cedarjs/vite": "7.0.0-canary.3107",
-    "@cedarjs/web-server": "7.0.0-canary.3107",
+    "@cedarjs/api-server": "7.0.0-canary.3110",
+    "@cedarjs/babel-config": "7.0.0-canary.3110",
+    "@cedarjs/cli-helpers": "7.0.0-canary.3110",
+    "@cedarjs/internal": "7.0.0-canary.3110",
+    "@cedarjs/prerender": "7.0.0-canary.3110",
+    "@cedarjs/project-config": "7.0.0-canary.3110",
+    "@cedarjs/structure": "7.0.0-canary.3110",
+    "@cedarjs/telemetry": "7.0.0-canary.3110",
+    "@cedarjs/utils": "7.0.0-canary.3110",
+    "@cedarjs/vite": "7.0.0-canary.3110",
+    "@cedarjs/web-server": "7.0.0-canary.3110",
     "@listr2/prompt-adapter-enquirer": "4.3.1",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "1.30.1",
@@ -94,7 +94,7 @@
     "yargs": "17.7.3"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "7.0.0-canary.3107",
+    "@cedarjs/framework-tools": "7.0.0-canary.3110",
     "@prisma/dmmf": "7.10.0",
     "@types/archiver": "^7.0.0",
     "memfs": "4.68.2",