sync features and bugfixs from b33ddb14 (#1660)

Author: embbnux

.sync

@@ -1 +1 @@
-94b20ac373f4b4b2b76a4023a3f2e369eb193d91
+b33ddb1410019452acbe86c80a5efa52d1331701

packages/babel-settings/babel.config.js

@@ -16,6 +16,7 @@ const plugins = [
   '@babel/plugin-proposal-object-rest-spread',
   '@babel/plugin-proposal-optional-chaining',
   '@babel/plugin-proposal-nullish-coalescing-operator',
+  'const-enum',
 ];
 
 module.exports = function baseBabelConfig(api) {

packages/babel-settings/package.json

@@ -25,6 +25,7 @@
     "@babel/preset-react": "^7.10.4",
     "@babel/preset-typescript": "^7.10.4",
     "@babel/register": "^7.10.5",
+    "babel-plugin-const-enum": "^1.0.1",
     "core-js": "^2.6.11",
     "typescript": "^4.0.2"
   },

packages/core/README.md

@@ -17,7 +17,6 @@ yarn add @ringcentral-integration/core
       - [state API](#state-api)
       - [action API](#action-api)
       - [computed API](#computed-api)
-      - [proxyState API](#proxystate-api)
     - [RcUIModule APIs](#rcuimodule-apis)
     - [Dependency Injection](#dependency-injection)
     - [Storage and GlobalStorage APIs](#storage-and-globalstorage-apis)
@@ -26,7 +25,7 @@ yarn add @ringcentral-integration/core
 
 ### RcModule APIs
 
-`@ringcentral-integration/core` provides `RcModuleV2` base module, decorators `state`, `action`, `computed`, `storage` and `globalStorage`, `proxyState`.
+`@ringcentral-integration/core` provides `RcModuleV2` base module, decorators `state`, `action`, `computed`, `storage` and `globalStorage`.
 
 The decorator `storage` depends on `Storage` Module, And  The decorator `globalStorage` depends on `GlobalStorage` Module.
 
@@ -122,10 +121,6 @@ class Auth extends RcModuleV2<Deps> {
 }
 ```
 
-#### proxyState API
-
-`@proxyState` is used for asynchronous state changes of the browser client, and its parameter must be an asynchronous function and cannot be used with `@storage`/`@globalStorage`.
-
 ### RcUIModule APIs
 
 `@ringcentral-integration/core` provides `RcUIModuleV2` base module and all decorators in `RcModuleV2`.
@@ -253,18 +248,30 @@ class Call extends RcModuleV2<Deps> {
     });
   }
 
+  // Pass a tracking event type
   @track(trackEvents.inbound)
   inboundCall() {
     //
   }
 
+  // Pass a function that returns an array `[customTrackEvent, trackProps]`
   @track((that: Call, phoneNumber: string) => [
     trackEvents.outbound,
     { loginType: that.callType, phoneNumber },
   ])
   async dialout(phoneNumber: string) {
     //
   }
+
+  // Pass a higher-order function and the sub-function has access to the `analytics` module
+  @track(() => (analytics) => {
+    analytics.setUserId();
+    return [trackEvents.authentication];
+  })
+  @action
+  setLoginSuccess(token: TokenInfo) {
+    //
+  }
 }
 ```
 

packages/core/lib/RcModule/RcModule.ts

@@ -5,7 +5,7 @@ import { Storage as StorageV2 } from 'ringcentral-integration/modules/StorageV2'
 import { GlobalStorage as GlobalStorageV2 } from 'ringcentral-integration/modules/GlobalStorageV2';
 import Storage from 'ringcentral-integration/modules/Storage';
 import GlobalStorage from 'ringcentral-integration/modules/GlobalStorage';
-import { Analytics } from 'ringcentral-integration/modules/Analytics';
+import { Analytics } from 'ringcentral-integration/modules/AnalyticsV2';
 import BaseModule, { state, action } from '../usm-redux';
 import { moduleStatuses } from '../../enums/moduleStatuses';
 import { Params } from '../usm/core/module';
@@ -42,7 +42,11 @@ function storage(
   return descriptor;
 }
 
-type TrackEvent = string | ((...args: any) => [string, object?]);
+type TrackEvent =
+  | string
+  | ((
+      ...args: any
+    ) => [string, object?] | ((analytics: Analytics) => [string, object?]));
 
 /**
  * decorate a method with `Analytics` Module
@@ -75,7 +79,11 @@ function track(trackEvent: TrackEvent) {
           if (typeof trackEvent === 'string') {
             analytics.track(trackEvent);
           } else {
-            const [event, trackProps] = trackEvent(this, ...args) ?? [];
+            let trackReturn = trackEvent(this, ...args);
+            if (typeof trackReturn === 'function') {
+              trackReturn = trackReturn(analytics);
+            }
+            const [event, trackProps] = trackReturn ?? [];
             if (event) {
               analytics.track(event, trackProps);
             }
@@ -123,6 +131,7 @@ class RcModuleV2<
   S extends Record<string, any> = {}
 > extends BaseModule<T> {
   __$$state$$__: any;
+  protected initializeProxy?(): Promise<void> | void;
   /**
    * `onInit` life cycle for current initialization before all deps modules are all ready.
    */

packages/core/lib/usm-redux/core/module.ts

@@ -30,29 +30,8 @@ class Module<T extends Record<string, any> = {}> extends BaseModule<T> {
       this._actionTypes.forEach((name) => {
         this._reducersMaps[name] = (types) => (
           _state = this._initialValue[name],
-          { type, states, __proxyState__ },
-        ) => {
-          if (type.indexOf(types[name]) > -1 && __proxyState__) {
-            return __proxyState__[name];
-          } else if (type.indexOf(types[name]) > -1 && states) {
-            if (this._transport && this.__proxyState__?.[name]) {
-              // sync up state with async proxy callback
-              (async () => {
-                await this.__proxyState__[name](this, states[name]);
-                this._dispatch({
-                  type: this.parentModule.__proxyAction__,
-                  action: {
-                    type: [types[name]],
-                    __proxyState__: { [name]: states[name] },
-                  },
-                });
-              })();
-              return _state;
-            }
-            return states[name];
-          }
-          return _state;
-        };
+          { type, states },
+        ) => (type.indexOf(types[name]) > -1 && states ? states[name] : _state);
       });
     }
     super._makeInstance(params);

packages/core/lib/usm/core/module.ts

@@ -18,7 +18,6 @@ export interface Params<T = {}> {
 export interface Action {
   type: string[] | string;
   states?: Properties;
-  __proxyState__?: Record<string, any>;
   [K: string]: any;
 }
 
@@ -39,10 +38,6 @@ interface Module {
    * Used by browser client to transport data.
    */
   _transport?: any;
-  /**
-   * browser client's proxy state.
-   */
-  __proxyState__: Record<string, (...args: any) => any>;
   /**
    * Used by browser client to dispatch.
    */