@reactables/core 0.8.0-alpha.0 → 0.8.0-alpha.2

package/dist/Helpers/jsonDiff.d.ts

@@ -0,0 +1,27 @@
+/**
+ * Modified from https://github.com/AsyncBanana/microdiff
+ * v 1.3.2
+ * @description handles serializable (JSON) objects only
+ */
+export interface DifferenceCreate {
+    type: 'CREATE';
+    path: (string | number)[];
+    value: unknown;
+}
+export interface DifferenceRemove {
+    type: 'REMOVE';
+    path: (string | number)[];
+    oldValue: unknown;
+}
+export interface DifferenceChange {
+    type: 'CHANGE';
+    path: (string | number)[];
+    value: unknown;
+    oldValue: unknown;
+}
+export type Difference = DifferenceCreate | DifferenceRemove | DifferenceChange;
+interface Options {
+    cyclesFix: boolean;
+}
+declare const jsonDiff: (obj: Record<string, any> | any[], newObj: Record<string, any> | any[], options?: Partial<Options>, _stack?: Record<string, any>[]) => Difference[];
+export default jsonDiff;

package/dist/Helpers/jsonDiff.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/index.js

@@ -4,11 +4,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var operators = require('rxjs/operators');
 var rxjs = require('rxjs');
-var diff = require('microdiff');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var diff__default = /*#__PURE__*/_interopDefaultLegacy(diff);
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -103,6 +98,60 @@ var createSlice = function (config) {
     };
 };
 
+var jsonDiff = function (obj, newObj, options, _stack) {
+    if (options === void 0) { options = { cyclesFix: true }; }
+    if (_stack === void 0) { _stack = []; }
+    var diffs = [];
+    var isObjArray = Array.isArray(obj);
+    var _loop_1 = function (key) {
+        var objKey = obj[key];
+        var path = isObjArray ? +key : key;
+        if (!(key in newObj)) {
+            diffs.push({
+                type: 'REMOVE',
+                path: [path],
+                oldValue: obj[key]
+            });
+            return "continue";
+        }
+        var newObjKey = newObj[key];
+        var areObjects = typeof objKey === 'object' && typeof newObjKey === 'object';
+        if (objKey && newObjKey && areObjects && (!options.cyclesFix || !_stack.includes(objKey))) {
+            var nestedDiffs = jsonDiff(objKey, newObjKey, options, options.cyclesFix ? _stack.concat([objKey]) : []);
+            // eslint-disable-next-line prefer-spread
+            diffs.push.apply(diffs, nestedDiffs.map(function (difference) {
+                difference.path.unshift(path);
+                return difference;
+            }));
+        }
+        else if (objKey !== newObjKey &&
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            //@ts-ignore
+            !(areObjects && (isNaN(objKey) ? objKey + '' === newObjKey + '' : +objKey === +newObjKey))) {
+            diffs.push({
+                path: [path],
+                type: 'CHANGE',
+                value: newObjKey,
+                oldValue: objKey
+            });
+        }
+    };
+    for (var key in obj) {
+        _loop_1(key);
+    }
+    var isNewObjArray = Array.isArray(newObj);
+    for (var key in newObj) {
+        if (!(key in obj)) {
+            diffs.push({
+                type: 'CREATE',
+                path: [isNewObjArray ? +key : key],
+                value: newObj[key]
+            });
+        }
+    }
+    return diffs;
+};
+
 var getScopedEffectSignature = function (actionType, key) {
     return "type: ".concat(actionType, ", scoped: true").concat(key ? ",key:".concat(key) : '');
 };
@@ -149,29 +198,28 @@ var HubFactory = function (_a) {
                     typeof prevState === 'object' &&
                     newState &&
                     typeof newState === 'object') {
-                    var reduceDiff = function (diff) {
-                        return diff.reduce(function (acc, change) {
-                            var _a;
-                            return (__assign(__assign({}, acc), (_a = {}, _a[change.path.join('|')] = change, _a)));
-                        }, {});
-                    };
-                    var difference = reduceDiff(diff__default["default"](prevState, newState));
-                    console.log(debugName, '[State]:', {
-                        state: newState,
-                        diff: Object.keys(difference).length ? difference : null
-                    });
+                    try {
+                        var reduceDiff = function (diff) {
+                            return diff.reduce(function (acc, change) {
+                                var _a;
+                                return (__assign(__assign({}, acc), (_a = {}, _a[change.path.join('|')] = change, _a)));
+                            }, {});
+                        };
+                        var difference = reduceDiff(jsonDiff(prevState, newState));
+                        console.log(debugName, '[Diff]:', Object.keys(difference).length ? difference : null, '[State]:', newState);
+                    }
+                    catch (e) {
+                        console.log('Error Reading Diff:', e, '[State]:', newState);
+                    }
                 }
                 else {
                     var hasDiff = prevState !== newState;
-                    console.log(debugName, '[State]:', {
-                        state: newState,
-                        diff: hasDiff
-                            ? {
-                                oldValue: prevState,
-                                newValue: newState
-                            }
-                            : null
-                    });
+                    console.log(debugName, '[Diff]:', hasDiff
+                        ? {
+                            oldValue: prevState,
+                            newValue: newState
+                        }
+                        : null, '[State]:', newState);
                 }
             }
         }), operators.map(function (pair) { return pair[1]; }));

package/package.json

@@ -16,8 +16,5 @@
   "peerDependencies": {
     "rxjs": "^6.0.0 || ^7.0.0"
   },
-  "dependencies": {
-    "microdiff": "^1.3.2"
-  },
-  "version": "0.8.0-alpha.0"
+  "version": "0.8.0-alpha.2"
 }