spyne 0.19.1 → 0.20.0

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

@@ -1,6 +1,6 @@
-import { fromEventPattern } from 'rxjs';
-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 { fromEventPattern } from 'rxjs'
+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'
 
 export class SpyneUtilsChannelRoute {
   constructor() {
@@ -13,219 +13,209 @@ export class SpyneUtilsChannelRoute {
      * Internal utility methods for the SpyneRouteChannel
      *
      */
-    this.createPopStateStream = SpyneUtilsChannelRoute.createPopStateStream.bind(this);
+    this.createPopStateStream = SpyneUtilsChannelRoute.createPopStateStream.bind(this)
   }
 
   static createPopStateStream(subscribeFn) {
-    let addHandler = function(handler) {
-      window.onpopstate = handler;
-    };
-    let removeHandler = function() {
-      window.onpopstate = function() {};
-    };
-    let popupObs$ = fromEventPattern(addHandler, removeHandler);
-
-    popupObs$.subscribe(subscribeFn);
+    const addHandler = function(handler) {
+      window.onpopstate = handler
+    }
+    const removeHandler = function() {
+      window.onpopstate = function() {}
+    }
+    const popupObs$ = fromEventPattern(addHandler, removeHandler)
+
+    popupObs$.subscribe(subscribeFn)
   }
 
   static getLastArrVal(arr) {
-    const getLastParam = (a) => last(a) !== undefined ? last(a) : '';
-    return getLastParam(arr);
+    const getLastParam = (a) => last(a) !== undefined ? last(a) : ''
+    return getLastParam(arr)
   }
 
   static compareRouteKeywords(obj = {}, arr) {
-    const pickValues = (o, a) => a !== undefined ? pick(a, o) : o;
-    let obj1 = pickValues(obj, arr);
+    const pickValues = (o, a) => a !== undefined ? pick(a, o) : o
+    let obj1 = pickValues(obj, arr)
     return {
       pickValues,
       compare: (obj = {}, arr) => {
-        let obj2 = pickValues(obj, arr);
+        const obj2 = pickValues(obj, arr)
         const compareProps = p => {
-          let p1 = prop(p, obj1);
-          let p2 = prop(p, obj2);
-          let same = equals(p1, p2);
-          let previousExists = p1 !== undefined;
-          let nextExists = p2 !== undefined;
-          let changed = !same;
-          let added = previousExists === false && nextExists === true;
-          let removed = previousExists === true && nextExists === false;
+          const p1 = prop(p, obj1)
+          const p2 = prop(p, obj2)
+          const same = equals(p1, p2)
+          const previousExists = p1 !== undefined
+          const nextExists = p2 !== undefined
+          const changed = !same
+          const added = previousExists === false && nextExists === true
+          const removed = previousExists === true && nextExists === false
           // console.log("P: ",p,{same, previousExists, nextExists});
-          let obj = {};
-          obj[p] = { same, changed, added, removed, previousExists, nextExists };
-          return obj;
-        };
-
-        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);
-        obj1 = obj2;
-        return { pathsAdded, pathsRemoved, pathsChanged };
+          const obj = {}
+          obj[p] = { same, changed, added, removed, previousExists, nextExists }
+          return obj
+        }
+
+        const createPred = p => compose(keys, filter(propEq(true, p)))
+
+        const getPropsState = compose(map(compareProps), uniq, chain(keys))([obj1, obj2])
+        const pathsChanged = chain(createPred('changed'), getPropsState)
+        const pathsAdded = chain(createPred('added'), getPropsState)
+        const pathsRemoved = chain(createPred('removed'), getPropsState)
+        obj1 = obj2
+        return { pathsAdded, pathsRemoved, pathsChanged }
       },
 
       getComparer: () => obj1
 
-    };
+    }
   }
 
   static getRouteArrData(routeArr, paramsArr) {
-    let paths =  filter(includes(__, routeArr), paramsArr);
-    const pathInnermost = SpyneUtilsChannelRoute.getLastArrVal(paths);
+    const paths =  filter(includes(__, routeArr), paramsArr)
+    const pathInnermost = SpyneUtilsChannelRoute.getLastArrVal(paths)
     // console.log('arr and routeName ',{paths, pathInnermost});
-    return { paths, pathInnermost };
+    return { paths, pathInnermost }
   }
 
   static flattenConfigObject(obj) {
     const go = obj_ => chain(([k, v]) => {
       if (Object.prototype.toString.call(v) === '[object Object]') {
-        return map(([k_, v_]) => [`${k}.${k_}`, v_], go(v));
+        return map(([k_, v_]) => [`${k}.${k_}`, v_], go(v))
       } else {
-        return [[k, v]];
+        return [[k, v]]
       }
-    }, toPairs(obj_));
+    }, toPairs(obj_))
 
     // console.log("FLATTEN: ",values(fromPairs(go(obj))));
-    return values(fromPairs(go(obj)));
+    return values(fromPairs(go(obj)))
   }
 
+  static addRouteDatasets(channelRouteObj) {
+    // channelRouteObj.type='query';
 
-
-  static addRouteDatasets(channelRouteObj){
-   // channelRouteObj.type='query';
-
-    const {type, isHash} = channelRouteObj;
+    const { type, isHash } = channelRouteObj
 
     // create href and check to see if need to convert to hash href links
-    const getHREF = (obj)=>{
+    const getHREF = (obj) => {
       const santizeHREF = str => {
         const hrefRE = /^(.*\/)([\w-]*\/?)(.*)$/gm
-        //const hrefRE = /^(.*\/)([\w-]*)(.*)$/gm;
-       str = str.replace(hrefRE, "$1$2");
-       // str = String(str).replace('^$', "");
-        return str;
+        // const hrefRE = /^(.*\/)([\w-]*)(.*)$/gm;
+        str = str.replace(hrefRE, '$1$2')
+        // str = String(str).replace('^$', "");
+        return str
       }
 
-      const headStrVal = type === 'query' ? "" : isHash === true ? "#" : "/";
-      const hrefStr =  SpyneUtilsChannelRouteUrl.convertParamsToRoute(obj, channelRouteObj);
-      return headStrVal+santizeHREF(hrefStr);
+      const headStrVal = type === 'query' ? '' : isHash === true ? '#' : '/'
+      const hrefStr =  SpyneUtilsChannelRouteUrl.convertParamsToRoute(obj, channelRouteObj)
+      return headStrVal + santizeHREF(hrefStr)
     }
 
     // remove special chars from href
-    const sanitizeStr = (str)=>String(str).replace(/([^A-Za-z0-9-_])/g, "");
-
+    const sanitizeStr = (str) => String(str).replace(/([^A-Za-z0-9-_])/g, '')
 
     // test whether to use key or val
-    const isValidStrRE = /^([A-Za-z0-9_-])+$/m;
-
-    const createInitialValFn = (accMain=[], routePathObj, objAcc={})=>{
-      let {routeName} = routePathObj;
+    const isValidStrRE = /^([A-Za-z0-9_-])+$/m
 
+    const createInitialValFn = (accMain = [], routePathObj, objAcc = {}) => {
+      let { routeName } = routePathObj
 
-      const propsReducer = (acc, arrPair)=>{
-        const [key, val] = arrPair;
-        const isObject = is(Object, val);
+      const propsReducer = (acc, arrPair) => {
+        const [key, val] = arrPair
+        const isObject = is(Object, val)
 
-        const createTitle = (str)=>String(str).replace(/([-_])/g, " ").toUpperCase();
+        const createTitle = (str) => String(str).replace(/([-_])/g, ' ').toUpperCase()
 
-        const getLinkText = str => test(isValidStrRE, str) ? createTitle(str) : key;
+        const getLinkText = str => test(isValidStrRE, str) ? createTitle(str) : key
 
-        if (key === 'routeName' || key === '404'){
-          return acc;
+        if (key === 'routeName' || key === '404') {
+          return acc
         }
 
-        routeName = routeName ||  prop('routeName', val);
-       // console.log("THE KEY IS ",{key,val,routeName})
-
-        let o = clone(objAcc);
-        o[routeName] =sanitizeStr(key);
-
-        if (isObject === true){
-          if (keys(o).length===1){
-            const subRouteName = path(['routePath', 'routeName'], val);
-            if (subRouteName){
-              const oBase = clone(o);
-              oBase[subRouteName] = "";
-              oBase['navLevel'] = keys(objAcc).length;
-              oBase['title'] = getLinkText(key);
-              oBase['href'] = getHREF(oBase);
-              acc.push(oBase);
+        routeName = routeName || prop('routeName', val)
+        // console.log("THE KEY IS ",{key,val,routeName})
+
+        let o = clone(objAcc)
+        o[routeName] = sanitizeStr(key)
+
+        if (isObject === true) {
+          if (keys(o).length === 1) {
+            const subRouteName = path(['routePath', 'routeName'], val)
+            if (subRouteName) {
+              const oBase = clone(o)
+              oBase[subRouteName] = ''
+              oBase.navLevel = keys(objAcc).length
+              oBase.title = getLinkText(key)
+              oBase.href = getHREF(oBase)
+              acc.push(oBase)
             }
           }
-          o = createInitialValFn(accMain, val, o);
+          o = createInitialValFn(accMain, val, o)
         } else {
-          o['title'] = getLinkText(key);
-          o['href'] = getHREF(o);
+          o.title = getLinkText(key)
+          o.href = getHREF(o)
         }
-        o['navLevel'] = keys(objAcc).length;
-        acc.push(o);
-        return acc;
-
+        o.navLevel = keys(objAcc).length
+        acc.push(o)
+        return acc
       }
 
-      return toPairs(routePathObj).reduce(propsReducer, []);
-
+      return toPairs(routePathObj).reduce(propsReducer, [])
     }
 
-    let reducedArr = createInitialValFn([], channelRouteObj.routes);
-    const routeDatasetsArr = flatten(reducedArr);
+    const reducedArr = createInitialValFn([], channelRouteObj.routes)
+    const routeDatasetsArr = flatten(reducedArr)
 
     const getNavProps = (datasetsArr) => {
       const exclude = reject(includes(__, ['title', 'href', 'navLevel']))
-      const getMainKeys = compose(uniq,exclude, flatten, map(keys))
-      return getMainKeys(datasetsArr);
+      const getMainKeys = compose(uniq, exclude, flatten, map(keys))
+      return getMainKeys(datasetsArr)
     }
-    const routeNamesArr = getNavProps(routeDatasetsArr);
+    const routeNamesArr = getNavProps(routeDatasetsArr)
 
-    return {routeDatasetsArr, routeNamesArr};
+    return { routeDatasetsArr, routeNamesArr }
   }
 
-
-  static conformRouteObject(channelRouteObj={}, add404Props=false){
-    const channelsRoutePath = path(['channels', 'ROUTE'], channelRouteObj);
-    let {add404s} = channelsRoutePath !== undefined ? channelsRoutePath : channelRouteObj;
-    add404s = add404s || add404Props;
+  static conformRouteObject(channelRouteObj = {}, add404Props = false) {
+    const channelsRoutePath = path(['channels', 'ROUTE'], channelRouteObj)
+    let { add404s } = channelsRoutePath !== undefined ? channelsRoutePath : channelRouteObj
+    add404s = add404s || add404Props
     const parseRoutePath = (a) => {
-      let val = a[1];
-      const isArr = is(Array, val);
-      if (val === ""){
-        a[1] = "^$";
-      } else if (isArr){
-        a[1] = val.join('|');;
+      const val = a[1]
+      const isArr = is(Array, val)
+      if (val === '') {
+        a[1] = '^$'
+      } else if (isArr) {
+        a[1] = val.join('|')
       }
-      return a;
+      return a
     }
 
-
-    const transduceConfig = (arr)=>{
-      let [key, val] = arr;
-      const obj404 = add404s ? {"404": ".+"} : {};
-      const isObj = is(Object, val);
-      const isArr = is(Array, val);
-      const iterObj = isObj === true && isArr === false;
-      const isRoutePath = key === 'routePath';
+    const transduceConfig = (arr) => {
+      const [key, val] = arr
+      const obj404 = add404s ? { 404: '.+' } : {}
+      const isObj = is(Object, val)
+      const isArr = is(Array, val)
+      const iterObj = isObj === true && isArr === false
+      const isRoutePath = key === 'routePath'
       if (iterObj) {
-        arr[1] = configMapperFn(arr[1]);
-        if (isRoutePath){
-          arr[1] =  compose(mergeDeepRight(obj404), fromPairs, map(parseRoutePath), toPairs)( arr[1]);
+        arr[1] = configMapperFn(arr[1])
+        if (isRoutePath) {
+          arr[1] = compose(mergeDeepRight(obj404), fromPairs, map(parseRoutePath), toPairs)(arr[1])
         }
       }
-      return arr;
+      return arr
     }
 
-    const configMapperFn = compose(fromPairs, map(transduceConfig), toPairs);
+    const configMapperFn = compose(fromPairs, map(transduceConfig), toPairs)
 
-
-    if (channelsRoutePath !== undefined){
+    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);
-      return channelRouteObj;
+      const extraRouteData = SpyneUtilsChannelRoute.addRouteDatasets(channelRouteObj.channels.ROUTE)
+      channelRouteObj.channels.ROUTE = mergeRight(channelRouteObj.channels.ROUTE, extraRouteData)
+      return channelRouteObj
     }
 
-    return configMapperFn(channelRouteObj);
-
+    return configMapperFn(channelRouteObj)
   }
 
   static getLocationData() {
@@ -238,7 +228,7 @@ export class SpyneUtilsChannelRoute {
       'port',
       'pathname',
       'search',
-      'hash'];
-    return pickAll(locationParamsArr, window.location);
+      'hash']
+    return pickAll(locationParamsArr, window.location)
   }
 }

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

@@ -1,6 +1,6 @@
-import { fromEventPattern } from 'rxjs';
-import { map } from 'rxjs/operators';
-import {mapObjIndexed} from 'ramda';
+import { fromEventPattern } from 'rxjs'
+import { map } from 'rxjs/operators'
+import { mapObjIndexed } from 'ramda'
 
 export class SpyneUtilsChannelWindow {
   /**
@@ -15,69 +15,69 @@ export class SpyneUtilsChannelWindow {
    */
   constructor() {
     this.createDomObservableFromEvent = SpyneUtilsChannelWindow.createDomObservableFromEvent.bind(
-      this);
+      this)
   }
 
-  static createDomObservableFromEvent(eventName, mapFn, isPassive = true, element=window) {
-    let addHandler = handler => element.addEventListener(eventName, handler,
-      { passive: isPassive });
-    let removeHandler = () => { element[eventName] = (p) => p; };
-    mapFn = mapFn === undefined ? (p) => p : mapFn;
-    return fromEventPattern(addHandler, removeHandler).pipe(map(mapFn));
+  static createDomObservableFromEvent(eventName, mapFn, isPassive = true, element = window) {
+    const addHandler = handler => element.addEventListener(eventName, handler,
+      { passive: isPassive })
+    const removeHandler = () => { element[eventName] = (p) => p }
+    mapFn = mapFn === undefined ? (p) => p : mapFn
+    return fromEventPattern(addHandler, removeHandler).pipe(map(mapFn))
   }
 
   // MEDIA QUERIES
   static createMediaQuery(str) {
-    const mq = window.matchMedia(str);
-    this.checkIfValidMediaQuery(mq, str);
-    return mq !== false ? mq : false;
+    const mq = window.matchMedia(str)
+    this.checkIfValidMediaQuery(mq, str)
+    return mq !== false ? mq : false
   }
 
   static checkIfValidMediaQuery(mq, str) {
-    const noSpaces = str => str.replace(/\s+/gm, '');
-    const isValidBool = mq.matches!==undefined  && noSpaces(mq.media).indexOf(noSpaces(str))>=0;
-    const warnMsg = str => console.warn(`Spyne Info: the following query string, "${str}", has been optimized to "${mq.media}" by the browser and may not be a valid Media Query item!`);
+    const noSpaces = str => str.replace(/\s+/gm, '')
+    const isValidBool = mq.matches !== undefined && noSpaces(mq.media).indexOf(noSpaces(str)) >= 0
+    const warnMsg = str => console.warn(`Spyne Info: the following query string, "${str}", has been optimized to "${mq.media}" by the browser and may not be a valid Media Query item!`)
     if (isValidBool === false) {
-      warnMsg(str);
+      warnMsg(str)
     }
-    return isValidBool;
+    return isValidBool
   }
 
   static createMediaQueryHandler(query, key) {
-    let keyFn = key => p => {
-      p['mediaQueryName'] = key;
-      return p;
-    };
+    const keyFn = key => p => {
+      p.mediaQueryName = key
+      return p
+    }
 
-    let mapKey = keyFn(key);
+    const mapKey = keyFn(key)
 
-    let handlers = (q) => {
+    const handlers = (q) => {
       return {
-        addHandler: (handler) => { q.addListener(handler); },
-        removeHandler: (handler) => { q.onchange = () => {}; }
-      };
-    };
-    let mediaQueryHandler = handlers(query);
+        addHandler: (handler) => { q.addListener(handler) },
+        removeHandler: (handler) => { q.onchange = () => {} }
+      }
+    }
+    const mediaQueryHandler = handlers(query)
     /* eslint-disable new-cap */
     return new fromEventPattern(
       mediaQueryHandler.addHandler,
       mediaQueryHandler.removeHandler)
-      .pipe(map(mapKey));
+      .pipe(map(mapKey))
   }
 
   static createMergedObsFromObj(config) {
-    let mediaQueriesObj = config.mediaQueries || config.mediqQueries;
-    let arr = [];
+    const mediaQueriesObj = config.mediaQueries || config.mediaQueries
+    const arr = []
 
     const loopQueries = (val, key, obj) => {
-      let mq = SpyneUtilsChannelWindow.createMediaQuery(val);
-      if (mq!==false) {
-        arr.push(SpyneUtilsChannelWindow.createMediaQueryHandler(mq, key));
+      const mq = SpyneUtilsChannelWindow.createMediaQuery(val)
+      if (mq !== false) {
+        arr.push(SpyneUtilsChannelWindow.createMediaQueryHandler(mq, key))
       }
-       return arr;
-    };
+      return arr
+    }
 
-    mapObjIndexed(loopQueries, mediaQueriesObj);
-    return arr;
+    mapObjIndexed(loopQueries, mediaQueriesObj)
+    return arr
   }
 }

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

@@ -1,18 +1,18 @@
-let createFaderInlineText = (isInBool = false, t = 1, e = 'ease', startZeroBool = false) => {
-  let initOpacityZero = startZeroBool === true ? 'opacity:0;' : '';
-  let opacity = isInBool === true ? 1 : 0;
-  return `${initOpacityZero}transition: opacity ${t}s ${e}; opacity: ${opacity};`;
-};
+const createFaderInlineText = (isInBool = false, t = 1, e = 'ease', startZeroBool = false) => {
+  const initOpacityZero = startZeroBool === true ? 'opacity:0;' : ''
+  const opacity = isInBool === true ? 1 : 0
+  return `${initOpacityZero}transition: opacity ${t}s ${e}; opacity: ${opacity};`
+}
 export function fadein(el, t) {
-  let currentOpacity = window.getComputedStyle(el).opacity * 1;
-  let startAtZero = currentOpacity === 1;
-  let inlineCss = createFaderInlineText(true, t, 'ease', startAtZero);
-  el.style.cssText += inlineCss;
+  const currentOpacity = window.getComputedStyle(el).opacity * 1
+  const startAtZero = currentOpacity === 1
+  const inlineCss = createFaderInlineText(true, t, 'ease', startAtZero)
+  el.style.cssText += inlineCss
 }
 export function fadeout(el, t, callback) {
-  let inlineCss = createFaderInlineText(false, t, 'ease');
-  el.style.cssText += inlineCss;
+  const inlineCss = createFaderInlineText(false, t, 'ease')
+  el.style.cssText += inlineCss
 
   // window.setTimeout(callback, t * 1000);
-  el.addEventListener('transitionend', callback, false);
+  el.addEventListener('transitionend', callback, false)
 }

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

@@ -1,6 +1,6 @@
-import { Subject } from 'rxjs';
-import { filter, map } from 'rxjs/operators';
-import {flip, mergeRight, clone, forEach, propSatisfies} from 'ramda';
+import { Subject } from 'rxjs'
+import { filter, map } from 'rxjs/operators'
+import { flip, mergeRight, clone, forEach, propSatisfies } from 'ramda'
 export class ViewStreamObservable {
   constructor(props) {
     /**
@@ -11,13 +11,13 @@ export class ViewStreamObservable {
      * @desc
      * Internal observable that creates the ViewStream Observable that branches out to parent, internal and child directions
      */
-    this.props.observableStreams = ViewStreamObservable.createDirectionalObservables();
+    this.props.observableStreams = ViewStreamObservable.createDirectionalObservables()
   }
 
   static createDirectionalFiltersObject() {
-    const dirInternal = 'internal';
-    const dirParent = 'parent';
-    const dirChild = 'child';
+    const dirInternal = 'internal'
+    const dirParent = 'parent'
+    const dirChild = 'child'
     return {
       P: [dirParent],
       C: [dirChild],
@@ -25,84 +25,84 @@ export class ViewStreamObservable {
       CI: [dirChild, dirInternal],
       PI: [dirParent, dirInternal],
       PC: [dirParent, dirChild]
-    };
+    }
   }
 
   static addDefaultDir(obj) {
-    const defaults = flip(mergeRight);
-    return defaults({ $dir:['internal'] }, clone(obj));
+    const defaults = flip(mergeRight)
+    return defaults({ $dir:['internal'] }, clone(obj))
   }
 
   static addDownInternalDir(obj, arr = ['internal', 'down']) {
-    const defaults = flip(mergeRight);
-    return defaults(clone(obj), { $dir:arr });
+    const defaults = flip(mergeRight)
+    return defaults(clone(obj), { $dir:arr })
   }
 
   static addChildAndInternalDir(obj, arr = ['child', 'down']) {
-    const defaults = flip(mergeRight);
-    return defaults(clone(obj), { $dir:arr });
+    const defaults = flip(mergeRight)
+    return defaults(clone(obj), { $dir:arr })
   }
 
   static mapToDefaultDir(p) {
-    return this.addDefaultDir(p);
+    return this.addDefaultDir(p)
   }
 
   static createDirectionalObservables(obs$ = new Subject(), viewName, vsid) {
     if (viewName !== undefined && vsid !== undefined) {
-      obs$['viewName'] = viewName;
-      obs$['vsid'] = vsid;
+      obs$.viewName = viewName
+      obs$.vsid = vsid
     }
 
-    const filterStreams = val => propSatisfies(arrType => arrType.includes(val), '$dir');
-    const filterParent = filterStreams('parent');
-    const filterChild = filterStreams('child');
-    const filterInternal = filterStreams('internal');
+    const filterStreams = val => propSatisfies(arrType => arrType.includes(val), '$dir')
+    const filterParent = filterStreams('parent')
+    const filterChild = filterStreams('child')
+    const filterInternal = filterStreams('internal')
 
-    const addfrom$ = relStr => mergeRight({ from$:relStr });
-    const addParentfrom$ = addfrom$('child');
-    const addInternalfrom$ = addfrom$('internal');
-    const addChildfrom$ = addfrom$('parent');
+    const addfrom$ = relStr => mergeRight({ from$:relStr })
+    const addParentfrom$ = addfrom$('child')
+    const addInternalfrom$ = addfrom$('internal')
+    const addChildfrom$ = addfrom$('parent')
 
     const raw$ =  obs$
-      .pipe(filter((payload) => payload !== undefined && payload.action !== undefined));
+      .pipe(filter((payload) => payload !== undefined && payload.action !== undefined))
 
-    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 toInternal$ = obs$.pipe(filter(filterInternal), map(addInternalfrom$))
+    const toParent$ = obs$.pipe(filter(filterParent), map(addParentfrom$))
+    const toChild$ = obs$.pipe(filter(filterChild), map(addChildfrom$))
 
     const streamObj = {
       parent: toParent$,
       internal: toInternal$,
       child: toChild$
-    };
+    }
 
     const completeStream = (arr = []) => {
       const endStream = o => {
-        o.complete();
-        o.isStopped = true;
-      };
+        o.complete()
+        o.isStopped = true
+      }
 
       const setCompleteStream = (str) => {
         if (streamObj[str] !== undefined) {
-          let obs$ = streamObj[str];
-          endStream(obs$);
+          const obs$ = streamObj[str]
+          endStream(obs$)
         }
-      };
+      }
 
       if (arr !== undefined && arr.length >= 1) {
-        arr.forEach(setCompleteStream);
+        arr.forEach(setCompleteStream)
       }
-    };
+    }
     const completeAll = () => {
-      let completeStream = o => {
-        o.complete();
-        o.isStopped = true;
-      };
-      forEach(completeStream, [raw$, toInternal$, toParent$, toChild$]);
-    };
+      const completeStream = o => {
+        o.complete()
+        o.isStopped = true
+      }
+      forEach(completeStream, [raw$, toInternal$, toParent$, toChild$])
+    }
 
     return {
       raw$, toInternal$, toParent$, toChild$, completeAll, completeStream
-    };
+    }
   }
 }