@based/db 0.0.17 → 0.0.19

package/dist/lib/darwin_aarch64/include/selva/fields.h

@@ -58,11 +58,6 @@ struct SelvaNodeWeakReferences {
     struct SelvaNodeWeakReference *refs __pcounted_by(nr_refs);
 };
 
-struct SelvaMicroBuffer {
-    uint16_t len;
-    uint8_t data[] __counted_by(len);
-} __packed;
-
 struct SelvaFieldsAny {
     enum SelvaFieldType type; /*!< Type of the value. */
     union {
@@ -85,9 +80,7 @@ struct SelvaFieldsAny {
         struct SelvaNodeReferences *references; /*!< SELVA_FIELD_TYPE_REFERENCES */
         struct SelvaNodeWeakReference weak_reference; /*!< SELVA_FIELD_TYPE_WEAK_REFERENCE */
         struct SelvaNodeWeakReferences weak_references; /*!< SELVA_FIELD_TYPE_WEAK_REFERENCES */
-        struct SelvaMicroBuffer *smb; /*!< SELVA_FIELD_TYPE_MICRO_BUFFER */
 #endif
-        // HyperLogLogPlusPlus cardinality; /*!< SELVA_FIELD_TYPE_HLL */
     };
 };
 

package/dist/lib/linux_aarch64/include/selva/fields.h

@@ -58,11 +58,6 @@ struct SelvaNodeWeakReferences {
     struct SelvaNodeWeakReference *refs __pcounted_by(nr_refs);
 };
 
-struct SelvaMicroBuffer {
-    uint16_t len;
-    uint8_t data[] __counted_by(len);
-} __packed;
-
 struct SelvaFieldsAny {
     enum SelvaFieldType type; /*!< Type of the value. */
     union {
@@ -85,9 +80,7 @@ struct SelvaFieldsAny {
         struct SelvaNodeReferences *references; /*!< SELVA_FIELD_TYPE_REFERENCES */
         struct SelvaNodeWeakReference weak_reference; /*!< SELVA_FIELD_TYPE_WEAK_REFERENCE */
         struct SelvaNodeWeakReferences weak_references; /*!< SELVA_FIELD_TYPE_WEAK_REFERENCES */
-        struct SelvaMicroBuffer *smb; /*!< SELVA_FIELD_TYPE_MICRO_BUFFER */
 #endif
-        // HyperLogLogPlusPlus cardinality; /*!< SELVA_FIELD_TYPE_HLL */
     };
 };
 

package/dist/lib/linux_x86_64/include/selva/fields.h

@@ -58,11 +58,6 @@ struct SelvaNodeWeakReferences {
     struct SelvaNodeWeakReference *refs __pcounted_by(nr_refs);
 };
 
-struct SelvaMicroBuffer {
-    uint16_t len;
-    uint8_t data[] __counted_by(len);
-} __packed;
-
 struct SelvaFieldsAny {
     enum SelvaFieldType type; /*!< Type of the value. */
     union {
@@ -85,9 +80,7 @@ struct SelvaFieldsAny {
         struct SelvaNodeReferences *references; /*!< SELVA_FIELD_TYPE_REFERENCES */
         struct SelvaNodeWeakReference weak_reference; /*!< SELVA_FIELD_TYPE_WEAK_REFERENCE */
         struct SelvaNodeWeakReferences weak_references; /*!< SELVA_FIELD_TYPE_WEAK_REFERENCES */
-        struct SelvaMicroBuffer *smb; /*!< SELVA_FIELD_TYPE_MICRO_BUFFER */
 #endif
-        // HyperLogLogPlusPlus cardinality; /*!< SELVA_FIELD_TYPE_HLL */
     };
 };
 

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

@@ -1,6 +1,6 @@
 import { Schema, StrictSchema } from '@based/schema';
 import { CreateObj } from './modify/create.js';
-import { SchemaTypeDef } from '../server/schema/types.js';
+import { SchemaTypeDef } from '@based/schema/def';
 import { ModifyCtx } from './operations.js';
 import { SubscriptionMarkerMap, SubscriptionsMap, SubscriptionsToRun } from './query/subscription/index.js';
 import { BasedDbQuery, QueryByAliasObj } from './query/BasedDbQuery.js';

package/dist/src/client/index.js

@@ -1,13 +1,12 @@
 import { parse } from '@based/schema';
 import { create } from './modify/create.js';
+import { updateTypeDefs, schemaToSelvaBuffer, } from '@based/schema/def';
 import { flushBuffer, ModifyCtx } from './operations.js';
 import { BasedDbQuery } from './query/BasedDbQuery.js';
 import { ModifyState } from './modify/ModifyRes.js';
 import { upsert } from './modify/upsert.js';
 import { update } from './modify/update.js';
 import { deleteFn } from './modify/delete.js';
-import { updateTypeDefs } from '../server/schema/typeDef.js';
-import { schemaToSelvaBuffer } from '../server/schema/selvaBuffer.js';
 import { deepEqual } from '@saulx/utils';
 import { hash } from '@saulx/hash';
 import { expire } from './modify/expire.js';
@@ -53,7 +52,13 @@ export class DbClient {
             return this.schema;
         }
         this.schema = schema;
-        updateTypeDefs(this);
+        for (const field in this.schema.types) {
+            if (!('id' in this.schema.types[field])) {
+                this.schema.lastId++;
+                this.schema.types[field].id = this.schema.lastId;
+            }
+        }
+        updateTypeDefs(this.schema, this.schemaTypesParsed, this.schemaTypesParsedById);
         // TODO should not need this, but it modifies the schema
         schemaToSelvaBuffer(this.schemaTypesParsed);
         return this.schema;

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

@@ -1,4 +1,4 @@
-import { PropDef, PropDefEdge, SchemaPropTree } from '../../server/schema/types.js';
+import { PropDef, PropDefEdge, SchemaPropTree } from '@based/schema/def';
 import { inspect } from 'node:util';
 import { SubscriptionMarkersCheck } from '../query/subscription/index.js';
 import { DbClient } from '../index.js';

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

@@ -1,4 +1,4 @@
-import { isPropDef, REVERSE_TYPE_INDEX_MAP, } from '../../server/schema/types.js';
+import { isPropDef, REVERSE_TYPE_INDEX_MAP, } from '@based/schema/def';
 import { inspect } from 'node:util';
 import { langCodesMap } from '@based/schema';
 const MAGIC_KEY = Math.random().toString(36).substring(2);

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

@@ -1,4 +1,4 @@
 import { ModifyCtx } from '../../index.js';
-import { SchemaTypeDef, PropDef } from '../../server/schema/types.js';
+import { SchemaTypeDef, PropDef } from '@based/schema/def';
 import { ModifyOp, ModifyErr } from './types.js';
 export declare function writeAlias(value: string | null | Buffer, ctx: ModifyCtx, def: SchemaTypeDef, t: PropDef, parentId: number, modifyOp: ModifyOp): ModifyErr;

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

@@ -31,7 +31,7 @@ export function writeAlias(value, ctx, def, t, parentId, modifyOp) {
             ctx.len += ctx.buf.write(value, ctx.len, 'utf8');
         }
     }
-    else if (typeof value === null) {
+    else if (value === null) {
         if (modifyOp === UPDATE) {
             if (ctx.len + 11 > ctx.max) {
                 return RANGE_ERR;

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

@@ -1,5 +1,5 @@
 import { ModifyCtx } from '../../index.js';
-import { PropDef, SchemaTypeDef } from '../../server/schema/types.js';
+import { PropDef, SchemaTypeDef } from '@based/schema/def';
 import { ModifyOp, ModifyErr } from './types.js';
 export declare function getBuffer(value: any): Buffer;
 export declare function writeBinaryRaw(value: Buffer, ctx: ModifyCtx): void;

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

@@ -1,4 +1,4 @@
 import { ModifyCtx } from '../../index.js';
-import { SchemaTypeDef, PropDef } from '../../server/schema/types.js';
+import { SchemaTypeDef, PropDef } from '@based/schema/def';
 import { ModifyOp, ModifyErr } from './types.js';
 export declare function writeHll(value: string | null | Buffer | Array<string | Buffer>, ctx: ModifyCtx, def: SchemaTypeDef, t: PropDef, parentId: number, modifyOp: ModifyOp): ModifyErr;

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

@@ -1,4 +1,4 @@
-import { RANGE_ERR, CREATE, } from './types.js';
+import { RANGE_ERR, CREATE } from './types.js';
 import { ModifyError } from './ModifyRes.js';
 import { setCursor } from './setCursor.js';
 import { xxHash64 } from '../xxHash64.js';

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

@@ -1,4 +1,4 @@
-import { MICRO_BUFFER } from '../../server/schema/schema.js';
+import { MICRO_BUFFER } from '@based/schema/def';
 import { startDrain, flushBuffer } from '../operations.js';
 import { setCursor } from './setCursor.js';
 import { modify } from './modify.js';
@@ -59,7 +59,7 @@ const appendCreate = (ctx, def, obj, res, unsafe) => {
             ctx.buf[sizepos] = size >>>= 8;
         }
         if (ctx.hasSortField !== -1) {
-            def.seperateSort.buffer.copy(def.seperateSort.bufferTmp);
+            def.seperateSort.buffer.set(def.seperateSort.bufferTmp);
         }
     }
 };

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

@@ -1,7 +1,7 @@
 import { flushBuffer, startDrain } from '../operations.js';
 import { setCursor } from './setCursor.js';
 import { UPDATE } from './types.js';
-import { MICRO_BUFFER } from '../../server/schema/schema.js';
+import { MICRO_BUFFER } from '@based/schema/def';
 export const deleteFn = (db, type, id) => {
     const ctx = db.modifyCtx;
     const schema = db.schemaTypesParsed[type];

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

@@ -1,4 +1,4 @@
-import { MICRO_BUFFER } from '../../server/schema/schema.js';
+import { MICRO_BUFFER } from '@based/schema/def';
 import { startDrain, flushBuffer } from '../operations.js';
 import { setCursor } from './setCursor.js';
 import { EXPIRE } from './types.js';

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

@@ -1,5 +1,5 @@
 import { ModifyCtx } from '../../index.js';
-import { PropDef, PropDefEdge } from '../../server/schema/types.js';
+import { PropDef, PropDefEdge } from '@based/schema/def';
 import { ModifyErr } from './types.js';
 export declare const writeFixedValue: (ctx: ModifyCtx, val: any, def: PropDef | PropDefEdge, pos: number) => ModifyErr;
 export declare const appendFixedValue: (ctx: ModifyCtx, val: any, def: PropDef | PropDefEdge) => ModifyErr;

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

@@ -1,4 +1,4 @@
-import { BINARY, BOOLEAN, ENUM, INT16, INT32, INT8, NUMBER, STRING, TIMESTAMP, UINT16, UINT32, UINT8, } from '../../server/schema/types.js';
+import { BINARY, BOOLEAN, ENUM, INT16, INT32, INT8, NUMBER, STRING, TIMESTAMP, UINT16, UINT32, UINT8, } from '@based/schema/def';
 import { convertToTimestamp } from '../timestamp.js';
 import { getBuffer } from './binary.js';
 import { ModifyError } from './ModifyRes.js';

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

@@ -1,4 +1,4 @@
 import { ModifyCtx } from '../../index.js';
-import { PropDef, SchemaTypeDef } from '../../server/schema/types.js';
+import { PropDef, SchemaTypeDef } from '@based/schema/def';
 import { ModifyOp, ModifyErr } from './types.js';
 export declare function writeJson(value: any, ctx: ModifyCtx, schema: SchemaTypeDef, t: PropDef, parentId: number, modifyOp: ModifyOp): ModifyErr;

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

@@ -1,5 +1,5 @@
 import { ModifyCtx } from '../../index.js';
-import { SchemaTypeDef } from '../../server/schema/types.js';
+import { SchemaTypeDef } from '@based/schema/def';
 import { ModifyState } from './ModifyRes.js';
 import { ModifyErr, ModifyOp } from './types.js';
 export declare function modify(ctx: ModifyCtx, res: ModifyState, obj: Record<string, any>, schema: SchemaTypeDef, mod: ModifyOp, tree: SchemaTypeDef['tree'], overwrite: boolean, unsafe?: boolean): ModifyErr;

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

@@ -1,4 +1,4 @@
-import { isPropDef, REFERENCE, REFERENCES, STRING, TEXT, ALIAS, BINARY, CARDINALITY, VECTOR, MICRO_BUFFER, JSON, } from '../../server/schema/types.js';
+import { isPropDef, REFERENCE, REFERENCES, STRING, TEXT, ALIAS, BINARY, CARDINALITY, VECTOR, MICRO_BUFFER, JSON, } from '@based/schema/def';
 import { ModifyError } from './ModifyRes.js';
 import { writeReference } from './references/reference.js';
 import { writeReferences } from './references/references.js';

package/dist/src/client/modify/references/edge.d.ts

@@ -1,5 +1,5 @@
 import { ModifyCtx } from '../../../index.js';
-import { PropDef } from '../../../server/schema/types.js';
+import { PropDef } from '@based/schema/def';
 import { ModifyErr } from '../types.js';
 import { RefModifyOpts } from './references.js';
 export declare function getEdgeSize(t: PropDef, ref: RefModifyOpts): number;

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

@@ -1,4 +1,4 @@
-import { BINARY, REFERENCE, REFERENCES, STRING, } from '../../../server/schema/types.js';
+import { BINARY, REFERENCE, REFERENCES, STRING, } from '@based/schema/def';
 import { write } from '../../string.js';
 import { getBuffer, writeBinaryRaw } from '../binary.js';
 import { ModifyError, ModifyState } from '../ModifyRes.js';

package/dist/src/client/modify/references/reference.d.ts

@@ -1,5 +1,5 @@
 import { ModifyCtx } from '../../../index.js';
-import { PropDef, SchemaTypeDef } from '../../../server/schema/types.js';
+import { PropDef, SchemaTypeDef } from '@based/schema/def';
 import { ModifyState } from '../ModifyRes.js';
 import { ModifyErr, ModifyOp } from '../types.js';
 export declare function writeReference(value: number | ModifyState | {

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

@@ -1,5 +1,5 @@
 import { ModifyCtx } from '../../../index.js';
-import { PropDef, SchemaTypeDef } from '../../../server/schema/types.js';
+import { PropDef, SchemaTypeDef } from '@based/schema/def';
 import { ModifyState } from '../ModifyRes.js';
 import { ModifyErr, ModifyOp } from '../types.js';
 export type RefModifyOpts = {

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

@@ -1,4 +1,4 @@
-import { REFERENCES, } from '../../../server/schema/types.js';
+import { REFERENCES } from '@based/schema/def';
 import { ModifyError, ModifyState } from '../ModifyRes.js';
 import { setCursor } from '../setCursor.js';
 import { DELETE, RANGE_ERR } from '../types.js';

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

@@ -1,4 +1,4 @@
 import { ModifyCtx } from '../../index.js';
-import { SchemaTypeDef } from '../../server/schema/types.js';
+import { SchemaTypeDef } from '@based/schema/def';
 import { ModifyOp } from './types.js';
 export declare const setCursor: (ctx: ModifyCtx, schema: SchemaTypeDef, field: number, typeIndex: number, id: number, modifyOp: ModifyOp, ignoreField?: boolean) => void;

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

@@ -1,5 +1,5 @@
 import { LangCode } from '@based/schema';
 import { ModifyCtx } from '../../index.js';
-import { SchemaTypeDef, PropDef } from '../../server/schema/types.js';
+import { SchemaTypeDef, PropDef } from '@based/schema/def';
 import { ModifyOp, ModifyErr } from './types.js';
 export declare function writeString(lang: LangCode, value: string | null | Buffer, ctx: ModifyCtx, def: SchemaTypeDef, t: PropDef, parentId: number, modifyOp: ModifyOp): ModifyErr;

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

@@ -1,6 +1,6 @@
 import { ModifyCtx } from '../../index.js';
 import { ModifyOp, ModifyErr } from './types.js';
-import { SchemaTypeDef, PropDef } from '../../server/schema/types.js';
+import { SchemaTypeDef, PropDef } from '@based/schema/def';
 import { writeString } from './string.js';
 import { ModifyState } from './ModifyRes.js';
 export declare function writeText(value: {

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

@@ -1,9 +1,15 @@
 import { langCodesMap } from '@based/schema';
+import { CREATE } from './types.js';
 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.locale ?? langCodesMap.get('en'), value, ctx, def, t, res.tmpId, modifyOp);
+        if (modifyOp === CREATE) {
+            def.seperateTextSort.bufferTmp[t.prop * def.localeSize] = 2;
+            ctx.hasSortText++;
+        }
+        return err;
     }
     else {
         for (const lang in value) {

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

@@ -1,4 +1,4 @@
-import { MICRO_BUFFER, } from '../../server/schema/schema.js';
+import { MICRO_BUFFER } from '@based/schema/def';
 import { startDrain, flushBuffer } from '../operations.js';
 import { setCursor } from './setCursor.js';
 import { modify } from './modify.js';

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

@@ -1,4 +1,4 @@
-import { ALIAS } from '../../server/schema/types.js';
+import { ALIAS } from '@based/schema/def';
 export async function upsert(db, type, obj, opts) {
     const tree = db.schemaTypesParsed[type].tree;
     let q;

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

@@ -1,4 +1,4 @@
 import { ModifyCtx } from '../../index.js';
-import { PropDef, SchemaTypeDef } from '../../server/schema/types.js';
+import { PropDef, SchemaTypeDef } from '@based/schema/def';
 import { ModifyOp, ModifyErr } from './types.js';
 export declare function writeVector(value: any, ctx: ModifyCtx, schema: SchemaTypeDef, t: PropDef, parentId: number, modifyOp: ModifyOp): ModifyErr;

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

@@ -1,4 +1,4 @@
-import { PropDef, SchemaTypeDef } from '../server/schema/types.js';
+import { PropDef, SchemaTypeDef } from '@based/schema/def';
 import { DbClient } from './index.js';
 import { ModifyState } from './modify/ModifyRes.js';
 export declare class ModifyCtx {
@@ -7,6 +7,7 @@ export declare class ModifyCtx {
     id: number;
     lastMain: number;
     hasSortField: number;
+    hasSortText: number;
     queue: Map<(payload: any) => void, ModifyState>;
     ctx: {
         offsets?: Record<number, number>;

package/dist/src/client/operations.js

@@ -10,6 +10,7 @@ export class ModifyCtx {
     id = -1;
     lastMain = -1;
     hasSortField = -1;
+    hasSortText = -1;
     queue = new Map();
     ctx = {}; // maybe make this different?
     payload;

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

@@ -4,7 +4,7 @@ import { createOrGetEdgeRefQueryDef, createOrGetRefQueryDef, } from './include/u
 import { FilterBranch } from './filter/FilterBranch.js';
 import { search, vectorSearch } from './search/index.js';
 import native from '../../native.js';
-import { REFERENCE, REFERENCES } from '../../server/schema/types.js';
+import { REFERENCE, REFERENCES } from '@based/schema/def';
 import { subscribe } from './subscription/index.js';
 import { registerQuery } from './registerQuery.js';
 import { langCodesMap } from '@based/schema';

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

@@ -1,5 +1,5 @@
 import picocolors from 'picocolors';
-import { isPropDef, REVERSE_TYPE_INDEX_MAP } from '../../server/schema/types.js';
+import { isPropDef, REVERSE_TYPE_INDEX_MAP } from '@based/schema/def';
 import { QueryDefType } from './types.js';
 import { concatUint8Arr } from '../bitWise.js';
 export const debugQueryDef = (q, returnIt) => {

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

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

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

@@ -1,5 +1,5 @@
 import picocolors from 'picocolors';
-import { BINARY, CARDINALITY, NUMBER, REFERENCE, REFERENCES, STRING, TEXT, TIMESTAMP, } from '../../server/schema/types.js';
+import { BINARY, CARDINALITY, NUMBER, REFERENCE, REFERENCES, STRING, TEXT, TIMESTAMP, } from '@based/schema/def';
 const decimals = (v) => ~~(v * 100) / 100;
 const sizeCalc = (size) => {
     if (size > 1e6) {

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

@@ -1,4 +1,4 @@
-import { PropDef, PropDefEdge } from '../../../server/schema/types.js';
+import { PropDef, PropDefEdge } from '@based/schema/def';
 import { FilterCtx } from './types.js';
 export declare const writeFixed: (prop: PropDef | PropDefEdge, buf: Buffer, value: any, size: number, offset: number) => void;
 export declare const createFixedFilterBuffer: (prop: PropDef | PropDefEdge, size: number, ctx: FilterCtx, value: any, sort: boolean) => Buffer;

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

@@ -1,5 +1,4 @@
-import { BINARY, STRING, REFERENCES, } from '../../../server/schema/types.js';
-import { propIsSigned } from '../../../server/schema/utils.js';
+import { BINARY, STRING, REFERENCES, propIsSigned, } from '@based/schema/def';
 import { EQUAL, MODE_AND_FIXED, MODE_DEFAULT, MODE_OR_FIXED, } from './types.js';
 import { parseFilterValue } from './parseFilterValue.js';
 // -------------------------------------------

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

@@ -1,3 +1,3 @@
-import { PropDef, PropDefEdge } from '../../../server/schema/types.js';
+import { PropDef, PropDefEdge } from '@based/schema/def';
 import { FilterCtx } from './types.js';
 export declare const createReferenceFilter: (prop: PropDef | PropDefEdge, ctx: FilterCtx, value: any) => Buffer;

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

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

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

@@ -1,4 +1,4 @@
-import { ALIAS, TEXT, VECTOR, } from '../../../server/schema/types.js';
+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 { createFixedFilterBuffer } from './createFixedFilterBuffer.js';
 import { crc32 } from '../../crc32.js';

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

@@ -1,5 +1,5 @@
 import { QueryDef, QueryDefFilter } from '../types.js';
-import { SchemaTypeDef } from '../../../server/schema/schema.js';
+import { SchemaTypeDef } from '@based/schema/def';
 import { Operator } from './types.js';
 import { Filter, FilterAst } from './types.js';
 import { DbClient } from '../../index.js';

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

@@ -1,4 +1,4 @@
-import { isPropDef, ID_FIELD_DEF, TEXT, REFERENCE, } from '../../../server/schema/schema.js';
+import { isPropDef, ID_FIELD_DEF, TEXT, REFERENCE, } from '@based/schema/def';
 import { primitiveFilter } from './primitiveFilter.js';
 import { IsFilter } from './types.js';
 import { langCodesMap } from '@based/schema';

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

@@ -1,2 +1,2 @@
-import { PropDef, PropDefEdge } from '../../../server/schema/types.js';
+import { PropDef, PropDefEdge } from '@based/schema/def';
 export declare const parseFilterValue: (prop: PropDef | PropDefEdge, value: any) => any;

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

@@ -1,4 +1,4 @@
-import { TIMESTAMP, CREATED, UPDATED, ENUM, BOOLEAN, STRING, BINARY, TEXT, } from '../../../server/schema/types.js';
+import { TIMESTAMP, CREATED, UPDATED, ENUM, BOOLEAN, STRING, BINARY, TEXT, } from '@based/schema/def';
 import { crc32 } from '../../crc32.js';
 import { convertToTimestamp } from '../../timestamp.js';
 // -------------------------------------------

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

@@ -1,4 +1,4 @@
-import { PropDef, PropDefEdge } from '../../../server/schema/types.js';
+import { PropDef, PropDefEdge } from '@based/schema/def';
 import { QueryDef, QueryDefFilter } from '../types.js';
 import { Filter } from './types.js';
 import { LangCode } from '@based/schema';

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

@@ -1,4 +1,4 @@
-import { REFERENCE, REFERENCES, REVERSE_SIZE_MAP, } from '../../../server/schema/types.js';
+import { CARDINALITY, REFERENCE, REFERENCES, REVERSE_SIZE_MAP, } from '@based/schema/def';
 import { EQUAL, isNumerical } from './types.js';
 import { createVariableFilterBuffer } from './createVariableFilterBuffer.js';
 import { createFixedFilterBuffer } from './createFixedFilterBuffer.js';
@@ -27,6 +27,9 @@ export const primitiveFilter = (def, prop, filter, conditions, lang) => {
         }
         buf = createFixedFilterBuffer(prop, 4, ctx, value, !isNumerical(ctx.operation));
     }
+    else if (prop.typeIndex === CARDINALITY) {
+        buf = createFixedFilterBuffer(prop, 2, ctx, value, false);
+    }
     else if (propSize) {
         buf = createFixedFilterBuffer(prop, propSize, ctx, value, false);
     }

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

@@ -1,4 +1,4 @@
-import { PropDef, PropDefEdge } from '../../../server/schema/types.js';
+import { PropDef, PropDefEdge } from '@based/schema/def';
 import { QueryDef } from '../types.js';
 export declare const getAll: (props: QueryDef["props"]) => string[];
 export declare const getAllRefs: (props: QueryDef["props"], affix?: string) => string[];

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

@@ -1,4 +1,4 @@
-import { REFERENCE, REFERENCES, TEXT, } from '../../../server/schema/types.js';
+import { REFERENCE, REFERENCES, TEXT, } from '@based/schema/def';
 export const getAll = (props) => {
     const fields = [];
     for (const key in props) {

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

@@ -1,4 +1,4 @@
-import { PropDef, PropDefEdge, SchemaPropTree } from '../../../server/schema/types.js';
+import { PropDef, PropDefEdge, SchemaPropTree } from '@based/schema/def';
 import { DbClient } from '../../index.js';
 import { QueryDef } from '../types.js';
 export declare const getAllFieldFromObject: (tree: SchemaPropTree | PropDef, arr?: string[]) => string[];

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

@@ -1,4 +1,4 @@
-import { REFERENCE, } from '../../../server/schema/types.js';
+import { REFERENCE, } from '@based/schema/def';
 import { createQueryDef } from '../queryDef.js';
 import { QueryDefType } from '../types.js';
 export const getAllFieldFromObject = (tree, arr = []) => {

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

@@ -1,4 +1,4 @@
-import { isPropDef, REFERENCE, REFERENCES, TEXT, } from '../../../server/schema/types.js';
+import { isPropDef, REFERENCE, REFERENCES, TEXT, } from '@based/schema/def';
 import { createQueryDef } from '../queryDef.js';
 import { isRefDef, QueryDefType } from '../types.js';
 import { getAllFieldFromObject, createOrGetRefQueryDef } from './utils.js';

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

@@ -1,4 +1,4 @@
-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 { ALIAS, ALIASES, BINARY, BOOLEAN, ENUM, INT16, INT32, INT8, NUMBER, STRING, TEXT, TIMESTAMP, UINT16, UINT32, UINT8, VECTOR, JSON, CARDINALITY, } from '@based/schema/def';
 import { read, readUtf8 } from '../../string.js';
 import { readDoubleLE, readFloatLE, readInt16, readInt32, readUint16, readUint32, } from '../../bitWise.js';
 import { inverseLangMap } from '@based/schema';

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

@@ -1,5 +1,5 @@
 import { langCodesMap } from '@based/schema';
-import { STRING, TEXT, VECTOR } from '../../../server/schema/types.js';
+import { STRING, TEXT, VECTOR } from '@based/schema/def';
 import { getVectorFn } from '../filter/types.js';
 import { searchDoesNotExist, searchIncorrecQueryValue, searchIncorrectType, } from '../validation.js';
 const makeSize = (nr, u8 = false) => {

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

@@ -1,4 +1,4 @@
-import { PropDef, PropDefEdge } from '../../../server/schema/types.js';
+import { PropDef, PropDefEdge } from '@based/schema/def';
 import { Subscription, SubscriptionMarkerMap, SubscriptionMarkersCheck } from './types.js';
 import { BasedDbQuery } from '../BasedDbQuery.js';
 import { DbClient } from '../../index.js';

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

@@ -1,5 +1,5 @@
 import { LangCode } from '@based/schema';
-import { PropDef, PropDefEdge, SchemaTypeDef } from '../../server/schema/schema.js';
+import { PropDef, PropDefEdge, SchemaTypeDef } from '@based/schema/def';
 import { FilterOpts } from './filter/types.js';
 import { QueryError } from './validation.js';
 export type MainIncludes = {

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

@@ -1,4 +1,4 @@
-import { PropDef, PropDefEdge, SchemaTypeDef } from '../../server/schema/types.js';
+import { PropDef, PropDefEdge, SchemaTypeDef } from '@based/schema/def';
 import { DbClient } from '../index.js';
 import { Filter } from './query.js';
 import { QueryByAliasObj, QueryDef } from './types.js';