@based/db 0.0.18 → 0.0.20

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';

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

@@ -1,6 +1,5 @@
 import picocolors from 'picocolors';
-import { ALIAS, BINARY, BOOLEAN, REFERENCE, REFERENCES, REVERSE_TYPE_INDEX_MAP, STRING, TEXT, TIMESTAMP, VECTOR, } from '../../server/schema/types.js';
-import { propIsNumerical } from '../../server/schema/utils.js';
+import { ALIAS, BINARY, BOOLEAN, REFERENCE, REFERENCES, REVERSE_TYPE_INDEX_MAP, STRING, TEXT, TIMESTAMP, VECTOR, propIsNumerical, } from '@based/schema/def';
 import { EQUAL, HAS, isNumerical, LIKE, operatorReverseMap, VECTOR_FNS, } from './filter/types.js';
 import { MAX_ID, MAX_ID_VALUE, MAX_IDS_PER_QUERY, MIN_ID_VALUE, } from './thresholds.js';
 import { displayTarget, safeStringify } from './display.js';
@@ -439,8 +438,9 @@ export const EMPTY_SCHEMA_DEF = {
     lastId: 0,
     blockCapacity: 0,
     mainLen: 0,
-    buf: Buffer.from([]),
-    propNames: Buffer.from([]),
+    buf: new Uint8Array([]),
+    propNames: new Uint8Array([]),
+    packed: new Uint8Array([]),
     props: {},
     locales: {},
     reverseProps: {},
@@ -452,16 +452,17 @@ export const EMPTY_SCHEMA_DEF = {
     hasSeperateSort: false,
     seperateSort: {
         size: 0,
-        buffer: Buffer.from([]),
-        bufferTmp: Buffer.from([]),
+        buffer: new Uint8Array([]),
+        bufferTmp: new Uint8Array([]),
         props: [],
     },
     hasSeperateTextSort: false,
     seperateTextSort: {
         size: 0,
-        buffer: Buffer.from([]),
-        bufferTmp: Buffer.from([]),
+        buffer: new Uint8Array([]),
+        bufferTmp: new Uint8Array([]),
         props: [],
     },
+    localeSize: 0,
 };
 //# sourceMappingURL=validation.js.map

package/dist/src/index.d.ts

@@ -2,7 +2,6 @@ import { compress, decompress } from './client/string.js';
 import { ModifyCtx } from './client/operations.js';
 import { DbServer } from './server/index.js';
 import { DbClient } from './client/index.js';
-export * from './server/schema/typeDef.js';
 export * from './client/modify/modify.js';
 export { compress, decompress };
 export { ModifyCtx };

package/dist/src/index.js

@@ -3,7 +3,6 @@ import { ModifyCtx } from './client/operations.js';
 import { DbServer } from './server/index.js';
 import { DbClient } from './client/index.js';
 import picocolors from 'picocolors';
-export * from './server/schema/typeDef.js';
 export * from './client/modify/modify.js';
 export { compress, decompress };
 export { ModifyCtx }; // TODO move this somewhere

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

@@ -1,5 +1,5 @@
 import { LangName, StrictSchema } from '@based/schema';
-import { SchemaTypeDef } from './schema/types.js';
+import { SchemaTypesParsed, SchemaTypesParsedById } from '@based/schema/def';
 import { createTree } from './csmt/index.js';
 import { Worker, MessagePort } from 'node:worker_threads';
 import { TransformFns } from './migrate/index.js';
@@ -29,10 +29,8 @@ export declare class DbServer {
         lastId: number;
     };
     migrating: number;
-    schemaTypesParsed: {
-        [key: string]: SchemaTypeDef;
-    };
-    schemaTypesParsedById: Record<number, SchemaTypeDef>;
+    schemaTypesParsed: SchemaTypesParsed;
+    schemaTypesParsedById: SchemaTypesParsedById;
     fileSystemPath: string;
     maxModifySize: number;
     merkleTree: ReturnType<typeof createTree>;

package/dist/src/server/index.js

@@ -2,9 +2,9 @@ import native from '../native.js';
 import { rm, writeFile } from 'node:fs/promises';
 import { dirname, join } from 'node:path';
 import { getPropType, langCodesMap, } from '@based/schema';
-import { genRootId } from './schema/utils.js';
-import { updateTypeDefs } from './schema/typeDef.js';
-import { schemaToSelvaBuffer } from './schema/selvaBuffer.js';
+import { 
+// genRootId,
+updateTypeDefs, schemaToSelvaBuffer, } from '@based/schema/def';
 import { start } from './start.js';
 import { foreachDirtyBlock, makeCsmtKey, makeCsmtKeyFromNodeId, } from './tree.js';
 import { save } from './save.js';
@@ -310,12 +310,18 @@ export class DbServer {
             }
             // @ts-ignore This creates an internal type to use for root props
             this.schema.types._root = {
-                id: genRootId(),
+                id: 1,
                 props,
             };
             delete this.schema.props;
         }
-        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);
         if (!fromStart) {
             writeFile(join(this.fileSystemPath, SCHEMA_FILE), JSON.stringify(this.schema)).catch((err) => console.error(SCHEMA_FILE, err));
             let types = Object.keys(this.schemaTypesParsed);

package/dist/src/server/migrate/worker.js

@@ -1,7 +1,7 @@
 import { isMainThread, receiveMessageOnPort, workerData, } from 'node:worker_threads';
 import native from '../../native.js';
 import { BasedDb } from '../../index.js';
-import { REFERENCE, REFERENCES } from '../schema/types.js';
+import { REFERENCE, REFERENCES } from '@based/schema/def';
 if (isMainThread) {
     console.warn('running worker.ts in mainthread');
 }

package/dist/src/server/start.d.ts

@@ -1,6 +1,5 @@
 import { DbServer } from './index.js';
 import './worker.js';
-export declare const DEFAULT_BLOCK_CAPACITY = 100000;
 export declare function start(db: DbServer, opts: {
     clean?: boolean;
 }): Promise<void>;

package/dist/src/server/start.js

@@ -9,9 +9,9 @@ import { availableParallelism } from 'node:os';
 import exitHook from 'exit-hook';
 import './worker.js';
 import { save } from './save.js';
+import { DEFAULT_BLOCK_CAPACITY } from '@based/schema/def';
 const SCHEMA_FILE = 'schema.json';
 const WRITELOG_FILE = 'writelog.json';
-export const DEFAULT_BLOCK_CAPACITY = 100_000;
 const makeCsmtKey = (typeId, start) => typeId * 4294967296 + start;
 export async function start(db, opts) {
     const path = db.fileSystemPath;

package/dist/src/server/tree.d.ts

@@ -1,5 +1,5 @@
 import { DbServer } from './index.js';
-import { SchemaTypeDef } from './schema/types.js';
+import { SchemaTypeDef } from '@based/schema/def';
 export type CsmtNodeRange = {
     file: string;
     typeId: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@based/db",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "license": "MIT",
   "type": "module",
   "main": "./dist/src/index.js",
@@ -31,7 +31,7 @@
     "basedDbNative.cjs"
   ],
   "dependencies": {
-    "@based/schema": "5.0.0-alpha.3",
+    "@based/schema": "5.0.0-alpha.5",
     "@saulx/hash": "^3.0.0",
     "@saulx/utils": "^4.3.2",
     "exit-hook": "^4.0.0",

package/dist/src/server/schema/schema.d.ts

@@ -1,3 +0,0 @@
-export * from './types.js';
-export * from './typeDef.js';
-export * from './selvaBuffer.js';

package/dist/src/server/schema/schema.js

@@ -1,4 +0,0 @@
-export * from './types.js';
-export * from './typeDef.js';
-export * from './selvaBuffer.js';
-//# sourceMappingURL=schema.js.map

package/dist/src/server/schema/selvaBuffer.d.ts

@@ -1,4 +0,0 @@
-import { SchemaTypeDef } from './types.js';
-export declare function schemaToSelvaBuffer(schema: {
-    [key: string]: SchemaTypeDef;
-}): Buffer[];

package/dist/src/server/schema/selvaBuffer.js

@@ -1,112 +0,0 @@
-import { ALIAS, ALIASES, BINARY, BOOLEAN, CREATED, EMPTY_MICRO_BUFFER, ENUM, CARDINALITY, INT16, INT32, INT64, INT8, MICRO_BUFFER, NULL, NUMBER, REFERENCE, REFERENCES, STRING, TEXT, TIMESTAMP, UINT16, UINT32, UINT8, UPDATED, VECTOR, WEAK_REFERENCE, WEAK_REFERENCES, JSON, } from './types.js';
-const selvaTypeMap = [];
-selvaTypeMap[NULL] = 0;
-selvaTypeMap[TIMESTAMP] = 1;
-selvaTypeMap[CREATED] = 1;
-selvaTypeMap[UPDATED] = 1;
-selvaTypeMap[NUMBER] = 4;
-selvaTypeMap[CARDINALITY] = 11;
-selvaTypeMap[INT8] = 20;
-selvaTypeMap[UINT8] = 6;
-selvaTypeMap[INT16] = 21;
-selvaTypeMap[UINT16] = 22;
-selvaTypeMap[INT32] = 23;
-selvaTypeMap[UINT32] = 7;
-selvaTypeMap[INT64] = 24;
-selvaTypeMap[BOOLEAN] = 9;
-selvaTypeMap[ENUM] = 10;
-selvaTypeMap[STRING] = 11;
-selvaTypeMap[TEXT] = 12;
-selvaTypeMap[REFERENCE] = 13;
-selvaTypeMap[REFERENCES] = 14;
-selvaTypeMap[WEAK_REFERENCE] = 15;
-selvaTypeMap[WEAK_REFERENCES] = 16;
-selvaTypeMap[MICRO_BUFFER] = 17;
-selvaTypeMap[ALIAS] = 18;
-selvaTypeMap[ALIASES] = 19;
-selvaTypeMap[BINARY] = 11;
-selvaTypeMap[VECTOR] = 17;
-selvaTypeMap[JSON] = 11;
-const EDGE_FIELD_CONSTRAINT_FLAG_DEPENDENT = 0x01;
-function sepPropCount(props) {
-    return props.filter((prop) => prop.separate).length;
-}
-function makeEdgeConstraintFlags(prop) {
-    return prop.dependent ? EDGE_FIELD_CONSTRAINT_FLAG_DEPENDENT : 0x00;
-}
-const propDefBuffer = (schema, prop, isEdge) => {
-    const type = prop.typeIndex;
-    const selvaType = selvaTypeMap[type];
-    if (prop.len && (type === MICRO_BUFFER || type === VECTOR)) {
-        const buf = Buffer.allocUnsafe(3);
-        buf[0] = selvaType;
-        buf.writeUint16LE(prop.len, 1);
-        return [...buf.values()];
-    }
-    else if (type === REFERENCE || type === REFERENCES) {
-        const buf = Buffer.allocUnsafe(9);
-        const dstType = schema[prop.inverseTypeName];
-        let eschema = [];
-        // @ts-ignore
-        buf[0] = selvaType + 2 * !!isEdge; // field type
-        buf[1] = makeEdgeConstraintFlags(prop); // flags
-        buf.writeUInt16LE(dstType.id, 2); // dst_node_type
-        buf.writeUint32LE(0, 5); // schema_len
-        if (!isEdge) {
-            prop.inverseTypeId = dstType.id;
-            prop.inversePropNumber = dstType.props[prop.inversePropName].prop;
-            buf[4] = prop.inversePropNumber;
-            if (prop.edges) {
-                const props = Object.values(prop.edges);
-                eschema = props
-                    .map((prop) => propDefBuffer(schema, prop, true))
-                    .flat(1);
-                eschema.unshift(0, 0, 0, 0, sepPropCount(props), 0);
-                buf.writeUint32LE(eschema.length, 5);
-            }
-        }
-        return [...buf.values(), ...eschema];
-    }
-    else if (type === STRING ||
-        type === BINARY ||
-        type === CARDINALITY ||
-        type === JSON) {
-        return [selvaType, prop.len < 50 ? prop.len : 0];
-    }
-    {
-        return [selvaType];
-    }
-};
-function makeBlockCapacityBuffer(blockCapacity) {
-    const buf = Buffer.allocUnsafe(4);
-    buf.writeInt32LE(blockCapacity);
-    return buf;
-}
-// todo rewrite
-export function schemaToSelvaBuffer(schema) {
-    return Object.values(schema).map((t, i) => {
-        const props = Object.values(t.props);
-        const rest = [];
-        let refFields = 0;
-        for (const f of props) {
-            if (f.separate) {
-                if (f.typeIndex === REFERENCE || f.typeIndex === REFERENCES) {
-                    refFields++;
-                }
-                rest.push(f);
-            }
-        }
-        rest.sort((a, b) => a.prop - b.prop);
-        return Buffer.from([
-            ...makeBlockCapacityBuffer(t.blockCapacity).values(),
-            1 + sepPropCount(props),
-            1 + refFields,
-            ...propDefBuffer(schema, {
-                ...EMPTY_MICRO_BUFFER,
-                len: t.mainLen === 0 ? 1 : t.mainLen,
-            }),
-            ...rest.map((f) => propDefBuffer(schema, f)).flat(1),
-        ]);
-    });
-}
-//# sourceMappingURL=selvaBuffer.js.map

package/dist/src/server/schema/typeDef.d.ts

@@ -1,6 +0,0 @@
-import { SchemaObject, StrictSchemaType, SchemaLocales } from '@based/schema';
-import { SchemaTypeDef } from './types.js';
-import { DbClient } from '../../client/index.js';
-import { DbServer } from '../index.js';
-export declare const updateTypeDefs: (db: DbClient | DbServer) => void;
-export declare const createSchemaTypeDef: (typeName: string, type: StrictSchemaType | SchemaObject, parsed: DbClient["schemaTypesParsed"], locales: Partial<SchemaLocales>, result?: Partial<SchemaTypeDef>, path?: string[], top?: boolean) => SchemaTypeDef;