@dboio/cli 0.15.3 → 0.16.2

package/src/commands/add.js

@@ -7,7 +7,7 @@ import { formatResponse, formatError } from '../lib/formatter.js';
 import { log } from '../lib/logger.js';
 import { shouldSkipColumn } from '../lib/columns.js';
 import { loadAppConfig, loadAppJsonBaseline, saveAppJsonBaseline, loadExtensionDocumentationMDPlacement, loadDescriptorFilenamePreference, loadConfig } from '../lib/config.js';
-import { resolveDirective, resolveTemplateCols, assembleMetadata, promptReferenceColumn, setTemplateCols, saveMetadataTemplates, loadMetadataTemplates } from '../lib/metadata-templates.js';
+import { resolveDirective, resolveTemplateCols, assembleMetadata, promptReferenceColumn, setTemplateCols, saveMetadataSchema, loadMetadataSchema } from '../lib/metadata-schema.js';
 import { hasUidInFilename, buildMetaFilename, isMetadataFile } from '../lib/filenames.js';
 import { setFileTimestamps } from '../lib/timestamps.js';
 import { checkStoredTicket, clearGlobalTicket } from '../lib/ticketing.js';
@@ -137,7 +137,7 @@ async function detectManifestFile(filePath) {
 
   const meta = {
     _entity: 'content',
-    _contentColumns: ['Content'],
+    _companionReferenceColumns: ['Content'],
     Content: '@/manifest.json',
     Path: 'manifest.json',
     Name: 'manifest.json',
@@ -202,7 +202,7 @@ export async function detectBinFile(filePath) {
 
     const meta = {
       _entity: 'content',
-      _contentColumns: ['Content'],
+      _companionReferenceColumns: ['Content'],
       Name: base,
       Content: `@${fileName}`,
       Extension: ext.toUpperCase(),
@@ -216,7 +216,7 @@ export async function detectBinFile(filePath) {
     await writeFile(metaPath, JSON.stringify(meta, null, 2) + '\n');
     log.success(`Auto-created content metadata for "${fileName}"`);
 
-    // Seed metadata_templates.json with content fields if missing
+    // Seed metadata_schema.json with content fields if missing
     await seedMetadataTemplate();
 
     return { meta, metaPath };
@@ -250,7 +250,7 @@ export async function detectBinFile(filePath) {
   await writeFile(metaPath, JSON.stringify(meta, null, 2) + '\n');
   log.success(`Auto-created media metadata for "${fileName}"`);
 
-  // Seed metadata_templates.json with media fields if missing
+  // Seed metadata_schema.json with media fields if missing
   await seedMetadataTemplate();
 
   return { meta, metaPath };
@@ -296,11 +296,11 @@ const TEMPLATE_DEFAULTS = {
 };
 
 /**
- * Seed .dbo/metadata_templates.json with default fields for the given entity
+ * Seed .dbo/metadata_schema.json with default fields for the given entity
  * (and any other missing core entities) if an entry doesn't already exist.
  */
 async function seedMetadataTemplate() {
-  const templates = await loadMetadataTemplates() ?? {};
+  const templates = await loadMetadataSchema() ?? {};
 
   // Seed all missing core entities in one pass
   const seeded = [];
@@ -312,8 +312,8 @@ async function seedMetadataTemplate() {
 
   if (seeded.length === 0) return;
 
-  await saveMetadataTemplates(templates);
-  log.dim(`  Seeded metadata_templates.json with ${seeded.join(', ')} fields`);
+  await saveMetadataSchema(templates);
+  log.dim(`  Seeded metadata_schema.json with ${seeded.join(', ')} fields`);
 }
 
 async function addSingleFile(filePath, client, options, batchDefaults) {
@@ -369,14 +369,14 @@ async function addSingleFile(filePath, client, options, batchDefaults) {
       const hasRefMarker = cols.some(c => c.includes('=@reference'));
       if (!hasRefMarker) {
         if (options.yes) {
-          console.warn(`Warning: No @reference column in template for ${entity}${descriptor ? '.' + descriptor : ''} — skipping content column. Update .dbo/metadata_templates.json to add Key=@reference.`);
+          console.warn(`Warning: No @reference column in template for ${entity}${descriptor ? '.' + descriptor : ''} — skipping content column. Update .dbo/metadata_schema.json to add Key=@reference.`);
         } else {
           const chosen = await promptReferenceColumn(cols, entity, descriptor);
           if (chosen) {
             cols = cols.map(c => c === chosen ? `${chosen}=@reference` : c);
-            templates = templates ?? await loadMetadataTemplates() ?? {};
+            templates = templates ?? await loadMetadataSchema() ?? {};
             setTemplateCols(templates, entity, descriptor, cols);
-            await saveMetadataTemplates(templates);
+            await saveMetadataSchema(templates);
           }
         }
       }
@@ -419,7 +419,7 @@ async function addSingleFile(filePath, client, options, batchDefaults) {
     const contentCol = filenameCol === 'Name' ? 'String10' : 'String10';
     const relPath = relative(process.cwd(), filePath).replace(/\\/g, '/');
     docMeta[contentCol] = `@/${relPath}`;
-    docMeta._contentColumns = [contentCol];
+    docMeta._companionReferenceColumns = [contentCol];
 
     const docMetaFile = join(companionDir, `${docBase}.metadata.json`);
     await writeFile(docMetaFile, JSON.stringify(docMeta, null, 2) + '\n');
@@ -544,7 +544,7 @@ async function addSingleFile(filePath, client, options, batchDefaults) {
   if (answers.Path.trim()) meta.Path = answers.Path.trim();
   meta[answers.contentColumn.trim()] = `@${fileName}`;
   meta._entity = answers.entity.trim();
-  meta._contentColumns = [answers.contentColumn.trim()];
+  meta._companionReferenceColumns = [answers.contentColumn.trim()];
 
   // Write metadata file
   await writeFile(metaPath, JSON.stringify(meta, null, 2) + '\n');
@@ -569,7 +569,7 @@ async function addSingleFile(filePath, client, options, batchDefaults) {
  */
 export async function submitAdd(meta, metaPath, filePath, client, options) {
   const entity = meta._entity;
-  const contentCols = new Set(meta._contentColumns || []);
+  const contentCols = new Set(meta._companionReferenceColumns || meta._contentColumns || []);
   const metaDir = dirname(metaPath);
 
   if (!entity) {
@@ -691,7 +691,7 @@ export async function submitAdd(meta, metaPath, filePath, client, options) {
         if (serverTz && returnedLastUpdated) {
           try {
             await setFileTimestamps(newMetaPath, returnedLastUpdated, returnedLastUpdated, serverTz);
-            for (const col of (meta._contentColumns || [])) {
+            for (const col of (meta._companionReferenceColumns || meta._contentColumns || [])) {
               const ref = meta[col];
               if (ref && String(ref).startsWith('@')) {
                 const fp = join(metaDir, String(ref).substring(1));
@@ -835,7 +835,7 @@ export async function findUnaddedFiles(dir, ig, referencedFiles) {
       const meta = JSON.parse(raw);
       // Only count records that are on the server (have UID or _CreatedOn)
       if (!meta.UID && !meta._CreatedOn) continue;
-      for (const col of (meta._contentColumns || [])) {
+      for (const col of (meta._companionReferenceColumns || meta._contentColumns || [])) {
         const val = meta[col];
         if (typeof val === 'string' && val.startsWith('@') && !val.startsWith('@/')) {
           localRefs.add(val.substring(1));
@@ -912,7 +912,7 @@ async function _scanMetadataRefs(dir, referenced) {
       const meta = JSON.parse(raw);
       if (!meta._CreatedOn && !meta.UID) continue; // only count server-confirmed records
 
-      for (const col of (meta._contentColumns || [])) {
+      for (const col of (meta._companionReferenceColumns || meta._contentColumns || [])) {
         const val = meta[col];
         if (typeof val === 'string' && val.startsWith('@')) {
           const ref = val.substring(1);