core-3nweb-client-lib 0.31.1 → 0.31.3

package/build/core/startup/startup-cap.js

@@ -25,7 +25,7 @@ const service_side_wrap_1 = require("../../core-ipc/json-ipc-wrapping/service-si
 const caller_side_wrap_1 = require("../../core-ipc/json-ipc-wrapping/caller-side-wrap");
 function wrapSignInCAP(cap) {
     return {
-        completeLoginAndLocalSetup: (0, service_side_wrap_1.wrapObservingFunc)(undefined, (obs, pass) => {
+        completeLoginAndLocalSetup: (0, service_side_wrap_1.wrapObservingFunc)((obs, pass) => {
             cap.completeLoginAndLocalSetup(pass, p => { var _a; return (_a = obs.next) === null || _a === void 0 ? void 0 : _a.call(obs, { p }); })
                 .then(decrResult => {
                 var _a, _b;
@@ -36,7 +36,7 @@ function wrapSignInCAP(cap) {
         }),
         getUsersOnDisk: (0, service_side_wrap_1.wrapReqReplySrvMethod)(cap, 'getUsersOnDisk'),
         startLoginToRemoteStorage: (0, service_side_wrap_1.wrapReqReplySrvMethod)(cap, 'startLoginToRemoteStorage'),
-        useExistingStorage: (0, service_side_wrap_1.wrapObservingFunc)(undefined, (obs, addr, pass) => {
+        useExistingStorage: (0, service_side_wrap_1.wrapObservingFunc)((obs, addr, pass) => {
             cap.useExistingStorage(addr, pass, p => { var _a; return (_a = obs.next) === null || _a === void 0 ? void 0 : _a.call(obs, { p }); })
                 .then(decrResult => {
                 var _a, _b;
@@ -99,7 +99,7 @@ function wrapSignUpCAP(cap) {
         getAvailableDomains: (0, service_side_wrap_1.wrapReqReplySrvMethod)(cap, 'getAvailableDomains'),
         getAvailableAddresses: (0, service_side_wrap_1.wrapReqReplySrvMethod)(cap, 'getAvailableAddresses'),
         addUser: (0, service_side_wrap_1.wrapReqReplySrvMethod)(cap, 'addUser'),
-        createUserParams: (0, service_side_wrap_1.wrapObservingFunc)(undefined, (obs, pass) => {
+        createUserParams: (0, service_side_wrap_1.wrapObservingFunc)((obs, pass) => {
             cap.createUserParams(pass, p => { var _a; return (_a = obs.next) === null || _a === void 0 ? void 0 : _a.call(obs, p); })
                 .then(() => { var _a; return (_a = obs.complete) === null || _a === void 0 ? void 0 : _a.call(obs); }, err => { var _a; return (_a = obs.error) === null || _a === void 0 ? void 0 : _a.call(obs, err); });
             return noop;

package/build/core-ipc/json-ipc-wrapping/service-side-wrap.d.ts

@@ -11,6 +11,8 @@ export interface TransformOpts {
     packReply?: ((reply: any) => PassedDatum | undefined) | 'noop';
 }
 export declare function wrapReqReplySrvMethod<T extends object, M extends keyof T>(srv: T, method: M, transforms?: TransformOpts): ExposedFn;
-export declare function wrapReqReplyFunc(srv: object | undefined, func: HandleReqReplyCall, transforms?: TransformOpts): ExposedFn;
-export declare function wrapObservingFunc<TEvent>(srv: object | undefined, func: HandleObservingCall<TEvent>, transforms?: TransformOpts): ExposedFn;
+export declare function wrapReqReplyFunc(srv: object, func: HandleReqReplyCall, transforms?: TransformOpts): ExposedFn;
+export declare function wrapReqReplyFunc(func: HandleReqReplyCall, transforms?: TransformOpts): ExposedFn;
+export declare function wrapObservingFunc<TEvent>(func: HandleObservingCall<TEvent>, transforms?: TransformOpts): ExposedFn;
+export declare function wrapObservingFunc<TEvent>(srv: object, func: HandleObservingCall<TEvent>, transforms?: TransformOpts): ExposedFn;
 export {};

package/build/core-ipc/json-ipc-wrapping/service-side-wrap.js

@@ -24,7 +24,18 @@ const json_n_binary_1 = require("./json-n-binary");
 function wrapReqReplySrvMethod(srv, method, transforms) {
     return wrapReqReplyFunc(srv, srv[method], transforms);
 }
-function wrapReqReplyFunc(srv, func, transforms) {
+function wrapReqReplyFunc(srvOrFn, funcOrTransforms, transforms) {
+    let srv;
+    let func;
+    if (typeof srvOrFn === 'function') {
+        srv = undefined;
+        func = srvOrFn;
+        transforms = funcOrTransforms;
+    }
+    else {
+        srv = srvOrFn;
+        func = funcOrTransforms;
+    }
     return buf => {
         const args = argsFromBuffer(buf, transforms);
         let promise = (args ?
@@ -75,7 +86,18 @@ function toPassedDatum(data, pack) {
         return (0, json_n_binary_1.serializeArgs)([data]);
     }
 }
-function wrapObservingFunc(srv, func, transforms) {
+function wrapObservingFunc(srvOrFn, funcOrTransforms, transforms) {
+    let srv;
+    let func;
+    if (typeof srvOrFn === 'function') {
+        srv = undefined;
+        func = srvOrFn;
+        transforms = funcOrTransforms;
+    }
+    else {
+        srv = srvOrFn;
+        func = funcOrTransforms;
+    }
     return buf => {
         const args = argsFromBuffer(buf, transforms);
         const s = new rxjs_1.Subject();

package/build/core-ipc/log-cap.js

@@ -22,7 +22,7 @@ const error_1 = require("../lib-common/exceptions/error");
 const caller_side_wrap_1 = require("./json-ipc-wrapping/caller-side-wrap");
 const service_side_wrap_1 = require("./json-ipc-wrapping/service-side-wrap");
 function exposeLogger(fn) {
-    return (0, service_side_wrap_1.wrapReqReplyFunc)(undefined, fn);
+    return (0, service_side_wrap_1.wrapReqReplyFunc)(fn);
 }
 function makeLogCaller(caller, path) {
     const log = (0, caller_side_wrap_1.makeReqRepFuncCaller)(caller, path);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-3nweb-client-lib",
-  "version": "0.31.1",
+  "version": "0.31.3",
   "description": "3NWeb client core library, embeddable into different environments",
   "main": "build/lib-index.js",
   "types": "build/lib-index.d.ts",