@restforgejs/platform 5.0.8 → 5.1.0

package/generators/cli/payload/sync.js

@@ -30,18 +30,34 @@ module.exports = {
             required: false,
             default: null,
             description: 'Sync hanya satu tabel spesifik (default: semua)'
+        },
+        'expand-fk': {
+            type: 'boolean',
+            required: false,
+            default: false,
+            description: 'Generate konfigurasi JOIN dari foreign key: buat file SQL query/<table>-join.sql dan set datatablesQuery/viewQuery ke file tersebut. Opt-in; tanpa flag ini perilaku sync tidak berubah. Butuh --table. Bila --fk-columns tidak diisi, kolom display per FK dipilih otomatis (name/nama -> code/kode -> primary key)'
+        },
+        'fk-columns': {
+            type: 'string',
+            required: false,
+            default: null,
+            description: 'Opsional. Daftar kolom tabel referensi yang di-surface lewat JOIN. Setiap entri WAJIB berbentuk `table.column` (qualified), dipisah koma. Contoh: visitor_categories.category_code,visitor_categories.category_name. Bila dikosongkan, di-resolve otomatis per FK'
         }
     },
     examples: [
         'npx restforge payload sync --config=db.env',
-        'npx restforge payload sync --config=db.env --table=users'
+        'npx restforge payload sync --config=db.env --table=users',
+        'npx restforge payload sync --table=visitors --expand-fk',
+        'npx restforge payload sync --table=visitors --expand-fk --fk-columns=visitor_categories.category_code,visitor_categories.category_name'
     ],
     async handler(args) {
         const generator = new PayloadGenerator();
         await generator.run({
             config: args.config,
             table: args.table || null,
-            sync: true
+            sync: true,
+            expandFk: args['expand-fk'] === true,
+            fkColumns: args['fk-columns'] || null
         });
     }
 };

package/generators/lib/dbschema-kit/connection.js

@@ -14,7 +14,10 @@ const DB_TYPE_TO_DIALECT = {
 const REQUIRED_FIELDS = {
   postgresql: ['DB_HOST', 'DB_PORT', 'DB_NAME', 'DB_USER', 'DB_PASSWORD'],
   mysql: ['DB_HOST', 'DB_PORT', 'DB_NAME', 'DB_USER', 'DB_PASSWORD'],
-  oracle: ['DB_HOST', 'DB_PORT', 'DB_SERVICE_NAME', 'DB_USER', 'DB_PASSWORD'],
+  // Oracle: service name dicek terpisah di bawah karena boleh DB_SERVICE_NAME
+  // ATAU DB_NAME (selaras dengan runtime + introspector legacy yang memakai
+  // DB_NAME sebagai service name pada connect string //host:port/<service>).
+  oracle: ['DB_HOST', 'DB_PORT', 'DB_USER', 'DB_PASSWORD'],
   sqlite: ['DB_FILE']
 };
 
@@ -85,6 +88,13 @@ function loadConfig(filePath) {
     );
   }
 
+  // Oracle service name boleh datang dari DB_SERVICE_NAME atau DB_NAME.
+  if (dbType === 'oracle' && !raw.DB_SERVICE_NAME && !raw.DB_NAME) {
+    throw new Error(
+      `Config file '${filePath}' missing required fields for oracle: DB_SERVICE_NAME (atau DB_NAME)`
+    );
+  }
+
   const dialect = DB_TYPE_TO_DIALECT[dbType];
   const config = { dialect };
 
@@ -101,7 +111,12 @@ function loadConfig(filePath) {
   if (raw.DB_NAME !== undefined) config.database = raw.DB_NAME;
   if (raw.DB_USER !== undefined) config.user = raw.DB_USER;
   if (raw.DB_PASSWORD !== undefined) config.password = raw.DB_PASSWORD;
-  if (raw.DB_SERVICE_NAME !== undefined) config.serviceName = raw.DB_SERVICE_NAME;
+  // serviceName: utamakan DB_SERVICE_NAME, fallback ke DB_NAME (Oracle).
+  if (raw.DB_SERVICE_NAME !== undefined) {
+    config.serviceName = raw.DB_SERVICE_NAME;
+  } else if (dbType === 'oracle' && raw.DB_NAME !== undefined) {
+    config.serviceName = raw.DB_NAME;
+  }
   if (raw.DB_FILE !== undefined) config.file = raw.DB_FILE;
 
   return config;

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

@@ -24,6 +24,19 @@ const AUDIT_FIELDS = ['created_at', 'created_by', 'updated_at', 'updated_by'];
 const TEXTAREA_FIELDS = ['address', 'description', 'notes'];
 const TEXTAREA_PREFIXES = ['remark'];
 
+// Tipe numerik kanonik RDF (lihat handbook catalogs/rdf/field-validation.md).
+// Ketiganya dipetakan ke form input `number` di UDF.
+const NUMERIC_TYPES = ['integer', 'decimal', 'number'];
+
+// Mengambil nilai `constraints.default` apa adanya bila ada. Constraint `default`
+// berlaku universal untuk semua tipe field (handbook field-validation.md), sehingga
+// nilai default dari SDF/RDF harus terbawa ke `defaultValue` UDF.
+function extractDefault(constraints) {
+    return Object.prototype.hasOwnProperty.call(constraints, 'default')
+        ? constraints.default
+        : undefined;
+}
+
 const CHECKBOX_TEXT_DEFAULT = { checked: 'Yes', unchecked: 'No' };
 const CHECKBOX_TEXT_MAP = {
     is_active: { checked: 'Active', unchecked: 'Inactive' },
@@ -202,8 +215,8 @@ class FieldTypeResolver {
             };
         }
 
-        // Rule 4: Number
-        if (valType === 'number') {
+        // Rule 4: Number (integer / decimal / number)
+        if (NUMERIC_TYPES.includes(valType)) {
             const extra = {};
             for (const key of ['min', 'max', 'step']) {
                 if (Object.prototype.hasOwnProperty.call(constraints, key)) {
@@ -219,7 +232,7 @@ class FieldTypeResolver {
                 inTable,
                 tableOrder,
                 tableField: null,
-                defaultValue: undefined,
+                defaultValue: extractDefault(constraints),
                 extra
             };
         }
@@ -293,7 +306,7 @@ class FieldTypeResolver {
                 inTable,
                 tableOrder,
                 tableField: null,
-                defaultValue: undefined,
+                defaultValue: extractDefault(constraints),
                 extra: { rows: 3, maxlength: maxlen }
             };
         }
@@ -316,7 +329,7 @@ class FieldTypeResolver {
             inTable,
             tableOrder,
             tableField: null,
-            defaultValue: undefined,
+            defaultValue: extractDefault(constraints),
             extra
         };
     }