@ketvietlab/ketjs 0.1.2 → 0.1.3

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":"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"}
+{"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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"}

package/dist/data/query.js

@@ -2,10 +2,11 @@
 // mutating one, so a query can be passed through several modules and refined by
 // each without any of them stepping on the others — Ecto's composability with a
 // chainable surface.
-import { exprTouches, and } from './expr.js';
+import { assertCol, exprTouches, and, makeCol } from './expr.js';
 import { tableNameFor } from './migrate.js';
 import { KetError } from '../kernel/errors.js';
-import { assertTimezone } from './time.js';
+import { assertGroupInterval, assertTimezone } from './time.js';
+import { DECIMAL_MAX_CHARS, parseDecimal } from './changeset.js';
 // Column handles are built once from the manifest. No proxies, no magic: a column
 // that does not exist simply is not there, and the expression helpers reject it.
 export function table(manifest, model) {
@@ -18,8 +19,8 @@ export function table(manifest, model) {
         });
     }
     const t = Object.create(null);
-    for (const name of Object.keys(def.fields))
-        t[name] = Object.freeze({ model, name });
+    for (const [name, field] of Object.entries(def.fields))
+        t[name] = makeCol(model, name, field.base);
     t['$model'] = model;
     t['$columns'] = Object.keys(def.fields);
     return Object.freeze(t);
@@ -67,7 +68,7 @@ export class Query {
         });
     }
     select(...cols) {
-        return this.with({ columns: cols.map((c) => c.name) });
+        return this.with({ columns: cols.map((c) => assertCol(c).name) });
     }
     /** Additional conditions are ANDed, so a query can be narrowed by several callers. */
     where(...parts) {
@@ -75,6 +76,8 @@ export class Query {
         return this.with({ condition: this.condition ? and(this.condition, next) : next });
     }
     orderBy(...order) {
+        for (const item of order)
+            assertCol(item.col);
         return this.with({ order: [...this.order, ...order] });
     }
     limit(n) {
@@ -90,11 +93,14 @@ export class Query {
         if (!groups.length)
             throw new KetError({ code: 'E_GROUP_EMPTY', message: 'groupBy requires a field' });
         for (const group of groups) {
+            assertCol(group.col);
             if (group.col.model !== this.model)
                 throw new KetError({
                     code: 'E_GROUP_MODEL',
                     message: `cannot group ${this.model} by ${group.col.model}`,
                 });
+            if (group.interval)
+                assertGroupInterval(group.interval);
             if (group.interval && group.timezone)
                 assertTimezone(group.timezone);
         }
@@ -102,7 +108,9 @@ export class Query {
     }
     aggregate(...aggregates) {
         for (const aggregate of aggregates) {
-            if (aggregate.fn !== 'count' && aggregate.col.model !== this.model)
+            if (aggregate.col)
+                assertCol(aggregate.col);
+            if (aggregate.col && aggregate.col.model !== this.model)
                 throw new KetError({
                     code: 'E_GROUP_MODEL',
                     message: `cannot aggregate ${aggregate.col.model} on ${this.model}`,
@@ -133,7 +141,7 @@ export class Query {
         for (const group of this.groups)
             s.add(group.col.model);
         for (const aggregate of this.aggregates)
-            if (aggregate.fn !== 'count')
+            if (aggregate.col)
                 s.add(aggregate.col.model);
         return [...s].sort();
     }
@@ -148,7 +156,44 @@ export class Query {
             params.push(v);
             return ph();
         };
-        const colSql = (c) => `${q(tableNameFor(c.model))}.${q(c.name)}`;
+        const colSql = (candidate) => {
+            const c = assertCol(candidate);
+            return `${q(tableNameFor(c.model))}.${q(c.name)}`;
+        };
+        const isDecimal = (c) => assertCol(c).base === 'decimal';
+        const isSqliteDecimal = (c) => dialect === 'sqlite' && isDecimal(c);
+        const nulls = (dir) => (dir === 'asc' ? 'LAST' : 'FIRST');
+        const orderTerm = (sql, dir) => `${sql} ${dir.toUpperCase()} NULLS ${nulls(dir)}`;
+        const bindDecimal = (c, value) => {
+            if (!isDecimal(c) || value === null)
+                return bind(value);
+            const parsed = parseDecimal(value);
+            if (!parsed.ok)
+                throw new KetError({
+                    code: parsed.reason === 'size' ? 'E_DECIMAL_TOO_LONG' : 'E_INVALID_DECIMAL',
+                    message: parsed.reason === 'size'
+                        ? `${c.model}.${c.name} query value exceeds the ${DECIMAL_MAX_CHARS}-character decimal limit`
+                        : `${c.model}.${c.name} query value must be a finite number or plain decimal string`,
+                });
+            return bind(parsed.value);
+        };
+        const decimalOrderSql = (column, dir) => {
+            const sign = `ket_decimal_sign(${column})`;
+            const exponent = `ket_decimal_exponent(${column})`;
+            const digits = `ket_decimal_digits(${column})`;
+            const reverse = dir === 'asc' ? 'desc' : 'asc';
+            // SQLite keeps decimal columns as TEXT for exact decoding. These components
+            // sort normalized scientific parts instead of coercing the value through
+            // REAL, including magnitudes beyond Number.MAX_SAFE_INTEGER.
+            return [
+                orderTerm(sign, dir),
+                orderTerm(`CASE WHEN ${sign} < 0 THEN ${exponent} END`, reverse),
+                orderTerm(`CASE WHEN ${sign} < 0 THEN ${digits} END`, reverse),
+                orderTerm(`CASE WHEN ${sign} > 0 THEN ${exponent} END`, dir),
+                orderTerm(`CASE WHEN ${sign} > 0 THEN ${digits} END`, dir),
+            ].join(', ');
+        };
+        const decimalOrder = (c, dir) => decimalOrderSql(colSql(c), dir);
         const render = (e) => {
             if (e.op === 'and' || e.op === 'or') {
                 if (!e.parts.length)
@@ -161,27 +206,34 @@ export class Query {
                 return `${colSql(e.col)} IS ${e.negated ? 'NOT ' : ''}NULL`;
             if (e.op === 'bucket') {
                 const column = colSql(e.col);
+                // Interpolated into DATE_TRUNC below, so it must be a member of the closed
+                // set and nothing else — the value reaches here straight from JSON.
+                const interval = assertGroupInterval(e.interval);
                 if (dialect === 'postgres') {
-                    const format = e.interval === 'quarter'
+                    const format = interval === 'quarter'
                         ? 'YYYY-"Q"Q'
-                        : e.interval === 'year'
+                        : interval === 'year'
                             ? 'YYYY'
-                            : e.interval === 'month'
+                            : interval === 'month'
                                 ? 'YYYY-MM'
                                 : 'YYYY-MM-DD';
-                    return `TO_CHAR(DATE_TRUNC('${e.interval}', ${column} AT TIME ZONE ${bind(e.timezone)}), '${format}') = ${bind(e.value)}`;
+                    return `TO_CHAR(DATE_TRUNC('${interval}', ${column} AT TIME ZONE ${bind(e.timezone)}), '${format}') = ${bind(e.value)}`;
                 }
-                return `ket_date_bucket(${column}, ${bind(e.interval)}, ${bind(e.timezone)}) = ${bind(e.value)}`;
+                return `ket_date_bucket(${column}, ${bind(interval)}, ${bind(e.timezone)}) = ${bind(e.value)}`;
             }
             if (e.op === 'like')
                 return `${colSql(e.col)} ${e.insensitive && dialect === 'postgres' ? 'ILIKE' : 'LIKE'} ${bind(e.value)}${e.escape ? ` ESCAPE '\\'` : ''}`;
             if (e.op === 'in') {
                 if (!e.values.length)
                     return '1 = 0';
-                return `${colSql(e.col)} IN (${e.values.map(bind).join(', ')})`;
+                if (isSqliteDecimal(e.col))
+                    return `(${e.values.map((value) => `ket_decimal_cmp(${colSql(e.col)}, ${bindDecimal(e.col, value)}) = 0`).join(' OR ')})`;
+                return `${colSql(e.col)} IN (${e.values.map((value) => bindDecimal(e.col, value)).join(', ')})`;
             }
+            if (isSqliteDecimal(e.col))
+                return `ket_decimal_cmp(${colSql(e.col)}, ${bindDecimal(e.col, e.value)}) ${e.cmp} 0`;
             const compared = e.numeric && dialect === 'sqlite' ? `CAST(${colSql(e.col)} AS REAL)` : colSql(e.col);
-            return `${compared} ${e.cmp} ${bind(e.value)}`;
+            return `${compared} ${e.cmp} ${bindDecimal(e.col, e.value)}`;
         };
         const t = q(tableNameFor(this.model));
         let text;
@@ -193,19 +245,66 @@ export class Query {
             const groupSql = this.groups.map((group) => {
                 const column = colSql(group.col);
                 if (!group.interval)
-                    return column;
+                    return isSqliteDecimal(group.col) ? `ket_decimal_key(${column})` : column;
+                // Same boundary as the bucket expression: interpolated into DATE_TRUNC, so
+                // it is validated here rather than trusted from the caller.
+                const interval = assertGroupInterval(group.interval);
                 const timezone = group.timezone ?? 'UTC';
                 if (dialect === 'postgres') {
-                    if (group.interval === 'quarter')
+                    if (interval === 'quarter')
                         return `TO_CHAR(DATE_TRUNC('quarter', ${column} AT TIME ZONE ${bind(timezone)}), 'YYYY-"Q"Q')`;
-                    const format = group.interval === 'year' ? 'YYYY' : group.interval === 'month' ? 'YYYY-MM' : 'YYYY-MM-DD';
-                    return `TO_CHAR(DATE_TRUNC('${group.interval}', ${column} AT TIME ZONE ${bind(timezone)}), '${format}')`;
+                    const format = interval === 'year' ? 'YYYY' : interval === 'month' ? 'YYYY-MM' : 'YYYY-MM-DD';
+                    return `TO_CHAR(DATE_TRUNC('${interval}', ${column} AT TIME ZONE ${bind(timezone)}), '${format}')`;
                 }
-                return `ket_date_bucket(${column}, ${bind(group.interval)}, ${bind(timezone)})`;
+                return `ket_date_bucket(${column}, ${bind(interval)}, ${bind(timezone)})`;
             });
             const aggregateSql = this.aggregates.map((aggregate) => {
                 if (aggregate.fn === 'count')
-                    return `COUNT(*) AS ${q(aggregate.as)}`;
+                    return `COUNT(${aggregate.col ? colSql(aggregate.col) : '*'}) AS ${q(aggregate.as)}`;
+                if (aggregate.fn === 'avg' && isDecimal(aggregate.col)) {
+                    if (aggregate.rounding !== 'half-away-from-zero' || aggregate.scale === undefined)
+                        throw new KetError({
+                            code: 'E_DECIMAL_AVG_ROUNDING_REQUIRED',
+                            message: 'a decimal average requires an explicit finite scale and rounding rule',
+                            hint: `add scale and rounding: 'half-away-from-zero', or request sum and count and divide in the domain`,
+                        });
+                    if (!Number.isSafeInteger(aggregate.scale) ||
+                        aggregate.scale < 0 ||
+                        aggregate.scale > DECIMAL_MAX_CHARS)
+                        throw new KetError({
+                            code: 'E_DECIMAL_AVG_SCALE',
+                            message: `decimal average scale must be an integer from 0 to ${DECIMAL_MAX_CHARS}`,
+                        });
+                    const column = colSql(aggregate.col);
+                    let average;
+                    if (dialect === 'sqlite')
+                        average = `ket_decimal_avg(${column}, ${bind(aggregate.scale)})`;
+                    else {
+                        // PostgreSQL's numeric AVG divides before ROUND and chooses a finite
+                        // internal result scale, so high requested scales can no longer
+                        // recover the discarded digits. Scale the exact SUM first, then use
+                        // integer quotient/remainder arithmetic for half-away-from-zero.
+                        const scale = bind(aggregate.scale);
+                        const factor = `CAST(('1e' || CAST(${scale} AS TEXT)) AS NUMERIC)`;
+                        const sum = `SUM(${column})`;
+                        const count = `COUNT(${column})`;
+                        const shifted = `ABS(${sum}) * ${factor}`;
+                        const rounded = `DIV(${shifted}, ${count}) + CASE WHEN MOD(${shifted}, ${count}) * 2 >= ${count} THEN 1 ELSE 0 END`;
+                        // Multiplication by an exact negative-power factor preserves the
+                        // requested display scale. PostgreSQL numeric division derives a
+                        // result scale from operand precision and can truncate this back
+                        // to 20 digits before the client receives it.
+                        const inverseFactor = `CAST(('1e-' || CAST(${scale} AS TEXT)) AS NUMERIC)`;
+                        average = `CASE WHEN ${count} = 0 THEN NULL ELSE SIGN(${sum}) * (${rounded}) * ${inverseFactor} END`;
+                    }
+                    return `${average} AS ${q(aggregate.as)}`;
+                }
+                if (isSqliteDecimal(aggregate.col)) {
+                    const column = colSql(aggregate.col);
+                    if (aggregate.fn === 'countDistinct')
+                        return `COUNT(DISTINCT ket_decimal_key(${column})) AS ${q(aggregate.as)}`;
+                    return `ket_decimal_${aggregate.fn}(${column}) AS ${q(aggregate.as)}`;
+                }
                 const fn = aggregate.fn === 'countDistinct' ? 'COUNT' : aggregate.fn.toUpperCase();
                 const body = aggregate.fn === 'countDistinct' ? `DISTINCT ${colSql(aggregate.col)}` : colSql(aggregate.col);
                 return `${fn}(${body}) AS ${q(aggregate.as)}`;
@@ -219,25 +318,35 @@ export class Query {
         if (this.kind === 'group') {
             text += ` GROUP BY ${this.groups.map((_, i) => String(i + 1)).join(', ')}`;
             if (this.groupOrder.length) {
-                const aliases = new Set(this.aggregates.map((a) => a.as));
+                const aliases = new Map(this.aggregates.map((aggregate) => [aggregate.as, aggregate]));
                 text += ` ORDER BY ${this.groupOrder
                     .map((order) => {
+                    const aggregate = aliases.get(order.by);
                     const by = order.by === 'key'
                         ? q('__group0')
                         : order.by === 'count'
                             ? q('__count')
-                            : aliases.has(order.by)
+                            : aggregate
                                 ? q(order.by)
                                 : null;
                     if (!by)
                         throw new KetError({ code: 'E_GROUP_ORDER', message: `unknown group order "${order.by}"` });
-                    return `${by} ${order.dir.toUpperCase()}`;
+                    const decimal = (order.by === 'key' && !this.groups[0].interval && isSqliteDecimal(this.groups[0].col)) ||
+                        (aggregate !== undefined &&
+                            aggregate.fn !== 'count' &&
+                            aggregate.fn !== 'countDistinct' &&
+                            isSqliteDecimal(aggregate.col));
+                    if (decimal)
+                        return decimalOrderSql(by, order.dir);
+                    return orderTerm(by, order.dir);
                 })
                     .join(', ')}`;
             }
         }
         else if (this.order.length)
-            text += ` ORDER BY ${this.order.map((o) => `${colSql(o.col)} ${o.dir.toUpperCase()}`).join(', ')}`;
+            text += ` ORDER BY ${this.order
+                .map((o) => (isSqliteDecimal(o.col) ? decimalOrder(o.col, o.dir) : orderTerm(colSql(o.col), o.dir)))
+                .join(', ')}`;
         if (this.limitN != null)
             text += ` LIMIT ${bind(this.limitN)}`;
         if (this.offsetN != null)
@@ -263,6 +372,6 @@ export class Query {
 }
 export const from = (t) => new Query({ kind: 'select', model: t.$model });
 export const deleteFrom = (t) => new Query({ kind: 'delete', model: t.$model });
-export const asc = (col) => ({ col, dir: 'asc' });
-export const desc = (col) => ({ col, dir: 'desc' });
+export const asc = (col) => ({ col: assertCol(col), dir: 'asc' });
+export const desc = (col) => ({ col: assertCol(col), dir: 'desc' });
 //# sourceMappingURL=query.js.map