spyne 0.17.1 → 0.18.3

package/src/spyne/views/dom-element.js

@@ -1,12 +1,7 @@
-// import {createElement} from '../utils/dom-methods';
 import { baseCoreMixins } from '../utils/mixins/base-core-mixins';
 import { DomElementTemplate } from './dom-element-template';
 import { deepMerge } from '../utils/deep-merge';
-// import {DomElementTemplate} from './template-renderer';
-
 import {is, defaultTo, pick, mapObjIndexed, forEachObjIndexed, pipe} from 'ramda';
-//import {ViewStreamElement} from './view-stream-element';
-//import {getConstructorName} from '../utils/frp-tools';
 
 class DomElement {
   /**
@@ -31,35 +26,21 @@ class DomElement {
    */
 
   constructor(props={}) {
-    //let isSimpleView = both(is(String), complement(isEmpty))(attributes);
-   // if (isSimpleView === true) {
-    //  data = attributes;
-      // attributes = {};
 
-   // }
     const checkDefault = (dflt, val)=>defaultTo(dflt)(val);
 
     props.tagName = checkDefault('div', props.tagName);
 
-
     props.attributes = props.attributes!==undefined ? props.attributes : this.getDomAttributes(props);
     props.attrs = this.updateAttrs(props.attributes);
 
     props.fragment =  document.createDocumentFragment()
     this.props = props;
 
-    //this.setProp('tagName', tagName);
-    //this.setProp('attrs', this.updateAttrs(attributes));
-    //this.setProp('data', data);
-   // this.setProp('template', template);
-
-   // this.setProp('fragment', document.createDocumentFragment());
-
     this.addMixins();
   }
 
   setProp(key, val) {
-    //this.props.set(key, val);
     this.props[key] = val;
   }
 

package/src/spyne/views/view-stream-broadcaster.js

@@ -3,7 +3,7 @@ import { convertDomStringMapToObj } from '../utils/frp-tools';
 import {SpyneAppProperties} from '../utils/spyne-app-properties';
 import { fromEvent } from 'rxjs';
 import { map } from 'rxjs/operators';
-import {clone, omit, path} from 'ramda';
+import {clone, omit} from 'ramda';
 
 export class ViewStreamBroadcaster {
   /**
@@ -47,9 +47,7 @@ export class ViewStreamBroadcaster {
     };
     // spread operator to select variables from arrays
     let [selector, event, local] = args;
-    // console.log('args is ',args);
     // btn query
-    // let query = this.props.el.querySelectorAll(selector);
     let channel; // hoist channel and later check if chnl exists
     let query = this.props.el.querySelectorAll(selector);
 
@@ -85,8 +83,6 @@ export class ViewStreamBroadcaster {
       data['channel'] = channel;
       // payload needs vsid# to pass verification
 
-      // data['event'] = event;
-      // data['el'] = q;
       data['srcElement'] = {};// pick(['vsid','viewName'], data);
       data.srcElement['id'] = this.props.id;
       data.srcElement['vsid'] = this.props.vsid;
@@ -103,7 +99,7 @@ export class ViewStreamBroadcaster {
     let queryIsNil = query === undefined || query.length <= 0;
     if (queryIsNil === true && isDevMode === true) {
       console.warn(`Spyne Warning: The item ${selector}, does not appear to exist in ${this.props.name} --> vsid:${this.props.vsid}!`);
-      // query = this.props.el;
+
       // addObservable(query, event);
     } else {
       query.forEach = Array.prototype.forEach;
@@ -124,6 +120,5 @@ export class ViewStreamBroadcaster {
     let streamMixins = baseStreamsMixins();
     this.sendUIPayload = streamMixins.sendUIPayload;
     this.sendRoutePayload = streamMixins.sendRoutePayload;
-    //this.createLifeStreamPayload = streamMixins.createLifeStreamPayload;
   }
 }

package/src/spyne/views/view-stream-element.js

@@ -1,6 +1,4 @@
-//import { baseCoreMixins } from '../utils/mixins/base-core-mixins';
 import { DomElement } from './dom-element';
-//import { ifNilThenUpdate, convertDomStringMapToObj } from '../utils/frp-tools';
 import { fadein, fadeout } from '../utils/viewstream-animations';
 import { ViewStreamObservable } from '../utils/viewstream-observables';
 import { deepMerge } from '../utils/deep-merge';
@@ -108,7 +106,6 @@ export class ViewStreamElement {
 
     let fadeOutObs = bindCallback(animateOut);
     let onFadeoutCompleted = (e) => {
-      // console.log('fade out completed ', e, d);
       this._source$.next(gcData);
     };
 
@@ -139,7 +136,6 @@ export class ViewStreamElement {
   }
 
   onGarbageCollect(p) {
-    // console.log('MEDIATOR onGarbageCollect ', this.vsid, this.vsName, p);
     if (this.domItem!==undefined) {
       this.domItem.unmount();
     }
@@ -161,9 +157,7 @@ export class ViewStreamElement {
     let append = (node, item) => node.appendChild(item);
     // DETERMINE WHETHER TO USE APPEND OR PREPEND
     // ON CONNECTING DOM ITEMS TO EACH OTHER
-    // this.domItemEl = this.domItem.render();
     let attachFunc = d.attachType === 'appendChild' ? append : prepend;
-    // d.node = isNil(d.query) ? d.node : d.query;
     attachFunc(container, this.domItem.render());
     this.setAnimateIn(d);
   }
@@ -177,7 +171,6 @@ export class ViewStreamElement {
   onAttachChildToSelf(p) {
     let data = p.childRenderData;
     this.combineDomItems(data);
-    //console.log("ATTACHING CHID TO SELF ===============")
     return {
       action: 'CHILD_ATTACHED',
       $dir: this.$dirs.PI
@@ -201,13 +194,8 @@ export class ViewStreamElement {
   }
 
   renderDomItem(d) {
-    let tagName, attributes, data, template;
-    [tagName,attributes,data,template]=d;
-    //console.log("RENDER DOM EL ",{tagName, attributes, data,template,d});
-
-    //this.domItem = new DomElement(...d);
+    const [tagName,attributes,data,template]=d;
     this.domItem = new DomElement({tagName,attributes,data,template});
-
     return this.domItem;
   }
 
@@ -232,7 +220,6 @@ export class ViewStreamElement {
    */
   onRenderAndAttachToDom(d) {
     let getEl = (data) => this.renderDomItem(data);
-    // let getEl = (data) => new DomElement(...data);
     d.attachData['el'] = getEl(props(['tagName', 'domAttributes', 'data', 'template'], d));
     this.combineDomItems(d.attachData);
     return {
@@ -252,13 +239,9 @@ export class ViewStreamElement {
     let action = payload.action;
     let defaultToFn = defaultTo((data) => this.extendedMethods(data));
     let fn = defaultToFn(this.options.hashMethods[action]);
-    // console.log('MEDIATOR onObsSinkSubscribe before ', this.vsid, action, payload);
     let data = fn(payload);
-    // data = this.addDefaultDir(data);
-    // console.log('add default dir ', data);
     let sendData = (d) => this._source$.next(d);
     if (data !== undefined) {
-      // console.log('MEDIATOR onObsSinkSubscribe ', this.vsid, data, payload);
       sendData(Object.freeze(data));
     }
   }

package/src/spyne/views/view-stream-payload.js

@@ -1,14 +1,11 @@
-import { uiValidations } from '../channels/channels-config';
 import {SpyneAppProperties} from '../utils/spyne-app-properties';
-//import { validate } from '../utils/channel-config-validator';
 import { gc } from '../utils/gc';
 import {
   compose,
   clone,
   fromPairs,
   toPairs,
-  __,
-  lte, defaultTo, prop, is,
+  is,
 } from 'ramda';
 
 export class ViewStreamPayload {
@@ -34,48 +31,17 @@ export class ViewStreamPayload {
       'data': data,
       'action': action
     };
-   // this.getValidationChecks(name);
     this.sendToDirectorStream(options);
   }
-/*  getValidationChecks(n) {
-    let left  = e => console.warn(e);
-    let right = val => this.onRunValidations(val);
-    let channelExists = SpyneAppProperties.channelsMap.testStream(n);
-    if (channelExists === true) {
-      return right(uiValidations);
-    } else {
-      return left('payload Needs a Valid Stream Name!');//
-    }
-  }
-  onRunValidations(checks) {
-    /!*validate(checks(), this.options).fold(
-      this.onError.bind(this),
-      this.onSuccess.bind(this));*!/
-  }
-  onPayloadValidated(p) {
-    this.sendToDirectorStream(p);
-  }*/
+
   sendToDirectorStream(payload) {
     let directorStream$ = SpyneAppProperties.channelsMap.getStream('DISPATCHER');
     const frozenPayload = ViewStreamPayload.deepClone(payload);
-    //console.log('payload is ',frozenPayload);
     directorStream$.next(frozenPayload);
     payload = undefined;
 
-    //this.gc();
-    //console.timeEnd(label);
-
     delete this;
   }
-/*
-  onError(errors) {
-    console.warn('payload failed due to:\n' + errors.map(e => '* ' + e).join('\n'));
-    this.gc();
-  }
-  onSuccess(payload) {
-    this.onPayloadValidated(payload);
-  }
-*/
 
   static deepClone(o) {
     const isArr = is(Array);
@@ -87,44 +53,11 @@ export class ViewStreamPayload {
   }
 
 
-
-  static deepFreeze(o) {
-    //return o;
-    //return Object.freeze(o);
-    const elIsDomElement = compose(lte(0), defaultTo(-1), prop('nodeType'));
-
-    try {
-      Object.freeze(o);
-      Object.getOwnPropertyNames(o).forEach(function(prop) {
-        if (o.hasOwnProperty(prop)
-            && elIsDomElement(o[prop]) === false
-            && o[prop] !== null
-            && (typeof o[prop] === "object" || typeof o[prop] === "function")
-            && !Object.isFrozen(o[prop])) {
-          ChannelPayload.deepFreeze(o[prop]);
-        }
-      });
-
-    } catch(e){
-      //console.log("FREEZE ERR ",{o,e});
-      return o;
-
-    }
-
-    return o;
-  }
-
   static getMouseEventKeys() {
     return ['altKey', 'bubbles', 'cancelBubble', 'cancelable', 'clientX', 'clientY', 'composed', 'ctrlKey', 'currentTarget', 'defaultPrevented', 'detail', 'eventPhase', 'fromElement', 'isTrusted', 'layerX', 'layerY', 'metaKey', 'movementX', 'movementY', 'offsetX', 'offsetY', 'pageX', 'pageY', 'path', 'relatedTarget', 'returnValue', 'screenX', 'screenY', 'shiftKey', 'sourceCapabilities', 'srcElement', 'target', 'timeStamp', 'toElement', 'type', 'view', 'which', 'x', 'y'];
   }
 
-
-
   addMixins() {
-    //  ==================================
-    // BASE CORE MIXINS
-    //  ==================================
-    // let coreMixins = baseCoreMixins();
     this.gc = gc;
   }
 }

package/src/spyne/views/view-stream-selector.js

@@ -1,9 +1,7 @@
-import {head, compose, reject, split, isEmpty, path, lte, defaultTo, prop} from 'ramda';
+import {head, compose, reject, split, isEmpty, lte, defaultTo, prop} from 'ramda';
 import {SpyneAppProperties} from '../utils/spyne-app-properties';
 
 function generateSpyneSelectorId(el) {
-  //const num = () => Math.floor(Math.random(10000000) * 10000000);
-  //const num = () => Math.random().toString(36).substring(2, 8);;
   const num = () => Math.random().toString(36).replace(/\d/gm, '').substring(1,8);
   let vsid = `${num()}`;
   if (el.dataset.vsid === undefined) {
@@ -203,9 +201,6 @@ function ViewStreamSelector(cxt, str) {
   };
 
 
-
-
-
   /**
    * Attaches html to the Selector's element
    * @param htmlElement