betterstart-cli 0.0.102 → 0.0.104

package/dist/assets/adapters/next/templates/init/lib/actions/webhooks/index.ts

@@ -1,8 +1,3 @@
-// Client-safe barrel: only types and server actions. Server-only modules are
-// imported by path — emitWebhookEvent from './dispatch' and
-// registerWebhookHooks from './register' — so client components can import
-// this barrel without pulling node:crypto into the bundle.
-
 export { createWebhook } from './create-webhook'
 export { deleteWebhook } from './delete-webhook'
 export { getWebhookDeliveries } from './get-webhook-deliveries'

package/dist/assets/adapters/next/templates/init/lib/actions/webhooks/send-test-webhook.ts

@@ -1,6 +1,7 @@
 'use server'
 
 import type { SendTestWebhookResult } from './types'
+import { recordWebhookDelivery } from '@admin/actions/webhooks/record-webhook-delivery'
 import { requireRole, UserRole } from '@admin/auth/middleware'
 import db from '@admin/db'
 import { webhooks } from '@admin/db/schema'
@@ -8,7 +9,6 @@ import { toActionError } from '@admin/utils/error/to-action-error'
 import { createWebhookEventId } from '@admin/utils/webhook/create-webhook-event-id'
 import { signWebhookPayload } from '@admin/utils/webhook/sign-webhook-payload'
 import { eq } from 'drizzle-orm'
-import { recordWebhookDelivery } from './dispatch'
 
 const TEST_REQUEST_TIMEOUT_MS = 10_000
 

package/dist/assets/adapters/next/templates/renderers/commands/init/banner-art.ts

@@ -0,0 +1,7 @@
+export function renderInitBannerArt(): string {
+  return `
+▄   ▗ ▗     ▄▖▗     ▗
+▙▘█▌▜▘▜▘█▌▛▘▚ ▜▘▀▌▛▘▜▘
+▙▘▙▖▐▖▐▖▙▖▌ ▄▌▐▖█▌▌ ▐▖
+    `
+}

package/dist/assets/adapters/next/templates/renderers/commands/init/verify-database-reachable.ts

@@ -0,0 +1,30 @@
+export function renderVerifyDatabaseReachableRequireFromProjectTemplate(): string {
+  return `
+const { createRequire } = require('node:module')
+const requireFromProject = createRequire(process.cwd() + '/package.json')
+const { Client } = requireFromProject('pg')
+const client = new Client({
+  connectionString: process.env.DATABASE_URL,
+  connectionTimeoutMillis: 10000
+})
+
+async function main() {
+  try {
+    await client.connect()
+    await client.query('select 1')
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error)
+    console.error('Database connection failed: ' + message)
+    process.exitCode = 1
+  } finally {
+    await client.end().catch(() => {})
+  }
+}
+
+main().catch((error) => {
+  const message = error instanceof Error ? error.message : String(error)
+  console.error('Database connection failed: ' + message)
+  process.exitCode = 1
+})
+`
+}

package/dist/assets/adapters/next/templates/renderers/commands/seed/build-seed-script.ts

@@ -0,0 +1,171 @@
+export function renderBuildSeedScriptEnvFileTemplate({
+  authBasePath
+}: {
+  authBasePath: string
+}): string {
+  return `/**
+ * AUTO-GENERATED by BetterStart — safe to delete after running.
+ */
+
+import { readFileSync } from 'node:fs'
+import { resolve } from 'node:path'
+
+// Parsed by hand to avoid a @next/env dependency in the generated project.
+for (const envFile of ['.env.local', '.env']) {
+  try {
+    const content = readFileSync(resolve(process.cwd(), envFile), 'utf-8')
+    for (const line of content.split('\\n')) {
+      const trimmed = line.trim()
+      if (!trimmed || trimmed.startsWith('#')) continue
+      const eqIdx = trimmed.indexOf('=')
+      if (eqIdx === -1) continue
+      const key = trimmed.slice(0, eqIdx).trim()
+      const val = trimmed.slice(eqIdx + 1).trim().replace(/^['"]|['"]$/g, '')
+      if (!process.env[key]) process.env[key] = val
+    }
+  } catch {}
+}
+
+import { drizzle } from 'drizzle-orm/postgres-js'
+import { eq } from 'drizzle-orm'
+import postgres from 'postgres'
+import * as schema from '../lib/db/schema'
+import { betterAuth } from 'better-auth'
+import { drizzleAdapter } from 'better-auth/adapters/drizzle'
+
+// Inline DB connection (mirrors generated lib/db/client.ts)
+const databaseUrl = process.env.DATABASE_URL
+if (!databaseUrl) {
+  throw new Error('DATABASE_URL is required')
+}
+
+const client = postgres(databaseUrl)
+const db = drizzle({ client, schema })
+
+// Inline auth setup (mirrors generated lib/actions/auth/server.ts)
+const auth = betterAuth({
+  secret: process.env.BETTERSTART_AUTH_SECRET,
+  baseURL: process.env.BETTERSTART_AUTH_URL,
+  basePath: process.env.BETTERSTART_AUTH_BASE_PATH || '${authBasePath}',
+  database: drizzleAdapter(db, {
+    provider: 'pg',
+    schema: {
+      user: schema.user,
+      session: schema.session,
+      account: schema.account,
+      verification: schema.verification,
+    },
+  }),
+  emailAndPassword: { enabled: true, minPasswordLength: 8 },
+  user: {
+    additionalFields: {
+      role: { type: 'string', required: false, defaultValue: 'member', input: false },
+    },
+  },
+})
+
+const CHECK_ADMIN_ONLY = process.env.SEED_CHECK_ADMIN === 'true'
+const OVERWRITE_MODE = process.env.SEED_OVERWRITE_MODE
+
+async function clearAuthorshipReferences(userId: string) {
+  for (const table of Object.values(schema)) {
+    if (!table || typeof table !== 'object') continue
+    const tableRef = table as unknown as Record<string, unknown>
+
+    if (tableRef.createdBy) {
+      await db
+        .update(table as never)
+        .set({ createdBy: null })
+        .where(eq(tableRef.createdBy as never, userId))
+    }
+
+    if (tableRef.updatedBy) {
+      await db
+        .update(table as never)
+        .set({ updatedBy: null })
+        .where(eq(tableRef.updatedBy as never, userId))
+    }
+  }
+}
+
+async function main() {
+  const existingAdmin = await db
+    .select({ id: schema.user.id, email: schema.user.email, name: schema.user.name })
+    .from(schema.user)
+    .where(eq(schema.user.role, 'admin'))
+    .then((rows: { id: string; email: string; name: string }[]) => rows[0])
+
+  if (CHECK_ADMIN_ONLY) {
+    if (existingAdmin) {
+      console.log(\`EXISTING_ADMIN:\${JSON.stringify(existingAdmin)}\`)
+      process.exit(3)
+    }
+    process.exit(0)
+  }
+
+  const EMAIL = process.env.SEED_EMAIL
+  const PASSWORD = process.env.SEED_PASSWORD
+  const NAME = process.env.SEED_NAME || 'Admin'
+
+  if (!EMAIL || !PASSWORD) {
+    console.error('  SEED_EMAIL and SEED_PASSWORD are required.')
+    process.exit(1)
+  }
+
+  const existingUser = await db
+    .select({ id: schema.user.id, name: schema.user.name })
+    .from(schema.user)
+    .where(eq(schema.user.email, EMAIL))
+    .then((rows: { id: string; name: string }[]) => rows[0])
+
+  const replaceTarget =
+    OVERWRITE_MODE === 'admin' ? existingAdmin : OVERWRITE_MODE === 'email' ? existingUser : undefined
+
+  if (existingUser && !replaceTarget) {
+    // Exit code 2 signals "user exists" to the CLI
+    console.log(\`EXISTING_USER:\${existingUser.name}\`)
+    process.exit(2)
+  }
+
+  if (replaceTarget) {
+    console.log(
+      OVERWRITE_MODE === 'admin'
+        ? '\\n  Replacing existing admin user...'
+        : '\\n  Replacing existing account...'
+    )
+    await clearAuthorshipReferences(replaceTarget.id)
+    // Remove existing account + session rows first (foreign key refs)
+    await db.delete(schema.session).where(eq(schema.session.userId, replaceTarget.id))
+    await db.delete(schema.account).where(eq(schema.account.userId, replaceTarget.id))
+    await db.delete(schema.user).where(eq(schema.user.id, replaceTarget.id))
+  } else {
+    console.log('\\n  Creating admin user...')
+  }
+
+  console.log(\`  Email: \${EMAIL}\\n\`)
+
+  const result = await auth.api.signUpEmail({
+    body: { email: EMAIL, password: PASSWORD, name: NAME },
+  })
+
+  if (!result?.user) {
+    console.error('  Failed to create user.')
+    process.exit(1)
+  }
+
+  await db
+    .update(schema.user)
+    .set({ role: 'admin' })
+    .where(eq(schema.user.id, result.user.id))
+
+  console.log(\`  Admin user \${replaceTarget ? 'replaced' : 'created'}: \${EMAIL}\`)
+  console.log('  Role: admin\\n')
+  process.exit(0)
+}
+
+main().catch((err) => {
+  console.error('  Seed failed:', err.message || err)
+  process.exit(1)
+})
+`
+}

package/dist/assets/adapters/next/templates/renderers/generators/actions/action-helpers/build-authorship-alias-block.ts

@@ -0,0 +1,4 @@
+export function renderBuildAuthorshipAliasBlockCreatedByUserTemplate(): string {
+  return `const createdByUser = alias(user, 'created_by_user')
+const updatedByUser = alias(user, 'updated_by_user')`
+}

package/dist/assets/adapters/next/templates/renderers/generators/actions/action-helpers/build-authorship-data-fields.ts

@@ -0,0 +1,4 @@
+export function renderBuildAuthorshipDataFieldsContentTemplate(): string {
+  return `  createdByUser: AdminUserSummary | null
+  updatedByUser: AdminUserSummary | null`
+}

package/dist/assets/adapters/next/templates/renderers/generators/actions/action-helpers/build-format-action-date-source.ts

@@ -0,0 +1,18 @@
+export function renderBuildFormatActionDateSourceDateTemplate({
+  optionsExportedExport
+}: {
+  optionsExportedExport: string
+}): string {
+  return `${optionsExportedExport}function formatActionDate(value: unknown): string {
+  if (typeof value !== 'string') return ''
+  const date = new Date(value)
+  if (Number.isNaN(date.getTime())) return ''
+
+  return date.toLocaleDateString('en-US', {
+    month: 'short',
+    day: '2-digit',
+    year: 'numeric',
+    timeZone: 'UTC'
+  })
+}`
+}

package/dist/assets/adapters/next/templates/renderers/generators/actions/action-helpers/build-read-select-option-type.ts

@@ -0,0 +1,6 @@
+export function renderBuildReadSelectOptionTypeComponentTemplate(): string {
+  return `export interface SelectOptionValue {
+  label: string
+  value: string
+}`
+}

package/dist/assets/adapters/next/templates/renderers/generators/actions/action-helpers/build-relationship-data-types.ts

@@ -0,0 +1,25 @@
+export function renderBuildRelationshipDataTypesComponentTemplate({
+  typeName
+}: {
+  typeName: string
+}): string {
+  return `export interface ${typeName} {
+  id: string
+  name?: string | null
+  email?: string | null
+}`
+}
+
+export function renderBuildRelationshipDataTypesComponentDetailsTemplate({
+  typeName
+}: {
+  typeName: string
+}): string {
+  return `export interface ${typeName} {
+  id: string
+  name?: string | null
+  title?: string | null
+  slug?: string | null
+  label?: string | null
+}`
+}

package/dist/assets/adapters/next/templates/renderers/generators/actions/action-helpers/build-result-mapping.ts

@@ -0,0 +1,62 @@
+export function renderBuildResultMappingResultTemplate({
+  plural,
+  rowDeclarations,
+  rowMappings
+}: {
+  plural: string
+  rowDeclarations: string
+  rowMappings: string
+}): string {
+  return `
+
+    const mapped${plural} = results.map((rawRow) => {
+      const row = rawRow as Record<string, unknown>
+${rowDeclarations}
+
+      return {
+${rowMappings}
+      }
+    })`
+}
+
+export function renderBuildResultMappingResultDetailsTemplate({
+  mapBlock,
+  plural,
+  singular,
+  camelPlural
+}: {
+  mapBlock: string
+  plural: string
+  singular: string
+  camelPlural: string
+}): string {
+  return `${mapBlock}
+
+    const populated${plural} = await Promise.all(
+      mapped${plural}.map(record => populate${singular}ListRelationships(record as ${singular}))
+    )
+
+    return {
+      ${camelPlural}: populated${plural},
+      total
+    }`
+}
+
+export function renderBuildResultMappingResultDetailsBranchTemplate({
+  mapBlock,
+  camelPlural,
+  plural,
+  singular
+}: {
+  mapBlock: string
+  camelPlural: string
+  plural: string
+  singular: string
+}): string {
+  return `${mapBlock}
+
+    return {
+      ${camelPlural}: mapped${plural} as unknown as ${singular}[],
+      total
+    }`
+}

package/dist/assets/adapters/next/templates/renderers/generators/actions/action-helpers/generate-populate-list-rels-function.ts

@@ -0,0 +1,50 @@
+export function renderPopulateListRelsFunctionResultTemplate({
+  v,
+  qListFieldName,
+  qRelFieldName,
+  qRelTable
+}: {
+  v: string
+  qListFieldName: string
+  qRelFieldName: string
+  qRelTable: string
+}): string {
+  return `  const ${v}Ids = record.${qListFieldName} && Array.isArray(record.${qListFieldName})
+    ? (record.${qListFieldName} as Record<string, unknown>[])
+        .map((item) => item.${qRelFieldName})
+        .filter((id) => id != null && id !== '')
+        .map((id) => String(id))
+    : []
+
+  const ${v}Results = ${v}Ids.length > 0
+    ? await db.select().from(${qRelTable}).where(inArray(${qRelTable}.id, ${v}Ids))
+    : []
+
+  const ${v}Map = new Map(${v}Results.map((r) => [r.id, r]))
+
+  if (record.${qListFieldName} && Array.isArray(record.${qListFieldName})) {
+    record.${qListFieldName} = (record.${qListFieldName} as Record<string, unknown>[]).map((item) => {
+      const relId = item.${qRelFieldName} ? String(item.${qRelFieldName}) : null
+      return {
+        ...item,
+        ${qRelFieldName}: relId ? ${v}Map.get(relId) || null : null
+      }
+    })
+  }`
+}
+
+export function renderPopulateListRelsFunctionContentTemplate({
+  singular,
+  join
+}: {
+  singular: string
+  join: string
+}): string {
+  return `
+async function populate${singular}ListRelationships(record: ${singular}): Promise<${singular}> {
+${join}
+
+  return record
+}
+`
+}

package/dist/assets/adapters/next/templates/renderers/generators/actions/entity-file-contents/build-restore-many-to-many-statements.ts

@@ -0,0 +1,27 @@
+export function renderBuildRestoreManyToManyStatementsValueTemplate({
+  fieldName,
+  junctionVar,
+  entityIdCol,
+  relSingular,
+  relIdCol
+}: {
+  fieldName: string
+  junctionVar: string
+  entityIdCol: string
+  relSingular: string
+  relIdCol: string
+}): string {
+  return `      const ${fieldName}Value = versionData.${fieldName}
+      const ${fieldName}Ids = Array.isArray(${fieldName}Value)
+        ? ${fieldName}Value.filter((id): id is string => typeof id === 'string')
+        : []
+      await tx.delete(${junctionVar}).where(eq(${junctionVar}.${entityIdCol}, versionRow.entityId))
+      if (${fieldName}Ids.length > 0) {
+        await tx.insert(${junctionVar}).values(
+          ${fieldName}Ids.map((${relSingular}Id) => ({
+            ${entityIdCol}: versionRow.entityId,
+            ${relIdCol}: ${relSingular}Id
+          }))
+        )
+      }`
+}

package/dist/assets/adapters/next/templates/renderers/generators/actions/entity-file-contents/build-select-option-types.ts

@@ -0,0 +1,37 @@
+export function renderBuildSelectOptionTypesComponentTemplate({
+  ctxSingular,
+  fieldNames,
+  ctxCamelSingular,
+  ctxPlural
+}: {
+  ctxSingular: string
+  fieldNames: string
+  ctxCamelSingular: string
+  ctxPlural: string
+}): string {
+  return `export type ${ctxSingular}SelectOptionFieldName = ${fieldNames}
+
+export interface ${ctxSingular}SelectOption {
+  id: string
+  fieldName: ${ctxSingular}SelectOptionFieldName
+  label: string
+  value: string
+  createdAt: string
+  updatedAt: string
+}
+
+export interface Create${ctxSingular}SelectOptionInput {
+  fieldName: ${ctxSingular}SelectOptionFieldName
+  label: string
+}
+
+export interface Create${ctxSingular}SelectOptionResult {
+  success: boolean
+  error?: string
+  option?: ${ctxSingular}SelectOption
+}
+
+export const ${ctxCamelSingular}SelectOptionsCacheTags = {
+  byField: (fieldName: ${ctxSingular}SelectOptionFieldName) => \`${ctxPlural}:select-options:\${fieldName}\`
+} as const`
+}

package/dist/assets/adapters/next/templates/renderers/generators/actions/entity-file-contents/gen-bulk-sort-order-content.ts

@@ -0,0 +1,93 @@
+export function renderGenBulkSortOrderContentServerActionTemplate({
+  ctxTableVar,
+  ctxCacheInvalidationFn,
+  ctxCamelPlural,
+  lifecycleHookImport,
+  ctxPlural,
+  reorderContext,
+  beforeHook,
+  afterHook
+}: {
+  ctxTableVar: string
+  ctxCacheInvalidationFn: string
+  ctxCamelPlural: string
+  lifecycleHookImport: string
+  ctxPlural: string
+  reorderContext: string
+  beforeHook: string
+  afterHook: string
+}): string {
+  return `'use server'
+
+import db from '@admin/db'
+import { requireRole, UserRole } from '@admin/auth/middleware'
+import { ${ctxTableVar} } from '@admin/db/schema'
+import { asc, eq, notInArray } from 'drizzle-orm'
+import { ${ctxCacheInvalidationFn} } from 'next/cache'
+import { ${ctxCamelPlural}CacheTags } from './types'
+${lifecycleHookImport}
+
+export async function bulkUpdate${ctxPlural}SortOrder(
+  updates: Array<{ id: string; sortOrder: number }>
+): Promise<{ success: boolean; error?: string }> {
+  const actor = await requireRole([UserRole.ADMIN, UserRole.EDITOR])
+  if (updates.length === 0) return { success: true }
+
+  const now = new Date().toISOString()
+  const auditRequestMetadata = await getAuditRequestMetadata()
+  const lifecycleContext = ${reorderContext}
+  ${beforeHook}
+
+  try {
+    const sorted = [...updates].sort((a, b) => a.sortOrder - b.sortOrder)
+    const updatedIds = sorted.map((u) => u.id)
+
+    const remaining = await db
+      .select({ id: ${ctxTableVar}.id })
+      .from(${ctxTableVar})
+      .where(updatedIds.length > 0 ? notInArray(${ctxTableVar}.id, updatedIds) : undefined)
+      .orderBy(asc(${ctxTableVar}.sortOrder))
+
+    const maxUpdatedPosition = Math.max(...sorted.map((u) => u.sortOrder))
+    const allIds: string[] = new Array(maxUpdatedPosition + 1 + remaining.length)
+
+    for (const u of sorted) {
+      allIds[u.sortOrder] = u.id
+    }
+
+    let fillIndex = 0
+    let remainingIndex = 0
+    while (fillIndex <= maxUpdatedPosition && remainingIndex < remaining.length) {
+      if (allIds[fillIndex] === undefined) {
+        allIds[fillIndex] = remaining[remainingIndex].id as string
+        remainingIndex++
+      }
+      fillIndex++
+    }
+    let appendIndex = maxUpdatedPosition + 1
+    while (remainingIndex < remaining.length) {
+      allIds[appendIndex] = remaining[remainingIndex].id as string
+      remainingIndex++
+      appendIndex++
+    }
+
+    const appliedOrder = allIds
+      .filter(Boolean)
+      .map((id, index) => ({ id, sortOrder: index }))
+
+    await Promise.all(
+      appliedOrder.map(({ id, sortOrder }) =>
+        db.update(${ctxTableVar}).set({ sortOrder }).where(eq(${ctxTableVar}.id, id))
+      )
+    )
+
+    ${ctxCacheInvalidationFn}(${ctxCamelPlural}CacheTags.all)
+    ${afterHook}
+    return { success: true }
+  } catch (error) {
+    console.error('Error bulk updating sort order:', error)
+    return { success: false, error: error instanceof Error ? error.message : 'Failed to bulk update sort order' }
+  }
+}
+`
+}