subscribable-things 2.0.1 → 2.0.5

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Christoph Guttandin
+Copyright (c) 2022 Christoph Guttandin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/build/es2019/factories/wrap-subscribe-function.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrap-subscribe-function.d.ts","sourceRoot":"","sources":["../../../src/factories/wrap-subscribe-function.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+D,6BAA6B,EAAE,MAAM,UAAU,CAAC;AAEtH,eAAO,MAAM,2BAA2B,EAAE,6BAkBzC,CAAC"}
+{"version":3,"file":"wrap-subscribe-function.d.ts","sourceRoot":"","sources":["../../../src/factories/wrap-subscribe-function.ts"],"names":[],"mappings":"AACA,OAAO,EAA+D,6BAA6B,EAAE,MAAM,UAAU,CAAC;AAEtH,eAAO,MAAM,2BAA2B,EAAE,6BAqBzC,CAAC"}

package/build/es2019/factories/wrap-subscribe-function.js

@@ -1,14 +1,17 @@
 export const createWrapSubscribeFunction = (patch, toObserver) => {
     const emptyFunction = () => { }; // tslint:disable-line:no-empty
+    const isNextFunction = (args) => typeof args[0] === 'function';
     return (innerSubscribe) => {
         const subscribe = ((...args) => {
-            const unsubscribe = innerSubscribe(toObserver(...args));
+            const unsubscribe = innerSubscribe(isNextFunction(args) ? toObserver({ next: args[0] }) : toObserver(...args));
             if (unsubscribe !== undefined) {
                 return unsubscribe;
             }
             return emptyFunction;
         });
-        subscribe[Symbol.observable] = () => ({ subscribe: (...args) => ({ unsubscribe: subscribe(...args) }) });
+        subscribe[Symbol.observable] = () => ({
+            subscribe: (...args) => ({ unsubscribe: subscribe(...args) })
+        });
         return patch(subscribe);
     };
 };

package/build/es2019/factories/wrap-subscribe-function.js.map

@@ -1 +1 @@
-{"version":3,"file":"wrap-subscribe-function.js","sourceRoot":"","sources":["../../../src/factories/wrap-subscribe-function.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,2BAA2B,GAAkC,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;IAC5F,MAAM,aAAa,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC,+BAA+B;IAE/D,OAAO,CAAI,cAAqC,EAAE,EAAE;QAChD,MAAM,SAAS,GAA0B,CAAC,CAAC,GAAG,IAA4B,EAAE,EAAE;YAC1E,MAAM,WAAW,GAAG,cAAc,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;YAExD,IAAI,WAAW,KAAK,SAAS,EAAE;gBAC3B,OAAO,WAAW,CAAC;aACtB;YAED,OAAO,aAAa,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,GAAG,IAA4B,EAAE,EAAE,CAAC,CAAC,EAAE,WAAW,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAEjI,OAAO,KAAK,CAAC,SAAS,CAAC,CAAC;IAC5B,CAAC,CAAC;AACN,CAAC,CAAC"}
+{"version":3,"file":"wrap-subscribe-function.js","sourceRoot":"","sources":["../../../src/factories/wrap-subscribe-function.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,2BAA2B,GAAkC,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;IAC5F,MAAM,aAAa,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC,+BAA+B;IAC/D,MAAM,cAAc,GAAG,CAAI,IAA4B,EAAiC,EAAE,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC;IAEzH,OAAO,CAAI,cAAqC,EAAE,EAAE;QAChD,MAAM,SAAS,GAA0B,CAAC,CAAC,GAAG,IAA4B,EAAE,EAAE;YAC1E,MAAM,WAAW,GAAG,cAAc,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;YAE/G,IAAI,WAAW,KAAK,SAAS,EAAE;gBAC3B,OAAO,WAAW,CAAC;aACtB;YAED,OAAO,aAAa,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC;YAClC,SAAS,EAAE,CAAC,GAAG,IAA8C,EAAE,EAAE,CAAC,CAAC,EAAE,WAAW,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;SAC1G,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC,SAAS,CAAC,CAAC;IAC5B,CAAC,CAAC;AACN,CAAC,CAAC"}

package/build/es2019/types/observer-parameters.d.ts

@@ -1,3 +1,3 @@
-import { PartialObserver, Subscribable } from 'rxjs-interop';
-export declare type TObserverParameters<T> = Parameters<Subscribable<T>['subscribe']> | [PartialObserver<T>?];
+import { Observer, Subscribable } from 'rxjs-interop';
+export declare type TObserverParameters<T> = Parameters<Subscribable<T>['subscribe']> | [Observer<T>['next']];
 //# sourceMappingURL=observer-parameters.d.ts.map

package/build/es2019/types/observer-parameters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"observer-parameters.d.ts","sourceRoot":"","sources":["../../../src/types/observer-parameters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAG7D,oBAAY,mBAAmB,CAAC,CAAC,IAAI,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"observer-parameters.d.ts","sourceRoot":"","sources":["../../../src/types/observer-parameters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEtD,oBAAY,mBAAmB,CAAC,CAAC,IAAI,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC"}

package/build/es5/bundle.js

@@ -407,9 +407,9 @@
       };
     };
 
-    function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+    function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-    function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+    function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
     var createVideoFrame = function createVideoFrame(emitNotSupportedError, wrapSubscribeFunction) {
       return function (videoElement) {
@@ -500,9 +500,19 @@
       var emptyFunction = function emptyFunction() {}; // tslint:disable-line:no-empty
 
 
+      var isNextFunction = function isNextFunction(args) {
+        return typeof args[0] === 'function';
+      };
+
       return function (innerSubscribe) {
         var _subscribe = function subscribe() {
-          var unsubscribe = innerSubscribe(toObserver.apply(void 0, arguments));
+          for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+            args[_key] = arguments[_key];
+          }
+
+          var unsubscribe = innerSubscribe(isNextFunction(args) ? toObserver({
+            next: args[0]
+          }) : toObserver.apply(void 0, args));
 
           if (unsubscribe !== undefined) {
             return unsubscribe;

package/package.json

@@ -15,33 +15,33 @@
         }
     ],
     "dependencies": {
-        "@babel/runtime": "^7.16.0",
+        "@babel/runtime": "^7.16.7",
         "rxjs-interop": "^2.0.0",
         "tslib": "^2.3.1"
     },
     "description": "A collection of reactive wrappers for various browser APIs.",
     "devDependencies": {
-        "@babel/core": "^7.16.0",
-        "@babel/plugin-external-helpers": "^7.16.0",
-        "@babel/plugin-transform-runtime": "^7.16.0",
-        "@babel/preset-env": "^7.16.0",
-        "@commitlint/cli": "^13.2.1",
-        "@commitlint/config-angular": "^13.2.0",
+        "@babel/core": "^7.16.7",
+        "@babel/plugin-external-helpers": "^7.16.7",
+        "@babel/plugin-transform-runtime": "^7.16.7",
+        "@babel/preset-env": "^7.16.7",
+        "@commitlint/cli": "^16.0.1",
+        "@commitlint/config-angular": "^16.0.0",
         "@rollup/plugin-babel": "^5.3.0",
         "baconjs": "^3.0.17",
-        "body-parser": "^1.19.0",
+        "body-parser": "^1.19.1",
         "callbag-basics": "^4.0.0",
         "chai": "^4.3.4",
         "commitizen": "^4.2.4",
         "cz-conventional-changelog": "^3.3.0",
         "eslint": "^7.32.0",
-        "eslint-config-holy-grail": "^50.1.17",
+        "eslint-config-holy-grail": "^50.1.23",
         "grunt": "^1.4.1",
         "grunt-cli": "^1.4.3",
         "grunt-contrib-clean": "^2.0.0",
         "grunt-sh": "^0.2.0",
         "husky": "^7.0.4",
-        "karma": "^6.3.7",
+        "karma": "^6.3.9",
         "karma-browserstack-launcher": "^1.6.0",
         "karma-chrome-launcher": "^3.1.0",
         "karma-firefox-launcher": "^2.1.2",
@@ -53,20 +53,20 @@
         "load-grunt-config": "^4.0.1",
         "midi-test": "^1.1.9",
         "mocha": "^9.1.3",
-        "prettier": "^2.4.1",
-        "pretty-quick": "^3.1.1",
-        "rollup": "^2.59.0",
-        "rxjs": "^7.4.0",
-        "rxjs-for-await": "0.0.2",
+        "prettier": "^2.5.1",
+        "pretty-quick": "^3.1.3",
+        "rollup": "^2.62.0",
+        "rxjs": "^7.5.1",
+        "rxjs-for-await": "^1.0.0",
         "sinon": "^11.1.2",
         "sinon-chai": "^3.7.0",
         "spect": "^23.1.1",
         "ts-loader": "^9.2.6",
-        "tsconfig-holy-grail": "^11.1.18",
+        "tsconfig-holy-grail": "^11.1.22",
         "tslint": "^6.1.3",
-        "tslint-config-holy-grail": "^53.2.25",
-        "typescript": "^4.4.4",
-        "webpack": "^5.61.0",
+        "tslint-config-holy-grail": "^53.2.26",
+        "typescript": "^4.5.4",
+        "webpack": "^5.65.0",
         "xstream": "^11.14.0"
     },
     "files": [
@@ -95,5 +95,5 @@
         "test": "grunt lint && grunt test"
     },
     "types": "build/es2019/module.d.ts",
-    "version": "2.0.1"
+    "version": "2.0.5"
 }

package/src/factories/wrap-subscribe-function.ts

@@ -1,11 +1,13 @@
+import { Observer, Subscribable } from 'rxjs-interop';
 import { TObserverParameters, TSubscribableThing, TSubscribeFunction, TWrapSubscribeFunctionFactory } from '../types';
 
 export const createWrapSubscribeFunction: TWrapSubscribeFunctionFactory = (patch, toObserver) => {
     const emptyFunction = () => {}; // tslint:disable-line:no-empty
+    const isNextFunction = <T>(args: TObserverParameters<T>): args is [Observer<T>['next']] => typeof args[0] === 'function';
 
     return <T>(innerSubscribe: TSubscribeFunction<T>) => {
         const subscribe = <TSubscribableThing<T>>((...args: TObserverParameters<T>) => {
-            const unsubscribe = innerSubscribe(toObserver(...args));
+            const unsubscribe = innerSubscribe(isNextFunction(args) ? toObserver({ next: args[0] }) : toObserver(...args));
 
             if (unsubscribe !== undefined) {
                 return unsubscribe;
@@ -14,7 +16,9 @@ export const createWrapSubscribeFunction: TWrapSubscribeFunctionFactory = (patch
             return emptyFunction;
         });
 
-        subscribe[Symbol.observable] = () => ({ subscribe: (...args: TObserverParameters<T>) => ({ unsubscribe: subscribe(...args) }) });
+        subscribe[Symbol.observable] = () => ({
+            subscribe: (...args: Parameters<Subscribable<T>['subscribe']>) => ({ unsubscribe: subscribe(...args) })
+        });
 
         return patch(subscribe);
     };

package/src/types/observer-parameters.ts

@@ -1,4 +1,3 @@
-import { PartialObserver, Subscribable } from 'rxjs-interop';
+import { Observer, Subscribable } from 'rxjs-interop';
 
-// @todo Using Parameters<T> only extracts the parameters of the first overload.
-export type TObserverParameters<T> = Parameters<Subscribable<T>['subscribe']> | [PartialObserver<T>?];
+export type TObserverParameters<T> = Parameters<Subscribable<T>['subscribe']> | [Observer<T>['next']];