dexin-content 0.2.0 → 0.3.0

package/cli/main.ts

@@ -1,207 +1,197 @@
-#!/usr/bin/env tsx
-// ─────────────────────────────────────────────────────────────
-// dexin-content CLI main entry
-//
-// Modes:
-//   Single-file:  tsx cli/main.ts build <file.md> --domain lesson --out <path>
-//   Directory:    tsx cli/main.ts build <dir> --out <dir> [--manifest <path>]
-// ─────────────────────────────────────────────────────────────
-
-import { readFile, writeFile, mkdir } from 'node:fs/promises'
-import { existsSync } from 'node:fs'
-import { resolve, isAbsolute, dirname, basename } from 'node:path'
-
-import { DomainParserRegistry, compile } from '../core/compiler/compiler'
-import type { CompileInput } from '../core/compiler/compiler'
-import { lessonParser, buildLessonIdentity } from '../domains/lesson/index'
-import { documentParser, buildDocumentIdentity } from '../domains/document/index'
-import { flowBuild } from './build'
-import { flowPackage } from './package'
-
-type CmdArgs = Record<string, string | boolean>
-
-function parseArgs(argv: string[]): { command: string; args: CmdArgs; positionals: string[] } {
-  const command = argv[0] ?? ''
-  const positionals: string[] = []
-  const args: CmdArgs = {}
-  for (let i = 1; i < argv.length; i++) {
-    const a = argv[i]
-    if (a.startsWith('--')) {
-      const key = a.slice(2)
-      const next = argv[i + 1]
-      if (next && !next.startsWith('--')) {
-        args[key] = next; i++
-      } else {
-        args[key] = true
-      }
-    } else {
-      positionals.push(a)
-    }
-  }
-  return { command, args, positionals }
-}
-
-function printHelp() {
-  console.log(`dexin-content CLI — Independent content compilation tool
-
-Usage:
-  dexin-content <command> [options]   (npm bin; or locally: npx tsx cli/main.ts)
-
-Commands:
-  build    Compile markdown to artifacts
-  help     Show this help
-
-Build modes:
-  Single-file:
-    dexin-content build <file.md> --domain <lesson|document> --out <path>
-
-  Directory tree:
-    dexin-content build <dir> --out <dir> [--manifest <path>] [--lessons <dir>] [--documents <dir>]
-
-Options:
-  --domain <name>      Domain parser (lesson | document). Required for single-file mode.
-  --out <path>         Output path (file for single, directory for batch).
-  --manifest <path>    Content manifest JSON for packaging.
-  --lessons <dir>      Relative path to lessons directory (default: lessons).
-  --documents <dir>   Relative path to documents directory.
-`)
-}
-
-async function runSingleFile(filePath: string, domain: string, outPath?: string) {
-  const absPath = isAbsolute(filePath) ? filePath : resolve(filePath)
-  if (!existsSync(absPath)) {
-    console.error(`Error: file not found: ${absPath}`)
-    process.exit(1)
-  }
-
-  const source = await readFile(absPath, 'utf-8')
-  const relPath = basename(absPath)
-
-  const registry = new DomainParserRegistry()
-  registry.register(lessonParser)
-  registry.register(documentParser)
-
-  let identity: any
-  let fixture: string
-
-  if (domain === 'lesson') {
-    // Try to parse lesson identity from parent directories
-    const parent = dirname(absPath)
-    const grandParent = dirname(parent)
-    const topicSlug = basename(grandParent)
-    const chapterSlug = basename(parent)
-    const lessonSlug = basename(absPath).replace(/\.md$/, '')
-    fixture = `${topicSlug}/${chapterSlug}/${lessonSlug}`
-    identity = buildLessonIdentity(lessonSlug, topicSlug, chapterSlug, relPath)
-  } else if (domain === 'document') {
-    const slug = basename(absPath).replace(/\.md$/, '')
-    fixture = slug
-    identity = buildDocumentIdentity(slug, relPath)
-  } else {
-    console.error(`Error: unknown domain '${domain}'`)
-    process.exit(1)
-  }
-
-  const input: CompileInput = {
-    fixture,
-    domain,
-    identity,
-    source,
-    file: relPath
-  }
-
-  const result = compile(input, registry)
-
-  if (result.kind === 'error') {
-    const err = result.error
-    console.error(`Compile error: ${err?.code ?? 'UNKNOWN'} — ${err?.message ?? err}`)
-    process.exit(1)
-  }
-
-  const output = JSON.stringify(result.artifact, null, 2) + '\n'
-
-  if (outPath) {
-    const absOut = isAbsolute(outPath) ? outPath : resolve(outPath)
-    await mkdir(dirname(absOut), { recursive: true })
-    await writeFile(absOut, output, 'utf-8')
-    console.log(`Compiled ${fixture} → ${absOut}`)
-  } else {
-    process.stdout.write(output)
-  }
-}
-
-async function runDirectory(rootDir: string, args: CmdArgs) {
-  const root = isAbsolute(rootDir) ? rootDir : resolve(rootDir)
-  if (!existsSync(root)) {
-    console.error(`Error: directory not found: ${root}`)
-    process.exit(1)
-  }
-
-  const outDirRaw = args.out as string | undefined
-  const outDir = outDirRaw
-    ? (isAbsolute(outDirRaw) ? outDirRaw : resolve(outDirRaw))
-    : resolve(root, 'output', 'flow')
-
-  const registry = new DomainParserRegistry()
-  registry.register(lessonParser)
-  registry.register(documentParser)
-
-  const lessonResult = await flowBuild({
-    root,
-    lessonsDir: args.lessons as string | undefined,
-    documentDir: args.documents as string | undefined,
-    outDir,
-    domain: {
-      lesson: lessonParser,
-      document: documentParser,
-      buildLessonIdentity
-    }
-  })
-
-  console.log(`Build complete: ${lessonResult.compiled} artifacts in ${lessonResult.durationMs}ms`)
-
-  if (args.manifest) {
-    const manifestPath = isAbsolute(args.manifest as string)
-      ? args.manifest as string
-      : resolve(args.manifest as string)
-    const pkg = await flowPackage({
-      storeDir: outDir,
-      manifestPath,
-      outFile: resolve(outDir, 'manifest.json')
-    })
-    console.log(`Packaged manifest.json: ${pkg.lessons.length} lessons, ${pkg.pages.length} pages`)
-  }
-}
-
-// ── Main ──────────────────────────────────────────────────
-
-const { command, args, positionals } = parseArgs(process.argv.slice(2))
-
-if (command === 'help' || !command) {
-  printHelp()
-  process.exit(0)
-}
-
-if (command === 'build') {
-  const target = positionals[0]
-  if (!target) {
-    console.error('Error: missing target. Usage: build <file.md | directory>')
-    process.exit(1)
-  }
-
-  const isFile = target.endsWith('.md')
-  if (isFile) {
-    const domain = args.domain as string | undefined
-    if (!domain) {
-      console.error('Error: --domain required for single-file mode')
-      process.exit(1)
-    }
-    await runSingleFile(target, domain, args.out as string | undefined)
-  } else {
-    await runDirectory(target, args)
-  }
-} else {
-  console.error(`Unknown command: ${command}`)
-  printHelp()
-  process.exit(1)
-}
+#!/usr/bin/env tsx
+// ─────────────────────────────────────────────────────────────
+// dexin-content CLI main entry
+//
+// Modes:
+//   Single-file:  tsx cli/main.ts build <file.md> --domain lesson --out <path>
+//   Directory:    tsx cli/main.ts build <dir> --out <dir> [--manifest <path>]
+// ─────────────────────────────────────────────────────────────
+
+import { readFile, writeFile, mkdir } from 'node:fs/promises'
+import { existsSync } from 'node:fs'
+import { resolve, isAbsolute, dirname, basename } from 'node:path'
+
+import { DomainParserRegistry, compile } from '../core/compiler/compiler'
+import type { CompileInput } from '../core/compiler/compiler'
+import { lessonParser, buildLessonIdentity } from '../domains/lesson/index'
+import { flowBuild } from './build'
+import { flowPackage } from './package'
+
+type CmdArgs = Record<string, string | boolean>
+
+function parseArgs(argv: string[]): { command: string; args: CmdArgs; positionals: string[] } {
+  const command = argv[0] ?? ''
+  const positionals: string[] = []
+  const args: CmdArgs = {}
+  for (let i = 1; i < argv.length; i++) {
+    const a = argv[i]
+    if (a.startsWith('--')) {
+      const key = a.slice(2)
+      const next = argv[i + 1]
+      if (next && !next.startsWith('--')) {
+        args[key] = next; i++
+      } else {
+        args[key] = true
+      }
+    } else {
+      positionals.push(a)
+    }
+  }
+  return { command, args, positionals }
+}
+
+function printHelp() {
+  console.log(`dexin-content CLI — Independent content compilation tool
+
+Usage:
+  dexin-content <command> [options]   (npm bin; or locally: npx tsx cli/main.ts)
+
+Commands:
+  build    Compile markdown to artifacts
+  help     Show this help
+
+Build modes:
+  Single-file:
+    dexin-content build <file.md> --domain lesson --out <path>
+
+  Directory tree:
+    dexin-content build <dir> --out <dir> [--manifest <path>] [--lessons <dir>]
+
+Options:
+  --domain <name>      Domain parser (lesson). Required for single-file mode.
+  --out <path>         Output path (file for single, directory for batch).
+  --manifest <path>    Content manifest JSON for packaging.
+  --lessons <dir>      Relative path to lessons directory (default: lessons).
+`)
+}
+
+async function runSingleFile(filePath: string, domain: string, outPath?: string) {
+  const absPath = isAbsolute(filePath) ? filePath : resolve(filePath)
+  if (!existsSync(absPath)) {
+    console.error(`Error: file not found: ${absPath}`)
+    process.exit(1)
+  }
+
+  const source = await readFile(absPath, 'utf-8')
+  const relPath = basename(absPath)
+
+  const registry = new DomainParserRegistry()
+  registry.register(lessonParser)
+
+  let identity: any
+  let fixture: string
+
+  if (domain === 'lesson') {
+    // Try to parse lesson identity from parent directories
+    const parent = dirname(absPath)
+    const grandParent = dirname(parent)
+    const topicSlug = basename(grandParent)
+    const chapterSlug = basename(parent)
+    const lessonSlug = basename(absPath).replace(/\.md$/, '')
+    fixture = `${topicSlug}/${chapterSlug}/${lessonSlug}`
+    identity = buildLessonIdentity(lessonSlug, topicSlug, chapterSlug, relPath)
+  } else {
+    console.error(`Error: unknown domain '${domain}'`)
+    process.exit(1)
+  }
+
+  const input: CompileInput = {
+    fixture,
+    domain,
+    identity,
+    source,
+    file: relPath
+  }
+
+  const result = compile(input, registry)
+
+  if (result.kind === 'error') {
+    const err = result.error
+    console.error(`Compile error: ${err?.code ?? 'UNKNOWN'} — ${err?.message ?? err}`)
+    process.exit(1)
+  }
+
+  const output = JSON.stringify(result.artifact, null, 2) + '\n'
+
+  if (outPath) {
+    const absOut = isAbsolute(outPath) ? outPath : resolve(outPath)
+    await mkdir(dirname(absOut), { recursive: true })
+    await writeFile(absOut, output, 'utf-8')
+    console.log(`Compiled ${fixture} → ${absOut}`)
+  } else {
+    process.stdout.write(output)
+  }
+}
+
+async function runDirectory(rootDir: string, args: CmdArgs) {
+  const root = isAbsolute(rootDir) ? rootDir : resolve(rootDir)
+  if (!existsSync(root)) {
+    console.error(`Error: directory not found: ${root}`)
+    process.exit(1)
+  }
+
+  const outDirRaw = args.out as string | undefined
+  const outDir = outDirRaw
+    ? (isAbsolute(outDirRaw) ? outDirRaw : resolve(outDirRaw))
+    : resolve(root, 'output', 'flow')
+
+  const registry = new DomainParserRegistry()
+  registry.register(lessonParser)
+
+  const lessonResult = await flowBuild({
+    root,
+    lessonsDir: args.lessons as string | undefined,
+    outDir,
+    domain: {
+      lesson: lessonParser,
+      buildLessonIdentity
+    }
+  })
+
+  console.log(`Build complete: ${lessonResult.compiled} artifacts in ${lessonResult.durationMs}ms`)
+
+  if (args.manifest) {
+    const manifestPath = isAbsolute(args.manifest as string)
+      ? args.manifest as string
+      : resolve(args.manifest as string)
+    const pkg = await flowPackage({
+      storeDir: outDir,
+      manifestPath,
+      outFile: resolve(outDir, 'manifest.json')
+    })
+    console.log(`Packaged manifest.json: ${pkg.lessons.length} lessons, ${pkg.pages.length} pages`)
+  }
+}
+
+// ── Main ──────────────────────────────────────────────────
+
+const { command, args, positionals } = parseArgs(process.argv.slice(2))
+
+if (command === 'help' || !command) {
+  printHelp()
+  process.exit(0)
+}
+
+if (command === 'build') {
+  const target = positionals[0]
+  if (!target) {
+    console.error('Error: missing target. Usage: build <file.md | directory>')
+    process.exit(1)
+  }
+
+  const isFile = target.endsWith('.md')
+  if (isFile) {
+    const domain = args.domain as string | undefined
+    if (!domain) {
+      console.error('Error: --domain required for single-file mode')
+      process.exit(1)
+    }
+    await runSingleFile(target, domain, args.out as string | undefined)
+  } else {
+    await runDirectory(target, args)
+  }
+} else {
+  console.error(`Unknown command: ${command}`)
+  printHelp()
+  process.exit(1)
+}

package/core/artifact/store.ts

@@ -73,7 +73,7 @@ const defaultFsOps: FsOps = {
 
 /**
  * File-system Artifact Store.
- * Layout: <baseDir>/index.json + <baseDir>/lessons/<id>.json
+ * Layout: <baseDir>/index.json + <baseDir>/content/<id>.json
  * Docs are serialised via toCanonicalJSON (2-space, key-lexicographic,
  * LF, trailing newline) to match golden candidate form.
  */
@@ -82,7 +82,7 @@ export function createFsArtifactStore (
   fsOps: FsOps = defaultFsOps
 ): ArtifactStore {
   const idxPath = () => `${baseDir}/index.json`
-  const docPath = (id: string) => `${baseDir}/lessons/${id}.json`
+  const docPath = (id: string) => `${baseDir}/content/${id}.json`
 
   return {
     async writeIndex (index) {