@dboio/cli 0.6.13 → 0.7.2

package/src/lib/input-parser.js

@@ -1,7 +1,8 @@
 import { readFile } from 'fs/promises';
 import { log } from './logger.js';
-import { loadUserInfo } from './config.js';
+import { loadUserInfo, loadTicketSuggestionOutput } from './config.js';
 import { buildTicketExpression, setGlobalTicket, setRecordTicket, getGlobalTicket, getRecordTicket } from './ticketing.js';
+import { DboClient } from './client.js';
 
 /**
  * Parse DBO input syntax and build form data.
@@ -84,6 +85,7 @@ function findValueAtSign(expr) {
 }
 
 // Patterns that indicate a missing user identity in the server response
+// Note: the user entity only has an ID (never a UID), so all patterns resolve to _OverrideUserID.
 const USER_ID_PATTERNS = [
   'LoggedInUser_UID',
   'LoggedInUserID',
@@ -101,7 +103,7 @@ const USER_ID_PATTERNS = [
  * - repo_mismatch → repository mismatch recovery (6 options)
  * - ticket_lookup_required_error → prompts for Ticket ID (legacy)
  * - LoggedInUser_UID, LoggedInUserID, CurrentUserID, UserID not found
- *   → prompts for User ID or UID (session not authenticated)
+ *   → prompts for User ID (session not authenticated)
  *
  * Returns an object with retry information, or null if no recoverable errors found.
  *
@@ -109,9 +111,9 @@ const USER_ID_PATTERNS = [
  *   { retryParams, ticketExpressions, skipRecord, skipAll }
  *
  * Return shape for legacy/user errors (backward compatible):
- *   { _OverrideTicketID, _OverrideUserUID, _OverrideUserID, ... }
+ *   { _OverrideTicketID, _OverrideUserID, ... }
  */
-export async function checkSubmitErrors(result) {
+export async function checkSubmitErrors(result, context = {}) {
   const messages = result.messages || result.data?.Messages || [];
   const allText = messages.filter(m => typeof m === 'string').join(' ');
 
@@ -121,7 +123,7 @@ export async function checkSubmitErrors(result) {
   const hasRepoMismatch = allText.includes('repo_mismatch');
 
   if (hasTicketError) {
-    return await handleTicketError(allText);
+    return await handleTicketError(allText, context);
   }
 
   if (hasRepoMismatch) {
@@ -132,7 +134,6 @@ export async function checkSubmitErrors(result) {
   const needsTicket = allText.includes('ticket_lookup_required_error');
   const matchedUserPattern = USER_ID_PATTERNS.find(p => allText.includes(p));
   const needsUser = !!matchedUserPattern;
-  const needsUserUid = matchedUserPattern && matchedUserPattern.includes('UID');
 
   if (!needsTicket && !needsUser) return null;
 
@@ -142,14 +143,9 @@ export async function checkSubmitErrors(result) {
   if (!process.stdin.isTTY) {
     if (needsUser) {
       const stored = await loadUserInfo();
-      const storedValue = needsUserUid ? stored.userUid : (stored.userId || stored.userUid);
-      if (storedValue) {
-        log.info(`Using stored user ${needsUserUid ? 'UID' : 'ID'}: ${storedValue} (non-interactive mode)`);
-        if (needsUserUid) {
-          retryParams['_OverrideUserUID'] = storedValue;
-        } else {
-          retryParams['_OverrideUserID'] = storedValue;
-        }
+      if (stored.userId) {
+        log.info(`Using stored user ID: ${stored.userId} (non-interactive mode)`);
+        retryParams['_OverrideUserID'] = stored.userId;
       } else {
         log.error(`This operation requires an authenticated user (${matchedUserPattern}).`);
         log.dim('  Run "dbo login" first, or use an interactive terminal.');
@@ -167,41 +163,36 @@ export async function checkSubmitErrors(result) {
   const prompts = [];
 
   if (needsUser) {
-    const idType = needsUserUid ? 'UID' : 'ID';
     log.warn(`This operation requires an authenticated user (${matchedUserPattern}).`);
     log.dim('  Your session may have expired, or you may not be logged in.');
     log.dim('  You can log in with "dbo login" to avoid this prompt in the future.');
 
     const stored = await loadUserInfo();
-    const storedValue = needsUserUid ? stored.userUid : (stored.userId || stored.userUid);
-    const storedLabel = needsUserUid
-      ? (stored.userUid ? `UID: ${stored.userUid}` : null)
-      : (stored.userId ? `ID: ${stored.userId}` : (stored.userUid ? `UID: ${stored.userUid}` : null));
 
-    if (storedValue) {
-      log.dim(`  Stored session user ${storedLabel}`);
+    if (stored.userId) {
+      log.dim(`  Stored session user ID: ${stored.userId}`);
       prompts.push({
         type: 'list',
         name: 'userChoice',
-        message: `User ${idType} Required:`,
+        message: 'User ID Required:',
         choices: [
-          { name: `Use session user (${storedLabel})`, value: storedValue },
-          { name: `Enter a different User ${idType}`, value: '_custom' },
+          { name: `Use session user (ID: ${stored.userId})`, value: stored.userId },
+          { name: 'Enter a different User ID', value: '_custom' },
         ],
       });
       prompts.push({
         type: 'input',
         name: 'customUserValue',
-        message: `Custom User ${idType}:`,
+        message: 'Custom User ID:',
         when: (answers) => answers.userChoice === '_custom',
-        validate: v => v.trim() ? true : `User ${idType} is required`,
+        validate: v => v.trim() ? true : 'User ID is required',
       });
     } else {
       prompts.push({
         type: 'input',
         name: 'userValue',
-        message: `User ${idType} Required:`,
-        validate: v => v.trim() ? true : `User ${idType} is required`,
+        message: 'User ID Required:',
+        validate: v => v.trim() ? true : 'User ID is required',
       });
     }
   }
@@ -224,11 +215,7 @@ export async function checkSubmitErrors(result) {
   const userValue = answers.userValue
     || (answers.userChoice === '_custom' ? answers.customUserValue : answers.userChoice);
   if (userValue) {
-    if (needsUserUid) {
-      retryParams['_OverrideUserUID'] = userValue.trim();
-    } else {
-      retryParams['_OverrideUserID'] = userValue.trim();
-    }
+    retryParams['_OverrideUserID'] = userValue.trim();
   }
 
   return retryParams;
@@ -238,7 +225,7 @@ export async function checkSubmitErrors(result) {
  * Handle ticket_error: Record update requires a Ticket ID but none was provided.
  * Prompts the user with 4 recovery options.
  */
-async function handleTicketError(allText) {
+async function handleTicketError(allText, context = {}) {
   // Try to extract record details from error text
   const entityMatch = allText.match(/entity:(\w+)/);
   const rowIdMatch = allText.match(/RowID:(\d+)/);
@@ -262,9 +249,63 @@ async function handleTicketError(allText) {
     return null;
   }
 
+  // Fetch ticket suggestions if configured
+  let suggestionChoices = [];
+  const ticketSuggestionUid = await loadTicketSuggestionOutput();
+  const rowUid = context.rowUid || uid || null;
+
+  if (ticketSuggestionUid && rowUid) {
+    try {
+      const client = new DboClient();
+      const suggestResult = await client.get(`/api/output/${ticketSuggestionUid}`, {
+        '_limit': '5',
+        '_rowcount': 'false',
+        '_template': 'json_raw',
+        '_filter@AssetUID': rowUid,
+      });
+      const rows = suggestResult.payload || suggestResult.data;
+      const rowArray = Array.isArray(rows) ? rows : (rows?.Rows || rows?.rows || []);
+      for (let i = 0; i < rowArray.length; i++) {
+        const row = rowArray[i];
+        const ticketId = row.TicketID || row.ticket_id;
+        const title = row.Title || row.Name || '';
+        const shortName = row.ShortName || row.short_name || '';
+        if (ticketId) {
+          const label = `${i + 1} (${ticketId}): ${title}${shortName ? ` [${shortName}]` : ''}`;
+          suggestionChoices.push({ name: label, value: String(ticketId) });
+        }
+      }
+    } catch (err) {
+      log.dim(`  (Could not fetch ticket suggestions: ${err.message})`);
+    }
+  }
+
   log.warn('This record update requires a Ticket ID.');
 
   const inquirer = (await import('inquirer')).default;
+
+  // Build the ticket ID prompt — list with suggestions or manual input
+  const needsTicket = (a) => a.ticketAction === 'apply_one' || a.ticketAction === 'apply_all';
+
+  const ticketIdPrompt = suggestionChoices.length > 0
+    ? {
+        type: 'list',
+        name: 'ticketId',
+        message: 'Select a Ticket ID:',
+        choices: [
+          ...suggestionChoices,
+          { name: 'Enter a Ticket ID manually\u2026', value: '_manual' },
+        ],
+        when: needsTicket,
+      }
+    : {
+        type: 'input',
+        name: 'ticketId',
+        message: 'Enter Ticket ID:',
+        when: needsTicket,
+        validate: v => v.trim() ? true : 'Ticket ID is required',
+      };
+
   const answers = await inquirer.prompt([
     {
       type: 'list',
@@ -277,11 +318,12 @@ async function handleTicketError(allText) {
         { name: 'Skip all updates that require a Ticket ID', value: 'skip_all' },
       ],
     },
+    ticketIdPrompt,
     {
       type: 'input',
-      name: 'ticketId',
-      message: 'Enter Ticket ID:',
-      when: (a) => a.ticketAction === 'apply_one' || a.ticketAction === 'apply_all',
+      name: 'ticketIdManual',
+      message: 'Ticket ID:',
+      when: (a) => needsTicket(a) && a.ticketId === '_manual',
       validate: v => v.trim() ? true : 'Ticket ID is required',
     },
   ]);
@@ -293,7 +335,14 @@ async function handleTicketError(allText) {
     return { skipAll: true };
   }
 
-  const ticketId = answers.ticketId.trim();
+  const ticketId = (answers.ticketIdManual?.trim()) ||
+    (answers.ticketId !== '_manual' ? answers.ticketId?.trim() : null);
+
+  if (!ticketId) {
+    log.error('  No Ticket ID provided. Skipping record.');
+    return { skipRecord: true };
+  }
+
   const ticketExpressions = [];
 
   if (entity && rowId) {

package/src/lib/scaffold.js

@@ -0,0 +1,62 @@
+import { mkdir, stat, writeFile, access } from 'fs/promises';
+import { join } from 'path';
+import { DEFAULT_PROJECT_DIRS } from './structure.js';
+import { log } from './logger.js';
+
+/**
+ * Scaffold the standard DBO project directory structure in cwd.
+ * Creates missing directories, skips existing ones, warns on name conflicts.
+ * Also creates app.json with {} if absent.
+ *
+ * @param {string} [cwd=process.cwd()]
+ * @returns {Promise<{ created: string[], skipped: string[], warned: string[] }>}
+ */
+export async function scaffoldProjectDirs(cwd = process.cwd()) {
+  const created = [];
+  const skipped = [];
+  const warned  = [];
+
+  for (const dir of DEFAULT_PROJECT_DIRS) {
+    const target = join(cwd, dir);
+    try {
+      const s = await stat(target);
+      if (s.isDirectory()) {
+        skipped.push(dir);
+      } else {
+        log.warn(`  Skipping "${dir}" — a file with that name already exists`);
+        warned.push(dir);
+      }
+    } catch {
+      // Does not exist — create it
+      await mkdir(target, { recursive: true });
+      created.push(dir);
+    }
+  }
+
+  // Create app.json if absent
+  const appJsonPath = join(cwd, 'app.json');
+  try {
+    await access(appJsonPath);
+  } catch {
+    await writeFile(appJsonPath, '{}\n');
+    created.push('app.json');
+  }
+
+  return { created, skipped, warned };
+}
+
+/**
+ * Print the scaffold summary to the console.
+ * @param {{ created: string[], skipped: string[], warned: string[] }} result
+ */
+export function logScaffoldResult({ created, skipped, warned }) {
+  if (created.length) {
+    log.success('Scaffolded directories:');
+    for (const d of created) log.dim(`  + ${d}`);
+  }
+  if (skipped.length) {
+    log.dim('Skipped (already exist):');
+    for (const d of skipped) log.dim(`  · ${d}`);
+  }
+  // warned items already printed inline during scaffold
+}

package/src/lib/structure.js

@@ -19,6 +19,22 @@ export const DEFAULT_PROJECT_DIRS = [
   'Integrations',
 ];
 
+/** Map from physical output table names → documentation/display names */
+export const OUTPUT_ENTITY_MAP = {
+  output: 'output',
+  output_value: 'column',
+  output_value_filter: 'filter',
+  output_value_entity_column_rel: 'join',
+};
+
+/** All output hierarchy entity types (physical table names) */
+export const OUTPUT_HIERARCHY_ENTITIES = [
+  'output',
+  'output_value',
+  'output_value_filter',
+  'output_value_entity_column_rel',
+];
+
 /** Map from server entity key → local project directory name */
 export const ENTITY_DIR_MAP = {
   extension:    'Extensions',