@tarojs/with-weapp 3.5.0-beta.2 → 3.5.0-beta.3

package/dist/index.js

@@ -13,8 +13,8 @@ var _inherits = require('@babel/runtime/helpers/inherits');
 var _possibleConstructorReturn = require('@babel/runtime/helpers/possibleConstructorReturn');
 var _getPrototypeOf = require('@babel/runtime/helpers/getPrototypeOf');
 var _typeof = require('@babel/runtime/helpers/typeof');
-var taro = require('@tarojs/taro');
 var runtime = require('@tarojs/runtime');
+var taro = require('@tarojs/taro');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -30,166 +30,110 @@ var _possibleConstructorReturn__default = /*#__PURE__*/_interopDefaultLegacy(_po
 var _getPrototypeOf__default = /*#__PURE__*/_interopDefaultLegacy(_getPrototypeOf);
 var _typeof__default = /*#__PURE__*/_interopDefaultLegacy(_typeof);
 
-var _lifecycleMap;
-
-var TaroLifeCycles;
-
-(function (TaroLifeCycles) {
-  TaroLifeCycles["WillMount"] = "componentWillMount";
-  TaroLifeCycles["DidMount"] = "componentDidMount";
-  TaroLifeCycles["DidShow"] = "componentDidShow";
-  TaroLifeCycles["DidHide"] = "componentDidHide";
-  TaroLifeCycles["WillUnmount"] = "componentWillUnmount";
-})(TaroLifeCycles || (TaroLifeCycles = {}));
-
-var lifecycleMap = (_lifecycleMap = {}, _defineProperty__default["default"](_lifecycleMap, TaroLifeCycles.WillMount, ['created']), _defineProperty__default["default"](_lifecycleMap, TaroLifeCycles.DidMount, ['attached']), _defineProperty__default["default"](_lifecycleMap, TaroLifeCycles.DidShow, ['onShow']), _defineProperty__default["default"](_lifecycleMap, TaroLifeCycles.DidHide, ['onHide']), _defineProperty__default["default"](_lifecycleMap, TaroLifeCycles.WillUnmount, ['detached', 'onUnload']), _lifecycleMap);
-var lifecycles = new Set(['ready']);
-
-for (var key in lifecycleMap) {
-  var lifecycle = lifecycleMap[key];
-  lifecycle.forEach(function (l) {
-    return lifecycles.add(l);
-  });
-}
-
-var uniquePageLifecycle = ['onPullDownRefresh', 'onReachBottom', 'onShareAppMessage', 'onShareTimeline', 'onAddToFavorites', 'onPageScroll', 'onResize', 'onTabItemTap'];
-var appOptions = ['onLaunch', 'onShow', 'onHide', 'onError', 'onPageNotFound', 'onUnhandledRejection', 'onThemeChange'];
+var json = JSON;
+var clone = function clone(obj) {
+  return json.parse(stringify(obj));
+};
 
-/**
- * Simple bind, faster than native
- */
-function bind(fn
-/*: Function */
-, ctx
-/*: Object */
-) {
-  if (!fn) return false;
+var isArray = Array.isArray || function (x) {
+  return {}.toString.call(x) === '[object Array]';
+};
 
-  function boundFn(a) {
-    var l
-    /*: number */
-    = arguments.length;
-    return l ? l > 1 ? fn.apply(ctx, arguments) : fn.call(ctx, a) : fn.call(ctx);
-  } // record original fn length
+var objectKeys = Object.keys || function (obj) {
+  var has = Object.prototype.hasOwnProperty || function () {
+    return true;
+  };
 
+  var keys = [];
 
-  boundFn._length = fn.length;
-  return boundFn;
-}
-function isEqual(obj1, obj2) {
-  return JSON.stringify(obj1) === JSON.stringify(obj2);
-}
-function safeGet(obj, propsArg, defaultValue) {
-  if (!obj) {
-    return defaultValue;
+  for (var key in obj) {
+    if (has.call(obj, key)) keys.push(key);
   }
 
-  var props, prop;
-
-  if (Array.isArray(propsArg)) {
-    props = propsArg.slice(0);
-  }
+  return keys;
+};
 
-  if (typeof propsArg === 'string') {
-    props = propsArg.replace(/\[(.+?)\]/g, '.$1');
-    props = props.split('.');
-  }
+function stringify(obj, opts) {
+  if (!opts) opts = {};
+  if (typeof opts === 'function') opts = {
+    cmp: opts
+  };
+  var space = opts.space || '';
+  if (typeof space === 'number') space = Array(space + 1).join(' ');
+  var cycles = typeof opts.cycles === 'boolean' ? opts.cycles : false;
 
-  if (_typeof__default["default"](propsArg) === 'symbol') {
-    props = [propsArg];
-  }
+  var replacer = opts.replacer || function (key, value) {
+    return value;
+  };
 
-  if (!Array.isArray(props)) {
-    throw new Error('props arg must be an array, a string or a symbol');
-  }
+  var cmp = opts.cmp && function (f) {
+    return function (node) {
+      return function (a, b) {
+        var aobj = {
+          key: a,
+          value: node[a]
+        };
+        var bobj = {
+          key: b,
+          value: node[b]
+        };
+        return f(aobj, bobj);
+      };
+    };
+  }(opts.cmp);
 
-  while (props.length) {
-    prop = props.shift();
+  var seen = [];
+  return function stringify(parent, key, node, level) {
+    var indent = space ? '\n' + new Array(level + 1).join(space) : '';
+    var colonSeparator = space ? ': ' : ':';
 
-    if (!obj) {
-      return defaultValue;
+    if (node && node.toJSON && typeof node.toJSON === 'function') {
+      node = node.toJSON();
     }
 
-    obj = obj[prop];
+    node = replacer.call(parent, key, node);
 
-    if (obj === undefined) {
-      return defaultValue;
+    if (node === undefined) {
+      return;
     }
-  }
 
-  return obj;
-}
-function safeSet(obj, props, value) {
-  if (typeof props === 'string') {
-    props = props.replace(/\[(.+?)\]/g, '.$1');
-    props = props.split('.');
-  }
-
-  if (_typeof__default["default"](props) === 'symbol') {
-    props = [props];
-  }
-
-  var lastProp = props.pop();
-
-  if (!lastProp) {
-    return false;
-  }
-
-  var thisProp;
-
-  while (thisProp = props.shift()) {
-    if (typeof obj[thisProp] === 'undefined') {
-      obj[thisProp] = {};
-    } // 直接按路径修改 this.state 可能会导致 nextProps 也被修改
-    // 因此按路径寻找时，每一层都复制一遍
-
-
-    if (Array.isArray(obj[thisProp])) {
-      obj[thisProp] = _toConsumableArray__default["default"](obj[thisProp]);
-    } else if (_typeof__default["default"](obj[thisProp]) === 'object') {
-      obj[thisProp] = Object.assign({}, obj[thisProp]);
+    if (_typeof__default["default"](node) !== 'object' || node === null) {
+      return json.stringify(node);
     }
 
-    obj = obj[thisProp];
+    if (isArray(node)) {
+      var out = [];
 
-    if (!obj || _typeof__default["default"](obj) !== 'object') {
-      return false;
-    }
-  }
+      for (var i = 0; i < node.length; i++) {
+        var item = stringify(node, i, node[i], level + 1) || json.stringify(null);
+        out.push(indent + space + item);
+      }
 
-  obj[lastProp] = value;
-  return true;
-}
-function report(msg) {
-  console.warn('[Taro Convert Warning] ' + msg);
-}
-var unsupport = new Map([['onError', '不支持 App 的 onError 生命周期方法。'], ['onPageNotFound', '不支持 App 的 onPageNotFound 生命周期方法。'], ['onUnhandledRejection', '不支持 App 的 onUnhandledRejection 生命周期方法。'], ['onThemeChange', '不支持 App 的 onThemeChange 生命周期方法。'], ['moved', '不支持自定义组件的 moved 生命周期。'], ['externalClasses', '不支持自定义组件的 externalClasses 功能。'], ['relations', '不支持自定义组件的 relations 功能。'], ['options', '不支持自定义组件的 options 功能。'], ['definitionFilter', '不支持自定义组件的 definitionFilter 功能。'], ['selectComponent', 'selectComponent 方法产生不到目标效果，请使用 React 的 ref 进行重构。'], ['selectAllComponents', 'selectAllComponents 方法产生不到目标效果，请使用 React 的 ref 进行重构。'], ['selectOwnerComponent', 'selectOwnerComponent 方法产生不到目标效果，请使用 React 语法重构。'], ['groupSetData', 'groupSetData 方法产生不到目标效果，请使用 React 语法重构。']]);
-function flattenBehaviors(behavior, behaviorMap) {
-  if (typeof behavior === 'string') {
-    return report("\u4E0D\u652F\u6301\u4F7F\u7528\u5185\u7F6E Behavior: [".concat(behavior, "]"));
-  }
+      return '[' + out.join(',') + indent + ']';
+    } else {
+      if (seen.indexOf(node) !== -1) {
+        if (cycles) return json.stringify('__cycle__');
+        throw new TypeError('Converting circular structure to JSON');
+      } else seen.push(node);
 
-  var subBehaviors = behavior.behaviors;
+      var keys = objectKeys(node).sort(cmp && cmp(node));
+      var _out = [];
 
-  if (subBehaviors === null || subBehaviors === void 0 ? void 0 : subBehaviors.length) {
-    subBehaviors.forEach(function (subBehavior) {
-      return flattenBehaviors(subBehavior, behaviorMap);
-    });
-  }
+      for (var _i = 0; _i < keys.length; _i++) {
+        var _key = keys[_i];
+        var value = stringify(node, _key, node[_key], level + 1);
+        if (!value) continue;
+        var keyValue = json.stringify(_key) + colonSeparator + value;
 
-  Object.keys(behavior).forEach(function (key) {
-    // 不支持的属性
-    if (unsupport.has(key)) {
-      var advise = unsupport.get(key);
-      return report(advise);
-    }
+        _out.push(indent + space + keyValue);
+      }
 
-    if (behaviorMap.has(key)) {
-      var list = behaviorMap.get(key);
-      var value = behavior[key];
-      list.push(value);
+      seen.splice(seen.indexOf(node), 1);
+      return '{' + _out.join(',') + indent + '}';
     }
-  });
+  }({
+    '': obj
+  }, '', obj, 0);
 }
 
 /*eslint-disable*/
@@ -304,110 +248,166 @@ function type(obj) {
   return Object.prototype.toString.call(obj);
 }
 
-var json = JSON;
-var clone = function clone(obj) {
-  return json.parse(stringify(obj));
-};
+var _lifecycleMap;
 
-var isArray = Array.isArray || function (x) {
-  return {}.toString.call(x) === '[object Array]';
-};
+var TaroLifeCycles;
 
-var objectKeys = Object.keys || function (obj) {
-  var has = Object.prototype.hasOwnProperty || function () {
-    return true;
-  };
+(function (TaroLifeCycles) {
+  TaroLifeCycles["WillMount"] = "componentWillMount";
+  TaroLifeCycles["DidMount"] = "componentDidMount";
+  TaroLifeCycles["DidShow"] = "componentDidShow";
+  TaroLifeCycles["DidHide"] = "componentDidHide";
+  TaroLifeCycles["WillUnmount"] = "componentWillUnmount";
+})(TaroLifeCycles || (TaroLifeCycles = {}));
 
-  var keys = [];
+var lifecycleMap = (_lifecycleMap = {}, _defineProperty__default["default"](_lifecycleMap, TaroLifeCycles.WillMount, ['created']), _defineProperty__default["default"](_lifecycleMap, TaroLifeCycles.DidMount, ['attached']), _defineProperty__default["default"](_lifecycleMap, TaroLifeCycles.DidShow, ['onShow']), _defineProperty__default["default"](_lifecycleMap, TaroLifeCycles.DidHide, ['onHide']), _defineProperty__default["default"](_lifecycleMap, TaroLifeCycles.WillUnmount, ['detached', 'onUnload']), _lifecycleMap);
+var lifecycles = new Set(['ready']);
 
-  for (var key in obj) {
-    if (has.call(obj, key)) keys.push(key);
+for (var key in lifecycleMap) {
+  var lifecycle = lifecycleMap[key];
+  lifecycle.forEach(function (l) {
+    return lifecycles.add(l);
+  });
+}
+
+var uniquePageLifecycle = ['onPullDownRefresh', 'onReachBottom', 'onShareAppMessage', 'onShareTimeline', 'onAddToFavorites', 'onPageScroll', 'onResize', 'onTabItemTap'];
+var appOptions = ['onLaunch', 'onShow', 'onHide', 'onError', 'onPageNotFound', 'onUnhandledRejection', 'onThemeChange'];
+
+/**
+ * Simple bind, faster than native
+ */
+function bind(fn
+/*: Function */
+, ctx
+/*: Object */
+) {
+  if (!fn) return false;
+
+  function boundFn(a) {
+    var l
+    /*: number */
+    = arguments.length;
+    return l ? l > 1 ? fn.apply(ctx, arguments) : fn.call(ctx, a) : fn.call(ctx);
+  } // record original fn length
+
+
+  boundFn._length = fn.length;
+  return boundFn;
+}
+function isEqual(obj1, obj2) {
+  return JSON.stringify(obj1) === JSON.stringify(obj2);
+}
+function safeGet(obj, propsArg, defaultValue) {
+  if (!obj) {
+    return defaultValue;
   }
 
-  return keys;
-};
+  var props, prop;
 
-function stringify(obj, opts) {
-  if (!opts) opts = {};
-  if (typeof opts === 'function') opts = {
-    cmp: opts
-  };
-  var space = opts.space || '';
-  if (typeof space === 'number') space = Array(space + 1).join(' ');
-  var cycles = typeof opts.cycles === 'boolean' ? opts.cycles : false;
+  if (Array.isArray(propsArg)) {
+    props = propsArg.slice(0);
+  }
 
-  var replacer = opts.replacer || function (key, value) {
-    return value;
-  };
+  if (typeof propsArg === 'string') {
+    props = propsArg.replace(/\[(.+?)\]/g, '.$1');
+    props = props.split('.');
+  }
 
-  var cmp = opts.cmp && function (f) {
-    return function (node) {
-      return function (a, b) {
-        var aobj = {
-          key: a,
-          value: node[a]
-        };
-        var bobj = {
-          key: b,
-          value: node[b]
-        };
-        return f(aobj, bobj);
-      };
-    };
-  }(opts.cmp);
+  if (_typeof__default["default"](propsArg) === 'symbol') {
+    props = [propsArg];
+  }
 
-  var seen = [];
-  return function stringify(parent, key, node, level) {
-    var indent = space ? '\n' + new Array(level + 1).join(space) : '';
-    var colonSeparator = space ? ': ' : ':';
+  if (!Array.isArray(props)) {
+    throw new Error('props arg must be an array, a string or a symbol');
+  }
 
-    if (node && node.toJSON && typeof node.toJSON === 'function') {
-      node = node.toJSON();
+  while (props.length) {
+    prop = props.shift();
+
+    if (!obj) {
+      return defaultValue;
     }
 
-    node = replacer.call(parent, key, node);
+    obj = obj[prop];
 
-    if (node === undefined) {
-      return;
+    if (obj === undefined) {
+      return defaultValue;
     }
+  }
 
-    if (_typeof__default["default"](node) !== 'object' || node === null) {
-      return json.stringify(node);
+  return obj;
+}
+function safeSet(obj, props, value) {
+  if (typeof props === 'string') {
+    props = props.replace(/\[(.+?)\]/g, '.$1');
+    props = props.split('.');
+  }
+
+  if (_typeof__default["default"](props) === 'symbol') {
+    props = [props];
+  }
+
+  var lastProp = props.pop();
+
+  if (!lastProp) {
+    return false;
+  }
+
+  var thisProp;
+
+  while (thisProp = props.shift()) {
+    if (typeof obj[thisProp] === 'undefined') {
+      obj[thisProp] = {};
+    } // 直接按路径修改 this.state 可能会导致 nextProps 也被修改
+    // 因此按路径寻找时，每一层都复制一遍
+
+
+    if (Array.isArray(obj[thisProp])) {
+      obj[thisProp] = _toConsumableArray__default["default"](obj[thisProp]);
+    } else if (_typeof__default["default"](obj[thisProp]) === 'object') {
+      obj[thisProp] = Object.assign({}, obj[thisProp]);
     }
 
-    if (isArray(node)) {
-      var out = [];
+    obj = obj[thisProp];
 
-      for (var i = 0; i < node.length; i++) {
-        var item = stringify(node, i, node[i], level + 1) || json.stringify(null);
-        out.push(indent + space + item);
-      }
+    if (!obj || _typeof__default["default"](obj) !== 'object') {
+      return false;
+    }
+  }
 
-      return '[' + out.join(',') + indent + ']';
-    } else {
-      if (seen.indexOf(node) !== -1) {
-        if (cycles) return json.stringify('__cycle__');
-        throw new TypeError('Converting circular structure to JSON');
-      } else seen.push(node);
+  obj[lastProp] = value;
+  return true;
+}
+function report(msg) {
+  console.warn('[Taro Convert Warning] ' + msg);
+}
+var nonsupport = new Map([['onError', '不支持 App 的 onError 生命周期方法。'], ['onPageNotFound', '不支持 App 的 onPageNotFound 生命周期方法。'], ['onUnhandledRejection', '不支持 App 的 onUnhandledRejection 生命周期方法。'], ['onThemeChange', '不支持 App 的 onThemeChange 生命周期方法。'], ['moved', '不支持自定义组件的 moved 生命周期。'], ['externalClasses', '不支持自定义组件的 externalClasses 功能。'], ['relations', '不支持自定义组件的 relations 功能。'], ['options', '不支持自定义组件的 options 功能。'], ['definitionFilter', '不支持自定义组件的 definitionFilter 功能。'], ['selectComponent', 'selectComponent 方法产生不到目标效果，请使用 React 的 ref 进行重构。'], ['selectAllComponents', 'selectAllComponents 方法产生不到目标效果，请使用 React 的 ref 进行重构。'], ['selectOwnerComponent', 'selectOwnerComponent 方法产生不到目标效果，请使用 React 语法重构。'], ['groupSetData', 'groupSetData 方法产生不到目标效果，请使用 React 语法重构。']]);
+function flattenBehaviors(behavior, behaviorMap) {
+  if (typeof behavior === 'string') {
+    return report("\u4E0D\u652F\u6301\u4F7F\u7528\u5185\u7F6E Behavior: [".concat(behavior, "]"));
+  }
 
-      var keys = objectKeys(node).sort(cmp && cmp(node));
-      var _out = [];
+  var subBehaviors = behavior.behaviors;
 
-      for (var _i = 0; _i < keys.length; _i++) {
-        var _key = keys[_i];
-        var value = stringify(node, _key, node[_key], level + 1);
-        if (!value) continue;
-        var keyValue = json.stringify(_key) + colonSeparator + value;
+  if (subBehaviors === null || subBehaviors === void 0 ? void 0 : subBehaviors.length) {
+    subBehaviors.forEach(function (subBehavior) {
+      return flattenBehaviors(subBehavior, behaviorMap);
+    });
+  }
 
-        _out.push(indent + space + keyValue);
-      }
+  Object.keys(behavior).forEach(function (key) {
+    // 不支持的属性
+    if (nonsupport.has(key)) {
+      var advise = nonsupport.get(key);
+      return report(advise);
+    }
 
-      seen.splice(seen.indexOf(node), 1);
-      return '{' + _out.join(',') + indent + '}';
+    if (behaviorMap.has(key)) {
+      var list = behaviorMap.get(key);
+      var value = behavior[key];
+      list.push(value);
     }
-  }({
-    '': obj
-  }, '', obj, 0);
+  });
 }
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
@@ -498,7 +498,7 @@ function withWeapp(weappConf) {
         _this.didHides = [];
         _this.didShows = [];
         _this.willUnmounts = [];
-        _this.eventDistoryList = [];
+        _this.eventDestroyList = [];
         _this.current = runtime.getCurrentInstance();
         _this.taroGlobalData = Object.create(null);
 
@@ -640,8 +640,8 @@ function withWeapp(weappConf) {
 
           for (var confKey in options) {
             // 不支持的属性
-            if (unsupport.has(confKey)) {
-              var advise = unsupport.get(confKey);
+            if (nonsupport.has(confKey)) {
+              var advise = nonsupport.get(confKey);
               report(advise);
             }
 
@@ -819,8 +819,8 @@ function withWeapp(weappConf) {
         key: "initLifeCycles",
         value: function initLifeCycles(lifecycleName, lifecycle) {
           // 不支持的生命周期
-          if (unsupport.has(lifecycleName)) {
-            var advise = unsupport.get(lifecycleName);
+          if (nonsupport.has(lifecycleName)) {
+            var advise = nonsupport.get(lifecycleName);
             return report(advise);
           }
 
@@ -887,7 +887,7 @@ function withWeapp(weappConf) {
           cb = cb.bind(this);
           (router === null || router === void 0 ? void 0 : router[lifecycleName]) && taro.eventCenter.on(router[lifecycleName], cb); // unMount 时需要取消事件监听
 
-          this.eventDistoryList.push(function () {
+          this.eventDestroyList.push(function () {
             return taro.eventCenter.off(router[lifecycleName], cb);
           });
         }
@@ -1029,7 +1029,7 @@ function withWeapp(weappConf) {
       }, {
         key: "componentWillUnmount",
         value: function componentWillUnmount() {
-          this.eventDistoryList.forEach(function (fn) {
+          this.eventDestroyList.forEach(function (fn) {
             return fn();
           });
           this.safeExecute(_get__default["default"](_getPrototypeOf__default["default"](BaseComponent.prototype), "componentWillUnmount", this));
@@ -1088,22 +1088,22 @@ function withWeapp(weappConf) {
       }, {
         key: "selectComponent",
         value: function selectComponent() {
-          report(unsupport.get('selectComponent'));
+          report(nonsupport.get('selectComponent'));
         }
       }, {
         key: "selectAllComponents",
         value: function selectAllComponents() {
-          report(unsupport.get('selectAllComponents'));
+          report(nonsupport.get('selectAllComponents'));
         }
       }, {
         key: "selectOwnerComponent",
         value: function selectOwnerComponent() {
-          report(unsupport.get('selectOwnerComponent'));
+          report(nonsupport.get('selectOwnerComponent'));
         }
       }, {
         key: "groupSetData",
         value: function groupSetData() {
-          report(unsupport.get('groupSetData'));
+          report(nonsupport.get('groupSetData'));
         }
       }]);