@ketvietlab/ketjs 0.1.2 → 0.1.5

package/dist/data/physical.js

@@ -0,0 +1,196 @@
+// Physical-schema verification for adopting an application-owned migration.
+//
+// The ordinary migration marker is intentionally declarative: it records the
+// manifest KetJS actually applied. A hand-written migration is the one exception,
+// and it may advance that marker only after the adapter's catalog proves every
+// modelled table, column, constraint, and index is at the requested target.
+const truthy = (value) => value === true || value === 1 || value === '1' || value === 't' || value === 'true' || value === 'YES';
+const normalizeType = (value) => {
+    const type = String(value ?? '')
+        .trim()
+        .toLowerCase()
+        .replace(/\s+/g, ' ')
+        .replace(/\s+primary key$/, '');
+    const aliases = {
+        int8: 'bigint',
+        float8: 'double precision',
+        timestamptz: 'timestamp with time zone',
+        decimal: 'numeric',
+    };
+    return aliases[type] ?? type;
+};
+const expectedType = (adapter, column) => normalizeType(adapter.columnSql(column));
+async function inspectSqliteTable(adapter, table) {
+    const q = adapter.quoteIdent;
+    const rows = await adapter.all(`PRAGMA table_info(${q(table)})`);
+    if (!rows.length)
+        return null;
+    const columns = {};
+    for (const row of rows) {
+        const name = String(row.name);
+        const primary = truthy(row.pk);
+        columns[name] = {
+            type: normalizeType(row.type),
+            // SQLite reports `notnull = 0` for a generated TEXT PRIMARY KEY. Treat the
+            // primary-key contract as required while checking PK identity separately.
+            nullable: !truthy(row.notnull) && !primary,
+            primary,
+        };
+    }
+    const indexes = {};
+    for (const row of await adapter.all(`PRAGMA index_list(${q(table)})`)) {
+        const name = String(row.name);
+        const fieldRows = (await adapter.all(`PRAGMA index_info(${q(name)})`)).sort((a, b) => Number(a.seqno) - Number(b.seqno));
+        const expression = fieldRows.some((field) => Number(field.cid) === -2);
+        const fields = fieldRows.map((field) => (Number(field.cid) === -2 ? '<expression>' : String(field.name)));
+        indexes[name] = {
+            fields,
+            unique: truthy(row.unique),
+            expression,
+            partial: truthy(row.partial),
+            valid: true,
+            ready: true,
+            live: true,
+        };
+    }
+    return { columns, indexes };
+}
+async function inspectPostgresTable(adapter, table) {
+    const rows = await adapter.all(`SELECT column_name, data_type, is_nullable
+       FROM information_schema.columns
+      WHERE table_schema = 'public' AND table_name = $1
+      ORDER BY ordinal_position`, [table]);
+    if (!rows.length)
+        return null;
+    const primary = new Set((await adapter.all(`SELECT kcu.column_name
+           FROM information_schema.table_constraints tc
+           JOIN information_schema.key_column_usage kcu
+             ON kcu.constraint_name = tc.constraint_name
+            AND kcu.constraint_schema = tc.constraint_schema
+          WHERE tc.table_schema = 'public'
+            AND tc.table_name = $1
+            AND tc.constraint_type = 'PRIMARY KEY'
+          ORDER BY kcu.ordinal_position`, [table])).map((row) => String(row.column_name)));
+    const columns = {};
+    for (const row of rows) {
+        const name = String(row.column_name);
+        columns[name] = {
+            type: normalizeType(row.data_type),
+            nullable: String(row.is_nullable).toUpperCase() === 'YES',
+            primary: primary.has(name),
+        };
+    }
+    const indexRows = await adapter.all(`SELECT index_class.relname AS index_name,
+            index_meta.indisunique AS is_unique,
+            index_meta.indpred IS NOT NULL AS is_partial,
+            index_meta.indisvalid AS is_valid,
+            index_meta.indisready AS is_ready,
+            index_meta.indislive AS is_live,
+            indexed_key.attnum = 0 AS is_expression,
+            attribute.attname AS column_name,
+            indexed_key.ordinality AS position
+       FROM pg_class table_class
+       JOIN pg_namespace namespace ON namespace.oid = table_class.relnamespace
+       JOIN pg_index index_meta ON index_meta.indrelid = table_class.oid
+       JOIN pg_class index_class ON index_class.oid = index_meta.indexrelid
+       JOIN LATERAL unnest(index_meta.indkey) WITH ORDINALITY AS indexed_key(attnum, ordinality) ON true
+       LEFT JOIN pg_attribute attribute
+         ON attribute.attrelid = table_class.oid AND attribute.attnum = indexed_key.attnum
+      WHERE namespace.nspname = 'public'
+        AND table_class.relname = $1
+        AND NOT index_meta.indisprimary
+      ORDER BY index_class.relname, indexed_key.ordinality`, [table]);
+    const indexes = {};
+    for (const row of indexRows) {
+        const name = String(row.index_name);
+        const expression = truthy(row.is_expression);
+        const index = (indexes[name] ??= {
+            fields: [],
+            unique: truthy(row.is_unique),
+            expression: false,
+            partial: truthy(row.is_partial),
+            valid: truthy(row.is_valid),
+            ready: truthy(row.is_ready),
+            live: truthy(row.is_live),
+        });
+        index.expression ||= expression;
+        index.fields[Number(row.position) - 1] = expression ? '<expression>' : String(row.column_name);
+    }
+    return { columns, indexes };
+}
+const inspectTable = (adapter, table) => {
+    if (adapter.name === 'sqlite')
+        return inspectSqliteTable(adapter, table);
+    if (adapter.name === 'postgres')
+        return inspectPostgresTable(adapter, table);
+    throw new Error(`adapter "${adapter.name}" cannot verify a physical schema safely; catalog verification supports sqlite and postgres`);
+};
+const describeFields = (fields) => `(${fields.join(', ')})`;
+/** Return every modelled difference between the physical database and `target`. */
+export async function physicalSchemaIssues(adapter, previous, target) {
+    const issues = [];
+    const tableNames = new Set([...Object.keys(previous.tables), ...Object.keys(target.tables)]);
+    for (const tableName of [...tableNames].sort()) {
+        const before = previous.tables[tableName];
+        const expected = target.tables[tableName];
+        const actual = await inspectTable(adapter, tableName);
+        if (!expected) {
+            if (actual)
+                issues.push(`table ${tableName} still exists; expected it to be removed`);
+            continue;
+        }
+        if (!actual) {
+            issues.push(`table ${tableName} is missing`);
+            continue;
+        }
+        for (const [columnName, column] of Object.entries(expected.columns)) {
+            const held = actual.columns[columnName];
+            const path = `${tableName}.${columnName}`;
+            if (!held) {
+                issues.push(`column ${path} is missing`);
+                continue;
+            }
+            const type = expectedType(adapter, column);
+            if (held.type !== type)
+                issues.push(`column ${path} has type ${held.type || '(none)'}; expected ${type}`);
+            if (held.nullable !== column.optional)
+                issues.push(`column ${path} is ${held.nullable ? 'nullable' : 'NOT NULL'}; expected ${column.optional ? 'nullable' : 'NOT NULL'}`);
+            const primary = column.base === 'id';
+            if (held.primary !== primary)
+                issues.push(`column ${path} is ${held.primary ? '' : 'not '}the expected primary key`);
+        }
+        for (const columnName of Object.keys(before?.columns ?? {})) {
+            if (!expected.columns[columnName] && actual.columns[columnName])
+                issues.push(`column ${tableName}.${columnName} still exists; expected it to be removed`);
+        }
+        for (const [name, index] of Object.entries(expected.indexes ?? {})) {
+            const physicalName = `${tableName}__${name}`;
+            const held = actual.indexes[physicalName];
+            if (!held) {
+                issues.push(`index ${physicalName} is missing`);
+                continue;
+            }
+            if (held.unique !== index.unique)
+                issues.push(`index ${physicalName} is ${held.unique ? 'unique' : 'non-unique'}; expected ${index.unique ? 'unique' : 'non-unique'}`);
+            if (held.expression)
+                issues.push(`index ${physicalName} contains expressions; expected only model fields`);
+            if (held.partial)
+                issues.push(`index ${physicalName} is partial; expected an unfiltered index`);
+            if (!held.valid)
+                issues.push(`index ${physicalName} is invalid`);
+            if (!held.ready)
+                issues.push(`index ${physicalName} is not ready for inserts`);
+            if (!held.live)
+                issues.push(`index ${physicalName} is being dropped`);
+            if (held.fields.join('\0') !== index.fields.join('\0'))
+                issues.push(`index ${physicalName} covers ${describeFields(held.fields)}; expected ${describeFields(index.fields)}`);
+        }
+        for (const name of Object.keys(before?.indexes ?? {})) {
+            const physicalName = `${tableName}__${name}`;
+            if (!expected.indexes?.[name] && actual.indexes[physicalName])
+                issues.push(`index ${physicalName} still exists; expected it to be removed`);
+        }
+    }
+    return issues;
+}
+//# sourceMappingURL=physical.js.map

package/dist/data/physical.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"physical.js","sourceRoot":"","sources":["../../../../../../packages/ketjs/src/data/physical.ts"],"names":[],"mappings":"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"}

package/dist/data/pool.d.ts

@@ -1,6 +1,7 @@
 import type { Adapter } from '../types.ts';
 export type PoolOptions = {
-    create(key: string): Adapter;
+    /** Create a fresh adapter for this pool entry; the pool owns its open/close lifecycle. */
+    create(key: string): Adapter | Promise<Adapter>;
     /** How many databases may stay open at once. */
     max?: number;
     /** Close an idle database after this long. */

package/dist/data/pool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../../../../packages/ketjs/src/data/pool.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAE1C,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;IAC5B,gDAAgD;IAChD,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,8CAA8C;IAC9C,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,GAAG,CAAC,EAAE,MAAM,MAAM,CAAA;CACnB,CAAA;AAID,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IACtC,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;IACtE,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAAA;IAC5B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAA;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CACtB,CAAA;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,WAAW,GAAG,WAAW,CAiF7D"}
+{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../../../../packages/ketjs/src/data/pool.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAE1C,MAAM,MAAM,WAAW,GAAG;IACxB,0FAA0F;IAC1F,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC/C,gDAAgD;IAChD,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,8CAA8C;IAC9C,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,GAAG,CAAC,EAAE,MAAM,MAAM,CAAA;CACnB,CAAA;AAID,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IACtC,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;IACtE,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAAA;IAC5B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAA;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CACtB,CAAA;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,WAAW,GAAG,WAAW,CAiM7D"}

package/dist/data/pool.js

@@ -1,6 +1,6 @@
 // One adapter per database, kept warm and bounded.
 //
-// This is where the Odoo model hurts most in practice: a database per tenant means
+// This is where the domain contract model hurts most in practice: a database per tenant means
 // connections multiply by tenant, and a Postgres cluster has a hard ceiling on them.
 // So the pool caps how many databases stay open at once, evicts the least recently
 // used, and refuses to close one that a request is still holding.
@@ -9,40 +9,128 @@ export function createAdapterPool(o) {
     const idleMs = o.idleMs ?? 5 * 60_000;
     const now = o.now ?? (() => Date.now());
     const entries = new Map();
+    const closing = new Set();
+    let state = 'open';
+    let closePromise = null;
+    const assertOpen = () => {
+        if (state !== 'open')
+            throw new Error('adapter pool is closed');
+    };
+    // Admission is separate from leasing an existing entry. Opening another
+    // datastore may have to close an idle one first, and that closing connection
+    // still consumes capacity until close() settles. Serializing this small path
+    // keeps a later acquire from slipping into the temporarily empty Map slot.
+    let admissionTail = Promise.resolve();
+    const withAdmission = async (fn) => {
+        const previous = admissionTail;
+        let release;
+        admissionTail = new Promise((resolve) => {
+            release = resolve;
+        });
+        await previous;
+        try {
+            return await fn();
+        }
+        finally {
+            release();
+        }
+    };
     const evictOne = async () => {
         let oldest = null;
         for (const [k, e] of entries) {
-            if (e.leases > 0)
+            if (e.leases > 0 || e.opening || closing.has(e))
                 continue;
             if (!oldest || e.lastUsed < oldest[1].lastUsed)
                 oldest = [k, e];
         }
         if (!oldest)
             return false;
-        entries.delete(oldest[0]);
-        await oldest[1].adapter.close();
+        const [key, entry] = oldest;
+        closing.add(entry);
+        try {
+            await entry.adapter?.close();
+        }
+        finally {
+            // Keep the tombstone visible to size/open until close has settled. The
+            // admission lock keeps another datastore from claiming it meanwhile.
+            if (entries.get(key) === entry)
+                entries.delete(key);
+            closing.delete(entry);
+        }
         return true;
     };
     const acquire = async (key) => {
+        assertOpen();
         let e = entries.get(key);
+        if (e && closing.has(e))
+            e = undefined;
         if (!e) {
-            // Make room before opening, never after: the cap is on connections actually held.
-            while (entries.size >= max) {
-                if (!(await evictOne())) {
-                    throw new Error(`adapter pool is full (${entries.size}/${max}) and every database is in use`);
+            e = await withAdmission(async () => {
+                assertOpen();
+                // Another acquire for this key may have won admission while we waited.
+                const admitted = entries.get(key);
+                if (admitted) {
+                    // Eviction normally owns the admission lock for the whole close, so a
+                    // closing entry here would mean that lifecycle invariant was broken.
+                    // Never lease it even if a future close path forgets that invariant.
+                    if (closing.has(admitted))
+                        throw new Error(`adapter pool entry "${key}" is closing during admission`);
+                    return admitted;
                 }
+                // Make room before opening, never after: the cap is on connections
+                // actually held, including a victim whose close() is still in flight.
+                while (entries.size >= max) {
+                    if (!(await evictOne())) {
+                        throw new Error(`adapter pool is full (${entries.size}/${max}) and every database is in use`);
+                    }
+                }
+                // close() marks the pool terminal before waiting for admission. An
+                // acquire already queued here must not create an adapter after shutdown.
+                assertOpen();
+                const entry = { adapter: null, leases: 0, lastUsed: now(), opening: null };
+                entries.set(key, entry);
+                entry.opening = (async () => {
+                    const adapter = await o.create(key);
+                    entry.adapter = adapter;
+                    try {
+                        await adapter.open();
+                    }
+                    catch (error) {
+                        await adapter.close().catch(() => { });
+                        entry.adapter = null;
+                        throw error;
+                    }
+                })().catch((error) => {
+                    if (entries.get(key) === entry)
+                        entries.delete(key);
+                    throw error;
+                });
+                return entry;
+            });
+        }
+        if (closing.has(e))
+            throw new Error(`adapter pool entry "${key}" is closing`);
+        assertOpen();
+        e.leases++;
+        const opening = e.opening;
+        if (opening) {
+            try {
+                await opening;
             }
-            const adapter = o.create(key);
-            e = { adapter, leases: 0, lastUsed: now(), opening: null };
-            entries.set(key, e);
-            e.opening = adapter.open();
+            catch (error) {
+                e.leases = Math.max(0, e.leases - 1);
+                throw error;
+            }
+            if (e.opening === opening)
+                e.opening = null;
         }
-        if (e.opening) {
-            await e.opening;
-            e.opening = null;
+        if (state !== 'open') {
+            e.leases = Math.max(0, e.leases - 1);
+            throw new Error('adapter pool is closed');
         }
-        e.leases++;
         e.lastUsed = now();
+        if (!e.adapter)
+            throw new Error(`adapter pool failed to open "${key}"`);
         return e.adapter;
     };
     const release = (key) => {
@@ -64,22 +152,62 @@ export function createAdapterPool(o) {
                 release(key);
             }
         },
-        async evictIdle() {
-            const cutoff = now() - idleMs;
-            let n = 0;
-            for (const [k, e] of [...entries]) {
-                if (e.leases > 0 || e.lastUsed > cutoff)
-                    continue;
-                entries.delete(k);
-                await e.adapter.close();
-                n++;
-            }
-            return n;
+        evictIdle() {
+            return withAdmission(async () => {
+                const cutoff = now() - idleMs;
+                let n = 0;
+                for (const [k, e] of [...entries]) {
+                    if (e.leases > 0 || e.opening || closing.has(e) || e.lastUsed > cutoff)
+                        continue;
+                    closing.add(e);
+                    try {
+                        await e.adapter?.close();
+                        n++;
+                    }
+                    finally {
+                        if (entries.get(k) === e)
+                            entries.delete(k);
+                        closing.delete(e);
+                    }
+                }
+                return n;
+            });
         },
-        async close() {
-            for (const [, e] of entries)
-                await e.adapter.close();
-            entries.clear();
+        close() {
+            if (closePromise)
+                return closePromise;
+            // Terminal state is visible synchronously. The actual drain is queued
+            // behind admission so it cannot race an eviction or a new datastore.
+            state = 'closing';
+            closePromise = withAdmission(async () => {
+                const errors = [];
+                for (const [key, e] of [...entries]) {
+                    closing.add(e);
+                    try {
+                        if (e.opening)
+                            await e.opening.catch(() => { });
+                        await e.adapter?.close();
+                    }
+                    catch (error) {
+                        errors.push(error);
+                    }
+                    finally {
+                        e.adapter = null;
+                        e.opening = null;
+                        if (entries.get(key) === e)
+                            entries.delete(key);
+                        closing.delete(e);
+                    }
+                }
+                entries.clear();
+                if (errors.length === 1)
+                    throw errors[0];
+                if (errors.length > 1)
+                    throw new AggregateError(errors, 'adapter pool failed to close');
+            }).finally(() => {
+                state = 'closed';
+            });
+            return closePromise;
         },
         get open() {
             return [...entries.keys()];

package/dist/data/pool.js.map

@@ -1 +1 @@
-{"version":3,"file":"pool.js","sourceRoot":"","sources":["../../../../../../packages/ketjs/src/data/pool.ts"],"names":[],"mappings":"AAAA,mDAAmD;AACnD,EAAE;AACF,mFAAmF;AACnF,qFAAqF;AACrF,mFAAmF;AACnF,kEAAkE;AAyBlE,MAAM,UAAU,iBAAiB,CAAC,CAAc;IAC9C,MAAM,GAAG,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,CAAA;IACvB,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,MAAM,CAAA;IACrC,MAAM,GAAG,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA;IACvC,MAAM,OAAO,GAAG,IAAI,GAAG,EAAiB,CAAA;IAExC,MAAM,QAAQ,GAAG,KAAK,IAAsB,EAAE;QAC5C,IAAI,MAAM,GAA2B,IAAI,CAAA;QACzC,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC;gBAAE,SAAQ;YAC1B,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ;gBAAE,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;QACjE,CAAC;QACD,IAAI,CAAC,MAAM;YAAE,OAAO,KAAK,CAAA;QACzB,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;QACzB,MAAM,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;QAC/B,OAAO,IAAI,CAAA;IACb,CAAC,CAAA;IAED,MAAM,OAAO,GAAG,KAAK,EAAE,GAAW,EAAoB,EAAE;QACtD,IAAI,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACxB,IAAI,CAAC,CAAC,EAAE,CAAC;YACP,kFAAkF;YAClF,OAAO,OAAO,CAAC,IAAI,IAAI,GAAG,EAAE,CAAC;gBAC3B,IAAI,CAAC,CAAC,MAAM,QAAQ,EAAE,CAAC,EAAE,CAAC;oBACxB,MAAM,IAAI,KAAK,CAAC,yBAAyB,OAAO,CAAC,IAAI,IAAI,GAAG,gCAAgC,CAAC,CAAA;gBAC/F,CAAC;YACH,CAAC;YACD,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;YAC7B,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;YAC1D,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;YACnB,CAAC,CAAC,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAA;QAC5B,CAAC;QACD,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;YACd,MAAM,CAAC,CAAC,OAAO,CAAA;YACf,CAAC,CAAC,OAAO,GAAG,IAAI,CAAA;QAClB,CAAC;QACD,CAAC,CAAC,MAAM,EAAE,CAAA;QACV,CAAC,CAAC,QAAQ,GAAG,GAAG,EAAE,CAAA;QAClB,OAAO,CAAC,CAAC,OAAO,CAAA;IAClB,CAAC,CAAA;IAED,MAAM,OAAO,GAAG,CAAC,GAAW,EAAQ,EAAE;QACpC,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC1B,IAAI,CAAC,CAAC;YAAE,OAAM;QACd,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QACpC,CAAC,CAAC,QAAQ,GAAG,GAAG,EAAE,CAAA;IACpB,CAAC,CAAA;IAED,OAAO;QACL,OAAO;QACP,OAAO;QACP,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE;YAChB,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAA;YAClC,IAAI,CAAC;gBACH,OAAO,MAAM,EAAE,CAAC,OAAO,CAAC,CAAA;YAC1B,CAAC;oBAAS,CAAC;gBACT,OAAO,CAAC,GAAG,CAAC,CAAA;YACd,CAAC;QACH,CAAC;QACD,KAAK,CAAC,SAAS;YACb,MAAM,MAAM,GAAG,GAAG,EAAE,GAAG,MAAM,CAAA;YAC7B,IAAI,CAAC,GAAG,CAAC,CAAA;YACT,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,EAAE,CAAC;gBAClC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,GAAG,MAAM;oBAAE,SAAQ;gBACjD,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;gBACjB,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;gBACvB,CAAC,EAAE,CAAA;YACL,CAAC;YACD,OAAO,CAAC,CAAA;QACV,CAAC;QACD,KAAK,CAAC,KAAK;YACT,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,OAAO;gBAAE,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;YACpD,OAAO,CAAC,KAAK,EAAE,CAAA;QACjB,CAAC;QACD,IAAI,IAAI;YACN,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;QAC5B,CAAC;QACD,IAAI,IAAI;YACN,OAAO,OAAO,CAAC,IAAI,CAAA;QACrB,CAAC;KACF,CAAA;AACH,CAAC"}
+{"version":3,"file":"pool.js","sourceRoot":"","sources":["../../../../../../packages/ketjs/src/data/pool.ts"],"names":[],"mappings":"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"}

package/dist/data/query.d.ts

@@ -18,11 +18,20 @@ export type GroupSpec = {
 };
 export type AggregateSpec = {
     fn: 'count';
+    col?: Col;
     as: string;
 } | {
-    fn: 'countDistinct' | 'sum' | 'avg' | 'min' | 'max';
+    fn: 'countDistinct' | 'sum' | 'min' | 'max';
     col: Col;
     as: string;
+} | {
+    fn: 'avg';
+    col: Col;
+    as: string;
+    /** Required for decimal columns so both adapters return the same finite value. */
+    scale?: number;
+    /** Decimal averages currently support PostgreSQL-compatible half-away-from-zero rounding. */
+    rounding?: 'half-away-from-zero';
 };
 export type GroupOrder = {
     by: 'key' | 'count' | string;

package/dist/data/query.d.ts.map

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