@ray-js/runtime 1.3.21 → 1.3.23

package/LICENSE.md

@@ -0,0 +1,9 @@
+Copyright © 2014-2022 Tuya.inc
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/lib/PageInstance.js

@@ -1,78 +1,59 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import "core-js/modules/es.array.splice.js";
-import "core-js/modules/es.array.index-of.js";
-import "core-js/modules/es.object.to-string.js";
-import "core-js/modules/web.dom-collections.for-each.js";
-
 /**
  * 管理 web 页面生命周期的调用
  * 小程序端
  * TODO: 支持 RN
  */
-var UniqueId = 0;
-export var generateUniqueId = function () {
+
+let UniqueId = 0;
+export const generateUniqueId = () => {
   return UniqueId += 1;
 };
-export var generatePageKey = function (uniqueId) {
+export const generatePageKey = uniqueId => {
   return 'Page-' + uniqueId;
 };
-export var PageInstance = /*#__PURE__*/function () {
-  function PageInstance(uniqueId) {
-    _classCallCheck(this, PageInstance);
-
+export class PageInstance {
+  constructor(uniqueId) {
     this.uniqueId = uniqueId !== null && uniqueId !== void 0 ? uniqueId : generateUniqueId();
     this.lifecycleCallback = {};
   }
+
   /**
    * 注册生命周期事件, 页面运行底层实例
    * @param lifecycleName - 事件名
    * @param context - fn 上下文
    * @param fn - 回调函数
    */
+  registerLifecycle(lifecycleName, context, fn) {
+    this.lifecycleCallback[lifecycleName] = this.lifecycleCallback[lifecycleName] || [];
+    const fnObj = {
+      context,
+      fn
+    };
+
+    // 先注册的函数先调用
+    this.lifecycleCallback[lifecycleName].push(fnObj);
+    return () => {
+      this.lifecycleCallback[lifecycleName].splice(this.lifecycleCallback[lifecycleName].indexOf(fnObj), 1);
+    };
+  }
 
-
-  _createClass(PageInstance, [{
-    key: "registerLifecycle",
-    value: function registerLifecycle(lifecycleName, context, fn) {
-      var _this = this;
-
-      this.lifecycleCallback[lifecycleName] = this.lifecycleCallback[lifecycleName] || [];
-      var fnObj = {
-        context: context,
-        fn: fn
-      }; // 先注册的函数先调用
-
-      this.lifecycleCallback[lifecycleName].push(fnObj);
-      return function () {
-        _this.lifecycleCallback[lifecycleName].splice(_this.lifecycleCallback[lifecycleName].indexOf(fnObj), 1);
-      };
-    }
-    /**
-     * 触发生命周期函数
-     * @param lifecycleName
-     * @param args
-     */
-
-  }, {
-    key: "callLifecycle",
-    value: function callLifecycle(params) {
-      var callbacks = this.lifecycleCallback[params.name] || [];
-      var result;
-
-      _toConsumableArray(callbacks).forEach(function (_ref) {
-        var _ref$context = _ref.context,
-            context = _ref$context === void 0 ? null : _ref$context,
-            fn = _ref.fn;
-        result = fn.apply(context, Array.isArray(params.args) ? params.args : [params.args]);
-      });
-
-      if (result) {
-        return result;
-      }
+  /**
+   * 触发生命周期函数
+   * @param lifecycleName
+   * @param args
+   */
+  callLifecycle(params) {
+    const callbacks = this.lifecycleCallback[params.name] || [];
+    let result;
+    [...callbacks].forEach(_ref => {
+      let {
+        context = null,
+        fn
+      } = _ref;
+      result = fn.apply(context, Array.isArray(params.args) ? params.args : [params.args]);
+    });
+    if (result) {
+      return result;
     }
-  }]);
-
-  return PageInstance;
-}();
+  }
+}

package/lib/PageInstanceContext.js

@@ -1,4 +1,4 @@
 import React from 'react';
-var PageInstanceContext = /*#__PURE__*/React.createContext(null);
+const PageInstanceContext = /*#__PURE__*/React.createContext(null);
 PageInstanceContext.displayName = 'PageInstanceContext';
 export { PageInstanceContext };

package/lib/current.d.ts

@@ -1,5 +1,5 @@
 import { AppInstance } from './instance';
-declare type Current = {
+type Current = {
     app: null | AppInstance;
     page: null;
     renderOptions: {};

package/lib/current.js

@@ -1,4 +1,4 @@
-export var current = {
+export const current = {
   app: null,
   page: null,
   renderOptions: {}

package/lib/index.js

@@ -2,26 +2,20 @@ import * as runtime from '@ray-core/runtime';
 export { lifecycle } from './lifecycle';
 export { PageInstance } from './PageInstance';
 export { PageInstanceContext } from './PageInstanceContext';
-export { useAppEvent } from './useAppEvent'; // 页面事件
-
+export { useAppEvent } from './useAppEvent';
+// 页面事件
 export { usePageEvent } from './usePageEvent';
 export { withPageLifecycle } from './withPageLifecycle';
 export { getCurrent } from './current';
-export var useNativeEffect = function () {
-  return console.warn("// TODO \u6682\u672A\u5B9E\u73B0\u94A9\u5B50 'useNativeEffect'");
-};
-export var useQuery = function () {
-  console.warn("// TODO \u6682\u672A\u5B9E\u73B0\u94A9\u5B50 'useQuery'");
+export const useNativeEffect = () => console.warn(`// TODO 暂未实现钩子 'useNativeEffect'`);
+export const useQuery = () => {
+  console.warn(`// TODO 暂未实现钩子 'useQuery'`);
   return null;
 };
-export var usePageInstance = function () {
-  return console.warn("// TODO \u6682\u672A\u5B9E\u73B0\u94A9\u5B50 'usePageInstance'");
-};
-export var useComponentInstance = function () {
-  return console.warn("// TODO \u6682\u672A\u5B9E\u73B0\u94A9\u5B50 'useComponentInstance'");
-};
-export var createPortal = runtime.createPortal;
-export var useModal = function () {
-  console.warn("// TODO \u6682\u672A\u5B9E\u73B0\u94A9\u5B50 'useModal'");
+export const usePageInstance = () => console.warn(`// TODO 暂未实现钩子 'usePageInstance'`);
+export const useComponentInstance = () => console.warn(`// TODO 暂未实现钩子 'useComponentInstance'`);
+export const createPortal = runtime.createPortal;
+export const useModal = () => {
+  console.warn(`// TODO 暂未实现钩子 'useModal'`);
   return undefined;
 };

package/lib/lifecycle.js

@@ -1,58 +1,36 @@
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import "core-js/modules/es.array.iterator.js";
-import "core-js/modules/es.map.js";
-import "core-js/modules/es.object.to-string.js";
-import "core-js/modules/es.string.iterator.js";
-import "core-js/modules/web.dom-collections.iterator.js";
 import { generatePageKey } from './PageInstance';
-
-var Lifecycle = /*#__PURE__*/function () {
-  function Lifecycle() {
-    _classCallCheck(this, Lifecycle);
-
+class Lifecycle {
+  constructor() {
     this.instanceMap = new Map();
   }
+
   /**
    * 增加一个 PageWrapper 实例
    *
    * @param uniqueId - 页面的 ID
    * @param ins - 示例对象
    */
+  addInstance(ins) {
+    const key = generatePageKey(ins.uniqueId);
+    this.instanceMap.set(key, ins);
+  }
 
-
-  _createClass(Lifecycle, [{
-    key: "addInstance",
-    value: function addInstance(ins) {
-      var key = generatePageKey(ins.uniqueId);
-      this.instanceMap.set(key, ins);
-    }
-    /**
-     * 删除一个 PageWrapper 实例
-     *
-     * @param uniqueId - 页面的 ID
-     * @param ins - 示例对象
-     */
-
-  }, {
-    key: "removeInstance",
-    value: function removeInstance(ins) {
-      var key = generatePageKey(ins.uniqueId);
-      this.instanceMap.delete(key);
-    }
-  }, {
-    key: "emit",
-    value: function emit(params) {
-      var key = generatePageKey(params.uniqueId);
-      var $instance = this.instanceMap.get(key);
-
-      if ($instance) {
-        $instance.callLifecycle(params);
-      }
+  /**
+   * 删除一个 PageWrapper 实例
+   *
+   * @param uniqueId - 页面的 ID
+   * @param ins - 示例对象
+   */
+  removeInstance(ins) {
+    const key = generatePageKey(ins.uniqueId);
+    this.instanceMap.delete(key);
+  }
+  emit(params) {
+    const key = generatePageKey(params.uniqueId);
+    const $instance = this.instanceMap.get(key);
+    if ($instance) {
+      $instance.callLifecycle(params);
     }
-  }]);
-
-  return Lifecycle;
-}();
-
-export var lifecycle = new Lifecycle();
+  }
+}
+export const lifecycle = new Lifecycle();

package/lib/useAppEvent/index.js

@@ -1,2 +1,3 @@
-export function useAppEvent() {// TODO: App 事件
+export function useAppEvent() {
+  // TODO: App 事件
 }

package/lib/usePageEvent/index.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { PageInstanceContext } from '../PageInstanceContext';
 export function usePageEvent(event, fn) {
-  var $instance = React.useContext(PageInstanceContext).$instance;
+  const $instance = React.useContext(PageInstanceContext).$instance;
   $instance.registerLifecycle(event, null, fn);
 }

package/lib/withPageLifecycle/index.js

@@ -1,93 +1,54 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _typeof from "@babel/runtime/helpers/esm/typeof";
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
-import _inherits from "@babel/runtime/helpers/esm/inherits";
-import _createSuper from "@babel/runtime/helpers/esm/createSuper";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-var _excluded = ["forwardedRef"];
-import "core-js/modules/es.array.concat.js";
-import "core-js/modules/es.object.to-string.js";
-import "core-js/modules/web.dom-collections.for-each.js";
-import "core-js/modules/es.object.keys.js";
+const _excluded = ["forwardedRef"];
 import React from 'react';
 import { pageLifecycles } from '@ray-js/types';
 import { PageInstanceContext } from '../PageInstanceContext';
 export function withPageLifecycle(Component) {
-  var displayName = "WithPageLifecycle(".concat(Component.displayName || Component.name, ")");
-
-  var WithPageLifeCycle = /*#__PURE__*/function (_React$Component) {
-    _inherits(WithPageLifeCycle, _React$Component);
-
-    var _super = _createSuper(WithPageLifeCycle);
-
-    function WithPageLifeCycle() {
-      var _this;
-
-      _classCallCheck(this, WithPageLifeCycle);
-
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
+  const displayName = `WithPageLifecycle(${Component.displayName || Component.name})`;
+  class WithPageLifeCycle extends React.Component {
+    static displayName = displayName;
+    refHandle = ref => {
+      const forwardedRef = this.props.forwardedRef;
+      if (ref) {
+        this.additionToLifecycle(ref);
       }
-
-      _this = _super.call.apply(_super, [this].concat(args));
-
-      _defineProperty(_assertThisInitialized(_this), "refHandle", function (ref) {
-        var forwardedRef = _this.props.forwardedRef;
-
-        if (ref) {
-          _this.additionToLifecycle(ref);
-        }
-
-        if (forwardedRef) {
-          if (typeof forwardedRef === 'function') {
-            forwardedRef(ref);
-          } else if (_typeof(forwardedRef) === 'object') {
-            forwardedRef.current = ref;
-          }
+      if (forwardedRef) {
+        if (typeof forwardedRef === 'function') {
+          forwardedRef(ref);
+        } else if (typeof forwardedRef === 'object') {
+          forwardedRef.current = ref;
         }
+      }
+    };
+    render() {
+      const _this$props = this.props,
+        {
+          forwardedRef
+        } = _this$props,
+        rest = _objectWithoutProperties(_this$props, _excluded);
+      return /*#__PURE__*/React.createElement(PageInstanceContext.Consumer, null, context => {
+        const {
+          $instance
+        } = context;
+        // 挂载页面事件
+        this.additionToLifecycle = function (ins) {
+          Object.keys(pageLifecycles).forEach(event => {
+            if (typeof ins[event] === 'function') {
+              $instance.registerLifecycle(event, ins, ins[event]);
+            }
+          });
+        };
+        return /*#__PURE__*/React.createElement(Component
+        // fixed: 坑货，不能直接一个匿名函数，因为每次渲染匿名函数都是个新的，导致每次渲染都会调用一次
+        // 进而导致生命周期函数重复添加
+        , _extends({
+          ref: this.refHandle
+        }, rest));
       });
-
-      return _this;
     }
-
-    _createClass(WithPageLifeCycle, [{
-      key: "render",
-      value: function render() {
-        var _this2 = this;
-
-        var _this$props = this.props,
-            forwardedRef = _this$props.forwardedRef,
-            rest = _objectWithoutProperties(_this$props, _excluded);
-
-        return /*#__PURE__*/React.createElement(PageInstanceContext.Consumer, null, function (context) {
-          var $instance = context.$instance; // 挂载页面事件
-
-          _this2.additionToLifecycle = function (ins) {
-            Object.keys(pageLifecycles).forEach(function (event) {
-              if (typeof ins[event] === 'function') {
-                $instance.registerLifecycle(event, ins, ins[event]);
-              }
-            });
-          };
-
-          return /*#__PURE__*/React.createElement(Component // fixed: 坑货，不能直接一个匿名函数，因为每次渲染匿名函数都是个新的，导致每次渲染都会调用一次
-          // 进而导致生命周期函数重复添加
-          , _extends({
-            ref: _this2.refHandle
-          }, rest));
-        });
-      }
-    }]);
-
-    return WithPageLifeCycle;
-  }(React.Component);
-
-  _defineProperty(WithPageLifeCycle, "displayName", displayName);
-
-  var forwardRef = /*#__PURE__*/React.forwardRef(function (props, ref) {
+  }
+  const forwardRef = /*#__PURE__*/React.forwardRef((props, ref) => {
     return /*#__PURE__*/React.createElement(WithPageLifeCycle, _extends({}, props, {
       forwardedRef: ref
     }));

package/lib/withPageLifecycle/index.jsx

@@ -0,0 +1,63 @@
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+import React from 'react';
+import { pageLifecycles } from '@ray-js/types';
+import { PageInstanceContext } from '../PageInstanceContext';
+export function withPageLifecycle(Component) {
+    const displayName = `WithPageLifecycle(${Component.displayName || Component.name})`;
+    class WithPageLifeCycle extends React.Component {
+        constructor() {
+            super(...arguments);
+            this.refHandle = (ref) => {
+                const forwardedRef = this.props.forwardedRef;
+                if (ref) {
+                    this.additionToLifecycle(ref);
+                }
+                if (forwardedRef) {
+                    if (typeof forwardedRef === 'function') {
+                        forwardedRef(ref);
+                    }
+                    else if (typeof forwardedRef === 'object') {
+                        forwardedRef.current = ref;
+                    }
+                }
+            };
+        }
+        render() {
+            const _a = this.props, { forwardedRef } = _a, rest = __rest(_a, ["forwardedRef"]);
+            return (<PageInstanceContext.Consumer>
+          {(context) => {
+                    const { $instance } = context;
+                    // 挂载页面事件
+                    this.additionToLifecycle = function additionToLifecycle(ins) {
+                        Object.keys(pageLifecycles).forEach((event) => {
+                            if (typeof ins[event] === 'function') {
+                                ;
+                                $instance.registerLifecycle(event, ins, ins[event]);
+                            }
+                        });
+                    };
+                    return (<Component 
+                    // fixed: 坑货，不能直接一个匿名函数，因为每次渲染匿名函数都是个新的，导致每次渲染都会调用一次
+                    // 进而导致生命周期函数重复添加
+                    ref={this.refHandle} {...rest}/>);
+                }}
+        </PageInstanceContext.Consumer>);
+        }
+    }
+    WithPageLifeCycle.displayName = displayName;
+    const forwardRef = React.forwardRef((props, ref) => {
+        return <WithPageLifeCycle {...props} forwardedRef={ref}/>;
+    });
+    forwardRef.displayName = displayName;
+    return forwardRef;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/runtime",
-  "version": "1.3.21",
+  "version": "1.3.23",
   "description": "Ray cross runtime",
   "keywords": [
     "ray"
@@ -21,11 +21,11 @@
     "watch": "tsc -p ./tsconfig.build.json --module esnext --outDir lib --watch"
   },
   "dependencies": {
-    "@ray-core/runtime": "^0.3.5"
+    "@ray-core/runtime": "^0.3.9"
   },
   "devDependencies": {
-    "@ray-js/cli": "1.3.21",
-    "@ray-js/types": "1.3.21"
+    "@ray-js/cli": "1.3.23",
+    "@ray-js/types": "1.3.23"
   },
   "maintainers": [
     {
@@ -33,6 +33,6 @@
       "email": "tuyafe@tuya.com"
     }
   ],
-  "gitHead": "14cb935df10f020e714b44bb41d4899646db751c",
+  "gitHead": "04708bb394d817a7a522fcde178f19f170d5d364",
   "repository": {}
 }