reactronic 0.22.105 → 0.22.109

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (C) 2016-2021 Yury Chetyrko <ychetyrko@gmail.com>
+Copyright (C) 2016-2022 Yury Chetyrko <ychetyrko@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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

@@ -2,7 +2,7 @@ export { all, pause } from './util/Utils';
 export { SealedArray } from './util/SealedArray';
 export { SealedMap } from './util/SealedMap';
 export { SealedSet } from './util/SealedSet';
-export { MemberOptions, Kind, Reentrance, TraceOptions, ProfilingOptions, TraceLevel } from './Options';
+export { MemberOptions, SnapshotOptions, Kind, Reentrance, TraceOptions, ProfilingOptions, TraceLevel } from './Options';
 export { Worker } from './Worker';
 export { Controller } from './Controller';
 export { Ref, ToggleRef, BoolOnly, GivenTypeOnly } from './Ref';

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

@@ -12,7 +12,7 @@ export declare class Observable {
     get originSnapshotId(): number | undefined;
     constructor(value: any);
 }
-export declare type StandaloneMode = boolean | 'isolated';
+export declare type StandaloneMode = boolean | 'isolated' | 'disposal';
 export interface Observer {
     readonly order: number;
     readonly observables: Map<Observable, ObservableInfo> | undefined;

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

@@ -39,7 +39,7 @@ export declare class Snapshot implements AbstractSnapshot {
     acquire(outer: Snapshot): void;
     bumpBy(timestamp: number): void;
     rebase(): ObjectRevision[] | undefined;
-    private static merge;
+    private merge;
     applyOrDiscard(error?: any): Array<Observer>;
     static sealObjectRevision(h: ObjectHolder, r: ObjectRevision): void;
     static sealObservable(observable: Observable | symbol, m: MemberName, typeName: string): void;

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

@@ -130,7 +130,7 @@ class Snapshot {
         if (this.changeset.size > 0) {
             this.changeset.forEach((r, h) => {
                 if (r.prev.revision !== h.head) {
-                    const merged = Snapshot.merge(h, r);
+                    const merged = this.merge(h, r);
                     if (r.conflicts.size > 0) {
                         if (!conflicts)
                             conflicts = [];
@@ -154,19 +154,21 @@ class Snapshot {
         }
         return conflicts;
     }
-    static merge(h, ours) {
+    merge(h, ours) {
         let counter = 0;
         const head = h.head;
-        const disposed = head.changes.has(Data_1.Meta.Disposed);
+        const headDisposed = head.changes.has(Data_1.Meta.Disposed);
         const merged = Object.assign({}, head.data);
         ours.changes.forEach((o, m) => {
             counter++;
             merged[m] = ours.data[m];
-            if (disposed || m === Data_1.Meta.Disposed) {
-                if (disposed !== (m === Data_1.Meta.Disposed)) {
-                    if (Dbg_1.Dbg.isOn && Dbg_1.Dbg.trace.change)
-                        Dbg_1.Dbg.log('║╠', '', `${Dump.rev2(h, ours.snapshot, m)} <> ${Dump.rev2(h, head.snapshot, m)}`, 0, ' *** CONFLICT ***');
-                    ours.conflicts.set(m, head);
+            if (headDisposed || m === Data_1.Meta.Disposed) {
+                if (headDisposed !== (m === Data_1.Meta.Disposed)) {
+                    if (headDisposed || this.options.standalone !== 'disposal') {
+                        if (Dbg_1.Dbg.isOn && Dbg_1.Dbg.trace.change)
+                            Dbg_1.Dbg.log('║╠', '', `${Dump.rev2(h, ours.snapshot, m)} <> ${Dump.rev2(h, head.snapshot, m)}`, 0, ' *** CONFLICT ***');
+                        ours.conflicts.set(m, head);
+                    }
                 }
             }
             else {

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

@@ -22,7 +22,7 @@ class Transaction {
     static run(options, func, ...args) { return TransactionImpl.run(options, func, ...args); }
     static standalone(func, ...args) { return TransactionImpl.standalone(func, ...args); }
     static off(func, ...args) { return TransactionImpl.off(func, ...args); }
-    static isFrameOver(everyN = 1, timeLimit = 14) { return TransactionImpl.isFrameOver(everyN, timeLimit); }
+    static isFrameOver(everyN = 1, timeLimit = 10) { return TransactionImpl.isFrameOver(everyN, timeLimit); }
     static requestNextFrame(sleepTime = 0) { return TransactionImpl.requestNextFrame(sleepTime); }
     static get isCanceled() { return TransactionImpl.current.isCanceled; }
 }
@@ -143,7 +143,7 @@ class TransactionImpl extends Transaction {
             TransactionImpl.curr = outer;
         }
     }
-    static isFrameOver(everyN = 1, timeLimit = 14) {
+    static isFrameOver(everyN = 1, timeLimit = 10) {
         TransactionImpl.frameOverCounter++;
         let result = TransactionImpl.frameOverCounter % everyN === 0;
         if (result) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactronic",
-  "version": "0.22.105",
+  "version": "0.22.109",
   "description": "Reactronic - Transactional Reactive State Management",
   "main": "build/dist/source/api.js",
   "types": "build/dist/source/api.d.ts",