@based/db 0.0.25 → 0.0.27

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

@@ -30,7 +30,8 @@ const appendCreate = (ctx, def, obj, res, unsafe) => {
                 ctx.buf[ctx.len++] = mainLenU32 >>>= 8;
                 ctx.buf[ctx.len++] = mainLenU32 >>>= 8;
                 ctx.lastMain = ctx.len;
-                ctx.buf.fill(0, ctx.len, (ctx.len += def.mainLen));
+                ctx.buf.set(def.mainEmpty, ctx.len);
+                ctx.len += def.mainLen;
             }
             err = writeFixedValue(ctx, createTs, prop, ctx.lastMain + prop.start);
             if (err) {
@@ -38,6 +39,21 @@ const appendCreate = (ctx, def, obj, res, unsafe) => {
             }
         }
     }
+    else if (ctx.lastMain === -1 && !def.mainEmptyAllZeroes) {
+        // this is there to handle different defaults
+        if (ctx.lastMain === -1) {
+            let mainLenU32 = def.mainLen;
+            setCursor(ctx, def, 0, MICRO_BUFFER, res.tmpId, CREATE);
+            ctx.buf[ctx.len++] = CREATE;
+            ctx.buf[ctx.len++] = mainLenU32;
+            ctx.buf[ctx.len++] = mainLenU32 >>>= 8;
+            ctx.buf[ctx.len++] = mainLenU32 >>>= 8;
+            ctx.buf[ctx.len++] = mainLenU32 >>>= 8;
+            ctx.lastMain = ctx.len;
+            ctx.buf.set(def.mainEmpty, ctx.len);
+            ctx.len += def.mainLen;
+        }
+    }
     if (def.hasSeperateSort) {
         if (ctx.hasSortField !== def.seperateSort.size - 1) {
             if (ctx.len + 3 > ctx.max) {

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

@@ -19,12 +19,6 @@ map[BINARY] = (ctx, val, def) => {
     ctx.len += buf.byteLength;
 };
 map[STRING] = (ctx, val, def) => {
-    if (typeof val !== 'string') {
-        if (val !== null) {
-            return new ModifyError(def, val);
-        }
-        val = '';
-    }
     const valBuf = ENCODER.encode(val);
     const size = valBuf.byteLength;
     if (size + 1 > def.len) {
@@ -66,9 +60,6 @@ map[ENUM] = (ctx, val, def) => {
     }
 };
 map[NUMBER] = (ctx, val, def) => {
-    if (typeof val !== 'number') {
-        return new ModifyError(def, val);
-    }
     if (ctx.len + 8 > ctx.max) {
         return RANGE_ERR;
     }
@@ -78,9 +69,6 @@ map[NUMBER] = (ctx, val, def) => {
 };
 map[TIMESTAMP] = (ctx, val, def) => {
     const parsedValue = convertToTimestamp(val);
-    if (typeof parsedValue !== 'number') {
-        return new ModifyError(def, val);
-    }
     if (ctx.len + 8 > ctx.max) {
         return RANGE_ERR;
     }
@@ -89,9 +77,6 @@ map[TIMESTAMP] = (ctx, val, def) => {
     view.setFloat64(0, parsedValue, true);
 };
 map[UINT32] = (ctx, val, def) => {
-    if (typeof val !== 'number') {
-        return new ModifyError(def, val);
-    }
     if (ctx.len + 4 > ctx.max) {
         return RANGE_ERR;
     }
@@ -101,9 +86,6 @@ map[UINT32] = (ctx, val, def) => {
     ctx.buf[ctx.len++] = val >>>= 8;
 };
 map[UINT16] = (ctx, val, def) => {
-    if (typeof val !== 'number') {
-        return new ModifyError(def, val);
-    }
     if (ctx.len + 2 > ctx.max) {
         return RANGE_ERR;
     }
@@ -111,18 +93,37 @@ map[UINT16] = (ctx, val, def) => {
     ctx.buf[ctx.len++] = val >>>= 8;
 };
 map[UINT8] = (ctx, val, def) => {
-    if (typeof val !== 'number') {
-        return new ModifyError(def, val);
+    if (ctx.len + 1 > ctx.max) {
+        return RANGE_ERR;
+    }
+    ctx.buf[ctx.len++] = val;
+};
+map[INT32] = (ctx, val, def) => {
+    if (ctx.len + 4 > ctx.max) {
+        return RANGE_ERR;
+    }
+    ctx.buf[ctx.len++] = val;
+    ctx.buf[ctx.len++] = val >>>= 8;
+    ctx.buf[ctx.len++] = val >>>= 8;
+    ctx.buf[ctx.len++] = val >>>= 8;
+};
+map[INT16] = (ctx, val, def) => {
+    if (ctx.len + 2 > ctx.max) {
+        return RANGE_ERR;
     }
+    ctx.buf[ctx.len++] = val;
+    ctx.buf[ctx.len++] = val >>>= 8;
+};
+map[INT8] = (ctx, val, def) => {
     if (ctx.len + 1 > ctx.max) {
         return RANGE_ERR;
     }
     ctx.buf[ctx.len++] = val;
 };
-map[INT32] = map[UINT32];
-map[INT16] = map[UINT16];
-map[INT8] = map[UINT8];
 export const writeFixedValue = (ctx, val, def, pos) => {
+    if (!def.validation(val, def)) {
+        return new ModifyError(def, val);
+    }
     const len = ctx.len;
     ctx.len = pos;
     const res = map[def.typeIndex](ctx, val, def);
@@ -130,6 +131,9 @@ export const writeFixedValue = (ctx, val, def, pos) => {
     return res;
 };
 export const appendFixedValue = (ctx, val, def) => {
+    if (!def.validation(val, def)) {
+        return new ModifyError(def, val);
+    }
     return map[def.typeIndex](ctx, val, def);
 };
 //# sourceMappingURL=fixed.js.map

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

@@ -1,5 +1,19 @@
 import { writeBinary } from './binary.js';
+import { ModifyError } from './ModifyRes.js';
 export function writeJson(value, ctx, schema, t, parentId, modifyOp) {
-    return writeBinary(value === null ? null : JSON.stringify(value), ctx, schema, t, parentId, modifyOp);
+    try {
+        if (value === null) {
+            return writeBinary(null, ctx, schema, t, parentId, modifyOp);
+        }
+        else {
+            if (!t.validation(value, t)) {
+                return new ModifyError(t, value);
+            }
+            return writeBinary(JSON.stringify(value), ctx, schema, t, parentId, modifyOp);
+        }
+    }
+    catch (err) {
+        return new ModifyError(t, value);
+    }
 }
 //# sourceMappingURL=json.js.map

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

@@ -75,7 +75,9 @@ function _modify(ctx, res, obj, schema, mod, tree, overwrite, unsafe) {
                     ctx.buf[ctx.len++] = mainLenU32 >>>= 8;
                     ctx.buf[ctx.len++] = mainLenU32 >>>= 8;
                     ctx.lastMain = ctx.len;
-                    ctx.buf.fill(0, ctx.len, (ctx.len += schema.mainLen));
+                    ctx.buf.set(schema.mainEmpty, ctx.len);
+                    ctx.len += schema.mainLen;
+                    // ctx.buf.fill(0, ctx.len, (ctx.len += schema.mainLen))
                 }
                 if (typeof val === 'object' && val !== null && 'increment' in val) {
                     err = writeFixedValue(ctx, val.increment, def, ctx.lastMain + def.start);

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

@@ -75,7 +75,8 @@ export function writeEdges(t, ref, ctx) {
                     if (typeof value !== 'string') {
                         return new ModifyError(edge, value);
                     }
-                    if (ctx.len + EDGE_HEADER_SIZE + ENCODER.encode(value).byteLength > ctx.max) {
+                    if (ctx.len + EDGE_HEADER_SIZE + ENCODER.encode(value).byteLength >
+                        ctx.max) {
                         return RANGE_ERR;
                     }
                     ctx.buf[ctx.len++] = STRING;
@@ -132,7 +133,7 @@ export function writeEdges(t, ref, ctx) {
                         return RANGE_ERR;
                     }
                     ctx.buf[ctx.len++] = CARDINALITY;
-                    writeHllBuf(value, ctx, t, size);
+                    writeHllBuf(value, ctx, edge, size);
                 }
             }
             else {
@@ -271,6 +272,7 @@ export function writeEdges(t, ref, ctx) {
             // Index of start of fields
             const sIndex = ctx.len;
             ctx.len += mainFieldsStartSize;
+            // this has to be replaced
             // Add zeroes
             ctx.buf.fill(0, ctx.len, ctx.len + t.edgeMainLen);
             // Keep track of written bytes from append fixed

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

@@ -27,7 +27,14 @@ export function writeReferences(value, ctx, schema, def, res, mod) {
         else if (key === 'delete') {
             err = deleteRefs(def, ctx, schema, mod, val, res.tmpId);
         }
-        else if (key === 'set') {
+        else if (key === 'update') {
+            // and add add: []
+            // replace this with update
+            err = updateRefs(def, ctx, schema, mod, val, res.tmpId, 1);
+        }
+        else if (key === 'add') {
+            // and add add: []
+            // replace this with update
             err = updateRefs(def, ctx, schema, mod, val, res.tmpId, 1);
         }
         else if (key === 'upsert') {
@@ -173,6 +180,9 @@ function appendRefs(def, ctx, modifyOp, refs, op, remaining) {
         else {
             return new ModifyError(def, refs);
         }
+        if (!def.validation(id, def)) {
+            return new ModifyError(def, refs);
+        }
         if (hasEdges) {
             if (index === undefined) {
                 if (ctx.len + 9 > ctx.max) {
@@ -261,17 +271,22 @@ function putRefs(def, ctx, modifyOp, refs, op) {
     for (; i < refs.length; i++) {
         let ref = refs[i];
         if (typeof ref === 'number') {
-            ctx.buf[ctx.len++] = ref;
-            ctx.buf[ctx.len++] = ref >>>= 8;
-            ctx.buf[ctx.len++] = ref >>>= 8;
-            ctx.buf[ctx.len++] = ref >>>= 8;
+            if (!def.validation(ref, def)) {
+                break;
+            }
+            else {
+                ctx.buf[ctx.len++] = ref;
+                ctx.buf[ctx.len++] = ref >>>= 8;
+                ctx.buf[ctx.len++] = ref >>>= 8;
+                ctx.buf[ctx.len++] = ref >>>= 8;
+            }
         }
         else if (ref instanceof ModifyState) {
             if (ref.error) {
                 return ref.error;
             }
             ref = ref.getId();
-            if (!ref) {
+            if (!def.validation(ref, def)) {
                 break;
             }
             ctx.buf[ctx.len++] = ref;

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

@@ -8,11 +8,7 @@ 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 (typeof value !== 'string' && value !== null && !isBuffer) {
-        return new ModifyError(t, value);
-    }
-    const len = value?.length;
-    if (!len) {
+    if (value === '' || value === null) {
         if (modifyOp === UPDATE) {
             if (ctx.len + 11 /* SIZE.DEFAULT_CURSOR */ + 1 > ctx.max) {
                 return RANGE_ERR;
@@ -22,11 +18,14 @@ export function writeString(lang, value, ctx, def, t, parentId, modifyOp) {
         }
     }
     else {
+        if (!t.validation(value, t)) {
+            return new ModifyError(t, value);
+        }
         let size = isBuffer
             ? value.byteLength
             : ENCODER.encode(value).byteLength + 6;
         if (ctx.len + 11 /* SIZE.DEFAULT_CURSOR */ + 11 + size > ctx.max) {
-            // +10 OR +11, teh original check was +20 but
+            // +10 OR +11, the original check was +20 but
             // there are 10 addtional bytes in this scope
             // 5 compression size
             return RANGE_ERR;

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

@@ -4,16 +4,6 @@ import { writeString } from './string.js';
 import { ModifyError } from './ModifyRes.js';
 import { setCursor } from './setCursor.js';
 export function writeText(value, ctx, def, t, res, parentId, modifyOp) {
-    const isBuffer = value instanceof Uint8Array;
-    if (typeof value !== 'string' &&
-        value !== null &&
-        !isBuffer &&
-        value &&
-        typeof value !== 'object') {
-        return new ModifyError(t, value);
-    }
-    // const len = value?.length
-    // think about this
     if (value === null && !res.locale) {
         if (modifyOp === UPDATE) {
             if (ctx.len + 11 /* SIZE.DEFAULT_CURSOR */ + 1 > ctx.max) {
@@ -31,7 +21,6 @@ export function writeText(value, ctx, def, t, res, parentId, modifyOp) {
             // @ts-ignore
             value = '';
         }
-        // @ts-ignore
         const err = writeString(res.locale, value, ctx, def, t, res.tmpId, modifyOp);
         if (modifyOp === CREATE) {
             const index = t.prop * (def.localeSize + 1);

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

@@ -2,7 +2,7 @@ import { ALIAS } from '@based/schema/def';
 export async function upsert(db, type, obj, opts) {
     const tree = db.schemaTypesParsed[type].tree;
     let q;
-    let id = '';
+    let id = type;
     for (const key in obj) {
         if (tree[key].typeIndex === ALIAS) {
             id += `${key}:${obj[key]};`;

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

@@ -18,11 +18,11 @@ export function writeVector(value, ctx, schema, t, parentId, modifyOp) {
         size = 0;
     }
     else {
-        if (!value) {
-            return new ModifyError(t, value);
-        }
         size = value.byteLength + 4;
     }
+    if (!t.validation(value, t)) {
+        return new ModifyError(t, value);
+    }
     if (size === 0) {
         if (modifyOp === UPDATE) {
             if (ctx.len + 11 /* SIZE.DEFAULT_CURSOR */ + 1 > ctx.max) {

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

@@ -162,7 +162,12 @@ export class QueryBranch {
                 });
             }
             else if (Array.isArray(f)) {
-                includeFields(this.def, f);
+                if (f.length === 0) {
+                    includeFields(this.def, ['id']);
+                }
+                else {
+                    includeFields(this.def, f);
+                }
             }
             else if (f !== undefined) {
                 throw new Error('Invalid include statement: expected props, refs and edges (string or array) or function');
@@ -208,6 +213,9 @@ export class BasedDbQuery extends QueryBranch {
                 }
             }
         }
+        if (!db.schemaIsSetValue) {
+            throw new Error('Query: No schema yet - use await db.schemaIsSet()');
+        }
         const def = createQueryDef(db, QueryDefType.Root, target, skipValidation);
         super(db, def);
     }

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

@@ -2,7 +2,7 @@ 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 '../bitWise.js';
+import { readFloatLE, readUint32 } from '../../utils.js';
 export { time, size, inspectData };
 export class BasedQueryResponse {
     result;
@@ -60,8 +60,9 @@ export class BasedQueryResponse {
             let id = readUint32(result, i);
             i += 4;
             let item;
-            if (this.def.aggregation == -999 /* AggFn.NONE */) {
+            if (this.def.aggregation == 255 /* AggFlag.TEMP */) {
                 item = {};
+                this.def.aggregation = 4 /* AggFlag.COUNT */;
             }
             else {
                 item = {
@@ -101,7 +102,13 @@ export class BasedQueryResponse {
         return readUint32(result, offset);
     }
     get length() {
-        return readUint32(this.result, 0);
+        const l = readUint32(this.result, 0);
+        if (this.def.aggregation != 0 /* AggFlag.NONE */ && this.def.aggregation != null) {
+            return l + 1;
+        }
+        else {
+            return l;
+        }
     }
     toObject() {
         return resultToObject(this.def, this.result, this.end - 4, 0);

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

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

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

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

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

@@ -119,7 +119,8 @@ const inspectObject = (object, q, path, level, isLast, isFirst, isObject, depth)
     let edges = [];
     for (const k in object) {
         const key = path ? path + '.' + k : k;
-        let def = q.props[key];
+        let def;
+        def = q.props[key];
         let v = object[k];
         const isEdge = k[0] === '$';
         if (k === '$searchScore') {
@@ -144,7 +145,16 @@ const inspectObject = (object, q, path, level, isLast, isFirst, isObject, depth)
             str += ',\n';
         }
         else if (!def) {
-            str += inspectObject(v, q, key, level + 2, false, false, true, depth) + '';
+            if (Object.keys(object)[0] == 'count') {
+                // TODO: to flag the agg someway. This is ugly as hell!!!
+                str += picocolors.blue(v);
+                str += picocolors.italic(picocolors.dim(' count'));
+                str += ',\n';
+            }
+            else {
+                str +=
+                    inspectObject(v, q, key, level + 2, false, false, true, depth) + '';
+            }
         }
         else if ('__isPropDef' in def) {
             if (def.typeIndex === REFERENCES) {

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

@@ -1,4 +1,4 @@
-import { TIMESTAMP, CREATED, UPDATED, ENUM, BOOLEAN, STRING, BINARY, TEXT, } from '@based/schema/def';
+import { TIMESTAMP, ENUM, BOOLEAN, STRING, BINARY, TEXT, } from '@based/schema/def';
 import { crc32 } from '../../crc32.js';
 import { convertToTimestamp } from '../../timestamp.js';
 import { ENCODER } from '../../../utils.js';
@@ -39,9 +39,7 @@ export const parseFilterValue = (prop, value) => {
     else if (prop.typeIndex === ENUM) {
         return prop.reverseEnum[value] + 1;
     }
-    else if (prop.typeIndex === TIMESTAMP ||
-        prop.typeIndex === CREATED ||
-        prop.typeIndex === UPDATED) {
+    else if (prop.typeIndex === TIMESTAMP) {
         const v = convertToTimestamp(value);
         if (typeof v !== 'number') {
             throw new Error(`Incorrect value for timestamp ${prop.path.join('.')}`);

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

@@ -33,7 +33,7 @@ const writeConditions = (result, k, offset, conditions) => {
 export const fillConditionsBuffer = (result, conditions, offset) => {
     let lastWritten = offset;
     let orJumpIndex = 0;
-    if (conditions.or) {
+    if (conditions.or && conditions.or.size != 0) {
         result[lastWritten] = META_OR_BRANCH;
         lastWritten++;
         orJumpIndex = lastWritten;
@@ -72,7 +72,7 @@ export const fillConditionsBuffer = (result, conditions, offset) => {
             result[sizeIndex + 1] = size >>> 8;
         });
     }
-    if (conditions.or) {
+    if (conditions.or && conditions.or.size != 0) {
         const size = fillConditionsBuffer(result, conditions.or, lastWritten);
         result[orJumpIndex] = size;
         result[orJumpIndex + 1] = size >>> 8;

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

@@ -20,6 +20,7 @@ export const walkDefs = (db, def, f) => {
                     def.edges.lang = def.lang;
                 }
                 const edgeProp = def.edges.props[p];
+                // console.log(p, !!edgeProp, Object.keys(def.edges.props), def.target)
                 if (edgeProp.typeIndex === REFERENCE ||
                     edgeProp.typeIndex === REFERENCES) {
                     const refDef = createOrGetRefQueryDef(db, def.edges, edgeProp);

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

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

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

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

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

@@ -31,7 +31,6 @@ export const createQueryDef = (db, type, target, skipValidation) => {
         const t = target;
         const q = queryDef;
         q.props = t.ref.edges;
-        // q.reverseProps = t.ref.reverseEdges
         q.type = type;
         q.target = t;
         return q;

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 '../../bitWise.js';
+import { readDoubleLE, readFloatLE, readInt16, readInt32, readUint16, readUint32, } from '../../../utils.js';
 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) => {
@@ -132,7 +132,7 @@ const readMain = (q, result, offset, item) => {
     return i - offset;
 };
 const handleUndefinedProps = (id, q, item) => {
-    if (q.aggregation != -999 /* AggFn.NONE */) {
+    if (q.aggregation == 0 /* AggFlag.NONE */ || q.aggregation == null) {
         for (const k in q.include.propsRead) {
             if (q.include.propsRead[k] !== id) {
                 // Only relvant for seperate props
@@ -291,11 +291,12 @@ export const readAllFields = (q, result, offset, end, item, id) => {
         else if (index === CREATE_AGGREGATION) {
             i--;
             result[i] = READ_AGGREGATION;
-            q.aggregation = -999 /* AggFn.NONE */;
+            result[0] = result[0] + 1;
+            q.aggregation = 255 /* AggFlag.TEMP */;
             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
+            // TODO: Change to a map and also to get the aggregate field name from a query function parameter
             const propAgg = {
                 name: 'count',
                 path: ['count'],
@@ -303,6 +304,9 @@ export const readAllFields = (q, result, offset, end, item, id) => {
             };
             const size = readUint32(result, i);
             addField(propAgg, readUint32(result, i + 4), item);
+            result[0] = result[0] - 1;
+            i--;
+            result[i] = CREATE_AGGREGATION;
             i += 4 + size + 4;
         }
         else if (index === 0) {
@@ -310,6 +314,9 @@ export const readAllFields = (q, result, offset, end, item, id) => {
         }
         else {
             const prop = q.schema.reverseProps[index];
+            if (!prop) {
+                console.log({ prop: !!prop }, index);
+            }
             if (prop.typeIndex === CARDINALITY) {
                 q.include.propsRead[index] = id;
                 const size = readUint32(result, i);
@@ -397,8 +404,9 @@ export const resultToObject = (q, result, end, offset = 0) => {
         const id = readUint32(result, i);
         i += 4;
         let item;
-        if (q.aggregation == -999 /* AggFn.NONE */) {
+        if (q.aggregation == 255 /* AggFlag.TEMP */) {
             item = {};
+            q.aggregation = 4 /* AggFlag.COUNT */;
         }
         else {
             item = {
@@ -414,6 +422,10 @@ export const resultToObject = (q, result, end, offset = 0) => {
         items.push(item);
     }
     if ('id' in q.target || 'alias' in q.target) {
+        if (q.type === QueryDefType.Root && q.target.type === '_root') {
+            // Todo can be optimized
+            delete items[0].id;
+        }
         return items[0];
     }
     return items;

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

@@ -3,7 +3,7 @@ import { QueryDefType } from './types.js';
 import { includeToBuffer } from './include/toBuffer.js';
 import { filterToBuffer } from './query.js';
 import { searchToBuffer } from './search/index.js';
-import { createAggFnBuffer } from './aggregationFn.js';
+import { createAggFlagBuffer } from './aggregation.js';
 import { ENCODER } from '../../utils.js';
 const byteSize = (arr) => {
     return arr.reduce((a, b) => {
@@ -95,7 +95,7 @@ export function defToBuffer(db, def) {
                 sortSize = sort.byteLength;
             }
             let aggregation;
-            aggregation = createAggFnBuffer(def.aggregation);
+            aggregation = createAggFlagBuffer(def.aggregation);
             if (def.target.ids) {
                 // type 1
                 // 1: 4 + ids * 4 [ids len] [id,id,id]

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

@@ -92,7 +92,7 @@ export type QueryDefShared = {
     };
     references: Map<number, QueryDef>;
     edges?: QueryDef;
-    aggregation: AggFn;
+    aggregation: AggFlag;
 };
 export type QueryDefEdges = {
     type: QueryDefType.Edge;
@@ -120,7 +120,8 @@ export declare const READ_REFERENCES = 253;
 export declare const READ_REFERENCE = 254;
 export declare const CREATE_AGGREGATION = 250;
 export declare const READ_AGGREGATION = 251;
-export declare const enum AggFn {
+export declare const enum AggFlag {
+    NONE = 0,
     AVG = 1,
     CARDINALITY = 2,
     CONCAT = 3,// string aggregation, delimiter should be an argument
@@ -133,5 +134,5 @@ export declare const enum AggFn {
     STDDEV = 10,// population or sample should be optional parameters, default = sample
     SUM = 11,
     VARIANCE = 12,
-    NONE = -999
+    TEMP = 255
 }