@restforgejs/platform 5.1.21 → 5.2.4

package/generators/cli/schema/template.js

@@ -1,222 +1,223 @@
-'use strict';
-
-/**
- * Contract: schema template
- *
- * Browse, preview, dan generate template schema dari koleksi RestForge Schema
- * Reference (85 template, 30 domain, 33 section). Verb ini bertindak sebagai
- * wrapper terhadap binary native `sdf-tools.exe` yang di-ship melalui folder
- * bin/. Semua filter dan display flag diteruskan ke binary; help text di sisi
- * Node mempertahankan kontrak CLI (contract validator + help generator).
- *
- * Binary lookup: <package-root>/bin/sdf-tools.exe relatif terhadap file ini
- * (resolusi sama untuk source workspace dan installation di node_modules).
- *
- * Platform: saat ini hanya Windows (sdf-tools.exe). Pemanggilan di non-Windows
- * akan return error eksplisit, bukan crash diam-diam.
- */
-
-const fs = require('fs');
-const os = require('os');
-const path = require('path');
-const { spawnSync } = require('child_process');
-
-const VALUE_FLAGS = ['domain', 'table', 'category', 'pattern', 'section', 'lang', 'path', 'format'];
-const BOOLEAN_FLAGS = [
-    'has-sdf',
-    'no-sdf',
-    'show',
-    'example',
-    'generate',
-    'force',
-    'list-domains',
-    'list-categories',
-    'list-sections',
-    'stats'
-];
-
-function resolveBinaryPath() {
-    if (os.platform() !== 'win32') return null;
-    return path.resolve(__dirname, '..', '..', '..', 'bin', 'sdf-tools.exe');
-}
-
-function buildBinaryArgs(args) {
-    const out = [];
-    for (const name of VALUE_FLAGS) {
-        const value = args[name];
-        if (value === undefined || value === null || value === '') continue;
-        out.push(`--${name}=${value}`);
-    }
-    for (const name of BOOLEAN_FLAGS) {
-        if (args[name] === true) {
-            out.push(`--${name}`);
-        }
-    }
-    return out;
-}
-
-module.exports = {
-    resource: 'schema',
-    verb: 'template',
-    description: 'Browse, preview, dan generate template schema dari koleksi RestForge Schema Reference',
-    category: 'utility',
-    flags: {
-        domain: {
-            type: 'string',
-            required: false,
-            default: null,
-            description: 'Filter berdasarkan domain (csv, mis. erp atau erp,finance)'
-        },
-        table: {
-            type: 'string',
-            required: false,
-            default: null,
-            description: 'Filter nama tabel (wildcard glob: sales*, *_invoice)'
-        },
-        category: {
-            type: 'string',
-            required: false,
-            default: null,
-            description: 'Filter category: master-data atau transactional'
-        },
-        pattern: {
-            type: 'string',
-            required: false,
-            default: null,
-            description: 'Filter pattern: single-table atau master-detail'
-        },
-        section: {
-            type: 'string',
-            required: false,
-            default: null,
-            description: 'Filter section code (lihat --list-sections)'
-        },
-        'has-sdf': {
-            type: 'boolean',
-            required: false,
-            default: false,
-            description: 'Filter hanya template yang sudah punya versi SDF'
-        },
-        'no-sdf': {
-            type: 'boolean',
-            required: false,
-            default: false,
-            description: 'Filter hanya template yang belum punya SDF (gap analysis)'
-        },
-        show: {
-            type: 'boolean',
-            required: false,
-            default: false,
-            description: 'Cetak schema template (perlu --table=<nama_spesifik>)'
-        },
-        example: {
-            type: 'boolean',
-            required: false,
-            default: false,
-            description: 'Sertakan section CONTOH DATA (kombinasi dengan --show)'
-        },
-        lang: {
-            type: 'string',
-            required: false,
-            default: null,
-            description: 'Format schema: sdf (default) atau sql'
-        },
-        generate: {
-            type: 'boolean',
-            required: false,
-            default: false,
-            description: 'Generate template ke filesystem (perlu --table dan --path)'
-        },
-        path: {
-            type: 'string',
-            required: false,
-            default: null,
-            description: 'Path destination untuk --generate (direktori atau file)'
-        },
-        force: {
-            type: 'boolean',
-            required: false,
-            default: false,
-            description: 'Overwrite file destination existing saat --generate'
-        },
-        'list-domains': {
-            type: 'boolean',
-            required: false,
-            default: false,
-            description: 'List semua domain aplikasi yang tersedia'
-        },
-        'list-categories': {
-            type: 'boolean',
-            required: false,
-            default: false,
-            description: 'List semua category template'
-        },
-        'list-sections': {
-            type: 'boolean',
-            required: false,
-            default: false,
-            description: 'List semua section beserta category-nya'
-        },
-        stats: {
-            type: 'boolean',
-            required: false,
-            default: false,
-            description: 'Tampilkan statistik koleksi (per category, pattern, domain, section)'
-        },
-        format: {
-            type: 'string',
-            required: false,
-            default: null,
-            description: 'Format output: table (default), plain, atau json'
-        }
-    },
-    examples: [
-        'npx restforge schema template',
-        'npx restforge schema template --domain=erp',
-        'npx restforge schema template --domain=erp,inventory --category=master-data',
-        'npx restforge schema template --table=sales_order --show',
-        'npx restforge schema template --table=sales_order --show --lang=sql',
-        'npx restforge schema template --table=sales_order --generate --path=./schema --lang=sdf',
-        'npx restforge schema template --stats',
-        'npx restforge schema template --list-domains'
-    ],
-    async handler(args) {
-        const binaryPath = resolveBinaryPath();
-        if (!binaryPath) {
-            const err = new Error(
-                `schema template hanya tersedia di Windows (sdf-tools.exe). Platform saat ini: ${os.platform()}`
-            );
-            err.exitCode = 3;
-            throw err;
-        }
-
-        if (!fs.existsSync(binaryPath)) {
-            const err = new Error(
-                `sdf-tools.exe tidak ditemukan di ${binaryPath}. ` +
-                'Pastikan binary sudah di-build dan tersedia di folder bin/ package.'
-            );
-            err.exitCode = 3;
-            throw err;
-        }
-
-        const binaryArgs = buildBinaryArgs(args);
-        const result = spawnSync(binaryPath, binaryArgs, {
-            stdio: 'inherit',
-            windowsHide: true
-        });
-
-        if (result.error) {
-            const err = new Error(`Gagal menjalankan sdf-tools.exe: ${result.error.message}`);
-            err.exitCode = 1;
-            throw err;
-        }
-
-        const status = typeof result.status === 'number' ? result.status : 1;
-        if (status !== 0) {
-            const err = new Error(`sdf-tools.exe exit code ${status}`);
-            err.exitCode = status;
-            err.silent = true;
-            throw err;
-        }
-    }
-};
+'use strict';
+
+/**
+ * Contract: schema template
+ *
+ * Browse, preview, dan generate template schema dari koleksi RestForge Schema
+ * Reference (85 template, 30 domain, 33 section). Verb ini bertindak sebagai
+ * wrapper terhadap binary native `sdf-tools.exe` yang di-ship melalui folder
+ * bin/. Semua filter dan display flag diteruskan ke binary; help text di sisi
+ * Node mempertahankan kontrak CLI (contract validator + help generator).
+ *
+ * Binary lookup: <package-root>/bin/sdf-tools.exe relatif terhadap file ini
+ * (resolusi sama untuk source workspace dan installation di node_modules).
+ *
+ * Platform: saat ini hanya Windows (sdf-tools.exe). Pemanggilan di non-Windows
+ * akan return error eksplisit, bukan crash diam-diam.
+ */
+
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+const { spawnSync } = require('child_process');
+
+const VALUE_FLAGS = ['domain', 'table', 'category', 'pattern', 'section', 'lang', 'format'];
+const BOOLEAN_FLAGS = [
+    'has-sdf',
+    'no-sdf',
+    'show',
+    'example',
+    'generate',
+    'force',
+    'list-domains',
+    'list-categories',
+    'list-sections',
+    'stats'
+];
+
+function resolveBinaryPath() {
+    if (os.platform() !== 'win32') return null;
+    return path.resolve(__dirname, '..', '..', '..', 'bin', 'sdf-tools.exe');
+}
+
+function buildBinaryArgs(args) {
+    const out = [];
+    for (const name of VALUE_FLAGS) {
+        const value = args[name];
+        if (value === undefined || value === null || value === '') continue;
+        out.push(`--${name}=${value}`);
+    }
+    if (args['schema-path']) out.push(`--path=${args['schema-path']}`);
+    for (const name of BOOLEAN_FLAGS) {
+        if (args[name] === true) {
+            out.push(`--${name}`);
+        }
+    }
+    return out;
+}
+
+module.exports = {
+    resource: 'schema',
+    verb: 'template',
+    description: 'Browse, preview, and generate schema templates from the RestForge Schema Reference collection',
+    category: 'utility',
+    flags: {
+        domain: {
+            type: 'string',
+            required: false,
+            default: null,
+            description: 'Filter by domain (csv, e.g., erp or erp,finance)'
+        },
+        table: {
+            type: 'string',
+            required: false,
+            default: null,
+            description: 'Filter by table name (wildcard glob: sales*, *_invoice)'
+        },
+        category: {
+            type: 'string',
+            required: false,
+            default: null,
+            description: 'Filter by category: master-data or transactional'
+        },
+        pattern: {
+            type: 'string',
+            required: false,
+            default: null,
+            description: 'Filter by pattern: single-table or master-detail'
+        },
+        section: {
+            type: 'string',
+            required: false,
+            default: null,
+            description: 'Filter by section code (see --list-sections)'
+        },
+        'has-sdf': {
+            type: 'boolean',
+            required: false,
+            default: false,
+            description: 'Filter only templates that have an SDF version'
+        },
+        'no-sdf': {
+            type: 'boolean',
+            required: false,
+            default: false,
+            description: 'Filter only templates that do not have an SDF version (gap analysis)'
+        },
+        show: {
+            type: 'boolean',
+            required: false,
+            default: false,
+            description: 'Print schema template (requires --table=<specific_name>)'
+        },
+        example: {
+            type: 'boolean',
+            required: false,
+            default: false,
+            description: 'Include sample data section (use with --show)'
+        },
+        lang: {
+            type: 'string',
+            required: false,
+            default: null,
+            description: 'Schema format: sdf (default) or sql'
+        },
+        generate: {
+            type: 'boolean',
+            required: false,
+            default: false,
+            description: 'Generate template to filesystem (requires --table and --schema-path)'
+        },
+        'schema-path': {
+            type: 'string',
+            required: false,
+            default: null,
+            description: 'Destination path for --generate (directory or file)'
+        },
+        force: {
+            type: 'boolean',
+            required: false,
+            default: false,
+            description: 'Overwrite existing destination file when using --generate'
+        },
+        'list-domains': {
+            type: 'boolean',
+            required: false,
+            default: false,
+            description: 'List all available application domains'
+        },
+        'list-categories': {
+            type: 'boolean',
+            required: false,
+            default: false,
+            description: 'List all template categories'
+        },
+        'list-sections': {
+            type: 'boolean',
+            required: false,
+            default: false,
+            description: 'List all sections with their categories'
+        },
+        stats: {
+            type: 'boolean',
+            required: false,
+            default: false,
+            description: 'Show collection statistics (per category, pattern, domain, section)'
+        },
+        format: {
+            type: 'string',
+            required: false,
+            default: null,
+            description: 'Output format: table (default), plain, or json'
+        }
+    },
+    examples: [
+        'npx restforge schema template',
+        'npx restforge schema template --domain=erp',
+        'npx restforge schema template --domain=erp,inventory --category=master-data',
+        'npx restforge schema template --table=sales_order --show',
+        'npx restforge schema template --table=sales_order --show --lang=sql',
+        'npx restforge schema template --table=sales_order --generate --schema-path=./schema --lang=sdf',
+        'npx restforge schema template --stats',
+        'npx restforge schema template --list-domains'
+    ],
+    async handler(args) {
+        const binaryPath = resolveBinaryPath();
+        if (!binaryPath) {
+            const err = new Error(
+                `schema template hanya tersedia di Windows (sdf-tools.exe). Platform saat ini: ${os.platform()}`
+            );
+            err.exitCode = 3;
+            throw err;
+        }
+
+        if (!fs.existsSync(binaryPath)) {
+            const err = new Error(
+                `sdf-tools.exe tidak ditemukan di ${binaryPath}. ` +
+                'Pastikan binary sudah di-build dan tersedia di folder bin/ package.'
+            );
+            err.exitCode = 3;
+            throw err;
+        }
+
+        const binaryArgs = buildBinaryArgs(args);
+        const result = spawnSync(binaryPath, binaryArgs, {
+            stdio: 'inherit',
+            windowsHide: true
+        });
+
+        if (result.error) {
+            const err = new Error(`Gagal menjalankan sdf-tools.exe: ${result.error.message}`);
+            err.exitCode = 1;
+            throw err;
+        }
+
+        const status = typeof result.status === 'number' ? result.status : 1;
+        if (status !== 0) {
+            const err = new Error(`sdf-tools.exe exit code ${status}`);
+            err.exitCode = status;
+            err.silent = true;
+            throw err;
+        }
+    }
+};

package/generators/cli/schema/validate.js

@@ -63,21 +63,21 @@ function printSuccessLines(absPath, models) {
 module.exports = {
     resource: 'schema',
     verb: 'validate',
-    description: 'Memvalidasi file schema definition (single-model dan cross-model)',
+    description: 'Validate schema definition files (single-model and cross-model)',
     category: 'introspection',
     flags: {
-        path: {
+        'schema-path': {
             type: 'string',
             required: true,
-            description: 'Path file atau folder schema (mis. ./schema atau ./schema/users.js)'
+            description: 'Path to schema file or directory (e.g., ./schema or ./schema/users.js)'
         }
     },
     examples: [
-        'npx restforge schema validate --path=./schema',
-        'npx restforge schema validate --path=./my-schema'
+        'npx restforge schema validate --schema-path=./schema',
+        'npx restforge schema validate --schema-path=./my-schema'
     ],
     async handler(args) {
-        const schemaPath = args.path;
+        const schemaPath = args['schema-path'];
         const absPath = path.resolve(process.cwd(), schemaPath);
 
         let models;

package/generators/cli/test/generate.js

@@ -145,36 +145,36 @@ function handleInit(args) {
 module.exports = {
     resource: 'test',
     verb: 'generate',
-    description: 'Generate integration test file (Jest + Supertest) untuk endpoint',
+    description: 'Generate an integration test file (Jest + Supertest) for an endpoint',
     category: 'generation',
     flags: {
         project: {
             type: 'string',
             required: true,
-            description: 'Nama project target'
+            description: 'Target project name'
         },
         endpoint: {
             type: 'string',
             required: true,
-            description: 'Nama endpoint yang akan di-test'
+            description: 'Endpoint name to test'
         },
         port: {
             type: 'number',
             required: false,
             default: 3000,
-            description: 'Port server saat test dijalankan'
+            description: 'Server port when running tests'
         },
         init: {
             type: 'boolean',
             required: false,
             default: false,
-            description: 'Inisialisasi konfigurasi test-data.json (global + per-endpoint jika endpoint diisi)'
+            description: 'Initialize test-data.json configuration (global + per-endpoint if endpoint is provided)'
         },
         force: {
             type: 'boolean',
             required: false,
             default: false,
-            description: 'Timpa file test existing'
+            description: 'Overwrite existing test files'
         }
     },
     examples: [

package/generators/lib/dbschema-kit/introspect-mapper.js

@@ -599,6 +599,26 @@ function parseCheckExpression(rawExpr) {
         }
     }
 
+    // PostgreSQL normalises IN-list CHECKs to: (col)::type = ANY ((ARRAY['a'::type, ...]::type[]))
+    // This form appears verbatim in pg_get_constraintdef output and is semantically identical to IN (...).
+    const pgAnyRe = /^\(?([A-Za-z_][A-Za-z0-9_]*)\)?(?:::\w+(?:\s+\w+)*)?\s*=\s*ANY\s*\((.+)\)\s*$/i;
+    const pgAnyM = e.match(pgAnyRe);
+    if (pgAnyM) {
+        const field = pgAnyM[1].toLowerCase();
+        const anyArg = pgAnyM[2];
+        const arrOpen = anyArg.toUpperCase().indexOf('ARRAY[');
+        if (arrOpen !== -1) {
+            const arrClose = anyArg.indexOf(']', arrOpen + 6);
+            if (arrClose !== -1) {
+                const raw = anyArg.slice(arrOpen + 6, arrClose);
+                // strip per-element type casts like ::character varying before parsing
+                const stripped = raw.replace(/::\w+(?:\s+\w+)*/g, '');
+                const values = parseValueList(stripped);
+                if (values) return { field, op: 'in', value: values };
+            }
+        }
+    }
+
     return { _unparsable: true, expression: rawExpr };
 }
 

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;

package/generators/lib/migrate/sql-parser.js

@@ -23,10 +23,11 @@ function parseTableRef(refstr) {
     const afterWhere = refstr.split(WHERE_SPLIT_RE)[0].trim();
     const cleaned = afterWhere.split(ORDER_SPLIT_RE)[0].trim();
     const tokens = cleaned.split(/\s+/).filter(Boolean);
-    if (tokens.length === 0) return { tableName: '', alias: '' };
-    const tableName = stripSchema(tokens[0]);
+    if (tokens.length === 0) return { tableName: '', alias: '', qualifiedName: '' };
+    const qualifiedName = tokens[0];
+    const tableName = stripSchema(qualifiedName);
     const alias = tokens.length > 1 ? tokens[1] : '';
-    return { tableName, alias };
+    return { tableName, alias, qualifiedName };
 }
 
 function parseJoinCondition(condition, mainAlias) {
@@ -108,6 +109,7 @@ function parseDatatablesQuery(sql) {
         const cond = parseJoinCondition(condition, mainAlias);
         joins.push({
             tableName: ref.tableName,
+            tableQualified: ref.qualifiedName,
             tableAlias: ref.alias,
             localColumn: cond.localColumn,
             remoteColumn: cond.remoteColumn