@dboio/cli 0.9.6 → 0.10.1

package/README.md

@@ -169,9 +169,12 @@ All configuration is **directory-scoped**. Each project folder maintains its own
 | `cookies.txt` | Session cookie (Netscape format) | Gitignored (per-user) |
 | `structure.json` | Bin directory mapping (created by `dbo clone`) | Committable (shared) |
 | `metadata_templates.json` | Column templates per entity/descriptor (auto-generated by `dbo clone`) | Committable (shared) |
+| `.app_baseline.json` | App JSON baseline for delta detection (auto-generated by `dbo clone`) | Gitignored (per-machine) |
 
 `dbo init` automatically adds `.dbo/credentials.json`, `.dbo/cookies.txt`, `.dbo/config.local.json`, and `.dbo/ticketing.local.json` to `.gitignore` (creates the file if it doesn't exist).
 
+> **Upgrading from pre-0.9.9**: The baseline file `.app.json` in the project root has moved to `.dbo/.app_baseline.json`. Running any `dbo` command will auto-migrate the file. You can also manually remove the `.app.json` entry from your `.gitignore`.
+
 #### config.json reference
 
 ```json
@@ -248,7 +251,6 @@ bins/
 .dbo/              # DBO internal
 *.dboio.json       # Export files
 app.json           # Clone output
-.app.json          # Clone baseline
 dbo.deploy.json    # Deployment manifest
 .git/              # Version control
 .gitignore
@@ -572,6 +574,41 @@ The CLI handles leading `/` in metadata paths flexibly:
 
 This ensures compatibility with various path formats from the server while maintaining correct local file organization.
 
+#### Output hierarchy format
+
+Each root output record produces a **single compound JSON file** containing all child entities (columns, joins, filters) embedded inline:
+
+```
+bins/app/
+  _output~Sales~abc123.json          ← root output with inline children
+  _output~Sales~abc123.column~col1.CustomSQL.sql  ← companion SQL file
+```
+
+The root JSON structure:
+```json
+{
+  "_entity": "output",
+  "UID": "abc123",
+  "Name": "Sales",
+  "children": {
+    "column": [
+      { "_entity": "output_value", "UID": "col1", "Title": "Amount", "children": { "column": [], "join": [], "filter": [] } }
+    ],
+    "join": [],
+    "filter": [
+      { "_entity": "output_value_filter", "UID": "f1", "ShortName": "Active", "children": { "column": [], "join": [], "filter": [] } }
+    ]
+  }
+}
+```
+
+Key points:
+- All three child keys (`column`, `join`, `filter`) are always present (empty arrays when unused)
+- Each child retains `_entity` set to its physical table name for push routing
+- Children nest recursively following FK relationships (e.g. a column can have filters)
+- `CustomSQL` content is extracted to companion `.sql` files per extraction rules
+- Re-cloning moves orphaned old-format child `.json` files to `/trash`
+
 #### Metadata Templates
 
 During `dbo clone`, the CLI auto-generates `.dbo/metadata_templates.json` — a file that records which columns each entity/descriptor uses. This file is seeded from the first cloned record of each type and can be manually edited afterwards.

package/bin/dbo.js

@@ -30,6 +30,7 @@ import { cloneCommand } from '../src/commands/clone.js';
 import { diffCommand } from '../src/commands/diff.js';
 import { rmCommand } from '../src/commands/rm.js';
 import { mvCommand } from '../src/commands/mv.js';
+import { syncCommand } from '../src/commands/sync.js';
 
 // First-run welcome message
 function checkFirstRun() {
@@ -89,6 +90,7 @@ program.addCommand(cloneCommand);
 program.addCommand(diffCommand);
 program.addCommand(rmCommand);
 program.addCommand(mvCommand);
+program.addCommand(syncCommand);
 
 // Show welcome message on first run
 checkFirstRun();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dboio/cli",
-  "version": "0.9.6",
+  "version": "0.10.1",
   "description": "CLI for the DBO.io framework",
   "type": "module",
   "bin": {

package/src/commands/add.js

@@ -13,6 +13,7 @@ import { setFileTimestamps } from '../lib/timestamps.js';
 import { checkStoredTicket, clearGlobalTicket } from '../lib/ticketing.js';
 import { checkModifyKey, isModifyKeyError, handleModifyKeyError } from '../lib/modify-key.js';
 import { loadIgnore } from '../lib/ignore.js';
+import { loadStructureFile, findBinByPath } from '../lib/structure.js';
 
 export const addCommand = new Command('add')
   .description('Add a new file to DBO.io (creates record on server)')
@@ -75,6 +76,45 @@ async function detectDocumentationFile(filePath) {
   return { entity: 'extension', descriptor: 'documentation' };
 }
 
+/**
+ * Detect whether a file is manifest.json at the project root.
+ * Returns { meta, metaPath } or null if not applicable.
+ *
+ * Creates companion metadata in bins/app/ with pre-filled fields.
+ */
+async function detectManifestFile(filePath) {
+  const rel = relative(process.cwd(), filePath).replace(/\\/g, '/');
+  if (rel.toLowerCase() !== 'manifest.json') return null;
+
+  const appConfig = await loadAppConfig();
+  const structure = await loadStructureFile();
+  const appBin = findBinByPath('app', structure);
+
+  const companionDir = join(process.cwd(), 'bins', 'app');
+  await mkdir(companionDir, { recursive: true });
+
+  const meta = {
+    _entity: 'content',
+    _contentColumns: ['Content'],
+    Content: '@/manifest.json',
+    Path: 'manifest.json',
+    Name: 'manifest.json',
+    Extension: 'JSON',
+    Public: 1,
+    Active: 1,
+    Title: 'PWA Manifest',
+  };
+
+  if (appBin) meta.BinID = appBin.binId;
+  if (appConfig.AppID) meta.AppID = appConfig.AppID;
+
+  const metaPath = join(companionDir, 'manifest.metadata.json');
+  await writeFile(metaPath, JSON.stringify(meta, null, 2) + '\n');
+  log.success(`Created manifest metadata at ${metaPath}`);
+
+  return { meta, metaPath };
+}
+
 async function addSingleFile(filePath, client, options, batchDefaults) {
   // Check .dboignore before doing any processing
   const ig = await loadIgnore();
@@ -186,6 +226,12 @@ async function addSingleFile(filePath, client, options, batchDefaults) {
     return await submitAdd(docMeta, docMetaFile, filePath, client, options);
   }
 
+  // Step 3d: Auto-detect manifest.json at project root
+  const manifestMeta = await detectManifestFile(filePath);
+  if (manifestMeta) {
+    return await submitAdd(manifestMeta.meta, manifestMeta.metaPath, filePath, client, options);
+  }
+
   // Step 4: No usable metadata — interactive wizard
   const inquirer = (await import('inquirer')).default;