@restforgejs/platform 5.2.16 → 5.3.5

package/generators/lib/payload/payload-runner.js

@@ -125,7 +125,7 @@ function parseFkColumns(fkColumnsStr) {
   if (typeof fkColumnsStr !== 'string' || fkColumnsStr.trim().length === 0) {
     throw new Error(
       '--fk-columns is required when --expand-fk is set ' +
-      '(format: table.column,table.column)'
+      '(format: ref_table.column or local_col:ref_table.column)'
     );
   }
 
@@ -137,18 +137,32 @@ function parseFkColumns(fkColumnsStr) {
   const specs = [];
   const seen = new Set();
   for (const raw of entries) {
-    const parts = raw.split('.');
+    let localColumn = null;
+    let qualified = raw;
+
+    const colonIdx = raw.indexOf(':');
+    if (colonIdx !== -1) {
+      localColumn = raw.slice(0, colonIdx).trim();
+      qualified = raw.slice(colonIdx + 1).trim();
+      if (!localColumn) {
+        throw new Error(
+          `Invalid --fk-columns entry "${raw}": local column name before ':' is empty`
+        );
+      }
+    }
+
+    const parts = qualified.split('.');
     if (parts.length !== 2 || !parts[0].trim() || !parts[1].trim()) {
       throw new Error(
-        `Invalid --fk-columns entry "${raw}": each entry must be qualified as table.column`
+        `Invalid --fk-columns entry "${raw}": must be ref_table.column or local_col:ref_table.column`
       );
     }
     const table = parts[0].trim();
     const column = parts[1].trim();
-    const key = `${table.toLowerCase()}.${column.toLowerCase()}`;
-    if (seen.has(key)) continue;
-    seen.add(key);
-    specs.push({ table, column, raw });
+    const dedupeKey = `${localColumn ? localColumn.toLowerCase() + ':' : ''}${table.toLowerCase()}.${column.toLowerCase()}`;
+    if (seen.has(dedupeKey)) continue;
+    seen.add(dedupeKey);
+    specs.push({ table, column, localColumn, raw });
   }
   return specs;
 }
@@ -180,10 +194,13 @@ function deriveTableAlias(tableName) {
  * @param {{references: {schema?: string, table: string}}} fk
  * @returns {string}
  */
-function qualifiedRefTable(fk) {
+function qualifiedRefTable(fk, dbType) {
   const schema = fk && fk.references && fk.references.schema;
   const table = fk && fk.references && fk.references.table;
-  return (schema && schema !== 'public') ? `${schema}.${table}` : table;
+  if (!schema) return table;
+  if (dbType === 'oracle') return table;
+  if (schema === 'public') return table;
+  return `${schema}.${table}`;
 }
 
 /**
@@ -257,7 +274,7 @@ function pickDisplayColumn(refColumns, primaryKey) {
  * @param {string[]} baseColumns - kolom fisik base table (non-audit)
  * @returns {{updatedPayload: Object, sqlRelPath: string, sqlContent: string}}
  */
-function buildForeignKeyExpansion(payload, fkSpec, foreignKeys, refColumnsMap, baseColumns) {
+function buildForeignKeyExpansion(payload, fkSpec, foreignKeys, refColumnsMap, baseColumns, dbType, joinType) {
   const tableName = payload.tableName;
 
   // Base fields = fieldName yang benar-benar kolom fisik base table.
@@ -268,12 +285,16 @@ function buildForeignKeyExpansion(payload, fkSpec, foreignKeys, refColumnsMap, b
   // Map refTable(lower) -> FK; deteksi FK ganda ke tabel referensi yang sama.
   const fkByRefTable = new Map();
   const dupRefTables = new Set();
+  const fkByLocalCol = new Map();
   for (const fk of (foreignKeys || [])) {
     const rt = fk && fk.references && fk.references.table ? String(fk.references.table) : '';
     if (!rt) continue;
     const key = rt.toLowerCase();
     if (fkByRefTable.has(key)) dupRefTables.add(key);
     else fkByRefTable.set(key, fk);
+    for (const localCol of (fk.columns || [])) {
+      fkByLocalCol.set(String(localCol).toLowerCase(), fk);
+    }
   }
 
   if (fkByRefTable.size === 0) {
@@ -292,25 +313,47 @@ function buildForeignKeyExpansion(payload, fkSpec, foreignKeys, refColumnsMap, b
   };
   const baseAlias = uniqueAlias(deriveTableAlias(tableName));
 
-  const refTableAlias = new Map(); // refKeyLower -> { alias, fk, refTableName }
-  const refSelections = [];        // { alias, column, refTableName }
+  const refTableAlias = new Map(); // aliasKey -> { alias, fk, refTableName }
+  const refSelections = [];        // { alias, column, refTableName, localColumn }
   for (const spec of fkSpec) {
     const key = spec.table.toLowerCase();
-    if (!fkByRefTable.has(key)) {
-      const available = [...fkByRefTable.keys()].join(', ') || '(none)';
-      throw new Error(
-        `Foreign key reference table "${spec.table}" not found for "${tableName}". ` +
-        `Referenced tables available: ${available}`
-      );
-    }
-    if (dupRefTables.has(key)) {
-      throw new Error(
-        `Table "${tableName}" has multiple foreign keys referencing "${spec.table}"; ` +
-        'cannot disambiguate by table name'
-      );
+
+    let fk;
+    if (spec.localColumn) {
+      const localKey = spec.localColumn.toLowerCase();
+      if (!fkByLocalCol.has(localKey)) {
+        const available = [...fkByLocalCol.keys()].join(', ') || '(none)';
+        throw new Error(
+          `Local FK column "${spec.localColumn}" not found in foreign keys of "${tableName}". ` +
+          `Local FK columns available: ${available}`
+        );
+      }
+      fk = fkByLocalCol.get(localKey);
+      const refTableKey = fk.references.table.toLowerCase();
+      if (refTableKey !== key) {
+        throw new Error(
+          `Local FK column "${spec.localColumn}" references table "${fk.references.table}", ` +
+          `not "${spec.table}" as specified`
+        );
+      }
+    } else {
+      if (!fkByRefTable.has(key)) {
+        const available = [...fkByRefTable.keys()].join(', ') || '(none)';
+        throw new Error(
+          `Foreign key reference table "${spec.table}" not found for "${tableName}". ` +
+          `Referenced tables available: ${available}`
+        );
+      }
+      if (dupRefTables.has(key)) {
+        throw new Error(
+          `Table "${tableName}" has multiple foreign keys referencing "${spec.table}"; ` +
+          'cannot disambiguate by table name'
+        );
+      }
+      fk = fkByRefTable.get(key);
     }
 
-    const fk = fkByRefTable.get(key);
+    const aliasKey = spec.localColumn ? spec.localColumn.toLowerCase() : key;
     const refTableName = fk.references.table;
     const refCols = refColumnsMap[key] || refColumnsMap[refTableName] || [];
     const refColsLower = refCols.map(c => String(c).toLowerCase());
@@ -321,17 +364,17 @@ function buildForeignKeyExpansion(payload, fkSpec, foreignKeys, refColumnsMap, b
       );
     }
 
-    if (!refTableAlias.has(key)) {
-      refTableAlias.set(key, {
+    if (!refTableAlias.has(aliasKey)) {
+      refTableAlias.set(aliasKey, {
         alias: uniqueAlias(deriveTableAlias(refTableName)),
         fk,
         refTableName,
         // Dipakai khusus untuk klausa JOIN (FROM/LEFT JOIN); refTableName (bare)
         // tetap dipakai untuk alias derivation & penamaan kolom output.
-        refQualified: qualifiedRefTable(fk)
+        refQualified: qualifiedRefTable(fk, dbType)
       });
     }
-    refSelections.push({ alias: refTableAlias.get(key).alias, column: spec.column, refTableName });
+    refSelections.push({ alias: refTableAlias.get(aliasKey).alias, column: spec.column, refTableName, localColumn: spec.localColumn || null });
   }
 
   // Output name + collision auto-prefix. Hitung occurrence nama tentatif
@@ -347,7 +390,7 @@ function buildForeignKeyExpansion(payload, fkSpec, foreignKeys, refColumnsMap, b
   for (const r of refSelections) {
     let output = r.column;
     if ((nameCount.get(r.column) || 0) > 1) {
-      output = `${r.refTableName}_${r.column}`.toLowerCase();
+      output = `${r.localColumn || r.refTableName}_${r.column}`.toLowerCase();
     }
     if (finalNames.has(output)) {
       throw new Error(
@@ -380,7 +423,8 @@ function buildForeignKeyExpansion(payload, fkSpec, foreignKeys, refColumnsMap, b
     for (let i = 0; i < pairCount; i++) {
       conds.push(`${info.alias}.${refCols[i]} = ${baseAlias}.${localCols[i]}`);
     }
-    sqlLines.push(`LEFT JOIN ${info.refQualified} ${info.alias} ON ${conds.join(' AND ')}`);
+    const joinKeyword = joinType === 'inner' ? 'INNER JOIN' : 'LEFT JOIN';
+    sqlLines.push(`${joinKeyword} ${info.refQualified} ${info.alias} ON ${conds.join(' AND ')}`);
   }
   const sqlContent = `${sqlLines.join('\n')}\n`;
 
@@ -1181,7 +1225,7 @@ function buildPayloadAdvisories(payload, info) {
       type: 'fk',
       table,
       message: `has ${fkCount} foreign key(s) not surfaced as JOIN`,
-      command: `npx restforge payload sync --table=${table} --expand-fk`
+      command: `npx restforge payload sync --table=${table} --expand-fk=both`
     });
   }
 
@@ -1768,7 +1812,7 @@ class PayloadGenerator {
         let result;
         if (args.sync) {
           result = await validator.runSync(targetTable, this, {
-            expandFk: args.expandFk === true,
+            expandFkMode: args.expandFkMode || null,
             fkColumns: args.fkColumns || null
           });
         } else if (args.diff) {
@@ -2439,12 +2483,12 @@ class SchemaValidator {
    * @param {string|null} tableName - Nama table spesifik, atau null untuk semua
    * @param {PayloadGenerator} generator - Instance PayloadGenerator untuk re-generate
    * @param {Object} [options]
-   * @param {boolean} [options.expandFk] - Aktifkan FK JOIN expansion
+   * @param {'both'|'datatables-only'|null} [options.expandFkMode] - Mode FK JOIN expansion
    * @param {string} [options.fkColumns] - Daftar kolom referensi `table.column,...`
    * @returns {Promise<Object>} { total, synced, skipped, error }
    */
   async runSync(tableName, generator, options = {}) {
-    const expandFk = options.expandFk === true;
+    const expandFkMode = options.expandFkMode || null;
     const fkColumns = options.fkColumns || null;
 
     console.log();
@@ -2455,7 +2499,7 @@ class SchemaValidator {
 
     // Mode expand-fk butuh target tabel tunggal dan --fk-columns yang valid.
     // Validasi upfront agar gagal cepat dengan pesan jelas.
-    if (expandFk) {
+    if (expandFkMode) {
       if (!tableName) {
         console.log('  [ERROR] --expand-fk requires --table=<table>');
         console.log();
@@ -2515,7 +2559,7 @@ class SchemaValidator {
       // dari sync biasa, mode ini tetap memproses meski kolom fisik sudah
       // in-sync (status 'ok'); bila ada drift kolom fisik, rekonsiliasi dulu
       // lewat regeneratePayload baru ekspansi FK diterapkan di atasnya.
-      if (expandFk) {
+      if (expandFkMode) {
         let workingPayload = payload;
         if (comparison.status === 'drift') {
           try {
@@ -2530,6 +2574,9 @@ class SchemaValidator {
         let expansion;
         try {
           expansion = await this.applyForeignKeyExpansion(workingPayload, fkColumns, { fileName });
+          if (expandFkMode === 'datatables-only') {
+            expansion.updatedPayload.viewQuery = workingPayload.viewQuery;
+          }
         } catch (e) {
           console.log(`  [ERROR]   ${fileName} - expand-fk failed: ${e.message}`);
           errorCount++;
@@ -2638,16 +2685,27 @@ class SchemaValidator {
     const refColumnsMap = {};
     let fkSpec;
 
+    // Deteksi tabel referensi yang dirujuk lebih dari satu FK (ambiguous).
+    // Dipakai di kedua mode (auto dan hybrid) untuk penentuan localColumn otomatis.
+    const refTableCount = new Map();
+    for (const fk of foreignKeys) {
+      const rt = fk && fk.references && fk.references.table;
+      if (!rt) continue;
+      refTableCount.set(String(rt).toLowerCase(), (refTableCount.get(String(rt).toLowerCase()) || 0) + 1);
+    }
+    const dupRefTables = new Set(
+      [...refTableCount.entries()].filter(([, n]) => n > 1).map(([k]) => k)
+    );
+
     if (isAuto) {
       // Auto-resolve: satu kolom display per foreign key.
+      // FK ganda ke tabel yang sama di-disambiguasi otomatis via nama kolom FK
+      // lokal sebagai prefix — tidak error, tidak butuh --fk-columns.
       fkSpec = [];
       for (const fk of foreignKeys) {
         const rt = fk && fk.references && fk.references.table;
         if (!rt) continue;
         const key = String(rt).toLowerCase();
-        // qualifiedRefTable() dipakai untuk query ke DB (perlu schema yang benar
-        // bila parent bukan di schema 'public'); `rt` (bare) tetap dipakai sebagai
-        // key map + identitas fkSpec (selaras format `--fk-columns=table.column`).
         const qualifiedRt = qualifiedRefTable(fk);
         if (!refColumnsMap[key]) {
           refColumnsMap[key] = await this.db.getColumns(qualifiedRt);
@@ -2662,25 +2720,83 @@ class SchemaValidator {
             '(no name/code column and no primary key found). Provide --fk-columns explicitly.'
           );
         }
-        fkSpec.push({ table: rt, column: display, raw: `${rt}.${display}` });
-        console.log(`  [AUTO]    ${tableName} -> ${rt}.${display} (display column)`);
+        const isAmbiguous = dupRefTables.has(key);
+        const localColumn = isAmbiguous ? (fk.columns && fk.columns[0]) || null : null;
+        fkSpec.push({ table: rt, column: display, localColumn, raw: `${rt}.${display}` });
+        if (isAmbiguous && localColumn) {
+          console.log(`  [AUTO]    ${tableName}.${localColumn} -> ${rt}.${display} (display column, auto-disambiguated)`);
+        } else {
+          console.log(`  [AUTO]    ${tableName} -> ${rt}.${display} (display column)`);
+        }
       }
     } else {
-      // Eksplisit: parse spec lalu fetch kolom tabel referensi yang disebut.
-      fkSpec = parseFkColumns(fkColumnsStr);
-      const neededTables = new Set(fkSpec.map(s => s.table.toLowerCase()));
+      // Hybrid: --fk-columns berlaku sebagai override/disambiguasi untuk FK yang
+      // disebut; FK lain yang tidak disebut tetap di-auto-resolve.
+      const explicitSpecs = parseFkColumns(fkColumnsStr);
+
+      // Index explicit specs: by localColumn (untuk FK ganda) atau by refTable (untuk FK tunggal).
+      const explicitByLocalCol = new Map();
+      const explicitByTable = new Map();
+      for (const spec of explicitSpecs) {
+        if (spec.localColumn) {
+          explicitByLocalCol.set(spec.localColumn.toLowerCase(), spec);
+        } else {
+          const k = spec.table.toLowerCase();
+          if (!explicitByTable.has(k)) explicitByTable.set(k, spec);
+        }
+      }
+
+      fkSpec = [];
       for (const fk of foreignKeys) {
         const rt = fk && fk.references && fk.references.table;
         if (!rt) continue;
         const key = String(rt).toLowerCase();
-        if (!neededTables.has(key)) continue;
+        const localColRaw = fk.columns && fk.columns[0];
+        const localColKey = localColRaw ? String(localColRaw).toLowerCase() : null;
+        const isAmbiguous = dupRefTables.has(key);
+
+        // Cari explicit spec yang cocok dengan FK ini.
+        let matchedSpec = null;
+        if (localColKey && explicitByLocalCol.has(localColKey)) {
+          matchedSpec = explicitByLocalCol.get(localColKey);
+        } else if (!isAmbiguous && explicitByTable.has(key)) {
+          matchedSpec = explicitByTable.get(key);
+        }
+
+        // Fetch kolom tabel referensi (dibutuhkan baik untuk explicit maupun auto).
+        const qualifiedRt = qualifiedRefTable(fk);
         if (!refColumnsMap[key]) {
-          refColumnsMap[key] = await this.db.getColumns(qualifiedRefTable(fk));
+          refColumnsMap[key] = await this.db.getColumns(qualifiedRt);
+        }
+
+        if (matchedSpec) {
+          fkSpec.push(matchedSpec);
+          const prefix = matchedSpec.localColumn ? `${tableName}.${matchedSpec.localColumn}` : tableName;
+          console.log(`  [EXPLICIT] ${prefix} -> ${matchedSpec.table}.${matchedSpec.column}`);
+        } else {
+          // FK tidak disebut di --fk-columns: auto-resolve.
+          const refPk = typeof this.db.getPrimaryKey === 'function'
+            ? await this.db.getPrimaryKey(qualifiedRt)
+            : null;
+          const display = pickDisplayColumn(refColumnsMap[key], refPk);
+          if (!display) {
+            throw new Error(
+              `Could not auto-resolve a display column for referenced table "${rt}" ` +
+              '(no name/code column and no primary key found). Provide --fk-columns explicitly.'
+            );
+          }
+          const localColumn = isAmbiguous ? localColRaw || null : null;
+          fkSpec.push({ table: rt, column: display, localColumn, raw: `${rt}.${display}` });
+          if (isAmbiguous && localColumn) {
+            console.log(`  [AUTO]    ${tableName}.${localColumn} -> ${rt}.${display} (display column, auto-disambiguated)`);
+          } else {
+            console.log(`  [AUTO]    ${tableName} -> ${rt}.${display} (display column)`);
+          }
         }
       }
     }
 
-    return buildForeignKeyExpansion(payload, fkSpec, foreignKeys, refColumnsMap, baseColumns);
+    return buildForeignKeyExpansion(payload, fkSpec, foreignKeys, refColumnsMap, baseColumns, this.db.dbType, this.db.fkAutoJoin || 'left');
   }
 
   /**

package/generators/lib/payload/schema-diff.js

@@ -190,9 +190,16 @@ async function compareSchemaStrict(payload, db, options = {}) {
 
     const { explicit, audit } = resolveEffectiveFieldList(payload);
 
+    // Bila ada kegagalan resolusi query (file: SQL error), kolom non-fisik yang
+    // tidak ditemukan di validColumnSet kemungkinan kolom JOIN yang tidak bisa
+    // diverifikasi — bukan drift nyata. Jangan laporkan sebagai removed agar
+    // SQL error tetap menjadi satu-satunya blocker yang terlihat.
+    const hasQueryFailures = (querySourceResult.warnings || []).length > 0;
+
     const explicitSet = new Set(explicit);
     for (const field of explicit) {
         if (!validColumnSet.has(field)) {
+            if (hasQueryFailures && !dbColumnSet.has(field)) continue;
             result.removed.push({ column: field, source: 'payload' });
         }
     }
@@ -486,6 +493,106 @@ function substituteQueryPlaceholders(sql, tableName) {
     return sql.replace(/\$\{tableName\}/g, tableName);
 }
 
+/**
+ * Resolve kolom per-sumber untuk derivasi field projections di Phase 02.
+ *
+ * Mengembalikan:
+ * - `physicalColumns`: nama kolom fisik tabel dari getDetailedColumnInfo
+ * - `readSourceColumns`: kolom dari sumber-baca yang menang resolusi
+ *     (viewName ≠ tableName → viewName; ada viewQuery → viewQuery; else → physicalColumns)
+ *     [] berarti sumber ada tapi introspeksi gagal (hard-fail trigger di deriveFieldProjections)
+ * - `datatablesColumns`: kolom dari datatablesQuery.
+ *     null = tidak ada datatablesQuery; [] = ada tapi introspeksi gagal
+ *
+ * Dipanggil di alur `endpoint create` menggunakan db handle yang sama dengan
+ * compareSchemaStrict (reuse koneksi, tidak buka koneksi baru — D2).
+ *
+ * @param {Object} payload
+ * @param {Object} db - DatabaseIntrospector terkoneksi
+ * @param {Object} [options]
+ * @param {string} [options.payloadDir] - Folder payload untuk resolve file: reference
+ * @returns {Promise<{physicalColumns: string[], readSourceColumns: string[], datatablesColumns: string[]|null}>}
+ */
+async function resolveFieldProjectionInputs(payload, db, options = {}) {
+    const payloadDir = options.payloadDir || null;
+    const tableName = payload.tableName;
+
+    // 1. physicalColumns dari getDetailedColumnInfo
+    let physicalColumns = [];
+    try {
+        const dbCols = await db.getDetailedColumnInfo(tableName);
+        physicalColumns = Array.isArray(dbCols) ? dbCols.map(c => c.column_name) : [];
+    } catch (_err) {
+        // Gagal → physicalColumns tetap []
+    }
+
+    // 2. readSourceColumns: priority viewName → viewQuery → tableName (physicalColumns)
+    const hasViewName = typeof payload.viewName === 'string' &&
+        payload.viewName.trim().length > 0 &&
+        payload.viewName.trim() !== tableName;
+    const hasViewQuery = typeof payload.viewQuery === 'string' &&
+        payload.viewQuery.trim().length > 0;
+
+    let readSourceColumns;
+    if (hasViewName) {
+        // P1: viewName berbeda dari tableName — introspeksi view
+        try {
+            const viewCols = await db.getDetailedColumnInfo(payload.viewName.trim());
+            readSourceColumns = Array.isArray(viewCols) ? viewCols.map(c => c.column_name) : [];
+        } catch (_err) {
+            readSourceColumns = [];
+        }
+    } else if (hasViewQuery) {
+        // P2: viewQuery — describe query
+        const resolved = resolveSqlSource(payload.viewQuery, payloadDir, 'viewQuery');
+        if (!resolved.ok) {
+            readSourceColumns = [];
+        } else {
+            const sql = substituteQueryPlaceholders(resolved.sql, tableName);
+            if (typeof db.describeQueryColumns !== 'function') {
+                readSourceColumns = [];
+            } else {
+                try {
+                    const desc = await db.describeQueryColumns(sql);
+                    readSourceColumns = (desc.ok && Array.isArray(desc.columns))
+                        ? desc.columns
+                        : [];
+                } catch (_err) {
+                    readSourceColumns = [];
+                }
+            }
+        }
+    } else {
+        // Fallback: read source = tableName → gunakan physicalColumns
+        readSourceColumns = physicalColumns;
+    }
+
+    // 3. datatablesColumns dari datatablesQuery (null bila tidak ada)
+    let datatablesColumns = null;
+    if (typeof payload.datatablesQuery === 'string' && payload.datatablesQuery.trim().length > 0) {
+        const resolved = resolveSqlSource(payload.datatablesQuery, payloadDir, 'datatablesQuery');
+        if (!resolved.ok) {
+            datatablesColumns = [];
+        } else {
+            const sql = substituteQueryPlaceholders(resolved.sql, tableName);
+            if (typeof db.describeQueryColumns !== 'function') {
+                datatablesColumns = [];
+            } else {
+                try {
+                    const desc = await db.describeQueryColumns(sql);
+                    datatablesColumns = (desc.ok && Array.isArray(desc.columns))
+                        ? desc.columns
+                        : [];
+                } catch (_err) {
+                    datatablesColumns = [];
+                }
+            }
+        }
+    }
+
+    return { physicalColumns, readSourceColumns, datatablesColumns };
+}
+
 module.exports = {
     DEFAULT_EXCLUDED_COLUMNS,
     normalizeDatabaseType,
@@ -493,5 +600,6 @@ module.exports = {
     compareSchemaStrict,
     formatDriftReport,
     resolveQuerySourceColumns,
+    resolveFieldProjectionInputs,
     resolveSqlSource
 };