@based/db 0.0.21 → 0.0.23

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

@@ -2,9 +2,11 @@ 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';
 const DEFAULT_SCORE = new Uint8Array(new Float32Array([0.5]).buffer);
 const parseValue = (value, prop, ctx, lang) => {
     let val = value;
+    // TODO should we do .normalize('NFKD') for all strings?
     if (ctx.operation === HAS_TO_LOWER_CASE && typeof val === 'string') {
         val = val.toLowerCase();
     }
@@ -28,25 +30,28 @@ const parseValue = (value, prop, ctx, lang) => {
         typeof value === 'string' ||
         !prop.separate ||
         ctx.operation !== EQUAL) {
-        if (prop.typeIndex === TEXT) {
-            // can be optmized replace when using uint8array
-            val = Buffer.concat([Buffer.from(val), Buffer.from([lang])]);
+        if (typeof val === 'string') {
+            val = ENCODER.encode(val);
         }
-        else {
-            val = Buffer.from(val);
+        if (prop.typeIndex === TEXT) {
+            const tmp = new Uint8Array(val.byteLength + 1);
+            tmp.set(val);
+            tmp[tmp.byteLength - 1] = lang;
+            val = tmp;
         }
     }
     if (val?.BYTES_PER_ELEMENT > 1) {
         val = val.buffer;
     }
-    if (!(val instanceof Buffer || val instanceof ArrayBuffer)) {
+    if (!(val instanceof Uint8Array || val instanceof ArrayBuffer)) {
         throw new Error(`Incorrect value for filter: ${prop.path}`);
     }
     if (ctx.operation === LIKE && prop.typeIndex !== VECTOR) {
-        // @ts-ignore
-        val = Buffer.concat([val, Buffer.from([ctx.opts.score ?? 2])]);
+        const tmp = new Uint8Array(val.byteLength + 1);
+        tmp.set((val instanceof ArrayBuffer) ? new Uint8Array(val) : val);
+        tmp[tmp.byteLength - 1] = ctx.opts.score ?? 2;
+        val = tmp;
     }
-    // @ts-ignore
     return val;
 };
 export const createVariableFilterBuffer = (value, prop, ctx, lang) => {
@@ -59,11 +64,12 @@ export const createVariableFilterBuffer = (value, prop, ctx, lang) => {
             const x = [];
             for (const v of value) {
                 const a = parseValue(v, prop, ctx, lang);
-                const size = Buffer.allocUnsafe(2);
-                size.writeUint16LE(a.byteLength);
+                const size = new Uint8Array(2);
+                size[0] = a.byteLength;
+                size[1] = a.byteLength >>> 8;
                 x.push(size, a);
             }
-            val = Buffer.concat(x);
+            val = concatUint8Arr(x);
         }
         else {
             const x = [];
@@ -85,21 +91,33 @@ export const createVariableFilterBuffer = (value, prop, ctx, lang) => {
                 prop.typeIndex !== ALIAS &&
                 prop.typeIndex !== VECTOR) {
                 if (prop.typeIndex === TEXT) {
-                    buf = writeVarFilter(mode, Buffer.concat([
-                        Buffer.from(new Uint32Array([crc32(val.slice(0, -1)), val.byteLength - 1])
-                            .buffer),
-                        Buffer.from(new Uint8Array([val[val.length - 1]]).buffer),
-                    ]), ctx, prop, 0, 0);
+                    const crc = crc32(val.slice(0, -1));
+                    const len = val.byteLength - 1;
+                    const v = new Uint8Array(9);
+                    v[0] = crc;
+                    v[1] = crc >>> 8;
+                    v[2] = crc >>> 16;
+                    v[3] = crc >>> 24;
+                    v[4] = len;
+                    v[5] = len >>> 8;
+                    v[6] = len >>> 16;
+                    v[7] = len >>> 24;
+                    v[8] = val[val.length - 1];
+                    buf = writeVarFilter(mode, v, ctx, prop, 0, 0);
                 }
                 else {
                     buf = createFixedFilterBuffer(prop, 8, { operation: EQUAL_CRC32, type: ctx.type, opts: ctx.opts }, val, false);
                 }
             }
             else {
+                if (val instanceof ArrayBuffer) {
+                    val = new Uint8Array(val);
+                }
                 buf = writeVarFilter(mode, val, ctx, prop, 0, 0);
             }
         }
         else {
+            // RFE is val always an Uint8Array?
             buf = writeVarFilter(mode, val, ctx, prop, prop.start, prop.len);
         }
     }
@@ -107,17 +125,22 @@ export const createVariableFilterBuffer = (value, prop, ctx, lang) => {
 };
 function writeVarFilter(mode, val, ctx, prop, start, len) {
     const size = val.byteLength;
-    const buf = Buffer.allocUnsafe(12 + size);
+    const buf = new Uint8Array(12 + size);
     buf[0] = ctx.type;
     buf[1] = mode;
     buf[2] = prop.typeIndex;
-    buf.writeUInt16LE(start, 3);
-    buf.writeUint16LE(len, 5);
-    buf.writeUint32LE(size, 7);
+    buf[3] = start;
+    buf[4] = start >>> 8;
+    buf[5] = len;
+    buf[6] = len >>> 8;
+    buf[7] = size;
+    buf[8] = size >>> 8;
+    buf[9] = size >>> 16;
+    buf[10] = size >>> 24;
     buf[11] = ctx.operation;
     // need to pas LANG FROM QUERY
     // need to set on 12 if TEXT
-    buf.set(Buffer.from(val), 12);
+    buf.set(val, 12);
     return buf;
 }
 //# sourceMappingURL=createVariableFilterBuffer.js.map

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

@@ -6,4 +6,4 @@ import { DbClient } from '../../index.js';
 export { Operator, Filter };
 export declare const filterRaw: (db: DbClient, filter: Filter, schema: SchemaTypeDef, conditions: QueryDefFilter, def: QueryDef) => number;
 export declare const filter: (db: DbClient, def: QueryDef, filterAst: FilterAst, conditions: QueryDefFilter) => void;
-export declare const filterOr: (db: DbClient, def: QueryDef, filterAst: FilterAst[], conditions: QueryDefFilter) => QueryDefFilter;
+export declare const filterOr: (db: DbClient, def: QueryDef, filterAst: FilterAst[], conditions: QueryDefFilter) => any;

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

@@ -100,6 +100,11 @@ export const filterOr = (db, def, filterAst, conditions) => {
             conditions: new Map(),
         };
     }
+    else {
+        const r = filterOr(db, def, filterAst, conditions.or);
+        conditions.size += r.size + 7;
+        return r;
+    }
     filter(db, def, filterAst, conditions.or);
     conditions.size += conditions.or.size;
     return conditions.or;

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

@@ -1,7 +1,7 @@
 import { TIMESTAMP, CREATED, UPDATED, ENUM, BOOLEAN, STRING, BINARY, TEXT, } from '@based/schema/def';
 import { crc32 } from '../../crc32.js';
 import { convertToTimestamp } from '../../timestamp.js';
-const ENCODER = new TextEncoder();
+import { ENCODER } from '../../../utils.js';
 // -------------------------------------------
 // conditions normal
 // field, [size 2]

package/dist/src/client/query/filter/toBuffer.d.ts

@@ -1,3 +1,3 @@
 import { QueryDefFilter } from '../types.js';
-export declare const fillConditionsBuffer: (result: Buffer, conditions: QueryDefFilter, offset: number) => number;
-export declare const filterToBuffer: (conditions: QueryDefFilter) => Buffer;
+export declare const fillConditionsBuffer: (result: Uint8Array, conditions: QueryDefFilter, offset: number) => number;
+export declare const filterToBuffer: (conditions: QueryDefFilter) => Uint8Array;

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

@@ -26,7 +26,8 @@ const writeConditions = (result, k, offset, conditions) => {
         result.set(condition, lastWritten);
         lastWritten += condition.byteLength;
     }
-    result.writeUint16LE(conditionSize, sizeIndex);
+    result[sizeIndex] = conditionSize;
+    result[sizeIndex + 1] = conditionSize >>> 8;
     return lastWritten - offset;
 };
 export const fillConditionsBuffer = (result, conditions, offset) => {
@@ -48,12 +49,14 @@ export const fillConditionsBuffer = (result, conditions, offset) => {
             lastWritten++;
             result[lastWritten] = refField;
             lastWritten++;
-            result.writeUint16LE(refConditions.schema.id, lastWritten);
+            result[lastWritten] = refConditions.schema.id;
+            result[lastWritten + 1] = refConditions.schema.id >>> 8;
             lastWritten += 2;
             const sizeIndex = lastWritten;
             lastWritten += 2;
             const size = fillConditionsBuffer(result, refConditions, lastWritten);
-            result.writeUint16LE(size, sizeIndex);
+            result[sizeIndex] = size;
+            result[sizeIndex + 1] = size >>> 8;
             lastWritten += size;
         }
     }
@@ -65,13 +68,18 @@ export const fillConditionsBuffer = (result, conditions, offset) => {
             lastWritten += 2;
             const size = writeConditions(result, k, lastWritten, v);
             lastWritten += size;
-            result.writeUint16LE(size, sizeIndex);
+            result[sizeIndex] = size;
+            result[sizeIndex + 1] = size >>> 8;
         });
     }
     if (conditions.or) {
         const size = fillConditionsBuffer(result, conditions.or, lastWritten);
-        result.writeUint16LE(size, orJumpIndex);
-        result.writeUint32LE(lastWritten, orJumpIndex + 2);
+        result[orJumpIndex] = size;
+        result[orJumpIndex + 1] = size >>> 8;
+        result[orJumpIndex + 2] = lastWritten;
+        result[orJumpIndex + 3] = lastWritten >>> 8;
+        result[orJumpIndex + 4] = lastWritten >>> 16;
+        result[orJumpIndex + 5] = lastWritten >>> 24;
         lastWritten += size;
     }
     if (conditions.exists) {
@@ -88,15 +96,14 @@ export const fillConditionsBuffer = (result, conditions, offset) => {
     }
     return lastWritten - offset;
 };
-// TODO convert to UINT8ARRAY
 export const filterToBuffer = (conditions) => {
     let result;
     if (conditions.size > 0) {
-        result = Buffer.allocUnsafe(conditions.size);
+        result = new Uint8Array(conditions.size);
         fillConditionsBuffer(result, conditions, 0);
     }
     else {
-        result = Buffer.alloc(0);
+        result = new Uint8Array(0);
     }
     return result;
 };

package/dist/src/client/query/include/props.js

@@ -1,4 +1,5 @@
 import { REFERENCE, REFERENCES, TEXT, } from '@based/schema/def';
+import { QueryDefType } from '../types.js';
 export const getAll = (props) => {
     const fields = [];
     for (const key in props) {
@@ -14,13 +15,29 @@ export const getAllRefs = (props, affix = '') => {
     for (const key in props) {
         const prop = props[key];
         if (prop.typeIndex === REFERENCE || prop.typeIndex === REFERENCES) {
-            fields.push(prop.path.join('.') + affix);
+            const refPath = prop.path.join('.') + affix;
+            fields.push(refPath);
+            if (prop.edges) {
+                for (const edge in prop.edges) {
+                    fields.push(refPath + '.' + edge);
+                }
+            }
         }
     }
     return fields;
 };
 export const includeField = (def, field) => {
     if (field === '*') {
+        if (def.type === QueryDefType.Reference ||
+            def.type === QueryDefType.References) {
+            const fields = [];
+            if (def.target.propDef.edges) {
+                for (const edge in def.target.propDef.edges) {
+                    fields.push(edge);
+                }
+            }
+            includeFields(def, fields);
+        }
         includeFields(def, getAll(def.props));
     }
     else if (field === '**') {

package/dist/src/client/query/include/toBuffer.d.ts

@@ -1,3 +1,3 @@
 import { DbClient } from '../../index.js';
 import { QueryDef } from '../types.js';
-export declare const includeToBuffer: (db: DbClient, def: QueryDef) => Buffer[];
+export declare const includeToBuffer: (db: DbClient, def: QueryDef) => Uint8Array[];

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

@@ -1,5 +1,6 @@
+import { QueryDefType } from '../types.js';
 import { walkDefs } from './walk.js';
-const EMPTY_BUFFER = Buffer.alloc(0);
+const EMPTY_BUFFER = new Uint8Array(0);
 export const includeToBuffer = (db, def) => {
     const result = [];
     if (!def.include.stringFields.size &&
@@ -17,8 +18,13 @@ export const includeToBuffer = (db, def) => {
             walkDefs(db, def, f);
         }
     }
+    // main
     if (def.include.main.len > 0) {
-        if (def.include.main.len === def.schema.mainLen) {
+        // if (def.target.)
+        const len = def.type === QueryDefType.Edge
+            ? def.target.ref.edgeMainLen
+            : def.schema.mainLen;
+        if (def.include.main.len === len) {
             // GET ALL MAIN FIELDS
             let m = 0;
             for (const key in def.include.main.include) {
@@ -32,16 +38,19 @@ export const includeToBuffer = (db, def) => {
         else {
             // GET SOME MAIN FIELDS
             const size = Object.keys(def.include.main.include).length;
-            mainBuffer = Buffer.allocUnsafe(size * 4 + 2);
-            mainBuffer.writeUint16LE(def.include.main.len, 0);
+            mainBuffer = new Uint8Array(size * 4 + 2);
+            mainBuffer[0] = def.include.main.len;
+            mainBuffer[1] = def.include.main.len >>> 8;
             let i = 2;
             let m = 0;
             for (const key in def.include.main.include) {
                 const v = def.include.main.include[key];
-                mainBuffer.writeUint16LE(v[1].start, i);
+                mainBuffer[i] = v[1].start;
+                mainBuffer[i + 1] = v[1].start >>> 8;
                 const len = v[1].len;
                 v[0] = m;
-                mainBuffer.writeUint16LE(len, i + 2);
+                mainBuffer[i + 2] = len;
+                mainBuffer[i + 3] = len >>> 8;
                 i += 4;
                 m += len;
             }
@@ -51,7 +60,7 @@ export const includeToBuffer = (db, def) => {
         for (const [prop, { codes, def: propDef },] of def.include.langTextFields.entries()) {
             def.include.propsRead[prop] = 0;
             if (codes.has(0)) {
-                const b = Buffer.allocUnsafe(3);
+                const b = new Uint8Array(3);
                 b[0] = prop;
                 b[1] = propDef.typeIndex;
                 b[2] = 0;
@@ -59,7 +68,7 @@ export const includeToBuffer = (db, def) => {
             }
             else {
                 for (const code of codes) {
-                    const b = Buffer.allocUnsafe(3);
+                    const b = new Uint8Array(3);
                     b[0] = prop;
                     b[1] = propDef.typeIndex;
                     b[2] = code;
@@ -71,11 +80,12 @@ export const includeToBuffer = (db, def) => {
     const propSize = def.include.props.size ?? 0;
     if (mainBuffer) {
         len = mainBuffer.byteLength + 3 + propSize * 2;
-        includeBuffer = Buffer.allocUnsafe(len);
+        includeBuffer = new Uint8Array(len);
         includeBuffer[0] = 0;
-        includeBuffer.writeInt16LE(mainBuffer.byteLength, 1);
+        includeBuffer[1] = mainBuffer.byteLength;
+        includeBuffer[2] = mainBuffer.byteLength >>> 8;
         const offset = 3 + mainBuffer.byteLength;
-        mainBuffer.copy(includeBuffer, 3);
+        includeBuffer.set(mainBuffer, 3);
         if (propSize) {
             let i = 0;
             for (const [prop, propDef] of def.include.props.entries()) {
@@ -86,7 +96,7 @@ export const includeToBuffer = (db, def) => {
         }
     }
     else if (propSize) {
-        const buf = Buffer.allocUnsafe(propSize * 2);
+        const buf = new Uint8Array(propSize * 2);
         let i = 0;
         for (const [prop, propDef] of def.include.props.entries()) {
             buf[i] = prop;

package/dist/src/client/query/include/walk.js

@@ -35,7 +35,8 @@ export const walkDefs = (db, def, f) => {
                     }
                 }
                 else {
-                    def.edges.include.props.set(edgeProp.prop, edgeProp);
+                    // use include here
+                    includeProp(def.edges, edgeProp);
                 }
                 return;
             }

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

@@ -8,3 +8,4 @@ export * from './filter/toBuffer.js';
 export * from './sort.js';
 export * from './debug.js';
 export * from './read/read.js';
+export * from './aggregationFn.js';

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

@@ -8,4 +8,5 @@ export * from './filter/toBuffer.js';
 export * from './sort.js';
 export * from './debug.js';
 export * from './read/read.js';
+export * from './aggregationFn.js';
 //# sourceMappingURL=query.js.map

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

@@ -21,6 +21,7 @@ const createEmptySharedDef = (skipValidation) => {
         },
         sort: null,
         references: new Map(),
+        aggregation: null,
     };
     return q;
 };
@@ -30,7 +31,7 @@ export const createQueryDef = (db, type, target, skipValidation) => {
         const t = target;
         const q = queryDef;
         q.props = t.ref.edges;
-        q.reverseProps = t.ref.reverseEdges;
+        // q.reverseProps = t.ref.reverseEdges
         q.type = type;
         q.target = t;
         return q;

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

@@ -4,5 +4,6 @@ export type Item = {
 } & {
     [key: string]: any;
 };
-export declare const readAllFields: (q: QueryDef, result: Uint8Array, offset: number, end: number, item: Item, id: number) => number;
+export type AggItem = Partial<Item>;
+export declare const readAllFields: (q: QueryDef, result: Uint8Array, offset: number, end: number, item: Item | AggItem, id: number) => number;
 export declare const resultToObject: (q: QueryDef, result: Uint8Array, end: number, offset?: number) => any;

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

@@ -1,8 +1,9 @@
 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 '../../bitWise.js';
 import { inverseLangMap } from '@based/schema';
-import { READ_EDGE, READ_ID, READ_REFERENCE, READ_REFERENCES } from './types.js';
+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) => {
     let i = p.__isEdge === true ? 1 : 0;
     // TODO OPTMIZE
@@ -112,11 +113,14 @@ const readMainValue = (prop, result, index, item) => {
 const readMain = (q, result, offset, item) => {
     const mainInclude = q.include.main;
     let i = offset;
-    if (mainInclude.len === q.schema.mainLen) {
-        for (const start in q.schema.main) {
-            readMainValue(q.schema.main[start], result, Number(start) + i, item);
+    const isEdge = q.type === QueryDefType.Edge;
+    const main = isEdge ? q.target.ref.reverseMainEdges : q.schema.main;
+    const len = isEdge ? q.target.ref.edgeMainLen : q.schema.mainLen;
+    if (mainInclude.len === len) {
+        for (const start in main) {
+            readMainValue(main[start], result, Number(start) + i, item);
         }
-        i += q.schema.mainLen;
+        i += len;
     }
     else {
         for (const k in mainInclude.include) {
@@ -128,33 +132,36 @@ const readMain = (q, result, offset, item) => {
     return i - offset;
 };
 const handleUndefinedProps = (id, q, item) => {
-    for (const k in q.include.propsRead) {
-        if (q.include.propsRead[k] !== id) {
-            const prop = q.schema.reverseProps[k];
-            if (prop.typeIndex === CARDINALITY) {
-                addField(prop, 0, item);
-            }
-            else if (prop.typeIndex === TEXT && q.lang == 0) {
-                const lan = getEmptyField(prop, item);
-                const lang = q.include.langTextFields.get(prop.prop).codes;
-                if (lang.has(0)) {
-                    for (const locale in q.schema.locales) {
-                        if (!lan[locale]) {
-                            lan[locale] = '';
+    if (q.aggregation != -999 /* AggFn.NONE */) {
+        for (const k in q.include.propsRead) {
+            if (q.include.propsRead[k] !== id) {
+                // Only relvant for seperate props
+                const prop = q.schema.reverseProps[k];
+                if (prop.typeIndex === CARDINALITY) {
+                    addField(prop, 0, item);
+                }
+                else if (prop.typeIndex === TEXT && q.lang == 0) {
+                    const lan = getEmptyField(prop, item);
+                    const lang = q.include.langTextFields.get(prop.prop).codes;
+                    if (lang.has(0)) {
+                        for (const locale in q.schema.locales) {
+                            if (!lan[locale]) {
+                                lan[locale] = '';
+                            }
                         }
                     }
-                }
-                else {
-                    for (const code of lang) {
-                        const locale = inverseLangMap.get(code);
-                        if (!lan[locale]) {
-                            lan[locale] = '';
+                    else {
+                        for (const code of lang) {
+                            const locale = inverseLangMap.get(code);
+                            if (!lan[locale]) {
+                                lan[locale] = '';
+                            }
                         }
                     }
                 }
-            }
-            else {
-                addField(prop, prop.typeIndex === JSON ? null : '', item);
+                else {
+                    addField(prop, prop.typeIndex === JSON ? null : '', item);
+                }
             }
         }
     }
@@ -209,41 +216,40 @@ export const readAllFields = (q, result, offset, end, item, id) => {
                 // ----------------
             }
             else {
-                const edgeDef = q.edges.reverseProps[prop];
-                const t = edgeDef.typeIndex;
-                if (t === JSON) {
-                    i++;
-                    const size = readUint32(result, i);
-                    addField(edgeDef, global.JSON.parse(readUtf8(result, i + 6, size + i)), item);
-                    i += size + 4;
-                }
-                else if (t === BINARY) {
-                    i++;
-                    const size = readUint32(result, i);
-                    addField(edgeDef, result.subarray(i + 6, size + i), item);
-                    i += size + 4;
+                i++;
+                const target = 'ref' in q.edges.target && q.edges.target.ref;
+                if (prop === 0) {
+                    i += readMain(q.edges, result, i, item);
+                    // i += edgeDef.len
                 }
-                else if (t === STRING || t === ALIAS || t === ALIASES) {
-                    i++;
-                    const size = readUint32(result, i);
-                    if (size === 0) {
-                        addField(edgeDef, '', item);
+                else {
+                    const edgeDef = target.reverseSeperateEdges[prop];
+                    const t = edgeDef.typeIndex;
+                    if (t === JSON) {
+                        const size = readUint32(result, i);
+                        addField(edgeDef, global.JSON.parse(readUtf8(result, i + 6, size + i)), item);
+                        i += size + 4;
                     }
-                    else {
-                        addField(edgeDef, read(result, i + 4, size), item);
+                    else if (t === BINARY) {
+                        const size = readUint32(result, i);
+                        addField(edgeDef, result.subarray(i + 6, size + i), item);
+                        i += size + 4;
+                    }
+                    else if (t === STRING || t === ALIAS || t === ALIASES) {
+                        const size = readUint32(result, i);
+                        if (size === 0) {
+                            addField(edgeDef, '', item);
+                        }
+                        else {
+                            addField(edgeDef, read(result, i + 4, size), item);
+                        }
+                        i += size + 4;
+                    }
+                    else if (t === CARDINALITY) {
+                        const size = readUint32(result, i);
+                        addField(edgeDef, readUint32(result, i + 4), item);
+                        i += size + 4;
                     }
-                    i += size + 4;
-                }
-                else if (t === CARDINALITY) {
-                    i++;
-                    const size = readUint32(result, i);
-                    addField(edgeDef, readUint32(result, i + 4), item);
-                    i += size + 4;
-                }
-                else {
-                    i++;
-                    readMainValue(edgeDef, result, i, item);
-                    i += edgeDef.len;
                 }
             }
         }
@@ -282,6 +288,23 @@ export const readAllFields = (q, result, offset, end, item, id) => {
             addField(ref.target.propDef, refs, item);
             i += size + 4;
         }
+        else if (index === CREATE_AGGREGATION) {
+            i--;
+            result[i] = READ_AGGREGATION;
+            q.aggregation = -999 /* AggFn.NONE */;
+            return i - offset - 4 - (q.search ? 4 : 0);
+        }
+        else if (index === READ_AGGREGATION) {
+            // TODO: To change to a map and also to get the aggregate field name from a query function parameter
+            const propAgg = {
+                name: 'count',
+                path: ['count'],
+                typeIndex: UINT32,
+            };
+            const size = readUint32(result, i);
+            addField(propAgg, readUint32(result, i + 4), item);
+            i += 4 + size + 4;
+        }
         else if (index === 0) {
             i += readMain(q, result, i, item);
         }
@@ -359,9 +382,13 @@ export const readAllFields = (q, result, offset, end, item, id) => {
     handleUndefinedProps(id, q, item);
     return i - offset;
 };
+let cnt = 0;
 export const resultToObject = (q, result, end, offset = 0) => {
     const len = readUint32(result, offset);
     if (len === 0) {
+        if ('id' in q.target || 'alias' in q.target) {
+            return null;
+        }
         return [];
     }
     let items = [];
@@ -369,9 +396,15 @@ export const resultToObject = (q, result, end, offset = 0) => {
     while (i < end) {
         const id = readUint32(result, i);
         i += 4;
-        const item = {
-            id,
-        };
+        var item;
+        if (q.aggregation == -999 /* AggFn.NONE */) {
+            item = {};
+        }
+        else {
+            item = {
+                id,
+            };
+        }
         if (q.search) {
             item.$searchScore = readFloatLE(result, i);
             i += 4;

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

@@ -1,2 +1,2 @@
 import { BasedDbQuery } from './BasedDbQuery.js';
-export declare const registerQuery: (q: BasedDbQuery) => Buffer;
+export declare const registerQuery: (q: BasedDbQuery) => Uint8Array;

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

@@ -1,10 +1,11 @@
 import native from '../../native.js';
+import { concatUint8Arr } from '../../utils.js';
 import { defToBuffer } from './toBuffer.js';
 import { handleErrors } from './validation.js';
 export const registerQuery = (q) => {
     if (!q.id) {
         const b = defToBuffer(q.db, q.def);
-        const buf = Buffer.concat(b);
+        const buf = concatUint8Arr(b);
         let id = native.crc32(buf);
         q.id = id;
         q.buffer = buf;