@restforgejs/platform 5.1.6 → 5.1.16

package/generators/cli/fast-track.js

@@ -28,6 +28,11 @@ const http = require('node:http');
 const readline = require('node:readline');
 const { spawnSync } = require('node:child_process');
 
+// Loader SDF yang SAMA dengan `schema migrate`. Bersifat rekursif sehingga
+// struktur per-schema (mis. `schema/public/visitors.js`) ikut terbaca, dan
+// mengembalikan IR model dengan relasi ter-normalisasi (sumber FK yang andal).
+const { loadSchemaPath } = require('../lib/dbschema-kit/loader');
+
 // ---------------------------------------------------------------------------
 // Default konfigurasi (selaras dengan restforge-playbook/fast-track.mjs)
 // ---------------------------------------------------------------------------
@@ -207,9 +212,11 @@ const FALLBACK_TABLES = [
 ];
 
 /**
- * Mengumpulkan nama tabel dari folder schema bila ada; bila tidak, memakai
+ * Mengumpulkan nama tabel dari folder schema bila ada (rekursif, termasuk
+ * subfolder per schema seperti `schema/public/*.js`); bila tidak, memakai
  * daftar fallback yang dipadkan sampai 30 entri agar contoh kanonik (30 tabel)
- * tetap dapat dirender.
+ * tetap dapat dirender. Nama yang dikumpulkan adalah kebab tabel agar count
+ * preview konsisten dengan file payload/endpoint yang akan dibuat.
  */
 function collectTables(schemaDir) {
     let names = [];
@@ -217,10 +224,7 @@ function collectTables(schemaDir) {
 
     try {
         if (schemaDir && fs.existsSync(schemaDir) && fs.statSync(schemaDir).isDirectory()) {
-            names = fs.readdirSync(schemaDir)
-                .filter((f) => f.endsWith('.js') && !f.startsWith('_') && !f.endsWith('.test.js'))
-                .map((f) => f.slice(0, -3))
-                .sort();
+            names = loadModels(schemaDir).map((m) => m.kebab).sort();
             if (names.length > 0) realSchema = true;
         }
     } catch (_err) {
@@ -497,48 +501,64 @@ function ensureEnv(ctx) {
 const AUDIT_COLS = new Set(['created_at', 'created_by', 'updated_at', 'updated_by']);
 
 /**
- * Parse satu file SDF menjadi descriptor model. Deterministik dari SDF (tanpa DB):
- *   { kebab, table, pk, fields[{name,isPk,isAudit,fk}], fks[{childCol,parentTable,parentCol}], displayCols }
- * displayCols = kolom yang mengandung `code`/`name`, di luar PK & kolom audit
- * (dipakai sebagai kolom display saat tabel ini menjadi parent FK).
+ * Turunkan kebab dari NAMA TABEL (bukan nama file) dengan normalisasi
+ * `[._]` -> `-`, identik dengan penamaan file output `payload generate`
+ * (payload-runner: baseFilename = table.replace(/[._]/g, '-')). Dengan ini
+ * `endpoint create --payload=<kebab>.json` dan `payload migrate --name=<kebab>.json`
+ * menemukan file payload yang benar, baik untuk SDF bernama underscore (hasil
+ * `schema introspect`, mis. `visitor_categories.js`) maupun kebab.
+ */
+function tableToKebab(table) {
+    return table.replace(/[._]/g, '-');
+}
+
+/**
+ * Muat seluruh SDF di folder memakai loader dbschema-kit yang SAMA dengan
+ * `schema migrate`. Loader bersifat REKURSIF sehingga struktur per-schema
+ * (mis. `schema/public/visitors.js`) ikut terbaca; flat readdir lama hanya
+ * membaca top-level sehingga subfolder schema tidak dikenali.
+ *
+ * Mengembalikan descriptor per tabel (deterministik dari SDF, tanpa DB):
+ *   { kebab, table, fks[{childCol,parentTable,parentCol}], displayCols }
+ *
+ * FK dibaca dari `relations` (belongsTo) pada IR model. IR menormalkan KEDUA
+ * gaya format: blok `relations:` eksplisit (gaya `schema introspect`) DAN inline
+ * `fk:<parent>.<col>` pada field (di-auto-promote ke relations oleh ir-builder).
+ * displayCols = kolom code/name di luar PK & kolom audit, dipakai sebagai kolom
+ * display saat tabel ini menjadi parent FK (untuk `payload sync --expand-fk`).
  */
-function parseModel(absFile, kebab) {
-    let content = '';
-    try { content = fs.readFileSync(absFile, 'utf8'); } catch (_err) { /* kosong */ }
-    const table = (content.match(/defineModel\(\s*['"]([^'"]+)['"]/) || [, kebab.replace(/-/g, '_')])[1];
-    const block = (content.match(/fields\s*:\s*\{([\s\S]*?)\}/) || [, ''])[1];
-
-    const fields = [];
-    const re = /(\w+)\s*:\s*'([^']*)'/g;
-    let m;
-    while ((m = re.exec(block)) !== null) {
-        const name = m[1];
-        const spec = m[2];
-        const fkMatch = spec.match(/fk:(\w+)\.(\w+)/);
-        fields.push({
-            name,
-            isPk: /\bpk\b/.test(spec),
-            isAudit: AUDIT_COLS.has(name),
-            fk: fkMatch ? { parentTable: fkMatch[1], parentCol: fkMatch[2] } : null
+function loadModels(schemaDir) {
+    const models = loadSchemaPath(schemaDir);
+    const entries = [];
+    for (const model of models.values()) {
+        const table = model.tableName;
+        const primaryKey = Array.isArray(model.primaryKey) ? model.primaryKey : [];
+
+        const fks = [];
+        for (const rel of Object.values(model.relations || {})) {
+            if (rel.type !== 'belongsTo' || !rel.localKey || !rel.target) continue;
+            fks.push({
+                childCol: rel.localKey,
+                parentTable: rel.target,
+                parentCol: rel.references || null
+            });
+        }
+
+        const displayCols = Object.keys(model.fields || {}).filter((name) => {
+            const field = model.fields[name];
+            const isPk = (field && field.pk === true) || primaryKey.includes(name);
+            return !isPk && !AUDIT_COLS.has(name) && /(code|name)/i.test(name);
         });
-    }
-    const pk = (fields.find((f) => f.isPk) || {}).name || null;
-    const displayCols = fields
-        .filter((f) => !f.isPk && !f.isAudit && /(code|name)/i.test(f.name))
-        .map((f) => f.name);
-    const fks = fields
-        .filter((f) => f.fk)
-        .map((f) => ({ childCol: f.name, parentTable: f.fk.parentTable, parentCol: f.fk.parentCol }));
 
-    return { kebab, table, pk, fields, fks, displayCols };
+        entries.push({ kebab: tableToKebab(table), table, fks, displayCols });
+    }
+    entries.sort((a, b) => a.table.localeCompare(b.table));
+    return entries;
 }
 
-/** Bangun daftar model dari folder schema. */
+/** Bangun daftar model dari folder schema (rekursif, via loader bersama). */
 function buildTableEntries(schemaDir) {
-    const files = fs.readdirSync(schemaDir)
-        .filter((f) => f.endsWith('.js') && !f.startsWith('_') && !f.endsWith('.test.js'))
-        .sort();
-    return files.map((f) => parseModel(path.join(schemaDir, f), f.slice(0, -3)));
+    return loadModels(schemaDir);
 }
 
 /**
@@ -946,5 +966,5 @@ module.exports = {
 // terpisah tanpa menjalankan pipeline penuh. Pada penggunaan CLI normal env ini
 // tidak di-set sehingga export tetap berupa contract murni.
 if (process.env.FASTTRACK_TEST === '1') {
-    module.exports.__test = { parseModel, buildTableEntries, fkColumnsForEntry };
+    module.exports.__test = { loadModels, buildTableEntries, fkColumnsForEntry, tableToKebab };
 }

package/generators/cli/payload/generate.js

@@ -36,18 +36,26 @@ module.exports = {
             required: false,
             default: null,
             description: 'Output directory untuk file payload yang di-generate (default: payload/)'
+        },
+        'schema-path': {
+            type: 'string',
+            required: false,
+            default: 'schema',
+            description: 'Lokasi SDF (file atau folder) sumber metadata tabel (default: folder `schema`). WAJIB memuat tabel bila tabel memiliki kolom soft-delete (is_deleted/deleted_at/deleted_by): blok softDelete RDF diturunkan dari SDF (R12/R13). Diabaikan untuk tabel non-soft-delete.'
         }
     },
     examples: [
         'npx restforge payload generate --config=db.env --table=users',
-        'npx restforge payload generate --config=db.env --table=users --output=./my-payloads'
+        'npx restforge payload generate --config=db.env --table=users --output=./my-payloads',
+        'npx restforge payload generate --config=db.env --table=visitor_categories --schema-path=./schema/visitor-categories.js'
     ],
     async handler(args) {
         const generator = new PayloadGenerator();
         await generator.run({
             config: args.config,
             table: args.table,
-            output: args.output || null
+            output: args.output || null,
+            'schema-path': args['schema-path']
         });
     }
 };

package/generators/cli/schema/apply.js

@@ -80,6 +80,7 @@ async function collectTableMeta(introspector, target) {
     const constraints = await introspector.getConstraints(ref);
     const foreignKeys = await introspector.getForeignKeys(ref);
     const indexes = await introspector.getIndexes(ref);
+    const checks = await introspector.getCheckConstraints(ref);
 
     const pkConstraint = constraints.find((c) => c.type === 'PRIMARY KEY');
     const uniqueConstraints = constraints
@@ -94,7 +95,11 @@ async function collectTableMeta(introspector, target) {
         uniques: uniqueConstraints,
         foreignKeys,
         indexes,
-        checks: []
+        // introspect-mapper expects { name, expression }; getCheckConstraints
+        // returns { name, clause } (D5 wiring, Phase 03).
+        checks: Array.isArray(checks)
+            ? checks.map((c) => ({ name: c.name, expression: c.clause }))
+            : []
     };
 }
 

package/generators/cli/schema/diff.js

@@ -69,6 +69,7 @@ async function collectTableMeta(introspector, target) {
     const constraints = await introspector.getConstraints(ref);
     const foreignKeys = await introspector.getForeignKeys(ref);
     const indexes = await introspector.getIndexes(ref);
+    const checks = await introspector.getCheckConstraints(ref);
 
     const pkConstraint = constraints.find((c) => c.type === 'PRIMARY KEY');
     const uniqueConstraints = constraints
@@ -83,7 +84,11 @@ async function collectTableMeta(introspector, target) {
         uniques: uniqueConstraints,
         foreignKeys,
         indexes,
-        checks: []
+        // introspect-mapper expects { name, expression }; getCheckConstraints
+        // returns { name, clause } (D5 wiring, Phase 03).
+        checks: Array.isArray(checks)
+            ? checks.map((c) => ({ name: c.name, expression: c.clause }))
+            : []
     };
 }
 

package/generators/cli/schema/introspect.js

@@ -146,6 +146,7 @@ async function collectTableMeta(introspector, target) {
     const constraints = await introspector.getConstraints(ref);
     const foreignKeys = await introspector.getForeignKeys(ref);
     const indexes = await introspector.getIndexes(ref);
+    const checks = await introspector.getCheckConstraints(ref);
 
     const pkConstraint = constraints.find((c) => c.type === 'PRIMARY KEY');
     const uniqueConstraints = constraints
@@ -160,7 +161,11 @@ async function collectTableMeta(introspector, target) {
         uniques: uniqueConstraints,
         foreignKeys,
         indexes,
-        checks: []
+        // introspect-mapper expects { name, expression }; getCheckConstraints
+        // returns { name, clause } (D5 wiring, Phase 03).
+        checks: Array.isArray(checks)
+            ? checks.map((c) => ({ name: c.name, expression: c.clause }))
+            : []
     };
 }
 
@@ -406,16 +411,32 @@ module.exports = {
         }
 
         const dialect = config.dialect;
-        const emitted = result.tables.map((tableMeta) => {
-            const ir = mapTableMetaToIR(tableMeta, dialect);
-            const source = serialize(ir);
-            return {
-                tableName: ir.tableName,
-                schemaName: ir.schemaName,
-                qualifiedName: ir.qualifiedName,
-                source
-            };
-        });
+        let emitted;
+        try {
+            emitted = result.tables.map((tableMeta) => {
+                // strictSoftDelete: introspect ERROR (R6) bila kolom soft-delete tidak
+                // lengkap / tipe salah / CHECK konsistensi hilang, dan tidak menghasilkan SDF.
+                const ir = mapTableMetaToIR(tableMeta, dialect, { strictSoftDelete: true });
+                const source = serialize(ir);
+                return {
+                    tableName: ir.tableName,
+                    schemaName: ir.schemaName,
+                    qualifiedName: ir.qualifiedName,
+                    source
+                };
+            });
+        } catch (err) {
+            if (err && err.isSoftDeleteIntrospectError) {
+                // Pesan multi-baris (R6/R8) sudah lengkap; print apa adanya lalu rethrow
+                // silent agar cli-entry tidak menambah prefix "Error: " yang merusak format.
+                console.error(err.message);
+                const e = new Error(err.message);
+                e.silent = true;
+                e.exitCode = 1;
+                throw e;
+            }
+            throw err;
+        }
 
         const schemaSet = new Set();
         for (const item of emitted) {

package/generators/lib/data/db-executor.js

@@ -38,33 +38,33 @@ function loadDriver(dialect) {
     case 'postgresql':
       if (!pgDriver) {
         try { pgDriver = require('pg'); } catch (_e) {
-          throw new Error('PostgreSQL driver (pg) tidak terpasang. Jalankan: npm install pg');
+          throw new Error('PostgreSQL driver (pg) is not installed. Run: npm install pg');
         }
       }
       return pgDriver;
     case 'mysql':
       if (!mysqlDriver) {
         try { mysqlDriver = require('mysql2/promise'); } catch (_e) {
-          throw new Error('MySQL driver (mysql2) tidak terpasang. Jalankan: npm install mysql2');
+          throw new Error('MySQL driver (mysql2) is not installed. Run: npm install mysql2');
         }
       }
       return mysqlDriver;
     case 'oracle':
       if (!oracleDriver) {
         try { oracleDriver = require('oracledb'); } catch (_e) {
-          throw new Error('Oracle driver (oracledb) tidak terpasang. Jalankan: npm install oracledb');
+          throw new Error('Oracle driver (oracledb) is not installed. Run: npm install oracledb');
         }
       }
       return oracleDriver;
     case 'sqlite':
       if (!sqliteDriver) {
         try { sqliteDriver = require('better-sqlite3'); } catch (_e) {
-          throw new Error('SQLite driver (better-sqlite3) tidak terpasang. Jalankan: npm rebuild better-sqlite3');
+          throw new Error('SQLite driver (better-sqlite3) is not installed. Run: npm rebuild better-sqlite3');
         }
       }
       return sqliteDriver;
     default:
-      throw new Error(`Dialect tidak didukung: ${dialect}. Didukung: postgresql, mysql, oracle, sqlite`);
+      throw new Error(`Unsupported dialect: ${dialect}. Supported: postgresql, mysql, oracle, sqlite`);
   }
 }
 
@@ -362,7 +362,7 @@ function createSqliteExecutor(config) {
   const Database = loadDriver('sqlite');
   const filePath = config.file || config.database;
   if (!filePath) {
-    throw new Error('SQLite: path file database wajib ada di config (field "file" atau "database")');
+    throw new Error('SQLite: the database file path is required in config (field "file" or "database")');
   }
   let db = null;
 
@@ -419,7 +419,7 @@ function createSqliteExecutor(config) {
  */
 function createExecutor(config) {
   if (!config || typeof config !== 'object') {
-    throw new Error('createExecutor: config wajib berupa object hasil loadConfig');
+    throw new Error('createExecutor: config must be an object produced by loadConfig');
   }
   const dialect = normalizeDialect(config.dialect);
   switch (dialect) {
@@ -428,7 +428,7 @@ function createExecutor(config) {
     case 'oracle': return createOracleExecutor(config);
     case 'sqlite': return createSqliteExecutor(config);
     default:
-      throw new Error(`createExecutor: dialect tidak didukung '${config.dialect}'`);
+      throw new Error(`createExecutor: unsupported dialect '${config.dialect}'`);
   }
 }
 

package/generators/lib/data/envelope.js

@@ -55,7 +55,7 @@ function resolveSink(sink) {
   if (typeof sink.write === 'function') {
     return { write: (chunk) => sink.write(chunk), buffer: null };
   }
-  throw new Error('EnvelopeWriter: sink harus berupa fungsi, object dengan method write(), atau undefined');
+  throw new Error('EnvelopeWriter: sink must be a function, an object with a write() method, or undefined');
 }
 
 /**
@@ -116,7 +116,7 @@ class EnvelopeWriter {
    */
   appendRows(rows) {
     if (this._state !== 'header') {
-      throw new Error('EnvelopeWriter: appendRows() harus dipanggil setelah writeHeader() dan sebelum end()');
+      throw new Error('EnvelopeWriter: appendRows() must be called after writeHeader() and before end()');
     }
     if (!Array.isArray(rows)) {
       throw new Error('EnvelopeWriter: appendRows() membutuhkan array rows');
@@ -138,7 +138,7 @@ class EnvelopeWriter {
       throw new Error('EnvelopeWriter: end() dipanggil sebelum writeHeader()');
     }
     if (this._state === 'ended') {
-      throw new Error('EnvelopeWriter: end() sudah dipanggil');
+      throw new Error('EnvelopeWriter: end() has already been called');
     }
     this._write(']}');
     this._state = 'ended';

package/generators/lib/dbschema-kit/apply-engine.js

@@ -645,6 +645,26 @@ function noteDeferredSections(delta, skipped) {
             });
         }
     }
+
+    // Soft-delete CHECK drift — Detection-only di Fase 1 (TIDAK ada emitter ALTER ADD
+    // CHECK). apply tidak meng-auto-retrofit; cukup laporkan + rekomendasi recreate/manual.
+    if (delta.softDelete && delta.softDelete.match === false) {
+        const sd = delta.softDelete;
+        const description = (sd.sdf && !sd.db)
+            ? `Soft-delete consistency CHECK missing in DB for '${delta.tableName}'. ` +
+              `Detection-only in Phase 1 (no ALTER ADD CHECK): retrofit via ` +
+              `'schema migrate --drop' (recreate) or add the CHECK manually.`
+            : `Soft-delete state mismatch for '${delta.tableName}' ` +
+              `(DB has the consistency CHECK, SDF does not declare softDelete.enabled). ` +
+              `Detection-only: reconcile SDF/DB manually.`;
+        skipped.push({
+            table: delta.tableName,
+            kind: 'soft-delete-check',
+            target: 'soft_delete_consistency',
+            reason: 'detection-only',
+            description
+        });
+    }
 }
 
 // ─────────────────────────────────────────────────────────────

package/generators/lib/dbschema-kit/dialect/mysql.js

@@ -84,6 +84,8 @@ module.exports = {
   maxIdentifierLength: 64,
   // Boolean disimpan sebagai VARCHAR(5) 'true'/'false'; bukan native.
   nativeBoolean: false,
+  // MySQL tidak punya partial index efisien; index soft-delete jadi plain (R11).
+  supportsPartialIndex: false,
   mapType,
   formatDefault,
   quoteIdentifier,

package/generators/lib/dbschema-kit/dialect/oracle.js

@@ -89,6 +89,8 @@ module.exports = {
   maxIdentifierLength: 128,
   // Boolean disimpan sebagai VARCHAR2(5) 'true'/'false'; bukan native.
   nativeBoolean: false,
+  // Oracle tidak punya partial index efisien; index soft-delete jadi plain (R11).
+  supportsPartialIndex: false,
   mapType,
   formatDefault,
   quoteIdentifier,

package/generators/lib/dbschema-kit/dialect/postgres.js

@@ -84,6 +84,10 @@ module.exports = {
   // PostgreSQL punya tipe BOOLEAN native; dialect lain menyimpan boolean
   // sebagai VARCHAR 'true'/'false' dan butuh CHECK sebagai penanda boolean.
   nativeBoolean: true,
+  // PostgreSQL mendukung partial index (`CREATE INDEX ... WHERE <predikat>`).
+  // Dipakai R10/R11: index non-unique pada tabel soft-delete jadi partial
+  // (`WHERE is_deleted = FALSE`).
+  supportsPartialIndex: true,
   mapType,
   formatDefault,
   quoteIdentifier,

package/generators/lib/dbschema-kit/dialect/sqlite.js

@@ -87,6 +87,11 @@ module.exports = {
   maxIdentifierLength: 63,
   // Boolean disimpan sebagai VARCHAR(5) 'true'/'false'; bukan native.
   nativeBoolean: false,
+  // Flag ini menandai apakah index non-unique soft-delete dimaterialisasi sebagai
+  // partial index (R10/R11). Per plan master R11, SQLite masuk grup plain index
+  // (bersama MySQL/Oracle), jadi false. (Soft-delete Fase 1 juga PostgreSQL-only via
+  // guard di emitter, sehingga jalur ini belum aktif untuk SQLite.)
+  supportsPartialIndex: false,
   mapType,
   formatDefault,
   quoteIdentifier,

package/generators/lib/dbschema-kit/diff-engine.js

@@ -588,6 +588,24 @@ function diffChecks(sdfChecks, dbChecks) {
     return { onlyInSdf, onlyInDb, mismatched };
 }
 
+// ─────────────────────────────────────────────────────────────
+// Soft-delete comparison (R8 poin 2 / R6 reverse)
+// ─────────────────────────────────────────────────────────────
+
+// Bandingkan status soft-delete kedua IR. CHECK konsistensi soft-delete bersifat
+// IMPLISIT (diturunkan dari `softDelete.enabled`, tidak pernah di-list di `checks`).
+// introspect-mapper men-set `dbIR.softDelete = { enabled: true }` HANYA bila tabel DB
+// valid (3 kolom + tipe benar + CHECK ada by-nama), dan mengecualikan CHECK soft-delete
+// dari `checks` di kedua sisi. Maka:
+//   - enabled di kedua sisi → CHECK implisit expected di keduanya → tidak ada drift.
+//   - SDF enabled tetapi DB tidak (CHECK absen / kolom-tipe tak valid) → drift NYATA
+//     (Detection-only; dilaporkan apa adanya, bukan disembunyikan, bukan di-auto-fix).
+function diffSoftDelete(sdfIR, dbIR) {
+    const sdf = !!(sdfIR && sdfIR.softDelete && sdfIR.softDelete.enabled === true);
+    const db = !!(dbIR && dbIR.softDelete && dbIR.softDelete.enabled === true);
+    return { sdf, db, match: sdf === db };
+}
+
 // ─────────────────────────────────────────────────────────────
 // Top-level API
 // ─────────────────────────────────────────────────────────────
@@ -610,6 +628,7 @@ function hasAnyDrift(delta) {
     if (delta.checks && delta.checks.onlyInSdf.length > 0) return true;
     if (delta.checks && delta.checks.onlyInDb.length > 0) return true;
     if (delta.checks && delta.checks.mismatched.length > 0) return true;
+    if (delta.softDelete && delta.softDelete.match === false) return true;
     return false;
 }
 
@@ -631,7 +650,8 @@ function diffModel(sdfIR, dbIR) {
         indexes: diffIndexes(sdfIR.indexes, dbIR.indexes),
         uniques: diffUniques(sdfIR.uniques, dbIR.uniques),
         foreignKeys: diffForeignKeys(sdfIR, dbIR),
-        checks: diffChecks(sdfIR.checks, dbIR.checks)
+        checks: diffChecks(sdfIR.checks, dbIR.checks),
+        softDelete: diffSoftDelete(sdfIR, dbIR)
     };
     delta.hasDrift = hasAnyDrift(delta);
 
@@ -706,6 +726,7 @@ module.exports = {
         diffForeignKeys,
         extractForeignKeys,
         diffChecks,
+        diffSoftDelete,
         compareDefaultValue,
         canonicalDefaultPayload,
         normalizeWeakDefault,