@wxn0brp/db-core 0.12.16 → 0.12.17

package/dist/db/transaction.d.ts

@@ -3,12 +3,13 @@ import { Data } from "../types/data.js";
 import { IndexOpts } from "../types/idx.js";
 import { VQueryT } from "../types/query.js";
 import { TransactionHandle } from "../types/transaction.js";
+import { ValtheraCompatible } from "../types/valthera.js";
 import { ValtheraClass } from "./valthera.js";
 /**
  * Transaction context. Operations are executed directly through the parent
  * database with the transaction handle passed to the executor.
  */
-export declare class Transaction {
+export declare class Transaction implements ValtheraCompatible {
     readonly handle: TransactionHandle;
     _parent: ValtheraClass;
     constructor(handle: TransactionHandle, _parent: ValtheraClass);
@@ -28,8 +29,8 @@ export declare class Transaction {
     issetCollection(collection: string | VQueryT.Collection): Promise<boolean>;
     getCollections(): Promise<string[]>;
     removeCollection(target: string | VQueryT.Collection): Promise<boolean>;
-    createIndex(collection: string, fields: string[], opts?: IndexOpts): Promise<unknown>;
-    removeIndex(collection: string, fields: string[]): Promise<unknown>;
+    createIndex(collection: string, fields: string[], opts?: IndexOpts): Promise<void>;
+    removeIndex(collection: string, fields: string[]): Promise<void>;
     capabilities(): Promise<import("../index.js").AdapterCapabilities>;
     commit(): Promise<void>;
     rollback(): Promise<void>;

package/dist/helpers/addId.d.ts

@@ -1,4 +1,4 @@
 import { ActionsBase } from "../base/actions.js";
-import { VQuery, VQueryT } from "../types/query.js";
-export declare function addId(query: VQuery, actions: ActionsBase, defaultGen?: boolean): Promise<import("../types/arg.js").Arg<import("../types/data.js").Data> | undefined>;
+import { VQueryT } from "../types/query.js";
+export declare function addId(query: VQueryT.Add, actions: ActionsBase, defaultGen?: boolean): Promise<void>;
 export declare function addIdBulk(query: VQueryT.BulkAdd, actions: ActionsBase, defaultGen?: boolean): Promise<void>;

package/dist/helpers/addId.js

@@ -9,91 +9,57 @@ function assertSafeIdKey(idKey) {
         idKey,
     });
 }
-export async function addId(query, actions, defaultGen = true) {
-    const collection = query.collection;
-    const data = query.data;
-    const id_gen = query.id_gen ?? defaultGen;
-    const { idKey = "_id", numberId } = actions.adapterOpts;
-    if (!id_gen)
-        return data;
-    assertSafeIdKey(idKey);
-    if (data[idKey])
-        return data;
-    if (!numberId) {
-        data[idKey] = genId();
-        return;
-    }
-    const txOpts = query.transaction
+const defaultIdGen = (data, _collection, adapter) => data.map(() => genId(adapter.adapterOpts.idParts));
+const numberIdGen = async (data, collection, adapter, transaction) => {
+    const txOpts = transaction
         ? {
-            transaction: query.transaction,
+            transaction,
         }
         : {};
-    const find = (await actions.findOne({
+    const found = (await adapter.findOne({
         collection: "__vdb_id",
         search: {
             c: collection,
         },
         ...txOpts,
     }));
-    data[idKey] = find?.i ? find.i + 1 : 1;
-    await actions.updateOneOrAdd({
+    const start = found?.i ?? 0;
+    await adapter.updateOneOrAdd({
         collection: "__vdb_id",
         search: {
             c: collection,
         },
         updater: {
             $inc: {
-                i: 1,
+                i: data.length,
             },
         },
         id_gen: false,
         ...txOpts,
     });
-}
-export async function addIdBulk(query, actions, defaultGen = true) {
-    const collection = query.collection;
-    const id_gen = query.id_gen ?? defaultGen;
-    const { idKey = "_id", numberId } = actions.adapterOpts;
-    if (!id_gen)
+    return data.map((_, i) => (start + i + 1));
+};
+async function applyIdGen(records, collection, actions, idGenEnabled, transaction) {
+    if (!idGenEnabled)
         return;
+    const { idKey = "_id", numberId, idGen } = actions.adapterOpts;
     assertSafeIdKey(idKey);
-    if (!numberId) {
-        for (const data of query.datas) {
-            if (!data[idKey])
-                data[idKey] = genId();
-        }
+    const targets = records.filter(data => !data[idKey]);
+    if (!targets.length)
         return;
+    const generator = idGen ?? (numberId ? numberIdGen : defaultIdGen);
+    const ids = await generator(targets, collection, actions, transaction);
+    for (let i = 0; i < targets.length; i++) {
+        targets[i][idKey] = ids[i];
     }
-    const txOpts = query.transaction
-        ? {
-            transaction: query.transaction,
-        }
-        : {};
-    const find = (await actions.findOne({
-        collection: "__vdb_id",
-        search: {
-            c: collection,
-        },
-        ...txOpts,
-    }));
-    const start = find?.i ?? 0;
-    for (let i = 0; i < query.datas.length; i++) {
-        const data = query.datas[i];
-        if (!data[idKey]) {
-            data[idKey] = start + i + 1;
-        }
-    }
-    await actions.updateOneOrAdd({
-        collection: "__vdb_id",
-        search: {
-            c: collection,
-        },
-        updater: {
-            $inc: {
-                i: query.datas.length,
-            },
-        },
-        id_gen: false,
-        ...txOpts,
-    });
+}
+export async function addId(query, actions, defaultGen = true) {
+    const id_gen = query.id_gen ?? defaultGen;
+    await applyIdGen([
+        query.data,
+    ], query.collection, actions, id_gen, query.transaction);
+}
+export async function addIdBulk(query, actions, defaultGen = true) {
+    const id_gen = query.id_gen ?? defaultGen;
+    await applyIdGen(query.datas, query.collection, actions, id_gen, query.transaction);
 }

package/dist/types/export.d.ts

@@ -6,6 +6,7 @@ export declare namespace ValtheraTypes {
     type FindOpts = import("./options.js").FindOpts;
     type DbOpts = import("./options.js").DbOpts;
     type AdapterOpts = import("./options.js").AdapterOpts;
+    type IdGen = import("./options.js").IdGen;
     type AdapterCapabilities = import("./action.js").AdapterCapabilities;
     type Data = import("./data.js").Data;
     type SearchOptions = import("./searchOpts.js").SearchOptions;

package/dist/types/options.d.ts

@@ -1,7 +1,15 @@
 import { ActionsBase } from "../base/actions.js";
 import { ExecutorInterface } from "../helpers/executor.js";
+import { Data } from "./data.js";
+import { Id } from "./Id.js";
+import { TransactionHandle } from "./transaction.js";
 import { KeysMatching } from "./utils.js";
 export type AdapterValue = ActionsBase | (() => Promise<ActionsBase>);
+/**
+ * Custom ID generator. Receives only records without the ID key set and
+ * returns generated IDs in the same order.
+ */
+export type IdGen = (data: Data[], collection: string, adapter: ActionsBase, transaction?: TransactionHandle) => Id[] | Promise<Id[]>;
 export interface DbOpts {
     adapter: AdapterValue;
     executor?: ExecutorInterface;
@@ -11,6 +19,9 @@ export interface DbOpts {
 export interface AdapterOpts {
     numberId?: boolean;
     idKey?: string;
+    idGen?: IdGen;
+    /** Parts lengths passed to `genId` for the default ID generator. */
+    idParts?: number[];
 }
 export type FieldPath<T = any> = KeysMatching<T, any> | (string & {}) | string[];
 export interface DbFindOpts<T = any> {

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "0.12.16";
+export declare const version = "0.12.17";

package/dist/version.js

@@ -1 +1 @@
-export const version = "0.12.16";
+export const version = "0.12.17";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wxn0brp/db-core",
-  "version": "0.12.16",
+  "version": "0.12.17",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "author": "wxn0brP",