@restforgejs/platform 5.2.16 → 5.3.5

package/generators/lib/auth/templates/processor/register.js.tmpl

@@ -22,7 +22,7 @@ module.exports = {
         return {
           success: false,
           statusCode: 400,
-          message: 'Field username dan password wajib diisi.',
+          message: 'Username and password are required.',
           timestamp: new Date().toISOString()
         };
       }
@@ -35,7 +35,7 @@ module.exports = {
         return {
           success: false,
           statusCode: 409,
-          message: 'Username sudah terpakai.',
+          message: 'Username is already taken.',
           timestamp: new Date().toISOString()
         };
       }
@@ -55,7 +55,7 @@ module.exports = {
       return {
         success: true,
         statusCode: 201,
-        message: 'Registrasi berhasil.',
+        message: 'Registration successful.',
         data: {
           user_id: userId,
           username,
@@ -69,7 +69,7 @@ module.exports = {
       return {
         success: false,
         statusCode: 500,
-        message: 'Terjadi kesalahan internal pada server.',
+        message: 'An internal server error occurred.',
         timestamp: new Date().toISOString()
       };
     }

package/generators/lib/auth/templates/processor/reset-password.js.tmpl

@@ -25,7 +25,7 @@ module.exports = {
         return {
           success: false,
           statusCode: 400,
-          message: 'Email, password baru, dan konfirmasi wajib diisi.',
+          message: 'Email, new password, and confirmation are required.',
           timestamp: new Date().toISOString()
         };
       }
@@ -33,7 +33,7 @@ module.exports = {
         return {
           success: false,
           statusCode: 400,
-          message: `Password minimal ${MIN_PASSWORD} karakter.`,
+          message: `Password must be at least ${MIN_PASSWORD} characters.`,
           timestamp: new Date().toISOString()
         };
       }
@@ -41,7 +41,7 @@ module.exports = {
         return {
           success: false,
           statusCode: 400,
-          message: 'Konfirmasi password tidak cocok.',
+          message: 'Password confirmation does not match.',
           timestamp: new Date().toISOString()
         };
       }
@@ -55,7 +55,7 @@ module.exports = {
         return {
           success: false,
           statusCode: 404,
-          message: 'Email tidak terdaftar.',
+          message: 'Email is not registered.',
           timestamp: new Date().toISOString()
         };
       }
@@ -64,7 +64,7 @@ module.exports = {
         return {
           success: false,
           statusCode: 409,
-          message: 'Email terdaftar pada lebih dari satu akun. Hubungi administrator.',
+          message: 'Email is registered to multiple accounts. Contact administrator.',
           timestamp: new Date().toISOString()
         };
       }
@@ -90,7 +90,7 @@ module.exports = {
       return {
         success: true,
         statusCode: 200,
-        message: 'Password berhasil diperbarui. Silakan login dengan password baru.',
+        message: 'Password updated successfully. Please sign in with your new password.',
         timestamp: new Date().toISOString()
       };
     } catch (error) {
@@ -98,7 +98,7 @@ module.exports = {
       return {
         success: false,
         statusCode: 500,
-        message: 'Terjadi kesalahan internal pada server.',
+        message: 'An internal server error occurred.',
         timestamp: new Date().toISOString()
       };
     }

package/generators/lib/auth/templates/rfx_auth.js.tmpl

@@ -6,6 +6,7 @@
  *
  *   POST /api/{{PROJECT_NAME}}/rfx_auth/register   — buat user baru
  *   POST /api/{{PROJECT_NAME}}/rfx_auth/login      — login, terbitkan access + refresh token
+ *   POST /api/{{PROJECT_NAME}}/rfx_auth/google     — login via Google ID token (find-or-create)
  *   POST /api/{{PROJECT_NAME}}/rfx_auth/refresh    — tukar refresh token (rotation)
  *   POST /api/{{PROJECT_NAME}}/rfx_auth/logout     — revoke refresh token
  *   POST /api/{{PROJECT_NAME}}/rfx_auth/reset-password — reset password via email (tanpa token)
@@ -21,6 +22,7 @@ const services = resolveServices();
 
 const register = require('./processor/auth/register');
 const login = require('./processor/auth/login');
+const google = require('./processor/auth/google');
 const refresh = require('./processor/auth/refresh');
 const logout = require('./processor/auth/logout');
 const me = require('./processor/auth/me');
@@ -83,6 +85,7 @@ function handle(processor, requiredFields, actionLabel) {
 
 router.post('/register', handle(register, ['username', 'password'], 'register'));
 router.post('/login', handle(login, ['username', 'password'], 'login'));
+router.post('/google', handle(google, ['credential'], 'google'));
 router.post('/refresh', handle(refresh, ['refresh_token'], 'refresh'));
 router.post('/logout', handle(logout, [], 'logout'));
 router.post('/reset-password', handle(resetPassword, ['email', 'new_password', 'confirm_password'], 'reset-password'));

package/generators/lib/generators/model-generator.js

@@ -61,38 +61,32 @@ class ModelGenerator {
    */
   static generateModelContent(moduleName, endpointName, payload, databaseType) {
     try {
-      // Try Oracle template first if specified
-      if (databaseType === 'sqlite') {
-        const sqliteContent = this.generateSqliteModelContent(moduleName, endpointName, payload);
-        if (sqliteContent) {
-          console.log(`Using SQLite-specific template for ${endpointName} model`);
-          return sqliteContent;
-        } else {
-          console.log(`SQLite template not available, falling back to PostgreSQL template`);
-        }
-      }
-
-      if (databaseType === 'mysql') {
-        const mysqlContent = this.generateMysqlModelContent(moduleName, endpointName, payload);
-        if (mysqlContent) {
-          console.log(`Using MySQL-specific template for ${endpointName} model`);
-          return mysqlContent;
-        } else {
-          console.log(`MySQL template not available, falling back to PostgreSQL template`);
-        }
-      }
-
-      if (databaseType === 'oracle') {
-        const oracleContent = this.generateOracleModelContent(moduleName, endpointName, payload);
-        if (oracleContent) {
-          console.log(`Using Oracle-specific template for ${endpointName} model`);
-          return oracleContent;
-        } else {
-          console.log(`Oracle template not available, falling back to PostgreSQL template`);
+      // Tipe database non-postgres yang diminta eksplisit WAJIB memakai template
+      // dialeknya. Bila template-nya tidak tersedia, kosong, atau melempar error,
+      // generator HARD-FAIL — tidak boleh fallback senyap ke PostgreSQL karena akan
+      // menghasilkan model dialek salah (mis. sintaks pg untuk project Oracle).
+      const dialectGenerators = {
+        sqlite: { label: 'SQLite', fn: this.generateSqliteModelContent },
+        mysql: { label: 'MySQL', fn: this.generateMysqlModelContent },
+        oracle: { label: 'Oracle', fn: this.generateOracleModelContent }
+      };
+
+      const dialect = dialectGenerators[databaseType];
+      if (dialect) {
+        const content = dialect.fn.call(this, moduleName, endpointName, payload);
+        if (content) {
+          console.log(`Using ${dialect.label}-specific template for ${endpointName} model`);
+          return content;
         }
+        throw new Error(
+          `${dialect.label} model template unavailable or produced empty output for ` +
+          `'${moduleName}/${endpointName}'. Refusing to fall back to the PostgreSQL template ` +
+          `for an explicitly requested '${databaseType}' model. ` +
+          `Verify the ${dialect.label} template is installed and supports this payload.`
+        );
       }
 
-      // Default PostgreSQL template
+      // Default PostgreSQL template (databaseType === 'postgres')
       return this.generatePostgresModelContent(moduleName, endpointName, payload);
 
     } catch (error) {
@@ -109,18 +103,17 @@ class ModelGenerator {
    * @returns {string|null} Oracle model content atau null
    */
   static generateOracleModelContent(moduleName, endpointName, payload) {
+    const oracleUtils = this.loadOracleUtils();
+    if (!oracleUtils || !oracleUtils.createOracleModelTemplate) {
+      return null; // modul template Oracle benar-benar tidak tersedia
+    }
+    // Error saat membangun template adalah bug nyata — jangan ditelan,
+    // bungkus dengan konteks lalu lempar agar terlihat oleh pemanggil.
     try {
-      const oracleUtils = this.loadOracleUtils();
-      if (oracleUtils && oracleUtils.createOracleModelTemplate) {
-        const content = oracleUtils.createOracleModelTemplate(moduleName, endpointName, payload);
-        if (content && content.trim().length > 0) {
-          return content;
-        }
-      }
-      return null;
+      const content = oracleUtils.createOracleModelTemplate(moduleName, endpointName, payload);
+      return content && content.trim().length > 0 ? content : null;
     } catch (error) {
-      console.warn(`Oracle model template not available: ${error.message}`);
-      return null;
+      throw new Error(`Oracle model template failed for '${moduleName}/${endpointName}': ${error.message}`);
     }
   }
 
@@ -144,18 +137,15 @@ class ModelGenerator {
    * @returns {string|null} SQLite model content atau null
    */
   static generateSqliteModelContent(moduleName, endpointName, payload) {
+    const sqliteUtils = this.loadSqliteUtils();
+    if (!sqliteUtils || !sqliteUtils.createSqliteModelTemplate) {
+      return null; // modul template SQLite benar-benar tidak tersedia
+    }
     try {
-      const sqliteUtils = this.loadSqliteUtils();
-      if (sqliteUtils && sqliteUtils.createSqliteModelTemplate) {
-        const content = sqliteUtils.createSqliteModelTemplate(moduleName, endpointName, payload);
-        if (content && content.trim().length > 0) {
-          return content;
-        }
-      }
-      return null;
+      const content = sqliteUtils.createSqliteModelTemplate(moduleName, endpointName, payload);
+      return content && content.trim().length > 0 ? content : null;
     } catch (error) {
-      console.warn(`SQLite model template not available: ${error.message}`);
-      return null;
+      throw new Error(`SQLite model template failed for '${moduleName}/${endpointName}': ${error.message}`);
     }
   }
 
@@ -179,18 +169,15 @@ class ModelGenerator {
    * @returns {string|null} MySQL model content atau null
    */
   static generateMysqlModelContent(moduleName, endpointName, payload) {
+    const mysqlUtils = this.loadMysqlUtils();
+    if (!mysqlUtils || !mysqlUtils.createMysqlModelTemplate) {
+      return null; // modul template MySQL benar-benar tidak tersedia
+    }
     try {
-      const mysqlUtils = this.loadMysqlUtils();
-      if (mysqlUtils && mysqlUtils.createMysqlModelTemplate) {
-        const content = mysqlUtils.createMysqlModelTemplate(moduleName, endpointName, payload);
-        if (content && content.trim().length > 0) {
-          return content;
-        }
-      }
-      return null;
+      const content = mysqlUtils.createMysqlModelTemplate(moduleName, endpointName, payload);
+      return content && content.trim().length > 0 ? content : null;
     } catch (error) {
-      console.warn(`MySQL model template not available: ${error.message}`);
-      return null;
+      throw new Error(`MySQL model template failed for '${moduleName}/${endpointName}': ${error.message}`);
     }
   }
 

package/generators/lib/help-generator.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const HELP_WIDTH = 100;
+
 const CATEGORY_ORDER = ['generation', 'management', 'introspection', 'utility'];
 const CATEGORY_LABEL = {
     generation: 'Generation',
@@ -131,6 +133,27 @@ function flagSignature(flagDef) {
     return ` <${flagDef.type}>`;
 }
 
+function wrapText(text, firstAvail, contIndent) {
+    const words = text.split(' ');
+    const lines = [];
+    let current = '';
+    let avail = firstAvail;
+
+    for (const word of words) {
+        if (!current) {
+            current = word;
+        } else if (current.length + 1 + word.length <= avail) {
+            current += ' ' + word;
+        } else {
+            lines.push(current);
+            current = word;
+            avail = HELP_WIDTH - contIndent;
+        }
+    }
+    if (current) lines.push(current);
+    return lines;
+}
+
 function defaultRepr(def) {
     if (def === null) return 'null';
     if (def === undefined) return 'undefined';
@@ -201,7 +224,12 @@ function generateCommandHelp(contract) {
         for (const posDef of positional) {
             const sig = posDef.required ? `<${posDef.name}>` : `[${posDef.name}]`;
             const label = `${sig} <${posDef.type}>`;
-            lines.push(`  ${padRight(label, colWidth)} ${posDef.description}`);
+            const prefix = `  ${padRight(label, colWidth)} `;
+            const descLines = wrapText(posDef.description, HELP_WIDTH - prefix.length, prefix.length);
+            lines.push(`${prefix}${descLines[0]}`);
+            for (let i = 1; i < descLines.length; i++) {
+                lines.push(`${' '.repeat(prefix.length)}${descLines[i]}`);
+            }
         }
         lines.push('');
     }
@@ -211,7 +239,12 @@ function generateCommandHelp(contract) {
         for (const fname of requiredFlagNames) {
             const fdef = flags[fname];
             const label = `--${fname}${flagSignature(fdef)}`;
-            lines.push(`  ${padRight(label, colWidth)} ${fdef.description}`);
+            const prefix = `  ${padRight(label, colWidth)} `;
+            const descLines = wrapText(fdef.description, HELP_WIDTH - prefix.length, prefix.length);
+            lines.push(`${prefix}${descLines[0]}`);
+            for (let i = 1; i < descLines.length; i++) {
+                lines.push(`${' '.repeat(prefix.length)}${descLines[i]}`);
+            }
         }
         lines.push('');
     }
@@ -222,7 +255,12 @@ function generateCommandHelp(contract) {
             const fdef = flags[fname];
             const label = `--${fname}${flagSignature(fdef)}`;
             const suffix = ` (default: ${defaultRepr(fdef.default)})`;
-            lines.push(`  ${padRight(label, colWidth)} ${fdef.description}${suffix}`);
+            const prefix = `  ${padRight(label, colWidth)} `;
+            const descLines = wrapText(`${fdef.description}${suffix}`, HELP_WIDTH - prefix.length, prefix.length);
+            lines.push(`${prefix}${descLines[0]}`);
+            for (let i = 1; i < descLines.length; i++) {
+                lines.push(`${' '.repeat(prefix.length)}${descLines[i]}`);
+            }
         }
         lines.push('');
     }

package/generators/lib/payload/endpoint-schema-validator.js

@@ -23,7 +23,7 @@
 const path = require('path');
 const { DatabaseIntrospector } = require('../utils/database-introspector');
 const { resolveConfig, printDefaultConfigWarning } = require('../utils/config-resolver');
-const { compareSchemaStrict, formatDriftReport } = require('./schema-diff');
+const { compareSchemaStrict, formatDriftReport, resolveFieldProjectionInputs } = require('./schema-diff');
 
 /**
  * Buat Error object dengan property `exitCode` agar cli-entry dapat
@@ -57,7 +57,8 @@ function createExitError(message, exitCode) {
  * @returns {Promise<{
  *   status: 'ok' | 'skipped',
  *   reason?: string,
- *   columnsChecked?: number
+ *   columnsChecked?: number,
+ *   projectionInputs?: {physicalColumns: string[], readSourceColumns: string[], datatablesColumns: string[]|null}
  * }>}
  * @throws {Error} Dengan property exitCode (1=drift, 2=usage, 3=connection)
  */
@@ -128,8 +129,11 @@ async function validateEndpointSchema(options) {
         : path.join(workingDir || process.cwd(), 'payload');
 
     let comparison;
+    let projectionInputs = null;
     try {
         comparison = await compareSchemaStrict(payload, db, { payloadDir });
+        // Reuse db handle (D2): compute per-source column inputs untuk deriveFieldProjections
+        projectionInputs = await resolveFieldProjectionInputs(payload, db, { payloadDir });
     } finally {
         try { await db.close(); } catch (_e) { /* ignore */ }
     }
@@ -158,7 +162,8 @@ async function validateEndpointSchema(options) {
 
     return {
         status: 'ok',
-        columnsChecked: comparison.totalColumnsChecked || 0
+        columnsChecked: comparison.totalColumnsChecked || 0,
+        projectionInputs
     };
 }
 

package/generators/lib/payload/field-projections.js

@@ -0,0 +1,116 @@
+'use strict';
+
+const { isSoftDeleteEnabled, SOFT_DELETE_COLUMNS } = require('../dbschema-kit/soft-delete-constants');
+
+/**
+ * Derive field projection whitelists from fieldName and introspected source columns.
+ * Pure function — no DB, no side effects.
+ *
+ * Kebijakan case-matching: case-insensitive (lowercase normalization).
+ * DB introspection mengembalikan nama kolom dengan case yang bisa berbeda
+ * tergantung dialect (Oracle uppercase, PostgreSQL lowercase, dll.).
+ * Pencocokan dilakukan lowercase di kedua sisi agar konsisten.
+ *
+ * @param {Object} input
+ * @param {string[]} input.fieldName         - Array fieldName dari payload
+ * @param {string[]} input.physicalColumns   - Kolom fisik tabel dari introspeksi DB
+ * @param {string[]|null} input.readSourceColumns - Kolom output sumber-baca-resolusi
+ *   (viewName → viewQuery → tableName). Null atau [] → sumber gagal diintrospeksi.
+ * @param {string[]|null} input.datatablesColumns - Kolom output datatablesQuery.
+ *   null = tidak ada datatablesQuery (fallback ke schemaFields).
+ *   [] = datatablesQuery ada tapi introspeksi gagal (hard-fail kecuali ada override).
+ * @param {Object} [input.overrides={}]
+ * @param {string[]} [input.overrides.readableFields]  - Override eksplisit readableFields
+ * @param {string[]} [input.overrides.datatablesFields] - Override eksplisit datatablesFields
+ * @returns {{ schemaFields: string[], readableFields: string[], datatablesFields: string[] }}
+ * @throws {Error} Bila validasi override gagal atau hard-fail D3 terpenuhi
+ */
+function deriveFieldProjections({
+    fieldName,
+    physicalColumns,
+    readSourceColumns,
+    datatablesColumns,
+    overrides = {}
+}) {
+    // Validasi override: tiap elemen harus ⊆ fieldName
+    for (const key of ['readableFields', 'datatablesFields']) {
+        if (!overrides[key]) continue;
+        for (const f of overrides[key]) {
+            if (!fieldName.includes(f)) {
+                throw new Error(
+                    `Override ${key} berisi "${f}" yang tidak ada di fieldName. ` +
+                    `Nilai valid: [${fieldName.join(', ')}]`
+                );
+            }
+        }
+    }
+
+    const toSet = (arr) => new Set((arr || []).map(c => String(c).toLowerCase()));
+
+    // schemaFields = fieldName ∩ physicalColumns (pertahankan urutan fieldName)
+    const physicalSet = toSet(physicalColumns);
+    const schemaFields = fieldName.filter(f => physicalSet.has(f.toLowerCase()));
+
+    // readableFields
+    let readableFields;
+    if (overrides.readableFields) {
+        readableFields = overrides.readableFields;
+    } else {
+        // Hard-fail D3: sumber-baca tidak terintrospeksi dan tidak ada override
+        if (!readSourceColumns || readSourceColumns.length === 0) {
+            throw new Error(
+                'Cannot derive readableFields: read-source resolution ' +
+                '(viewName → viewQuery → tableName) produced no columns. ' +
+                'Provide payload.readableFields as an override to bypass.'
+            );
+        }
+        const readSet = toSet(readSourceColumns);
+        readableFields = fieldName.filter(f => readSet.has(f.toLowerCase()));
+    }
+
+    // datatablesFields
+    let datatablesFields;
+    if (overrides.datatablesFields) {
+        datatablesFields = overrides.datatablesFields;
+    } else if (datatablesColumns === null) {
+        // Tidak ada datatablesQuery → fallback ke schemaFields
+        datatablesFields = schemaFields;
+    } else if (datatablesColumns.length === 0) {
+        // Hard-fail D3: datatablesQuery ada tapi introspeksi gagal
+        throw new Error(
+            'Cannot derive datatablesFields: datatablesQuery is set but ' +
+            'introspection produced no columns. ' +
+            'Provide payload.datatablesFields as an override to bypass.'
+        );
+    } else {
+        const dtSet = toSet(datatablesColumns);
+        datatablesFields = fieldName.filter(f => dtSet.has(f.toLowerCase()));
+    }
+
+    return { schemaFields, readableFields, datatablesFields };
+}
+
+/**
+ * Augmentasi proyeksi dengan kolom soft-delete bila soft-delete aktif (D9).
+ * Meniru buildValidFieldsString: kolom soft-delete disuntik middleware ke WHERE,
+ * sehingga WAJIB ada di ketiga proyeksi agar validasi whitelist lolos.
+ * Augmentasi tak-bersyarat — tidak digate interseksi kolom sumber.
+ * Mutasi in-place; mengembalikan objek yang sama.
+ *
+ * @param {{ schemaFields: string[], readableFields: string[], datatablesFields: string[] }} fieldProjections
+ * @param {Object} payload - IR/payload dengan blok softDelete opsional
+ * @returns {typeof fieldProjections}
+ */
+function augmentProjectionsForSoftDelete(fieldProjections, payload) {
+    if (!isSoftDeleteEnabled(payload)) return fieldProjections;
+    for (const proj of ['schemaFields', 'readableFields', 'datatablesFields']) {
+        for (const col of SOFT_DELETE_COLUMNS) {
+            if (!fieldProjections[proj].includes(col)) {
+                fieldProjections[proj].push(col);
+            }
+        }
+    }
+    return fieldProjections;
+}
+
+module.exports = { deriveFieldProjections, augmentProjectionsForSoftDelete };