reactronic 0.22.311 → 0.22.312

package/README.md

@@ -4,7 +4,7 @@
 [![NPM Version](https://img.shields.io/npm/v/reactronic.svg?style=flat&colorB=success)](https://www.npmjs.com/package/reactronic)
 [![Package Size](https://img.shields.io/bundlephobia/minzip/reactronic.svg?colorB=success)](https://bundlephobia.com/result?p=reactronic)
 ![Coverage](https://img.shields.io/badge/coverage-97%25-success.svg)
-![Lines](https://img.shields.io/badge/lines-1811-success.svg)
+![Lines](https://img.shields.io/badge/lines-2722-success.svg)
 [![Demo](https://img.shields.io/badge/demo-live-success.svg)](https://gitlab.com/nezaboodka/nevod.website/-/blob/master/README.md)
 
 # **Reactronic** - Transactional Reactive State Management

package/build/dist/source/impl/Changeset.d.ts

@@ -29,9 +29,9 @@ export declare class Changeset implements AbstractChangeset {
     static propagateAllChangesThroughSubscriptions: (changeset: Changeset) => void;
     static revokeAllSubscriptions: (changeset: Changeset) => void;
     static enqueueReactionsToRun: (reactions: Array<Subscriber>) => void;
-    seekSnapshot(h: ObjectHandle, m: MemberName): ObjectSnapshot;
-    getRelevantSnapshot(h: ObjectHandle, m: MemberName): ObjectSnapshot;
-    getEditableSnapshot(h: ObjectHandle, m: MemberName, value: any, token?: any): ObjectSnapshot;
+    lookupObjectSnapshot(h: ObjectHandle, m: MemberName): ObjectSnapshot;
+    getObjectSnapshot(h: ObjectHandle, m: MemberName): ObjectSnapshot;
+    getEditableObjectSnapshot(h: ObjectHandle, m: MemberName, value: any, token?: any): ObjectSnapshot;
     static takeSnapshot<T>(obj: T): T;
     static dispose(obj: any): void;
     static doDispose(ctx: Changeset, h: ObjectHandle): ObjectSnapshot;

package/build/dist/source/impl/Changeset.js

@@ -11,7 +11,7 @@ Object.defineProperty(ObjectHandle.prototype, '#this', {
     configurable: false, enumerable: false,
     get() {
         const result = {};
-        const data = Changeset.current().getRelevantSnapshot(this, '#this').data;
+        const data = Changeset.current().getObjectSnapshot(this, '#this').data;
         for (const m in data) {
             const v = data[m];
             if (v instanceof Subscription)
@@ -38,7 +38,7 @@ export class Changeset {
     }
     get hint() { var _a; return (_a = this.options.hint) !== null && _a !== void 0 ? _a : 'noname'; }
     get timestamp() { return this.revision; }
-    seekSnapshot(h, m) {
+    lookupObjectSnapshot(h, m) {
         let os = h.editing;
         if (os && os.changeset !== this) {
             os = this.items.get(h);
@@ -52,14 +52,14 @@ export class Changeset {
         }
         return os;
     }
-    getRelevantSnapshot(h, m) {
-        const r = this.seekSnapshot(h, m);
+    getObjectSnapshot(h, m) {
+        const r = this.lookupObjectSnapshot(h, m);
         if (r === EMPTY_SNAPSHOT)
-            throw misuse(`object ${Dump.obj(h)} doesn't exist in snapshot v${this.revision} (${this.hint})`);
+            throw misuse(`cannot use data from a transaction started after the current one T${this.id}[${this.hint}]: ${Dump.obj(h, m)} (head is T${h.head.changeset.id}[${h.head.changeset.hint}]${h.editing ? `, uncommitted T${h.editing.changeset.id}[${h.editing.changeset.hint}]` : ''})`);
         return r;
     }
-    getEditableSnapshot(h, m, value, token) {
-        let os = this.seekSnapshot(h, m);
+    getEditableObjectSnapshot(h, m, value, token) {
+        let os = this.lookupObjectSnapshot(h, m);
         const existing = os.data[m];
         if (existing !== Meta.Nonreactive) {
             if (this.isNewSnapshotRequired(h, os, m, existing, value, token)) {
@@ -90,7 +90,7 @@ export class Changeset {
             Changeset.doDispose(ctx, h);
     }
     static doDispose(ctx, h) {
-        const os = ctx.getEditableSnapshot(h, Meta.Revision, Meta.Undefined);
+        const os = ctx.getEditableObjectSnapshot(h, Meta.Revision, Meta.Undefined);
         if (os !== EMPTY_SNAPSHOT)
             os.disposed = true;
         return os;
@@ -98,13 +98,15 @@ export class Changeset {
     isNewSnapshotRequired(h, os, m, existing, value, token) {
         if (this.sealed && os.changeset !== EMPTY_SNAPSHOT.changeset)
             throw misuse(`reactive property ${Dump.obj(h, m)} can only be modified inside transaction`);
-        if (m !== Meta.Handle && value !== Meta.Handle) {
-            if (os.changeset !== this || os.former.snapshot !== EMPTY_SNAPSHOT) {
-                if (this.options.token !== undefined && token !== this.options.token)
-                    throw misuse(`${this.hint} should not have side effects (trying to change ${Dump.snapshot(os, m)})`);
+        if (m !== Meta.Handle) {
+            if (value !== Meta.Handle) {
+                if (os.changeset !== this || os.former.snapshot !== EMPTY_SNAPSHOT) {
+                    if (this.options.token !== undefined && token !== this.options.token)
+                        throw misuse(`${this.hint} should not have side effects (trying to change ${Dump.snapshot(os, m)})`);
+                }
             }
             if (os === EMPTY_SNAPSHOT)
-                throw misuse(`member ${Dump.snapshot(os, m)} doesn't exist in snapshot v${this.revision} (${this.hint})`);
+                throw misuse(`cannot use data from a transaction started after the current one T${this.id}[${this.hint}]: ${Dump.snapshot(os, m)} (head is T${h.head.changeset.id}[${h.head.changeset.hint}]${h.editing ? `, uncommitted T${h.editing.changeset.id}[${h.editing.changeset.hint}]` : ''})`);
         }
         return os.changeset !== this && !this.sealed;
     }

package/build/dist/source/impl/Hooks.js

@@ -120,7 +120,7 @@ export class Hooks {
         let result;
         if (m !== Meta.Handle) {
             const cs = Changeset.current();
-            const os = cs.getRelevantSnapshot(h, m);
+            const os = cs.getObjectSnapshot(h, m);
             result = os.data[m];
             if (result instanceof Subscription && !result.isOperation) {
                 Changeset.markUsed(result, os, m, h, Kind.Plain, false);
@@ -134,7 +134,7 @@ export class Hooks {
         return result;
     }
     set(h, m, value, receiver) {
-        const os = Changeset.edit().getEditableSnapshot(h, m, value);
+        const os = Changeset.edit().getEditableObjectSnapshot(h, m, value);
         if (os !== EMPTY_SNAPSHOT) {
             let curr = os.data[m];
             if (curr !== undefined || (os.former.snapshot.changeset === EMPTY_SNAPSHOT.changeset && (m in h.data) === false)) {
@@ -158,18 +158,18 @@ export class Hooks {
         return true;
     }
     has(h, m) {
-        const os = Changeset.current().getRelevantSnapshot(h, m);
+        const os = Changeset.current().getObjectSnapshot(h, m);
         return m in os.data || m in h.data;
     }
     getOwnPropertyDescriptor(h, m) {
-        const os = Changeset.current().getRelevantSnapshot(h, m);
+        const os = Changeset.current().getObjectSnapshot(h, m);
         const pd = Reflect.getOwnPropertyDescriptor(os.data, m);
         if (pd)
             pd.configurable = pd.writable = true;
         return pd;
     }
     ownKeys(h) {
-        const os = Changeset.current().getRelevantSnapshot(h, Meta.Handle);
+        const os = Changeset.current().getObjectSnapshot(h, Meta.Handle);
         const result = [];
         for (const m of Object.getOwnPropertyNames(os.data)) {
             const value = os.data[m];
@@ -245,7 +245,7 @@ export class Hooks {
     static createHandleForReactiveObject(proto, data, blank, hint) {
         const ctx = Changeset.edit();
         const h = new ObjectHandle(data, undefined, Hooks.handler, EMPTY_SNAPSHOT, hint);
-        ctx.getEditableSnapshot(h, Meta.Handle, blank);
+        ctx.getEditableObjectSnapshot(h, Meta.Handle, blank);
         if (!Hooks.reactionsAutoStartDisabled)
             for (const m in Meta.getFrom(proto, Meta.Reactions))
                 h.proxy[m][Meta.Controller].markObsolete();

package/build/dist/source/impl/Journal.js

@@ -97,7 +97,7 @@ export class JournalImpl extends Journal {
             if (!disposed) {
                 op.forEach((vp, m) => {
                     const value = undoing ? vp.formerValue : vp.freshValue;
-                    const os = ctx.getEditableSnapshot(h, m, value);
+                    const os = ctx.getEditableObjectSnapshot(h, m, value);
                     if (os.changeset === ctx) {
                         os.data[m] = new Subscription(value);
                         const existing = os.former.snapshot.data[m];

package/build/dist/source/impl/Operation.js

@@ -103,7 +103,7 @@ export class OperationController extends Controller {
     }
     peek(args) {
         const ctx = Changeset.current();
-        const os = ctx.seekSnapshot(this.objectHandle, this.memberName);
+        const os = ctx.lookupObjectSnapshot(this.objectHandle, this.memberName);
         const op = this.acquireFromSnapshot(os, args);
         const isValid = op.options.kind !== Kind.Transaction && op.cause !== BOOT_CAUSE &&
             (ctx === op.changeset || ctx.timestamp < op.obsoleteSince) &&
@@ -120,7 +120,7 @@ export class OperationController extends Controller {
         const h = this.objectHandle;
         const m = this.memberName;
         const ctx = Changeset.edit();
-        const os = ctx.getEditableSnapshot(h, m, Meta.Handle, this);
+        const os = ctx.getEditableObjectSnapshot(h, m, Meta.Handle, this);
         let op = this.acquireFromSnapshot(os, undefined);
         if (op.changeset !== os.changeset) {
             const op2 = new Operation(this, os.changeset, op);
@@ -140,10 +140,10 @@ export class OperationController extends Controller {
                 const standalone = os.changeset.sealed || os.former.snapshot !== EMPTY_SNAPSHOT;
                 op = Transaction.run({ hint, standalone, token: this }, () => {
                     const h = this.objectHandle;
-                    let r2 = Changeset.current().getRelevantSnapshot(h, m);
+                    let r2 = Changeset.current().getObjectSnapshot(h, m);
                     let op2 = r2.data[m];
                     if (op2.controller !== this) {
-                        r2 = Changeset.edit().getEditableSnapshot(h, m, Meta.Handle, this);
+                        r2 = Changeset.edit().getEditableObjectSnapshot(h, m, Meta.Handle, this);
                         const t = new Operation(this, r2.changeset, op2);
                         if (args)
                             t.args = args;

package/build/dist/source/impl/Transaction.js

@@ -301,7 +301,7 @@ class TransactionImpl extends Transaction {
         Changeset._init();
     }
 }
-TransactionImpl.none = new TransactionImpl({ hint: 'Transaction.off' });
+TransactionImpl.none = new TransactionImpl({ hint: '<none>' });
 TransactionImpl.curr = TransactionImpl.none;
 TransactionImpl.inspection = false;
 TransactionImpl.frameStartTime = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactronic",
-  "version": "0.22.311",
+  "version": "0.22.312",
   "description": "Reactronic - Transactional Reactive State Management",
   "type": "module",
   "main": "build/dist/source/api.js",