@restforgejs/platform 5.2.0 → 5.2.10

package/generators/cli/fast-track.js

@@ -398,6 +398,111 @@ async function collectConfig(args, ask, fileCfg = {}) {
     return cfg;
 }
 
+/**
+ * Versi non-interaktif dari `collectConfig`: hitung cfg final dari fileCfg +
+ * DEFAULTS dengan urutan prioritas yang SAMA PERSIS dengan default per-field
+ * yang dipakai `collectConfig` (lihat masing-masing `askField` di atas), tanpa
+ * menanyakan apa pun ke user. Dipakai saat user memilih "Continue" pada
+ * existing-config summary.
+ */
+function defaultCfgFromFile(args, fileCfg = {}) {
+    const cfg = {};
+    cfg.LICENSE = args.license || fileCfg.LICENSE || DEFAULTS.LICENSE;
+    cfg.SERVER_ADDRESS = fileCfg.SERVER_ADDRESS || DEFAULTS.SERVER_ADDRESS;
+    cfg.SERVER_PORT = fileCfg.SERVER_PORT || DEFAULTS.SERVER_PORT;
+    cfg.WEB_SERVER_PORT = DEFAULTS.WEB_SERVER_PORT;
+    cfg.DB_TYPE = (fileCfg.DB_TYPE || DEFAULTS.DB_TYPE).toLowerCase();
+
+    if (cfg.DB_TYPE === 'sqlite') {
+        cfg.DB_FILE = fileCfg.DB_FILE || DEFAULTS.DB_FILE;
+        cfg.DB_NAME = cfg.DB_FILE;
+    } else {
+        const dbDef = DB_TYPE_DEFAULTS[cfg.DB_TYPE] || {};
+        cfg.DB_HOST = fileCfg.DB_HOST || DEFAULTS.DB_HOST;
+        cfg.DB_PORT = fileCfg.DB_PORT || dbDef.DB_PORT || DEFAULTS.DB_PORT;
+        cfg.DB_USER = fileCfg.DB_USER || dbDef.DB_USER || DEFAULTS.DB_USER;
+        cfg.DB_PASSWORD = fileCfg.DB_PASSWORD || DEFAULTS.DB_PASSWORD;
+        cfg.DB_NAME = fileCfg.DB_NAME || dbDef.DB_NAME || DEFAULTS.DB_NAME;
+    }
+
+    return cfg;
+}
+
+/**
+ * Tampilkan ringkasan config yang sudah ada (hasil `resolveSourceConfig`),
+ * dalam bentuk cfg yang sudah di-default-kan (`defaultCfgFromFile`).
+ */
+function printExistingConfigSummary({ project, schemaFlag, configName, cfg, overwrite }) {
+    console.log('');
+    console.log(rule('='));
+    console.log('  RESTForge Fast-Track  —  Existing Configuration');
+    console.log(rule('='));
+    console.log('');
+    console.log(`  Project    : ${project}`);
+    console.log(`  Schema     : ${schemaFlag}`);
+    console.log(`  Config     : ${configName}`);
+    console.log(`  License    : ${maskLicense(cfg.LICENSE)}`);
+    console.log(`  REST API   : ${cfg.SERVER_ADDRESS}:${cfg.SERVER_PORT}`);
+    console.log(`  Web server : ${cfg.SERVER_ADDRESS}:${cfg.WEB_SERVER_PORT}`);
+    console.log(`  Mode       : ${overwrite ? 'overwrite' : 'sync'}`);
+    console.log('');
+    console.log('  Database Configuration');
+    if (cfg.DB_TYPE === 'sqlite') {
+        console.log(`  Type       : ${cfg.DB_TYPE}`);
+        console.log(`  File       : ${cfg.DB_FILE}`);
+    } else {
+        console.log(`  Type       : ${cfg.DB_TYPE}`);
+        console.log(`  Host       : ${cfg.DB_HOST}`);
+        console.log(`  Port       : ${cfg.DB_PORT}`);
+        console.log(`  User       : ${cfg.DB_USER}`);
+        console.log(`  Password   : ${cfg.DB_PASSWORD}`);
+        console.log(`  DB Name    : ${cfg.DB_NAME}`);
+    }
+}
+
+// Menu pemilihan aksi setelah existing-config summary ditampilkan. Default
+// 'continue' (Enter langsung lanjut tanpa edit), selaras dengan pola
+// SCOPE_MENU/DEFAULT_SCOPE di bawah.
+const CONFIG_ACTION_MENU = [
+    { key: '1', text: 'Edit Configuration' },
+    { key: '2', text: 'Continue' }
+];
+const DEFAULT_CONFIG_ACTION = '2';
+
+/**
+ * Tanya user mau "Edit Configuration" atau "Continue" terhadap existing
+ * config yang baru ditampilkan. Mengikuti pola selektor `selectScope`
+ * (arrow-key untuk TTY, numbered fallback untuk non-TTY/piped input).
+ *
+ * @returns {Promise<'edit'|'continue'>}
+ */
+async function selectConfigAction(prompter) {
+    const ask = prompter.ask;
+
+    if (!process.stdin.isTTY) {
+        console.log('');
+        for (const m of CONFIG_ACTION_MENU) console.log(`    ${m.key}. ${m.text}`);
+        console.log('');
+
+        let choice = null;
+        while (!choice) {
+            const input = (await ask(`  Choice (1-2) [${DEFAULT_CONFIG_ACTION}]: `)).trim() || DEFAULT_CONFIG_ACTION;
+            choice = CONFIG_ACTION_MENU.find((m) => m.key === input);
+            if (!choice) console.log('  Invalid choice. Enter 1 or 2.');
+        }
+        return choice.key === '1' ? 'edit' : 'continue';
+    }
+
+    const initialIndex = CONFIG_ACTION_MENU.findIndex((m) => m.key === DEFAULT_CONFIG_ACTION);
+    const chosen = await arrowSelect({
+        title: '',
+        items: CONFIG_ACTION_MENU.map((m) => m.text),
+        initialIndex: initialIndex >= 0 ? initialIndex : 0,
+        prompter
+    });
+    return CONFIG_ACTION_MENU[chosen].key === '1' ? 'edit' : 'continue';
+}
+
 // ---------------------------------------------------------------------------
 // Fase pemilihan scope generate (menu)
 // ---------------------------------------------------------------------------
@@ -856,19 +961,49 @@ function tableToKebab(table) {
  * displayCols = kolom code/name di luar PK & kolom audit, dipakai sebagai kolom
  * display saat tabel ini menjadi parent FK (untuk `payload sync --expand-fk`).
  */
+// Postgres 'public' diperlakukan sebagai default implisit (selalu di search_path
+// secara konvensi), SAMA seperti pengecualian di `qualifiedRefTable()`
+// (generators/lib/payload/payload-runner.js). `schema introspect` SELALU menulis
+// field `schema:` eksplisit di SDF hasil introspeksi, termasuk untuk tabel yang
+// sebenarnya di schema default ('public') — tanpa pengecualian ini, SETIAP SDF
+// hasil introspect Postgres default-schema akan ikut di-qualify ('public.visitors'),
+// menghasilkan nama file RDF berprefix 'public-' yang tidak konsisten dengan JOIN
+// SQL (qualifiedRefTable() di payload-runner.js TIDAK menulis prefix 'public.' pada
+// klausa JOIN) — JOIN auto-discovery di `payload migrate` (migrate-runner.js) jadi
+// gagal menemukan file RDF parent, dan page UDF parent tidak pernah dibuat.
+const DEFAULT_SCHEMA_SENTINEL = 'public';
+function isQualifyingSchema(schemaName) {
+    return !!schemaName && schemaName !== DEFAULT_SCHEMA_SENTINEL;
+}
+
 function loadModels(schemaDir) {
     const models = loadSchemaPath(schemaDir);
     const entries = [];
     for (const model of models.values()) {
-        const table = model.tableName;
+        // qualifiedName (mis. 'myschema.guest_book') dipakai, bukan tableName
+        // bare, agar `--table=` yang dikirim ke `payload generate`/`payload sync`
+        // tetap menemukan tabel yang ada di custom schema (tanpa prefix, resolver
+        // koneksi default ke schema 'public'/setara dan tabel tidak ditemukan).
+        // Schema 'public' dikecualikan (lihat isQualifyingSchema) karena memang
+        // sudah default tanpa perlu di-qualify.
+        const schemaName = model.schemaName || null;
+        const table = isQualifyingSchema(schemaName) ? (model.qualifiedName || model.tableName) : 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;
+            // Konvensi SDF (restforge-handbook/catalogs/sdf/multi-schema.md): target
+            // relasi ditulis bare bila parent di schema YANG SAMA dengan child, dan
+            // fully-qualified hanya bila cross-schema. Qualify bare target dengan
+            // schema child di sini supaya konsisten dengan `table` qualified di atas
+            // (byTable/parentTables dibangun dari nilai ini, lihat ctx.byTable).
+            const parentTable = rel.target.includes('.')
+                ? rel.target
+                : (isQualifyingSchema(schemaName) ? `${schemaName}.${rel.target}` : rel.target);
             fks.push({
                 childCol: rel.localKey,
-                parentTable: rel.target,
+                parentTable,
                 parentCol: rel.references || null
             });
         }
@@ -879,7 +1014,17 @@ function loadModels(schemaDir) {
             return !isPk && !AUDIT_COLS.has(name) && /(code|name)/i.test(name);
         });
 
-        entries.push({ kebab: tableToKebab(table), table, fks, displayCols });
+        // `kebab` (qualified, mis. 'myschema-guest-book') HARUS dipakai untuk
+        // mencocokkan nama file RDF/UDF di disk (`payload generate` menulis
+        // baseFilename dari `--table=` literal, jadi ikut prefix schema).
+        // `resourceName` (bare, mis. 'guest-book') dipakai khusus untuk identitas
+        // REST endpoint (`endpoint create --name=`): endpoint TIDAK mengenal
+        // schema (itu murni konsep koneksi database), dan `payload migrate`
+        // (RDF -> UDF) sendiri sudah men-strip schema saat menurunkan apiPath/
+        // pageId (lihat backend-payload-migrator.js: cleanTable = tableName.split('.').pop()).
+        // Memakai `kebab` qualified untuk nama endpoint akan membuat route REST
+        // tidak sinkron dengan apiPath yang dipanggil frontend.
+        entries.push({ kebab: tableToKebab(table), resourceName: tableToKebab(model.tableName), table, fks, displayCols });
     }
     entries.sort((a, b) => a.table.localeCompare(b.table));
     return entries;
@@ -894,13 +1039,24 @@ function buildTableEntries(schemaDir) {
  * Turunkan daftar `--fk-columns` untuk `payload sync --expand-fk` dari SDF:
  * `<parentTable>.<displayCol>` untuk tiap kolom display (code/name) tiap parent.
  * Kosong bila tidak ada kolom display terdeteksi (jatuh ke mode AUTO command).
+ *
+ * `parentTable` di sini WAJIB bare (tanpa prefix schema), berbeda dari
+ * `fk.parentTable` yang dipakai untuk lookup `byTable` (qualified). Alasannya:
+ * `payload-runner.js parseFkColumns()` mem-validasi setiap entri persis 2 segmen
+ * (`table.column`), dan nilainya dicocokkan terhadap `getForeignKeys().references.table`
+ * hasil introspeksi DB — yang SELALU bare (`pg_class.relname`, schema ada di field
+ * terpisah `references.schema`). Mengirim `sch02.company.company_name` (3 segmen)
+ * ditolak validator; mengirim bare `company.company_name` cocok dengan hasil introspeksi.
  */
 function fkColumnsForEntry(entry, byTable) {
     const cols = [];
     for (const fk of entry.fks) {
         const parent = byTable.get(fk.parentTable);
         const disp = parent ? parent.displayCols : [];
-        for (const dc of disp) cols.push(`${fk.parentTable}.${dc}`);
+        const bareParentTable = fk.parentTable.includes('.')
+            ? fk.parentTable.split('.').pop()
+            : fk.parentTable;
+        for (const dc of disp) cols.push(`${bareParentTable}.${dc}`);
     }
     return cols;
 }
@@ -940,6 +1096,35 @@ async function waitForHealth(url, { timeoutMs = 30000, intervalMs = 600 } = {})
     return { ok: false, elapsedMs: Date.now() - start };
 }
 
+/**
+ * Satu kali GET <url>; resolve true bila ADA respons HTTP apa pun (status
+ * berapa saja). Beda dari `pingOnce` yang strict butuh 200 - dipakai untuk
+ * static file server (`npx serve`) yang sering me-redirect (301) request
+ * eksplisit ke "/index.html" menuju "/". 301 tetap berarti server SUDAH
+ * hidup; menunggu 200 di path tersebut bisa tidak pernah tercapai dan
+ * menghabiskan timeout penuh secara percuma.
+ */
+function pingAnyResponse(url, perReqTimeoutMs) {
+    return new Promise((resolve) => {
+        const req = http.get(url, (res) => {
+            res.resume(); // drain body, status/isi tidak relevan di sini
+            resolve(true);
+        });
+        req.setTimeout(perReqTimeoutMs, () => { req.destroy(); resolve(false); });
+        req.on('error', () => resolve(false));
+    });
+}
+
+/** Poll <url> sampai ADA respons (lihat `pingAnyResponse`) atau timeout. */
+async function waitForHttpUp(url, { timeoutMs = 10000, intervalMs = 300 } = {}) {
+    const start = Date.now();
+    while (Date.now() - start < timeoutMs) {
+        if (await pingAnyResponse(url, 2000)) return { ok: true, elapsedMs: Date.now() - start };
+        await sleep(intervalMs);
+    }
+    return { ok: false, elapsedMs: Date.now() - start };
+}
+
 /** Host untuk health URL: 0.0.0.0/kosong -> localhost (mirror banner runtime). */
 function healthHost(serverAddress) {
     return (!serverAddress || serverAddress === '0.0.0.0') ? 'localhost' : serverAddress;
@@ -998,7 +1183,9 @@ function runBackendPipeline(ctx) {
 
     phase('[4/4] REST endpoints');
     for (const t of ctx.tableEntries) {
-        run(`npx restforge endpoint create --project=${ctx.project} --name=${t.kebab} --payload=${t.kebab}.json ${cfgArg} --database=${dbFlag} --force`, ctx.cwd);
+        // --name= = identitas REST endpoint (bare, lihat resourceName di loadModels).
+        // --payload= = nama file RDF di disk (qualified/kebab, ikut prefix schema).
+        run(`npx restforge endpoint create --project=${ctx.project} --name=${t.resourceName} --payload=${t.kebab}.json ${cfgArg} --database=${dbFlag} --force`, ctx.cwd);
     }
 }
 
@@ -1104,18 +1291,17 @@ function printFinalSummary(ctx) {
     console.log(rule('='));
 }
 
-/** Konfirmasi lalu jalankan runtime server di window CMD baru. */
-async function maybeRunServer(ctx, ask) {
+/**
+ * Jalankan runtime server di window CMD baru + tunggu health check.
+ * Eksekusi murni (tanpa prompt) - dipakai baik oleh `maybeRunServer` (scope
+ * REST API Only) maupun `maybeRunServerAndFrontend` (scope REST API +
+ * Frontend, server harus start lebih dulu sebelum frontend).
+ */
+async function startServerNow(ctx) {
     // Samakan dengan pola server-start.bat: serve + --watch (auto-restart pada
     // perubahan src/). Format log rapi (pino-pretty) berasal dari NODE_ENV
     // development yang di-set saat spawn di bawah.
     const serveCmd = `npx restforge serve --project=${ctx.project} --config=${ctx.configFlag} --watch`;
-    console.log('');
-    const answer = (await ask('  Run Runtime Server now in a new window? (Y/n): ')).trim().toLowerCase();
-    if (answer === 'n' || answer === 'no') {
-        console.log(`  Skipped. Start later:  ${serveCmd}`);
-        return;
-    }
     freePort(ctx.cfg.SERVER_PORT);
     const title = `RESTForge Server - ${ctx.project}`;
     console.log(`\n  Opening new window: "${title}"`);
@@ -1129,7 +1315,7 @@ async function maybeRunServer(ctx, ask) {
     const r = spawnSync('cmd', ['/C', 'start', title, 'cmd', '/k', serveCmd], { cwd: ctx.cwd, stdio: 'inherit', env: serveEnv });
     if (r.error) {
         console.log(`  Failed to open server window: ${r.error.message}`);
-        return;
+        return false;
     }
     console.log('  ✓ Server window opened. Keep it open. Stop with Ctrl+C.');
 
@@ -1145,26 +1331,37 @@ async function maybeRunServer(ctx, ask) {
         console.log(`  ⚠ Health check timed out after ${(h.elapsedMs / 1000).toFixed(0)}s.`);
         console.log('    Server may still be starting; check the server window for errors.');
     }
+    return true;
+}
+
+/** Konfirmasi lalu jalankan runtime server di window CMD baru. Dipakai scope REST API Only. */
+async function maybeRunServer(ctx, ask) {
+    const serveCmd = `npx restforge serve --project=${ctx.project} --config=${ctx.configFlag} --watch`;
+    console.log('');
+    const answer = (await ask('  Run Runtime Server now in a new window? (Y/n): ')).trim().toLowerCase();
+    if (answer === 'n' || answer === 'no') {
+        console.log(`  Skipped. Start later:  ${serveCmd}`);
+        return;
+    }
+    await startServerNow(ctx);
 }
 
-/** Konfirmasi lalu jalankan aplikasi frontend (app-start.bat) di window CMD baru. */
-async function maybeRunFrontend(ctx, ask) {
+/**
+ * Jalankan aplikasi frontend di window CMD baru, tunggu static server siap,
+ * lalu otomatis buka browser default ke index.html agar user tidak perlu
+ * membukanya manual. Eksekusi murni (tanpa prompt).
+ */
+async function startFrontendNow(ctx) {
     const appDir = path.join(ctx.cwd, 'frontend', 'apps', ctx.project);
     const webPort = ctx.cfg.WEB_SERVER_PORT;
     // Jalankan langsung `npx serve . -l <port>` (identik untuk Windows & Linux),
     // tidak bergantung pada app-start.bat/.sh. File launcher itu urusan generator.
     const serveCmd = `npx serve . -l ${webPort}`;
-    console.log('');
-    const answer = (await ask('  Run Frontend Application now in a new window? (Y/n): ')).trim().toLowerCase();
-    if (answer === 'n' || answer === 'no') {
-        console.log(`  Skipped. Start later (in ${appDir}):  ${serveCmd}`);
-        return;
-    }
     const indexHtml = path.join(appDir, 'index.html');
     if (!fs.existsSync(indexHtml)) {
         console.log(`  Frontend app not found: ${indexHtml}`);
         console.log('  Frontend generation may have failed; cannot launch.');
-        return;
+        return false;
     }
     freePort(webPort);
     const title = `RESTForge Frontend - ${ctx.project}`;
@@ -1173,10 +1370,49 @@ async function maybeRunFrontend(ctx, ask) {
     const r = spawnSync('cmd', ['/C', 'start', title, 'cmd', '/k', serveCmd], { cwd: appDir, stdio: 'inherit' });
     if (r.error) {
         console.log(`  Failed to open frontend window: ${r.error.message}`);
-    } else {
-        console.log(`  ✓ Frontend window opened (WEB_SERVER_PORT ${webPort}).`);
-        console.log(`    Open: http://localhost:${webPort}/index.html`);
+        return false;
+    }
+    console.log(`  ✓ Frontend window opened (WEB_SERVER_PORT ${webPort}).`);
+
+    const url = `http://localhost:${webPort}/index.html`;
+    // Tunggu static server (`npx serve`) benar-benar siap sebelum buka browser,
+    // supaya tidak membuka tab dengan error "connection refused" (npx serve
+    // bisa butuh beberapa saat pada first-run, mis. resolve package). Pakai
+    // waitForHttpUp (bukan waitForHealth/200-strict) karena `serve` me-redirect
+    // "/index.html" -> "/" dengan 301 - menunggu 200 di path ini bisa tidak
+    // pernah tercapai dan menghabiskan timeout penuh secara percuma walau
+    // server sebenarnya sudah hidup sejak request pertama.
+    const ready = await waitForHttpUp(url, { timeoutMs: 10000, intervalMs: 300 });
+    console.log(`    Open: ${url}`);
+    if (!ready.ok) {
+        console.log('    ⚠ Frontend belum merespons - buka URL di atas manual bila browser tidak otomatis terbuka.');
+    }
+    const openResult = spawnSync('cmd', ['/C', 'start', '""', url], { stdio: 'ignore' });
+    if (openResult.error) {
+        console.log(`    (Could not open browser automatically: ${openResult.error.message})`);
+    }
+    return true;
+}
+
+/**
+ * Dialog gabungan untuk scope REST API + Frontend: SATU konfirmasi saja
+ * ("Run Runtime Server and frontend application now in a new window?"),
+ * tapi urutan eksekusi tetap wajib runtime server lebih dulu (frontend
+ * butuh API sudah hidup), baru lanjut frontend setelah server window
+ * terbuka + health check selesai.
+ */
+async function maybeRunServerAndFrontend(ctx, ask) {
+    const serveCmd = `npx restforge serve --project=${ctx.project} --config=${ctx.configFlag} --watch`;
+    const frontendCmd = `npx serve . -l ${ctx.cfg.WEB_SERVER_PORT}`;
+    console.log('');
+    const answer = (await ask('  Run Runtime Server and frontend application now in a new window? (Y/n): ')).trim().toLowerCase();
+    if (answer === 'n' || answer === 'no') {
+        console.log(`  Skipped. Start later:  ${serveCmd}`);
+        console.log(`  Skipped. Start later (in frontend/apps/${ctx.project}):  ${frontendCmd}`);
+        return;
     }
+    await startServerNow(ctx);
+    await startFrontendNow(ctx);
 }
 
 // ---------------------------------------------------------------------------
@@ -1234,8 +1470,26 @@ module.exports = {
             const { configName, fileCfg } = resolveSourceConfig(cwd, args.config);
 
             // 1) Input konfigurasi (LICENSE + database), gaya fast-track.mjs.
-            //    Default tiap field mengikuti fileCfg bila tersedia.
-            const cfg = await collectConfig(args, prompter.ask, fileCfg);
+            //    Bila config existing terdeteksi (fileCfg punya isi), tampilkan
+            //    ringkasannya dulu dan tawarkan "Continue" (skip prompt sama
+            //    sekali) atau "Edit Configuration" (alur prompt lama). Bila
+            //    tidak ada config existing (0 file), langsung ke prompt seperti
+            //    sebelumnya.
+            let cfg;
+            if (Object.keys(fileCfg).length > 0) {
+                const previewCfg = defaultCfgFromFile(args, fileCfg);
+                printExistingConfigSummary({
+                    project: args.project,
+                    schemaFlag: args['schema-path'],
+                    configName,
+                    cfg: previewCfg,
+                    overwrite: args.overwrite
+                });
+                const action = await selectConfigAction(prompter);
+                cfg = action === 'continue' ? previewCfg : await collectConfig(args, prompter.ask, fileCfg);
+            } else {
+                cfg = await collectConfig(args, prompter.ask, fileCfg);
+            }
 
             // 2) Menu pemilihan scope generate (REST API / frontend / all).
             const scope = await selectScope(prompter);
@@ -1302,14 +1556,16 @@ module.exports = {
 
             printFinalSummary(ctx);
 
-            // 7) Tawarkan menjalankan service: runtime server (backend) lalu
-            //    aplikasi frontend, masing-masing di window CMD baru.
-            if (ctx.scope.backend) {
+            // 7) Tawarkan menjalankan service. Scope REST API + Frontend -> SATU
+            //    dialog konfirmasi gabungan, tapi eksekusi tetap wajib runtime
+            //    server lebih dulu baru frontend (frontend butuh API hidup).
+            //    Scope REST API Only -> dialog server saja (tidak ada frontend
+            //    yang di-generate, SCOPES tidak punya opsi frontend-only).
+            if (ctx.scope.backend && ctx.scope.frontend) {
+                await maybeRunServerAndFrontend(ctx, prompter.ask);
+            } else if (ctx.scope.backend) {
                 await maybeRunServer(ctx, prompter.ask);
             }
-            if (ctx.scope.frontend) {
-                await maybeRunFrontend(ctx, prompter.ask);
-            }
         } finally {
             prompter.close();
         }
@@ -1323,6 +1579,8 @@ if (process.env.FASTTRACK_TEST === '1') {
     module.exports.__test = {
         loadModels, buildTableEntries, fkColumnsForEntry, tableToKebab,
         parseDesignerPlugins, pluginHasAuth, injectDesignerAuth,
-        DESIGNER_DEFAULT_PLUGIN, DESIGNER_AUTH_DEFAULTS
+        DESIGNER_DEFAULT_PLUGIN, DESIGNER_AUTH_DEFAULTS,
+        waitForHealth, waitForHttpUp,
+        defaultCfgFromFile
     };
 }

package/generators/lib/migrate/backend-payload-migrator.js

@@ -79,33 +79,55 @@ function convertSinglePage(backend) {
 
     const hasSearch = datatablesWhere.length > 0
         && datatablesWhere.some(w => typeof w === 'string' && w !== 'all');
-    const hasStatusFilter = resolvedFields.some(rf => rf.name === 'is_active' || rf.name === 'status');
 
     const features = {
         enableSearch: hasSearch,
         fieldLayout: 'vertical'
     };
 
-    if (hasStatusFilter) {
+    const primaryStatusField = resolvedFields.find(rf => {
+        if (rf.name !== 'is_active' && rf.name !== 'status') return false;
+        if (rf.fieldType === 'checkbox') return true;
+        return rf.fieldType === 'select' && rf.extra && rf.extra.dataSource && rf.extra.dataSource.type === 'static';
+    });
+
+    if (primaryStatusField) {
         features.enableStatusFilter = true;
-        for (const rf of resolvedFields) {
-            if ((rf.name === 'is_active' || rf.name === 'status') && rf.fieldType === 'checkbox') {
-                const cbt = (rf.extra && rf.extra.checkboxText) || {};
-                const checked = typeof cbt.checked === 'string' ? cbt.checked : 'Active';
-                const unchecked = typeof cbt.unchecked === 'string' ? cbt.unchecked : 'Inactive';
-                features.statusFilter = {
-                    field: rf.name,
-                    label: rf.label,
-                    options: [
-                        { value: 'true', text: checked },
-                        { value: 'false', text: unchecked }
-                    ]
-                };
-                break;
-            }
+        if (primaryStatusField.fieldType === 'checkbox') {
+            const cbt = (primaryStatusField.extra && primaryStatusField.extra.checkboxText) || {};
+            const checked = typeof cbt.checked === 'string' ? cbt.checked : 'Active';
+            const unchecked = typeof cbt.unchecked === 'string' ? cbt.unchecked : 'Inactive';
+            features.statusFilter = {
+                field: primaryStatusField.name,
+                label: primaryStatusField.label,
+                options: [
+                    { value: 'true', text: checked },
+                    { value: 'false', text: unchecked }
+                ]
+            };
+        } else {
+            features.statusFilter = {
+                field: primaryStatusField.name,
+                label: primaryStatusField.label,
+                options: primaryStatusField.extra.dataSource.options
+            };
         }
     }
 
+    const dataFilters = resolvedFields
+        .filter(rf => {
+            if (rf.fieldType !== 'select' || !rf.extra || !rf.extra.dataSource) return false;
+            if (rf.extra.dataSource.type === 'api') return true;
+            if (rf.extra.dataSource.type === 'static') return rf !== primaryStatusField;
+            return false;
+        })
+        .map(rf => ({ name: rf.name, field: rf.name, label: rf.label, dataSource: rf.extra.dataSource }));
+
+    if (dataFilters.length > 0) {
+        features.enableDataFilter = true;
+        features.dataFilters = dataFilters;
+    }
+
     const fieldsArray = [];
     for (const rf of resolvedFields) {
         const fieldObj = { name: rf.name, label: rf.label, type: rf.fieldType };

package/generators/lib/migrate/field-type-resolver.js

@@ -251,15 +251,39 @@ class FieldTypeResolver {
                 inTable,
                 tableOrder,
                 tableField: null,
-                defaultValue: undefined,
+                defaultValue: extractDefault(constraints),
                 extra: {
                     dataSource: { type: 'static', options }
                 }
             };
         }
 
-        // Rule 6: Date
-        if (fieldName.endsWith('_date') || fieldName === 'date') {
+        // Rule 6: Date/datetime/timestamp — valType adalah sumber kebenaran utama
+        // (REGARDLESS nama field). Heuristik nama hanya fallback bila field tidak
+        // punya entry fieldValidation (valType kosong).
+        //
+        // defaultValue: constraints.autoGenerate=true (representasi default:now()/
+        // CURRENT_TIMESTAMP, lihat payload-runner.js generateFieldValidation) di-
+        // terjemahkan ke keyword dinamis 'now'/'today' yang dikenali frontend
+        // (field_js_generator.rs dynamic_default_js: "today"/"now" -> JS expression
+        // tanggal/jam saat ini). Tanpa autoGenerate, fallback ke literal
+        // constraints.default biasa (handbook: default berlaku universal semua tipe).
+        if (valType === 'datetime' || valType === 'timestamp') {
+            return {
+                name: fieldName,
+                label,
+                fieldType: 'timestamp',
+                skip: false,
+                required,
+                inTable,
+                tableOrder,
+                tableField: null,
+                defaultValue: constraints.autoGenerate === true ? 'now' : extractDefault(constraints),
+                extra: {}
+            };
+        }
+
+        if (valType === 'date') {
             return {
                 name: fieldName,
                 label,
@@ -269,13 +293,14 @@ class FieldTypeResolver {
                 inTable,
                 tableOrder,
                 tableField: null,
-                defaultValue: undefined,
+                defaultValue: constraints.autoGenerate === true ? 'today' : extractDefault(constraints),
                 extra: {}
             };
         }
 
-        // Rule 7: Time
-        if (fieldName.endsWith('_time') || fieldName === 'time') {
+        // Rule 7: Time (autoGenerate tidak didukung untuk time per handbook
+        // field-validation.md - hanya literal default yang relevan)
+        if (valType === 'time') {
             return {
                 name: fieldName,
                 label,
@@ -285,11 +310,43 @@ class FieldTypeResolver {
                 inTable,
                 tableOrder,
                 tableField: null,
-                defaultValue: undefined,
+                defaultValue: extractDefault(constraints),
                 extra: {}
             };
         }
 
+        if (valType === '') {
+            if (fieldName.endsWith('_date') || fieldName === 'date') {
+                return {
+                    name: fieldName,
+                    label,
+                    fieldType: 'date',
+                    skip: false,
+                    required,
+                    inTable,
+                    tableOrder,
+                    tableField: null,
+                    defaultValue: undefined,
+                    extra: {}
+                };
+            }
+
+            if (fieldName.endsWith('_time') || fieldName === 'time') {
+                return {
+                    name: fieldName,
+                    label,
+                    fieldType: 'time',
+                    skip: false,
+                    required,
+                    inTable,
+                    tableOrder,
+                    tableField: null,
+                    defaultValue: undefined,
+                    extra: {}
+                };
+            }
+        }
+
         // Rule 8: Textarea
         const isTextarea = TEXTAREA_FIELDS.includes(fieldName)
             || TEXTAREA_PREFIXES.some(p => fieldName.startsWith(p));

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

@@ -176,9 +176,19 @@ function loadRdf(filePath) {
  * Petakan nama tabel JOIN (snake_case, mis. visitor_categories) ke file RDF
  * sibling di folder payload. Coba bentuk kebab dulu (visitor-categories.json),
  * lalu bentuk snake (visitor_categories.json).
+ *
+ * `qualifiedName` (opsional) = identifier JOIN apa adanya sebelum schema
+ * di-strip (mis. 'sch02.company'). Tabel di custom schema ditulis `payload
+ * generate` dengan baseFilename = `--table=` literal (lihat payload-runner.js),
+ * jadi file di disk-nya `sch02-company.json`, BUKAN `company.json`. Tanpa
+ * kandidat ini, related table di schema custom selalu gagal ditemukan
+ * walau file-nya ada (lihat bug: "no RDF file found ... tried: company.json, company.json").
  */
-function findRelatedRdfPath(tableName, payloadDir) {
+function findRelatedRdfPath(tableName, payloadDir, qualifiedName) {
     const candidates = [`${snakeToKebab(tableName)}.json`, `${tableName}.json`];
+    if (qualifiedName && qualifiedName !== tableName) {
+        candidates.push(`${qualifiedName.replace(/[._]/g, '-')}.json`);
+    }
     for (const c of candidates) {
         const p = path.join(payloadDir, c);
         if (fs.existsSync(p)) return { path: p, candidates };
@@ -259,7 +269,7 @@ async function run(args) {
         if (!t || seenTables.has(t)) continue;
         seenTables.add(t);
 
-        const { path: relPath, candidates } = findRelatedRdfPath(t, payloadDir);
+        const { path: relPath, candidates } = findRelatedRdfPath(t, payloadDir, join.tableQualified);
         if (!relPath) {
             warnings.push(`Related table '${t}' referenced by JOIN but no RDF file found in ${payloadDir} (tried: ${candidates.join(', ')}); page not generated, only the select reference is kept`);
             continue;