@based/db 0.0.1 → 0.0.3

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

@@ -1,5 +1,5 @@
 import { Subscription } from './types.js';
 import { DbClient } from '../../index.js';
-export declare const resultsAreEqual: (a: Buffer, b: Buffer) => boolean;
+export declare const resultsAreEqual: (a: Uint8Array, b: Uint8Array) => boolean;
 export declare const runSubscription: (subscription: Subscription) => void;
 export declare const startSubscription: (db: DbClient) => void;

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

@@ -16,6 +16,7 @@ export const resultsAreEqual = (a, b) => {
         return false;
     return true;
 };
+const EMPTY = new Uint8Array(Buffer.alloc(4));
 export const runSubscription = (subscription) => {
     if (!subscription.inProgress) {
         subscription.inProgress = true;
@@ -29,7 +30,15 @@ export const runSubscription = (subscription) => {
                 return;
             }
             subscription.inProgress = false;
-            const buf = Buffer.from(res);
+            let err = null;
+            let buf;
+            if (res instanceof Error) {
+                err = res;
+                buf = EMPTY;
+            }
+            else {
+                buf = res;
+            }
             if (subscription.res) {
                 if (resultsAreEqual(subscription.res.result, buf)) {
                     return;
@@ -41,8 +50,9 @@ export const runSubscription = (subscription) => {
             else {
                 subscription.res = new BasedQueryResponse(q.id, q.def, buf, performance.now() - d);
             }
+            console.log('RUN ', subscription.subs.size);
             subscription.subs.forEach((fn) => {
-                fn(subscription.res);
+                fn(subscription.res, err);
             });
         })
             .catch((err) => {

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

@@ -224,6 +224,9 @@ export function defToBuffer(db, def) {
         result.push(metaEdgeBuffer, ...edges);
     }
     // 8 byte crc 32
+    if (def.type === QueryDefType.Root) {
+        result.push(Buffer.from([def.lang]));
+    }
     return result;
 }
 //# sourceMappingURL=toBuffer.js.map

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

@@ -1,3 +1,4 @@
+import { LangCode } from '@based/schema';
 import { PropDef, PropDefEdge, SchemaTypeDef } from '../../server/schema/schema.js';
 export type MainIncludes = {
     [start: string]: [number, PropDef];
@@ -44,6 +45,7 @@ export type QueryDefSort = {
     order: 0 | 1;
 };
 export type QueryDefShared = {
+    lang: LangCode;
     filter: QueryDefFilter;
     search: null | QueryDefSearch;
     sort: null | QueryDefSort;

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

@@ -1,5 +1,6 @@
 import { LangCode } from '@based/schema';
 export declare const write: (buf: Buffer, value: string, offset: number, noCompression: boolean, lang?: LangCode) => number;
 export declare const compress: (str: string) => Buffer;
-export declare const decompress: (buf: Buffer) => string;
-export declare const read: (buf: Buffer, offset: number, len: number) => string;
+export declare const decompress: (val: Uint8Array) => string;
+export declare const read: (val: Uint8Array, offset: number, len: number) => string;
+export declare const readUtf8: (val: Uint8Array, offset: number, len: number) => string;

package/dist/src/client/string.js

@@ -1,4 +1,7 @@
 import native from '../native.js';
+import { readUint32 } from './bitWise.js';
+const DECODER = new TextDecoder('utf-8');
+// add encoder
 // type 0 = no compression; 1 = deflate
 // [lang] [type] [uncompressed size 4] [compressed string] [crc32]
 // var cnt = 0
@@ -54,20 +57,23 @@ export const compress = (str) => {
     tmpCompressBlock.copy(nBuffer, 0, 0, s);
     return nBuffer;
 };
-export const decompress = (buf) => {
-    return read(buf, 0, buf.byteLength);
+export const decompress = (val) => {
+    return read(val, 0, val.length);
 };
-export const read = (buf, offset, len) => {
-    const type = buf[offset + 1];
+export const read = (val, offset, len) => {
+    const type = val[offset + 1];
     if (type == 1) {
-        const origSize = buf.readUint32LE(offset + 2);
+        const origSize = readUint32(val, offset + 2);
         const newBuffer = Buffer.allocUnsafe(origSize);
-        native.decompress(buf, newBuffer, offset + 6, len - 6);
+        native.decompress(Buffer.from(val), newBuffer, offset + 6, len - 6);
         return newBuffer.toString('utf8');
     }
     else if (type == 0) {
-        return buf.toString('utf8', offset + 2, len + offset - 4);
+        return DECODER.decode(val.subarray(offset + 2, len + offset - 4));
     }
     return '';
 };
+export const readUtf8 = (val, offset, len) => {
+    return DECODER.decode(val.subarray(offset, len + offset));
+};
 //# sourceMappingURL=string.js.map

package/dist/src/native.d.ts

@@ -4,7 +4,7 @@ declare const _default: {
     externalFromInt(address: BigInt): any;
     intFromExternal(external: any): BigInt;
     modify: (data: Buffer, types: Buffer, dbCtx: any) => any;
-    getQueryBuf: (q: Buffer, dbCtx: any) => Buffer | null;
+    getQueryBuf: (q: Buffer, dbCtx: any) => ArrayBuffer | null;
     start: (id: number) => any;
     stop: (dbCtx: any) => any;
     saveCommon: (path: string, dbCtx: any) => number;

package/dist/src/native.js

@@ -19,7 +19,8 @@ export default {
         db.modify(data, types, dbCtx);
     },
     getQueryBuf: (q, dbCtx) => {
-        return db.getQueryBuf(dbCtx, q);
+        const x = db.getQueryBuf(dbCtx, q);
+        return x;
     },
     start: (id) => {
         return db.start(id);

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

@@ -11,7 +11,7 @@ export declare class DbWorker {
     resolvers: any[];
     callback: (resolve: any) => void;
     updateCtx(address: BigInt): Promise<void>;
-    getQueryBuf(buf: Buffer): Promise<Buffer>;
+    getQueryBuf(buf: Buffer): Promise<Uint8Array>;
 }
 type OnSchemaChange = (schema: StrictSchema) => void;
 export declare class DbServer {

package/dist/src/server/index.js

@@ -29,7 +29,8 @@ export class DbWorker {
             transferList: [port2],
         });
         port1.on('message', (buf) => {
-            this.resolvers.shift()(buf);
+            // TODO FIX TYPES CHECK IF THIS MAKES A COPY
+            this.resolvers.shift()(new Uint8Array(buf));
             this.db.onQueryEnd();
         });
     }

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

@@ -1,4 +1,4 @@
-import { EMPTY_MICRO_BUFFER, MICRO_BUFFER, REFERENCE, REFERENCES, STRING, BINARY, CREATED, UPDATED, TIMESTAMP, NULL, NUMBER, HLL, INT8, UINT8, INT16, UINT16, INT32, UINT32, INT64, BOOLEAN, ENUM, TEXT, WEAK_REFERENCE, WEAK_REFERENCES, ALIAS, ALIASES, } from './types.js';
+import { ALIAS, ALIASES, BINARY, BOOLEAN, CREATED, EMPTY_MICRO_BUFFER, ENUM, HLL, INT16, INT32, INT64, INT8, MICRO_BUFFER, NULL, NUMBER, REFERENCE, REFERENCES, STRING, TEXT, TIMESTAMP, UINT16, UINT32, UINT8, UPDATED, VECTOR, WEAK_REFERENCE, WEAK_REFERENCES, } from './types.js';
 const selvaTypeMap = [];
 selvaTypeMap[NULL] = 0;
 selvaTypeMap[TIMESTAMP] = 1;
@@ -25,13 +25,14 @@ selvaTypeMap[MICRO_BUFFER] = 17;
 selvaTypeMap[ALIAS] = 18;
 selvaTypeMap[ALIASES] = 19;
 selvaTypeMap[BINARY] = 11;
+selvaTypeMap[VECTOR] = 17;
 function sepPropCount(props) {
     return props.filter((prop) => prop.separate).length;
 }
 const propDefBuffer = (schema, prop, isEdge) => {
     const type = prop.typeIndex;
     const selvaType = selvaTypeMap[type];
-    if (prop.len && type === MICRO_BUFFER) {
+    if (prop.len && (type === MICRO_BUFFER || type === VECTOR)) {
         const buf = Buffer.allocUnsafe(3);
         buf[0] = selvaType;
         buf.writeUint16LE(prop.len, 1);
@@ -80,7 +81,7 @@ export function schemaToSelvaBuffer(schema) {
         let refFields = 0;
         for (const f of props) {
             if (f.separate) {
-                if (f.typeIndex === 13 || f.typeIndex === 14) {
+                if (f.typeIndex === REFERENCE || f.typeIndex === REFERENCES) {
                     refFields++;
                 }
                 rest.push(f);

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

@@ -140,7 +140,10 @@ export const createSchemaTypeDef = (typeName, type, parsed, result = {
             else if (isPropType('text', schemaProp)) {
                 stringFields++;
             }
-            const isseparate = len === 0;
+            else if (isPropType('vector', schemaProp)) {
+                len = 4 * schemaProp.size;
+            }
+            const isseparate = len === 0 || isPropType('vector', schemaProp);
             if (isseparate) {
                 result.cnt++;
             }

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

@@ -23,6 +23,8 @@ export declare const MICRO_BUFFER = 17;
 export declare const ALIAS = 18;
 export declare const ALIASES = 19;
 export declare const BINARY = 25;
+export declare const ID = 26;
+export declare const VECTOR = 27;
 export declare const TYPE_INDEX_MAP: {
     alias: number;
     aliases: number;
@@ -46,6 +48,7 @@ export declare const TYPE_INDEX_MAP: {
     id: number;
     binary: number;
     hll: number;
+    vector: number;
 };
 export type InternalSchemaProp = keyof typeof TYPE_INDEX_MAP;
 export type TypeIndex = (typeof TYPE_INDEX_MAP)[InternalSchemaProp];

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

@@ -1,3 +1,4 @@
+// WARN: The following type codes are used in js and zig but selva has its own typing.
 export const NULL = 0;
 export const TIMESTAMP = 1;
 export const CREATED = 2;
@@ -23,6 +24,8 @@ export const MICRO_BUFFER = 17;
 export const ALIAS = 18;
 export const ALIASES = 19;
 export const BINARY = 25;
+export const ID = 26;
+export const VECTOR = 27;
 export const TYPE_INDEX_MAP = {
     alias: ALIAS,
     aliases: ALIASES,
@@ -46,6 +49,7 @@ export const TYPE_INDEX_MAP = {
     id: NULL,
     binary: BINARY,
     hll: HLL,
+    vector: VECTOR,
 };
 export const SIZE_MAP = {
     timestamp: 8, // 64bit
@@ -71,6 +75,7 @@ export const SIZE_MAP = {
     aliases: 0,
     id: 4,
     binary: 0,
+    vector: 0, // separate
 };
 const reverseMap = {};
 for (const k in TYPE_INDEX_MAP) {

package/dist/src/server/worker.js

@@ -17,7 +17,7 @@ else {
                 channel.postMessage(null);
             }
             else {
-                const arrayBuf = native.getQueryBuf(msg, dbCtx).buffer;
+                const arrayBuf = native.getQueryBuf(msg, dbCtx);
                 transferList[0] = arrayBuf;
                 channel.postMessage(arrayBuf, transferList);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@based/db",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "license": "MIT",
   "type": "module",
   "main": "./dist/src/index.js",