fastify-auto-sqlapi 0.0.5 → 0.1.2

package/dist/bin/generate-schema.js

@@ -5,26 +5,13 @@ import { loadConfig } from '../lib/cli/config.js';
 import { buildConnectionString, introspectTables } from '../lib/cli/pg-introspect.js';
 import { buildMysqlConnectionConfig, introspectMysqlTables } from '../lib/cli/mysql-introspect.js';
 import { buildTableMap, generateSchemaFile } from '../lib/cli/schema-codegen.js';
-import { loadEnvFile, CONSOLE_COLORS, display, displayAsTableRow, error } from './utils.js';
-function parseCliArgs() {
-    const args = process.argv.slice(2);
-    const result = {};
-    for (let i = 0; i < args.length; i++) {
-        if (args[i] === '--output' && i + 1 < args.length) {
-            result.output = args[++i];
-        }
-        else if (args[i] === '--tables' && i + 1 < args.length) {
-            result.tables = args[++i].split(',').map((t) => t.trim()).filter(Boolean);
-        }
-        else if (args[i] === '--dialect' && i + 1 < args.length) {
-            result.dialect = args[++i];
-        }
-    }
-    return result;
-}
-async function main() {
-    display('++++++ fastify-auto-sqlapi: generating schemas ++++++', CONSOLE_COLORS.yellow);
-    const cliArgs = parseCliArgs();
+import { loadEnvFile, CONSOLE_COLORS, display, displayAsTableRow, parseArgs, runCli } from './utils.js';
+await runCli('fastify-auto-sqlapi: generating schemas', async () => {
+    const cliArgs = parseArgs({
+        output: { type: 'value' },
+        tables: { type: 'list' },
+        dialect: { type: 'value' },
+    });
     const config = await loadConfig();
     loadEnvFile(config.envFile);
     const dialect = (cliArgs.dialect || config.dialect || 'postgres');
@@ -51,7 +38,7 @@ async function main() {
     const tableMap = buildTableMap(rows);
     // Filter tables if --tables flag is provided
     const tableNames = cliArgs.tables;
-    if (tableNames) {
+    if (tableNames.length) {
         for (const schemaName of Object.keys(tableMap)) {
             if (!tableNames.includes(tableMap[schemaName].name)) {
                 delete tableMap[schemaName];
@@ -94,7 +81,7 @@ async function main() {
         }
     }
     // Remove orphan Schema*.ts files (only when generating all tables)
-    if (!tableNames) {
+    if (!tableNames.length) {
         const existingFiles = fs.readdirSync(schemasDir);
         for (const file of existingFiles) {
             if (file.startsWith('Schema') && file.endsWith('.ts') && !generatedFiles.has(file)) {
@@ -115,8 +102,4 @@ async function main() {
     if (!somethingTouched) {
         display('All schemas are already up to date.', CONSOLE_COLORS.magenta);
     }
-}
-main().catch((e) => {
-    error(`Error: ${e.message}`);
-    process.exit(1);
 });

package/dist/bin/generate-tables.js

@@ -3,7 +3,7 @@ import * as fs from 'node:fs';
 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';
+import { loadEnvFile, CONSOLE_COLORS, display, displayAsTableRow, error, parseArgs, runCli } from './utils.js';
 function printHelp() {
     console.log('');
     display('Usage:', CONSOLE_COLORS.yellow);
@@ -22,35 +22,16 @@ function printHelp() {
     display('Table*.ts files are only created if they do not already exist.', CONSOLE_COLORS.magenta);
     display('dbTables.ts is always regenerated to include all schemas.', CONSOLE_COLORS.magenta);
 }
-function parseCliArgs() {
-    const args = process.argv.slice(2);
-    const result = { all: false, tables: [] };
-    for (let i = 0; i < args.length; i++) {
-        if (args[i] === '--output' && i + 1 < args.length) {
-            result.output = args[++i];
-        }
-        else if (args[i] === '--all') {
-            result.all = true;
-        }
-        else if (!args[i].startsWith('--')) {
-            // Split by comma to support both "a b" and "a,b" and "a, b"
-            for (const part of args[i].split(',')) {
-                const trimmed = part.trim();
-                if (trimmed)
-                    result.tables.push(trimmed);
-            }
-        }
-    }
-    return result;
-}
-async function main() {
-    const cliArgs = parseCliArgs();
+await runCli('fastify-auto-sqlapi: generating tables template', async () => {
+    const cliArgs = parseArgs({
+        output: { type: 'value' },
+        all: { type: 'flag' },
+        tables: { type: 'list' },
+    });
     if (!cliArgs.all && cliArgs.tables.length === 0) {
-        display('++++++ fastify-auto-sqlapi: generate tables template ++++++', CONSOLE_COLORS.yellow);
         printHelp();
         process.exit(1);
     }
-    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);
@@ -128,8 +109,4 @@ async function main() {
     }
     console.log('');
     display('Edit the generated Table*.ts files to customize your table configuration.', CONSOLE_COLORS.magenta);
-}
-main().catch((e) => {
-    error(`Error: ${e.message}`);
-    process.exit(1);
 });

package/dist/bin/utils.d.ts

@@ -15,4 +15,32 @@ export declare const CONSOLE_COLORS: {
 export declare function displayAsTableRow(pref: string, value: string, distance: number, color?: number): void;
 export declare function display(text: string, color?: number): void;
 export declare function error(text: string): void;
+type ArgSpec = {
+    type: 'value';
+} | {
+    type: 'flag';
+} | {
+    type: 'list';
+};
+type ArgValue<S extends ArgSpec> = S['type'] extends 'flag' ? boolean : S['type'] extends 'list' ? string[] : string | undefined;
+/**
+ * Tiny declarative argv parser for the bundled CLIs.
+ * - `value`  → recognized as `--name X`, last value wins
+ * - `flag`   → recognized as `--name`, default false
+ * - `list`   → comma-separated `--name a,b,c`; can also accept positional comma-/space- separated tokens
+ *
+ * Positional tokens (non-`--`) are accumulated into `positional`. List specs auto-merge those tokens
+ * (split on ',') into the list as well, supporting both "a b" and "a,b" CLI shapes.
+ */
+export declare function parseArgs<S extends Record<string, ArgSpec>>(spec: S, argv?: string[]): {
+    [K in keyof S]: ArgValue<S[K]>;
+} & {
+    positional: string[];
+};
+/**
+ * CLI entry-point wrapper: prints a header, awaits `fn`, and turns thrown errors into a red message
+ * with a non-zero exit code (without aborting the process synchronously, so unfinished stdout flushes).
+ */
+export declare function runCli(name: string, fn: () => Promise<void>): Promise<void>;
+export {};
 //# sourceMappingURL=utils.d.ts.map

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,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"}
+{"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;AAED,KAAK,OAAO,GACR;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,GACjB;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAErB,KAAK,QAAQ,CAAC,CAAC,SAAS,OAAO,IAC7B,CAAC,CAAC,MAAM,CAAC,SAAS,MAAM,GAAG,OAAO,GAClC,CAAC,CAAC,MAAM,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,GACnC,MAAM,GAAG,SAAS,CAAC;AAErB;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACzD,IAAI,EAAE,CAAC,EACP,IAAI,WAAwB,GAC3B;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAAE,GAAG;IAAE,UAAU,EAAE,MAAM,EAAE,CAAA;CAAE,CAyC/D;AAED;;;GAGG;AACH,wBAAsB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAQjF"}

package/dist/bin/utils.js

@@ -52,3 +52,72 @@ export function display(text, color = 0) {
 export function error(text) {
     display(text, CONSOLE_COLORS.red);
 }
+/**
+ * Tiny declarative argv parser for the bundled CLIs.
+ * - `value`  → recognized as `--name X`, last value wins
+ * - `flag`   → recognized as `--name`, default false
+ * - `list`   → comma-separated `--name a,b,c`; can also accept positional comma-/space- separated tokens
+ *
+ * Positional tokens (non-`--`) are accumulated into `positional`. List specs auto-merge those tokens
+ * (split on ',') into the list as well, supporting both "a b" and "a,b" CLI shapes.
+ */
+export function parseArgs(spec, argv = process.argv.slice(2)) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const out = { positional: [] };
+    for (const [name, def] of Object.entries(spec)) {
+        out[name] = def.type === 'flag' ? false : def.type === 'list' ? [] : undefined;
+    }
+    for (let i = 0; i < argv.length; i++) {
+        const token = argv[i];
+        if (token.startsWith('--')) {
+            const name = token.slice(2);
+            const def = spec[name];
+            if (!def)
+                continue;
+            if (def.type === 'flag') {
+                out[name] = true;
+            }
+            else if (def.type === 'value' && i + 1 < argv.length) {
+                out[name] = argv[++i];
+            }
+            else if (def.type === 'list' && i + 1 < argv.length) {
+                const next = argv[++i];
+                for (const part of next.split(',')) {
+                    const t = part.trim();
+                    if (t)
+                        out[name].push(t);
+                }
+            }
+        }
+        else {
+            out.positional.push(token);
+            // Auto-distribute positional values into the (single) list spec, if any
+            for (const [n, def] of Object.entries(spec)) {
+                if (def.type === 'list') {
+                    for (const part of token.split(',')) {
+                        const t = part.trim();
+                        if (t)
+                            out[n].push(t);
+                    }
+                    break;
+                }
+            }
+        }
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    return out;
+}
+/**
+ * CLI entry-point wrapper: prints a header, awaits `fn`, and turns thrown errors into a red message
+ * with a non-zero exit code (without aborting the process synchronously, so unfinished stdout flushes).
+ */
+export async function runCli(name, fn) {
+    display(`++++++ ${name} ++++++`, CONSOLE_COLORS.yellow);
+    try {
+        await fn();
+    }
+    catch (e) {
+        error(`Error: ${e.message ?? String(e)}`);
+        process.exitCode = 1;
+    }
+}

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, ValidationError, ValidatorFn, BulkValidatorItem, BulkValidatorFn, } 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, ComputedFieldFn, ComputedFieldContext, ComputedFieldExpr, 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/load-dependency.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Load an optional peer dependency by trying the consumer's CWD first
+ * (so it works when installed via `npm install`/`npm link`), then falling
+ * back to the plugin's own `node_modules` (so it works in the plugin's own tests).
+ * Throws a friendly error if neither succeeds.
+ */
+export declare function loadOptionalDependency<T = unknown>(modulePath: string, installHint: string): T;
+//# sourceMappingURL=load-dependency.d.ts.map

package/dist/lib/cli/load-dependency.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"load-dependency.d.ts","sourceRoot":"","sources":["../../../src/lib/cli/load-dependency.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,CAAC,GAAG,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,CAAC,CAW9F"}

package/dist/lib/cli/load-dependency.js

@@ -0,0 +1,21 @@
+import { createRequire } from 'node:module';
+/**
+ * Load an optional peer dependency by trying the consumer's CWD first
+ * (so it works when installed via `npm install`/`npm link`), then falling
+ * back to the plugin's own `node_modules` (so it works in the plugin's own tests).
+ * Throws a friendly error if neither succeeds.
+ */
+export function loadOptionalDependency(modulePath, installHint) {
+    try {
+        return createRequire(process.cwd() + '/noop.js')(modulePath);
+    }
+    catch {
+        /* fall through to local require */
+    }
+    try {
+        return createRequire(import.meta.url)(modulePath);
+    }
+    catch {
+        throw new Error(`${modulePath} is required. Install it with: ${installHint}`);
+    }
+}

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,CAuCvB"}
+{"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,CAyBvB"}

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

@@ -1,4 +1,4 @@
-import { createRequire } from 'node:module';
+import { loadOptionalDependency } from './load-dependency.js';
 export function buildMysqlConnectionConfig() {
     if (process.env.DATABASE_URL) {
         const url = new URL(process.env.DATABASE_URL);
@@ -66,24 +66,8 @@ function mapMysqlType(dataType) {
     }
 }
 export async function introspectMysqlTables(connectionConfig, schema) {
-    // Dynamic import: mysql2 is optional peer dependency.
-    // 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 {
-        const require = createRequire(process.cwd() + '/noop.js');
-        mysql2 = require('mysql2/promise');
-    }
-    catch {
-        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 mysql2 = loadOptionalDependency('mysql2/promise', 'npm install mysql2');
     const connection = await mysql2.createConnection(connectionConfig);
     try {
         const [rows] = await connection.query(`SELECT table_name, column_name, data_type, column_default, is_nullable

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,CAkCvB"}
+{"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,CAqBvB"}

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

@@ -1,4 +1,4 @@
-import { createRequire } from 'node:module';
+import { loadOptionalDependency } from './load-dependency.js';
 export function buildConnectionString() {
     if (process.env.DATABASE_URL) {
         return process.env.DATABASE_URL;
@@ -11,23 +11,8 @@ export function buildConnectionString() {
     return `postgres://${user}:${password}@${host}:${port}/${db}`;
 }
 export async function introspectTables(connectionString, schema) {
-    // Dynamic require from cwd so it works with npm link
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    let pg;
-    try {
-        const require = createRequire(process.cwd() + '/noop.js');
-        pg = require('pg');
-    }
-    catch {
-        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 pg = loadOptionalDependency('pg', 'npm install pg');
     const client = new pg.Client({ connectionString });
     try {
         await client.connect();

package/dist/lib/db.d.ts

@@ -13,6 +13,7 @@ export declare class QueryClient {
     get qi(): (id: string) => string;
     get ph(): (i: number) => string;
     get dialectName(): string;
+    get dateTrunc(): SqlDialect['dateTrunc'];
     setDebug(mode: boolean): void;
     expression(value: string): Expression;
     query<T = Record<string, unknown>>(text: string, values?: unknown[]): Promise<SqlResult<T>>;

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;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"}
+{"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;AAQ/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,IAAI,SAAS,IAAI,UAAU,CAAC,WAAW,CAAC,CAEvC;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;IAmGlB,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;IAgB7B,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;IAkB7B,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;IAoB/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;IAuB/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

@@ -1,5 +1,8 @@
 import { Expression } from 'node-condition-builder';
 import { getDialect } from './dialect.js';
+// Default chunk size for bulk INSERT/UPSERT. Picked to keep parameter count well under
+// PostgreSQL's hard limit of 65535 bind parameters per statement (≈ 130 columns × 500 rows).
+// Override per-call via the `chunkSize` argument when working with extremely wide tables.
 const DEFAULT_CHUNK_SIZE = 500;
 /** @deprecated Use db.qi() instead */
 export const escapeIdent = (f) => f.replace(/"/g, '""');
@@ -20,6 +23,9 @@ export class QueryClient {
     get dialectName() {
         return this.dialect.name;
     }
+    get dateTrunc() {
+        return this.dialect.dateTrunc.bind(this.dialect);
+    }
     setDebug(mode) {
         this.debug = mode;
     }
@@ -73,26 +79,14 @@ export class QueryClient {
         }
         return { values, rows: rowPlaceholders.join(', ') };
     }
-    // Build the update SET for upsert: dialect-specific
-    #upsertUpdateSet(fields, conflictKeys) {
-        const updateCols = fields.filter((f) => !conflictKeys.includes(f));
-        if (!updateCols.length)
-            return '';
-        if (this.dialect.name === 'postgres') {
-            return updateCols
-                .map((f) => `${this.dialect.qi(f)} = EXCLUDED.${this.dialect.qi(f)}`)
-                .join(', ');
-        }
-        // MySQL/MariaDB: VALUES(col) syntax
-        return updateCols
-            .map((f) => `${this.dialect.qi(f)} = VALUES(${this.dialect.qi(f)})`)
-            .join(', ');
-    }
     #quotedPkCols(pkCol) {
         const cols = Array.isArray(pkCol) ? pkCol : [pkCol];
         return cols.map((c) => this.dialect.qi(c)).join(', ');
     }
-    #mysqlPkResult(pkCol, record, insertId) {
+    #insertHead(table, fields) {
+        return `INSERT INTO ${this.dialect.qi(table)} (${this.#q(fields)})`;
+    }
+    #mysqlPkRow(pkCol, record, insertId) {
         const cols = Array.isArray(pkCol) ? pkCol : [pkCol];
         const result = {};
         for (const col of cols) {
@@ -106,57 +100,51 @@ export class QueryClient {
             return { [pkCol]: insertId };
         return result;
     }
+    /**
+     * Single source of truth for "extract PK rows from an insert/upsert result". When the
+     * dialect supports RETURNING (postgres/mariadb), returns `result.rows` directly. Otherwise
+     * (mysql) synthesizes PK rows from `insertId` + the input records (assumes
+     * `auto_increment_increment=1` for multi-row inserts).
+     */
+    #extractPkRows(result, pkCol, inputs) {
+        if (this.dialect.supportsReturning)
+            return result.rows;
+        const firstId = result.insertId;
+        return inputs.map((rec, j) => this.#mysqlPkRow(pkCol, rec, typeof firstId === 'number' ? firstId + j : undefined));
+    }
     async insert(table, record, pkCol) {
         const values = [];
         const { fields, placeholders } = this.#params(record, values);
         if (!fields.length)
             throw new Error('Cannot execute empty insert');
         const returning = this.dialect.returningPk(this.#quotedPkCols(pkCol));
-        const result = await this.query(`INSERT INTO ${this.dialect.qi(table)} (${this.#q(fields)})
+        const result = await this.query(`${this.#insertHead(table, fields)}
        VALUES (${placeholders.join(', ')})${returning}`, values);
-        if (this.dialect.supportsReturning) {
-            return result.rows[0];
-        }
-        return this.#mysqlPkResult(pkCol, record, result.insertId);
+        return this.#extractPkRows(result, pkCol, [record])[0];
     }
     async insertOrUpdate(table, record, conflictKeys, pkCol) {
         const values = [];
         const { fields, placeholders } = this.#params(record, values);
         if (!fields.length)
             throw new Error('Cannot execute empty insert');
-        const updateSet = this.#upsertUpdateSet(fields, conflictKeys);
-        const upsertClause = this.dialect.upsertSql(this.#q(conflictKeys), updateSet);
+        const upsertClause = this.dialect.upsertSql(this.#q(conflictKeys), this.dialect.upsertUpdateSet(fields, conflictKeys));
         const returning = this.dialect.returningPk(this.#quotedPkCols(pkCol));
-        const result = await this.query(`INSERT INTO ${this.dialect.qi(table)} (${this.#q(fields)})
+        const result = await this.query(`${this.#insertHead(table, fields)}
        VALUES (${placeholders.join(', ')})
        ${upsertClause}${returning}`, values);
-        if (this.dialect.supportsReturning) {
-            return result.rows[0];
-        }
-        return this.#mysqlPkResult(pkCol, record, result.insertId);
+        return this.#extractPkRows(result, pkCol, [record])[0];
     }
     async bulkInsert(table, records, pkCol, chunkSize = DEFAULT_CHUNK_SIZE) {
         if (!records.length)
             return [];
         const fields = Object.keys(records[0]);
-        const results = [];
         const returning = this.dialect.returningPk(this.#quotedPkCols(pkCol));
+        const results = [];
         for (let i = 0; i < records.length; i += chunkSize) {
             const chunk = records.slice(i, i + chunkSize);
             const { values, rows } = this.#bulkValues(fields, chunk);
-            const result = await this.query(`INSERT INTO ${this.dialect.qi(table)} (${this.#q(fields)}) VALUES ${rows}${returning}`, values);
-            if (this.dialect.supportsReturning) {
-                results.push(...result.rows);
-            }
-            else {
-                // 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));
-                }
-            }
+            const result = await this.query(`${this.#insertHead(table, fields)} VALUES ${rows}${returning}`, values);
+            results.push(...this.#extractPkRows(result, pkCol, chunk));
         }
         return results;
     }
@@ -164,26 +152,16 @@ export class QueryClient {
         if (!records.length)
             return [];
         const fields = Object.keys(records[0]);
-        const updateSet = this.#upsertUpdateSet(fields, conflictKeys);
-        const upsertClause = this.dialect.upsertSql(this.#q(conflictKeys), updateSet);
+        const upsertClause = this.dialect.upsertSql(this.#q(conflictKeys), this.dialect.upsertUpdateSet(fields, conflictKeys));
         const returning = this.dialect.returningPk(this.#quotedPkCols(pkCol));
         const results = [];
         for (let i = 0; i < records.length; i += chunkSize) {
             const chunk = records.slice(i, i + chunkSize);
             const { values, rows } = this.#bulkValues(fields, chunk);
-            const result = await this.query(`INSERT INTO ${this.dialect.qi(table)} (${this.#q(fields)})
+            const result = await this.query(`${this.#insertHead(table, fields)}
          VALUES ${rows}
          ${upsertClause}${returning}`, values);
-            if (this.dialect.supportsReturning) {
-                results.push(...result.rows);
-            }
-            else {
-                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));
-                }
-            }
+            results.push(...this.#extractPkRows(result, pkCol, chunk));
         }
         return results;
     }

package/dist/lib/dialect.d.ts

@@ -1,4 +1,5 @@
 export type DialectName = 'postgres' | 'mysql' | 'mariadb';
+export type TruncateUnit = 'year' | 'quarter' | 'month' | 'day' | 'hour';
 export interface SqlDialect {
     name: DialectName;
     /** Quote identifier: "id" (postgres) or `id` (mysql/mariadb) */
@@ -12,6 +13,22 @@ export interface SqlDialect {
     upsertSql(quotedConflictKeys: string, quotedUpdateSet: string): string;
     /** RETURNING pk_col suffix or empty string */
     returningPk(quotedPkCol: string): string;
+    /**
+     * Build the SET body for an upsert: the column list (separated by ', ') that the dialect
+     * uses to copy "incoming row" values into a conflicting row.
+     * - postgres: `"col" = EXCLUDED."col"`
+     * - mysql/mariadb: `` `col` = VALUES(`col`) ``
+     * Returns '' when there is nothing to update (i.e. all `fields` are conflict keys).
+     */
+    upsertUpdateSet(fields: string[], conflictKeys: string[]): string;
+    /**
+     * Truncate a timestamp/date column to the start of the given unit and
+     * return it as an ISO-style string. The output is always a STRING:
+     *  - year/quarter/month/day → 'YYYY-MM-DD' (e.g. '2026-04-01')
+     *  - hour                    → 'YYYY-MM-DDTHH:00:00'
+     * `qualifiedCol` is a fully-qualified, already-quoted column expression.
+     */
+    dateTrunc(unit: TruncateUnit, qualifiedCol: string): string;
 }
 export declare function getDialect(name: DialectName): SqlDialect;
 //# sourceMappingURL=dialect.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"dialect.d.ts","sourceRoot":"","sources":["../../src/lib/dialect.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,OAAO,GAAG,SAAS,CAAC;AAE3D,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,WAAW,CAAC;IAClB,gEAAgE;IAChE,EAAE,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,sDAAsD;IACtD,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,oCAAoC;IACpC,SAAS,EAAE,UAAU,GAAG,OAAO,CAAC;IAChC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,4CAA4C;IAC5C,SAAS,CAAC,kBAAkB,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM,CAAC;IACvE,8CAA8C;IAC9C,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;CAC1C;AAqDD,wBAAgB,UAAU,CAAC,IAAI,EAAE,WAAW,GAAG,UAAU,CAIxD"}
+{"version":3,"file":"dialect.d.ts","sourceRoot":"","sources":["../../src/lib/dialect.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,OAAO,GAAG,SAAS,CAAC;AAE3D,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,KAAK,GAAG,MAAM,CAAC;AAEzE,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,WAAW,CAAC;IAClB,gEAAgE;IAChE,EAAE,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,sDAAsD;IACtD,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,oCAAoC;IACpC,SAAS,EAAE,UAAU,GAAG,OAAO,CAAC;IAChC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,4CAA4C;IAC5C,SAAS,CAAC,kBAAkB,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM,CAAC;IACvE,8CAA8C;IAC9C,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;IACzC;;;;;;OAMG;IACH,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAClE;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC;CAC7D;AAqFD,wBAAgB,UAAU,CAAC,IAAI,EAAE,WAAW,GAAG,UAAU,CAIxD"}