@based/db 0.0.16 → 0.0.17

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

@@ -3,14 +3,19 @@ import { setCursor } from '../setCursor.js';
 import { DELETE, RANGE_ERR } from '../types.js';
 import { getEdgeSize, writeEdges } from './edge.js';
 import { dbUpdateFromUpsert } from './references.js';
-function writeRef(id, ctx, schema, def, parentId, modifyOp, hasEdges) {
+function writeRef(id, ctx, schema, def, parentId, modifyOp, hasEdges, isTmpId) {
     if (ctx.len + 16 > ctx.max) {
         return RANGE_ERR;
     }
     ctx.markNodeDirty(ctx.db.schemaTypesParsed[def.inverseTypeName], id);
     setCursor(ctx, schema, def.prop, def.typeIndex, parentId, modifyOp);
     ctx.buf[ctx.len++] = modifyOp;
-    ctx.buf[ctx.len++] = hasEdges ? 1 : 0;
+    if (isTmpId) {
+        ctx.buf[ctx.len++] = hasEdges ? 2 : 3;
+    }
+    else {
+        ctx.buf[ctx.len++] = hasEdges ? 1 : 0;
+    }
     ctx.buf[ctx.len++] = id;
     ctx.buf[ctx.len++] = id >>>= 8;
     ctx.buf[ctx.len++] = id >>>= 8;
@@ -18,20 +23,22 @@ function writeRef(id, ctx, schema, def, parentId, modifyOp, hasEdges) {
 }
 function singleReferenceEdges(ref, ctx, schema, def, parentId, modifyOp) {
     let id = ref.id;
+    let isTmpId;
     if (typeof id !== 'number') {
         if (id instanceof ModifyState) {
             if (id.error) {
                 return id.error;
             }
+            isTmpId = !id.resolved;
             id = id.tmpId;
         }
     }
     if (id > 0) {
         const edgesLen = def.edgesTotalLen || getEdgeSize(def, ref);
         if (edgesLen === 0) {
-            return writeRef(id, ctx, schema, def, parentId, modifyOp, false);
+            return writeRef(id, ctx, schema, def, parentId, modifyOp, false, isTmpId);
         }
-        let err = writeRef(id, ctx, schema, def, parentId, modifyOp, true);
+        let err = writeRef(id, ctx, schema, def, parentId, modifyOp, true, isTmpId);
         if (err) {
             return err;
         }
@@ -63,20 +70,20 @@ export function writeReference(value, ctx, schema, def, res, modifyOp) {
         ctx.buf[ctx.len++] = DELETE;
     }
     else if (typeof value === 'number') {
-        return writeRef(value, ctx, schema, def, res.tmpId, modifyOp, false);
+        return writeRef(value, ctx, schema, def, res.tmpId, modifyOp, false, false);
     }
     else if (value instanceof ModifyState) {
         if (value.error) {
             return value.error;
         }
-        return writeRef(value.tmpId, ctx, schema, def, res.tmpId, modifyOp, false);
+        return writeRef(value.tmpId, ctx, schema, def, res.tmpId, modifyOp, false, !value.resolved);
     }
     else if (typeof value === 'object' && value !== null) {
         if (def.edges) {
             return singleReferenceEdges(value, ctx, schema, def, res.tmpId, modifyOp);
         }
         else if (typeof value.id === 'number') {
-            return writeRef(value.id, ctx, schema, def, res.tmpId, modifyOp, false);
+            return writeRef(value.id, ctx, schema, def, res.tmpId, modifyOp, false, false);
         }
         else if (typeof value.upsert === 'object' && value.upsert !== null) {
             dbUpdateFromUpsert(ctx, schema, def, res, ctx.db.upsert(def.inverseTypeName, value.upsert));

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

@@ -130,12 +130,14 @@ function appendRefs(def, ctx, modifyOp, refs, op, remaining) {
         const ref = refs[i];
         let id;
         let index;
+        let isTmpId;
         if (typeof ref === 'object') {
             if (ref instanceof ModifyState) {
                 if (ref.error) {
                     return ref.error;
                 }
                 id = ref.tmpId;
+                isTmpId = !ref.resolved;
             }
             else if (ref.id instanceof ModifyState) {
                 if (ref.id.error) {
@@ -143,6 +145,7 @@ function appendRefs(def, ctx, modifyOp, refs, op, remaining) {
                 }
                 id = ref.id.tmpId;
                 index = ref.$index;
+                isTmpId = !ref.id.resolved;
             }
             else if (ref.id > 0) {
                 id = ref.id;
@@ -163,7 +166,7 @@ function appendRefs(def, ctx, modifyOp, refs, op, remaining) {
                 if (ctx.len + 9 > ctx.max) {
                     return RANGE_ERR;
                 }
-                ctx.buf[ctx.len++] = 1;
+                ctx.buf[ctx.len++] = isTmpId ? 5 : 1;
                 ctx.buf[ctx.len++] = id;
                 ctx.buf[ctx.len++] = id >>>= 8;
                 ctx.buf[ctx.len++] = id >>>= 8;
@@ -173,7 +176,7 @@ function appendRefs(def, ctx, modifyOp, refs, op, remaining) {
                 if (ctx.len + 13 > ctx.max) {
                     return RANGE_ERR;
                 }
-                ctx.buf[ctx.len++] = 2;
+                ctx.buf[ctx.len++] = isTmpId ? 6 : 2;
                 ctx.buf[ctx.len++] = id;
                 ctx.buf[ctx.len++] = id >>>= 8;
                 ctx.buf[ctx.len++] = id >>>= 8;
@@ -202,7 +205,7 @@ function appendRefs(def, ctx, modifyOp, refs, op, remaining) {
             if (ctx.len + 5 > ctx.max) {
                 return RANGE_ERR;
             }
-            ctx.buf[ctx.len++] = 0;
+            ctx.buf[ctx.len++] = isTmpId ? 4 : 0;
             ctx.buf[ctx.len++] = id;
             ctx.buf[ctx.len++] = id >>>= 8;
             ctx.buf[ctx.len++] = id >>>= 8;
@@ -212,7 +215,7 @@ function appendRefs(def, ctx, modifyOp, refs, op, remaining) {
             if (ctx.len + 9 > ctx.max) {
                 return RANGE_ERR;
             }
-            ctx.buf[ctx.len++] = 3;
+            ctx.buf[ctx.len++] = isTmpId ? 7 : 3;
             ctx.buf[ctx.len++] = id;
             ctx.buf[ctx.len++] = id >>>= 8;
             ctx.buf[ctx.len++] = id >>>= 8;
@@ -255,6 +258,9 @@ function putRefs(def, ctx, modifyOp, refs, op) {
             if (ref.error) {
                 return ref.error;
             }
+            if (!ref.resolved) {
+                break;
+            }
             ref = ref.tmpId;
             ctx.buf[ctx.len++] = ref;
             ctx.buf[ctx.len++] = ref >>>= 8;

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

@@ -29,8 +29,8 @@ export function writeString(lang, value, ctx, def, t, parentId, modifyOp) {
             return RANGE_ERR;
         }
         if (modifyOp === CREATE) {
-            def.stringPropsCurrent[t.prop] = 2;
-            ctx.hasStringField++;
+            def.seperateSort.bufferTmp[t.prop] = 2;
+            ctx.hasSortField++;
         }
         setCursor(ctx, def, t.prop, t.typeIndex, parentId, modifyOp);
         // TODO if buffer check if second byte is zero or one

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

@@ -3,7 +3,7 @@ import { writeString } from './string.js';
 export function writeText(value, ctx, def, t, res, modifyOp) {
     // todo proper fallback as well
     if (value && typeof value !== 'object') {
-        const err = writeString(res.i18n ?? langCodesMap.get('en'), value, ctx, def, t, res.tmpId, modifyOp);
+        const err = writeString(res.locale ?? langCodesMap.get('en'), value, ctx, def, t, res.tmpId, modifyOp);
     }
     else {
         for (const lang in value) {

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

@@ -8,6 +8,8 @@ export declare const RANGE_ERR = 1;
 export declare const INCREMENT = 12;
 export declare const DECREMENT = 13;
 export declare const EXPIRE = 14;
+export declare const ADD_EMPTY_SORT_TEXT = 15;
+export declare const ADD_EMPTY_SORT = 7;
 export declare const SWITCH_TYPE = 2;
 export declare const SWITCH_FIELD = 0;
 export declare const SWITCH_ID_CREATE = 9;
@@ -16,6 +18,6 @@ export type ModifyErr = typeof RANGE_ERR | ModifyError | void;
 export type ModifyOp = typeof CREATE | typeof UPDATE | typeof INCREMENT | typeof EXPIRE;
 export type ModifyOpts = {
     unsafe?: boolean;
-    i18n?: LangName;
+    locale?: LangName;
     overwrite?: boolean;
 };

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

@@ -6,6 +6,8 @@ export const RANGE_ERR = 1;
 export const INCREMENT = 12;
 export const DECREMENT = 13;
 export const EXPIRE = 14;
+export const ADD_EMPTY_SORT_TEXT = 15;
+export const ADD_EMPTY_SORT = 7;
 export const SWITCH_TYPE = 2;
 export const SWITCH_FIELD = 0;
 export const SWITCH_ID_CREATE = 9;

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

@@ -59,7 +59,7 @@ export const update = (db, type, id, obj, opts) => {
     }
     const ctx = db.modifyCtx;
     const pos = ctx.len;
-    const res = new ModifyState(def.id, id, db, getSubscriptionMarkers(db, def.id, id, false), opts);
+    const res = new ModifyState(def.id, id, db, getSubscriptionMarkers(db, def.id, id, false), opts, true);
     const err = appendUpdate(ctx, def, obj, res, opts?.overwrite);
     if (err) {
         ctx.prefix0 = -1; // force a new cursor

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

@@ -6,7 +6,7 @@ export declare class ModifyCtx {
     len: number;
     id: number;
     lastMain: number;
-    hasStringField: number;
+    hasSortField: number;
     queue: Map<(payload: any) => void, ModifyState>;
     ctx: {
         offsets?: Record<number, number>;
@@ -25,7 +25,7 @@ export declare class ModifyCtx {
     markNodeDirty(schema: SchemaTypeDef, nodeId: number): void;
     markTypeDirty(schema: SchemaTypeDef): void;
     updateMax(): void;
-    getData(): Buffer;
+    getData(lastIds: Record<number, number>): Buffer;
 }
 export declare const flushBuffer: (db: DbClient) => Promise<void>;
 export declare const startDrain: (db: DbClient) => void;

package/dist/src/client/operations.js

@@ -9,7 +9,7 @@ export class ModifyCtx {
     len = 0;
     id = -1;
     lastMain = -1;
-    hasStringField = -1;
+    hasSortField = -1;
     queue = new Map();
     ctx = {}; // maybe make this different?
     payload;
@@ -47,7 +47,7 @@ export class ModifyCtx {
                 this.dirtyTypes.size * 10 -
                 this.dirtyRanges.size * 8;
     }
-    getData() {
+    getData(lastIds) {
         const rangesSize = this.dirtyRanges.size;
         const typesSize = this.dirtyTypes.size;
         const data = this.buf.subarray(0, this.len + 4 + 2 + typesSize * 10 + rangesSize * 8);
@@ -56,6 +56,7 @@ export class ModifyCtx {
         i += 2;
         for (const [id, startId] of this.dirtyTypes) {
             const lastId = this.db.schemaTypesParsedById[id].lastId;
+            lastIds[id] = lastId;
             data.writeUint16LE(id, i);
             i += 2;
             data.writeUint32LE(startId, i);
@@ -76,11 +77,26 @@ export const flushBuffer = (db) => {
     let flushPromise;
     if (ctx.len) {
         const d = Date.now();
-        const data = ctx.getData();
+        const lastIds = {};
+        const data = ctx.getData(lastIds);
         const resCtx = ctx.ctx;
         const queue = ctx.queue;
         flushPromise = db.hooks.flushModify(data).then(({ offsets }) => {
             resCtx.offsets = offsets;
+            for (const typeId in lastIds) {
+                if (typeId in offsets) {
+                    const lastId = lastIds[typeId] + offsets[typeId];
+                    const def = db.schemaTypesParsedById[typeId];
+                    const delta = lastId - def.lastId;
+                    if (delta > 0) {
+                        def.lastId += delta;
+                        def.total += delta;
+                    }
+                }
+                else {
+                    console.warn('no offset returned, very wrong');
+                }
+            }
             db.writeTime += Date.now() - d;
             if (queue.size) {
                 flushPromise.then(() => {

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

@@ -19,7 +19,7 @@ export declare class QueryBranch<T> {
     search(query: ArrayBufferView, field: string, opts?: Omit<FilterOpts, 'lowerCase'>): T;
     or(fn: FilterBranchFn): T;
     or(field: string, operator?: Operator | boolean, value?: any, opts?: FilterOpts): T;
-    range(offset: number, limit: number): T;
+    range(offset: number, limit?: number): T;
     include(...fields: (string | BranchInclude | string[])[]): T;
 }
 export declare class BasedDbReferenceQuery extends QueryBranch<BasedDbReferenceQuery> {
@@ -31,12 +31,13 @@ declare class GetPromise extends Promise<BasedQueryResponse> {
 }
 export declare class BasedDbQuery extends QueryBranch<BasedDbQuery> {
     #private;
-    constructor(db: DbClient, type: string, id?: QueryByAliasObj | number | Uint32Array | (QueryByAliasObj | number)[]);
+    skipValidation: boolean;
+    constructor(db: DbClient, type: string, id?: QueryByAliasObj | number | Uint32Array | (QueryByAliasObj | number)[], skipValidation?: boolean);
     id: number;
     get(): GetPromise;
     buffer: Buffer;
     register(): void;
-    i18n(locale: LangName): this;
+    locale(locale: LangName): this;
     subscribe(onData: OnData, onError?: OnError): import("./subscription/types.js").OnClose;
     _getSync(dbCtxExternal: any): BasedQueryResponse;
     toBuffer(): Buffer;

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

@@ -9,6 +9,8 @@ import { subscribe } from './subscription/index.js';
 import { registerQuery } from './registerQuery.js';
 import { langCodesMap } from '@based/schema';
 import { convertFilter } from './filter/convertFilter.js';
+import { validateLocale, validateRange } from './validation.js';
+import { DEF_RANGE_PROP_LIMIT } from './thresholds.js';
 export class QueryBranch {
     db;
     def;
@@ -106,7 +108,13 @@ export class QueryBranch {
         // @ts-ignore
         return this;
     }
-    range(offset, limit) {
+    range(offset, limit = DEF_RANGE_PROP_LIMIT) {
+        if (validateRange(this.def, offset, limit)) {
+            this.def.range.offset = 0;
+            this.def.range.limit = DEF_RANGE_PROP_LIMIT;
+            // @ts-ignore
+            return this;
+        }
         this.def.range.offset = offset;
         this.def.range.limit = limit;
         // @ts-ignore
@@ -172,7 +180,8 @@ class GetPromise extends Promise {
     }
 }
 export class BasedDbQuery extends QueryBranch {
-    constructor(db, type, id) {
+    skipValidation = false;
+    constructor(db, type, id, skipValidation) {
         const target = {
             type,
         };
@@ -185,15 +194,13 @@ export class BasedDbQuery extends QueryBranch {
                     // TODO ADD MULTI ALIAS
                     // @ts-ignore
                     target.ids = id;
-                    // target.ids = new Uint32Array(id)
-                    // target.ids.sort()
                 }
                 else {
                     target.id = id;
                 }
             }
         }
-        const def = createQueryDef(db, QueryDefType.Root, target);
+        const def = createQueryDef(db, QueryDefType.Root, target, skipValidation);
         super(db, def);
     }
     #getInternal = async (resolve, reject) => {
@@ -226,7 +233,8 @@ export class BasedDbQuery extends QueryBranch {
     register() {
         registerQuery(this);
     }
-    i18n(locale) {
+    locale(locale) {
+        validateLocale(this.def, locale);
         this.def.lang = langCodesMap.get(locale) ?? 0;
         return this;
     }

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

@@ -1,7 +1,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 { size, time, inspectData, defHasId, displayTarget } from './display.js';
 import { readFloatLE, readUint32 } from '../bitWise.js';
 export { time, size, inspectData };
 export class BasedQueryResponse {
@@ -21,15 +21,8 @@ export class BasedQueryResponse {
         return this.result.length;
     }
     [inspect.custom](depth) {
-        const hasId = 'id' in this.def.target || 'alias' in this.def.target;
-        const target = hasId
-            ? this.def.schema.type +
-                ':' +
-                ('alias' in this.def.target
-                    ? inspect(this.def.target.alias)
-                    : // @ts-ignore
-                        this.def.target.id)
-            : this.def.schema.type;
+        const hasId = defHasId(this.def);
+        const target = displayTarget(this.def);
         let str = '';
         str += '\n  execTime: ' + time(this.execTime);
         str += '\n  size: ' + size(this.result.byteLength);

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

@@ -1,5 +1,11 @@
 import { QueryDef } from './types.js';
+import { TypeIndex } from '../../server/schema/types.js';
 import { BasedQueryResponse } from './BasedIterable.js';
 export declare const size: (size: number) => string;
 export declare const time: (time: number) => string;
+export declare const prettyPrintVal: (v: any, type: TypeIndex) => string;
+export declare const parseUint8Array: (p: any) => any;
+export declare const safeStringify: (p: any, nr?: number) => string;
 export declare const inspectData: (q: BasedQueryResponse, def: QueryDef, level: number, top: boolean, depth: number, hasId?: boolean) => string;
+export declare const defHasId: (def: QueryDef) => boolean;
+export declare const displayTarget: (def: QueryDef) => string;

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

@@ -34,7 +34,7 @@ export const time = (time) => {
         return picocolors.green(str);
     }
 };
-const prettyPrintVal = (v, type) => {
+export const prettyPrintVal = (v, type) => {
     if (type === BINARY) {
         const nr = 12;
         const isLarger = v.length > nr;
@@ -72,6 +72,37 @@ const prettyPrintVal = (v, type) => {
     }
     return v;
 };
+export const parseUint8Array = (p) => {
+    if (ArrayBuffer.isView(p)) {
+        const x = [];
+        // @ts-ignore
+        for (let i = 0; i < p.length; i++) {
+            x[i] = p[i];
+        }
+        p = x;
+        return p;
+    }
+    return p;
+};
+export const safeStringify = (p, nr = 30) => {
+    var v;
+    try {
+        p = parseUint8Array(p);
+        if (typeof p === 'object') {
+            for (const key in p) {
+                p[key] = parseUint8Array(p[key]);
+            }
+        }
+        v = JSON.stringify(p).replace(/"/g, '').slice(0, nr);
+        if (v.length === nr) {
+            v += '...';
+        }
+    }
+    catch (err) {
+        v = '';
+    }
+    return v;
+};
 const inspectObject = (object, q, path, level, isLast, isFirst, isObject, depth) => {
     const prefix = ''.padEnd(level, ' ');
     let str = '';
@@ -253,4 +284,24 @@ export const inspectData = (q, def, level, top, depth, hasId = false) => {
     }
     return str;
 };
+export const defHasId = (def) => {
+    return 'id' in def.target || 'alias' in def.target;
+};
+export const displayTarget = (def) => {
+    // ids
+    const hasId = defHasId(def);
+    const hasIds = 'ids' in def.target;
+    const target = hasId || hasIds
+        ? def.schema.type +
+            ':' +
+            (hasIds
+                ? // @ts-ignore
+                    `ids(${def.target?.ids?.length ?? 0})`
+                : 'alias' in def.target
+                    ? safeStringify(def.target.alias, 30)
+                    : // @ts-ignore
+                        def.target.id)
+        : def.schema.type;
+    return target;
+};
 //# sourceMappingURL=display.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/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/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;