mvcc-api 1.2.1 → 1.2.3

package/dist/cjs/index.cjs

@@ -42,6 +42,8 @@ var MVCCTransaction = class {
   // create()로 생성된 키 추적
   deletedValues;
   // delete 시 삭제 전 값 저장
+  originallyExisted;
+  // 트랜잭션 시작 시점에 디스크에 존재했던 키 (deleted 결과 필터링용)
   // Nested Transaction Properties
   parent;
   localVersion;
@@ -61,6 +63,7 @@ var MVCCTransaction = class {
     this.deleteBuffer = /* @__PURE__ */ new Set();
     this.createdKeys = /* @__PURE__ */ new Set();
     this.deletedValues = /* @__PURE__ */ new Map();
+    this.originallyExisted = /* @__PURE__ */ new Set();
     this.committed = false;
     this.parent = parent;
     this.keyVersions = /* @__PURE__ */ new Map();
@@ -81,12 +84,26 @@ var MVCCTransaction = class {
   isRoot() {
     return !this.parent;
   }
+  /**
+   * Checks if any ancestor transaction has already been committed.
+   * A nested transaction cannot commit if its parent or any higher ancestor is committed.
+   * @returns True if at least one ancestor is committed, false otherwise.
+   */
+  hasCommittedAncestor() {
+    let current = this.parent;
+    while (current) {
+      if (current.committed) return true;
+      current = current.parent;
+    }
+    return false;
+  }
   // --- Internal buffer manipulation helpers ---
   _bufferCreate(key, value) {
     this.localVersion++;
     this.writeBuffer.set(key, value);
     this.createdKeys.add(key);
     this.deleteBuffer.delete(key);
+    this.originallyExisted.delete(key);
     this.keyVersions.set(key, this.localVersion);
   }
   _bufferWrite(key, value) {
@@ -102,12 +119,7 @@ var MVCCTransaction = class {
     this.createdKeys.delete(key);
     this.keyVersions.set(key, this.localVersion);
   }
-  /**
-   * Rolls back the transaction.
-   * Clears all buffers and marks the transaction as finished.
-   * @returns The result object with success, created, updated, and deleted keys.
-   */
-  rollback() {
+  _getResultEntries() {
     const created = [];
     const updated = [];
     for (const [key, data] of this.writeBuffer.entries()) {
@@ -119,15 +131,26 @@ var MVCCTransaction = class {
     }
     const deleted = [];
     for (const key of this.deleteBuffer) {
+      if (!this.originallyExisted.has(key)) continue;
       const data = this.deletedValues.get(key);
       if (data !== void 0) {
         deleted.push({ key, data });
       }
     }
+    return { created, updated, deleted };
+  }
+  /**
+   * Rolls back the transaction.
+   * Clears all buffers and marks the transaction as finished.
+   * @returns The result object with success, created, updated, and deleted keys.
+   */
+  rollback() {
+    const { created, updated, deleted } = this._getResultEntries();
     this.writeBuffer.clear();
     this.deleteBuffer.clear();
     this.createdKeys.clear();
     this.deletedValues.clear();
+    this.originallyExisted.clear();
     this.committed = true;
     if (this.root !== this) {
       this.root.activeTransactions.delete(this);
@@ -161,8 +184,10 @@ var SyncMVCCTransaction = class _SyncMVCCTransaction extends MVCCTransaction {
   delete(key) {
     if (this.committed) throw new Error("Transaction already committed");
     let valueToDelete = null;
+    let wasInWriteBuffer = false;
     if (this.writeBuffer.has(key)) {
       valueToDelete = this.writeBuffer.get(key);
+      wasInWriteBuffer = true;
     } else if (!this.deleteBuffer.has(key)) {
       valueToDelete = this.read(key);
     }
@@ -170,6 +195,9 @@ var SyncMVCCTransaction = class _SyncMVCCTransaction extends MVCCTransaction {
       throw new Error(`Key not found: ${key}`);
     }
     this.deletedValues.set(key, valueToDelete);
+    if (!wasInWriteBuffer || !this.createdKeys.has(key)) {
+      this.originallyExisted.add(key);
+    }
     this._bufferDelete(key);
     return this;
   }
@@ -212,29 +240,17 @@ var SyncMVCCTransaction = class _SyncMVCCTransaction extends MVCCTransaction {
     }
   }
   commit() {
+    const { created, updated, deleted } = this._getResultEntries();
     if (this.committed) {
-      return { success: false, error: "Transaction already committed", created: [], updated: [], deleted: [] };
+      return { success: false, error: "Transaction already committed", created, updated, deleted };
     }
-    const created = [];
-    const updated = [];
-    for (const [key, data] of this.writeBuffer.entries()) {
-      if (this.createdKeys.has(key)) {
-        created.push({ key, data });
-      } else {
-        updated.push({ key, data });
-      }
-    }
-    const deleted = [];
-    for (const key of this.deleteBuffer) {
-      const data = this.deletedValues.get(key);
-      if (data !== void 0) {
-        deleted.push({ key, data });
-      }
+    if (this.hasCommittedAncestor()) {
+      return { success: false, error: "Ancestor transaction already committed", created, updated, deleted };
     }
     if (this.parent) {
       const error = this.parent._merge(this);
       if (error) {
-        return { success: false, error, created: [], updated: [], deleted: [] };
+        return { success: false, error, created, updated, deleted };
       }
       this.committed = true;
     } else {
@@ -247,6 +263,7 @@ var SyncMVCCTransaction = class _SyncMVCCTransaction extends MVCCTransaction {
         this.deleteBuffer.clear();
         this.createdKeys.clear();
         this.deletedValues.clear();
+        this.originallyExisted.clear();
         this.keyVersions.clear();
         this.localVersion = 0;
       }
@@ -285,6 +302,9 @@ var SyncMVCCTransaction = class _SyncMVCCTransaction extends MVCCTransaction {
         if (deletedValue !== void 0) {
           this.deletedValues.set(key, deletedValue);
         }
+        if (child.originallyExisted.has(key)) {
+          this.originallyExisted.add(key);
+        }
       }
       this.localVersion = newLocalVersion;
       this.root.activeTransactions.delete(child);
@@ -703,8 +723,10 @@ var AsyncMVCCTransaction = class _AsyncMVCCTransaction extends MVCCTransaction {
   async delete(key) {
     if (this.committed) throw new Error("Transaction already committed");
     let valueToDelete = null;
+    let wasInWriteBuffer = false;
     if (this.writeBuffer.has(key)) {
       valueToDelete = this.writeBuffer.get(key);
+      wasInWriteBuffer = true;
     } else if (!this.deleteBuffer.has(key)) {
       valueToDelete = await this.read(key);
     }
@@ -712,6 +734,9 @@ var AsyncMVCCTransaction = class _AsyncMVCCTransaction extends MVCCTransaction {
       throw new Error(`Key not found: ${key}`);
     }
     this.deletedValues.set(key, valueToDelete);
+    if (!wasInWriteBuffer || !this.createdKeys.has(key)) {
+      this.originallyExisted.add(key);
+    }
     this._bufferDelete(key);
     return this;
   }
@@ -755,29 +780,17 @@ var AsyncMVCCTransaction = class _AsyncMVCCTransaction extends MVCCTransaction {
   }
   async commit() {
     return this.writeLock(async () => {
+      const { created, updated, deleted } = this._getResultEntries();
       if (this.committed) {
-        return { success: false, error: "Transaction already committed", created: [], updated: [], deleted: [] };
-      }
-      const created = [];
-      const updated = [];
-      for (const [key, data] of this.writeBuffer.entries()) {
-        if (this.createdKeys.has(key)) {
-          created.push({ key, data });
-        } else {
-          updated.push({ key, data });
-        }
+        return { success: false, error: "Transaction already committed", created, updated, deleted };
       }
-      const deleted = [];
-      for (const key of this.deleteBuffer) {
-        const data = this.deletedValues.get(key);
-        if (data !== void 0) {
-          deleted.push({ key, data });
-        }
+      if (this.hasCommittedAncestor()) {
+        return { success: false, error: "Ancestor transaction already committed", created, updated, deleted };
       }
       if (this.parent) {
         const error = await this.parent._merge(this);
         if (error) {
-          return { success: false, error, created: [], updated: [], deleted: [] };
+          return { success: false, error, created, updated, deleted };
         }
         this.committed = true;
       } else {
@@ -790,6 +803,7 @@ var AsyncMVCCTransaction = class _AsyncMVCCTransaction extends MVCCTransaction {
           this.deleteBuffer.clear();
           this.createdKeys.clear();
           this.deletedValues.clear();
+          this.originallyExisted.clear();
           this.keyVersions.clear();
           this.localVersion = 0;
         }
@@ -830,6 +844,9 @@ var AsyncMVCCTransaction = class _AsyncMVCCTransaction extends MVCCTransaction {
           if (deletedValue !== void 0) {
             this.deletedValues.set(key, deletedValue);
           }
+          if (child.originallyExisted.has(key)) {
+            this.originallyExisted.add(key);
+          }
         }
         this.localVersion = newLocalVersion;
         this.root.activeTransactions.delete(child);

package/dist/esm/index.mjs

@@ -13,6 +13,8 @@ var MVCCTransaction = class {
   // create()로 생성된 키 추적
   deletedValues;
   // delete 시 삭제 전 값 저장
+  originallyExisted;
+  // 트랜잭션 시작 시점에 디스크에 존재했던 키 (deleted 결과 필터링용)
   // Nested Transaction Properties
   parent;
   localVersion;
@@ -32,6 +34,7 @@ var MVCCTransaction = class {
     this.deleteBuffer = /* @__PURE__ */ new Set();
     this.createdKeys = /* @__PURE__ */ new Set();
     this.deletedValues = /* @__PURE__ */ new Map();
+    this.originallyExisted = /* @__PURE__ */ new Set();
     this.committed = false;
     this.parent = parent;
     this.keyVersions = /* @__PURE__ */ new Map();
@@ -52,12 +55,26 @@ var MVCCTransaction = class {
   isRoot() {
     return !this.parent;
   }
+  /**
+   * Checks if any ancestor transaction has already been committed.
+   * A nested transaction cannot commit if its parent or any higher ancestor is committed.
+   * @returns True if at least one ancestor is committed, false otherwise.
+   */
+  hasCommittedAncestor() {
+    let current = this.parent;
+    while (current) {
+      if (current.committed) return true;
+      current = current.parent;
+    }
+    return false;
+  }
   // --- Internal buffer manipulation helpers ---
   _bufferCreate(key, value) {
     this.localVersion++;
     this.writeBuffer.set(key, value);
     this.createdKeys.add(key);
     this.deleteBuffer.delete(key);
+    this.originallyExisted.delete(key);
     this.keyVersions.set(key, this.localVersion);
   }
   _bufferWrite(key, value) {
@@ -73,12 +90,7 @@ var MVCCTransaction = class {
     this.createdKeys.delete(key);
     this.keyVersions.set(key, this.localVersion);
   }
-  /**
-   * Rolls back the transaction.
-   * Clears all buffers and marks the transaction as finished.
-   * @returns The result object with success, created, updated, and deleted keys.
-   */
-  rollback() {
+  _getResultEntries() {
     const created = [];
     const updated = [];
     for (const [key, data] of this.writeBuffer.entries()) {
@@ -90,15 +102,26 @@ var MVCCTransaction = class {
     }
     const deleted = [];
     for (const key of this.deleteBuffer) {
+      if (!this.originallyExisted.has(key)) continue;
       const data = this.deletedValues.get(key);
       if (data !== void 0) {
         deleted.push({ key, data });
       }
     }
+    return { created, updated, deleted };
+  }
+  /**
+   * Rolls back the transaction.
+   * Clears all buffers and marks the transaction as finished.
+   * @returns The result object with success, created, updated, and deleted keys.
+   */
+  rollback() {
+    const { created, updated, deleted } = this._getResultEntries();
     this.writeBuffer.clear();
     this.deleteBuffer.clear();
     this.createdKeys.clear();
     this.deletedValues.clear();
+    this.originallyExisted.clear();
     this.committed = true;
     if (this.root !== this) {
       this.root.activeTransactions.delete(this);
@@ -132,8 +155,10 @@ var SyncMVCCTransaction = class _SyncMVCCTransaction extends MVCCTransaction {
   delete(key) {
     if (this.committed) throw new Error("Transaction already committed");
     let valueToDelete = null;
+    let wasInWriteBuffer = false;
     if (this.writeBuffer.has(key)) {
       valueToDelete = this.writeBuffer.get(key);
+      wasInWriteBuffer = true;
     } else if (!this.deleteBuffer.has(key)) {
       valueToDelete = this.read(key);
     }
@@ -141,6 +166,9 @@ var SyncMVCCTransaction = class _SyncMVCCTransaction extends MVCCTransaction {
       throw new Error(`Key not found: ${key}`);
     }
     this.deletedValues.set(key, valueToDelete);
+    if (!wasInWriteBuffer || !this.createdKeys.has(key)) {
+      this.originallyExisted.add(key);
+    }
     this._bufferDelete(key);
     return this;
   }
@@ -183,29 +211,17 @@ var SyncMVCCTransaction = class _SyncMVCCTransaction extends MVCCTransaction {
     }
   }
   commit() {
+    const { created, updated, deleted } = this._getResultEntries();
     if (this.committed) {
-      return { success: false, error: "Transaction already committed", created: [], updated: [], deleted: [] };
+      return { success: false, error: "Transaction already committed", created, updated, deleted };
     }
-    const created = [];
-    const updated = [];
-    for (const [key, data] of this.writeBuffer.entries()) {
-      if (this.createdKeys.has(key)) {
-        created.push({ key, data });
-      } else {
-        updated.push({ key, data });
-      }
-    }
-    const deleted = [];
-    for (const key of this.deleteBuffer) {
-      const data = this.deletedValues.get(key);
-      if (data !== void 0) {
-        deleted.push({ key, data });
-      }
+    if (this.hasCommittedAncestor()) {
+      return { success: false, error: "Ancestor transaction already committed", created, updated, deleted };
     }
     if (this.parent) {
       const error = this.parent._merge(this);
       if (error) {
-        return { success: false, error, created: [], updated: [], deleted: [] };
+        return { success: false, error, created, updated, deleted };
       }
       this.committed = true;
     } else {
@@ -218,6 +234,7 @@ var SyncMVCCTransaction = class _SyncMVCCTransaction extends MVCCTransaction {
         this.deleteBuffer.clear();
         this.createdKeys.clear();
         this.deletedValues.clear();
+        this.originallyExisted.clear();
         this.keyVersions.clear();
         this.localVersion = 0;
       }
@@ -256,6 +273,9 @@ var SyncMVCCTransaction = class _SyncMVCCTransaction extends MVCCTransaction {
         if (deletedValue !== void 0) {
           this.deletedValues.set(key, deletedValue);
         }
+        if (child.originallyExisted.has(key)) {
+          this.originallyExisted.add(key);
+        }
       }
       this.localVersion = newLocalVersion;
       this.root.activeTransactions.delete(child);
@@ -674,8 +694,10 @@ var AsyncMVCCTransaction = class _AsyncMVCCTransaction extends MVCCTransaction {
   async delete(key) {
     if (this.committed) throw new Error("Transaction already committed");
     let valueToDelete = null;
+    let wasInWriteBuffer = false;
     if (this.writeBuffer.has(key)) {
       valueToDelete = this.writeBuffer.get(key);
+      wasInWriteBuffer = true;
     } else if (!this.deleteBuffer.has(key)) {
       valueToDelete = await this.read(key);
     }
@@ -683,6 +705,9 @@ var AsyncMVCCTransaction = class _AsyncMVCCTransaction extends MVCCTransaction {
       throw new Error(`Key not found: ${key}`);
     }
     this.deletedValues.set(key, valueToDelete);
+    if (!wasInWriteBuffer || !this.createdKeys.has(key)) {
+      this.originallyExisted.add(key);
+    }
     this._bufferDelete(key);
     return this;
   }
@@ -726,29 +751,17 @@ var AsyncMVCCTransaction = class _AsyncMVCCTransaction extends MVCCTransaction {
   }
   async commit() {
     return this.writeLock(async () => {
+      const { created, updated, deleted } = this._getResultEntries();
       if (this.committed) {
-        return { success: false, error: "Transaction already committed", created: [], updated: [], deleted: [] };
-      }
-      const created = [];
-      const updated = [];
-      for (const [key, data] of this.writeBuffer.entries()) {
-        if (this.createdKeys.has(key)) {
-          created.push({ key, data });
-        } else {
-          updated.push({ key, data });
-        }
+        return { success: false, error: "Transaction already committed", created, updated, deleted };
       }
-      const deleted = [];
-      for (const key of this.deleteBuffer) {
-        const data = this.deletedValues.get(key);
-        if (data !== void 0) {
-          deleted.push({ key, data });
-        }
+      if (this.hasCommittedAncestor()) {
+        return { success: false, error: "Ancestor transaction already committed", created, updated, deleted };
       }
       if (this.parent) {
         const error = await this.parent._merge(this);
         if (error) {
-          return { success: false, error, created: [], updated: [], deleted: [] };
+          return { success: false, error, created, updated, deleted };
         }
         this.committed = true;
       } else {
@@ -761,6 +774,7 @@ var AsyncMVCCTransaction = class _AsyncMVCCTransaction extends MVCCTransaction {
           this.deleteBuffer.clear();
           this.createdKeys.clear();
           this.deletedValues.clear();
+          this.originallyExisted.clear();
           this.keyVersions.clear();
           this.localVersion = 0;
         }
@@ -801,6 +815,9 @@ var AsyncMVCCTransaction = class _AsyncMVCCTransaction extends MVCCTransaction {
           if (deletedValue !== void 0) {
             this.deletedValues.set(key, deletedValue);
           }
+          if (child.originallyExisted.has(key)) {
+            this.originallyExisted.add(key);
+          }
         }
         this.localVersion = newLocalVersion;
         this.root.activeTransactions.delete(child);

package/dist/types/core/base/Transaction.d.ts

@@ -1,4 +1,4 @@
-import type { Deferred, TransactionResult } from '../../types';
+import type { Deferred, TransactionResult, TransactionEntry } from '../../types';
 import type { MVCCStrategy } from './Strategy';
 /**
  * MVCC Transaction abstract class.
@@ -16,6 +16,7 @@ export declare abstract class MVCCTransaction<S extends MVCCStrategy<K, T>, K, T
     readonly deleteBuffer: Set<K>;
     readonly createdKeys: Set<K>;
     readonly deletedValues: Map<K, T>;
+    readonly originallyExisted: Set<K>;
     readonly parent?: MVCCTransaction<S, K, T>;
     localVersion: number;
     readonly keyVersions: Map<K, number>;
@@ -33,6 +34,12 @@ export declare abstract class MVCCTransaction<S extends MVCCStrategy<K, T>, K, T
     protected activeTransactions: Set<MVCCTransaction<S, K, T>>;
     constructor(strategy?: S, parent?: MVCCTransaction<S, K, T>, snapshotVersion?: number);
     isRoot(): boolean;
+    /**
+     * Checks if any ancestor transaction has already been committed.
+     * A nested transaction cannot commit if its parent or any higher ancestor is committed.
+     * @returns True if at least one ancestor is committed, false otherwise.
+     */
+    hasCommittedAncestor(): boolean;
     /**
      * Schedules a creation (insert) of a key-value pair.
      * Throws if the key already exists.
@@ -59,6 +66,11 @@ export declare abstract class MVCCTransaction<S extends MVCCStrategy<K, T>, K, T
     protected _bufferCreate(key: K, value: T): void;
     protected _bufferWrite(key: K, value: T): void;
     protected _bufferDelete(key: K): void;
+    protected _getResultEntries(): {
+        created: TransactionEntry<K, T>[];
+        updated: TransactionEntry<K, T>[];
+        deleted: TransactionEntry<K, T>[];
+    };
     /**
      * Rolls back the transaction.
      * Clears all buffers and marks the transaction as finished.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mvcc-api",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "Multiversion Concurrency Control (MVCC) API for TypeScript",
   "license": "MIT",
   "author": "izure <admin@izure.org>",