spyne 0.18.2 → 0.19.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "spyne",
   "sideEffects": false,
-  "version": "0.18.2",
+  "version": "0.19.0",
   "description": "Reactive Real-DOM Framework for Advanced Javascript applications",
   "main": "lib/spyne.min.js",
   "module": "src/spyne/spyne.js",
@@ -28,55 +28,40 @@
   },
   "keywords": [],
   "author": "Frank Batista",
-  "license": "LGPL",
+  "license": "UNLICENSED",
   "devDependencies": {
-    "@babel/core": "^7.15.0",
-    "@babel/plugin-transform-runtime": "^7.15.0",
-    "@babel/preset-env": "^7.15.0",
-    "babel-loader": "^8.2.2",
-    "chai": "^4.3.4",
-    "chai-dom": "^1.9.0",
-    "clean-webpack-plugin": "^3.0.0",
-    "commitizen": "^4.2.4",
-    "css-loader": "^6.2.0",
-    "cz-conventional-changelog": "^3.3.0",
-    "eslint": "^7.32.0",
-    "eslint-config-semistandard": "^16.0.0",
-    "eslint-config-standard": "^16.0.3",
-    "eslint-loader": "^4.0.2",
-    "eslint-plugin-import": "^2.24.2",
+    "chai": "^4.3.9",
+    "chai-dom": "^1.11.0",
+    "clean-webpack-plugin": "^4.0.0",
+    "css-loader": "^6.8.1",
+    "eslint": "^8.50.0",
+    "eslint-config-semistandard": "^17.0.0",
+    "eslint-config-standard": "^17.1.0",
+    "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^5.1.0",
+    "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-standard": "^5.0.0",
     "file-loader": "^6.2.0",
-    "ghooks": "^2.0.4",
-    "karma": "^6.3.4",
+    "karma": "^6.4.2",
     "karma-chai": "^0.1.0",
-    "karma-chrome-launcher": "^3.1.0",
-    "karma-coverage": "^2.0.3",
+    "karma-chrome-launcher": "^3.2.0",
+    "karma-coverage": "^2.2.1",
     "karma-mocha": "^2.0.1",
     "karma-webpack": "^5.0.0",
-    "mocha": "^9.1.1",
-    "mocha-loader": "^5.1.5",
-    "selenium-webdriver": "^4.0.0-beta.4",
-    "tslib": "^2.3.1",
-    "webpack": "^5.51.1",
-    "webpack-cli": "^4.8.0",
-    "webpack-dev-middleware": "^5.0.0",
-    "webpack-dev-server": "^4.0.0",
-    "webpack-node-externals": "^3.0.0",
+    "mocha": "^10.2.0",
+    "webpack": "^5.88.2",
+    "webpack-cli": "^5.1.4",
+    "webpack-dev-middleware": "^6.1.1",
+    "webpack-dev-server": "^4.15.1",
     "webpack-rxjs-externals": "^2.0.0"
   },
   "config": {
     "ghooks": {
       "pre-commit": "npm run test:single"
-    },
-    "commitizen": {
-      "path": "cz-conventional-changelog"
     }
   },
   "dependencies": {
-    "ramda": "^0.27.1",
-    "rxjs": "^7.3.0"
+    "ramda": "^0.29.0",
+    "rxjs": "^7.8.1"
   }
 }

package/src/spyne/channels/channel-fetch-class.js

@@ -100,7 +100,7 @@ export class ChannelFetch extends Channel {
 
   startFetch(options = {}, subscriber = this.onFetchReturned.bind(this)) {
     let fetchProps = this.consolidateAllFetchProps(options);
-    return new ChannelFetchUtil(fetchProps, subscriber);
+    return new ChannelFetchUtil(fetchProps, subscriber, false, this.props.name);
   }
 
   onFetchUpdate(evt) {
@@ -113,7 +113,9 @@ export class ChannelFetch extends Channel {
   }
 
   createChannelPayloadItem(payload, action = `${this.props.name}_DATA_EVENT`) {
-    this.sendChannelPayload(action, payload);
+    const {name, sendCachedPayload, url} = this.props;
+    const srcElement = {name, sendCachedPayload, url};
+    this.sendChannelPayload(action, payload, srcElement);
   }
 
   getPropsForFetch(evt) {

package/src/spyne/channels/channel-payload-class.js

@@ -12,6 +12,7 @@ import {
   is
 } from 'ramda';
 import {SpyneAppProperties} from '../utils/spyne-app-properties';
+import {safeClone} from '../utils/safe-clone';
 
 export class ChannelPayload {
   /**
@@ -76,15 +77,15 @@ export class ChannelPayload {
 
 
 
-    channelPayloadItemObj.clone = () => clone(mergeAll([
-        {payload:ChannelPayload.deepClone(channelPayloadItemObj.payload)},
+    channelPayloadItemObj.clone = () => mergeAll([
+        {payload:safeClone(channelPayloadItemObj.payload)},
       channelPayloadItemObj.payload,
-        { channel },
-        { event: event },
+        { channel: clone(channel) },
+        { event: clone(event) },
         {srcElement: srcElement},
-                channelPayloadItemObj.srcElement, {
-        action: channelPayloadItemObj.action }
-         ]));
+                clone(channelPayloadItemObj.srcElement), {
+        action: clone(channelPayloadItemObj.action) }
+         ]);
 
 
 

package/src/spyne/channels/channel.js

@@ -84,7 +84,7 @@ export class Channel {
     this.checkForPersistentDataMode = Channel.checkForPersistentDataMode.bind(this);
     this.observer$ = this.props['observer'] = observer$;
     let dispatcherStream$ = this.streamsController.getStream('DISPATCHER');
-    const payloadPredByChannelName = propEq('name', props.name)
+    const payloadPredByChannelName = propEq(props.name, 'name')
     dispatcherStream$.pipe(filter(payloadPredByChannelName)).subscribe((val) => this.onReceivedObservable(val));
   }
 
@@ -295,7 +295,7 @@ export class Channel {
     //console.log("INCOMING ",{action, payload, srcElement}, {obj});
     const mergeProps = (d) => mergeAll([d, { action: prop('action', d) }, prop('payload', d), prop('srcElement', d)]);
     let dataObj = obsVal => ({
-      props: () => mergeProps(obj.data),
+      clone: () => mergeProps(obj.data),
       action, payload, srcElement,
       event: obsVal
     });
@@ -401,6 +401,13 @@ export class Channel {
   }
 
 
+  static checkForNotTrackFlag(props={}){
+    if (props.doNotTrack === true){
+      SpyneAppProperties.doNotTrackChannel(props.channelName);
+    }
+
+
+  }
 
 
 

package/src/spyne/channels/channels-map.js

@@ -45,8 +45,8 @@ export class ChannelsMap {
 
   static listRegisteredChannels(showOnlyProxies = false) {
     let proxyMap = this.getChannelsList();
-    let rejectProxyFn = reject(propEq('val', 'ChannelProxy'));
-    let filterProxyFn = filter(propEq('val', 'ChannelProxy'));
+    let rejectProxyFn = reject(propEq('ChannelProxy', 'val'));
+    let filterProxyFn = filter(propEq('ChannelProxy', 'val' ));
     let fn = showOnlyProxies === true ? filterProxyFn : rejectProxyFn;
     let removedProxyArr = fn(proxyMap);
     return pluck(['key'], removedProxyArr);
@@ -57,7 +57,7 @@ export class ChannelsMap {
 
   checkForMissingChannels() {
     let proxyMap = this.getChannelsList();
-    let filterProxyFn = filter(propEq('val', 'ChannelProxy'));
+    let filterProxyFn = filter(propEq('ChannelProxy', 'val'));
     let filterProxyArr = filterProxyFn(proxyMap);
 
     if (filterProxyArr.length >= 1) {

package/src/spyne/channels/spyne-channel-window.js

@@ -295,9 +295,18 @@ export class SpyneChannelWindow extends Channel {
       'CHANNEL_WINDOW_FOCUS_EVENT',
       'CHANNEL_WINDOW_FULLSCREENCHANGE_EVENT',
       'CHANNEL_WINDOW_FULLSCREENERROR_EVENT',
+      'CHANNEL_WINDOW_KEYUP_EVENT',
+      'CHANNEL_WINDOW_KEYDOWN_EVENT',
       'CHANNEL_WINDOW_LOAD_EVENT',
       'CHANNEL_WINDOW_MEDIA_QUERY_EVENT',
       'CHANNEL_WINDOW_MESSAGE_EVENT',
+      'CHANNEL_WINDOW_MOUSEDOWN_EVENT',
+      'CHANNEL_WINDOW_MOUSEENTER_EVENT',
+      'CHANNEL_WINDOW_MOUSELEAVE_EVENT',
+      'CHANNEL_WINDOW_MOUSEMOVE_EVENT',
+      'CHANNEL_WINDOW_MOUSEOUT_EVENT',
+      'CHANNEL_WINDOW_MOUSEOVER_EVENT',
+      'CHANNEL_WINDOW_MOUSEUP_EVENT',
       'CHANNEL_WINDOW_MOUSEWHEEL_EVENT',
       'CHANNEL_WINDOW_OFFLINE_EVENT',
       'CHANNEL_WINDOW_ONLINE_EVENT',

package/src/spyne/spyne-app.js

@@ -3,7 +3,7 @@ import {ViewStream} from './views/view-stream';
 import {SpyneAppProperties} from './utils/spyne-app-properties';
 import {deepMerge} from './utils/deep-merge';
 const _channels = new ChannelsMap();
-const version = '0.18.2';
+const version = '0.19.0';
 
 class SpyneApplication {
   /**
@@ -41,7 +41,7 @@ class SpyneApplication {
   init(config = {}, testMode=false) {
     //this.channels = new ChannelsMap();
     /*!
-     * Spyne 0.18.2
+     * Spyne 0.19.0
      * https://spynejs.org
      *
      * @license Copyright 2017-2021, Frank Batista, Relevant Context, LLC. All rights reserved.
@@ -102,8 +102,8 @@ class SpyneApplication {
     };
     if (config !== undefined) {
        config = SpyneAppProperties.initialize(defaultConfig, config, _channels);
-      window.Spyne = this;
-      window.Spyne['config'] = deepMerge(defaultConfig, config)
+      //window.Spyne = this;
+      //window.Spyne['config'] = deepMerge(defaultConfig, config)
     }
 
     this.pluginsFn = SpyneAppProperties.getPluginsMethodObj(config['pluginMethods']);
@@ -117,7 +117,7 @@ class SpyneApplication {
     _channels.init();
 
     if (SpyneAppProperties.config.debug===true){
-       //window.Spyne = {version};
+       window.Spyne = {version};
     }
 
 

package/src/spyne/spyne.js

@@ -14,6 +14,7 @@ import { ChannelPayload } from './channels/channel-payload-class';
 import {ChannelPayloadFilter} from './utils/channel-payload-filter';
 import {SpynePlugin} from './spyne-plugins';
 import { deepMerge } from './utils/deep-merge';
+import {safeClone} from './utils/safe-clone';
 import {SpyneAppProperties} from './utils/spyne-app-properties';
 import {SpyneApp} from './spyne-app';
 
@@ -35,5 +36,6 @@ export {
   SpyneApp,
   SpyneAppProperties,
   SpynePlugin,
-  deepMerge
+  deepMerge,
+  safeClone
 };

package/src/spyne/utils/channel-fetch-util.js

@@ -47,7 +47,7 @@ export class ChannelFetchUtil {
    */
 
 
-  constructor(options, subscriber, testMode) {
+  constructor(options, subscriber, testMode, CHANNEL_NAME) {
 
     const testSubscriber = (p) => console.log('FETCH RETURNED ', p);
 
@@ -57,6 +57,7 @@ export class ChannelFetchUtil {
     this._serverOptions = ChannelFetchUtil.setServerOptions(options);
     this._subscriber = subscriber !== undefined ? subscriber : testSubscriber;
     this.debug = options.debug !== undefined ? options.debug : false;
+    this.channelName = CHANNEL_NAME;
 
     let fetchProps = {
       mapFn: this.mapFn,
@@ -66,18 +67,27 @@ export class ChannelFetchUtil {
       debug: this.debug
     };
     if (testMode !== true) {
-      ChannelFetchUtil.startWindowFetch(fetchProps, this._subscriber);
+      ChannelFetchUtil.startWindowFetch(fetchProps, this._subscriber, this.channelName);
     }
   }
 
-  static startWindowFetch(props, subscriber) {
+  static startWindowFetch(props, subscriber, channelName) {
     let { mapFn, url, serverOptions, responseType, debug } = props;
-    const tapLogDebug = p => console.log('DEBUG FETCH :', p);
+    const tapLogDebug = p => console.log('DEBUG FETCH :', p, {url, serverOptions, responseType, channelName});
     const tapLog = debug === true ? tapLogDebug : () => {};
 
+    const mapWrapper = (mapMethod)=>{
+      const metadata = {channelName, url, responseType, serverOptions}
+
+      return (data)=>{
+        return mapMethod(data, metadata);
+      }
+
+    }
+
     let response$ = from(window.fetch(url, serverOptions))
     .pipe(tap(tapLog), flatMap(r => from(r[responseType]())),
-        map(mapFn),
+        map(mapWrapper(mapFn)),
         publish());
 
     response$.connect();
@@ -126,7 +136,7 @@ export class ChannelFetchUtil {
 
   static updateMethodWhenBodyExists(opts) {
     const hasBody = has('body');
-    const methodIsGet = propEq('method', 'GET');
+    const methodIsGet = propEq('GET', 'method');
     const pred = allPass([hasBody, methodIsGet]);
     return when(pred, assoc('method', 'POST'))(opts);
   }

package/src/spyne/utils/safe-clone.js

@@ -0,0 +1,85 @@
+import {clone, compose, fromPairs, is, path, toPairs} from 'ramda';
+import {SpyneAppProperties} from './spyne-app-properties';
+
+
+
+
+const  getPropType = (prp) => {
+  let type = typeof prp;
+  if (['number', 'boolean', 'string'].includes(type)){
+    type = 'primitive';
+  } else if (type==='object'){
+    if (Array.isArray(prp)){
+      type = 'array'
+    } else if (prp===null){
+      type = 'undefined';
+    }
+  }
+  return type;
+}
+
+
+const  cmsDataReviveNestedProxyObj = (proxyObj, proxyReviverMethod) => {
+
+
+  const {__proxy__proxyName} = proxyObj;
+
+  if (__proxy__proxyName === undefined){
+    console.error('object is not proxy object ',proxyObj);
+  }
+
+  const cloneNestedProxyObj = (target, pathArr)=>{
+    const nestedProxyObj = path(pathArr, proxyObj);
+    const {__proxy__isProxy, __proxy__props} = nestedProxyObj;
+    return __proxy__isProxy ? proxyReviverMethod(target, __proxy__props) : target;
+  }
+
+
+  const rootObj = cloneNestedProxyObj(clone(proxyObj), []);
+
+
+  const proxyIterable = (iterObj, iterPath) => {
+    let dataPath = iterPath || [];
+    const loopObj = ([key, prop]) => {
+      const type = getPropType(prop);
+      const clonedPath = [...dataPath]
+      clonedPath.push(key);
+      if (type === 'object' || type==='array') {
+        iterObj[key] = cloneNestedProxyObj(prop, clonedPath);
+        proxyIterable(prop, clonedPath)
+      }
+    }
+    Object.entries(iterObj).forEach(loopObj);
+  }
+
+  proxyIterable(rootObj);
+  // console.timeEnd('proxify2');
+
+
+  return rootObj;
+
+
+}
+
+
+
+
+export const safeClone = function(o){
+  const {__proxy__proxyName} = o;
+  if (__proxy__proxyName!==undefined){
+    const proxyReviverMethod = SpyneAppProperties.getProxyReviver(__proxy__proxyName);
+    if (typeof  proxyReviverMethod === 'function'){
+      return cmsDataReviveNestedProxyObj(o, proxyReviverMethod);
+    }
+  }
+
+  const isArr = is(Array);
+  const isObj = is(Object);
+  const isIter = ob => isArr(ob)===false && isObj(ob)===true;
+  const isIterable = isIter(o);
+  return isIterable ? compose(fromPairs, toPairs, clone)(o) : clone(o);
+
+
+
+
+}

package/src/spyne/utils/spyne-app-properties.js

@@ -5,9 +5,11 @@ import {path} from 'ramda';
 
 let _config;
 let _channels;
-let _channelsMap
+let _channelsMap;
 let _initialized = false;
 let _debug = true;
+const _doNotTrackChannelsArr = [];
+const _proxiesMap = new Map();;
 
 const _spynePluginMethods = new SpynePluginsMethods();
 
@@ -162,6 +164,27 @@ class SpyneAppPropertiesClass{
 
   }
 
+
+
+  doNotTrackChannel(channelName){
+    _doNotTrackChannelsArr.push(channelName);
+  }
+
+  getUntrackedChannelsList(){
+    return _doNotTrackChannelsArr;
+  }
+
+
+  registerProxyReviver(name, method){
+    _proxiesMap.set(name, method);
+    //console.log("REGISTERD PROXY REVIVER",_proxiesMap, _proxiesMap.get(name));
+
+  }
+
+  getProxyReviver(proxyName){
+    return _proxiesMap.get(proxyName);
+  }
+
   getPluginConfigByPluginName(pluginName){
     return _config.plugins[pluginName];
   }

package/src/spyne/utils/spyne-utils-channel-route-url.js

@@ -188,7 +188,7 @@ export class SpyneUtilsChannelRouteUrl {
     };
 
     const checkForEitherStrOrReMatch =  either(
-      propEq('str', mainStr), compose(test(__, mainStr), prop('re'))
+      propEq(mainStr, 'str'), compose(test(__, mainStr), prop('re'))
     );
 
     const findMatchIndex = compose(findLastIndex(equals(true)), map(checkForEitherStrOrReMatch), map(createStrRegexTest), map(checkForEmpty));

package/src/spyne/utils/spyne-utils-channel-route.js

@@ -55,13 +55,12 @@ export class SpyneUtilsChannelRoute {
           return obj;
         };
 
-        const createPred = p => compose(keys, filter(propEq(p, true)));
+        const createPred = p => compose(keys, filter(propEq(true, p)));
 
         const getPropsState = compose(map(compareProps), uniq, chain(keys))([obj1, obj2]);
         let pathsChanged = chain(createPred('changed'), getPropsState);
         let pathsAdded = chain(createPred('added'), getPropsState);
         let pathsRemoved = chain(createPred('removed'), getPropsState);
-        // console.log("GET KEYS ", pathsChanged);
         obj1 = obj2;
         return { pathsAdded, pathsRemoved, pathsChanged };
       },