@based/db 0.1.3-alpha.1 → 0.1.3

package/dist/basedDbNative.cjs

@@ -0,0 +1,23 @@
+"use strict";
+const os = require('os');
+const path = require('path');
+const process = require('process');
+const platform = os.platform();
+const arch = os.arch();
+const nodeMajorVersion = parseInt(process.version.match(/^v?(\d+)/)[1], 10);
+const baseDir = path.join(__dirname, 'dist/lib');
+let platformDir;
+switch (platform) {
+    case 'darwin':
+        platformDir = arch === 'arm64' ? 'darwin_aarch64' : 'darwin_x86_64';
+        break;
+    case 'linux':
+        platformDir = arch === 'arm64' ? 'linux_aarch64' : 'linux_x86_64';
+        break;
+    default:
+        throw new Error(`Unsupported platform: ${platform}`);
+}
+const libPath = path.join(baseDir, platformDir, `libnode-v${nodeMajorVersion}.node`);
+const addon = require(libPath);
+module.exports = addon;
+//# sourceMappingURL=basedDbNative.cjs.map

package/dist/lib/darwin_aarch64/include/cdefs.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2024 SAULX
+ * Copyright (c) 2020-2025 SAULX
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
@@ -51,6 +51,9 @@
 #define __constfn
 #endif
 
+/**
+ * The last argument to a function is expected to be nullptr.
+ */
 #define __sentinel __attribute__((sentinel))
 
 #if __has_c_attribute(noreturn)

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

@@ -5,6 +5,7 @@
 #pragma once
 
 #include <assert.h>
+#include <stddef.h>
 #include <stdint.h>
 #include <sys/types.h>
 #include "selva/_export.h"
@@ -16,6 +17,20 @@
  */
 struct XXH3_state_s;
 
+struct selva_dump_common_data {
+    /**
+     * Pointer to data returned here when loading; Data read from here when saving.
+     */
+    const void *meta_data __pcounted_by(meta_len);
+    size_t meta_len;
+
+    /**
+     * Can be nullptr. Also set errlog_size to 0.
+     */
+    char *errlog_buf __pcounted_by(errlog_size);
+    size_t errlog_size;
+};
+
 /**
  * Create a new DB instance.
  */
@@ -39,7 +54,7 @@ int selva_db_create_type(struct SelvaDb *db, node_type_t type, const uint8_t *sc
  * Save the common/shared data of the database.
  */
 SELVA_EXPORT
-int selva_dump_save_common(struct SelvaDb *db, const char *filename) __attribute__((nonnull));
+int selva_dump_save_common(struct SelvaDb *db, struct selva_dump_common_data *com, const char *filename) __attribute__((nonnull));
 
 /**
  * Save a nodes block starting from start.
@@ -56,7 +71,7 @@ int selva_dump_save_block(struct SelvaDb *db, struct SelvaTypeEntry *te, const c
  *  ```
  */
 SELVA_EXPORT
-int selva_dump_load_common(struct SelvaDb *db, const char *filename, char *errlog_buf, size_t errlog_size) __attribute__((nonnull));
+int selva_dump_load_common(struct SelvaDb *db, struct selva_dump_common_data *com, const char *filename) __attribute__((nonnull));
 
 SELVA_EXPORT
 int selva_dump_load_block(struct SelvaDb *db, const char *filename, char *errlog_buf, size_t errlog_size) __attribute__((nonnull));
@@ -124,11 +139,10 @@ inline const struct SelvaNodeSchema *selva_get_ns_by_te(const struct SelvaTypeEn
 #endif
 
 SELVA_EXPORT
-__attribute__((nonnull, pure))
 inline const struct SelvaFieldSchema *get_fs_by_fields_schema_field(const struct SelvaFieldsSchema *fields_schema, field_t field)
 #ifndef __zig
 {
-    if (field >= fields_schema->nr_fields) {
+    if (!fields_schema || field >= fields_schema->nr_fields) {
         return nullptr;
     }
 
@@ -223,7 +237,16 @@ inline const struct EdgeFieldConstraint *selva_get_edge_field_constraint(const s
 #endif
 
 SELVA_EXPORT
-const struct SelvaFieldsSchema *selva_get_edge_field_fields_schema(struct SelvaDb *db, const struct EdgeFieldConstraint *efc);
+inline const struct SelvaFieldsSchema *selva_get_edge_field_fields_schema(struct SelvaDb *db, const struct EdgeFieldConstraint *efc)
+#ifndef __zig
+{
+    struct SelvaTypeEntry *te = selva_get_type_by_index(db, efc->meta_node_type);
+
+    return (te) ? &selva_get_ns_by_te(te)->fields_schema : nullptr;
+}
+#else
+;
+#endif
 
 SELVA_EXPORT
 void selva_expire_node(struct SelvaDb *db, node_type_t type, node_id_t node_id, int64_t ts);

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

@@ -21,7 +21,7 @@ SELVA_EXPORT
 ssize_t fast_linear_search_node(const struct SelvaNode *arr[], size_t len, const struct SelvaNode *x);
 
 SELVA_EXPORT
-ssize_t fast_linear_search_references_small(const struct SelvaNodeSmallReference *arr, size_t len, const struct SelvaNode *x);
+ssize_t fast_linear_search_references_small(const struct SelvaNodeSmallReference *arr, size_t len, node_id_t x);
 
 SELVA_EXPORT
-ssize_t fast_linear_search_references_large(const struct SelvaNodeLargeReference *arr, size_t len, const struct SelvaNode *x);
+ssize_t fast_linear_search_references_large(const struct SelvaNodeLargeReference *arr, size_t len, node_id_t x);

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

@@ -25,12 +25,12 @@ struct SelvaTextField {
 #endif
 
 struct SelvaNodeSmallReference {
-    struct SelvaNode *dst;
+    node_id_t dst;
 };
 
 struct SelvaNodeLargeReference {
-    struct SelvaNode *dst;
-    struct SelvaFields *meta;
+    node_id_t dst;
+    node_id_t meta;
 };
 
 enum SelvaNodeReferenceType {
@@ -116,12 +116,14 @@ void *selva_fields_nfo2p(struct SelvaFields *fields, const struct SelvaFieldInfo
 SELVA_EXPORT
 struct SelvaFields *selva_fields_node2fields(struct SelvaNode *node);
 
-void selva_fields_ensure_ref_meta(
+SELVA_EXPORT
+struct SelvaNode *selva_fields_ensure_ref_meta(
         struct SelvaDb *db,
         struct SelvaNode *node,
+        const struct EdgeFieldConstraint *efc,
         struct SelvaNodeLargeReference *ref,
-        const struct EdgeFieldConstraint *efc)
-    __attribute__((nonnull));
+        node_id_t meta_id,
+        selva_dirty_node_cb_t dirty_cb, void *dirty_ctx);
 
 SELVA_EXPORT
 int selva_fields_get_mutable_string(
@@ -143,15 +145,6 @@ struct selva_string *selva_fields_ensure_string(
         const struct SelvaFieldSchema *fs,
         size_t initial_len);
 
-SELVA_EXPORT
-struct selva_string *selva_fields_ensure_string2(
-        struct SelvaDb *db,
-        struct SelvaNode *node,
-        const struct EdgeFieldConstraint *efc,
-        struct SelvaNodeLargeReference *ref,
-        const struct SelvaFieldSchema *fs,
-        size_t initial_len);
-
 /**
  * Set reference to fields.
  */
@@ -179,7 +172,8 @@ int selva_fields_references_insert(
         bool reorder,
         struct SelvaTypeEntry *te_dst,
         struct SelvaNode * restrict dst,
-        struct SelvaNodeReferenceAny *ref_out)
+        struct SelvaNodeReferenceAny *ref_out,
+        selva_dirty_node_cb_t dirty_cb, void *dirty_ctx, bool ignore_src_dependent)
     __attribute__((access(write_only, 8)));
 
 /**
@@ -196,7 +190,8 @@ int selva_fields_references_insert_tail_wupsert(
         const struct SelvaFieldSchema *fs,
         struct SelvaTypeEntry *te_dst,
         const node_id_t ids[],
-        size_t nr_ids)
+        size_t nr_ids,
+        selva_dirty_node_cb_t dirty_cb, void *dirty_ctx)
     __attribute__((access(read_only, 5, 6)));
 
 /**
@@ -223,25 +218,6 @@ int selva_fields_references_swap(
         size_t index_a,
         size_t index_b);
 
-SELVA_EXPORT
-int selva_fields_set_reference_meta(
-        struct SelvaDb *db,
-        struct SelvaNode *node,
-        struct SelvaNodeLargeReference *ref,
-        const struct EdgeFieldConstraint *efc,
-        const struct SelvaFieldSchema *efs,
-        const void *value, size_t len);
-
-SELVA_EXPORT
-int selva_fields_get_reference_meta_mutable_string(
-        struct SelvaDb *db,
-        struct SelvaNode *node,
-        struct SelvaNodeLargeReference *ref,
-        const struct EdgeFieldConstraint *efc,
-        const struct SelvaFieldSchema *efs,
-        size_t len,
-        struct selva_string **s);
-
 /**
  * Set string field.
  *
@@ -339,10 +315,6 @@ struct SelvaNode *selva_fields_resolve_weak_reference(
         const struct SelvaNodeWeakReference *weak_ref)
     __attribute__((nonnull));
 
-SELVA_EXPORT
-struct selva_string *selva_fields_get_selva_string3(struct SelvaDb *db, struct SelvaNodeLargeReference *ref, const struct SelvaFieldSchema *fs)
-    __attribute__((nonnull));
-
 SELVA_EXPORT
 struct selva_string *selva_fields_get_selva_string2(struct SelvaFields *fields, const struct SelvaFieldSchema *fs)
     __attribute__((nonnull));
@@ -374,7 +346,7 @@ int selva_fields_del(struct SelvaDb *db, struct SelvaNode *node, const struct Se
  * Delete an edge from a references field.
  */
 SELVA_EXPORT
-int selva_fields_del_ref(struct SelvaDb *db, struct SelvaNode *node, const struct SelvaFieldSchema *fs, node_id_t dst_node_id);
+int selva_fields_del_ref(struct SelvaDb *db, struct SelvaNode *node, const struct SelvaFieldSchema *fs, node_id_t dst_node_id, selva_dirty_node_cb_t dirty_cb, void *dirty_ctx);
 
 /**
  * Clear a references field but don't free it.

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

@@ -244,7 +244,11 @@ typedef union {
  * @param s is a pointer to a selva_string.
  */
 SELVA_EXPORT
+#ifdef __zig
+void selva_string_free(struct selva_string *s);
+#else
 void selva_string_free(_selva_string_ptr_t s);
+#endif
 
 /**
  * Add a selva_string to the given finalizer.

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

@@ -48,26 +48,16 @@ enum SelvaFieldType {
 struct EdgeFieldConstraint {
     enum EdgeFieldConstraintFlag {
         EDGE_FIELD_CONSTRAINT_FLAG_DEPENDENT = 0x01,
-        /**
-         * _fields_schema is referenced from the opposite efc and shouldn't be freed.
-         */
-        EDGE_FIELD_CONSTRAINT_FLAG_SCHEMA_REF_CACHED = 0x40,
         /**
          * Skip saving this field while dumping.
          * If the field is of type SELVA_FIELD_TYPE_REFERENCES it's saved
          * regardless of this flag to preserve the original order of references.
-         * However, the meta is only save from one side, i.e. the side that's
-         * not skipped.
          */
         EDGE_FIELD_CONSTRAINT_FLAG_SKIP_DUMP = 0x80,
     } __packed flags;
     field_t inverse_field;
     node_type_t dst_node_type;
-    /**
-     * Don't use directly!
-     * Use: `selva_get_edge_field_fields_schema()`
-     */
-    struct SelvaFieldsSchema *_fields_schema;
+    node_type_t meta_node_type;
 };
 
 struct SelvaFieldSchema {

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

@@ -14,6 +14,7 @@ type DbClientOpts = {
 export declare class DbClient extends DbShared {
     constructor({ hooks, maxModifySize, flushTime, debug, }: DbClientOpts);
     subs: Map<BasedDbQuery, SubStore>;
+    stopped: boolean;
     hooks: DbClientHooks;
     flushTime: number;
     writeTime: number;
@@ -36,6 +37,7 @@ export declare class DbClient extends DbShared {
     }, opts?: ModifyOpts): Promise<number>;
     update(value: Record<string, any>, opts?: ModifyOpts): Promise<number>;
     upsert(type: string, obj: Record<string, any>, opts?: ModifyOpts): Promise<number>;
+    insert(type: string, obj: Record<string, any>, opts?: ModifyOpts): Promise<number>;
     delete(type: string, id: number | Promise<number>): any;
     expire(type: string, id: number, seconds: number): Promise<number>;
     destroy(): void;

package/dist/src/client/index.js

@@ -1,4 +1,4 @@
-import { parse } from '@based/schema';
+import { parse, } from '@based/schema';
 import { BasedDbQuery } from './query/BasedDbQuery.js';
 import { debugMode } from '../utils.js';
 import { DbShared } from '../shared/DbBase.js';
@@ -9,7 +9,7 @@ import { update } from './modify/update/index.js';
 import { del } from './modify/delete/index.js';
 import { expire } from './modify/expire/index.js';
 import { cancel, drain, schedule } from './modify/drain.js';
-import { upsert } from './modify/upsert/index.js';
+import { insert, upsert } from './modify/upsert/index.js';
 export class DbClient extends DbShared {
     constructor({ hooks, maxModifySize = 100 * 1e3 * 1e3, flushTime = 0, debug, }) {
         super();
@@ -27,6 +27,7 @@ export class DbClient extends DbShared {
         });
     }
     subs = new Map();
+    stopped;
     hooks;
     // modify
     flushTime;
@@ -44,6 +45,9 @@ export class DbClient extends DbShared {
         const strictSchema = parse(schema).schema;
         await this.drain();
         const schemaChecksum = await this.hooks.setSchema(strictSchema, transformFns);
+        if (this.stopped) {
+            return this.schema.hash;
+        }
         if (schemaChecksum !== this.schema?.hash) {
             await this.once('schema');
             return this.schema.hash;
@@ -119,6 +123,9 @@ export class DbClient extends DbShared {
     upsert(type, obj, opts) {
         return upsert(this, type, obj, opts);
     }
+    insert(type, obj, opts) {
+        return insert(this, type, obj, opts);
+    }
     delete(type, id) {
         if (typeof id === 'object' &&
             id !== null &&
@@ -130,6 +137,7 @@ export class DbClient extends DbShared {
                 id = id.id;
             }
             else {
+                // @ts-ignore
                 return id.then((id) => this.delete(type, id));
             }
         }
@@ -144,6 +152,7 @@ export class DbClient extends DbShared {
         delete this.listeners;
     }
     stop() {
+        this.stopped = true;
         for (const [, { onClose }] of this.subs) {
             onClose();
         }

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

@@ -4,7 +4,6 @@ import { type ModifyOp } from './types.js';
 import type { Tmp } from './Tmp.js';
 export declare class Ctx {
     constructor(schemaChecksum: number, array: Uint8Array<ArrayBufferLike>);
-    id: number;
     start: number;
     index: number;
     schema: SchemaTypeDef;
@@ -12,26 +11,25 @@ export declare class Ctx {
     max: number;
     size: number;
     unsafe?: boolean;
-    overwrite?: boolean;
     operation: ModifyOp;
     main: Map<PropDef, any>;
     draining: Promise<void>;
     scheduled: Promise<void>;
-    created: Record<number, number>;
     locale: LangCode;
     sort: number;
     sortText: number;
     defaults: number;
     cursor: {
-        id?: number;
         type?: number;
         prop?: number;
         main?: number;
         operation?: ModifyOp;
+        upserting?: boolean;
     };
     batch: {
+        count?: number;
         promises?: Tmp[];
-        offsets?: Record<number, number>;
+        res?: Uint8Array;
         ready?: boolean;
         error?: Error;
     };

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

@@ -6,7 +6,6 @@ export class Ctx {
         this.size = array.buffer.byteLength - 4;
         writeUint64(array, schemaChecksum, 0);
     }
-    id;
     start;
     index = 8;
     schema;
@@ -14,12 +13,10 @@ export class Ctx {
     max;
     size;
     unsafe;
-    overwrite;
     operation;
     main = new Map();
     draining;
     scheduled;
-    created = {}; // <typeId, count
     locale;
     sort = 0;
     sortText = 0;

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

@@ -3,8 +3,8 @@ export declare const resolveTmp: (tmp: Tmp) => void;
 export declare const rejectTmp: (tmp: Tmp) => void;
 export declare class Tmp implements Promise<number> {
     #private;
-    constructor(ctx: Ctx, id?: number);
-    get [Symbol.toStringTag](): string;
+    constructor(ctx: Ctx);
+    [Symbol.toStringTag]: 'ModifyPromise';
     get error(): Error;
     get id(): number;
     type: number;

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

@@ -1,8 +1,14 @@
+import { readUint32 } from '@based/utils';
 const promisify = (tmp) => {
     if (!tmp.promise) {
-        const id = tmp.id;
-        if (id) {
-            tmp.promise = Promise.resolve(id);
+        if (tmp.batch.ready) {
+            const id = tmp.id;
+            if (id) {
+                tmp.promise = Promise.resolve(id);
+            }
+            else {
+                tmp.promise = Promise.reject(tmp.error);
+            }
         }
         else {
             tmp.promise = new Promise((resolve, reject) => {
@@ -16,37 +22,35 @@ const promisify = (tmp) => {
     return tmp.promise;
 };
 export const resolveTmp = (tmp) => {
-    tmp.resolve(tmp.id);
+    const id = tmp.id;
+    if (id) {
+        return tmp.resolve(tmp.id);
+    }
+    return tmp.reject(tmp.error);
+};
+export const rejectTmp = (tmp) => {
+    return tmp.reject(tmp.error);
 };
-export const rejectTmp = (tmp) => tmp.reject(tmp.error);
 export class Tmp {
-    constructor(ctx, id) {
+    constructor(ctx) {
+        ctx.batch.count ??= 0;
         this.type = ctx.cursor.type;
-        this.tmpId = ctx.id;
         this.batch = ctx.batch;
-        this.#id = id;
-    }
-    get [Symbol.toStringTag]() {
-        return 'ModifyPromise';
+        this.tmpId = ctx.batch.count++;
     }
+    [Symbol.toStringTag];
     #id;
     get error() {
-        if (!this.batch.ready) {
-            return;
+        if (this.batch.ready) {
+            // TODO: also handle individual errors here
+            return this.batch.error;
         }
-        return this.batch.error;
     }
     get id() {
-        if (!this.batch.ready) {
-            return;
-        }
-        if (!this.#id) {
-            if (this.batch.offsets) {
-                const offset = this.batch.offsets[this.type];
-                this.#id = this.tmpId + offset;
-            }
+        if (this.batch.ready) {
+            this.#id ??= this.batch.res && readUint32(this.batch.res, this.tmpId * 5);
+            return this.#id;
         }
-        return this.#id;
     }
     type;
     tmpId;

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

@@ -1,19 +1,19 @@
 import { TEXT } from '@based/schema/def';
 import { writeObject } from '../props/object.js';
 import { reserve } from '../resize.js';
-import { FULL_CURSOR_SIZE, PROP_CURSOR_SIZE, writeMainCursor, writeNodeCursor, writeTypeCursor, } from '../cursor.js';
+import { FULL_CURSOR_SIZE, PROP_CURSOR_SIZE, writeMainCursor, writeTypeCursor, } from '../cursor.js';
 import { getByPath, writeUint16 } from '@based/utils';
 import { writeMainBuffer, writeMainValue } from '../props/main.js';
 import { Tmp } from '../Tmp.js';
 import { schedule } from '../drain.js';
-import { ADD_EMPTY_SORT, ADD_EMPTY_SORT_TEXT, CREATE, } from '../types.js';
+import { ADD_EMPTY_SORT, ADD_EMPTY_SORT_TEXT, CREATE, PADDING, SWITCH_ID_CREATE, SWITCH_ID_CREATE_UNSAFE, } from '../types.js';
 import { inverseLangMap, langCodesMap } from '@based/schema';
 import { writeSeparate } from '../props/separate.js';
 import { writeString } from '../props/string.js';
-import { writeU8 } from '../uint.js';
+import { writeU32, writeU8 } from '../uint.js';
 import { getValidSchema, validatePayload } from '../validate.js';
 import { handleError } from '../error.js';
-const writeDefaults = (ctx, payload) => {
+const writeDefaults = (ctx) => {
     if (!ctx.schema.hasSeperateDefaults) {
         return;
     }
@@ -119,23 +119,22 @@ const writeCreateTs = (ctx, payload) => {
 };
 export const writeCreate = (ctx, schema, payload, opts) => {
     validatePayload(payload);
-    validatePayload(schema);
-    if (schema.hooks?.create) {
-        payload = schema.hooks.create(payload) || payload;
-    }
-    if (payload.id) {
-        if (!opts?.unsafe) {
-            throw 'Invalid payload. "id" not allowed';
+    if (schema.propHooks?.create) {
+        for (const def of schema.propHooks.create) {
+            let val = payload;
+            let obj;
+            let key;
+            for (key of def.path) {
+                obj = val;
+                val = val?.[key];
+            }
+            if (val !== undefined) {
+                obj[key] = def.hooks.create(val, obj);
+            }
         }
-        ctx.id = payload.id;
     }
-    else {
-        if (!(schema.id in ctx.created)) {
-            ctx.created[schema.id] = 0;
-            ctx.max -= 6;
-            ctx.size -= 6;
-        }
-        ctx.id = ctx.created[schema.id] + 1;
+    if (schema.hooks?.create) {
+        payload = schema.hooks.create(payload) || payload;
     }
     if (ctx.defaults) {
         ctx.defaults = 0;
@@ -151,13 +150,24 @@ export const writeCreate = (ctx, schema, payload, opts) => {
     }
     ctx.schema = schema;
     ctx.operation = CREATE;
-    ctx.overwrite = true;
     ctx.unsafe = opts?.unsafe;
     ctx.locale = opts?.locale && langCodesMap.get(opts.locale);
-    ctx.start = ctx.index;
+    // TODO: can we remove this (and just init main buffer here?)
+    ctx.cursor.main = null;
     reserve(ctx, FULL_CURSOR_SIZE);
     writeTypeCursor(ctx);
-    writeNodeCursor(ctx);
+    if (payload.id) {
+        if (ctx.unsafe) {
+            writeU8(ctx, SWITCH_ID_CREATE_UNSAFE);
+            writeU32(ctx, payload.id);
+        }
+        else {
+            throw 'Invalid payload. "id" not allowed';
+        }
+    }
+    else {
+        writeU8(ctx, SWITCH_ID_CREATE);
+    }
     const index = ctx.index;
     writeObject(ctx, ctx.schema.tree, payload);
     if (ctx.index === index || ctx.schema.mainLen === 0) {
@@ -168,16 +178,17 @@ export const writeCreate = (ctx, schema, payload, opts) => {
     if (!ctx.cursor.main && !ctx.schema.mainEmptyAllZeroes) {
         writeMainBuffer(ctx);
     }
-    writeDefaults(ctx, payload);
+    writeDefaults(ctx);
     writeSortable(ctx);
     writeSortableText(ctx);
-    if (schema.id in ctx.created) {
-        ctx.created[schema.id]++;
+    while (ctx.index < ctx.start + 5) {
+        writeU8(ctx, PADDING);
     }
 };
 export function create(db, type, payload, opts) {
     const schema = getValidSchema(db, type);
     const ctx = db.modifyCtx;
+    ctx.start = ctx.index;
     try {
         writeCreate(ctx, schema, payload, opts);
         const tmp = new Tmp(ctx);

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

@@ -7,4 +7,3 @@ export declare const FULL_CURSOR_SIZE: number;
 export declare const writeTypeCursor: (ctx: Ctx) => void;
 export declare const writePropCursor: (ctx: Ctx, def: PropDef, typeIndex?: import("@based/schema/prop-types").TypeIndex) => void;
 export declare const writeMainCursor: (ctx: Ctx) => void;
-export declare const writeNodeCursor: (ctx: Ctx) => void;