@based/db 0.0.15 → 0.0.17

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

@@ -0,0 +1,4 @@
+import { QueryDef } from '../types.js';
+import { Operator } from './filter.js';
+import { FilterOpts, FilterAst } from './types.js';
+export declare const convertFilter: (def: QueryDef, field: string, operator?: Operator | boolean, value?: any, opts?: FilterOpts | undefined) => FilterAst;

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

@@ -0,0 +1,56 @@
+import { toFilterCtx } from './types.js';
+const normalizeNeedle = (s) => {
+    return s
+        .normalize('NFKD')
+        .split('')
+        .filter((ch) => ch.charCodeAt(0) <= 127)
+        .join('');
+};
+export const convertFilter = (def, field, operator, value, opts) => {
+    if (operator === undefined) {
+        operator = '=';
+        value = true;
+    }
+    else if (typeof operator === 'boolean') {
+        value = operator;
+        operator = '=';
+    }
+    if (value === '' || value === undefined) {
+        return;
+    }
+    if (operator === '!..') {
+        return [
+            [field, toFilterCtx(def, '>', opts), value[1]],
+            [field, toFilterCtx(def, '<', opts), value[0]],
+        ];
+    }
+    else if (operator === '..') {
+        return [
+            [field, toFilterCtx(def, '>', opts), value[0]],
+            [field, toFilterCtx(def, '<', opts), value[1]],
+        ];
+    }
+    else {
+        if (operator == 'like') {
+            if (value == null) {
+                throw new Error('Value is required');
+            }
+            if (value?.normalize) {
+                value = normalizeNeedle(value);
+            }
+            else if (Array.isArray(value)) {
+                if (value[0]?.normalize) {
+                    value = value.map(normalizeNeedle);
+                }
+                else if (value[0]?.BYTES_PER_ELEMENT > 1) {
+                    value = value.map((v) => v.buffer);
+                }
+            }
+            else if (value?.BYTES_PER_ELEMENT > 1) {
+                value = value.buffer;
+            }
+        }
+        return [[field, toFilterCtx(def, operator, opts), value]];
+    }
+};
+//# sourceMappingURL=convertFilter.js.map

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

@@ -70,10 +70,11 @@ export const createFixedFilterBuffer = (prop, size, ctx, value, sort) => {
             prop.typeIndex === REFERENCES && ctx.operation === EQUAL
                 ? MODE_AND_FIXED
                 : MODE_OR_FIXED;
-        buf.writeUInt16LE(size, 2);
-        buf.writeUInt16LE(start, 4);
-        buf[6] = ctx.operation;
-        buf[7] = prop.typeIndex;
+        buf[2] = prop.typeIndex;
+        buf.writeUInt16LE(size, 3);
+        buf.writeUInt16LE(start, 5);
+        buf[7] = ctx.operation;
+        // buf[7] = prop.typeIndex
         buf.writeUInt16LE(len, 8);
         if (sort) {
             value = new Uint32Array(value.map((v) => parseFilterValue(prop, v)));
@@ -93,10 +94,10 @@ export const createFixedFilterBuffer = (prop, size, ctx, value, sort) => {
         buf = Buffer.allocUnsafe(8 + size);
         buf[0] = ctx.type;
         buf[1] = MODE_DEFAULT;
-        buf.writeUInt16LE(size, 2);
-        buf.writeUInt16LE(start, 4);
-        buf[6] = ctx.operation;
-        buf[7] = prop.typeIndex;
+        buf[2] = prop.typeIndex;
+        buf.writeUInt16LE(size, 3);
+        buf.writeUInt16LE(start, 5);
+        buf[7] = ctx.operation;
         writeFixed(prop, buf, parseFilterValue(prop, value), size, 8);
     }
     return buf;

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

@@ -5,10 +5,11 @@ export const createReferenceFilter = (prop, ctx, value) => {
     buf = Buffer.allocUnsafe(11 + len * 8);
     buf[0] = ctx.type;
     buf[1] = MODE_REFERENCE;
-    buf.writeUInt16LE(8, 2);
-    buf.writeUInt16LE(len, 4);
-    buf[6] = ctx.operation;
-    buf[7] = prop.typeIndex;
+    buf[2] = prop.typeIndex;
+    buf.writeUInt16LE(8, 3);
+    buf.writeUInt16LE(len, 5);
+    buf[7] = ctx.operation;
+    // buf[7] = prop.typeIndex
     // REF TYPE (only 1 exists now...)
     buf[8] = 0;
     buf.writeUInt16LE(prop.inverseTypeId, 9);

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

@@ -40,7 +40,7 @@ const parseValue = (value, prop, ctx, lang) => {
         // @ts-ignore
         val = Buffer.concat([val, Buffer.from([ctx.opts.score ?? 2])]);
     }
-    // @ts-ignore TODO FDN-576
+    // @ts-ignore
     return val;
 };
 export const createVariableFilterBuffer = (value, prop, ctx, lang) => {
@@ -70,7 +70,6 @@ export const createVariableFilterBuffer = (value, prop, ctx, lang) => {
     else {
         val = parseValue(value, prop, ctx, lang);
     }
-    // -------------------- PUT VARIABLES HERE
     if (ctx.operation === EQUAL ||
         ctx.operation === HAS ||
         ctx.operation === LIKE ||
@@ -98,9 +97,6 @@ export const createVariableFilterBuffer = (value, prop, ctx, lang) => {
             buf = writeVarFilter(mode, val, ctx, prop, prop.start, prop.len);
         }
     }
-    else {
-        console.log('OP NOT SUPPORTED YET =>', ctx);
-    }
     return buf;
 };
 function writeVarFilter(mode, val, ctx, prop, start, len) {
@@ -108,11 +104,11 @@ function writeVarFilter(mode, val, ctx, prop, start, len) {
     const buf = Buffer.allocUnsafe(12 + size);
     buf[0] = ctx.type;
     buf[1] = mode;
-    buf.writeUInt16LE(start, 2);
-    buf.writeUint16LE(len, 4);
-    buf.writeUint32LE(size, 6);
-    buf[10] = ctx.operation;
-    buf[11] = prop.typeIndex;
+    buf[2] = prop.typeIndex;
+    buf.writeUInt16LE(start, 3);
+    buf.writeUint16LE(len, 5);
+    buf.writeUint32LE(size, 7);
+    buf[11] = ctx.operation;
     // need to pas LANG FROM QUERY
     // need to set on 12 if TEXT
     buf.set(Buffer.from(val), 12);

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

@@ -1,10 +1,9 @@
 import { QueryDef, QueryDefFilter } from '../types.js';
 import { SchemaTypeDef } from '../../../server/schema/schema.js';
-import { FilterOpts, Operator } from './types.js';
+import { Operator } from './types.js';
 import { Filter, FilterAst } from './types.js';
 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 convertFilter: (def: QueryDef, field: string, operator?: Operator | boolean, value?: any, opts?: FilterOpts) => FilterAst;

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

@@ -1,6 +1,5 @@
 import { isPropDef, ID_FIELD_DEF, TEXT, REFERENCE, } from '../../../server/schema/schema.js';
 import { primitiveFilter } from './primitiveFilter.js';
-import { toFilterCtx } from './types.js';
 import { IsFilter } from './types.js';
 import { langCodesMap } from '@based/schema';
 import { filterFieldDoesNotExist, filterInvalidLang } from '../validation.js';
@@ -22,7 +21,8 @@ const referencesFilter = (db, filter, schema, conditions, def) => {
                     const edgeDef = edges[p];
                     if (edgeDef) {
                         conditions.edges ??= new Map();
-                        size += 3 + primitiveFilter(edgeDef, filter, conditions, def.lang);
+                        size +=
+                            3 + primitiveFilter(def, edgeDef, filter, conditions, def.lang);
                     }
                 }
             }
@@ -71,16 +71,16 @@ export const filterRaw = (db, filter, schema, conditions, def) => {
                     filterInvalidLang(def, field);
                     return 0;
                 }
-                return primitiveFilter(fieldDef, filter, conditions, code);
+                return primitiveFilter(def, fieldDef, filter, conditions, code);
             }
         }
         if (field === 'id') {
             fieldDef = ID_FIELD_DEF;
-            return primitiveFilter(fieldDef, filter, conditions, def.lang);
+            return primitiveFilter(def, fieldDef, filter, conditions, def.lang);
         }
         return referencesFilter(db, filter, schema, conditions, def);
     }
-    return primitiveFilter(fieldDef, filter, conditions, def.lang);
+    return primitiveFilter(def, fieldDef, filter, conditions, def.lang);
 };
 export const filter = (db, def, filterAst, conditions) => {
     for (const f of filterAst) {
@@ -104,55 +104,4 @@ export const filterOr = (db, def, filterAst, conditions) => {
     conditions.size += conditions.or.size;
     return conditions.or;
 };
-const normalizeNeedle = (s) => {
-    return s
-        .normalize('NFKD')
-        .split('')
-        .filter((ch) => ch.charCodeAt(0) <= 127)
-        .join('');
-};
-export const convertFilter = (def, field, operator, value, opts) => {
-    if (operator === undefined) {
-        operator = '=';
-        value = true;
-    }
-    else if (typeof operator === 'boolean') {
-        value = operator;
-        operator = '=';
-    }
-    if (operator === '!..') {
-        return [
-            [field, toFilterCtx(def, '>', opts), value[1]],
-            [field, toFilterCtx(def, '<', opts), value[0]],
-        ];
-    }
-    else if (operator === '..') {
-        return [
-            [field, toFilterCtx(def, '>', opts), value[0]],
-            [field, toFilterCtx(def, '<', opts), value[1]],
-        ];
-    }
-    else {
-        if (operator == 'like') {
-            if (value == null) {
-                throw new Error('Value is required');
-            }
-            if (value?.normalize) {
-                value = normalizeNeedle(value);
-            }
-            else if (Array.isArray(value)) {
-                if (value[0]?.normalize) {
-                    value = value.map(normalizeNeedle);
-                }
-                else if (value[0]?.BYTES_PER_ELEMENT > 1) {
-                    value = value.map((v) => v.buffer);
-                }
-            }
-            else if (value?.BYTES_PER_ELEMENT > 1) {
-                value = value.buffer;
-            }
-        }
-        return [[field, toFilterCtx(def, operator, opts), value]];
-    }
-};
 //# sourceMappingURL=filter.js.map

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

@@ -1,5 +1,5 @@
 import { PropDef, PropDefEdge } from '../../../server/schema/types.js';
-import { QueryDefFilter } from '../types.js';
+import { QueryDef, QueryDefFilter } from '../types.js';
 import { Filter } from './types.js';
 import { LangCode } from '@based/schema';
-export declare const primitiveFilter: (prop: PropDef | PropDefEdge, filter: Filter, conditions: QueryDefFilter, lang: LangCode) => number;
+export declare const primitiveFilter: (def: QueryDef, prop: PropDef | PropDefEdge, filter: Filter, conditions: QueryDefFilter, lang: LangCode) => number;

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

@@ -3,7 +3,11 @@ import { EQUAL, isNumerical } from './types.js';
 import { createVariableFilterBuffer } from './createVariableFilterBuffer.js';
 import { createFixedFilterBuffer } from './createFixedFilterBuffer.js';
 import { createReferenceFilter } from './createReferenceFilter.js';
-export const primitiveFilter = (prop, filter, conditions, lang) => {
+import { validateFilter } from '../validation.js';
+export const primitiveFilter = (def, prop, filter, conditions, lang) => {
+    if (validateFilter(def, prop, filter)) {
+        return;
+    }
     let [, ctx, value] = filter;
     const fieldIndexChar = prop.prop;
     let buf;

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

@@ -9,20 +9,15 @@ import { META_EDGE, META_OR_BRANCH, META_REFERENCE } from './types.js';
 // [meta = 254] [field] [typeId 2] [size 2]
 // -------------------------------------------
 // conditions normal
-// field, [size 2]
-// [or = 0] [size 2] [start 2], [op] [typeIndex], value[size]
 // -------------------------------------------
 // conditions or fixed
-// field, [size 2]
-// [or = 1] [size 2] [start 2] [op] [typeIndex], [repeat 2], value[size] value[size] value[size]
 // -------------------------------------------
 // conditions or variable
-// field, [size 2]
-// [or = 2] [size 2] [start 2], [op] [typeIndex], [size 2], value[size], [size 2], value[size]
 // -------------------------------------------
 const writeConditions = (result, k, offset, conditions) => {
     let lastWritten = offset;
     result[lastWritten] = k;
+    // result[lasWritten + 1] = typeIndex
     lastWritten++;
     const sizeIndex = lastWritten;
     lastWritten += 2;

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

@@ -4,8 +4,8 @@ export type Filter = [fieldStr: string, ctx: FilterCtx, value: any];
 export type FilterBranchFn = (filterBranch: FilterBranch) => void;
 export type FilterAst = (Filter | FilterAst)[];
 export declare const IsFilter: (f: FilterAst) => f is Filter;
-export declare const validOperators: readonly ["=", "has", "!has", "<", ">", "!=", "like", ">=", "<=", "..", "!.."];
 export type Operator = '=' | 'has' | '!has' | '<' | '>' | '!=' | 'like' | '>=' | '<=' | '..' | '!..' | 'like';
+export declare const VECTOR_FNS: string[];
 export type FilterOpts<O = Operator> = {
     lowerCase?: boolean;
     fn?: 'dotProduct' | 'manhattanDistance' | 'cosineSimilarity' | 'euclideanDistance';
@@ -54,3 +54,4 @@ export declare const VECTOR_COSTINE_SIMILARITY = 2;
 export declare const VECTOR_EUCLIDEAN_DIST = 3;
 export declare const getVectorFn: (optsFn?: FilterOpts["fn"]) => 0 | 1 | 2 | 3;
 export declare const toFilterCtx: (def: QueryDef, op: Operator, opts?: FilterOpts) => FilterCtx;
+export declare const operatorReverseMap: Record<OPERATOR, string>;

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

@@ -5,18 +5,11 @@ export const IsFilter = (f) => {
     }
     return false;
 };
-export const validOperators = [
-    '=',
-    'has',
-    '!has',
-    '<',
-    '>',
-    '!=',
-    'like',
-    '>=',
-    '<=',
-    '..',
-    '!..',
+export const VECTOR_FNS = [
+    'dotProduct',
+    'manhattanDistance',
+    'cosineSimilarity',
+    'euclideanDistance',
 ];
 // -------------------------------------------
 // operations shared
@@ -119,4 +112,22 @@ export const toFilterCtx = (def, op, opts = {}) => {
     }
     filterOperatorDoesNotExist(def, op);
 };
+export const operatorReverseMap = {
+    [EQUAL]: '=',
+    [HAS]: 'has',
+    [ENDS_WITH]: 'endsWith',
+    [STARTS_WITH]: 'startsWith',
+    [GREATER_THAN]: '>',
+    [SMALLER_THAN]: '<',
+    [GREATER_THAN_INCLUSIVE]: '>=',
+    [SMALLER_THAN_INCLUSIVE]: '<=',
+    [RANGE]: '..',
+    [RANGE_EXCLUDE]: '!..',
+    [EQUAL_LOWER_CASE]: '= (lowerCase)',
+    [HAS_TO_LOWER_CASE]: 'has (lowerCase)',
+    [STARTS_WITH_LOWER_CASE]: 'startsWith (lowerCase)',
+    [ENDS_WITH_LOWER_CASE]: 'endsWith (lowerCase)',
+    [LIKE]: 'like',
+    [EQUAL_CRC32]: '= (crc32)',
+};
 //# sourceMappingURL=types.js.map

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

@@ -1,4 +1,4 @@
-import { REFERENCE, REFERENCES, } from '../../../server/schema/types.js';
+import { REFERENCE, REFERENCES, TEXT, } from '../../../server/schema/types.js';
 export const getAll = (props) => {
     const fields = [];
     for (const key in props) {
@@ -50,13 +50,21 @@ export const includeProp = (def, prop) => {
     if (!prop || prop.typeIndex === REFERENCE || prop.typeIndex === REFERENCES) {
         return false;
     }
-    if (prop.separate) {
-        def.include.props.set(prop.prop, prop);
+    if (prop.typeIndex === TEXT) {
+        if (!def.include.langTextFields.has(prop.prop)) {
+            def.include.langTextFields.set(prop.prop, { def: prop, codes: new Set() });
+        }
+        def.include.langTextFields.get(prop.prop).codes.add(def.lang ?? 0);
     }
     else {
-        def.include.main.len += prop.len;
-        def.include.main.include[prop.start] = [0, prop];
-        return true;
+        if (prop.separate) {
+            def.include.props.set(prop.prop, prop);
+        }
+        else {
+            def.include.main.len += prop.len;
+            def.include.main.include[prop.start] = [0, prop];
+            return true;
+        }
     }
     return false;
 };

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

@@ -19,7 +19,7 @@ const createRefQueryDef = (db, def, t) => {
         : QueryDefType.References, {
         type: t.inverseTypeName,
         propDef: t,
-    });
+    }, def.skipValidation);
     defRef.lang = def.lang;
     def.references.set(t.prop, defRef);
     return defRef;
@@ -33,7 +33,7 @@ export const createOrGetRefQueryDef = (db, def, t) => {
 export const createOrGetEdgeRefQueryDef = (db, def, t) => {
     def.edges ??= createQueryDef(db, QueryDefType.Edge, {
         ref: t,
-    });
+    }, def.skipValidation);
     def.edges.props ??= {};
     def.edges.props[t.name] = t;
     const refDef = createOrGetRefQueryDef(db, def.edges, t);

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

@@ -16,7 +16,7 @@ export const walkDefs = (db, def, f) => {
                 if (!def.edges) {
                     def.edges = createQueryDef(db, QueryDefType.Edge, {
                         ref: def.target.propDef,
-                    });
+                    }, def.skipValidation);
                     def.edges.lang = def.lang;
                 }
                 const edgeProp = def.edges.props[p];
@@ -82,12 +82,6 @@ export const walkDefs = (db, def, f) => {
         includeAllProps(refDef);
         return;
     }
-    else if (prop.typeIndex === TEXT) {
-        if (!def.include.langTextFields.has(prop.prop)) {
-            def.include.langTextFields.set(prop.prop, { def: prop, codes: new Set() });
-        }
-        def.include.langTextFields.get(prop.prop).codes.add(def.lang ?? 0);
-    }
     else {
         includeProp(def, prop);
     }

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

@@ -1,3 +1,3 @@
 import { DbClient } from '../index.js';
 import { QueryDef, QueryDefType, QueryTarget } from './types.js';
-export declare const createQueryDef: (db: DbClient, type: QueryDefType, target: QueryTarget) => QueryDef;
+export declare const createQueryDef: (db: DbClient, type: QueryDefType, target: QueryTarget, skipValidation: boolean) => QueryDef;

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

@@ -2,9 +2,10 @@ import { langCodesMap } from '@based/schema';
 import { DEF_RANGE_PROP_LIMIT, DEF_RANGE_REF_LIMIT } from './thresholds.js';
 import { QueryDefType, } from './types.js';
 import { validateAlias, validateId, validateIds, validateType, } from './validation.js';
-const createEmptySharedDef = () => {
+const createEmptySharedDef = (skipValidation) => {
     const q = {
         errors: [],
+        skipValidation,
         filter: { conditions: new Map(), size: 0 },
         range: { offset: 0, limit: 0 },
         lang: langCodesMap.get('none'),
@@ -23,8 +24,8 @@ const createEmptySharedDef = () => {
     };
     return q;
 };
-export const createQueryDef = (db, type, target) => {
-    const queryDef = createEmptySharedDef();
+export const createQueryDef = (db, type, target, skipValidation) => {
+    const queryDef = createEmptySharedDef(skipValidation);
     if (type === QueryDefType.Edge) {
         const t = target;
         const q = queryDef;

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

@@ -1,7 +1,8 @@
-import { ALIAS, ALIASES, BINARY, BOOLEAN, ENUM, INT16, INT32, INT8, NUMBER, STRING, TEXT, TIMESTAMP, UINT16, UINT32, UINT8, VECTOR, JSON, } from '../../../server/schema/types.js';
+import { ALIAS, ALIASES, BINARY, BOOLEAN, ENUM, INT16, INT32, INT8, NUMBER, STRING, TEXT, TIMESTAMP, UINT16, UINT32, UINT8, VECTOR, JSON, CARDINALITY, } from '../../../server/schema/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';
 const addField = (p, value, item, defaultOnly = false, lang = 0) => {
     let i = p.__isEdge === true ? 1 : 0;
     // TODO OPTMIZE
@@ -58,19 +59,15 @@ const getEmptyField = (p, item) => {
     return select;
 };
 const readMainValue = (prop, result, index, item) => {
-    // 1: timestamp, 4: number
     if (prop.typeIndex === TIMESTAMP || prop.typeIndex === NUMBER) {
         addField(prop, readDoubleLE(result, index), item);
     }
-    // 5: uint32
     else if (prop.typeIndex === UINT32) {
         addField(prop, readUint32(result, index), item);
     }
-    // 9: boolean
     else if (prop.typeIndex === BOOLEAN) {
         addField(prop, Boolean(result[index]), item);
     }
-    // 10: Enum
     else if (prop.typeIndex === ENUM) {
         if (result[index] === 0) {
             addField(prop, undefined, item);
@@ -79,9 +76,7 @@ const readMainValue = (prop, result, index, item) => {
             addField(prop, prop.enum[result[index] - 1], item);
         }
     }
-    // 11: string
     else if (prop.typeIndex === STRING) {
-        // Also delete this default then (same as other string)
         const len = result[index];
         if (len !== 0) {
             const str = readUtf8(result, index + 1, len);
@@ -91,32 +86,25 @@ const readMainValue = (prop, result, index, item) => {
             addField(prop, '', item);
         }
     }
-    // ?: json
     else if (prop.typeIndex === JSON) {
-        addField(prop, global.JSON.parse(Buffer.from(result.subarray(index + 1, index + 1 + result[index])).toString()), item);
+        addField(prop, global.JSON.parse(readUtf8(result, index + 1, index + 1 + result[index])), item);
     }
-    // 25: binary
     else if (prop.typeIndex === BINARY) {
         addField(prop, result.subarray(index + 1, index + 1 + result[index]), item);
     }
-    // 18: int8
     else if (prop.typeIndex === INT8) {
         const signedVal = (result[index] << 24) >> 24;
         addField(prop, signedVal, item);
     }
-    // 19: uint8
     else if (prop.typeIndex === UINT8) {
         addField(prop, result[index], item);
     }
-    // 20: int16
     else if (prop.typeIndex === INT16) {
         addField(prop, readInt16(result, index), item);
     }
-    // 21: uint16
     else if (prop.typeIndex === UINT16) {
         addField(prop, readUint16(result, index), item);
     }
-    // 22: int32
     else if (prop.typeIndex === INT32) {
         addField(prop, readInt32(result, index), item);
     }
@@ -143,7 +131,10 @@ 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 === TEXT && q.lang == 0) {
+            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)) {
@@ -173,16 +164,13 @@ export const readAllFields = (q, result, offset, end, item, id) => {
     while (i < end) {
         const index = result[i];
         i++;
-        // index:255 id
-        if (index === 255) {
+        if (index === READ_ID) {
             handleUndefinedProps(id, q, item);
             return i - offset;
         }
-        // index:252 edge
-        if (index === 252) {
+        if (index === READ_EDGE) {
             let prop = result[i];
-            // index:254 ref
-            if (prop === 254) {
+            if (prop === READ_REFERENCE) {
                 i++;
                 const field = result[i];
                 i++;
@@ -206,9 +194,8 @@ export const readAllFields = (q, result, offset, end, item, id) => {
                     addField(ref.target.propDef, refItem, item);
                     i += size - 5;
                 }
-                // index:253 refs
             }
-            else if (prop === 253) {
+            else if (prop === READ_REFERENCES) {
                 i++;
                 const field = result[i];
                 i++;
@@ -227,7 +214,7 @@ export const readAllFields = (q, result, offset, end, item, id) => {
                 if (t === JSON) {
                     i++;
                     const size = readUint32(result, i);
-                    addField(edgeDef, global.JSON.parse(Buffer.from(result.subarray(i + 6, size + i)).toString()), item);
+                    addField(edgeDef, global.JSON.parse(readUtf8(result, i + 6, size + i)), item);
                     i += size + 4;
                 }
                 else if (t === BINARY) {
@@ -253,9 +240,8 @@ export const readAllFields = (q, result, offset, end, item, id) => {
                     i += edgeDef.len;
                 }
             }
-            // index:254 ref
         }
-        else if (index === 254) {
+        else if (index === READ_REFERENCE) {
             const field = result[i];
             i++;
             const size = readUint32(result, i);
@@ -278,9 +264,8 @@ export const readAllFields = (q, result, offset, end, item, id) => {
                 addField(ref.target.propDef, refItem, item);
                 i += size - 5;
             }
-            // index:253 refs
         }
-        else if (index === 253) {
+        else if (index === READ_REFERENCES) {
             const field = result[i];
             i++;
             const ref = q.references.get(field);
@@ -296,7 +281,13 @@ export const readAllFields = (q, result, offset, end, item, id) => {
         }
         else {
             const prop = q.schema.reverseProps[index];
-            if (prop.typeIndex === JSON) {
+            if (prop.typeIndex === CARDINALITY) {
+                q.include.propsRead[index] = id;
+                const size = readUint32(result, i);
+                addField(prop, readUint32(result, i + 4), item);
+                i += size + 4;
+            }
+            else if (prop.typeIndex === JSON) {
                 q.include.propsRead[index] = id;
                 const size = readUint32(result, i);
                 addField(prop, global.JSON.parse(Buffer.from(result.subarray(i + 6, i + size)).toString()), item);
@@ -329,7 +320,6 @@ export const readAllFields = (q, result, offset, end, item, id) => {
                         addField(prop, read(result, i + 4, size), item);
                     }
                     else {
-                        // q.include.propsRead[index] = id
                         addField(prop, read(result, i + 4, size), item, false, result[i + 4]);
                     }
                 }
@@ -360,7 +350,6 @@ export const readAllFields = (q, result, offset, end, item, id) => {
             }
         }
     }
-    // to add defaults - may not optimal for performance
     handleUndefinedProps(id, q, item);
     return i - offset;
 };

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

@@ -0,0 +1,4 @@
+export declare const READ_ID = 255;
+export declare const READ_EDGE = 252;
+export declare const READ_REFERENCES = 253;
+export declare const READ_REFERENCE = 254;

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

@@ -0,0 +1,5 @@
+export const READ_ID = 255;
+export const READ_EDGE = 252;
+export const READ_REFERENCES = 253;
+export const READ_REFERENCE = 254;
+//# sourceMappingURL=types.js.map