@dboio/cli 0.8.0 → 0.9.2

package/src/lib/structure.js

@@ -4,19 +4,22 @@ import { join } from 'path';
 const STRUCTURE_FILE = '.dbo/structure.json';
 
 /** All bin-placed files go under this directory at project root */
-export const BINS_DIR = 'Bins';
+export const BINS_DIR = 'bins';
 
 /** Default top-level directories created at project root during clone */
 export const DEFAULT_PROJECT_DIRS = [
-  BINS_DIR,
-  'Automations',
-  'App Versions',
-  'Documentation',
-  'Sites',
-  'Extensions',
-  'Data Sources',
-  'Groups',
-  'Integrations',
+  'bins',
+  'automation',
+  'app_version',
+  'docs',
+  'site',
+  'extension',
+  'data_source',
+  'group',
+  'integration',
+  'src',
+  'tests',
+  'trash',
 ];
 
 /** Map from physical output table names → documentation/display names */
@@ -35,16 +38,16 @@ export const OUTPUT_HIERARCHY_ENTITIES = [
   'output_value_entity_column_rel',
 ];
 
-/** Map from server entity key → local project directory name */
-export const ENTITY_DIR_MAP = {
-  extension:    'Extensions',
-  app_version:  'App Versions',
-  data_source:  'Data Sources',
-  site:         'Sites',
-  group:        'Groups',
-  integration:  'Integrations',
-  automation:   'Automations',
-};
+/** Entity keys that correspond to project directories (key IS the dir name) */
+export const ENTITY_DIR_NAMES = new Set([
+  'extension',
+  'app_version',
+  'data_source',
+  'site',
+  'group',
+  'integration',
+  'automation',
+]);
 
 /**
  * Build a bin hierarchy from an array of bin objects.
@@ -160,11 +163,12 @@ export function getBinName(binId, structure) {
 
 /**
  * Reverse-lookup: find a bin entry by its directory path.
- * Accepts paths with or without the "Bins/" prefix.
+ * Accepts paths with or without the "bins/" prefix.
  * Returns { binId, name, path, segment, parentBinID, uid, fullPath } or null.
  */
 export function findBinByPath(dirPath, structure) {
-  const normalized = dirPath.replace(/^Bins\//, '').replace(/^\/+|\/+$/g, '');
+  const binsPrefix = BINS_DIR + '/';
+  const normalized = dirPath.replace(new RegExp('^' + binsPrefix), '').replace(/^\/+|\/+$/g, '');
   for (const [binId, entry] of Object.entries(structure)) {
     if (entry.fullPath === normalized) {
       return { binId: Number(binId), ...entry };
@@ -183,13 +187,13 @@ export function findChildBins(binId, structure) {
 // ─── Extension Descriptor Sub-directory Support ───────────────────────────
 
 /** Root for all extension descriptor-grouped sub-directories */
-export const EXTENSION_DESCRIPTORS_DIR = 'Extensions';
+export const EXTENSION_DESCRIPTORS_DIR = 'extension';
 
 /** Extensions that cannot be mapped go here (always created, even if empty) */
-export const EXTENSION_UNSUPPORTED_DIR = 'Extensions/Unsupported';
+export const EXTENSION_UNSUPPORTED_DIR = 'extension/_unsupported';
 
 /** Root-level documentation directory for alternate placement */
-export const DOCUMENTATION_DIR = 'Documentation';
+export const DOCUMENTATION_DIR = 'docs';
 
 /**
  * Build a descriptor→dirName mapping from a flat array of extension records.
@@ -280,7 +284,7 @@ export async function loadDescriptorMapping() {
 
 /**
  * Resolve the sub-directory path for a single extension record.
- * Returns "Extensions/<MappedName>" or "Extensions/Unsupported".
+ * Returns "extension/<MappedName>" or "extension/_unsupported".
  *
  * @param {Object} record   - Extension record with a .Descriptor field
  * @param {Object} mapping  - descriptor key → dir name (from buildDescriptorMapping)

package/src/lib/ticketing.js

@@ -13,7 +13,7 @@ function ticketingPath() {
   return join(dboDir(), TICKETING_FILE);
 }
 
-const DEFAULT_TICKETING = { ticket_id: null, records: [] };
+const DEFAULT_TICKETING = { ticket_id: null, ticketing_required: false, records: [] };
 
 /**
  * Load ticketing.local.json. Returns default structure if missing or corrupted.
@@ -30,6 +30,7 @@ export async function loadTicketing() {
     const data = JSON.parse(trimmed);
     return {
       ticket_id: data.ticket_id || null,
+      ticketing_required: !!data.ticketing_required,
       records: Array.isArray(data.records) ? data.records : [],
     };
   } catch (err) {
@@ -97,6 +98,25 @@ export async function setRecordTicket(uid, rowId, entity, ticketId) {
   await saveTicketing(data);
 }
 
+/**
+ * Mark ticketing as required for this app (detected after first ticket_error).
+ */
+export async function setTicketingRequired() {
+  const data = await loadTicketing();
+  if (!data.ticketing_required) {
+    data.ticketing_required = true;
+    await saveTicketing(data);
+  }
+}
+
+/**
+ * Check if ticketing is required for this app.
+ */
+export async function isTicketingRequired() {
+  const data = await loadTicketing();
+  return !!data.ticketing_required;
+}
+
 /**
  * Clear the global ticket_id (preserves records).
  */
@@ -145,28 +165,77 @@ export function buildTicketExpression(entity, rowId, ticketId) {
  *
  * @param {Object} options - Command options (checks options.ticket for flag override)
  */
-export async function checkStoredTicket(options) {
+export async function checkStoredTicket(options, context = '') {
   // --ticket flag takes precedence; skip stored-ticket prompt
   if (options.ticket) {
     return { useTicket: false, clearTicket: false, cancel: false };
   }
 
   const data = await loadTicketing();
-  if (!data.ticket_id) {
+
+  // No stored ticket and ticketing not known to be required — skip prompt
+  if (!data.ticket_id && !data.ticketing_required) {
     return { useTicket: false, clearTicket: false, cancel: false };
   }
 
-  // Non-interactive mode: auto-use stored ticket
+  // Non-interactive mode: auto-use stored ticket if available
   if (!process.stdin.isTTY) {
-    log.info(`Using stored ticket "${data.ticket_id}" (non-interactive mode)`);
-    return { useTicket: true, clearTicket: false, cancel: false };
+    if (data.ticket_id) {
+      log.info(`Using stored ticket "${data.ticket_id}" (non-interactive mode)`);
+      return { useTicket: true, clearTicket: false, cancel: false };
+    }
+    // ticketing_required but no stored ticket — can't prompt in non-interactive
+    log.warn('This app requires a Ticket ID but none is stored.');
+    log.dim('  Use --ticket <id> or run interactively first to set a ticket.');
+    return { useTicket: false, clearTicket: false, cancel: false };
   }
 
+  const suffix = context ? ` (${context})` : '';
   const inquirer = (await import('inquirer')).default;
+
+  // Ticketing required but no stored ticket — prompt for one
+  if (!data.ticket_id && data.ticketing_required) {
+    const { action } = await inquirer.prompt([{
+      type: 'list',
+      name: 'action',
+      message: `This app requires a Ticket ID. Enter one for this submission?${suffix}`,
+      choices: [
+        { name: 'Enter a Ticket ID for this and future submissions', value: 'enter_save' },
+        { name: 'Enter a Ticket ID for this submission only', value: 'enter_once' },
+        { name: 'Continue without a ticket', value: 'skip' },
+        { name: 'Cancel submission', value: 'cancel' },
+      ],
+    }]);
+
+    if (action === 'cancel') {
+      return { useTicket: false, clearTicket: false, cancel: true };
+    }
+    if (action === 'skip') {
+      return { useTicket: false, clearTicket: false, cancel: false };
+    }
+
+    const { ticketInput } = await inquirer.prompt([{
+      type: 'input',
+      name: 'ticketInput',
+      message: 'Ticket ID:',
+    }]);
+    const ticket = ticketInput.trim();
+    if (!ticket) {
+      log.error('  No Ticket ID entered. Submission cancelled.');
+      return { useTicket: false, clearTicket: false, cancel: true };
+    }
+    if (action === 'enter_save') {
+      await saveTicketing({ ...data, ticket_id: ticket });
+      log.dim(`  Stored ticket set to "${ticket}"`);
+    }
+    return { useTicket: true, clearTicket: false, cancel: false, overrideTicket: ticket };
+  }
+
+  // Stored ticket exists — prompt to use, change, or clear
   const { action } = await inquirer.prompt([{
     type: 'list',
     name: 'action',
-    message: `Use stored Ticket ID "${data.ticket_id}" for this submission?`,
+    message: `Use stored Ticket ID "${data.ticket_id}" for this submission?${suffix}`,
     choices: [
       { name: `Yes, use "${data.ticket_id}"`, value: 'use' },
       { name: 'Use a different ticket for this submission only', value: 'alt_once' },
@@ -213,7 +282,7 @@ export async function checkStoredTicket(options) {
  * @param {string|null} [sessionOverride] - One-time ticket override from pre-flight prompt
  */
 export async function applyStoredTicketToSubmission(dataExprs, entity, rowId, uid, options, sessionOverride = null) {
-  if (options.ticket) return; // --ticket flag takes precedence
+  if (options.ticket) return null; // --ticket flag takes precedence
 
   const recordTicket = await getRecordTicket(uid);
   const globalTicket = await getGlobalTicket();
@@ -223,5 +292,7 @@ export async function applyStoredTicketToSubmission(dataExprs, entity, rowId, ui
     const ticketExpr = buildTicketExpression(entity, rowId, ticketToUse);
     dataExprs.push(ticketExpr);
     log.dim(`  Applying ticket: ${ticketToUse}`);
+    return ticketToUse;
   }
+  return null;
 }