@based/db 0.0.71 → 0.1.1

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

@@ -1,13 +1,4 @@
-export declare enum AggregateType {
-    SUM = 1,
-    COUNT = 2,
-    CARDINALITY = 3,
-    STDDEV = 4,
-    AVERAGE = 5,
-    VARIANCE = 6,
-    MAX = 7,
-    MIN = 8
-}
+import { AggregateType } from '@based/protocol/db-read';
 export declare const enum AccumulatorSize {
     SUM = 8,
     COUNT = 4,
@@ -16,7 +7,8 @@ export declare const enum AccumulatorSize {
     AVERAGE = 16,// count (u64) + sum (f64) = 16
     VARIANCE = 24,// count (u64) + sum (f64) + sum_sq (f64) = 8 + 8 + 8 = 24
     MAX = 8,
-    MIN = 8
+    MIN = 8,
+    HMEAN = 16
 }
 export declare const aggregateTypeMap: Map<AggregateType, {
     resultsSize: number;
@@ -26,3 +18,33 @@ export declare const enum GroupBy {
     NONE = 0,
     HAS_GROUP = 255
 }
+export declare enum Interval {
+    none = 0,
+    epoch = 1,
+    hour = 2,
+    day = 6,// The day of the month (1–31); for interval values, the number of days
+    doy = 7,// The day of the year (0–365)
+    dow = 8,// The day of the week as Sunday (0) to Saturday (6)
+    isoDOW = 9,// The day of the week as Monday (1) to Sunday (7). This matches the ISO 8601 day of the week numbering.
+    month = 11,// The number of the month within the year (0–11);
+    year = 14
+}
+export type IntervalString = keyof typeof Interval;
+export type StepObject = {
+    step?: number | IntervalString;
+    timeZone?: string;
+    display?: Intl.DateTimeFormat;
+};
+export type StepShorthand = number | IntervalString;
+export type StepInput = StepObject | StepShorthand;
+export type NormalizedStepObject = {
+    step: number | Interval;
+};
+export declare enum setMode {
+    'sample' = 0,
+    'population' = 1
+}
+export type setModeString = 'sample' | 'population';
+export type aggFnOptions = {
+    mode?: setModeString;
+};

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

@@ -1,14 +1,4 @@
-export var AggregateType;
-(function (AggregateType) {
-    AggregateType[AggregateType["SUM"] = 1] = "SUM";
-    AggregateType[AggregateType["COUNT"] = 2] = "COUNT";
-    AggregateType[AggregateType["CARDINALITY"] = 3] = "CARDINALITY";
-    AggregateType[AggregateType["STDDEV"] = 4] = "STDDEV";
-    AggregateType[AggregateType["AVERAGE"] = 5] = "AVERAGE";
-    AggregateType[AggregateType["VARIANCE"] = 6] = "VARIANCE";
-    AggregateType[AggregateType["MAX"] = 7] = "MAX";
-    AggregateType[AggregateType["MIN"] = 8] = "MIN";
-})(AggregateType || (AggregateType = {}));
+import { AggregateType } from '@based/protocol/db-read';
 export const aggregateTypeMap = new Map([
     [
         AggregateType.CARDINALITY,
@@ -26,10 +16,38 @@ export const aggregateTypeMap = new Map([
         AggregateType.AVERAGE,
         { resultsSize: 8, accumulatorSize: 16 /* AccumulatorSize.AVERAGE */ },
     ],
+    [
+        AggregateType.HMEAN,
+        { resultsSize: 8, accumulatorSize: 16 /* AccumulatorSize.HMEAN */ },
+    ],
     [
         AggregateType.VARIANCE,
         { resultsSize: 8, accumulatorSize: 24 /* AccumulatorSize.VARIANCE */ },
     ],
     // Othe types like MAX, MIN, SUM fall in the else case in aggregation.ts 8/8
 ]);
+export var Interval;
+(function (Interval) {
+    Interval[Interval["none"] = 0] = "none";
+    Interval[Interval["epoch"] = 1] = "epoch";
+    Interval[Interval["hour"] = 2] = "hour";
+    // minute = 3,
+    // second = 4,
+    // microseconds = 5,
+    Interval[Interval["day"] = 6] = "day";
+    Interval[Interval["doy"] = 7] = "doy";
+    Interval[Interval["dow"] = 8] = "dow";
+    Interval[Interval["isoDOW"] = 9] = "isoDOW";
+    // week = 10, // The number of the ISO 8601 week-numbering week of the year
+    Interval[Interval["month"] = 11] = "month";
+    // isoMonth = 12, // The number of the month within the year (1–12);
+    // quarter = 13, // The quarter of the year (1–4) that the date is in
+    Interval[Interval["year"] = 14] = "year";
+    // timeZone = 15, // ? seconds? or string?
+})(Interval || (Interval = {}));
+export var setMode;
+(function (setMode) {
+    setMode[setMode["sample"] = 0] = "sample";
+    setMode[setMode["population"] = 1] = "population";
+})(setMode || (setMode = {}));
 //# sourceMappingURL=types.js.map

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

@@ -1,7 +1,7 @@
 import picocolors from 'picocolors';
 import { isPropDef, REVERSE_TYPE_INDEX_MAP } from '@based/schema/def';
 import { QueryDefType } from './types.js';
-import { concatUint8Arr } from '@saulx/utils';
+import { concatUint8Arr } from '@based/utils';
 export const debugQueryDef = (q, returnIt) => {
     const loggableObject = { type: 'bla', schema: null };
     const f = (a) => {

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

@@ -1,6 +1,6 @@
 import { QueryDef } from './types.js';
 import { TypeIndex } from '@based/schema/def';
-import { BasedQueryResponse } from './BasedIterable.js';
+import { BasedQueryResponse } from './BasedQueryResponse.js';
 export declare const size: (size: number) => string;
 export declare const time: (time: number) => string;
 export declare const printNumber: (nr: number) => string;

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

@@ -1,7 +1,7 @@
 import picocolors from 'picocolors';
 import { BINARY, CARDINALITY, NUMBER, REFERENCE, REFERENCES, STRING, TEXT, TIMESTAMP, } from '@based/schema/def';
-import { ENCODER } from '@saulx/utils';
-import { AggregateType } from './aggregates/types.js';
+import { ENCODER } from '@based/utils';
+import { AggregateType } from '@based/protocol/db-read';
 const decimals = (v) => ~~(v * 100) / 100;
 const sizeCalc = (size) => {
     if (size > 1e6) {
@@ -124,6 +124,7 @@ const inspectObject = (object, q, path, level, isLast, isFirst, isObject, depth)
     }
     const prefixBody = ''.padEnd(level + 3, ' ');
     let edges = [];
+    // use reader schema
     for (const k in object) {
         const key = path ? path + '.' + k : k;
         let def;
@@ -176,14 +177,30 @@ const inspectObject = (object, q, path, level, isLast, isFirst, isObject, depth)
         }
         else if ('__isPropDef' in def) {
             if (def.typeIndex === REFERENCES) {
-                str += inspectData(v, q.references.get(def.prop), level + 2, false, depth);
+                if (q.aggregate) {
+                    str += printNumber(v);
+                    const [[__, akv], _] = q.aggregate.aggregates;
+                    const aggType = akv[0].type;
+                    str += picocolors.italic(picocolors.dim(` ${AggregateType[aggType].toLowerCase()}`));
+                }
+                else {
+                    str += inspectData(v, q.references.get(def.prop), level + 2, false, depth);
+                }
             }
             else if (def.typeIndex === REFERENCE) {
                 if (!v || !v.id) {
                     str += 'null,\n';
                 }
                 else {
-                    str += inspectObject(v, q.references.get(def.prop), '', level + 2, false, false, true, depth);
+                    if (q.aggregate) {
+                        str += printNumber(v);
+                        const [[__, akv], _] = q.aggregate.aggregates;
+                        const aggType = akv[0].type;
+                        str += picocolors.italic(picocolors.dim(` ${AggregateType[aggType].toLowerCase()}`));
+                    }
+                    else {
+                        str += inspectObject(v, q.references.get(def.prop), '', level + 2, false, false, true, depth);
+                    }
                 }
             }
             else if (def.typeIndex === BINARY) {

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

@@ -16,7 +16,7 @@ export class FilterBranch {
             this.def.filter.size += f.filterBranch.size;
         }
         else {
-            const f = convertFilter(this.def, field, operator, value, opts);
+            const f = convertFilter(this, field, operator, value, opts);
             if (f) {
                 filterOr(this.db, this.def, f, this.filterBranch);
             }
@@ -24,7 +24,7 @@ export class FilterBranch {
         return this;
     }
     filter(field, operator, value) {
-        const f = convertFilter(this.def, field, operator, value);
+        const f = convertFilter(this, field, operator, value);
         if (f) {
             filter(this.db, this.def, f, this.filterBranch);
         }

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

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

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

@@ -6,7 +6,19 @@ const normalizeNeedle = (s) => {
         .filter((ch) => ch.charCodeAt(0) <= 127)
         .join('');
 };
-export const convertFilter = (def, field, operator, value, opts) => {
+export const convertFilter = (query, field, operator, value, opts) => {
+    const def = query.def;
+    const filterHook = def.schema.hooks?.filter;
+    if (filterHook) {
+        def.schema.hooks.filter = null;
+        if (typeof operator === 'boolean') {
+            filterHook(query, field, '=', operator);
+        }
+        else {
+            filterHook(query, field, operator, value);
+        }
+        def.schema.hooks.filter = filterHook;
+    }
     if (operator === undefined) {
         operator = '=';
         value = true;

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

@@ -1,11 +1,8 @@
-import { BINARY, STRING, REFERENCES, } from '@based/schema/def';
+import { BINARY, STRING, REFERENCES, TIMESTAMP, } from '@based/schema/def';
 import { ALIGNMENT_NOT_SET, EQUAL, MODE_AND_FIXED, MODE_DEFAULT, MODE_OR_FIXED, } from './types.js';
 import { parseFilterValue } from './parseFilterValue.js';
-import { ENCODER } from '@saulx/utils';
+import { ENCODER, writeDoubleLE, writeInt64, writeUint16, writeUint32, } from '@based/utils';
 export const writeFixed = (prop, buf, value, size, offset) => {
-    if (prop.transform) {
-        value = prop.transform('filter', value);
-    }
     if (prop.typeIndex === BINARY || prop.typeIndex === STRING) {
         if (typeof value === 'string') {
             const { written } = ENCODER.encodeInto(value, buf.subarray(offset + 1));
@@ -23,19 +20,18 @@ export const writeFixed = (prop, buf, value, size, offset) => {
     }
     else {
         if (size === 8) {
-            // RFE no int64 for u? prob important to add...
-            const view = new DataView(buf.buffer, buf.byteOffset);
-            view.setFloat64(offset, value, true);
+            if (prop.typeIndex === TIMESTAMP) {
+                writeInt64(buf, value, offset);
+            }
+            else {
+                writeDoubleLE(buf, value, offset);
+            }
         }
         else if (size === 4) {
-            buf[offset] = value;
-            buf[offset + 1] = value >>> 8;
-            buf[offset + 2] = value >>> 16;
-            buf[offset + 3] = value >>> 24;
+            writeUint32(buf, value, offset);
         }
         else if (size === 2) {
-            buf[offset] = value;
-            buf[offset + 1] = value >>> 8;
+            writeUint16(buf, value, offset);
         }
         else if (size === 1) {
             buf[offset] = value;
@@ -54,24 +50,16 @@ export const createFixedFilterBuffer = (prop, size, ctx, value, sort) => {
                 ? MODE_AND_FIXED
                 : MODE_OR_FIXED;
         buf[2] = prop.typeIndex;
-        buf[3] = size;
-        buf[4] = size >>> 8;
-        buf[5] = start;
-        buf[6] = start >>> 8;
+        writeUint16(buf, size, 3);
+        writeUint16(buf, start, 5);
         buf[7] = ctx.operation;
-        buf[8] = len;
-        buf[9] = len >>> 8;
+        writeUint16(buf, len, 8);
         buf[10] = ALIGNMENT_NOT_SET;
         if (sort) {
             value = new Uint32Array(value.map((v) => parseFilterValue(prop, v)));
             value.sort();
             for (let i = 0; i < len; i++) {
-                const off = 18 + i * size;
-                const val = value[i];
-                buf[off] = val;
-                buf[off + 1] = val >>> 8;
-                buf[off + 2] = val >>> 16;
-                buf[off + 3] = val >>> 24;
+                writeUint32(buf, value[i], 18 + i * size);
             }
         }
         else {
@@ -86,10 +74,8 @@ export const createFixedFilterBuffer = (prop, size, ctx, value, sort) => {
         buf[0] = ctx.type;
         buf[1] = MODE_DEFAULT;
         buf[2] = prop.typeIndex;
-        buf[3] = size;
-        buf[4] = size >>> 8;
-        buf[5] = start;
-        buf[6] = start >>> 8;
+        writeUint16(buf, size, 3);
+        writeUint16(buf, start, 5);
         buf[7] = ctx.operation;
         writeFixed(prop, buf, parseFilterValue(prop, value), size, 8);
         return buf;

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

@@ -1,39 +1,25 @@
 import { ALIGNMENT_NOT_SET, MODE_REFERENCE } from './types.js';
+import { writeUint16, writeUint32 } from '@based/utils';
 export const createReferenceFilter = (prop, ctx, value) => {
-    if (prop.transform) {
-        value = prop.transform('filter', value);
-    }
     const isArray = Array.isArray(value);
     const len = isArray ? value.length : 1;
     const buf = new Uint8Array(11 + (isArray ? 8 : 0) + len * 4);
     buf[0] = ctx.type;
     buf[1] = MODE_REFERENCE;
     buf[2] = prop.typeIndex;
-    // size (4)
-    buf[3] = 4;
-    buf[4] = 0;
-    buf[5] = len;
-    buf[6] = len >>> 8;
+    writeUint16(buf, 4, 3); // size (4)
+    writeUint16(buf, len, 5);
     buf[7] = ctx.operation;
     buf[8] = 0;
-    buf[9] = prop.inverseTypeId;
-    buf[10] = prop.inverseTypeId >>> 8;
+    writeUint16(buf, prop.inverseTypeId, 9);
     if (isArray) {
         buf[11] = ALIGNMENT_NOT_SET;
         for (let i = 0; i < len; i++) {
-            let off = 19 + i * 4;
-            const v = value[i];
-            buf[off++] = v;
-            buf[off++] = v >>> 8;
-            buf[off++] = v >>> 16;
-            buf[off++] = v >>> 24;
+            writeUint32(buf, value[i], 19 + i * 4);
         }
     }
     else {
-        buf[11] = value;
-        buf[12] = value >>> 8;
-        buf[13] = value >>> 16;
-        buf[14] = value >>> 24;
+        writeUint32(buf, value, 11);
     }
     return buf;
 };

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

@@ -1,14 +1,11 @@
 import { ALIAS, TEXT, VECTOR } from '@based/schema/def';
-import { EQUAL, EQUAL_CRC32, HAS, HAS_TO_LOWER_CASE, LIKE, MODE_DEFAULT_VAR, MODE_OR_VAR, getVectorFn, } from './types.js';
+import { EQUAL, EQUAL_CRC32, INCLUDES, INCLUDES_TO_LOWER_CASE, LIKE, MODE_DEFAULT_VAR, MODE_OR_VAR, getVectorFn, } from './types.js';
 import { createFixedFilterBuffer } from './createFixedFilterBuffer.js';
 import { crc32 } from '../../crc32.js';
-import { ENCODER, concatUint8Arr } from '@saulx/utils';
+import { ENCODER, concatUint8Arr, writeUint16, writeUint32 } from '@based/utils';
 const DEFAULT_SCORE = new Uint8Array(new Float32Array([0.5]).buffer);
 const parseValue = (value, prop, ctx, lang) => {
-    if (prop.transform) {
-        value = prop.transform('filter', value);
-    }
-    if (ctx.operation === HAS_TO_LOWER_CASE && typeof value === 'string') {
+    if (ctx.operation === INCLUDES_TO_LOWER_CASE && typeof value === 'string') {
         value = value.toLowerCase();
     }
     if (ctx.operation === LIKE && prop.typeIndex === VECTOR) {
@@ -68,15 +65,14 @@ export const createVariableFilterBuffer = (value, prop, ctx, lang) => {
     if (Array.isArray(value)) {
         if (ctx.operation !== EQUAL || !prop.separate) {
             mode = MODE_OR_VAR;
-            const x = [];
+            const values = [];
             for (const v of value) {
-                const a = parseValue(v, prop, ctx, lang);
+                const parsedValue = parseValue(v, prop, ctx, lang);
                 const size = new Uint8Array(2);
-                size[0] = a.byteLength;
-                size[1] = a.byteLength >>> 8;
-                x.push(size, a);
+                writeUint16(size, parsedValue.byteLength, 0);
+                values.push(size, parsedValue);
             }
-            val = concatUint8Arr(x);
+            val = concatUint8Arr(values);
         }
         else {
             const x = [];
@@ -90,9 +86,9 @@ export const createVariableFilterBuffer = (value, prop, ctx, lang) => {
         val = parseValue(value, prop, ctx, lang);
     }
     if (ctx.operation === EQUAL ||
-        ctx.operation === HAS ||
+        ctx.operation === INCLUDES ||
         ctx.operation === LIKE ||
-        ctx.operation === HAS_TO_LOWER_CASE) {
+        ctx.operation === INCLUDES_TO_LOWER_CASE) {
         if (prop.separate) {
             if (ctx.operation === EQUAL &&
                 prop.typeIndex !== ALIAS &&
@@ -102,14 +98,8 @@ export const createVariableFilterBuffer = (value, prop, ctx, lang) => {
                     const crc = crc32(val.slice(0, -fbLen));
                     const len = val.byteLength - fbLen;
                     const v = new Uint8Array(8 + fbLen);
-                    v[0] = crc;
-                    v[1] = crc >>> 8;
-                    v[2] = crc >>> 16;
-                    v[3] = crc >>> 24;
-                    v[4] = len;
-                    v[5] = len >>> 8;
-                    v[6] = len >>> 16;
-                    v[7] = len >>> 24;
+                    writeUint32(v, crc, 0);
+                    writeUint32(v, len, 4);
                     for (let i = 0; i < fbLen; i++) {
                         v[v.byteLength - (i + 1)] = val[val.byteLength - (i + 1)];
                     }
@@ -142,17 +132,10 @@ function writeVarFilter(mode, val, ctx, prop, start, len) {
     buf[0] = ctx.type;
     buf[1] = mode;
     buf[2] = prop.typeIndex;
-    buf[3] = start;
-    buf[4] = start >>> 8;
-    buf[5] = len;
-    buf[6] = len >>> 8;
-    buf[7] = size;
-    buf[8] = size >>> 8;
-    buf[9] = size >>> 16;
-    buf[10] = size >>> 24;
+    writeUint16(buf, start, 3);
+    writeUint16(buf, len, 5);
+    writeUint32(buf, size, 7);
     buf[11] = ctx.operation;
-    // 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/parseFilterValue.js

@@ -1,6 +1,6 @@
 import { TIMESTAMP, ENUM, BOOLEAN, STRING, BINARY, TEXT, } from '@based/schema/def';
 import { crc32 } from '../../crc32.js';
-import { convertToTimestamp, ENCODER } from '@saulx/utils';
+import { convertToTimestamp, ENCODER, writeUint32 } from '@based/utils';
 // -------------------------------------------
 // conditions normal
 // field, [size 2]
@@ -20,16 +20,8 @@ export const parseFilterValue = (prop, value) => {
         prop.typeIndex === TEXT) {
         const b = value instanceof Uint8Array ? value : ENCODER.encode(value);
         const buf = new Uint8Array(8);
-        let crc = crc32(b);
-        buf[0] = crc;
-        buf[1] = crc >>>= 8;
-        buf[2] = crc >>>= 8;
-        buf[3] = crc >>>= 8;
-        let len = b.byteLength;
-        buf[4] = len;
-        buf[5] = len >>>= 8;
-        buf[6] = len >>>= 8;
-        buf[7] = len >>>= 8;
+        writeUint32(buf, crc32(b), 0);
+        writeUint32(buf, b.byteLength, 4);
         return buf;
     }
     else if (prop.typeIndex === BOOLEAN) {

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

@@ -38,7 +38,7 @@ export const primitiveFilter = (def, prop, filter, conditions, lang) => {
         parsedCondition = createFixedFilterBuffer(prop, 4, ctx, value, !isNumerical(ctx.operation));
     }
     else if (prop.typeIndex === CARDINALITY) {
-        parsedCondition = createFixedFilterBuffer(prop, 2, ctx, value, false);
+        parsedCondition = createFixedFilterBuffer(prop, 4, ctx, value, false);
     }
     else if (propSize) {
         parsedCondition = createFixedFilterBuffer(prop, propSize, ctx, value, false);

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

@@ -1,3 +1,4 @@
+import { writeUint16, writeUint32 } from '@based/utils';
 import { META_EDGE, META_EXISTS, META_OR_BRANCH, META_REFERENCE, TYPE_DEFAULT, TYPE_NEGATE, } from './types.js';
 const writeConditions = (result, k, offset, conditions) => {
     let lastWritten = offset;
@@ -11,8 +12,7 @@ const writeConditions = (result, k, offset, conditions) => {
         result.set(condition, lastWritten);
         lastWritten += condition.byteLength;
     }
-    result[sizeIndex] = conditionSize;
-    result[sizeIndex + 1] = conditionSize >>> 8;
+    writeUint16(result, conditionSize, sizeIndex);
     return lastWritten - offset;
 };
 export const fillConditionsBuffer = (result, conditions, offset) => {
@@ -34,14 +34,12 @@ export const fillConditionsBuffer = (result, conditions, offset) => {
             lastWritten++;
             result[lastWritten] = refField;
             lastWritten++;
-            result[lastWritten] = refConditions.schema.id;
-            result[lastWritten + 1] = refConditions.schema.id >>> 8;
+            writeUint16(result, refConditions.schema.id, lastWritten);
             lastWritten += 2;
             const sizeIndex = lastWritten;
             lastWritten += 2;
             const size = fillConditionsBuffer(result, refConditions, lastWritten);
-            result[sizeIndex] = size;
-            result[sizeIndex + 1] = size >>> 8;
+            writeUint16(result, size, sizeIndex);
             lastWritten += size;
         }
     }
@@ -53,18 +51,13 @@ export const fillConditionsBuffer = (result, conditions, offset) => {
             lastWritten += 2;
             const size = writeConditions(result, k, lastWritten, v);
             lastWritten += size;
-            result[sizeIndex] = size;
-            result[sizeIndex + 1] = size >>> 8;
+            writeUint16(result, size, sizeIndex);
         });
     }
     if (conditions.or && conditions.or.size != 0) {
         const size = fillConditionsBuffer(result, conditions.or, lastWritten);
-        result[orJumpIndex] = size;
-        result[orJumpIndex + 1] = size >>> 8;
-        result[orJumpIndex + 2] = lastWritten;
-        result[orJumpIndex + 3] = lastWritten >>> 8;
-        result[orJumpIndex + 4] = lastWritten >>> 16;
-        result[orJumpIndex + 5] = lastWritten >>> 24;
+        writeUint16(result, size, orJumpIndex);
+        writeUint32(result, lastWritten, orJumpIndex + 2);
         lastWritten += size;
     }
     if (conditions.exists) {
@@ -86,7 +79,8 @@ export const isSimpleMainFilter = (conditions) => {
         !conditions.edges &&
         conditions.conditions.size === 1 &&
         conditions.conditions.has(0) &&
-        !conditions.or) {
+        !conditions.or &&
+        !conditions.exists) {
         return true;
     }
     return false;

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

@@ -4,15 +4,15 @@ 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 type Operator = '=' | 'has' | '!has' | '<' | '>' | '!=' | 'like' | '>=' | '<=' | '..' | '!..' | 'like' | 'exists' | '!exists';
-export declare const VECTOR_FNS: string[];
+export type Operator = '=' | 'includes' | '!includes' | '<' | '>' | '!=' | 'like' | '>=' | '<=' | '..' | '!..' | 'like' | 'exists' | '!exists';
 export type FilterOpts<O = Operator> = {
     lowerCase?: boolean;
     fn?: 'dotProduct' | 'manhattanDistance' | 'cosineSimilarity' | 'euclideanDistance';
     score?: number;
 };
+export declare const VECTOR_FNS: string[];
 export declare const EQUAL = 1;
-export declare const HAS = 2;
+export declare const INCLUDES = 2;
 export declare const ENDS_WITH = 4;
 export declare const STARTS_WITH = 5;
 export declare const EQUAL_CRC32 = 17;
@@ -23,12 +23,12 @@ export declare const SMALLER_THAN_INCLUSIVE = 9;
 export declare const RANGE = 10;
 export declare const RANGE_EXCLUDE = 11;
 export declare const EQUAL_LOWER_CASE = 12;
-export declare const HAS_TO_LOWER_CASE = 13;
+export declare const INCLUDES_TO_LOWER_CASE = 13;
 export declare const STARTS_WITH_LOWER_CASE = 14;
 export declare const ENDS_WITH_LOWER_CASE = 15;
 export declare const LIKE = 18;
 export declare const EXISTS = 19;
-export type OPERATOR = typeof EQUAL | typeof HAS | typeof ENDS_WITH | typeof STARTS_WITH | typeof GREATER_THAN | typeof SMALLER_THAN | typeof GREATER_THAN_INCLUSIVE | typeof SMALLER_THAN_INCLUSIVE | typeof RANGE | typeof RANGE_EXCLUDE | typeof EQUAL_LOWER_CASE | typeof HAS_TO_LOWER_CASE | typeof STARTS_WITH_LOWER_CASE | typeof ENDS_WITH_LOWER_CASE | typeof LIKE | typeof EQUAL_CRC32 | typeof EXISTS;
+export type OPERATOR = typeof EQUAL | typeof INCLUDES | typeof ENDS_WITH | typeof STARTS_WITH | typeof GREATER_THAN | typeof SMALLER_THAN | typeof GREATER_THAN_INCLUSIVE | typeof SMALLER_THAN_INCLUSIVE | typeof RANGE | typeof RANGE_EXCLUDE | typeof EQUAL_LOWER_CASE | typeof INCLUDES_TO_LOWER_CASE | typeof STARTS_WITH_LOWER_CASE | typeof ENDS_WITH_LOWER_CASE | typeof LIKE | typeof EQUAL_CRC32 | typeof EXISTS;
 export declare const isNumerical: (op: OPERATOR) => boolean;
 export declare const TYPE_NEGATE = 1;
 export declare const TYPE_DEFAULT = 2;
@@ -54,7 +54,7 @@ export declare const VECTOR_DOT_PRODUCT = 0;
 export declare const VECTOR_MANHATTAN_DIST = 1;
 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 getVectorFn: (optsFn?: FilterOpts["fn"]) => 0 | 1 | 3 | 2;
 export declare const toFilterCtx: (def: QueryDef, op: Operator, opts?: FilterOpts) => FilterCtx;
 export declare const operatorReverseMap: Record<OPERATOR, string>;
 export declare const ALIGNMENT_NOT_SET = 255;

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

@@ -14,7 +14,7 @@ export const VECTOR_FNS = [
 // -------------------------------------------
 // operations shared
 export const EQUAL = 1;
-export const HAS = 2;
+export const INCLUDES = 2;
 export const ENDS_WITH = 4;
 export const STARTS_WITH = 5;
 export const EQUAL_CRC32 = 17;
@@ -29,12 +29,12 @@ export const RANGE_EXCLUDE = 11;
 // -------------------------------------------
 // operations strings
 export const EQUAL_LOWER_CASE = 12;
-export const HAS_TO_LOWER_CASE = 13;
+export const INCLUDES_TO_LOWER_CASE = 13;
 export const STARTS_WITH_LOWER_CASE = 14;
 export const ENDS_WITH_LOWER_CASE = 15;
 export const LIKE = 18;
 // -------------------------------------------
-// only valid for seperate fields
+// only valid for separate fields
 export const EXISTS = 19;
 // -------------------------------------------
 export const isNumerical = (op) => {
@@ -99,10 +99,10 @@ export const toFilterCtx = (def, op, opts = {}) => {
             opts,
         };
     }
-    if (op === 'has' || op === '!has') {
+    if (op === 'includes' || op === '!includes') {
         return {
-            operation: opts.lowerCase ? HAS_TO_LOWER_CASE : HAS,
-            type: op === '!has' ? TYPE_NEGATE : TYPE_DEFAULT,
+            operation: opts.lowerCase ? INCLUDES_TO_LOWER_CASE : INCLUDES,
+            type: op === '!includes' ? TYPE_NEGATE : TYPE_DEFAULT,
             opts,
         };
     }
@@ -125,7 +125,7 @@ export const toFilterCtx = (def, op, opts = {}) => {
 };
 export const operatorReverseMap = {
     [EQUAL]: '=',
-    [HAS]: 'has',
+    [INCLUDES]: 'includes',
     [ENDS_WITH]: 'endsWith',
     [STARTS_WITH]: 'startsWith',
     [GREATER_THAN]: '>',
@@ -135,7 +135,7 @@ export const operatorReverseMap = {
     [RANGE]: '..',
     [RANGE_EXCLUDE]: '!..',
     [EQUAL_LOWER_CASE]: '= (lowerCase)',
-    [HAS_TO_LOWER_CASE]: 'has (lowerCase)',
+    [INCLUDES_TO_LOWER_CASE]: 'includes (lowerCase)',
     [STARTS_WITH_LOWER_CASE]: 'startsWith (lowerCase)',
     [ENDS_WITH_LOWER_CASE]: 'endsWith (lowerCase)',
     [LIKE]: 'like',

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

@@ -0,0 +1,3 @@
+import { IncludeOpts } from '../types.js';
+import { BranchInclude, QueryBranch } from '../BasedDbQuery.js';
+export declare const include: (query: QueryBranch<any>, fields: (string | BranchInclude | IncludeOpts | (string | IncludeOpts)[])[]) => void;