@based/db 0.0.39 → 0.0.41

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

@@ -5,6 +5,7 @@
 #pragma once
 
 #include <assert.h>
+#include <stdint.h>
 #include <sys/types.h>
 #include "selva/_export.h"
 #include "selva/types.h"
@@ -32,7 +33,7 @@ void selva_db_destroy(struct SelvaDb *db) __attribute__((nonnull));
  * @param type must not exist before.
  */
 SELVA_EXPORT
-int selva_db_create_type(struct SelvaDb *db, node_type_t type, const char *schema_buf, size_t schema_len) __attribute__((nonnull));
+int selva_db_create_type(struct SelvaDb *db, node_type_t type, const uint8_t *schema_buf, size_t schema_len) __attribute__((nonnull));
 
 /**
  * Save the common/shared data of the database.
@@ -406,7 +407,7 @@ SELVA_EXPORT
 const struct SelvaAlias *selva_get_next_alias(const struct SelvaAlias *alias);
 
 SELVA_EXPORT
-const char *selva_get_alias_name(const struct SelvaAlias *alias, size_t *len) __attribute__((nonnull(1), pure));
+const char *selva_get_alias_name(const struct SelvaAlias *alias, size_t *len) __attribute__((nonnull, pure));
 
 SELVA_EXPORT
 struct SelvaAliases *selva_get_aliases(struct SelvaTypeEntry *type, field_t field);

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

@@ -5,6 +5,7 @@
 #pragma once
 
 #include <assert.h>
+#include <stdint.h>
 #include <sys/types.h>
 #include "selva/_export.h"
 #include "selva/types.h"
@@ -32,7 +33,7 @@ void selva_db_destroy(struct SelvaDb *db) __attribute__((nonnull));
  * @param type must not exist before.
  */
 SELVA_EXPORT
-int selva_db_create_type(struct SelvaDb *db, node_type_t type, const char *schema_buf, size_t schema_len) __attribute__((nonnull));
+int selva_db_create_type(struct SelvaDb *db, node_type_t type, const uint8_t *schema_buf, size_t schema_len) __attribute__((nonnull));
 
 /**
  * Save the common/shared data of the database.
@@ -406,7 +407,7 @@ SELVA_EXPORT
 const struct SelvaAlias *selva_get_next_alias(const struct SelvaAlias *alias);
 
 SELVA_EXPORT
-const char *selva_get_alias_name(const struct SelvaAlias *alias, size_t *len) __attribute__((nonnull(1), pure));
+const char *selva_get_alias_name(const struct SelvaAlias *alias, size_t *len) __attribute__((nonnull, pure));
 
 SELVA_EXPORT
 struct SelvaAliases *selva_get_aliases(struct SelvaTypeEntry *type, field_t field);

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

@@ -5,6 +5,7 @@
 #pragma once
 
 #include <assert.h>
+#include <stdint.h>
 #include <sys/types.h>
 #include "selva/_export.h"
 #include "selva/types.h"
@@ -32,7 +33,7 @@ void selva_db_destroy(struct SelvaDb *db) __attribute__((nonnull));
  * @param type must not exist before.
  */
 SELVA_EXPORT
-int selva_db_create_type(struct SelvaDb *db, node_type_t type, const char *schema_buf, size_t schema_len) __attribute__((nonnull));
+int selva_db_create_type(struct SelvaDb *db, node_type_t type, const uint8_t *schema_buf, size_t schema_len) __attribute__((nonnull));
 
 /**
  * Save the common/shared data of the database.
@@ -406,7 +407,7 @@ SELVA_EXPORT
 const struct SelvaAlias *selva_get_next_alias(const struct SelvaAlias *alias);
 
 SELVA_EXPORT
-const char *selva_get_alias_name(const struct SelvaAlias *alias, size_t *len) __attribute__((nonnull(1), pure));
+const char *selva_get_alias_name(const struct SelvaAlias *alias, size_t *len) __attribute__((nonnull, pure));
 
 SELVA_EXPORT
 struct SelvaAliases *selva_get_aliases(struct SelvaTypeEntry *type, field_t field);

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

@@ -18,6 +18,7 @@ export declare class QueryBranch<T> {
     search(query: string, ...fields: Search[]): T;
     search(query: ArrayBufferView, field: string, opts?: Omit<FilterOpts, 'lowerCase'>): T;
     groupBy(field: string): T;
+    count(field?: string): T;
     sum(...fields: (string | string[])[]): T;
     or(fn: FilterBranchFn): T;
     or(field: string, operator?: Operator | boolean, value?: any, opts?: FilterOpts): T;

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

@@ -100,7 +100,12 @@ export class QueryBranch {
         // @ts-ignore
         return this;
     }
-    // x
+    count(field = '$count') {
+        const p = field.split('.');
+        addAggregate(2 /* AggregateType.COUNT */, this.def, p);
+        // @ts-ignore
+        return this;
+    }
     sum(...fields) {
         addAggregate(1 /* AggregateType.SUM */, this.def, fields);
         // @ts-ignore

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

@@ -1,4 +1,6 @@
 import { writeUint16 } from '@saulx/utils';
+import { UINT32 } from '@based/schema/def';
+import { aggregationFieldDoesNotExist } from '../validation.js';
 export const aggregateToBuffer = (aggregates) => {
     const aggBuffer = new Uint8Array(aggregates.size);
     let i = 0;
@@ -15,7 +17,7 @@ export const aggregateToBuffer = (aggregates) => {
         i += 2;
     }
     else {
-        aggBuffer[i] = 1 /* GroupBy.NONE */;
+        aggBuffer[i] = 0 /* GroupBy.NONE */;
         i += 1;
     }
     writeUint16(aggBuffer, aggregates.totalResultsPos, i);
@@ -55,7 +57,7 @@ const ensureAggregate = (def) => {
 export const groupBy = (def, field) => {
     const fieldDef = def.schema.props[field];
     if (!fieldDef) {
-        throw new Error(`Field for agg:groupBy does not exists "${field}" make better error later...`);
+        aggregationFieldDoesNotExist(def, field);
     }
     ensureAggregate(def);
     if (!def.aggregate.groupBy) {
@@ -71,9 +73,21 @@ export const addAggregate = (type, def, fields) => {
             addAggregate(type, def, field);
         }
         else {
-            const fieldDef = def.schema.props[field];
+            const fieldDef = type === 2 /* AggregateType.COUNT */
+                ? {
+                    prop: 255,
+                    path: [field],
+                    __isPropDef: true,
+                    len: 4,
+                    start: 0,
+                    typeIndex: UINT32,
+                    separate: true,
+                    validation: () => true,
+                    default: 0,
+                }
+                : def.schema.props[field];
             if (!fieldDef) {
-                throw new Error(`Field for agg does not exists ${field} make better error later...`);
+                aggregationFieldDoesNotExist(def, field);
             }
             if (!aggregates.get(fieldDef.prop)) {
                 aggregates.set(fieldDef.prop, []);

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

@@ -1,7 +1,8 @@
 export declare const enum AggregateType {
-    SUM = 1
+    SUM = 1,
+    COUNT = 2
 }
 export declare const enum GroupBy {
-    NONE = 1,
+    NONE = 0,
     HAS_GROUP = 255
 }

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

@@ -122,7 +122,7 @@ const inspectObject = (object, q, path, level, isLast, isFirst, isObject, depth)
         let def;
         def = q.props[key];
         let v = object[k];
-        const isEdge = k[0] === '$';
+        let isEdge = k[0] === '$';
         if (k === '$searchScore') {
             edges.push({ k, v, def: { typeIndex: NUMBER } });
         }
@@ -130,6 +130,10 @@ const inspectObject = (object, q, path, level, isLast, isFirst, isObject, depth)
             if (q.edges?.props?.[k]) {
                 edges.push({ k, v, def: q.edges?.props?.[k] });
             }
+            else {
+                str += prefixBody + `${k}: `;
+                isEdge = false;
+            }
         }
         else {
             str += prefixBody + `${k}: `;
@@ -145,7 +149,20 @@ const inspectObject = (object, q, path, level, isLast, isFirst, isObject, depth)
             str += ',\n';
         }
         else if (!def) {
-            str += inspectObject(v, q, key, level + 2, false, false, true, depth) + '';
+            if (typeof v === 'number') {
+                if (q.aggregate) {
+                    str += picocolors.blue(v);
+                    str += picocolors.italic(picocolors.dim(` ${key.indexOf('count') >= 0 ? ' count' : ' sum'}`));
+                    str += ',\n';
+                }
+                else {
+                    str += picocolors.blue(v) + '\n';
+                }
+            }
+            else {
+                str +=
+                    inspectObject(v, q, key, level + 2, false, false, true, depth) + '';
+            }
         }
         else if ('__isPropDef' in def) {
             if (def.typeIndex === REFERENCES) {
@@ -194,7 +211,15 @@ const inspectObject = (object, q, path, level, isLast, isFirst, isObject, depth)
             }
             else {
                 if (typeof v === 'number') {
-                    str += picocolors.blue(v);
+                    if (q.aggregate) {
+                        str += picocolors.blue(v);
+                        str += picocolors.italic(picocolors.dim(` ${key.indexOf('count') >= 0 ? ' count' : ' sum'}`));
+                    }
+                    // str += ',\n'
+                    // str += picocolors.blue(v)
+                }
+                else if (typeof v === 'object' && v) {
+                    inspectObject(v, q, key, level + 2, false, false, true, depth) + '';
                 }
                 else {
                     str += v;
@@ -243,7 +268,7 @@ export const inspectData = (q, def, level, top, depth, hasId = false) => {
     const prefix = top ? '  ' : '';
     let str;
     let i = 0;
-    if (hasId) {
+    if (hasId || def.aggregate) {
         str = prefix;
         level = level + 1;
     }
@@ -254,6 +279,10 @@ export const inspectData = (q, def, level, top, depth, hasId = false) => {
     else {
         str = prefix + '[';
     }
+    if (def.aggregate) {
+        str += inspectObject(q.toObject(), def, '', level + 1, i === max - 1, i === 0, false, depth);
+        return str;
+    }
     for (const x of q) {
         str += inspectObject(x, def, '', level + 1, i === max - 1, i === 0, false, depth);
         i++;

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

@@ -3,9 +3,7 @@ import { QueryDefType } from '../types.js';
 import { read, readUtf8 } from '../../string.js';
 import { DECODER, readDoubleLE, readFloatLE, readInt16, readInt32, readUint16, readUint32, setByPath, } from '@saulx/utils';
 import { inverseLangMap } from '@based/schema';
-import { READ_EDGE, READ_ID, READ_REFERENCE, READ_REFERENCES,
-// AggFlag,
- } from '../types.js';
+import { READ_EDGE, READ_ID, READ_REFERENCE, READ_REFERENCES, } from '../types.js';
 const addField = (p, value, item, defaultOnly = false, lang = 0) => {
     let i = p.__isEdge === true ? 1 : 0;
     // TODO OPTMIZE
@@ -229,12 +227,12 @@ export const readAllFields = (q, result, offset, end, item, id) => {
                     const t = edgeDef.typeIndex;
                     if (t === JSON) {
                         const size = readUint32(result, i);
-                        addField(edgeDef, global.JSON.parse(readUtf8(result, i + 6, size + i)), item);
+                        addField(edgeDef, global.JSON.parse(read(result, i + 4, size, true)), item);
                         i += size + 4;
                     }
                     else if (t === BINARY) {
                         const size = readUint32(result, i);
-                        addField(edgeDef, result.subarray(i + 6, size + i), item);
+                        addField(edgeDef, result.subarray(i + 6, size + i + 4), item);
                         i += size + 4;
                     }
                     else if (t === STRING || t === ALIAS || t === ALIASES) {
@@ -304,13 +302,13 @@ export const readAllFields = (q, result, offset, end, item, id) => {
             else if (prop.typeIndex === JSON) {
                 q.include.propsRead[index] = id;
                 const size = readUint32(result, i);
-                addField(prop, global.JSON.parse(readUtf8(result, i + 6, size - 6)), item);
+                addField(prop, global.JSON.parse(read(result, i + 4, size, true)), item);
                 i += size + 4;
             }
             else if (prop.typeIndex === BINARY) {
                 q.include.propsRead[index] = id;
                 const size = readUint32(result, i);
-                addField(prop, result.subarray(i + 6, i + size), item);
+                addField(prop, result.subarray(i + 6, i + size + 4), item);
                 i += size + 4;
             }
             else if (prop.typeIndex === STRING) {
@@ -332,10 +330,10 @@ export const readAllFields = (q, result, offset, end, item, id) => {
                 else {
                     if (q.lang != 0) {
                         q.include.propsRead[index] = id;
-                        addField(prop, read(result, i + 4, size, false), item);
+                        addField(prop, read(result, i + 4, size, true), item);
                     }
                     else {
-                        addField(prop, read(result, i + 4, size, false), item, false, result[i + 4]);
+                        addField(prop, read(result, i + 4, size, true), item, false, result[i + 4]);
                     }
                 }
                 i += size + 4;
@@ -372,11 +370,25 @@ let cnt = 0;
 export const resultToObject = (q, result, end, offset = 0) => {
     if (q.aggregate) {
         const results = {};
+        // range for numbers
         if (q.aggregate.groupBy) {
             // key size = 2 for now... not perfect...
             let i = 0;
             while (i < result.byteLength - 4) {
-                const key = DECODER.decode(result.subarray(i, i + 2));
+                // if group = 0
+                // add extra thing for the keys maybe?
+                let key = '';
+                if (result[i] == 0) {
+                    if (q.aggregate.groupBy.default) {
+                        key = q.aggregate.groupBy.default;
+                    }
+                    else {
+                        key = `$undefined`;
+                    }
+                }
+                else {
+                    key = DECODER.decode(result.subarray(i, i + 2));
+                }
                 i += 2;
                 const resultKey = (results[key] = {});
                 for (const aggregatesArray of q.aggregate.aggregates.values()) {

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

@@ -30,6 +30,7 @@ export declare const ERR_SEARCH_ENOENT = 21;
 export declare const ERR_SEARCH_TYPE = 22;
 export declare const ERR_SEARCH_INCORRECT_VALUE = 23;
 export declare const ERR_SORT_LANG = 24;
+export declare const ERR_AGG_ENOENT = 25;
 declare const messages: {
     1: (p: any) => string;
     2: (p: any) => string;
@@ -55,6 +56,7 @@ declare const messages: {
     22: (p: any) => string;
     23: (p: any) => string;
     24: (p: any) => string;
+    25: (p: any) => string;
 };
 export type ErrorCode = keyof typeof messages;
 export declare const searchIncorrecQueryValue: (def: QueryDef, payload: any) => void;
@@ -82,4 +84,5 @@ export declare const EMPTY_ALIAS_PROP_DEF: PropDef;
 export declare const ERROR_STRING: PropDef;
 export declare const ERROR_VECTOR: PropDef;
 export declare const EMPTY_SCHEMA_DEF: SchemaTypeDef;
+export declare const aggregationFieldDoesNotExist: (def: QueryDef, field: string) => void;
 export {};

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

@@ -28,6 +28,7 @@ export const ERR_SEARCH_ENOENT = 21;
 export const ERR_SEARCH_TYPE = 22;
 export const ERR_SEARCH_INCORRECT_VALUE = 23;
 export const ERR_SORT_LANG = 24;
+export const ERR_AGG_ENOENT = 25;
 const messages = {
     [ERR_TARGET_INVAL_TYPE]: (p) => `Type "${p}" does not exist`,
     [ERR_TARGET_INVAL_ALIAS]: (p) => {
@@ -59,6 +60,7 @@ const messages = {
     [ERR_SEARCH_TYPE]: (p) => `Search: incorrect type "${p.path.join('.')}"`,
     [ERR_SEARCH_INCORRECT_VALUE]: (p) => `Search: incorrect query on field "${safeStringify(p)}"`,
     [ERR_SORT_LANG]: (p) => `Sort: invalid lang`,
+    [ERR_AGG_ENOENT]: (p) => `Field \"${p}\" in the aggregate function is invalid or unreacheable.`,
 };
 export const searchIncorrecQueryValue = (def, payload) => {
     def.errors.push({ code: ERR_SEARCH_INCORRECT_VALUE, payload });
@@ -397,7 +399,8 @@ export const handleErrors = (def) => {
             }
         }
         const err = new Error(`Query\n`);
-        err.stack = name;
+        err.message = name;
+        err.stack = '';
         throw err;
     }
 };
@@ -441,4 +444,11 @@ export const EMPTY_SCHEMA_DEF = {
     idUint8: new Uint8Array([0, 0]),
     mainEmptyAllZeroes: true,
 };
+export const aggregationFieldDoesNotExist = (def, field) => {
+    def.errors.push({
+        code: ERR_AGG_ENOENT,
+        payload: field,
+    });
+    handleErrors(def);
+};
 //# sourceMappingURL=validation.js.map

package/dist/src/index.d.ts

@@ -13,6 +13,7 @@ export * from './utils.js';
 export * from './client/query/query.js';
 export * from './client/query/BasedDbQuery.js';
 export * from './client/query/BasedIterable.js';
+export * from './server/save.js';
 export declare class BasedDb {
     #private;
     client: DbClient;

package/dist/src/index.js

@@ -16,6 +16,7 @@ export * from './utils.js';
 export * from './client/query/query.js';
 export * from './client/query/BasedDbQuery.js';
 export * from './client/query/BasedIterable.js';
+export * from './server/save.js';
 export class BasedDb {
     client;
     server;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@based/db",
-  "version": "0.0.39",
+  "version": "0.0.41",
   "license": "MIT",
   "type": "module",
   "main": "./dist/src/index.js",
@@ -23,7 +23,7 @@
     "test-fast-linux_aarch64": "podman run --rm -v \"$PWD/../..:/usr/src/based-db\" based-db-clibs-build-linux_aarch64 sh -c '\\. \"/usr/local/nvm/nvm.sh\"; cd /usr/src/based-db/packages/db; npm run test-fast'",
     "test-fast-linux_aarch64-gdb": "podman run --rm -v \"$PWD/../..:/usr/src/based-db\" based-db-clibs-build-linux_aarch64 sh -c '\\. \"/usr/local/nvm/nvm.sh\"; cd /usr/src/based-db/packages/db; LOCPATH=../locale/locale-x86_64-gnu/locale gdb -ex run --args node ./scripts/test.js'",
     "test-fast-linux_aarch64-valgrind": "podman run --rm -v \"$PWD/../..:/usr/src/based-db\" based-db-clibs-build-linux_aarch64 sh -c '\\. \"/usr/local/nvm/nvm.sh\"; cd /usr/src/based-db/packages/db; LOCPATH=../locale/locale-aarch64-gnu/locale valgrind --leak-check=full node ./scripts/test.js references:update2'",
-    "test-zig": "npm run build-zig -- debug && tsc && npm run test-fast",
+    "test-zig": "npm run build-zig && tsc && npm run test-fast",
     "test-zig-debug": "npm run build-zig -- debug && tsc && LOCPATH=../locale/locale-x86_64-gnu/locale ./scripts/lldb-node ./scripts/test.js",
     "test-ts": "tsc && node ./scripts/test.js",
     "perf": "npm run build && node benchmarks/references.js && node benchmarks/transfermarkt/transfermarkt-based.js"
@@ -38,7 +38,7 @@
     "basedDbNative.cjs"
   ],
   "dependencies": {
-    "@based/schema": "5.0.0-alpha.14",
+    "@based/schema": "5.0.0-alpha.15",
     "@saulx/hash": "^3.0.0",
     "@saulx/utils": "^6.6.0",
     "exit-hook": "^4.0.0",