fastify-auto-sqlapi 0.0.3 → 0.0.5

package/dist/bin/generate-tables.js

@@ -4,7 +4,6 @@ import * as path from 'node:path';
 import { loadConfig } from '../lib/cli/config.js';
 import { parseSchemaFile, generateSingleTableFile, generateDbTablesIndex } from '../lib/cli/tables-codegen.js';
 import { loadEnvFile, CONSOLE_COLORS, display, displayAsTableRow, error } from './utils.js';
-loadEnvFile();
 function printHelp() {
     console.log('');
     display('Usage:', CONSOLE_COLORS.yellow);
@@ -53,6 +52,7 @@ async function main() {
     }
     display('++++++ fastify-auto-sqlapi: generating tables template ++++++', CONSOLE_COLORS.yellow);
     const config = await loadConfig();
+    loadEnvFile(config.envFile);
     const outputDir = path.resolve(process.cwd(), cliArgs.output || config.outputDir);
     const schemasDir = path.join(outputDir, 'schemas');
     const tablesDir = path.join(outputDir, 'tables');

package/dist/bin/utils.d.ts

@@ -2,7 +2,7 @@
  * Load .env file from cwd if it exists.
  * Does not override already-set environment variables.
  */
-export declare function loadEnvFile(): void;
+export declare function loadEnvFile(envFile?: string): void;
 export declare const CONSOLE_COLORS: {
     readonly black: 30;
     readonly gray: 90;

package/dist/bin/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/bin/utils.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAgB,WAAW,IAAI,IAAI,CAqBlC;AAED,eAAO,MAAM,cAAc;;;;;;;;CAQjB,CAAC;AAEX,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,KAAK,GAAE,MAAU,GAChB,IAAI,CAQN;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,GAAE,MAAU,GAAG,IAAI,CAE7D;AAED,wBAAgB,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAExC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/bin/utils.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAgB,WAAW,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAqBlD;AAED,eAAO,MAAM,cAAc;;;;;;;;CAQjB,CAAC;AAEX,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,KAAK,GAAE,MAAU,GAChB,IAAI,CAQN;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,GAAE,MAAU,GAAG,IAAI,CAE7D;AAED,wBAAgB,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAExC"}

package/dist/bin/utils.js

@@ -4,8 +4,8 @@ import { resolve } from 'node:path';
  * Load .env file from cwd if it exists.
  * Does not override already-set environment variables.
  */
-export function loadEnvFile() {
-    const envPath = resolve(process.cwd(), '.env');
+export function loadEnvFile(envFile) {
+    const envPath = resolve(process.cwd(), envFile || '.env');
     if (!existsSync(envPath))
         return;
     const content = readFileSync(envPath, 'utf-8');

package/dist/index.d.ts

@@ -30,5 +30,5 @@ export { BulkDeleteTableBody, BulkDeleteTableResponse } from './lib/schema/bulk-
 export { default as bulkDeleteRoutes } from './routes/auto/bulk-delete.routes.js';
 export { Type, type Static } from '@sinclair/typebox';
 export { ConditionBuilder, Expression } from 'node-condition-builder';
-export type { SqlApiConfig, ColumnInfo, TableMap, Queryable, SqlResult, DbRecord, DbRecordValue, SelectOptions, SchemaDefinition, JoinDefinition, ITable, DbTables, SqlApiPluginOptions, SwaggerOptions, SearchParams, SearchResult, Paginator, PaginationResult, TableFilterFn, ExtendedConditionFn, FilterRecord, AggregationRequest, JoinGroupRequest, GetParams, GetResult, DeleteParams, DeleteResult, InsertParams, InsertResult, BulkUpsertItem, BulkUpsertParams, BulkUpsertResult, BulkDeleteParams, BulkDeleteResult, ConditionMethod, SearchCondition, UpdateParams, UpdateResult, TenantId, TenantScope, TenantScopeDirect, TenantScopeIndirect, TenantContext, } from './types.js';
+export type { SqlApiConfig, ColumnInfo, TableMap, Queryable, SqlResult, DbRecord, DbRecordValue, SelectOptions, SchemaDefinition, JoinDefinition, ITable, DbTables, SqlApiPluginOptions, SwaggerOptions, SearchParams, SearchResult, Paginator, PaginationResult, TableFilterFn, ExtendedConditionFn, FilterRecord, AggregationRequest, JoinGroupRequest, GetParams, GetResult, DeleteParams, DeleteResult, InsertParams, InsertResult, BulkUpsertItem, BulkUpsertParams, BulkUpsertResult, BulkDeleteParams, BulkDeleteResult, ConditionMethod, SearchCondition, UpdateParams, UpdateResult, TenantId, TenantScope, TenantScopeDirect, TenantScopeIndirect, TenantContext, ValidationError, ValidatorFn, BulkValidatorItem, BulkValidatorFn, } from './types.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/lib/cli/mysql-introspect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mysql-introspect.d.ts","sourceRoot":"","sources":["../../../src/lib/cli/mysql-introspect.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEjD,wBAAgB,0BAA0B,IAAI;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAmBA;AAkDD,wBAAsB,qBAAqB,CACzC,gBAAgB,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,EAClG,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,UAAU,EAAE,CAAC,CAiCvB"}
+{"version":3,"file":"mysql-introspect.d.ts","sourceRoot":"","sources":["../../../src/lib/cli/mysql-introspect.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEjD,wBAAgB,0BAA0B,IAAI;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAmBA;AAkDD,wBAAsB,qBAAqB,CACzC,gBAAgB,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,EAClG,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,UAAU,EAAE,CAAC,CAuCvB"}

package/dist/lib/cli/mysql-introspect.js

@@ -67,7 +67,8 @@ function mapMysqlType(dataType) {
 }
 export async function introspectMysqlTables(connectionConfig, schema) {
     // Dynamic import: mysql2 is optional peer dependency.
-    // Use createRequire from cwd so it works with npm link.
+    // Try the consumer's CWD first (so it works when installed), then fall back to
+    // the plugin's own node_modules (so it works in the plugin's own tests).
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let mysql2;
     try {
@@ -75,7 +76,13 @@ export async function introspectMysqlTables(connectionConfig, schema) {
         mysql2 = require('mysql2/promise');
     }
     catch {
-        throw new Error('mysql2 is required for MySQL/MariaDB introspection. Install it with: npm install mysql2');
+        try {
+            const require = createRequire(import.meta.url);
+            mysql2 = require('mysql2/promise');
+        }
+        catch {
+            throw new Error('mysql2 is required for MySQL/MariaDB introspection. Install it with: npm install mysql2');
+        }
     }
     const connection = await mysql2.createConnection(connectionConfig);
     try {

package/dist/lib/cli/pg-introspect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pg-introspect.d.ts","sourceRoot":"","sources":["../../../src/lib/cli/pg-introspect.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEjD,wBAAgB,qBAAqB,IAAI,MAAM,CAY9C;AAED,wBAAsB,gBAAgB,CACpC,gBAAgB,EAAE,MAAM,EACxB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,UAAU,EAAE,CAAC,CA4BvB"}
+{"version":3,"file":"pg-introspect.d.ts","sourceRoot":"","sources":["../../../src/lib/cli/pg-introspect.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEjD,wBAAgB,qBAAqB,IAAI,MAAM,CAY9C;AAED,wBAAsB,gBAAgB,CACpC,gBAAgB,EAAE,MAAM,EACxB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,UAAU,EAAE,CAAC,CAkCvB"}

package/dist/lib/cli/pg-introspect.js

@@ -19,7 +19,14 @@ export async function introspectTables(connectionString, schema) {
         pg = require('pg');
     }
     catch {
-        throw new Error('pg is required for PostgreSQL introspection. Install it with: npm install pg');
+        try {
+            // Fallback: resolve from the package's own node_modules
+            const require = createRequire(import.meta.url);
+            pg = require('pg');
+        }
+        catch {
+            throw new Error('pg is required for PostgreSQL introspection. Install it with: npm install pg');
+        }
     }
     const client = new pg.Client({ connectionString });
     try {

package/dist/lib/cli/schema-codegen.d.ts

@@ -4,5 +4,5 @@ export declare function convertColType(udtName: string, columnInfo: {
     is_nullable: string;
 }): string;
 export declare function buildTableMap(rows: ColumnInfo[]): TableMap;
-export declare function generateSchemaFile(schemaName: string, tableName: string, fields: Record<string, string>): string;
+export declare function generateSchemaFile(schemaName: string, tableName: string, fields: Record<string, string>, colMap: Record<string, string>): string;
 //# sourceMappingURL=schema-codegen.d.ts.map

package/dist/lib/cli/schema-codegen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema-codegen.d.ts","sourceRoot":"","sources":["../../../src/lib/cli/schema-codegen.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE3D,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,EACf,UAAU,EAAE;IAAE,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GACjE,MAAM,CAoDR;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,QAAQ,CAkB1D;AAED,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC7B,MAAM,CAsCR"}
+{"version":3,"file":"schema-codegen.d.ts","sourceRoot":"","sources":["../../../src/lib/cli/schema-codegen.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE3D,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,EACf,UAAU,EAAE;IAAE,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GACjE,MAAM,CAoDR;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,QAAQ,CAqB1D;AAED,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC7B,MAAM,CA2CR"}

package/dist/lib/cli/schema-codegen.js

@@ -57,20 +57,26 @@ export function buildTableMap(rows) {
             acc[schemaName] = {
                 name: row.table_name,
                 fields: {},
+                colMap: {},
             };
         }
-        acc[schemaName].fields[toCamelCase(row.column_name)] = convertColType(row.udt_name, row);
+        const fieldName = toCamelCase(row.column_name);
+        acc[schemaName].fields[fieldName] = convertColType(row.udt_name, row);
+        acc[schemaName].colMap[fieldName] = row.column_name;
         return acc;
     }, {});
 }
-export function generateSchemaFile(schemaName, tableName, fields) {
+export function generateSchemaFile(schemaName, tableName, fields, colMap) {
     const fieldsStr = JSON.stringify(fields, null, 2).replace(/"(.*?)"\s*:\s*"Type(.*?)"/g, '$1: Type$2');
+    const colMapStr = JSON.stringify(colMap, null, 2);
     return `// Auto-generated by fastify-auto-sqlapi. Do not edit.
-import { Type, toUnderscore } from "fastify-auto-sqlapi";
+import { Type } from "fastify-auto-sqlapi";
 import type { Static } from "fastify-auto-sqlapi";
 
 const _Schema = ${fieldsStr};
 
+const _colMap: Record<string, string> = ${colMapStr};
+
 const validation = Type.Object(_Schema, { $id: "${schemaName}" });
 const partialValidation = Type.Object(
   Object.fromEntries(
@@ -83,7 +89,8 @@ const partialValidation = Type.Object(
 );
 
 export const Schema = {
-  col: (f: keyof typeof _Schema) => toUnderscore(f),
+  col: (f: keyof typeof _Schema) => _colMap[f as string] ?? f,
+  colMap: _colMap,
   fields: _Schema,
   validation,
   tableName: "${tableName}",

package/dist/lib/cli/tables-codegen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tables-codegen.d.ts","sourceRoot":"","sources":["../../../src/lib/cli/tables-codegen.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,gBAAgB;IAC/B,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;CACpB;AAID,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CA2BpE;AAgBD,wBAAgB,eAAe,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,gBAAgB,EAAE,CAwB3E;AAID,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,MAAM,CAiGhG;AAID,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,CAqBrE;AAID,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,CAoFlE"}
+{"version":3,"file":"tables-codegen.d.ts","sourceRoot":"","sources":["../../../src/lib/cli/tables-codegen.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,gBAAgB;IAC/B,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;CACpB;AAID,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CA2BpE;AAgBD,wBAAgB,eAAe,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,gBAAgB,EAAE,CAwB3E;AAID,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,MAAM,CAwHhG;AAID,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,CAqBrE;AAID,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,CA6FlE"}

package/dist/lib/cli/tables-codegen.js

@@ -98,6 +98,7 @@ export function generateSingleTableFile(schema, allSchemas) {
     const lines = [];
     // Imports
     lines.push(`import {defineTable, exportTableInfo, Type} from 'fastify-auto-sqlapi';`);
+    lines.push(`import type {ValidationError} from 'fastify-auto-sqlapi';`);
     lines.push(`import {${schema.schemaName} as Schema} from '../schemas/${schema.schemaName}';`);
     // Commented imports for related schemas
     for (const relSchema of relatedSchemas) {
@@ -140,6 +141,27 @@ export function generateSingleTableFile(schema, allSchemas) {
         lines.push(`  // allowedReadJoins: [],`);
     }
     lines.push(`  // upsertMap: buildUpsertRules(buildUpsertRule(Schema, ['${pk}'])),`);
+    // schemaOverrides: suggest email format if email field exists, otherwise minLength on first string field
+    const emailField = schema.fields.find(f => f.toLowerCase().includes('email'));
+    if (emailField) {
+        lines.push(`  // schemaOverrides: { ${emailField}: Type.String({ format: 'email' }) },`);
+    }
+    else {
+        const stringField = schema.fields.find(f => f !== pk && schema.fieldTypes[f]?.includes('String'));
+        if (stringField) {
+            lines.push(`  // schemaOverrides: { ${stringField}: Type.String({ minLength: 1 }) },`);
+        }
+        else {
+            lines.push(`  // schemaOverrides: {},`);
+        }
+    }
+    // validate: use first non-PK field for example
+    const exampleField = schema.fields.find(f => f !== pk) || schema.fields[0];
+    lines.push(`  validate: async (db, req, main, secondaries) => {`);
+    lines.push(`    const errors: ValidationError[] = [];`);
+    lines.push(`    // if (!main.${exampleField}) errors.push(['${exampleField}', 'required']);`);
+    lines.push(`    return errors;`);
+    lines.push(`  },`);
     lines.push(`  // beforeInsert: async (db, req, record) => {},`);
     lines.push(`  // beforeUpdate: async (db, req, fields) => {},`);
     if (childRels.length > 0) {
@@ -188,7 +210,7 @@ export function generateTablesFile(schemas) {
     const lines = [];
     // Imports
     lines.push(`import {defineTable, exportTableInfo, Type} from 'fastify-auto-sqlapi';`);
-    lines.push(`import type { DbTables } from 'fastify-auto-sqlapi';`);
+    lines.push(`import type { DbTables, ValidationError } from 'fastify-auto-sqlapi';`);
     lines.push(``);
     // Schema imports
     for (const schema of schemas) {
@@ -223,6 +245,13 @@ export function generateTablesFile(schemas) {
             lines.push(`  // allowedReadJoins: [],`);
         }
         lines.push(`  // upsertMap: buildUpsertRules(buildUpsertRule(${schema.schemaName}, ['${pk}'])),`);
+        lines.push(`  // schemaOverrides: {},`);
+        const exampleFieldLegacy = schema.fields.find(f => f !== pk) || schema.fields[0];
+        lines.push(`  validate: async (db, req, main, secondaries) => {`);
+        lines.push(`    const errors: ValidationError[] = [];`);
+        lines.push(`    // if (!main.${exampleFieldLegacy}) errors.push(['${exampleFieldLegacy}', 'required']);`);
+        lines.push(`    return errors;`);
+        lines.push(`  },`);
         lines.push(`  // beforeInsert: async (db, req, record) => {},`);
         lines.push(`  // beforeUpdate: async (db, req, fields) => {},`);
         const childRels = relsByChild.get(schema.schemaName) || [];

package/dist/lib/db.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../src/lib/db.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAK/C,sCAAsC;AACtC,eAAO,MAAM,WAAW,GAAI,GAAG,MAAM,WAA0B,CAAC;AAEhE,qBAAa,WAAW;;IACtB,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,OAAO,CAAa;IAC5B,OAAO,CAAC,KAAK,CAAS;gBAEV,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,UAAU;IAKnD,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,MAAM,KAAK,MAAM,CAE/B;IAED,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAE9B;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,QAAQ,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;IAI7B,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU;IAIrC,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,OAAO,EAAE,GACjB,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IA6FlB,MAAM,CACV,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,QAAQ,EAChB,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GACvB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAoB7B,cAAc,CAClB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,QAAQ,EAChB,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GACvB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAuB7B,UAAU,CACd,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,QAAQ,EAAE,EACnB,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,EACxB,SAAS,SAAqB,GAC7B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IA2B/B,kBAAkB,CACtB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,QAAQ,EAAE,EACnB,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,EACxB,SAAS,SAAqB,GAC7B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IA+B/B,MAAM,CACV,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,QAAQ,EAChB,KAAK,EAAE,QAAQ,EACf,cAAc,CAAC,EAAE,gBAAgB,GAChC,OAAO,CAAC,MAAM,CAAC;IAuBZ,MAAM,CACV,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,QAAQ,GACd,OAAO,CAAC,MAAM,CAAC;IAYZ,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EACxC,SAAS,EACT,OAAa,EACb,KAAK,EACL,MAAM,EACN,KAAY,EACZ,OAAY,EACZ,KAAU,EACV,QAAgB,GACjB,EAAE,aAAa,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;CAchC;AAED,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,SAAS,EACf,WAAW,CAAC,EAAE,MAAM,GACnB,WAAW,CAGb"}
+{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../src/lib/db.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAK/C,sCAAsC;AACtC,eAAO,MAAM,WAAW,GAAI,GAAG,MAAM,WAA0B,CAAC;AAEhE,qBAAa,WAAW;;IACtB,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,OAAO,CAAa;IAC5B,OAAO,CAAC,KAAK,CAAS;gBAEV,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,UAAU;IAKnD,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,MAAM,KAAK,MAAM,CAE/B;IAED,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAE9B;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,QAAQ,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;IAI7B,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU;IAIrC,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,OAAO,EAAE,GACjB,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IA6FlB,MAAM,CACV,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,QAAQ,EAChB,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GACvB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAoB7B,cAAc,CAClB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,QAAQ,EAChB,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GACvB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAuB7B,UAAU,CACd,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,QAAQ,EAAE,EACnB,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,EACxB,SAAS,SAAqB,GAC7B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IA+B/B,kBAAkB,CACtB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,QAAQ,EAAE,EACnB,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,EACxB,SAAS,SAAqB,GAC7B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IAiC/B,MAAM,CACV,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,QAAQ,EAChB,KAAK,EAAE,QAAQ,EACf,cAAc,CAAC,EAAE,gBAAgB,GAChC,OAAO,CAAC,MAAM,CAAC;IAuBZ,MAAM,CACV,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,QAAQ,GACd,OAAO,CAAC,MAAM,CAAC;IAYZ,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EACxC,SAAS,EACT,OAAa,EACb,KAAK,EACL,MAAM,EACN,KAAY,EACZ,OAAY,EACZ,KAAU,EACV,QAAgB,GACjB,EAAE,aAAa,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;CAchC;AAED,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,SAAS,EACf,WAAW,CAAC,EAAE,MAAM,GACnB,WAAW,CAGb"}

package/dist/lib/db.js

@@ -149,8 +149,12 @@ export class QueryClient {
                 results.push(...result.rows);
             }
             else {
-                for (const rec of chunk) {
-                    results.push(this.#mysqlPkResult(pkCol, rec, result.insertId));
+                // MySQL: insertId is the FIRST generated ID of the multi-row insert.
+                // Subsequent rows follow sequentially assuming auto_increment_increment=1 (default).
+                const firstId = result.insertId;
+                for (let j = 0; j < chunk.length; j++) {
+                    const id = typeof firstId === 'number' ? firstId + j : undefined;
+                    results.push(this.#mysqlPkResult(pkCol, chunk[j], id));
                 }
             }
         }
@@ -174,8 +178,10 @@ export class QueryClient {
                 results.push(...result.rows);
             }
             else {
-                for (const rec of chunk) {
-                    results.push(this.#mysqlPkResult(pkCol, rec, result.insertId));
+                const firstId = result.insertId;
+                for (let j = 0; j < chunk.length; j++) {
+                    const id = typeof firstId === 'number' ? firstId + j : undefined;
+                    results.push(this.#mysqlPkResult(pkCol, chunk[j], id));
                 }
             }
         }

package/dist/lib/engine/bulk/bulk-upsert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bulk-upsert.d.ts","sourceRoot":"","sources":["../../../../src/lib/engine/bulk/bulk-upsert.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EAGjB,MAAM,mBAAmB,CAAC;AAE3B,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAuF5F"}
+{"version":3,"file":"bulk-upsert.d.ts","sourceRoot":"","sources":["../../../../src/lib/engine/bulk/bulk-upsert.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EAGjB,MAAM,mBAAmB,CAAC;AAE3B,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAoG5F"}

package/dist/lib/engine/bulk/bulk-upsert.js

@@ -1,23 +1,41 @@
-import { camelcaseObject, snakecaseRecord } from '../../naming.js';
+import { snakecaseRecord } from '../../naming.js';
 import { removeExcludedFields, processSecondaries, processDeletions } from '../write-helpers.js';
 import { injectTenantValue, validateTenantFK } from '../../tenant.js';
+import { runValidation, runBulkValidation } from '../validate.js';
 import { primaryAsString } from '../../../types.js';
 export async function bulkUpsertEngine(params) {
     const { db, tableConf, dbTables, request, items, tenant } = params;
     if (!items.length)
         return [];
+    const schema = tableConf.Schema;
     const pk = primaryAsString(tableConf.primary);
-    const pkCol = tableConf.Schema.col(pk);
-    // 1. Prepare all main records
-    const preparedMains = items.map((item) => {
-        let rec = snakecaseRecord(item.main);
-        rec = removeExcludedFields(rec, tableConf);
-        return rec;
+    const pkCol = schema.col(pk);
+    // 1. Mutable camelCase copies of each item.main
+    const inputMains = items.map((item) => ({ ...item.main }));
+    // 2. Custom validation (camelCase)
+    if (tableConf.validateBulk) {
+        await runBulkValidation(db, request, tableConf, items);
+    }
+    else {
+        for (let i = 0; i < items.length; i++) {
+            await runValidation(db, request, tableConf, inputMains[i], items[i].secondaries);
+        }
+    }
+    // 3. beforeInsert hook per record (camelCase)
+    if (tableConf.beforeInsert) {
+        for (const rec of inputMains) {
+            await tableConf.beforeInsert(db, request, rec);
+        }
+    }
+    // 4. Convert to DB format (after user mutations)
+    const preparedMains = inputMains.map((rec) => {
+        let converted = snakecaseRecord(rec, schema);
+        converted = removeExcludedFields(converted, tableConf);
+        return converted;
     });
-    // 1b. Tenant: inject or validate FK
+    // 5. Tenant: inject or validate FK (enforced after user mutations)
     if (tenant) {
         if ('through' in tenant.scope) {
-            // Indirect: collect all FK values, validate in batch
             const scope = tenant.scope;
             const fkCol = scope.through.localField;
             const fkValues = preparedMains.map((rec) => rec[fkCol]);
@@ -29,31 +47,27 @@ export async function bulkUpsertEngine(params) {
             }
         }
     }
-    // 2. beforeInsert hook per record
-    if (tableConf.beforeInsert) {
-        for (const rec of preparedMains) {
-            await tableConf.beforeInsert(db, request, rec);
-        }
-    }
-    // 3. Bulk upsert all mains in one query → returns PK-only
-    const upsertKeys = tableConf.upsertMap?.get(tableConf.Schema);
+    // 6. Bulk upsert all mains in one query → returns PK-only
+    const upsertKeys = tableConf.upsertMap?.get(schema);
     let pkRows;
     if (upsertKeys) {
-        const conflictCols = upsertKeys.map((k) => tableConf.Schema.col(k));
-        pkRows = await db.bulkInsertOrUpdate(tableConf.Schema.tableName, preparedMains, conflictCols, pkCol);
+        const conflictCols = upsertKeys.map((k) => schema.col(k));
+        pkRows = await db.bulkInsertOrUpdate(schema.tableName, preparedMains, conflictCols, pkCol);
     }
     else {
-        pkRows = await db.bulkInsert(tableConf.Schema.tableName, preparedMains, pkCol);
+        pkRows = await db.bulkInsert(schema.tableName, preparedMains, pkCol);
     }
-    const pksCamel = pkRows.map((r) => camelcaseObject(r));
-    // 4. Process secondaries and deletions per item
+    // 7. Process secondaries, deletions, afterInsert per item (all camelCase)
     const results = [];
     for (let i = 0; i < items.length; i++) {
         const item = items[i];
-        const mainPk = pksCamel[i];
-        const result = { main: mainPk };
-        // For FK auto-fill in secondaries, merge input record + PK
-        const mainForFK = { ...camelcaseObject(preparedMains[i]), ...mainPk };
+        const mainPk = pkRows[i]; // PK-only (already in camelCase field name since PK uses camelCase field)
+        // pkRows entries come from SQL RETURNING or insertId — keys are DB column names.
+        // For simple PK named the same in API and DB (like 'id') this is transparent.
+        // If PK name differs (rare), the user should not rely on mainPk for FK auto-fill — it's the merged inputMain that drives FK.
+        const result = { main: { [pk]: mainPk[pkCol] ?? mainPk[pk] } };
+        // FK auto-fill: input camelCase + generated PK
+        const mainForFK = { ...inputMains[i], [pk]: mainPk[pkCol] ?? mainPk[pk] };
         if (item.secondaries && Object.keys(item.secondaries).length > 0) {
             const sec = await processSecondaries(db, tableConf, dbTables, mainForFK, item.secondaries);
             if (Object.keys(sec).length > 0)
@@ -64,7 +78,7 @@ export async function bulkUpsertEngine(params) {
             if (Object.keys(del).length > 0)
                 result.deletions = del;
         }
-        // 5. afterInsert hook per item
+        // 8. afterInsert hook per item (camelCase)
         if (tableConf.afterInsert) {
             await tableConf.afterInsert(db, request, mainForFK, result.secondaries);
         }

package/dist/lib/engine/rest/get.js

@@ -28,5 +28,5 @@ export async function getEngine(params) {
         err.statusCode = 404;
         throw err;
     }
-    return { main: camelcaseObject(rows[0]) };
+    return { main: camelcaseObject(rows[0], tableConf.Schema) };
 }

package/dist/lib/engine/rest/insert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../../src/lib/engine/rest/insert.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,YAAY,EACZ,YAAY,EAGb,MAAM,mBAAmB,CAAC;AAE3B,wBAAsB,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CAsE9E"}
+{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../../src/lib/engine/rest/insert.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,YAAY,EACZ,YAAY,EAGb,MAAM,mBAAmB,CAAC;AAE3B,wBAAsB,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CA2E9E"}

package/dist/lib/engine/rest/insert.js

@@ -1,18 +1,27 @@
 import { camelcaseObject, snakecaseRecord } from '../../naming.js';
 import { removeExcludedFields, processSecondaries } from '../write-helpers.js';
 import { injectTenantValue, validateTenantFK } from '../../tenant.js';
+import { runValidation } from '../validate.js';
 import { primaryAsString } from '../../../types.js';
 export async function insertEngine(params) {
     const { db, tableConf, dbTables, request, record, secondaries, tenant } = params;
+    const schema = tableConf.Schema;
     const pk = primaryAsString(tableConf.primary);
-    const pkCol = tableConf.Schema.col(pk);
-    // 1. Prepare main record
-    let mainRecord = snakecaseRecord(record);
+    const pkCol = schema.col(pk);
+    // 1. Mutable copy of input in camelCase (user-facing format)
+    const inputRecord = { ...record };
+    // 2. Custom validation (camelCase)
+    await runValidation(db, request, tableConf, inputRecord, secondaries);
+    // 3. beforeInsert hook (camelCase — user can mutate with schema field names)
+    if (tableConf.beforeInsert) {
+        await tableConf.beforeInsert(db, request, inputRecord);
+    }
+    // 4. Convert to DB format (after all user mutations)
+    let mainRecord = snakecaseRecord(inputRecord, schema);
     mainRecord = removeExcludedFields(mainRecord, tableConf);
-    // 1b. Tenant: inject or validate
+    // 5. Tenant: inject or validate (enforced after user mutations for security)
     if (tenant) {
         if ('through' in tenant.scope) {
-            // Indirect: validate FK belongs to tenant
             const scope = tenant.scope;
             const fkCol = scope.through.localField;
             const fkValue = mainRecord[fkCol];
@@ -22,34 +31,29 @@ export async function insertEngine(params) {
             injectTenantValue(mainRecord, tenant.scope, tenant.ids);
         }
     }
-    // 2. beforeInsert hook
-    if (tableConf.beforeInsert) {
-        await tableConf.beforeInsert(db, request, mainRecord);
-    }
-    // 3. Insert main → returns PK-only
+    // 6. Insert main → returns PK-only
     let pkResult;
-    const upsertKeys = tableConf.upsertMap?.get(tableConf.Schema);
+    const upsertKeys = tableConf.upsertMap?.get(schema);
     if (upsertKeys) {
-        const conflictCols = upsertKeys.map((k) => tableConf.Schema.col(k));
-        pkResult = await db.insertOrUpdate(tableConf.Schema.tableName, mainRecord, conflictCols, pkCol);
+        const conflictCols = upsertKeys.map((k) => schema.col(k));
+        pkResult = await db.insertOrUpdate(schema.tableName, mainRecord, conflictCols, pkCol);
     }
     else {
-        pkResult = await db.insert(tableConf.Schema.tableName, mainRecord, pkCol);
+        pkResult = await db.insert(schema.tableName, mainRecord, pkCol);
     }
-    const mainPkCamel = camelcaseObject(pkResult);
-    // 4. Secondaries: need full record for FK auto-fill
+    const mainPkCamel = camelcaseObject(pkResult, schema);
+    // 7. Secondaries: need full record for FK auto-fill (camelCase)
     let secondaryResults;
     if (secondaries && Object.keys(secondaries).length > 0) {
-        // Merge input record + PK for FK auto-fill
-        const mainForFK = { ...camelcaseObject(mainRecord), ...mainPkCamel };
+        const mainForFK = { ...inputRecord, ...mainPkCamel };
         secondaryResults = await processSecondaries(db, tableConf, dbTables, mainForFK, secondaries);
     }
-    // 5. afterInsert hook
+    // 8. afterInsert hook (camelCase — input merged with generated PK)
     if (tableConf.afterInsert) {
-        const mainForHook = { ...camelcaseObject(mainRecord), ...mainPkCamel };
+        const mainForHook = { ...inputRecord, ...mainPkCamel };
         await tableConf.afterInsert(db, request, mainForHook, secondaryResults);
     }
-    // 6. Return PK-only
+    // 9. Return PK-only
     const result = { main: mainPkCamel };
     if (secondaryResults && Object.keys(secondaryResults).length > 0) {
         result.secondaries = secondaryResults;

package/dist/lib/engine/rest/update.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../src/lib/engine/rest/update.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,YAAY,EACZ,YAAY,EAGb,MAAM,mBAAmB,CAAC;AAE3B,wBAAsB,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CA6H9E"}
+{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../src/lib/engine/rest/update.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,YAAY,EACZ,YAAY,EAGb,MAAM,mBAAmB,CAAC;AAE3B,wBAAsB,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CAkI9E"}