@based/db 0.0.30 → 0.0.32

package/dist/src/client/flushModify.js

@@ -93,10 +93,11 @@ export const flushBuffer = (db) => {
         const lastIds = {};
         const data = ctx.getData(lastIds);
         const resCtx = ctx.ctx;
-        const d = performance.now();
-        flushPromise = db.hooks.flushModify(data).then(({ offsets }) => {
-            // return time there
-            db.writeTime += performance.now() - d;
+        // pass from flushModify
+        flushPromise = db.hooks
+            .flushModify(data)
+            .then(({ offsets, dbWriteTime }) => {
+            db.writeTime += dbWriteTime ?? 0;
             resCtx.offsets = offsets;
             for (const typeId in lastIds) {
                 if (typeId in offsets) {

package/dist/src/client/index.d.ts

@@ -12,6 +12,7 @@ export type DbClientHooks = {
     setSchema(schema: StrictSchema, fromStart?: boolean, transformFns?: TransformFns): Promise<DbServer['schema']>;
     flushModify(buf: Uint8Array): Promise<{
         offsets: Record<number, number>;
+        dbWriteTime?: number;
     }>;
     getQueryBuf(buf: Uint8Array): Promise<Uint8Array>;
     subscribe(q: BasedDbQuery, onData: OnData, onError?: OnError): OnClose;
@@ -39,7 +40,7 @@ export declare class DbClient {
     isDraining: boolean;
     modifyCtx: ModifyCtx;
     maxModifySize: number;
-    upserting: Map<string, {
+    upserting: Map<number, {
         o: Record<string, any>;
         p: Promise<number | ModifyRes>;
     }>;
@@ -54,7 +55,7 @@ export declare class DbClient {
     update(type: string, value: Record<string, any> & {
         id: number | ModifyRes;
     }, opts?: ModifyOpts): ModifyRes;
-    update(value: any, opts?: ModifyOpts): ModifyRes;
+    update(value: Record<string, any>, opts?: ModifyOpts): ModifyRes;
     upsert(type: string, obj: Record<string, any>, opts?: ModifyOpts): Promise<any>;
     delete(type: string, id: number | ModifyRes): ModifyRes;
     expire(type: string, id: number | ModifyRes, seconds: number): void;

package/dist/src/client/modify/binary.js

@@ -1,4 +1,4 @@
-import { ENCODER } from '../../utils.js';
+import { ENCODER } from '@saulx/utils';
 import { UPDATE, RANGE_ERR, DELETE, } from './types.js';
 import { ModifyError } from './ModifyRes.js';
 import { setCursor } from './setCursor.js';

package/dist/src/client/modify/cardinality.js

@@ -2,7 +2,7 @@ import { RANGE_ERR, CREATE } from './types.js';
 import { ModifyError } from './ModifyRes.js';
 import { setCursor } from './setCursor.js';
 import { xxHash64 } from '../xxHash64.js';
-import { ENCODER } from '../../utils.js';
+import { ENCODER } from '@saulx/utils';
 export function writeHll(value, ctx, def, t, parentId, modifyOp) {
     if (!value) {
         return new ModifyError(t, value);

package/dist/src/client/modify/references/appendEdgeRefs.js

@@ -9,6 +9,9 @@ export function appendEdgeRefs(t, ctx, value) {
                 }
                 id = id.tmpId;
             }
+            else if (typeof id === 'object' && id !== null && id.id) {
+                id = id.id;
+            }
             else {
                 return new ModifyError(t, value);
             }

package/dist/src/client/modify/references/edge.js

@@ -106,8 +106,14 @@ export function writeEdges(t, ref, ctx) {
                 // add null
                 if (typeof value !== 'number') {
                     if (value instanceof ModifyState) {
+                        if (value.error) {
+                            return value.error;
+                        }
                         value = value.tmpId;
                     }
+                    else if (typeof value === 'object' && value !== null && value.id) {
+                        value = value.id;
+                    }
                     else {
                         return new ModifyError(edge, value);
                     }

package/dist/src/client/modify/references/getEdgeSize.js

@@ -1,5 +1,5 @@
 import { STRING, REFERENCE, REFERENCES } from '@based/schema/def';
-import { ENCODER } from '../../../utils.js';
+import { ENCODER } from '@saulx/utils';
 export function getEdgeSize(t, ref) {
     let size = 0;
     for (const key in t.edges) {

package/dist/src/client/modify/string.js

@@ -1,5 +1,5 @@
 import { ENCODER } from '../../index.js';
-import { CREATE, UPDATE, RANGE_ERR, DELETE, } from './types.js';
+import { CREATE, UPDATE, RANGE_ERR, DELETE, DELETE_TEXT_FIELD, } from './types.js';
 import { ModifyError } from './ModifyRes.js';
 import { setCursor } from './setCursor.js';
 import { write } from '../string.js';
@@ -8,13 +8,19 @@ import { write } from '../string.js';
 // add compression handling for edge fields
 export function writeString(lang, value, ctx, def, t, parentId, modifyOp) {
     const isBuffer = value instanceof Uint8Array;
-    if (value === '' || value === null) {
+    if (value === null || value === '') {
         if (modifyOp === UPDATE) {
-            if (ctx.len + 11 /* SIZE.DEFAULT_CURSOR */ + 1 > ctx.max) {
+            if (ctx.len + 11 /* SIZE.DEFAULT_CURSOR */ + 2 > ctx.max) {
                 return RANGE_ERR;
             }
             setCursor(ctx, def, t.prop, t.typeIndex, parentId, modifyOp);
-            ctx.buf[ctx.len++] = DELETE;
+            if (lang === 0) {
+                ctx.buf[ctx.len++] = DELETE;
+            }
+            else {
+                ctx.buf[ctx.len++] = DELETE_TEXT_FIELD;
+                ctx.buf[ctx.len++] = lang;
+            }
         }
     }
     else {

package/dist/src/client/modify/text.js

@@ -13,7 +13,7 @@ export function writeText(value, ctx, def, t, res, parentId, modifyOp) {
         }
         return;
     }
-    if ((value && typeof value !== 'object') || value === null) {
+    if ((value && typeof value !== 'object') || value === null || value === '') {
         let locale = res.locale;
         if (!locale) {
             // TODO: Add def lang option...
@@ -25,10 +25,6 @@ export function writeText(value, ctx, def, t, res, parentId, modifyOp) {
         if (!def.seperateTextSort.localeToIndex.has(locale)) {
             return new ModifyError(t, locale, 'Invalid locale');
         }
-        if (value == null) {
-            // @ts-ignore
-            value = '';
-        }
         const err = writeString(res.locale, value, ctx, def, t, res.tmpId, modifyOp);
         if (modifyOp === CREATE) {
             const index = t.prop * (def.localeSize + 1);
@@ -47,10 +43,6 @@ export function writeText(value, ctx, def, t, res, parentId, modifyOp) {
                 return new ModifyError(t, lang, 'Invalid locale');
             }
             let s = value[lang];
-            if (s == null) {
-                // @ts-ignore
-                s = '';
-            }
             const err = writeString(langC[1], s, ctx, def, t, res.tmpId, modifyOp);
             if (err) {
                 return err;

package/dist/src/client/modify/types.d.ts

@@ -12,6 +12,7 @@ export declare const DECREMENT = 13;
 export declare const EXPIRE = 14;
 export declare const ADD_EMPTY_SORT_TEXT = 15;
 export declare const ADD_EMPTY_SORT = 7;
+export declare const DELETE_TEXT_FIELD = 16;
 export declare const SWITCH_TYPE = 2;
 export declare const SWITCH_FIELD = 0;
 export declare const SWITCH_ID_CREATE = 9;

package/dist/src/client/modify/types.js

@@ -10,6 +10,7 @@ export const DECREMENT = 13;
 export const EXPIRE = 14;
 export const ADD_EMPTY_SORT_TEXT = 15;
 export const ADD_EMPTY_SORT = 7;
+export const DELETE_TEXT_FIELD = 16;
 export const SWITCH_TYPE = 2;
 export const SWITCH_FIELD = 0;
 export const SWITCH_ID_CREATE = 9;

package/dist/src/client/modify/upsert.js

@@ -1,41 +1,53 @@
-import { ALIAS } from '@based/schema/def';
-export async function upsert(db, type, obj, opts) {
-    const tree = db.schemaTypesParsed[type].tree;
-    let q;
-    let id = type;
+import { deepMerge } from '@saulx/utils';
+import { ALIAS, isPropDef } from '@based/schema/def';
+const filterAliases = (obj, tree) => {
+    let aliases;
     for (const key in obj) {
-        if (tree[key].typeIndex === ALIAS) {
-            id += `${key}:${obj[key]};`;
-            if (q) {
-                q = q.or(key, '=', obj[key]);
+        const def = tree[key];
+        if (def === undefined) {
+            return;
+        }
+        if (isPropDef(def)) {
+            if (def.typeIndex === ALIAS) {
+                aliases ??= {};
+                aliases[key] = obj[key];
             }
-            else {
-                q = db.query(type).include('id').filter(key, '=', obj[key]);
+        }
+        else {
+            const nested = filterAliases(obj[key], def);
+            if (nested) {
+                aliases ??= {};
+                aliases[key] = nested;
             }
         }
     }
-    if (!q) {
-        // fix with promise
-        throw new Error('no alias found for upsert operation');
-    }
-    if (db.upserting.has(id)) {
-        const store = db.upserting.get(id);
-        store.o = { ...store.o, ...obj };
+    return aliases;
+};
+export async function upsert(db, type, obj, opts) {
+    const tree = db.schemaTypesParsed[type].tree;
+    const aliases = filterAliases(obj, tree);
+    const q = db.query(type, aliases);
+    q.register();
+    if (db.upserting.has(q.id)) {
+        const store = db.upserting.get(q.id);
+        deepMerge(store.o, obj);
         return store.p;
     }
     const store = {
         o: obj,
         p: q.get().then((res) => {
-            db.upserting.delete(id);
+            db.upserting.delete(q.id);
             if (res.length === 0) {
                 return db.create(type, store.o, opts);
             }
             else {
-                return db.update(type, res.toObject()[0].id, store.o, opts);
+                const obj = res.toObject();
+                const id = Array.isArray(obj) ? obj[0].id : obj.id;
+                return db.update(type, id, store.o, opts);
             }
         }),
     };
-    db.upserting.set(id, store);
+    db.upserting.set(q.id, store);
     return store.p;
 }
 //# sourceMappingURL=upsert.js.map

package/dist/src/client/query/BasedDbQuery.js

@@ -11,7 +11,7 @@ import { langCodesMap } from '@based/schema';
 import { convertFilter } from './filter/convertFilter.js';
 import { validateLocale, validateRange } from './validation.js';
 import { DEF_RANGE_PROP_LIMIT } from './thresholds.js';
-import { concatUint8Arr } from '../../utils.js';
+import { concatUint8Arr } from '@saulx/utils';
 export class QueryBranch {
     db;
     def;

package/dist/src/client/query/BasedIterable.d.ts

@@ -1,6 +1,5 @@
 import { inspect } from 'node:util';
 import { QueryDef } from './types.js';
-import { Item } from './query.js';
 import { size, time, inspectData } from './display.js';
 export { time, size, inspectData };
 export declare class BasedQueryResponse {
@@ -10,11 +9,12 @@ export declare class BasedQueryResponse {
     end: number;
     id: number;
     constructor(id: number, def: QueryDef, result: Uint8Array, execTime: number, end?: number);
+    get version(): number;
     get size(): number;
     [inspect.custom](depth: number): string;
     debug(): this;
     node(index?: number): any;
-    [Symbol.iterator](): Generator<Partial<Item>, void, unknown>;
+    [Symbol.iterator](): Generator<Partial<import("./query.js").Item>, void, unknown>;
     inspect(depth?: number, raw?: boolean): this;
     forEach(fn: (item: any, key: number) => void): void;
     map(fn: (item: any, key: number) => any): any[];

package/dist/src/client/query/BasedIterable.js

@@ -2,8 +2,11 @@ import { inspect } from 'node:util';
 import picocolors from 'picocolors';
 import { debug, resultToObject, readAllFields } from './query.js';
 import { size, time, inspectData, defHasId, displayTarget } from './display.js';
-import { readFloatLE, readUint32 } from '../../utils.js';
+import { readFloatLE, readUint32 } from '@saulx/utils';
 export { time, size, inspectData };
+const BITS_FOR_BYTE_LEN = 21;
+const FACTOR = 2 ** BITS_FOR_BYTE_LEN;
+const MASK_B = FACTOR - 1;
 export class BasedQueryResponse {
     result;
     def;
@@ -17,6 +20,9 @@ export class BasedQueryResponse {
         this.execTime = execTime;
         this.end = end;
     }
+    get version() {
+        return (this.checksum >>> 0) * FACTOR + (this.result.byteLength & MASK_B);
+    }
     get size() {
         return this.result.length;
     }

package/dist/src/client/query/aggregates/aggregation.d.ts

@@ -0,0 +1,4 @@
+import { QueryDef, AggFlag } from '../types.js';
+export declare const createAggFlagBuffer: (aggregation: AggFlag) => Uint8Array;
+export declare const count: (def: QueryDef) => void;
+export declare const sum: (def: QueryDef) => void;

package/dist/src/client/query/aggregates/aggregation.js

@@ -0,0 +1,12 @@
+export const createAggFlagBuffer = (aggregation) => {
+    const buf = new Uint8Array(1);
+    buf[0] = aggregation;
+    return buf;
+};
+export const count = (def) => {
+    def.aggregation = 4 /* AggFlag.COUNT */;
+};
+export const sum = (def) => {
+    def.aggregation = 11 /* AggFlag.SUM */;
+};
+//# sourceMappingURL=aggregation.js.map

package/dist/src/client/query/aggregation.d.ts

@@ -1,3 +1,3 @@
 import { QueryDef, AggFlag } from './types.js';
-export declare const createAggFlagBuffer: (aggregation: AggFlag) => Uint8Array;
+export declare const createAggFlagBuffer: (aggregation: AggFlag) => Uint8Array<ArrayBuffer>;
 export declare const count: (def: QueryDef) => void;

package/dist/src/client/query/debug.js

@@ -1,14 +1,15 @@
 import picocolors from 'picocolors';
 import { isPropDef, REVERSE_TYPE_INDEX_MAP } from '@based/schema/def';
 import { QueryDefType } from './types.js';
-import { concatUint8Arr } from '../../utils.js';
+import { concatUint8Arr } from '@saulx/utils';
 export const debugQueryDef = (q, returnIt) => {
     const loggableObject = { type: 'bla', schema: null };
     const f = (a) => {
         if (a === null) {
             return null;
         }
-        if (a instanceof Buffer) { // RFE is this necessary?
+        if (a instanceof Buffer) {
+            // RFE is this necessary?
             return new Uint8Array(a);
         }
         if (a instanceof Uint8Array) {

package/dist/src/client/query/display.js

@@ -1,6 +1,6 @@
 import picocolors from 'picocolors';
 import { BINARY, CARDINALITY, NUMBER, REFERENCE, REFERENCES, STRING, TEXT, TIMESTAMP, } from '@based/schema/def';
-import { ENCODER } from '../../utils.js';
+import { ENCODER } from '@saulx/utils';
 const decimals = (v) => ~~(v * 100) / 100;
 const sizeCalc = (size) => {
     if (size > 1e6) {

package/dist/src/client/query/filter/createFixedFilterBuffer.js

@@ -1,7 +1,7 @@
 import { BINARY, STRING, REFERENCES, } from '@based/schema/def';
 import { ALIGNMENT_NOT_SET, EQUAL, MODE_AND_FIXED, MODE_DEFAULT, MODE_OR_FIXED, } from './types.js';
 import { parseFilterValue } from './parseFilterValue.js';
-import { ENCODER } from '../../../utils.js';
+import { ENCODER } from '@saulx/utils';
 export const writeFixed = (prop, buf, value, size, offset) => {
     if (prop.typeIndex === BINARY || prop.typeIndex === STRING) {
         if (typeof value === 'string') {

package/dist/src/client/query/filter/createVariableFilterBuffer.js

@@ -2,7 +2,7 @@ import { ALIAS, TEXT, VECTOR } from '@based/schema/def';
 import { EQUAL, EQUAL_CRC32, HAS, HAS_TO_LOWER_CASE, LIKE, MODE_DEFAULT_VAR, MODE_OR_VAR, getVectorFn, } from './types.js';
 import { createFixedFilterBuffer } from './createFixedFilterBuffer.js';
 import { crc32 } from '../../crc32.js';
-import { ENCODER, concatUint8Arr } from '../../../utils.js';
+import { ENCODER, concatUint8Arr } from '@saulx/utils';
 const DEFAULT_SCORE = new Uint8Array(new Float32Array([0.5]).buffer);
 const parseValue = (value, prop, ctx, lang) => {
     let val = value;

package/dist/src/client/query/filter/parseFilterValue.js

@@ -1,7 +1,6 @@
 import { TIMESTAMP, ENUM, BOOLEAN, STRING, BINARY, TEXT, } from '@based/schema/def';
 import { crc32 } from '../../crc32.js';
-import { convertToTimestamp } from '@saulx/utils';
-import { ENCODER } from '../../../utils.js';
+import { convertToTimestamp, ENCODER } from '@saulx/utils';
 // -------------------------------------------
 // conditions normal
 // field, [size 2]

package/dist/src/client/query/queryDef.js

@@ -21,7 +21,7 @@ const createEmptySharedDef = (skipValidation) => {
         },
         sort: null,
         references: new Map(),
-        aggregation: null,
+        aggregation: 0 /* AggFlag.NONE */,
     };
     return q;
 };
@@ -51,7 +51,7 @@ export const createQueryDef = (db, type, target, skipValidation) => {
                 q.range.limit = t.ids.length;
             }
             else if (t.alias) {
-                t.resolvedAlias = validateAlias(t.alias, [], q);
+                t.resolvedAlias = validateAlias(q, t.alias);
             }
             else {
                 q.range.limit = DEF_RANGE_PROP_LIMIT;

package/dist/src/client/query/read/read.js

@@ -1,7 +1,7 @@
 import { ALIAS, ALIASES, BINARY, BOOLEAN, ENUM, INT16, INT32, INT8, NUMBER, STRING, TEXT, TIMESTAMP, UINT16, UINT32, UINT8, VECTOR, JSON, CARDINALITY, } from '@based/schema/def';
 import { QueryDefType } from '../types.js';
 import { read, readUtf8 } from '../../string.js';
-import { readDoubleLE, readFloatLE, readInt16, readInt32, readUint16, readUint32, } from '../../../utils.js';
+import { readDoubleLE, readFloatLE, readInt16, readInt32, readUint16, readUint32, } from '@saulx/utils';
 import { inverseLangMap } from '@based/schema';
 import { READ_EDGE, READ_ID, READ_REFERENCE, READ_REFERENCES, READ_AGGREGATION, CREATE_AGGREGATION, } from '../types.js';
 const addField = (p, value, item, defaultOnly = false, lang = 0) => {
@@ -47,14 +47,7 @@ const getEmptyField = (p, item) => {
     else {
         for (; i < len; i++) {
             const field = path[i];
-            if (i === len - 1) {
-                if (!(field in select)) {
-                    select = select[field] = {};
-                }
-            }
-            else {
-                select = select[field] ?? (select[field] = {});
-            }
+            select = select[field] ?? (select[field] = {});
         }
     }
     return select;
@@ -132,7 +125,7 @@ const readMain = (q, result, offset, item) => {
     return i - offset;
 };
 const handleUndefinedProps = (id, q, item) => {
-    if (q.aggregation == 0 /* AggFlag.NONE */ || q.aggregation == null) {
+    if (q.aggregation === 0 /* AggFlag.NONE */ || q.aggregation === null) {
         for (const k in q.include.propsRead) {
             if (q.include.propsRead[k] !== id) {
                 // Only relevant for seperate props
@@ -145,8 +138,7 @@ const handleUndefinedProps = (id, q, item) => {
                     const lang = q.include.langTextFields.get(prop.prop).codes;
                     if (lang.has(0)) {
                         for (const locale in q.schema.locales) {
-                            if (!lan[locale]) {
-                                // console.log('???', locale, prop.default)
+                            if (lan[locale] == undefined) {
                                 lan[locale] = prop.default[locale] || '';
                             }
                         }
@@ -164,8 +156,6 @@ const handleUndefinedProps = (id, q, item) => {
                     addField(prop, prop.default, item);
                 }
                 else if (prop.typeIndex === TEXT) {
-                    // q.lang
-                    // console.log('???')
                     addField(prop, '', item);
                 }
                 else {

package/dist/src/client/query/registerQuery.js

@@ -1,5 +1,5 @@
 import native from '../../native.js';
-import { concatUint8Arr } from '../../utils.js';
+import { concatUint8Arr } from '@saulx/utils';
 import { defToBuffer } from './toBuffer.js';
 import { handleErrors } from './validation.js';
 export const registerQuery = (q) => {

package/dist/src/client/query/search/index.d.ts

@@ -5,4 +5,4 @@ export type Search = string[] | {
 } | string;
 export declare const vectorSearch: (def: QueryDef, q: ArrayBufferView, field: string, opts: Omit<FilterOpts, "lowerCase">) => void;
 export declare const search: (def: QueryDef, q: string, s?: Search) => void;
-export declare const searchToBuffer: (search: QueryDefSearch) => Uint8Array;
+export declare const searchToBuffer: (search: QueryDefSearch) => Uint8Array<ArrayBuffer>;

package/dist/src/client/query/search/index.js

@@ -2,7 +2,7 @@ import { langCodesMap } from '@based/schema';
 import { STRING, TEXT, VECTOR } from '@based/schema/def';
 import { getVectorFn } from '../filter/types.js';
 import { searchDoesNotExist, searchIncorrecQueryValue, searchIncorrectType, } from '../validation.js';
-import { ENCODER, concatUint8Arr } from '../../../utils.js';
+import { ENCODER, concatUint8Arr } from '@saulx/utils';
 // vector
 export const vectorSearch = (def, q, field, opts) => {
     let prop = def.props[field];

package/dist/src/client/query/sort.d.ts

@@ -1,3 +1,3 @@
 import { QueryDef, QueryDefSort } from './types.js';
-export declare const createSortBuffer: (sort: QueryDefSort) => Uint8Array;
+export declare const createSortBuffer: (sort: QueryDefSort) => Uint8Array<ArrayBuffer>;
 export declare const sort: (def: QueryDef, field: string, order?: "asc" | "desc") => void;

package/dist/src/client/query/toBuffer.js

@@ -1,10 +1,10 @@
 import { createSortBuffer } from './sort.js';
-import { QueryDefType } from './types.js';
+import { QueryDefType, QueryType } from './types.js';
 import { includeToBuffer } from './include/toBuffer.js';
 import { filterToBuffer } from './query.js';
 import { searchToBuffer } from './search/index.js';
 import { createAggFlagBuffer } from './aggregation.js';
-import { ENCODER } from '../../utils.js';
+import { ENCODER } from '@saulx/utils';
 const byteSize = (arr) => {
     return arr.reduce((a, b) => {
         return a + b.byteLength;
@@ -20,6 +20,7 @@ export function defToBuffer(db, def) {
             def.errors.push(...ref.errors);
         }
     });
+    const aggregation = createAggFlagBuffer(def.aggregation || 0 /* AggFlag.NONE */);
     let edges;
     let edgesSize = 0;
     if (def.edges) {
@@ -49,7 +50,7 @@ export function defToBuffer(db, def) {
             const aliasStr = ENCODER.encode(alias.value);
             const aliasLen = aliasStr.byteLength;
             const buf = new Uint8Array(8 + filterSize + aliasLen);
-            buf[0] = 3;
+            buf[0] = QueryType.alias;
             buf[1] = def.schema.idUint8[0];
             buf[2] = def.schema.idUint8[1];
             buf[3] = alias.def.prop;
@@ -65,7 +66,7 @@ export function defToBuffer(db, def) {
         }
         else if (def.target.id) {
             const buf = new Uint8Array(9 + filterSize);
-            buf[0] = 0;
+            buf[0] = QueryType.id;
             buf[1] = def.schema.idUint8[0];
             buf[2] = def.schema.idUint8[1];
             buf[3] = def.target.id;
@@ -86,10 +87,6 @@ export function defToBuffer(db, def) {
                 sort = createSortBuffer(def.sort);
                 sortSize = sort.byteLength;
             }
-            let aggregation;
-            if (def.aggregation) {
-                aggregation = createAggFlagBuffer(def.aggregation);
-            }
             if (def.target.ids) {
                 if (!sortSize &&
                     (def.range.offset || def.range.limit < def.target.ids.length)) {
@@ -97,7 +94,7 @@ export function defToBuffer(db, def) {
                 }
                 const idsSize = def.target.ids.length * 4;
                 const buf = new Uint8Array(21 + idsSize + filterSize + sortSize + searchSize);
-                buf[0] = 1;
+                buf[0] = QueryType.ids;
                 buf[1] = def.schema.idUint8[0];
                 buf[2] = def.schema.idUint8[1];
                 buf[3] = idsSize;
@@ -134,7 +131,7 @@ export function defToBuffer(db, def) {
             }
             else {
                 const buf = new Uint8Array(18 + filterSize + sortSize + searchSize);
-                buf[0] = 2;
+                buf[0] = QueryType.default;
                 buf[1] = def.schema.idUint8[0];
                 buf[2] = def.schema.idUint8[1];
                 buf[3] = def.range.offset;
@@ -160,9 +157,7 @@ export function defToBuffer(db, def) {
                 if (searchSize) {
                     buf.set(search, 17 + filterSize + sortSize);
                 }
-                if (aggregation) {
-                    buf.set(aggregation, 17 + filterSize + sortSize + searchSize);
-                }
+                buf.set(aggregation, 17 + filterSize + sortSize + searchSize);
                 result.push(buf);
             }
         }
@@ -175,8 +170,8 @@ export function defToBuffer(db, def) {
         }
         const sortSize = sort?.byteLength ?? 0;
         const modsSize = filterSize + sortSize;
-        const meta = new Uint8Array(modsSize + 10 + 8);
-        const sz = size + 7 + modsSize + 8;
+        const meta = new Uint8Array(modsSize + 10 + 8 + 1);
+        const sz = size + 7 + modsSize + 8 + 1;
         meta[0] = 254;
         meta[1] = sz;
         meta[2] = sz >>> 8;
@@ -201,6 +196,7 @@ export function defToBuffer(db, def) {
         meta[15 + modsSize] = def.schema.idUint8[0];
         meta[15 + 1 + modsSize] = def.schema.idUint8[1];
         meta[15 + 2 + modsSize] = def.target.propDef.prop;
+        meta[15 + 3 + modsSize] = aggregation[0];
         result.push(meta);
     }
     else if (def.type === QueryDefType.Reference) {

package/dist/src/client/query/types.d.ts

@@ -6,6 +6,13 @@ export type MainIncludes = {
     [start: string]: [number, PropDef];
 };
 export type IncludeTreeArr = (string | PropDef | IncludeTreeArr)[];
+export declare enum QueryType {
+    id = 0,
+    ids = 1,
+    default = 2,
+    alias = 3,
+    aggregates = 4
+}
 declare enum QueryDefType {
     Edge = 1,
     Reference = 2,

package/dist/src/client/query/types.js

@@ -1,3 +1,11 @@
+export var QueryType;
+(function (QueryType) {
+    QueryType[QueryType["id"] = 0] = "id";
+    QueryType[QueryType["ids"] = 1] = "ids";
+    QueryType[QueryType["default"] = 2] = "default";
+    QueryType[QueryType["alias"] = 3] = "alias";
+    QueryType[QueryType["aggregates"] = 4] = "aggregates";
+})(QueryType || (QueryType = {}));
 var QueryDefType;
 (function (QueryDefType) {
     QueryDefType[QueryDefType["Edge"] = 1] = "Edge";

package/dist/src/client/query/validation.d.ts

@@ -71,7 +71,7 @@ export declare const includeDoesNotExist: (def: QueryDef, field: string) => void
 export declare const includeLangDoesNotExist: (def: QueryDef, field: string) => void;
 export declare const validateLocale: (def: QueryDef, lang: string) => void;
 export declare const validateSort: (def: QueryDef, field: string, orderInput?: "asc" | "desc") => QueryDef["sort"];
-export declare const validateAlias: (alias: QueryByAliasObj, path: string[], def: QueryDef) => {
+export declare const validateAlias: (def: QueryDef, alias: QueryByAliasObj, path?: string) => {
     def: PropDef;
     value: string;
 };