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

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "7.0.0-canary.3108",
+  "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.3108",
-    "@cedarjs/babel-config": "7.0.0-canary.3108",
-    "@cedarjs/cli-helpers": "7.0.0-canary.3108",
-    "@cedarjs/internal": "7.0.0-canary.3108",
-    "@cedarjs/prerender": "7.0.0-canary.3108",
-    "@cedarjs/project-config": "7.0.0-canary.3108",
-    "@cedarjs/structure": "7.0.0-canary.3108",
-    "@cedarjs/telemetry": "7.0.0-canary.3108",
-    "@cedarjs/utils": "7.0.0-canary.3108",
-    "@cedarjs/vite": "7.0.0-canary.3108",
-    "@cedarjs/web-server": "7.0.0-canary.3108",
+    "@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.3108",
+    "@cedarjs/framework-tools": "7.0.0-canary.3110",
     "@prisma/dmmf": "7.10.0",
     "@types/archiver": "^7.0.0",
     "memfs": "4.68.2",