@actuate-media/cli 0.4.1 → 0.5.0

package/src/__tests__/seed.test.ts

@@ -1,17 +1,17 @@
-import { afterEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, describe, expect, it, vi } from 'vitest'
 
 vi.mock('@actuate-media/cms-core', () => ({
   extractPlainText: vi.fn((value: string) => value.replace(/<[^>]+>/g, ' ')),
   hashContent: vi.fn(async () => 'hash-1'),
   sanitizeHtml: vi.fn((value: string) => value.replace(/<script[\s\S]*?<\/script>/gi, '')),
   createInitialAdmin: vi.fn(),
-}));
+}))
 
-import { createSeedDocument, ensureSeedAdmin, normalizeSeedPayload } from '../commands/seed.js';
+import { createSeedDocument, ensureSeedAdmin, normalizeSeedPayload } from '../commands/seed.js'
 
 afterEach(() => {
-  vi.unstubAllEnvs();
-});
+  vi.unstubAllEnvs()
+})
 
 describe('seed payload normalization', () => {
   it('separates globals from collection documents', () => {
@@ -30,38 +30,38 @@ describe('seed payload normalization', () => {
           },
         ],
       },
-    });
+    })
 
     expect(normalized.globals).toEqual([
       {
         slug: 'site-settings',
         data: { siteName: 'MaidPro', phone: '555-0100' },
       },
-    ]);
+    ])
     expect(normalized.documents).toEqual([
       {
         collection: 'pages',
         data: { title: 'Home', slug: 'home' },
         status: 'PUBLISHED',
       },
-    ]);
-  });
+    ])
+  })
 
   it('keeps backwards-compatible collection-key seed files', () => {
     const normalized = normalizeSeedPayload({
       pages: [{ title: 'Home', slug: 'home' }],
-    });
+    })
 
-    expect(normalized.globals).toEqual([]);
+    expect(normalized.globals).toEqual([])
     expect(normalized.documents).toEqual([
       {
         collection: 'pages',
         data: { title: 'Home', slug: 'home' },
         status: 'DRAFT',
       },
-    ]);
-  });
-});
+    ])
+  })
+})
 
 describe('seed admin handling', () => {
   it('refuses to create a first admin without credentials', async () => {
@@ -69,11 +69,11 @@ describe('seed admin handling', () => {
       user: {
         findFirst: vi.fn().mockResolvedValue(null),
       },
-    };
+    }
 
-    await expect(ensureSeedAdmin(db)).rejects.toThrow('CMS_ADMIN_EMAIL and CMS_ADMIN_PASSWORD');
-  });
-});
+    await expect(ensureSeedAdmin(db)).rejects.toThrow('CMS_ADMIN_EMAIL and CMS_ADMIN_PASSWORD')
+  })
+})
 
 describe('seed document creation', () => {
   it('creates documents with versions, content hashes, and sanitized HTML', async () => {
@@ -84,10 +84,10 @@ describe('seed document creation', () => {
       version: {
         create: vi.fn(),
       },
-    };
+    }
     const db = {
       $transaction: vi.fn(async (fn) => fn(tx)),
-    };
+    }
 
     await createSeedDocument(db, 'admin-1', {
       collection: 'pages',
@@ -97,7 +97,7 @@ describe('seed document creation', () => {
         slug: 'home',
         content: '<p>Hello</p><script>alert(1)</script>',
       },
-    });
+    })
 
     expect(tx.document.create).toHaveBeenCalledWith({
       data: expect.objectContaining({
@@ -114,13 +114,13 @@ describe('seed document creation', () => {
           content: '<p>Hello</p>',
         }),
       }),
-    });
+    })
     expect(tx.version.create).toHaveBeenCalledWith({
       data: expect.objectContaining({
         documentId: 'doc-1',
         changedById: 'admin-1',
         changeType: 'CREATE',
       }),
-    });
-  });
-});
+    })
+  })
+})

package/src/commands/db-init.ts

@@ -1,384 +1,211 @@
-import { Command } from "commander";
-import { readFile, writeFile, access } from "node:fs/promises";
-import { resolve, join } from "node:path";
-import { execSync, type ExecSyncOptions } from "node:child_process";
-import ora from "ora";
-import { logger } from "../utils/logger.js";
+import { Command } from 'commander'
+import { readFile, writeFile, access } from 'node:fs/promises'
+import { resolve, join, dirname } from 'node:path'
+import { createRequire } from 'node:module'
+import { execSync, type ExecSyncOptions } from 'node:child_process'
+import ora from 'ora'
+import { logger } from '../utils/logger.js'
 
-const CMS_SCHEMA_MARKER = "// ── Actuate CMS models";
+const CMS_SCHEMA_MARKER = '// ── Actuate CMS models'
+
+const require = createRequire(import.meta.url)
 
 export let runDbInitCommand = (command: string, options: ExecSyncOptions): void => {
-  execSync(command, options);
-};
+  execSync(command, options)
+}
 
-const defaultDbInitCommandRunner = runDbInitCommand;
+const defaultDbInitCommandRunner = runDbInitCommand
 
 export function setDbInitCommandRunner(runner: typeof runDbInitCommand): void {
-  runDbInitCommand = runner;
+  runDbInitCommand = runner
 }
 
 export function resetDbInitCommandRunner(): void {
-  runDbInitCommand = defaultDbInitCommandRunner;
-}
-
-async function fileExists(filePath: string): Promise<boolean> {
+  runDbInitCommand = defaultDbInitCommandRunner
+}
+
+/**
+ * Reads the canonical Prisma schema shipped by the installed
+ * `@actuate-media/cms-core` package. This is the single source of truth — it has
+ * the correct `@@map("actuate_*")` table names and every model the API handlers
+ * expect. Previously `db:init` injected a hand-maintained copy that drifted
+ * (missing `@@map`, missing models), producing a database the runtime couldn't
+ * query. Overridable for tests.
+ */
+export let readCanonicalCmsSchema = async (): Promise<string | null> => {
+  const candidates: string[] = []
   try {
-    await access(filePath);
-    return true;
+    // `./prisma/schema` is an exported subpath, so this resolves inside the
+    // package's `prisma/` directory without depending on the build output.
+    const exported = require.resolve('@actuate-media/cms-core/prisma/schema')
+    candidates.push(join(dirname(exported), 'schema.prisma'))
   } catch {
-    return false;
+    /* exports map missing the subpath — fall through to the main entry */
+  }
+  try {
+    const mainEntry = require.resolve('@actuate-media/cms-core')
+    candidates.push(join(dirname(mainEntry), '..', 'prisma', 'schema.prisma'))
+  } catch {
+    /* package not installed */
   }
-}
-
-function getCmsSchemaFragment(): string {
-  return `
-// ── Actuate CMS models ─────────────────────────────────────────────────────
-// Auto-injected by \`actuate db:init\`. Do not remove this marker comment.
-// Schema version: 1
-
-enum DocumentStatus {
-  DRAFT
-  PUBLISHED
-  ARCHIVED
-  SCHEDULED
-}
-
-model User {
-  id            String    @id @default(cuid())
-  email         String    @unique
-  name          String    @default("")
-  role          String    @default("EDITOR")
-  passwordHash  String?
-  isActive      Boolean   @default(true)
-  isApproved    Boolean   @default(false)
-  emailVerified Boolean   @default(false)
-  totpEnabled   Boolean   @default(false)
-  totpSecret    String?
-  backupCodes   Json?
-  oauthProvider String?
-  oauthId       String?
-  createdAt     DateTime  @default(now())
-  updatedAt     DateTime  @updatedAt
-
-  sessions          Session[]
-  documentsCreated  Document[] @relation("DocumentCreatedBy")
-  documentsUpdated  Document[] @relation("DocumentUpdatedBy")
-  documentsReviewed Document[] @relation("DocumentReviewer")
-  versions          Version[]
-  mediaUploaded     Media[]    @relation("MediaUploadedBy")
-  auditLogs         AuditLog[]
-
-  @@index([role])
-  @@index([isActive])
-}
-
-model Session {
-  id        String    @id @default(cuid())
-  userId    String
-  user      User      @relation(fields: [userId], references: [id], onDelete: Cascade)
-  token     String?   @unique
-  expiresAt DateTime
-  revokedAt DateTime?
-  ipAddress String?
-  userAgent String?
-  createdAt DateTime  @default(now())
-
-  @@index([userId])
-  @@index([expiresAt])
-}
-
-model Document {
-  id                   String          @id @default(cuid())
-  collection           String
-  slug                 String?
-  title                String?
-  data                 Json
-  status               DocumentStatus  @default(DRAFT)
-  plainText            String?         @db.Text
-  locale               String?
-  folderId             String?
-  structuredData       Json?
-  workflowStage        String?
-  reviewerId           String?
-  reviewNote           String?         @db.Text
-  publishedAt          DateTime?
-  scheduledAt          DateTime?
-  scheduledUnpublishAt DateTime?
-  deletedAt            DateTime?
-  contentHash          String?
-  siteId               String?
-  templateId           String?
-  createdById          String
-  updatedById          String
-  createdAt            DateTime        @default(now())
-  updatedAt            DateTime        @updatedAt
-
-  createdBy       User             @relation("DocumentCreatedBy", fields: [createdById], references: [id], onDelete: Restrict)
-  updatedBy       User             @relation("DocumentUpdatedBy", fields: [updatedById], references: [id], onDelete: Restrict)
-  reviewer        User?            @relation("DocumentReviewer", fields: [reviewerId], references: [id], onDelete: SetNull)
-  folder          Folder?          @relation(fields: [folderId], references: [id], onDelete: SetNull)
-  versions        Version[]
-  formSubmissions FormSubmission[]
-
-  @@unique([collection, slug], name: "collection_slug")
-  @@index([collection])
-  @@index([status])
-  @@index([deletedAt])
-  @@index([publishedAt])
-  @@index([folderId])
-  @@index([locale])
-  @@index([scheduledAt])
-  @@index([scheduledUnpublishAt])
-  @@index([createdById])
-  @@index([updatedById])
-}
-
-model Media {
-  id           String   @id @default(cuid())
-  filename     String
-  storageKey   String   @unique
-  mimeType     String
-  fileSize     Int
-  width        Int?
-  height       Int?
-  altText      String?
-  title        String?
-  blurHash     String?
-  focalPointX  Float?
-  focalPointY  Float?
-  folderId     String?
-  uploadedById String
-  createdAt    DateTime @default(now())
-  updatedAt    DateTime @updatedAt
-
-  uploadedBy User    @relation("MediaUploadedBy", fields: [uploadedById], references: [id], onDelete: Restrict)
-  folder     Folder? @relation(fields: [folderId], references: [id], onDelete: SetNull)
-
-  @@index([folderId])
-  @@index([mimeType])
-  @@index([createdAt])
-}
-
-model Version {
-  id          String   @id @default(cuid())
-  documentId  String
-  document    Document @relation(fields: [documentId], references: [id], onDelete: Cascade)
-  data        Json
-  changedById String
-  changedBy   User     @relation(fields: [changedById], references: [id], onDelete: Restrict)
-  changeType  String   @default("UPDATE")
-  createdAt   DateTime @default(now())
-
-  @@index([documentId])
-  @@index([createdAt])
-}
-
-model Folder {
-  id        String   @id @default(cuid())
-  name      String
-  scope     String
-  parentId  String?
-  position  Int      @default(0)
-  createdAt DateTime @default(now())
-
-  parent    Folder?    @relation("FolderTree", fields: [parentId], references: [id], onDelete: Cascade)
-  children  Folder[]   @relation("FolderTree")
-  documents Document[]
-  media     Media[]
-
-  @@index([scope])
-  @@index([parentId])
-  @@index([scope, parentId, position])
-}
-
-model Redirect {
-  id          String   @id @default(cuid())
-  source      String
-  destination String
-  statusCode  Int      @default(301)
-  isRegex     Boolean  @default(false)
-  notes       String?
-  createdAt   DateTime @default(now())
-  updatedAt   DateTime @updatedAt
 
-  @@unique([source])
-  @@index([createdAt])
+  for (const candidate of candidates) {
+    try {
+      return await readFile(candidate, 'utf-8')
+    } catch {
+      /* try the next candidate */
+    }
+  }
+  return null
 }
 
-model FormSubmission {
-  id           String   @id @default(cuid())
-  formId       String
-  form         Document @relation(fields: [formId], references: [id], onDelete: Cascade)
-  data         Json
-  attribution  Json?
-  submittedAt  DateTime @default(now())
-  createdAt    DateTime @default(now())
+const defaultSchemaReader = readCanonicalCmsSchema
 
-  @@index([formId])
-  @@index([submittedAt])
-  @@index([createdAt])
+export function setCanonicalSchemaReader(reader: typeof readCanonicalCmsSchema): void {
+  readCanonicalCmsSchema = reader
 }
 
-model AuditLog {
-  id        String   @id @default(cuid())
-  event     String
-  userId    String?
-  user      User?    @relation(fields: [userId], references: [id], onDelete: SetNull)
-  details   Json?
-  ipAddress String?
-  userAgent String?
-  createdAt DateTime @default(now())
-
-  @@index([event])
-  @@index([userId])
-  @@index([createdAt])
+export function resetCanonicalSchemaReader(): void {
+  readCanonicalCmsSchema = defaultSchemaReader
 }
 
-model PasswordResetToken {
-  id        String    @id @default(cuid())
-  userId    String
-  tokenHash String
-  expiresAt DateTime
-  usedAt    DateTime?
-  createdAt DateTime  @default(now())
-
-  @@index([tokenHash])
-  @@index([userId])
+function netBraces(line: string): number {
+  return (line.match(/\{/g)?.length ?? 0) - (line.match(/\}/g)?.length ?? 0)
 }
 
-model MediaUsage {
-  id          String   @id @default(cuid())
-  mediaId     String
-  documentId  String
-  fieldPath   String?
-  createdAt   DateTime @default(now())
+/**
+ * Strips the top-level `generator` and `datasource` blocks from a full Prisma
+ * schema, leaving only the `enum` and `model` definitions. The consumer keeps
+ * their own datasource/generator; we only contribute models.
+ */
+export function extractModelsFragment(fullSchema: string): string {
+  const lines = fullSchema.split(/\r?\n/)
+  const kept: string[] = []
+  let skipping = false
+  let depth = 0
 
-  @@unique([mediaId, documentId, fieldPath])
-  @@index([mediaId])
-  @@index([documentId])
-}
-
-model ScriptTag {
-  id          String   @id @default(cuid())
-  name        String
-  code        String   @db.Text
-  placement   String
-  scope       String
-  targetPaths String[]
-  priority    Int      @default(100)
-  enabled     Boolean  @default(true)
-  createdAt   DateTime @default(now())
-  updatedAt   DateTime @updatedAt
+  for (const line of lines) {
+    if (!skipping) {
+      if (/^\s*(generator|datasource)\s+[A-Za-z0-9_]+\s*\{/.test(line)) {
+        skipping = true
+        depth = netBraces(line)
+        if (depth <= 0) skipping = false
+        continue
+      }
+      kept.push(line)
+    } else {
+      depth += netBraces(line)
+      if (depth <= 0) skipping = false
+    }
+  }
 
-  @@index([enabled])
-  @@index([placement])
+  return kept.join('\n').trim()
 }
 
-model PageTemplate {
-  id          String   @id @default(cuid())
-  name        String
-  description String?
-  category    String   @default("content")
-  tree        Json
-  thumbnail   String?
-  builtIn     Boolean  @default(false)
-  createdAt   DateTime @default(now())
-  updatedAt   DateTime @updatedAt
+function wrapFragment(models: string): string {
+  return `
+${CMS_SCHEMA_MARKER} ─────────────────────────────────────────────────────────
+// Auto-injected by \`actuate db:init\` from the installed @actuate-media/cms-core
+// package's canonical prisma/schema.prisma (the single source of truth). Do not
+// edit by hand — re-run \`actuate db:init --force\` after upgrading cms-core.
 
-  @@index([category])
-  @@index([builtIn])
+${models}
+`
 }
 
-model SavedSection {
-  id          String   @id @default(cuid())
-  name        String
-  description String?
-  category    String   @default("content")
-  tree        Json
-  thumbnail   String?
-  usageCount  Int      @default(0)
-  createdAt   DateTime @default(now())
-  updatedAt   DateTime @updatedAt
-
-  @@index([category])
-}
-`;
+async function fileExists(filePath: string): Promise<boolean> {
+  try {
+    await access(filePath)
+    return true
+  } catch {
+    return false
+  }
 }
 
 export function registerDbInitCommand(program: Command): void {
   program
-    .command("db:init")
-    .description("Add Actuate CMS models to your Prisma schema and generate the client")
-    .option("--schema <path>", "Path to schema.prisma", "prisma/schema.prisma")
-    .option("--migrate", "Run prisma migrate dev after adding models")
-    .option("--force", "Overwrite existing CMS models if present")
+    .command('db:init')
+    .description('Add Actuate CMS models (from the installed cms-core) to your Prisma schema')
+    .option('--schema <path>', 'Path to schema.prisma', 'prisma/schema.prisma')
+    .option('--migrate', 'Run prisma migrate dev after adding models')
+    .option('--force', 'Overwrite existing CMS models if present')
     .action(async (opts: { schema: string; migrate?: boolean; force?: boolean }) => {
-      const schemaPath = resolve(process.cwd(), opts.schema);
+      const schemaPath = resolve(process.cwd(), opts.schema)
 
       if (!(await fileExists(schemaPath))) {
-        logger.error(`Schema file not found at ${schemaPath}`);
-        logger.info("Run `npx prisma init` first, or specify --schema <path>.");
-        process.exitCode = 1;
-        return;
+        logger.error(`Schema file not found at ${schemaPath}`)
+        logger.info('Run `npx prisma init` first, or specify --schema <path>.')
+        process.exitCode = 1
+        return
       }
 
-      const spinner = ora("Reading Prisma schema...").start();
+      const spinner = ora('Reading canonical Actuate schema...').start()
+
+      const canonical = await readCanonicalCmsSchema()
+      if (!canonical) {
+        spinner.fail('Could not locate @actuate-media/cms-core.')
+        logger.info('Install it first: `npm install @actuate-media/cms-core`.')
+        process.exitCode = 1
+        return
+      }
+      const fragment = wrapFragment(extractModelsFragment(canonical))
 
-      let content: string;
+      spinner.text = 'Reading Prisma schema...'
+      let content: string
       try {
-        content = await readFile(schemaPath, "utf-8");
+        content = await readFile(schemaPath, 'utf-8')
       } catch (err) {
-        spinner.fail("Failed to read schema file.");
-        logger.error(err instanceof Error ? err.message : String(err));
-        process.exitCode = 1;
-        return;
+        spinner.fail('Failed to read schema file.')
+        logger.error(err instanceof Error ? err.message : String(err))
+        process.exitCode = 1
+        return
       }
 
       if (content.includes(CMS_SCHEMA_MARKER)) {
         if (!opts.force) {
-          spinner.info("Actuate CMS models already present in schema. Use --force to overwrite.");
-          return;
+          spinner.info('Actuate CMS models already present in schema. Use --force to overwrite.')
+          return
         }
-        spinner.text = "Removing existing CMS models...";
-        const markerIndex = content.indexOf(CMS_SCHEMA_MARKER);
-        content = content.substring(0, markerIndex).trimEnd() + "\n";
+        spinner.text = 'Removing existing CMS models...'
+        const markerIndex = content.indexOf(CMS_SCHEMA_MARKER)
+        content = content.substring(0, markerIndex).trimEnd() + '\n'
       }
 
-      spinner.text = "Adding Actuate CMS models...";
-      const updatedContent = content.trimEnd() + "\n" + getCmsSchemaFragment();
+      spinner.text = 'Adding Actuate CMS models...'
+      const updatedContent = content.trimEnd() + '\n' + fragment
 
       try {
-        await writeFile(schemaPath, updatedContent);
-        spinner.succeed("Actuate CMS models added to schema.");
+        await writeFile(schemaPath, updatedContent)
+        spinner.succeed('Actuate CMS models added to schema.')
       } catch (err) {
-        spinner.fail("Failed to write schema file.");
-        logger.error(err instanceof Error ? err.message : String(err));
-        process.exitCode = 1;
-        return;
+        spinner.fail('Failed to write schema file.')
+        logger.error(err instanceof Error ? err.message : String(err))
+        process.exitCode = 1
+        return
       }
 
-      const execOpts: ExecSyncOptions = { stdio: "inherit", cwd: process.cwd() };
+      const execOpts: ExecSyncOptions = { stdio: 'inherit', cwd: process.cwd() }
 
-      const genSpinner = ora("Running prisma generate...").start();
+      const genSpinner = ora('Running prisma generate...').start()
       try {
-        genSpinner.stop();
-        runDbInitCommand("npx prisma generate", execOpts);
-        logger.success("Prisma client generated.");
+        genSpinner.stop()
+        runDbInitCommand('npx prisma generate', execOpts)
+        logger.success('Prisma client generated.')
       } catch {
-        logger.warn("prisma generate failed. You may need to set DATABASE_URL first.");
+        logger.warn('prisma generate failed. You may need to set DATABASE_URL first.')
       }
 
       if (opts.migrate) {
-        const migSpinner = ora("Running prisma migrate dev...").start();
+        const migSpinner = ora('Running prisma migrate dev...').start()
         try {
-          migSpinner.stop();
-          runDbInitCommand("npx prisma migrate dev --name actuate-cms-init", execOpts);
-          logger.success("Migration created and applied.");
+          migSpinner.stop()
+          runDbInitCommand('npx prisma migrate dev --name actuate-cms-init', execOpts)
+          logger.success('Migration created and applied.')
         } catch {
-          logger.warn("prisma migrate dev failed. Run it manually after setting DATABASE_URL.");
+          logger.warn('prisma migrate dev failed. Run it manually after setting DATABASE_URL.')
         }
       } else {
-        logger.info("Run `npx prisma migrate dev --name actuate-cms` to create the migration.");
+        logger.info('Run `npx prisma migrate dev --name actuate-cms` to create the migration.')
       }
-    });
+    })
 }