spyne 0.17.1 → 0.18.3

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

@@ -2,7 +2,6 @@ import { from } from 'rxjs';
 import { flatMap, map, publish, tap } from 'rxjs/operators';
 import {compose, prop, defaultTo, over, lensProp, has, propEq, when, propIs, allPass, assoc, pick, mergeDeepRight} from 'ramda';
 export class ChannelFetchUtil {
-// METHOD GET POST PUT PATCH DELETE
   /**
    * @module ChannelFetchUtil
    * @type util
@@ -49,7 +48,7 @@ export class ChannelFetchUtil {
 
 
   constructor(options, subscriber, testMode) {
-    // console.log('url ',url,options);
+
     const testSubscriber = (p) => console.log('FETCH RETURNED ', p);
 
     this._mapFn = ChannelFetchUtil.setMapFn(options);

package/src/spyne/utils/channel-payload-filter.js

@@ -1,14 +1,9 @@
 import {
   is,
   reject,
-  ifElse,
-  invoker,
-  identity,
-  assoc,
   isNil,
-    find,
+  find,
   allPass,
-  tap,
   forEachObjIndexed,
   not,
   isEmpty,
@@ -19,16 +14,11 @@ import {
   where,
   defaultTo,
   mergeAll,
-  __,
   omit,
-  path,
-  call,
-  clone,
   flatten,
   any,
-  type,
   curry,
-  mergeRight, lte,
+  lte
 } from 'ramda';
 
 import {SpyneAppProperties} from './spyne-app-properties';
@@ -125,8 +115,6 @@ export class ChannelPayloadFilter {
 
     const debugLabelArr = [debugLabel,  prop('debugLabel', filters)]
 
-    const makeBool = b => Boolean(b);
-
     debugLabel = compose(find(is(String)))(debugLabelArr);
 
     let props = omit(['debugLabel', 'label', 'selector', 'props', 'testMode', 'propFilters'], filters)
@@ -140,22 +128,13 @@ export class ChannelPayloadFilter {
     filters['propFilters'] = props;
 
     let {propFilters} = filters;
-    //console.log("selector filters ", {selector, filters})
 
-    // let {selector,propFilters,debugLabel} = filters;
 
     const addStringSelectorFilter =  isNonEmptyStr(selector) ? ChannelPayloadFilter.filterSelector([selector], debugLabel) : undefined;
     const addArraySelectorFilter =   isNonEmptyArr(selector) ? ChannelPayloadFilter.filterSelector(selector, debugLabel) : undefined;
-
-
     const addDataFilter = isNonEmptyObjectFn(propFilters) ? ChannelPayloadFilter.filterData(propFilters, debugLabel) : undefined;
 
-    //console.log("IS STRING ",{selector, addStringSelectorFilter, addArraySelectorFilter, addDataFilter},isNonEmptyStr(selector))
-
-
-
     let filtersArr = reject(isNil, [addStringSelectorFilter, addArraySelectorFilter, addDataFilter]);
-   // console.log('filtersArr is ',{selector})
 
       // IF ARRAY IS EMPTY ALWAYS RETURN FALSE;
 
@@ -168,10 +147,7 @@ export class ChannelPayloadFilter {
         }
 
       }
-
-
-    //console.log(" VALUES OF FILTERS ",{selector,propFilters,filters,debugLabel,testMode, filtersAreEmpty});
-    if (testMode === true){
+      if (testMode === true){
         return {selector, propFilters, debugLabel, filters, testMode, filtersAreEmpty};
       }
 
@@ -181,40 +157,21 @@ export class ChannelPayloadFilter {
   static filterData(filterJson, filterdebugLabel) {
     const debugLabel = filterdebugLabel;
 
-    //console.log('filter data is ',{filterJson, debugLabel})
     let compareData = () => {
       // DO NOT ALLOW AN EMPTY OBJECT TO RETURN TRUEs
       if (isEmpty(filterJson)) {
         return always(false);
       }
 
-      //console.log("FILTER JSON ",filterJson);
       //  CHECKS ALL VALUES IN JSON TO DETERMINE IF THERE ARE FILTERING METHODS
 
-      //let typeArrFn = compose(values, rMap(type));
-
-      /*let sendMalFormedWarningBool = uniq(filterValsArr).length > 1;
-      if (sendMalFormedWarningBool === true) {
-        console.warn('Spyne Warningd: The data values in ChannelActionFilters needs to be either all methods or all static values.  DATA: ', filterJson);
-      }*/
-
       const createCurryComparator = compareStr => (str)=>{
         return str===compareStr;
       };
       const checkToConvertToFn = (val, key, obj)=>val = is(String, val)===true ? createCurryComparator(val) : val;
       filterJson = rMap(checkToConvertToFn, filterJson);
 
-      // console.log("FILTER JSON: ",{filterJson, newJson});
-      //const isAllMethods  = all(equals('Function'), filterValsArr);
-
-      // PULL OUT THE CHANNEL PAYLOAD OBJECT IN THE MAIN PAYLOAD
-      // let payload = prop('channelPayload', eventData)
-
-      // IF THERE ARE METHODS IN THE FILTERING JSON, THEN USE where or whereEq if Basic JSON
-     // let fMethod = isAllMethods === true ? where(filterJson) : whereEq(filterJson);
-
       // TAP LOGGER
-
       const tapLogger = (comparedObj)=>{
         if (debugLabel===undefined){
           return comparedObj;
@@ -228,7 +185,6 @@ export class ChannelPayloadFilter {
       };
 
       // END TAP LOGGER
-
       let fMethod = where(filterJson);
 
       let getFilteringObj =  (v)=>{
@@ -242,29 +198,20 @@ export class ChannelPayloadFilter {
       return compose( fMethod, tapLogger, defaultTo({}),  getFilteringObj);
 
     };
-   // const filterLabel = `filtering-${Math.floor(Math.random()*999999)}`;
-    //console.time(filterLabel);
-   // const val = compareData();
 
-    //console.timeEnd(filterLabel);
-    //return val;
     return compareData();
   }
 
 
   static checkPayloadSelector(arr, debugLabel, srcPayload) {
-    // ELEMENT FROM PAYLOADs
-
 
+    // ELEMENT FROM PAYLOADs
     const {payload, srcElement, event} = srcPayload || {};
-    //console.log('payload before ',{srcPayload, payload, srcElement, event})
 
     const reduceFindEl = (acc, src) => {
       const el = prop('el', src);
-      //console.log("EL IS ",{el, src, acc})
       if (ChannelPayloadFilter.elIsDomElement(el) && acc===undefined){
         acc = el;
-       // return acc;
       }
       return acc;
     }
@@ -272,19 +219,6 @@ export class ChannelPayloadFilter {
     const el = [srcElement, payload, prop('srcElement', event), srcPayload].reduce(reduceFindEl, undefined);
 
 
-    //console.log('el check ',{debugLabel, srcElement, payload, event, el})
-
-    //const o = Object.assign({}, srcPayload, event,srcElement, payload);
-
-    //console.log('o is ',o);
-
-
-    //let payloadIsNotProps = compose(equals('Function'),type, prop('props')  )(payload);
-    //payload = payloadIsNotProps === true ? payload.payload : payload;
-   // console.log('payload after ',{o})
-
-   // let el = path(['el'], o);
-
     // RETURN BOOLEAN MATCH WITH PAYLOAD EL
     const compareEls = (elCompare) => elCompare.isEqualNode((el));
 
@@ -299,10 +233,7 @@ export class ChannelPayloadFilter {
     if (debugLabel!==undefined){
       let nodeArrResultsDebugger = compose(flatten, rMap(mapNodeArrWithEl))(arr);
       const selectorsArr = arr;
-
       console.log(`%c CHANNEL PAYLOAD FILTER DEBUGGER ["${debugLabel}"] - selectors: `, "color:orange;",{el, selectorsArr, nodeArrResultsDebugger});
-
-
     }
 
     // CHECK IF PAYLOAD EL EXISTS

package/src/spyne/utils/gc.js

@@ -1,7 +1,7 @@
 import {forEach} from 'ramda';
 export function gc() {
   let cleanup = () => {
-    let loopM = m => void 0;
+    let loopM = m => undefined;
     forEach(loopM, this);
   };
   setTimeout(cleanup, 1);

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

@@ -7,10 +7,7 @@ export class RouteChannelUpdater{
     let id = `${name}_ROUTE_UPDATER`;
 
     const sendRouteChannelUpdate = curry(RouteChannelUpdater.createTemporaryViewStreamObj);
-
     return sendRouteChannelUpdate({id,name});
-
-   //RouteChannelUpdater.createTemporaryViewStreamObj({name,id});
   }
 
 
@@ -30,7 +27,6 @@ export class RouteChannelUpdater{
     };
 
     vs.appendToNull();
-    //console.log("VIEWSTREAM IS ",{vs, name,id,payload});
 
   }
 

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

@@ -1,9 +1,7 @@
 import {SpyneUtilsChannelRoute} from './spyne-utils-channel-route';
-import {SpyneScrollLock} from './spyne-scroll-lock';
 import {SpynePluginsMethods} from './spyne-plugins-methods';
-import {ChannelsMap} from '../channels/channels-map';
 import {deepMerge} from './deep-merge';
-import {prop, path} from 'ramda';
+import {path} from 'ramda';
 
 let _config;
 let _channels;
@@ -11,7 +9,6 @@ let _channelsMap
 let _initialized = false;
 let _debug = true;
 
-const _spyneScrollLock = new SpyneScrollLock();
 const _spynePluginMethods = new SpynePluginsMethods();
 
 
@@ -22,19 +19,48 @@ class SpyneAppPropertiesClass{
 
   }
 
+  get channelsMap(){
+    return _channelsMap;
+  }
+
+  get initialized(){
+    return _initialized;
+  }
+
+  get config(){
+    return _config;
+  }
+
+  get debug(){
+    return _debug;
+  }
 
+  /**
+   * This is mostly used for debugging purposes
+   *
+   * @example
+   * TITLE['<h4>Listing the registereed Channels in the browser console</h4>']
+   * SpyneApp.listChannels();
+   *
+   * @returns A list of all registered channels
+   */
+  static listChannels() {
+    return Array.from(_channels.map.keys());
+  }
 
   initialize(defaultConfig={}, config={}, channelsMap){
     _channels = channelsMap;
-    const userConfig = SpyneUtilsChannelRoute.conformRouteObject(config);
+    let userConfig = config;
+    if (config.channels && config.channels.ROUTE) {
+       userConfig = SpyneUtilsChannelRoute.conformRouteObject(config);
+    }
     _config = deepMerge(defaultConfig, userConfig);
     _debug = _config.debug!== undefined ? _config.debug : _debug;
     this.getChannelActions = _channels.getChannelActions.bind(_channels);
     this.listRegisteredChannels = _channels.listRegisteredChannels.bind(_channels);
     _initialized = true;
-   // if (channelsMap!==undefined) {
-      this.setChannelsMap();
-    //}
+     this.setChannelsMap();
+
 
     return _config;
 
@@ -49,22 +75,13 @@ class SpyneAppPropertiesClass{
 
   }
 
-
-
   setChannelsMap(){
-    let obj = {};
-
-
-
     const getStream = _channels.getStream.bind(_channels);
     const testStream =  _channels.testStream.bind(_channels);
     const getProxySubject = _channels.getProxySubject.bind(_channels);
 
-
     _channelsMap = {getStream, testStream, getProxySubject}
 
-
-
   }
 
   setProp(key, val){
@@ -75,26 +92,19 @@ class SpyneAppPropertiesClass{
     return path(['tmp', key], _config);
   }
 
-  get channelsMap(){
-    return _channelsMap;
-  }
-
-  get initialized(){
-    return _initialized;
-  }
-
-  get scrollLock(){
-    return _spyneScrollLock;
-  }
-
-
-
-
   setChannelConfig(channelName, config){
     _config.channels[channelName] = config;
     return _config.channels[channelName];
   }
 
+  /**
+   * This method is useful to check in the console or in the code what actions are available to be listened to.
+   * @param {String} channelName
+   * @returns {Array} An array of Actions that can be listened to
+   */
+/*  getChannelActions(channelName) {
+    return _channels.getChannelActions(channelName);
+  }*/
 
   getChannelConfig(channelName, config=_config){
     if (channelName === 'CHANNEL_ROUTE'){
@@ -115,41 +125,9 @@ class SpyneAppPropertiesClass{
       return;
     }
 
-    //console.log("MAIN CONFIG IS ",{channelName, channelConfig, config});
-
     return channelConfig;
   }
 
-
-
-
-  get config(){
-    return _config;
-  }
-
-  /**
-   * This is mostly used for debugging purposes
-   *
-   * @example
-   * TITLE['<h4>Listing the registereed Channels in the browser console</h4>']
-   * SpyneApp.listChannels();
-   *
-   * @returns A list of all registered channels
-   */
-  static listChannels() {
-    return Array.from(_channels.map.keys());
-  }
-
-  /**
-   * This method is useful to check in the console or in the code what actions are available to be listened to.
-   * @param {String} channelName
-   * @returns {Array} An array of Actions that can be listened to
-   */
-/*  getChannelActions(channelName) {
-    return _channels.getChannelActions(channelName);
-  }*/
-
-
   registerChannel(){
 
 
@@ -188,9 +166,6 @@ class SpyneAppPropertiesClass{
     return _config.plugins[pluginName];
   }
 
-
-
-
   tempGetChannelsInstance(){
 
   }
@@ -200,11 +175,6 @@ class SpyneAppPropertiesClass{
 
   }
 
-  get debug(){
-    return _debug;
-    //return _config['debug']===true;
-  }
-
 
 
 

package/src/spyne/utils/spyne-plugins-methods.js

@@ -25,11 +25,9 @@ export class SpynePluginsMethods{
 
 
   addMethod(key, fn, test=false){
-    //console.log('has method is 2',typeof(_pluginMethodsObj),{_pluginMethodsObj})
 
-    if (_pluginMethodsObj.hasOwnProperty(key)===true){
+    if (Object.prototype.hasOwnProperty.call(_pluginMethodsObj, key)===true){
       const warnStr = `Spyne Warning: the method name, ${key}, already exists.`;
-
       if (test){
         return warnStr;
       }
@@ -50,7 +48,6 @@ export class SpynePluginsMethods{
     if (isObj === false){
       warnStr = `Spyne Warning: the pluginMethods property, ${JSON.stringify(methodsObj)} needs to be an object.`
       if (test){
-        //console.log('this is a test ',{methodsObj})
         return warnStr;
       }
       console.warn(warnStr);
@@ -63,7 +60,6 @@ export class SpynePluginsMethods{
 
       const isFunction = typeof(methodVal) === 'function';
 
-      //console.log('method to add ',{keyStr, isFunction})
 
       if (isFunction){
         this.addMethod(keyStr, methodVal, test);
@@ -88,10 +84,6 @@ export class SpynePluginsMethods{
 
   }
 
-  test1(){
-    //console.log('test 1 is ');
-  }
-
 
   get pluginMethodsObj(){
     return _pluginMethodsObj;

package/src/spyne/utils/spyne-trait.js

@@ -1,5 +1,5 @@
 import { getAllMethodNames } from './frp-tools';
-import {reject, test, curryN, __, map} from 'ramda';
+import {reject, curryN, __, map} from 'ramda';
 
 export class SpyneTrait {
   /**
@@ -63,13 +63,10 @@ export class SpyneTrait {
     this.checkForMalformedMethods(methodsObj.allMethods);
       let obj = {};
     const bindMethodsToParentViewStream = (str, isStatic = false) => {
-      const addMethod = s =>  {
-        return context[s] = constructorType[s].bind(context);
-      };
       let constructorType = isStatic === true ? this.constructor : this;
       let propertyType = typeof (constructorType[str]);
       if (propertyType === 'function') {
-         obj[str] = addMethod(str);
+         obj[str] = context[str] = constructorType[str].bind(context);
       }
     };
 

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

@@ -62,7 +62,6 @@ export class SpyneUtilsChannelRouteUrl {
       let keyword = routeObj.routeName; // PARAM FORM SPYNE CONFIG
       let paramValFromData = data[keyword] !== undefined ? data[keyword] : prop(keyword, paramsFromLoc); // PULL VALUE FOR THIS PARAM FROM DATA
       const paramValType = typeof (routeObj[paramValFromData]);
-      // console.log({routeObj, paramValType, paramValFromData, keyword})
 
       if (paramValType === 'string') {
         paramValFromData = routeObj[paramValFromData];
@@ -72,12 +71,9 @@ export class SpyneUtilsChannelRouteUrl {
 
       urlObj[keyword] = paramValFromData;
 
-      // console.log("URL OBJ ",urlObj);
       if (this.checkIfObjIsNotEmptyOrNil(urlObj)) {
-        // console.log("FOUND ",{paramValFromData, paramValType, urlObj, routeObj});
         urlArr.push(urlObj);
       } else {
-        // console.log("NOT FOUND ",paramValFromData, paramValType, urlObj, routeObj);
 
       }
 
@@ -85,10 +81,8 @@ export class SpyneUtilsChannelRouteUrl {
       const objectParamExists = has(paramValFromData, routeObj);
       const objectContainsRoute = has('routePath', routeObj);
       const recursivelyCallLoopBool = objectParamExists && isObject;
-      // console.log("CHECKS ", {isObject, objectParamExists, objectContainsRoute, recursivelyCallLoopBool})
       if (recursivelyCallLoopBool === true) {
         let newObj = routeObj[paramValFromData];
-        // console.log("NEW OBJ ",{paramValFromData, routeObj, newObj});
         if (has('routePath', newObj)) {
           loopThroughParam(newObj.routePath);
         }
@@ -240,7 +234,7 @@ export class SpyneUtilsChannelRouteUrl {
       let getParamInverted = compose(head, defaultTo([]), prop(param));
       let paramInverted = getParamInverted(invertedObj);
       // spyne 11.0.1;
-      let re =  /^([-\$\w]*)$/;
+      let re =  /^([-$\w]*)$/;
       let keyMatch =  re.test(paramInverted);
 
       if (keyMatch === true && is(String, paramInverted) === true) {

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

@@ -1,7 +1,6 @@
 import { fromEventPattern } from 'rxjs';
-import {last, mapObjIndexed, flatten, clone, pick, prop, propOr, pickAll, path, equals, compose, keys, filter, propEq, uniq, map, __, chain,is, includes, fromPairs, reject, mergeDeepRight, mergeRight, reverse, test, omit, reduceRight, nth, toPairs, values} from 'ramda';
+import {last, flatten, clone, pick, prop, pickAll, path, equals, compose, keys, filter, propEq, uniq, map, __, chain,is, includes, fromPairs, reject, mergeDeepRight, mergeRight, test, toPairs, values} from 'ramda';
 import {SpyneUtilsChannelRouteUrl} from './spyne-utils-channel-route-url';
-import {RouteDataForTests} from '../../tests/mocks/utils-data';
 
 export class SpyneUtilsChannelRoute {
   constructor() {
@@ -102,7 +101,7 @@ export class SpyneUtilsChannelRoute {
     // create href and check to see if need to convert to hash href links
     const getHREF = (obj)=>{
       const santizeHREF = str => {
-        const hrefRE = /^(.*\/)([\w\-]*\/?)(.*)$/gm
+        const hrefRE = /^(.*\/)([\w-]*\/?)(.*)$/gm
         //const hrefRE = /^(.*\/)([\w-]*)(.*)$/gm;
        str = str.replace(hrefRE, "$1$2");
        // str = String(str).replace('^$', "");
@@ -119,7 +118,7 @@ export class SpyneUtilsChannelRoute {
 
 
     // test whether to use key or val
-    const isValidStrRE = /^([A-Za-z0-9_\-])+$/m;
+    const isValidStrRE = /^([A-Za-z0-9_-])+$/m;
 
     const createInitialValFn = (accMain=[], routePathObj, objAcc={})=>{
       let {routeName} = routePathObj;
@@ -179,7 +178,6 @@ export class SpyneUtilsChannelRoute {
       return getMainKeys(datasetsArr);
     }
     const routeNamesArr = getNavProps(routeDatasetsArr);
-    //console.log('validate route names arr is ',routeNamesArr);
 
     return {routeDatasetsArr, routeNamesArr};
   }
@@ -189,7 +187,6 @@ export class SpyneUtilsChannelRoute {
     const channelsRoutePath = path(['channels', 'ROUTE'], channelRouteObj);
     let {add404s} = channelsRoutePath !== undefined ? channelsRoutePath : channelRouteObj;
     add404s = add404s || add404Props;
-    //console.log("add 404s is1 ",{add404s, channelsRoutePath})
     const parseRoutePath = (a) => {
       let val = a[1];
       const isArr = is(Array, val);
@@ -219,24 +216,17 @@ export class SpyneUtilsChannelRoute {
     }
 
     const configMapperFn = compose(fromPairs, map(transduceConfig), toPairs);
-    //console.log('route obj ',channelRouteObj);
 
 
     if (channelsRoutePath !== undefined){
       channelRouteObj.channels.ROUTE = configMapperFn(channelRouteObj.channels.ROUTE)
       const extraRouteData = SpyneUtilsChannelRoute.addRouteDatasets(channelRouteObj.channels.ROUTE);
       channelRouteObj.channels.ROUTE = mergeRight(channelRouteObj.channels.ROUTE, extraRouteData);
-      //console.log("CHANNEL ROUTE OBJ ",channelRouteObj.channels.ROUTE);
-      //channelRouteObj.channels.ROUTE.linkDatasets = SpyneUtilsChannelRoute.addRouteDatasets(channelRouteObj.channels.ROUTE);
       return channelRouteObj;
     }
 
-
-
     return configMapperFn(channelRouteObj);
 
-
-
   }
 
   static getLocationData() {

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

@@ -1,4 +1,4 @@
-import { fromEventPattern, fromEvent } from 'rxjs';
+import { fromEventPattern } from 'rxjs';
 import { map } from 'rxjs/operators';
 import {mapObjIndexed} from 'ramda';
 
@@ -66,7 +66,7 @@ export class SpyneUtilsChannelWindow {
   }
 
   static createMergedObsFromObj(config) {
-    let mediaQueriesObj = config.mediqQueries;
+    let mediaQueriesObj = config.mediaQueries || config.mediqQueries;
     let arr = [];
 
     const loopQueries = (val, key, obj) => {
@@ -78,8 +78,6 @@ export class SpyneUtilsChannelWindow {
     };
 
     mapObjIndexed(loopQueries, mediaQueriesObj);
-    // let obs$ = Observable.merge(...arr);
-    // console.log('arr is ',arr);
     return arr;
   }
 }

package/src/spyne/utils/viewstream-observables.js

@@ -65,12 +65,11 @@ export class ViewStreamObservable {
 
     const raw$ =  obs$
       .pipe(filter((payload) => payload !== undefined && payload.action !== undefined));
-    // .filter(p => p.$dir !== undefined)
-    // .do(p => console.log('payload : ', p.$dir, p));
+
     const toInternal$ = obs$.pipe(filter(filterInternal), map(addInternalfrom$));
     const toParent$ = obs$.pipe(filter(filterParent), map(addParentfrom$));
     const toChild$ = obs$.pipe(filter(filterChild), map(addChildfrom$));
-    // const upObs$ = obs$.do(p => console.log('UP: ', p));
+
     const streamObj = {
       parent: toParent$,
       internal: toInternal$,

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

@@ -1,4 +1,4 @@
-import {includes, __, ifElse, compose,path,split,prop, reject, is, defaultTo, isNil, isEmpty} from 'ramda';
+import {includes, __, ifElse, path, prop, reject, is, isNil, isEmpty} from 'ramda';
 
 /**
  * @module DomElTemplate
@@ -136,9 +136,6 @@ export class DomElementTemplate {
   constructor(template, data) {
     this.template = this.formatTemplate(template);
 
-    //const tempL = `template-${Math.floor(Math.random()*99999)}`
-   // this.tempL=tempL
-
     const checkForArrayData = ()=>{
       if (is(Array, data) === true) {
         data = {spyneData:data};
@@ -206,8 +203,6 @@ export class DomElementTemplate {
 
 
   renderDocFrag() {
-
-
     const html = this.finalArr.join('');
     const isTableSubTag =   /^([^>]*?)(<){1}(\b)(thead|col|colgroup|tbody|td|tfoot|tr|th)(\b)([^\0]*)$/.test(html);
     const el = isTableSubTag ? html : document.createRange().createContextualFragment(html);