@beechcms/cli 0.6.0-preview.1 → 0.6.0-preview.3

package/src/lib/wrangler.ts

@@ -1,129 +1,129 @@
-// SPDX-License-Identifier: MIT
-// Copyright (c) 2024–2026 Flavio De Musso
-
-import { spawnSync, type SpawnSyncReturns } from 'node:child_process'
-import { writeFileSync, rmSync, existsSync, readFileSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join, resolve } from 'node:path'
-
-export interface WranglerOptions {
-  db: string
-  local: boolean
-  configPath: string | null
-}
-
-export interface D1Row {
-  [key: string]: unknown
-}
-
-interface WranglerResult {
-  results: D1Row[]
-  success: boolean
-  error?: string
-}
-
-function buildArgs(options: WranglerOptions): string[] {
-  const args: string[] = []
-  if (options.configPath) args.push('--config', options.configPath)
-  if (options.local) args.push('--local')
-  else args.push('--remote')
-  return args
-}
-
-/** Esegue SQL da file temporaneo via `wrangler d1 execute --file`. Returns true on success. */
-export function executeD1File(sql: string, options: WranglerOptions): boolean {
-  const tmpFile = join(tmpdir(), `beech-seed-${Date.now()}.sql`)
-  try {
-    writeFileSync(tmpFile, sql, 'utf-8')
-    const args = ['d1', 'execute', options.db, '--file', tmpFile, ...buildArgs(options)]
-    const result = spawnSync('npx', ['wrangler', ...args], { stdio: 'inherit', cwd: process.cwd(), shell: true })
-    return result.status === 0
-  } finally {
-    try { rmSync(tmpFile) } catch {}
-  }
-}
-
-/**
- * Esegue una query SQL e ritorna i risultati come array di oggetti (--json).
- *
- * Passa il SQL via file temporaneo (`--file`) anziché `--command`: su Windows,
- * `spawnSync` con `shell: true` non preserva le virgolette/spazi/virgole interni
- * a un argomento inline, e wrangler riceve il comando spezzato in token sciolti
- * ("Unknown arguments: name, FROM, sqlite_master, …"). Il file evita del tutto
- * il riquoting della shell — stesso approccio di `executeD1File`.
- */
-export function queryD1<T extends D1Row = D1Row>(sql: string, options: WranglerOptions): T[] {
-  const tmpFile = join(tmpdir(), `beech-query-${Date.now()}.sql`)
-  let result: SpawnSyncReturns<string>
-  try {
-    writeFileSync(tmpFile, sql, 'utf-8')
-    const args = ['d1', 'execute', options.db, '--file', tmpFile, '--json', ...buildArgs(options)]
-    result = spawnSync('npx', ['wrangler', ...args], { encoding: 'utf-8', cwd: process.cwd(), shell: true })
-  } finally {
-    try { rmSync(tmpFile) } catch {}
-  }
-
-  if (result.status !== 0) {
-    throw new Error(`wrangler d1 execute failed:\n${result.stderr}`)
-  }
-
-  try {
-    const parsed: WranglerResult[] = JSON.parse(result.stdout)
-    return (parsed[0]?.results ?? []) as T[]
-  } catch {
-    throw new Error(`Failed to parse wrangler JSON output:\n${result.stdout}`)
-  }
-}
-
-/** Trova il path di wrangler.jsonc risalendo l'albero da CWD fino alla root del filesystem. */
-export function findWranglerConfig(): string | null {
-  let dir = process.cwd()
-  while (true) {
-    for (const name of ['wrangler.jsonc', 'wrangler.json', 'wrangler.toml']) {
-      const p = resolve(dir, name)
-      if (existsSync(p)) return p
-    }
-    for (const name of ['wrangler.jsonc', 'wrangler.json', 'wrangler.toml']) {
-      const p = resolve(dir, 'apps', 'api', name)
-      if (existsSync(p)) return p
-    }
-    const parent = resolve(dir, '..')
-    if (parent === dir) break
-    dir = parent
-  }
-  return null
-}
-
-/** Wraps a string value in single quotes, escaping internal single quotes for SQL literals. */
-export function sqlQuote(value: string): string {
-  return `'${value.replace(/'/g, "''")}'`
-}
-
-/** Risolve il nome del database D1 da wrangler.jsonc (stripping JSONC comments). */
-export function resolveDbName(configPath: string | null): string {
-  if (!configPath) return 'beech-db'
-  try {
-    const raw = readFileSync(configPath, 'utf-8')
-    
-    if (configPath.endsWith('.toml')) {
-      // Basic regex-based TOML parsing for d1_databases
-      // Matches both [d1_databases] and [[d1_databases]]
-      const d1SectionMatch = raw.match(/\[\[?d1_databases\]\]?[\s\S]*?(?=\n\[|$)/)
-      if (d1SectionMatch) {
-        const section = d1SectionMatch[0]
-        const dbNameMatch = section.match(/database_name\s*=\s*["'](.+?)["']/)
-        if (dbNameMatch) return dbNameMatch[1]
-      }
-      return 'beech-db'
-    }
-
-    const stripped = raw
-      .replace(/\/\/[^\n]*/g, '')
-      .replace(/\/\*[\s\S]*?\*\//g, '')
-    const parsed = JSON.parse(stripped)
-    const bindings: { database_name?: string }[] = parsed?.d1_databases ?? []
-    return bindings[0]?.database_name ?? 'beech-db'
-  } catch {
-    return 'beech-db'
-  }
-}
+// SPDX-License-Identifier: MIT
+// Copyright (c) 2024–2026 Flavio De Musso
+
+import { spawnSync, type SpawnSyncReturns } from 'node:child_process'
+import { writeFileSync, rmSync, existsSync, readFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join, resolve } from 'node:path'
+
+export interface WranglerOptions {
+  db: string
+  local: boolean
+  configPath: string | null
+}
+
+export interface D1Row {
+  [key: string]: unknown
+}
+
+interface WranglerResult {
+  results: D1Row[]
+  success: boolean
+  error?: string
+}
+
+function buildArgs(options: WranglerOptions): string[] {
+  const args: string[] = []
+  if (options.configPath) args.push('--config', options.configPath)
+  if (options.local) args.push('--local')
+  else args.push('--remote')
+  return args
+}
+
+/** Esegue SQL da file temporaneo via `wrangler d1 execute --file`. Returns true on success. */
+export function executeD1File(sql: string, options: WranglerOptions): boolean {
+  const tmpFile = join(tmpdir(), `beech-seed-${Date.now()}.sql`)
+  try {
+    writeFileSync(tmpFile, sql, 'utf-8')
+    const args = ['d1', 'execute', options.db, '--file', tmpFile, ...buildArgs(options)]
+    const result = spawnSync('npx', ['wrangler', ...args], { stdio: 'inherit', cwd: process.cwd(), shell: true })
+    return result.status === 0
+  } finally {
+    try { rmSync(tmpFile) } catch {}
+  }
+}
+
+/**
+ * Esegue una query SQL e ritorna i risultati come array di oggetti (--json).
+ *
+ * Passa il SQL via file temporaneo (`--file`) anziché `--command`: su Windows,
+ * `spawnSync` con `shell: true` non preserva le virgolette/spazi/virgole interni
+ * a un argomento inline, e wrangler riceve il comando spezzato in token sciolti
+ * ("Unknown arguments: name, FROM, sqlite_master, …"). Il file evita del tutto
+ * il riquoting della shell — stesso approccio di `executeD1File`.
+ */
+export function queryD1<T extends D1Row = D1Row>(sql: string, options: WranglerOptions): T[] {
+  const tmpFile = join(tmpdir(), `beech-query-${Date.now()}.sql`)
+  let result: SpawnSyncReturns<string>
+  try {
+    writeFileSync(tmpFile, sql, 'utf-8')
+    const args = ['d1', 'execute', options.db, '--file', tmpFile, '--json', ...buildArgs(options)]
+    result = spawnSync('npx', ['wrangler', ...args], { encoding: 'utf-8', cwd: process.cwd(), shell: true })
+  } finally {
+    try { rmSync(tmpFile) } catch {}
+  }
+
+  if (result.status !== 0) {
+    throw new Error(`wrangler d1 execute failed:\n${result.stderr}`)
+  }
+
+  try {
+    const parsed: WranglerResult[] = JSON.parse(result.stdout)
+    return (parsed[0]?.results ?? []) as T[]
+  } catch {
+    throw new Error(`Failed to parse wrangler JSON output:\n${result.stdout}`)
+  }
+}
+
+/** Trova il path di wrangler.jsonc risalendo l'albero da CWD fino alla root del filesystem. */
+export function findWranglerConfig(): string | null {
+  let dir = process.cwd()
+  while (true) {
+    for (const name of ['wrangler.jsonc', 'wrangler.json', 'wrangler.toml']) {
+      const p = resolve(dir, name)
+      if (existsSync(p)) return p
+    }
+    for (const name of ['wrangler.jsonc', 'wrangler.json', 'wrangler.toml']) {
+      const p = resolve(dir, 'apps', 'api', name)
+      if (existsSync(p)) return p
+    }
+    const parent = resolve(dir, '..')
+    if (parent === dir) break
+    dir = parent
+  }
+  return null
+}
+
+/** Wraps a string value in single quotes, escaping internal single quotes for SQL literals. */
+export function sqlQuote(value: string): string {
+  return `'${value.replace(/'/g, "''")}'`
+}
+
+/** Risolve il nome del database D1 da wrangler.jsonc (stripping JSONC comments). */
+export function resolveDbName(configPath: string | null): string {
+  if (!configPath) return 'beech-db'
+  try {
+    const raw = readFileSync(configPath, 'utf-8')
+    
+    if (configPath.endsWith('.toml')) {
+      // Basic regex-based TOML parsing for d1_databases
+      // Matches both [d1_databases] and [[d1_databases]]
+      const d1SectionMatch = raw.match(/\[\[?d1_databases\]\]?[\s\S]*?(?=\n\[|$)/)
+      if (d1SectionMatch) {
+        const section = d1SectionMatch[0]
+        const dbNameMatch = section.match(/database_name\s*=\s*["'](.+?)["']/)
+        if (dbNameMatch) return dbNameMatch[1]
+      }
+      return 'beech-db'
+    }
+
+    const stripped = raw
+      .replace(/\/\/[^\n]*/g, '')
+      .replace(/\/\*[\s\S]*?\*\//g, '')
+    const parsed = JSON.parse(stripped)
+    const bindings: { database_name?: string }[] = parsed?.d1_databases ?? []
+    return bindings[0]?.database_name ?? 'beech-db'
+  } catch {
+    return 'beech-db'
+  }
+}

package/src/test/reset.test.ts

@@ -0,0 +1,128 @@
+// SPDX-License-Identifier: MIT
+// Copyright (c) 2024–2026 Flavio De Musso
+
+import { describe, it, expect, vi, beforeEach } from 'vitest'
+import { reset } from '../commands/reset.js'
+import { spawnSync } from 'node:child_process'
+import { existsSync } from 'node:fs'
+
+vi.mock('node:child_process', () => ({
+  spawnSync: vi.fn(() => ({ status: 0 })),
+}))
+
+vi.mock('node:fs', () => ({
+  existsSync: vi.fn(),
+  rmSync: vi.fn(),
+  readFileSync: vi.fn(() => '{}'),
+}))
+
+vi.mock('picocolors', () => ({
+  default: {
+    cyan: (s: string) => s,
+    dim: (s: string) => s,
+    green: (s: string) => s,
+    red: (s: string) => s,
+    yellow: (s: string) => s,
+  },
+}))
+
+describe('reset command', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    vi.mocked(spawnSync).mockImplementation(() => ({ status: 0 } as any))
+  })
+
+  it('runs docker compose down when --docker is passed and docker is running', async () => {
+    await reset({ docker: true })
+    expect(spawnSync).toHaveBeenCalledWith(
+      'docker',
+      ['compose', 'down', '-v'],
+      expect.any(Object)
+    )
+  })
+
+  it('does not run docker compose down when docker is not installed', async () => {
+    // Mock docker --version to fail
+    vi.mocked(spawnSync).mockImplementation((cmd: string, args?: any) => {
+      if (cmd === 'docker' && args && args[0] === '--version') {
+        return { status: 1 } as any
+      }
+      return { status: 0 } as any
+    })
+
+    const mockExit = vi.spyOn(process, 'exit').mockImplementation(() => undefined as never)
+    try {
+      await reset({ docker: true })
+      expect(spawnSync).not.toHaveBeenCalledWith(
+        'docker',
+        ['compose', 'down', '-v'],
+        expect.any(Object)
+      )
+      expect(mockExit).toHaveBeenCalledWith(1)
+    } finally {
+      mockExit.mockRestore()
+    }
+  })
+
+  it('does not run docker compose down when docker daemon is not running', async () => {
+    // Mock docker info to fail
+    vi.mocked(spawnSync).mockImplementation((cmd: string, args?: any) => {
+      if (cmd === 'docker' && args && args[0] === 'info') {
+        return { status: 1 } as any
+      }
+      return { status: 0 } as any
+    })
+
+    const mockExit = vi.spyOn(process, 'exit').mockImplementation(() => undefined as never)
+    try {
+      await reset({ docker: true })
+      expect(spawnSync).not.toHaveBeenCalledWith(
+        'docker',
+        ['compose', 'down', '-v'],
+        expect.any(Object)
+      )
+      expect(mockExit).toHaveBeenCalledWith(1)
+    } finally {
+      mockExit.mockRestore()
+    }
+  })
+
+  it('runs db reset using npm script when apps/api has package.json', async () => {
+    vi.mocked(existsSync).mockImplementation((path: any) => {
+      if (typeof path === 'string' && path.includes('apps') && path.includes('package.json')) {
+        return true
+      }
+      return false
+    })
+
+    await reset({ db: true })
+    expect(spawnSync).toHaveBeenCalledWith(
+      'npm',
+      ['run', 'db:reset:local'],
+      expect.objectContaining({
+        cwd: expect.stringMatching(/apps[/\\]api/),
+      })
+    )
+  })
+
+  it('runs both docker and db when --all is passed', async () => {
+    vi.mocked(existsSync).mockImplementation((path: any) => {
+      if (typeof path === 'string' && path.includes('apps') && path.includes('package.json')) {
+        return true
+      }
+      return false
+    })
+
+    await reset({ all: true })
+    expect(spawnSync).toHaveBeenCalledWith(
+      'docker',
+      ['compose', 'down', '-v'],
+      expect.any(Object)
+    )
+    expect(spawnSync).toHaveBeenCalledWith(
+      'npm',
+      ['run', 'db:reset:local'],
+      expect.any(Object)
+    )
+  })
+})

package/src/test/seed-load.test.ts

@@ -0,0 +1,158 @@
+// SPDX-License-Identifier: MIT
+// Copyright (c) 2024–2026 Flavio De Musso
+
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
+import { sortSeedsByDependencies } from '@beechcms/core'
+import type { Seed } from '@beechcms/core'
+import { sqlQuote } from '../lib/wrangler.js'
+import { buildSeedRegistrationSql } from '../commands/seed-load.js'
+
+// These seeds declare articles BEFORE team (arbitrary user order in seed.ts)
+const TEAM_SEED: Seed = {
+  slug: 'team',
+  label: 'Team',
+  displayNameAlias: 'name',
+  branches: [{ alias: 'name', label: 'Name', type: 'text' }],
+} as Seed
+
+const ARTICLES_SEED: Seed = {
+  slug: 'articles',
+  label: 'Articles',
+  displayNameAlias: 'title',
+  branches: [
+    { alias: 'title', label: 'Title', type: 'text' },
+    { alias: 'author_id', label: 'Author', type: 'relation', targetSeed: 'team' },
+  ],
+} as Seed
+
+describe('sortSeedsByDependencies — topological ordering', () => {
+  it('puts team before articles even when articles is declared first', () => {
+    // articles declared first — arbitrary insertion order
+    const sorted = sortSeedsByDependencies([ARTICLES_SEED, TEAM_SEED])
+    const slugs = sorted.map(s => s.slug)
+    expect(slugs.indexOf('team')).toBeLessThan(slugs.indexOf('articles'))
+  })
+
+  it('preserves order for seeds with no relations', () => {
+    const a = { slug: 'a', label: 'A', displayNameAlias: 'x', branches: [{ alias: 'x', label: 'X', type: 'text' }] } as Seed
+    const b = { slug: 'b', label: 'B', displayNameAlias: 'x', branches: [{ alias: 'x', label: 'X', type: 'text' }] } as Seed
+    const sorted = sortSeedsByDependencies([a, b])
+    expect(sorted).toHaveLength(2)
+  })
+
+  it('throws on unknown targetSeed', () => {
+    const bad: Seed = {
+      slug: 'bad',
+      label: 'Bad',
+      displayNameAlias: 'title',
+      branches: [
+        { alias: 'title', label: 'Title', type: 'text' },
+        { alias: 'ref_id', label: 'Ref', type: 'relation', targetSeed: 'ghost' },
+      ],
+    } as Seed
+    expect(() => sortSeedsByDependencies([bad])).toThrow(/unknown target|ghost/)
+  })
+
+  it('throws on cyclic graph', () => {
+    const a = {
+      slug: 'a', label: 'A', displayNameAlias: 'x',
+      branches: [
+        { alias: 'x', label: 'X', type: 'text' },
+        { alias: 'b_id', label: 'B', type: 'relation', targetSeed: 'b' },
+      ],
+    } as Seed
+    const b = {
+      slug: 'b', label: 'B', displayNameAlias: 'x',
+      branches: [
+        { alias: 'x', label: 'X', type: 'text' },
+        { alias: 'a_id', label: 'A', type: 'relation', targetSeed: 'a' },
+      ],
+    } as Seed
+    expect(() => sortSeedsByDependencies([a, b])).toThrow(/[Cc]ycl/)
+  })
+})
+
+// ── sqlQuote ─────────────────────────────────────────────────────────────
+
+describe('sqlQuote', () => {
+  it('wraps value in single quotes', () => {
+    expect(sqlQuote('hello')).toBe("'hello'")
+  })
+
+  it("escapes internal single quotes by doubling them", () => {
+    expect(sqlQuote("it's")).toBe("'it''s'")
+  })
+
+  it('handles multiple single quotes', () => {
+    expect(sqlQuote("a'b'c")).toBe("'a''b''c'")
+  })
+
+  it('handles empty string', () => {
+    expect(sqlQuote('')).toBe("''")
+  })
+})
+
+// ── buildSeedRegistrationSql ─────────────────────────────────────────────
+
+describe('buildSeedRegistrationSql', () => {
+  const SIMPLE_SEED: Seed = {
+    slug: 'posts',
+    label: 'Posts',
+    displayNameAlias: 'title',
+    branches: [{ id: 'br_01', alias: 'title', label: 'Title', type: 'text' }],
+  } as Seed
+
+  it('produces INSERT … ON CONFLICT for the correct slug', () => {
+    const sql = buildSeedRegistrationSql(SIMPLE_SEED)
+    expect(sql).toContain("INSERT INTO seeds")
+    expect(sql).toContain("ON CONFLICT(slug) DO UPDATE SET")
+    expect(sql).toContain("'posts'")
+  })
+
+  it("sets source to 'code'", () => {
+    const sql = buildSeedRegistrationSql(SIMPLE_SEED)
+    expect(sql).toContain("'code'")
+  })
+
+  it('escapes single quotes in slug and JSON literal', () => {
+    const seedWithApostrophe: Seed = {
+      ...SIMPLE_SEED,
+      slug: "it's",
+      label: "It's",
+    }
+    const sql = buildSeedRegistrationSql(seedWithApostrophe)
+    // Slug value must have its single quote doubled
+    expect(sql).toContain("'it''s'")
+    // JSON label must also have its single quote doubled
+    expect(sql).toContain("It''s")
+  })
+
+  it('does not contain unescaped single quotes inside the JSON literal', () => {
+    const sql = buildSeedRegistrationSql(SIMPLE_SEED)
+    const jsonStart = sql.indexOf("VALUES (")
+    const jsonPart = sql.slice(jsonStart)
+    // Extract the JSON literal between the second pair of outer quotes
+    // Verify it round-trips back to the original seed
+    const inner = JSON.stringify(SIMPLE_SEED).replace(/'/g, "''")
+    expect(sql).toContain(inner)
+  })
+})
+
+// ── Dry-run output ordering ───────────────────────────────────────────────
+// Verify that seed-load uses sortSeedsByDependencies (not Object.values order)
+// by testing the pure function behavior that underpins it.
+
+describe('seed-load dry-run ordering contract', () => {
+  it('content_team CREATE TABLE appears before content_articles when articles declared first', () => {
+    // The dry-run loops over sortSeedsByDependencies(Object.values(registry)).
+    // We verify the sort result here — the integration is in seed-load.ts.
+    const registry = {
+      articles: ARTICLES_SEED, // declared first
+      team: TEAM_SEED,
+    }
+    const sorted = sortSeedsByDependencies(Object.values(registry))
+    const slugs = sorted.map(s => s.slug)
+    // team must come first so its CREATE TABLE is emitted before articles'
+    expect(slugs.indexOf('team')).toBeLessThan(slugs.indexOf('articles'))
+  })
+})