@based/db 0.0.1 → 0.0.3

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

@@ -8,6 +8,7 @@ import native from '../../native.js';
 import { REFERENCE, REFERENCES } from '../../server/schema/types.js';
 import { subscribe } from './subscription/index.js';
 import { registerQuery } from './registerQuery.js';
+import { langCodesMap } from '@based/schema';
 export class QueryBranch {
     db;
     def;
@@ -136,7 +137,6 @@ export class BasedDbReferenceQuery extends QueryBranch {
 }
 const resToJSON = (res) => res.toJSON();
 const resToObject = (res) => res.toObject();
-const resInspect = (res) => new GetPromise((resolve) => resolve(res.inspect()));
 class GetPromise extends Promise {
     toObject() {
         return this.then(resToObject);
@@ -144,8 +144,8 @@ class GetPromise extends Promise {
     toJSON() {
         return this.then(resToJSON);
     }
-    inspect() {
-        return this.then(resInspect);
+    inspect(depth) {
+        return this.then((res) => new GetPromise((resolve) => resolve(res.inspect(depth))));
     }
 }
 export class BasedDbQuery extends QueryBranch {
@@ -194,8 +194,7 @@ export class BasedDbQuery extends QueryBranch {
             reject(res);
         }
         else {
-            const result = Buffer.from(res);
-            resolve(new BasedQueryResponse(this.id, this.def, result, performance.now() - d));
+            resolve(new BasedQueryResponse(this.id, this.def, res, performance.now() - d));
         }
     };
     // if !id not initialized yet
@@ -207,6 +206,10 @@ export class BasedDbQuery extends QueryBranch {
     register() {
         return registerQuery(this);
     }
+    i18n(locale) {
+        this.def.lang = langCodesMap.get(locale) ?? 0;
+        return this;
+    }
     subscribe(onData, onError) {
         return subscribe(this, onData, onError ??
             ((err) => {
@@ -220,8 +223,7 @@ export class BasedDbQuery extends QueryBranch {
         const buf = registerQuery(this);
         const d = performance.now();
         const res = native.getQueryBuf(buf, dbCtxExternal);
-        const result = Buffer.from(res);
-        return new BasedQueryResponse(this.id, this.def, result, performance.now() - d);
+        return new BasedQueryResponse(this.id, this.def, new Uint8Array(res), performance.now() - d);
     }
     toBuffer() {
         if (!this.def.include.stringFields.size && !this.def.references.size) {

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

@@ -4,12 +4,12 @@ import { Item } from './query.js';
 import { size, time, inspectData } from './display.js';
 export { time, size, inspectData };
 export declare class BasedQueryResponse {
-    result: Buffer;
+    result: Uint8Array;
     def: QueryDef;
     execTime: number;
     end: number;
     id: number;
-    constructor(id: number, def: QueryDef, result: Buffer, execTime: number, end?: number);
+    constructor(id: number, def: QueryDef, result: Uint8Array, execTime: number, end?: number);
     get size(): number;
     [inspect.custom](depth: number): string;
     debug(): this;

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

@@ -2,6 +2,7 @@ import { inspect } from 'node:util';
 import picocolors from 'picocolors';
 import { debug, resultToObject, readAllFields } from './query.js';
 import { size, time, inspectData } from './display.js';
+import { readUint32 } from '../bitWise.js';
 export { time, size, inspectData };
 export class BasedQueryResponse {
     result;
@@ -9,7 +10,7 @@ export class BasedQueryResponse {
     execTime;
     end;
     id;
-    constructor(id, def, result, execTime, end = result.byteLength) {
+    constructor(id, def, result, execTime, end = result.length) {
         this.id = id;
         this.def = def;
         this.result = result;
@@ -17,7 +18,7 @@ export class BasedQueryResponse {
         this.end = end;
     }
     get size() {
-        return this.result.byteLength;
+        return this.result.length;
     }
     [inspect.custom](depth) {
         const hasId = 'id' in this.def.target || 'alias' in this.def.target;
@@ -42,6 +43,8 @@ export class BasedQueryResponse {
         return this;
     }
     node(index = 0) {
+        // get id as well
+        // and potentialy a proxy [i] as well
         let i = 0;
         if ('id' in this.def.target || 'alias' in this.def.target) {
             return this.toObject();
@@ -61,7 +64,7 @@ export class BasedQueryResponse {
         let i = 5;
         const result = this.result;
         while (i < result.byteLength - 4) {
-            let id = result.readUInt32LE(i);
+            let id = readUint32(result, i);
             i += 4;
             const item = {
                 id,
@@ -94,10 +97,12 @@ export class BasedQueryResponse {
         return arr;
     }
     get checksum() {
-        return this.result.readUint32LE(this.result.byteLength - 4);
+        const result = this.result;
+        const offset = result.byteLength - 4;
+        return readUint32(result, offset);
     }
     get length() {
-        return this.result.readUint32LE(0);
+        return readUint32(this.result, 0);
     }
     toObject() {
         return resultToObject(this.def, this.result, this.end - 4, 0);

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

@@ -1,6 +1,7 @@
 import picocolors from 'picocolors';
 import { isPropDef, REVERSE_TYPE_INDEX_MAP } from '../../server/schema/types.js';
 import { QueryDefType } from './types.js';
+import { concatUint8Arr } from '../bitWise.js';
 export const debugQueryDef = (q, returnIt) => {
     const loggableObject = { type: 'bla', schema: null };
     const f = (a) => {
@@ -69,10 +70,10 @@ export const debug = (x, start = 0, end = 0, label) => {
         console.log(x);
         return;
     }
-    if (Array.isArray(x) && x[0] instanceof Buffer) {
-        debug(Buffer.concat(x), start, end, label);
+    if (Array.isArray(x) && x[0] instanceof Uint8Array) {
+        debug(concatUint8Arr(x), start, end, label);
     }
-    else if (x instanceof Buffer) {
+    else if (x instanceof Uint8Array) {
         console.log(label || '');
         if (!end) {
             end = x.byteLength;

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

@@ -1,5 +1,5 @@
 import picocolors from 'picocolors';
-import { BINARY, NUMBER, REFERENCE, REFERENCES, STRING, TIMESTAMP, } from '../../server/schema/types.js';
+import { BINARY, NUMBER, REFERENCE, REFERENCES, STRING, TEXT, TIMESTAMP, } from '../../server/schema/types.js';
 const decimals = (v) => ~~(v * 100) / 100;
 const sizeCalc = (size) => {
     if (size > 1e6) {
@@ -45,11 +45,11 @@ const prettyPrintVal = (v, type) => {
             (isLarger ? picocolors.dim('... ') : '') +
             picocolors.italic(picocolors.dim(`${~~((Buffer.byteLength(v, 'utf8') / 1e3) * 100) / 100}kb`)));
     }
-    if (type === STRING) {
-        if (v.length > 75) {
+    if (type === STRING || type === TEXT) {
+        if (v.length > 50) {
             const chars = picocolors.italic(picocolors.dim(`${~~((Buffer.byteLength(v, 'utf8') / 1e3) * 100) / 100}kb`));
             v =
-                v.slice(0, 75).replace(/\n/g, '\\n ') +
+                v.slice(0, 50).replace(/\n/g, '\\n ') +
                     picocolors.dim('...') +
                     '" ' +
                     chars;
@@ -125,6 +125,21 @@ const inspectObject = (object, q, path, level, isLast, isFirst, isObject, depth)
                 }
                 str += prettyPrintVal(v, def.typeIndex);
             }
+            else if (def.typeIndex === TEXT) {
+                if (typeof v === 'object') {
+                    str += '{\n';
+                    for (const lang in v) {
+                        str += `${prefixBody}  ${lang}: ${prettyPrintVal(v[lang], def.typeIndex)},\n`;
+                    }
+                    str += `${prefixBody}}`;
+                }
+                else {
+                    if (v === undefined) {
+                        return '';
+                    }
+                    str += prettyPrintVal(v, def.typeIndex);
+                }
+            }
             else if (def.typeIndex === STRING) {
                 if (v === undefined) {
                     return '';

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

@@ -1,2 +1,3 @@
 import { PropDef, PropDefEdge } from '../../../server/schema/types.js';
-export declare const createVariableFilterBuffer: (value: any, prop: PropDef | PropDefEdge, op: number) => Buffer;
+import { LangCode } from '@based/schema';
+export declare const createVariableFilterBuffer: (value: any, prop: PropDef | PropDefEdge, op: number, lang: LangCode) => Buffer;

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

@@ -1,7 +1,7 @@
-import { ALIAS } from '../../../server/schema/types.js';
+import { ALIAS, TEXT, } from '../../../server/schema/types.js';
 import { negateType, stripNegation } from './operators.js';
 import { createFixedFilterBuffer } from './createFixedFilterBuffer.js';
-const parseValue = (value, prop, op) => {
+const parseValue = (value, prop, op, lang) => {
     let val = value;
     if (op === 19 && typeof val === 'string') {
         val = val.toLowerCase();
@@ -10,14 +10,20 @@ const parseValue = (value, prop, op) => {
         typeof value === 'string' ||
         !prop.separate ||
         op !== 1) {
-        val = Buffer.from(val);
+        if (prop.typeIndex === TEXT) {
+            // can be optmized replace when using uint8array
+            val = Buffer.concat([Buffer.from(val), Buffer.from([lang])]);
+        }
+        else {
+            val = Buffer.from(val);
+        }
     }
     if (!(val instanceof Buffer)) {
         throw new Error('Incorrect value for filter ' + prop.path);
     }
     return val;
 };
-export const createVariableFilterBuffer = (value, prop, op) => {
+export const createVariableFilterBuffer = (value, prop, op, lang) => {
     let isOr = 4;
     let val;
     let buf;
@@ -26,7 +32,7 @@ export const createVariableFilterBuffer = (value, prop, op) => {
             isOr = 2;
             const x = [];
             for (const v of value) {
-                const a = parseValue(v, prop, op);
+                const a = parseValue(v, prop, op, lang);
                 const size = Buffer.allocUnsafe(2);
                 size.writeUint16LE(a.byteLength);
                 x.push(size, a);
@@ -36,18 +42,19 @@ export const createVariableFilterBuffer = (value, prop, op) => {
         else {
             const x = [];
             for (const v of value) {
-                x.push(parseValue(v, prop, op));
+                x.push(parseValue(v, prop, op, lang));
             }
             val = x;
         }
     }
     else {
-        val = parseValue(value, prop, op);
+        val = parseValue(value, prop, op, lang);
     }
     // --------------------
     if (op === 3 || op === 1 || op === 2 || op === 16 || op === 18 || op === 19) {
         if (prop.separate) {
             if (op === 1 && prop.typeIndex !== ALIAS) {
+                // console.log('STRICT EQUAL FOR TEXT ALSO!')
                 // 17 crc32 check
                 buf = createFixedFilterBuffer(prop, 8, 17, val, false);
             }
@@ -75,6 +82,8 @@ function writeVarFilter(isOr, val, buf, op, prop, start, len) {
     buf.writeUint32LE(size, 6);
     buf[10] = stripNegation(op);
     buf[11] = prop.typeIndex;
+    // need to pas LANG FROM QUERY
+    // need to set on 12 if TEXT
     buf.set(val, 12);
     return buf;
 }

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

@@ -1,7 +1,8 @@
-import { isPropDef, ID_FIELD_DEF, } from '../../../server/schema/schema.js';
+import { isPropDef, ID_FIELD_DEF, TEXT, } from '../../../server/schema/schema.js';
 import { primitiveFilter } from './primitiveFilter.js';
 import { IsFilter } from './types.js';
 import { hasField, checkOperator, checkValue } from '../validation.js';
+import { langCodesMap } from '@based/schema';
 const referencesFilter = (db, filter, schema, conditions, def) => {
     const [fieldStr, operator, value] = filter;
     var size = 0;
@@ -23,7 +24,7 @@ const referencesFilter = (db, filter, schema, conditions, def) => {
                     const edgeDef = edges[p];
                     if (edgeDef) {
                         conditions.edges ??= new Map();
-                        size += 3 + primitiveFilter(edgeDef, filter, conditions);
+                        size += 3 + primitiveFilter(edgeDef, filter, conditions, def.lang);
                     }
                 }
             }
@@ -58,13 +59,25 @@ export const filterRaw = (db, filter, schema, conditions, def) => {
     checkValue(value, operator); // Validates the value based on the operator
     let fieldDef = schema.props[field];
     if (!fieldDef) {
+        const s = field.split('.');
+        if (s.length > 1) {
+            const f = s.slice(0, -1).join();
+            fieldDef = schema.props[f];
+            if (fieldDef && fieldDef.typeIndex === TEXT) {
+                const code = langCodesMap.get(s[s.length - 1]);
+                if (!code) {
+                    throw new Error(`Invalid value for filter on ${field}: expected a valid locale`);
+                }
+                return primitiveFilter(fieldDef, filter, conditions, code);
+            }
+        }
         if (field === 'id') {
             fieldDef = ID_FIELD_DEF;
-            return primitiveFilter(fieldDef, filter, conditions);
+            return primitiveFilter(fieldDef, filter, conditions, def.lang);
         }
         return referencesFilter(db, filter, schema, conditions, def);
     }
-    return primitiveFilter(fieldDef, filter, conditions);
+    return primitiveFilter(fieldDef, filter, conditions, def.lang);
 };
 export const filter = (db, def, filterAst, conditions) => {
     for (const f of filterAst) {

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

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

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

@@ -4,7 +4,7 @@ import { createVariableFilterBuffer } from './createVariableFilterBuffer.js';
 import { createFixedFilterBuffer } from './createFixedFilterBuffer.js';
 import { createReferenceFilter } from './createReferenceFilter.js';
 import { checkOperator, checkValue } from '../validation.js';
-export const primitiveFilter = (prop, filter, conditions) => {
+export const primitiveFilter = (prop, filter, conditions, lang) => {
     let [, operator, value] = filter;
     checkOperator(operator);
     checkValue(value, operator);
@@ -31,7 +31,7 @@ export const primitiveFilter = (prop, filter, conditions) => {
         buf = createFixedFilterBuffer(prop, propSize, op, value, false);
     }
     else {
-        buf = createVariableFilterBuffer(value, prop, op);
+        buf = createVariableFilterBuffer(value, prop, op, lang);
     }
     // ADD OR if array for value
     let arr = bufferMap.get(fieldIndexChar);

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

@@ -20,6 +20,7 @@ const createRefQueryDef = (db, def, t) => {
         type: t.inverseTypeName,
         propDef: t,
     });
+    defRef.lang = def.lang;
     def.references.set(t.prop, defRef);
     return defRef;
 };

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

@@ -15,6 +15,7 @@ export const walkDefs = (db, def, f) => {
                     def.edges = createQueryDef(db, QueryDefType.Edge, {
                         ref: def.target.propDef,
                     });
+                    def.edges.lang = def.lang;
                 }
                 const edgeProp = def.edges.props[p];
                 if (edgeProp.typeIndex === REFERENCE ||

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

@@ -1,9 +1,11 @@
+import { langCodesMap } from '@based/schema';
 import { MAX_RANGE_PROP_LIMIT, MAX_RANGE_REF_LIMIT } from './thresholds.js';
 import { QueryDefType, } from './types.js';
 const createEmptySharedDef = () => {
     const q = {
         filter: { conditions: new Map(), size: 0 },
         range: { offset: 0, limit: 0 },
+        lang: langCodesMap.get('none'),
         include: {
             stringFields: new Set(),
             props: new Set(),

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

@@ -4,5 +4,5 @@ export type Item = {
 } & {
     [key: string]: any;
 };
-export declare const readAllFields: (q: QueryDef, result: Buffer, offset: number, end: number, item: Item, id: number) => number;
-export declare const resultToObject: (q: QueryDef, result: Buffer, end: number, offset?: number) => any;
+export declare const readAllFields: (q: QueryDef, result: Uint8Array, offset: number, end: number, item: Item, 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,10 +1,14 @@
-import { ALIAS, ALIASES, BINARY, BOOLEAN, ENUM, INT16, INT32, INT8, NUMBER, STRING, TEXT, TIMESTAMP, UINT16, UINT32, UINT8, } from '../../../server/schema/types.js';
-import { read } from '../../string.js';
-const addField = (p, value, item, defaultOnly = false) => {
+import { ALIAS, ALIASES, BINARY, BOOLEAN, ENUM, INT16, INT32, INT8, NUMBER, STRING, TEXT, TIMESTAMP, UINT16, UINT32, UINT8, VECTOR, } from '../../../server/schema/types.js';
+import { read, readUtf8 } from '../../string.js';
+import { readDoubleLE, readFloatLE, readInt16, readInt32, readUint16, readUint32, } from '../../bitWise.js';
+import { inverseLangMap, langCodesMap } from '@based/schema';
+const addField = (p, value, item, defaultOnly = false, lang = 0) => {
     let i = p.__isEdge === true ? 1 : 0;
-    const len = p.path.length;
+    // TODO OPTMIZE
+    const path = lang ? [...p.path, inverseLangMap.get(lang)] : p.path;
+    const len = path.length;
     if (len - i === 1) {
-        const field = p.path[i];
+        const field = path[i];
         if (!defaultOnly || !(field in item)) {
             item[field] = value;
         }
@@ -12,7 +16,7 @@ const addField = (p, value, item, defaultOnly = false) => {
     else {
         let select = item;
         for (; i < len; i++) {
-            const field = p.path[i];
+            const field = path[i];
             if (i === len - 1) {
                 if (!defaultOnly || !(field in select)) {
                     select[field] = value;
@@ -27,11 +31,11 @@ const addField = (p, value, item, defaultOnly = false) => {
 const readMainValue = (prop, result, index, item) => {
     // 1: timestamp, 4: number
     if (prop.typeIndex === TIMESTAMP || prop.typeIndex === NUMBER) {
-        addField(prop, result.readDoubleLE(index), item);
+        addField(prop, readDoubleLE(result, index), item);
     }
     // 5: uint32
     else if (prop.typeIndex === UINT32) {
-        addField(prop, result.readUInt32LE(index), item);
+        addField(prop, readUint32(result, index), item);
     }
     // 9: boolean
     else if (prop.typeIndex === BOOLEAN) {
@@ -51,40 +55,37 @@ const readMainValue = (prop, result, index, item) => {
         // Also remove this default then (same as other string)
         const len = result[index];
         if (len !== 0) {
-            const str = result.toString('utf-8', index + 1, index + len + 1);
+            const str = readUtf8(result, index + 1, len);
             addField(prop, str, item);
         }
         else {
             addField(prop, '', item);
         }
     }
-    // 11: string
+    // 25: binary
     else if (prop.typeIndex === BINARY) {
-        addField(prop, new Uint8Array(result.buffer, index + 1, result[index]), item);
+        addField(prop, result.subarray(index + 1, index + 1 + result[index]), item);
     }
     // 18: int8
     else if (prop.typeIndex === INT8) {
-        addField(prop, result.readInt8(index), item);
+        const signedVal = (result[index] << 24) >> 24;
+        addField(prop, signedVal, item);
     }
     // 19: uint8
     else if (prop.typeIndex === UINT8) {
-        addField(prop, result.readUint8(index), item);
+        addField(prop, result[index], item);
     }
     // 20: int16
     else if (prop.typeIndex === INT16) {
-        addField(prop, result.readInt16LE(index), item);
+        addField(prop, readInt16(result, index), item);
     }
     // 21: uint16
     else if (prop.typeIndex === UINT16) {
-        addField(prop, result.readUint16LE(index), item);
+        addField(prop, readUint16(result, index), item);
     }
     // 22: int32
     else if (prop.typeIndex === INT32) {
-        addField(prop, result.readInt32LE(index), item);
-    }
-    // 5: uint32
-    else if (prop.typeIndex === UINT32) {
-        addField(prop, result.readUint32LE(index), item);
+        addField(prop, readInt32(result, index), item);
     }
 };
 const readMain = (q, result, offset, item) => {
@@ -127,7 +128,7 @@ export const readAllFields = (q, result, offset, end, item, id) => {
                 i++;
                 const field = result[i];
                 i++;
-                const size = result.readUint32LE(i);
+                const size = readUint32(result, i);
                 i += 4;
                 const ref = q.edges.references.get(field);
                 if (size === 0) {
@@ -137,7 +138,7 @@ export const readAllFields = (q, result, offset, end, item, id) => {
                 }
                 else {
                     i++;
-                    let id = result.readUInt32LE(i);
+                    const id = readUint32(result, i);
                     i += 4;
                     const refItem = {
                         id,
@@ -153,7 +154,7 @@ export const readAllFields = (q, result, offset, end, item, id) => {
                 const field = result[i];
                 i++;
                 const ref = q.edges.references.get(field);
-                const size = result.readUint32LE(i);
+                const size = readUint32(result, i);
                 i += 4;
                 const refs = resultToObject(ref, result, size + i + 4, i);
                 // @ts-ignore
@@ -166,13 +167,13 @@ export const readAllFields = (q, result, offset, end, item, id) => {
                 const t = edgeDef.typeIndex;
                 if (t === BINARY) {
                     i++;
-                    const size = result.readUint32LE(i);
-                    addField(edgeDef, new Uint8Array(result.buffer, i + 6, size - 6), item);
+                    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) {
                     i++;
-                    const size = result.readUint32LE(i);
+                    const size = readUint32(result, i);
                     if (size === 0) {
                         addField(edgeDef, '', item);
                     }
@@ -191,7 +192,7 @@ export const readAllFields = (q, result, offset, end, item, id) => {
         else if (index === 254) {
             const field = result[i];
             i++;
-            const size = result.readUint32LE(i);
+            const size = readUint32(result, i);
             i += 4;
             const ref = q.references.get(field);
             if (size === 0) {
@@ -201,7 +202,7 @@ export const readAllFields = (q, result, offset, end, item, id) => {
             }
             else {
                 i++;
-                let id = result.readUInt32LE(i);
+                let id = readUint32(result, i);
                 i += 4;
                 const refItem = {
                     id,
@@ -216,7 +217,7 @@ export const readAllFields = (q, result, offset, end, item, id) => {
             const field = result[i];
             i++;
             const ref = q.references.get(field);
-            const size = result.readUint32LE(i);
+            const size = readUint32(result, i);
             i += 4;
             const refs = resultToObject(ref, result, size + i + 4, i);
             // @ts-ignore
@@ -230,13 +231,13 @@ export const readAllFields = (q, result, offset, end, item, id) => {
             const prop = q.schema.reverseProps[index];
             if (prop.typeIndex === BINARY) {
                 q.include.propsRead[index] = id;
-                const size = result.readUint32LE(i);
-                addField(prop, new Uint8Array(result.buffer, i + 4 + 2, size - 6), item);
+                const size = readUint32(result, i);
+                addField(prop, result.subarray(i + 6, i + size), item);
                 i += size + 4;
             }
             else if (prop.typeIndex === STRING) {
                 q.include.propsRead[index] = id;
-                const size = result.readUint32LE(i);
+                const size = readUint32(result, i);
                 if (size === 0) {
                     addField(prop, '', item);
                 }
@@ -247,27 +248,52 @@ export const readAllFields = (q, result, offset, end, item, id) => {
             }
             else if (prop.typeIndex == TEXT) {
                 q.include.propsRead[index] = id;
-                const size = result.readUint32LE(i);
+                const size = readUint32(result, i);
+                // if queryDef.LANG do different
+                if (size === 0) {
+                    // LATER
+                    // addField(prop, '', item)
+                }
+                else {
+                    if (q.lang != langCodesMap.get('none')) {
+                        addField(prop, read(result, i + 4, size), item);
+                    }
+                    else {
+                        addField(prop, read(result, i + 4, size), item, false, result[i + 4]);
+                    }
+                }
+                const lan = 
                 // TODO Read text
                 //if (size === 0) {
                 //  addField(prop, '', item)
                 //} else {
                 //  addField(prop, read(result, i + 4, size), item)
                 //}
-                i += size + 4;
+                (i += size + 4);
             }
             else if (prop.typeIndex === ALIAS) {
                 q.include.propsRead[index] = id;
-                const size = result.readUint32LE(i);
+                const size = readUint32(result, i);
                 i += 4;
                 if (size === 0) {
                     addField(prop, '', item);
                 }
                 else {
-                    const string = result.toString('utf8', i, (i += size));
+                    const string = readUtf8(result, i, size);
+                    i += size;
                     addField(prop, string, item);
                 }
             }
+            else if (prop.typeIndex == VECTOR) {
+                q.include.propsRead[index] = id;
+                const size = readUint32(result, i);
+                const arr = new Float32Array(size / 4);
+                for (let j = 0; j < size; j += 4) {
+                    arr[j / 4] = readFloatLE(result, i + 4 + j);
+                }
+                addField(prop, arr, item);
+                i += size + 4;
+            }
         }
     }
     // to add defaults - may not optimal for performance
@@ -275,14 +301,14 @@ export const readAllFields = (q, result, offset, end, item, id) => {
     return i - offset;
 };
 export const resultToObject = (q, result, end, offset = 0) => {
-    const len = result.readUint32LE(offset);
+    const len = readUint32(result, offset);
     if (len === 0) {
         return [];
     }
     let items = [];
     let i = 5 + offset;
     while (i < end) {
-        let id = result.readUInt32LE(i);
+        const id = readUint32(result, i);
         i += 4;
         const item = {
             id,

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

@@ -41,12 +41,12 @@ export const subscribe = (q, onData, onError) => {
         return q;
     };
     sub.subs.add(fn);
+    if (sub.res) {
+        onData(sub.res);
+    }
     if (!sub.inProgress) {
         runSubscription(sub);
     }
-    else if (sub.res) {
-        onData(sub.res);
-    }
     return close;
 };
 //# sourceMappingURL=index.js.map