spyne 0.20.4 → 0.20.5

package/lib/spyne.umd.js.LICENSE.txt

@@ -1,16 +1,21 @@
 /*!
-     * Spyne 0.20.4
+     * Spyne 0.20.5
      * https://spynejs.org
      *
-     * @license Copyright 2017-2021, Frank Batista, Relevant Context, LLC. All rights reserved.
-     * Spyne is licensed under the GNU Lesser General Public License v3.0
+     * @license
+     * Copyright 2017-2025, Frank Batista,
+     * Relevant Context, LLC. All rights reserved.
      *
-     * @author: Frank Batista,
-     * @email:  frbatista.nyc@gmail.com
-    */
+     * Licensed under the GNU Lesser General Public License v3.0 (the "License");
+     * You may not use this file except in compliance with the License.
+     * A copy of the License is located in the project root, or at:
+     * https://www.gnu.org/licenses/lgpl-3.0.html
+     *
+     * This notice may not be removed or altered from any distribution.
+     */
 
 /*!
- * spynejs 0.20.4
+ * spynejs 0.20.5
  * https://spynejs.org
  * (c) 2017-present Frank Batista
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spyne",
-  "version": "0.20.4",
+  "version": "0.20.5",
   "description": "Reactive Real-DOM Framework for Advanced Javascript applications",
   "sideEffects": true,
   "main": "./lib/spyne.esm.js",

package/src/spyne/channels/channel.js

@@ -2,8 +2,8 @@ import { registeredStreamNames } from './channels-config'
 import { ChannelPayload } from './channel-payload-class'
 import { SpyneAppProperties } from '../utils/spyne-app-properties'
 import { RouteChannelUpdater } from '../utils/route-channel-updater'
-import { ReplaySubject, Subject } from 'rxjs'
-import { filter, map } from 'rxjs/operators'
+import { ReplaySubject, Subject, forkJoin, combineLatest } from 'rxjs'
+import { filter, map, take } from 'rxjs/operators'
 import {
   ifElse,
   identity,
@@ -398,6 +398,46 @@ export class Channel {
     return fn(channelName)
   }
 
+  /**
+   * Merge Channels is a convenience method to forkJoin Channel.observer$
+   *
+   * */
+
+  mergeChannels(channelsOrNames, persistent = false) {
+    // 1) Convert strings to Observables
+    const channelObservables = channelsOrNames.map(item => {
+      if (typeof item === 'string') {
+        const chan$ = this.getChannel(item)
+        return persistent ? chan$ : chan$.pipe(take(1))
+      } else {
+        // Already an Observable
+        return persistent ? item : item.pipe(take(1))
+      }
+    })
+
+    // 2) Decide which RxJS operator
+    const combiningOperator = persistent
+      ? combineLatest
+      : forkJoin
+
+    // 3) Combine them into an array emission
+    const combined$ = combiningOperator(channelObservables)
+
+    // 4) Map the array [result1, result2, ...] => { CHANNEL_1: result1, CHANNEL_2: result2, ... }
+    return combined$.pipe(
+      map((arr) => {
+        // Build an object keyed by the channel name (or index if you prefer).
+        const resultObj = {}
+        channelsOrNames.forEach((item, idx) => {
+          // item might be a string or Observable
+          const channelName = (typeof item === 'string') ? item : `channel_${idx}`
+          resultObj[channelName] = arr[idx]
+        })
+        return resultObj
+      })
+    )
+  }
+
   static checkForNotTrackFlag(props = {}) {
     if (props.doNotTrack === true) {
       SpyneAppProperties.doNotTrackChannel(props.channelName)

package/src/spyne/spyne-app.js

@@ -5,7 +5,7 @@ import { SpyneAppProperties } from './utils/spyne-app-properties'
 import { sanitizeHTMLConfigure } from './utils/sanitize-html'
 
 const _channels = new ChannelsMap()
-const version = '0.20.4'
+const version = '0.20.5'
 
 class SpyneApplication {
   /**
@@ -42,15 +42,20 @@ class SpyneApplication {
   init(config = {}, testMode = false) {
     // this.channels = new ChannelsMap();
     /*!
-     * Spyne 0.20.4
+     * Spyne 0.20.5
      * https://spynejs.org
      *
-     * @license Copyright 2017-2021, Frank Batista, Relevant Context, LLC. All rights reserved.
-     * Spyne is licensed under the GNU Lesser General Public License v3.0
+     * @license
+     * Copyright 2017-2025, Frank Batista,
+     * Relevant Context, LLC. All rights reserved.
      *
-     * @author: Frank Batista,
-     * @email:  frbatista.nyc@gmail.com
-    */
+     * Licensed under the GNU Lesser General Public License v3.0 (the "License");
+     * You may not use this file except in compliance with the License.
+     * A copy of the License is located in the project root, or at:
+     * https://www.gnu.org/licenses/lgpl-3.0.html
+     *
+     * This notice may not be removed or altered from any distribution.
+     */
     /* eslint-disable */
 
 

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

@@ -14,6 +14,7 @@ import {
   where,
   defaultTo,
   mergeAll,
+  F,
   omit,
   flatten,
   any,
@@ -31,6 +32,11 @@ const isNonEmptyArr = allPass([is(Array), isNotEmpty])
 const isObjectFn = compose(allPass([isNotArr, is(Object)]))
 const isNonEmptyObjectFn = compose(allPass([isNotEmpty, isNotArr, is(Object)]))
 
+const isString  = (val) => is(String, val)
+const isBoolean = (val) => is(Boolean, val)
+const isNumber  = (val) => is(Number, val)
+const isArrayFn = (val) => is(Array, val)
+
 export class ChannelPayloadFilter {
   /**
    * @module ChannelPayloadFilter
@@ -160,7 +166,18 @@ export class ChannelPayloadFilter {
         return str === compareStr
       }
       const checkToConvertToFn = (val, key, obj) => {
-        const fnVal = is(String, val) === true ? createCurryComparator(val) : val
+        let fnVal = F
+        if (isString(val) || isBoolean(val) || isNumber(val)) {
+          fnVal = createCurryComparator(val)
+        } else if (typeof val === 'function') {
+          return val
+        } else if (isArrayFn(val) || isObjectFn(val)) {
+          console.warn(
+              `ChannelPayloadFilter: Property "${val}" is an array/object, which is not allowed. ` +
+              'This property will always return false.'
+          )
+          return fnVal
+        }
         return fnVal
       }
       filterJson = rMap(checkToConvertToFn, filterJson)

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

@@ -96,7 +96,18 @@ export class ViewStreamBroadcaster {
       data.srcElement.srcEvent = event
       data.srcElement.el = q
       // select the correct payload
-      const channelPayload = channel !== undefined ? channelPayloads[channel] : channelPayloads.UI
+
+      function getValidChannel(ch) {
+        if (ch === 'ROUTE' || ch === 'CHANNEL_ROUTE') {
+          return 'ROUTE'
+        }
+        if (ch !== 'UI' && ch !== 'CHANNEL_UI' && ch !== undefined) {
+          console.warn(`SpyneJS warning: The channel, ${ch}, is not allowed here, only "UI" or "ROUTE" are valid channels, defaulting to CHANNEL_UI`)
+        }
+        return 'UI'
+      }
+
+      const channelPayload = channelPayloads[getValidChannel(channel)]
       // run payload
       channelPayload(observable, data)
     }