hrsass-components 2.5.5 → 2.5.7

package/lib/hrsass-components.js

@@ -65,7 +65,7 @@ var contentStyle = _interopDefault(require('!!raw-loader!tinymce/skins/content/d
 var SvgPanZoom = _interopDefault(require('svg-pan-zoom'));
 var saveSvgAsPng = require('save-svg-as-png');
 
-var version = "2.5.5";
+var version = "2.5.7";
 
 /**
  * 版本号
@@ -495,29 +495,82 @@ var capitalizeUpper = function capitalizeUpper(word) {
 
 /**
  * 高阶包装函数，移除过期数据
- * @param  {Function} fun 待包装函数
- * @return {Function}     包装后的函数
+ * @param {Function} fun 待包装函数
+ * @return {Function} 包装后的函数
  */
 var warpFun = function warpFun(fun) {
-  var stack = [],
-    self = _this;
+  // 参数验证和类型检查
+  if (typeof fun !== 'function') {
+    throw new TypeError('Expected a function as argument');
+  }
+  var stack = [];
+  // 使用弱引用避免内存泄漏
+  var self = _this;
   return function () {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    // 验证函数调用上下文
+    if (!fun || typeof fun !== 'function') {
+      return Promise.reject(new Error('Wrapped function is invalid or has been corrupted'));
+    }
     var length = stack.length + 1;
-    var arg = arguments;
-    var p = new Promise(function (reslove, reject) {
-      fun.apply(self, arg).then(function (res) {
-        if (stack.length === length) {
-          console.log('1', stack);
-          stack = [];
-          reslove(res);
-        } else {
-          console.log('0', stack);
+    return new Promise(function (resolve, reject) {
+      // 参数验证
+      if (!args || !Array.isArray(args)) {
+        reject(new Error('Invalid arguments provided'));
+        return;
+      }
+
+      // 修复点：在开始异步操作前，同步更新调用栈
+      // 推送一个代表本次调用的标识符，这里使用时间戳和随机数确保唯一性
+      var callIdentifier = {
+        id: Date.now() + Math.random(),
+        args: args
+      };
+      stack.push(callIdentifier);
+      try {
+        // 执行原函数并处理结果
+        var resultPromise = fun.apply(self, args);
+
+        // 验证返回的是否是Promise
+        if (!resultPromise || typeof resultPromise.then !== 'function') {
+          reject(new TypeError('Wrapped function must return a Promise'));
+          return;
         }
-      });
+        resultPromise.then(function (res) {
+          try {
+            // 检查是否为最新调用
+            if (stack.length === length) {
+              console.log('Processing latest call', stack);
+              stack = []; // 清空栈
+              resolve(res);
+            } else {
+              console.log('Discarding stale data', stack);
+              // 静默处理过期数据，不抛出错误
+              resolve(null); // 或返回特定标识表示数据已过期
+            }
+          } catch (processingError) {
+            console.error('Error processing result:', processingError);
+            reject(new Error("Result processing failed: ".concat(processingError.message)));
+          }
+        })["catch"](function (error) {
+          console.error('Wrapped function execution failed:', error);
+
+          // 根据错误类型进行不同处理
+          if (error instanceof TypeError) {
+            reject(new Error("Type error in wrapped function: ".concat(error.message)));
+          } else if (error instanceof RangeError) {
+            reject(new Error("Range error in wrapped function: ".concat(error.message)));
+          } else {
+            reject(new Error("Execution failed: ".concat(error.message)));
+          }
+        });
+      } catch (syncError) {
+        console.error('Synchronous error in wrapped function:', syncError);
+        reject(new Error("Synchronous execution error: ".concat(syncError.message)));
+      }
     });
-    stack.push(arguments[0].conditionList);
-    // stack.length = length;
-    return p;
   };
 };
 
@@ -8617,7 +8670,7 @@ var index = {
           loading: false
         });
         _this5.$emit("load");
-      })["finally"](function () {
+      })["catch"](function () {
         _this5.setState({
           loading: false
         });