reactronic 0.21.516 → 0.21.520

package/README.md

@@ -6,7 +6,7 @@
 [![CircleCI Status](https://circleci.com/gh/nezaboodka/reactronic.svg?style=shield&circle-token=:circle-token)](https://circleci.com/gh/nezaboodka/reactronic)
 ![Coverage](https://img.shields.io/badge/coverage-97%25-success.svg)
 ![Lines](https://img.shields.io/badge/lines-1715-success.svg)
-[![Demo](https://img.shields.io/badge/demo-live-success.svg)](https://gitlab.com/nezaboodka/nevod.web.public/-/blob/master/README.md)
+[![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/Ref.d.ts

@@ -27,8 +27,8 @@ export declare class Ref<T = any> {
     static similarRefs(v1: Ref, v2: Ref): boolean;
 }
 export declare class ToggleRef<T = boolean> extends Ref<T> {
-    readonly value1: T;
-    readonly value2: T;
-    constructor(owner: any, name: string, value1: T, value2: T);
+    readonly valueOn: T;
+    readonly valueOff: T;
+    constructor(owner: any, name: string, valueOn: T, valueOff: T);
     toggle(): void;
 }

package/build/dist/source/Ref.js

@@ -49,22 +49,22 @@ class Ref {
 }
 exports.Ref = Ref;
 class ToggleRef extends Ref {
-    constructor(owner, name, value1, value2) {
+    constructor(owner, name, valueOn, valueOff) {
         super(owner, name);
-        this.value1 = value1;
-        this.value2 = value2;
+        this.valueOn = valueOn;
+        this.valueOff = valueOff;
     }
     toggle() {
         const o = this.owner;
         const p = this.name;
         Transaction_1.Transaction.runAs({ hint: `toggle ${o.constructor.name}.${p}` }, () => {
             const v = o[p];
-            const isValue1 = v === this.value1 || (v instanceof Ref && this.value1 instanceof Ref &&
-                Ref.sameRefs(v, this.value1));
-            if (!isValue1)
-                o[p] = this.value1;
+            const isOn = v === this.valueOn || (v instanceof Ref && this.valueOn instanceof Ref &&
+                Ref.sameRefs(v, this.valueOn));
+            if (!isOn)
+                o[p] = this.valueOn;
             else
-                o[p] = this.value2;
+                o[p] = this.valueOff;
         });
     }
 }

package/build/dist/source/Trace.d.ts

@@ -24,10 +24,10 @@ export interface ProfilingOptions {
 }
 export declare const TraceLevel: {
     Error: TraceOptions;
-    Minimal: TraceOptions;
-    Info: TraceOptions;
+    Transactions: TraceOptions;
+    Operations: TraceOptions;
     Debug: TraceOptions;
-    Suppress: TraceOptions;
+    Silent: TraceOptions;
 };
 declare global {
     interface Window {

package/build/dist/source/Trace.js

@@ -20,7 +20,7 @@ exports.TraceLevel = {
         margin1: 0,
         margin2: 0,
     },
-    Minimal: {
+    Transactions: {
         silent: false,
         transaction: true,
         operation: false,
@@ -38,7 +38,7 @@ exports.TraceLevel = {
         margin1: 0,
         margin2: 0,
     },
-    Info: {
+    Operations: {
         silent: false,
         transaction: true,
         operation: true,
@@ -74,7 +74,7 @@ exports.TraceLevel = {
         margin1: 0,
         margin2: 0,
     },
-    Suppress: {
+    Silent: {
         silent: true,
         transaction: false,
         operation: false,

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

@@ -12,7 +12,7 @@ const Hooks_1 = require("./Hooks");
 const TransactionJournal_1 = require("./TransactionJournal");
 const ROOT_ARGS = [];
 const ROOT_HOLDER = new Data_1.ObjectHolder(undefined, undefined, Hooks_1.Hooks.proxy, Snapshot_1.ROOT_REV, 'root-holder');
-const ROOT_CAUSE = { revision: Snapshot_1.ROOT_REV, memberName: 'root-cause', usageCount: 0 };
+const ROOT_TRIGGER = { revision: Snapshot_1.ROOT_REV, memberName: 'root-trigger', usageCount: 0 };
 class OperationController extends Controller_1.Controller {
     constructor(ownHolder, memberName) {
         super();
@@ -35,7 +35,7 @@ class OperationController extends Controller_1.Controller {
         const op = oc.operation;
         const opts = op.options;
         if (!oc.isUpToDate && oc.revision.data[Data_1.Meta.Disposed] === undefined
-            && (!weak || op.cause === ROOT_CAUSE || !op.successor ||
+            && (!weak || op.cause === ROOT_TRIGGER || !op.successor ||
                 op.successor.transaction.isFinished)) {
             const standalone = weak || opts.kind === Options_1.Kind.Reaction ||
                 (opts.kind === Options_1.Kind.Cache && (oc.revision.snapshot.sealed ||
@@ -69,7 +69,7 @@ class OperationController extends Controller_1.Controller {
             throw (0, Dbg_1.misuse)('a method is expected with reactronic decorator');
         op.options = new Hooks_1.OptionsImpl(op.options.getter, op.options.setter, op.options, options, false);
         if (Dbg_1.Dbg.isOn && Dbg_1.Dbg.trace.write)
-            Dbg_1.Dbg.log('║', '  ♦', `${op.hint()}.options = ...`);
+            Dbg_1.Dbg.log('║', '  ✎', `${op.hint()}.options = ...`);
         return op.options;
     }
     static runWithin(op, func, ...args) {
@@ -105,7 +105,7 @@ class OperationController extends Controller_1.Controller {
         const ctx = Snapshot_1.Snapshot.current();
         const r = ctx.seekRevision(this.ownHolder, this.memberName);
         const op = this.peekFromRevision(r);
-        const isValid = op.options.kind !== Options_1.Kind.Transaction && op.cause !== ROOT_CAUSE &&
+        const isValid = op.options.kind !== Options_1.Kind.Transaction && op.cause !== ROOT_TRIGGER &&
             (ctx === op.revision.snapshot || ctx.timestamp < op.obsoleteSince) &&
             (!op.options.sensitiveArgs || args === undefined ||
                 op.args.length === args.length && op.args.every((t, i) => t === args[i])) ||
@@ -144,7 +144,7 @@ class OperationController extends Controller_1.Controller {
                 if (op2.controller !== this) {
                     r2 = Snapshot_1.Snapshot.edit().getEditableRevision(h, m, Data_1.Meta.Holder, this);
                     op2 = r2.data[m] = new Operation(this, r2, op2);
-                    op2.cause = ROOT_CAUSE;
+                    op2.cause = ROOT_TRIGGER;
                     Snapshot_1.Snapshot.markEdited(op2, true, r2, m, h);
                 }
                 return op2;
@@ -160,7 +160,7 @@ class OperationController extends Controller_1.Controller {
             if (!oc.operation.transaction.isCanceled) {
                 oc = this.edit();
                 if (Dbg_1.Dbg.isOn && (Dbg_1.Dbg.trace.transaction || Dbg_1.Dbg.trace.operation || Dbg_1.Dbg.trace.obsolete))
-                    Dbg_1.Dbg.log('║', ' (f)', `${oc.operation.why()}`);
+                    Dbg_1.Dbg.log('║', '  𝑓', `${oc.operation.why()}`);
                 oc.operation.run(this.ownHolder.proxy, argsx);
             }
             else {
@@ -168,7 +168,7 @@ class OperationController extends Controller_1.Controller {
                 if (oc.operation.options.kind === Options_1.Kind.Transaction || !oc.isUpToDate) {
                     oc = this.edit();
                     if (Dbg_1.Dbg.isOn && (Dbg_1.Dbg.trace.transaction || Dbg_1.Dbg.trace.operation || Dbg_1.Dbg.trace.obsolete))
-                        Dbg_1.Dbg.log('║', ' (f)', `${oc.operation.why()}`);
+                        Dbg_1.Dbg.log('║', '  𝑓', `${oc.operation.why()}`);
                     oc.operation.run(this.ownHolder.proxy, argsx);
                 }
             }
@@ -215,14 +215,14 @@ class Operation extends Data_1.Observable {
         const prev = this.revision.prev.revision.data[this.controller.memberName];
         if (prev instanceof Operation)
             ms = prev.started !== 0 ? Math.abs(this.started || ms) - Math.abs(prev.started) : Infinity;
-        let cause;
+        let trigger;
         if (this.cause)
-            cause = `   <<   ${propagationHint(this.cause, true).join('   <<   ')}`;
+            trigger = `   <<   ${propagationHint(this.cause, true).join('   <<   ')}`;
         else if (this.controller.options.kind === Options_1.Kind.Transaction)
-            cause = '   <<   operation';
+            trigger = '   <<   operation';
         else
-            cause = `   <<   called within ${this.revision.snapshot.hint}`;
-        return `${this.hint()}${cause}   (${ms !== Infinity ? `${ms}ms since previous run` : 'initial run'})`;
+            trigger = `   <<   called within ${this.revision.snapshot.hint}`;
+        return `${this.hint()}${trigger}   (${ms !== Infinity ? `${ms}ms since previous run` : 'initial run'})`;
     }
     briefWhy() {
         return this.cause ? propagationHint(this.cause, false)[0] : ROOT_HOLDER.hint;
@@ -443,12 +443,12 @@ class Operation extends Data_1.Observable {
     static markEdited(value, edited, r, m, h) {
         edited ? r.changes.set(m, Operation.current) : r.changes.delete(m);
         if (Dbg_1.Dbg.isOn && Dbg_1.Dbg.trace.write)
-            edited ? Dbg_1.Dbg.log('║', '  ♦', `${Snapshot_1.Dump.rev(r, m)} = ${valueHint(value)}`) : Dbg_1.Dbg.log('║', '  ♦', `${Snapshot_1.Dump.rev(r, m)} = ${valueHint(value)}`, undefined, ' (same as previous)');
+            edited ? Dbg_1.Dbg.log('║', '  ✎', `${Snapshot_1.Dump.rev(r, m)} = ${valueHint(value)}`) : Dbg_1.Dbg.log('║', '  ✎', `${Snapshot_1.Dump.rev(r, m)} = ${valueHint(value)}`, undefined, ' (same as previous)');
     }
     static isConflicting(oldValue, newValue) {
         let result = oldValue !== newValue;
         if (result)
-            result = oldValue instanceof Operation && oldValue.cause !== ROOT_CAUSE;
+            result = oldValue instanceof Operation && oldValue.cause !== ROOT_TRIGGER;
         return result;
     }
     static propagateAllChangesThroughSubscriptions(snapshot) {
@@ -569,7 +569,7 @@ class Operation extends Data_1.Observable {
     }
     static init() {
         Object.freeze(ROOT_ARGS);
-        Object.freeze(ROOT_CAUSE);
+        Object.freeze(ROOT_TRIGGER);
         Dbg_1.Dbg.getMergedTraceOptions = getMergedTraceOptions;
         Snapshot_1.Snapshot.markUsed = Operation.markUsed;
         Snapshot_1.Snapshot.markEdited = Operation.markEdited;

package/build/dist/source/util/Dbg.js

@@ -27,7 +27,7 @@ class Dbg {
             const t = Dbg.global;
             const o = Object.keys(Dbg.global).filter(x => t[x] === true).join(', ');
             Dbg.log('', '', `Reactronic trace is enabled: ${o}`);
-            Dbg.log('', '', 'Method-level trace can be configured with @trace decorator');
+            Dbg.log('', '', 'Method-level trace can be configured with @options({ trace: ... }) decorator');
         }
         else
             Dbg.log('', '', 'Reactronic trace is disabled');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactronic",
-  "version": "0.21.516",
+  "version": "0.21.520",
   "description": "Reactronic - Transactional Reactive State Management",
   "main": "build/dist/source/api.js",
   "types": "build/dist/source/api.d.ts",
@@ -29,16 +29,16 @@
   },
   "homepage": "https://github.com/nezaboodka/reactronic/blob/master/README.md#readme",
   "devDependencies": {
-    "@types/node": "16.10.1",
-    "@types/react": "17.0.24",
-    "@typescript-eslint/eslint-plugin": "4.31.2",
-    "@typescript-eslint/parser": "4.31.2",
+    "@types/node": "16.11.10",
+    "@types/react": "17.0.37",
+    "@typescript-eslint/eslint-plugin": "5.4.0",
+    "@typescript-eslint/parser": "5.4.0",
     "ava": "3.15.0",
-    "eslint": "7.32.0",
+    "eslint": "8.3.0",
     "nyc": "15.1.0",
     "react": "17.0.2",
-    "ts-node": "10.2.1",
-    "tsconfig-paths": "3.11.0",
+    "ts-node": "10.4.0",
+    "tsconfig-paths": "3.12.0",
     "typescript": "4.4.3"
   },
   "scripts": {