remove querystring

tencentyun · Nov 29, 2019 · d43c064 · d43c064
1 parent c2e5752
commit d43c064
Show file tree

Hide file tree

Showing 5 changed files with 83 additions and 209 deletions.
diff --git a/dist/cos-js-sdk-v5.js b/dist/cos-js-sdk-v5.js
@@ -1948,7 +1948,7 @@ var util = __webpack_require__(0);
 var event = __webpack_require__(2);
 var task = __webpack_require__(11);
 var base = __webpack_require__(12);
-var advance = __webpack_require__(17);
+var advance = __webpack_require__(14);
 
 var defaultOptions = {
     AppId: '', // AppId 已废弃，请拼接到 Bucket 后传入，例如：test-1250000000
@@ -2003,7 +2003,7 @@ base.init(COS, task);
 advance.init(COS, task);
 
 COS.getAuthorization = util.getAuth;
-COS.version = '0.5.21';
+COS.version = '0.5.22';
 
 module.exports = COS;
 
@@ -6546,9 +6546,7 @@ module.exports.init = function (COS, task) {
 
 /***/ }),
 /* 13 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var queryString = __webpack_require__(14);
+/***/ (function(module, exports) {
 
 var $ = function () {
     var deletedIds = [];
@@ -10613,6 +10611,41 @@ var $ = function () {
     return jQuery;
 }();
 
+var stringifyPrimitive = function (v) {
+    switch (typeof v) {
+        case 'string':
+            return v;
+        case 'boolean':
+            return v ? 'true' : 'false';
+        case 'number':
+            return isFinite(v) ? v : '';
+        default:
+            return '';
+    }
+};
+
+var queryStringify = function (obj, sep, eq, name) {
+    sep = sep || '&';
+    eq = eq || '=';
+    if (obj === null) {
+        obj = undefined;
+    }
+    if (typeof obj === 'object') {
+        return Object.keys(obj).map(function (k) {
+            var ks = encodeURIComponent(stringifyPrimitive(k)) + eq;
+            if (Array.isArray(obj[k])) {
+                return obj[k].map(function (v) {
+                    return ks + encodeURIComponent(stringifyPrimitive(v));
+                }).join(sep);
+            } else {
+                return ks + encodeURIComponent(stringifyPrimitive(obj[k]));
+            }
+        }).filter(Boolean).join(sep);
+    }
+    if (!name) return '';
+    return encodeURIComponent(stringifyPrimitive(name)) + eq + encodeURIComponent(stringifyPrimitive(obj));
+};
+
 var request = function (options, callback) {
 
     options = $.extend(true, { headers: {}, qs: {} }, options);
@@ -10629,7 +10662,7 @@ var request = function (options, callback) {
 
     // qs
     if (options.qs) {
-        var qsStr = queryString.stringify(options.qs);
+        var qsStr = queryStringify(options.qs);
         if (qsStr) {
             options.url += (options.url.indexOf('?') === -1 ? '?' : '&') + qsStr;
         }
@@ -10707,201 +10740,7 @@ module.exports = request;
 /* 14 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-
-exports.decode = exports.parse = __webpack_require__(15);
-exports.encode = exports.stringify = __webpack_require__(16);
-
-
-/***/ }),
-/* 15 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// 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.
-
-
-
-// If obj.hasOwnProperty has been overridden, then calling
-// obj.hasOwnProperty(prop) will break.
-// See: https://github.com/joyent/node/issues/1707
-function hasOwnProperty(obj, prop) {
-  return Object.prototype.hasOwnProperty.call(obj, prop);
-}
-
-module.exports = function(qs, sep, eq, options) {
-  sep = sep || '&';
-  eq = eq || '=';
-  var obj = {};
-
-  if (typeof qs !== 'string' || qs.length === 0) {
-    return obj;
-  }
-
-  var regexp = /\+/g;
-  qs = qs.split(sep);
-
-  var maxKeys = 1000;
-  if (options && typeof options.maxKeys === 'number') {
-    maxKeys = options.maxKeys;
-  }
-
-  var len = qs.length;
-  // maxKeys <= 0 means that we should not limit keys count
-  if (maxKeys > 0 && len > maxKeys) {
-    len = maxKeys;
-  }
-
-  for (var i = 0; i < len; ++i) {
-    var x = qs[i].replace(regexp, '%20'),
-        idx = x.indexOf(eq),
-        kstr, vstr, k, v;
-
-    if (idx >= 0) {
-      kstr = x.substr(0, idx);
-      vstr = x.substr(idx + 1);
-    } else {
-      kstr = x;
-      vstr = '';
-    }
-
-    k = decodeURIComponent(kstr);
-    v = decodeURIComponent(vstr);
-
-    if (!hasOwnProperty(obj, k)) {
-      obj[k] = v;
-    } else if (isArray(obj[k])) {
-      obj[k].push(v);
-    } else {
-      obj[k] = [obj[k], v];
-    }
-  }
-
-  return obj;
-};
-
-var isArray = Array.isArray || function (xs) {
-  return Object.prototype.toString.call(xs) === '[object Array]';
-};
-
-
-/***/ }),
-/* 16 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// 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.
-
-
-
-var stringifyPrimitive = function(v) {
-  switch (typeof v) {
-    case 'string':
-      return v;
-
-    case 'boolean':
-      return v ? 'true' : 'false';
-
-    case 'number':
-      return isFinite(v) ? v : '';
-
-    default:
-      return '';
-  }
-};
-
-module.exports = function(obj, sep, eq, name) {
-  sep = sep || '&';
-  eq = eq || '=';
-  if (obj === null) {
-    obj = undefined;
-  }
-
-  if (typeof obj === 'object') {
-    return map(objectKeys(obj), function(k) {
-      var ks = encodeURIComponent(stringifyPrimitive(k)) + eq;
-      if (isArray(obj[k])) {
-        return map(obj[k], function(v) {
-          return ks + encodeURIComponent(stringifyPrimitive(v));
-        }).join(sep);
-      } else {
-        return ks + encodeURIComponent(stringifyPrimitive(obj[k]));
-      }
-    }).join(sep);
-
-  }
-
-  if (!name) return '';
-  return encodeURIComponent(stringifyPrimitive(name)) + eq +
-         encodeURIComponent(stringifyPrimitive(obj));
-};
-
-var isArray = Array.isArray || function (xs) {
-  return Object.prototype.toString.call(xs) === '[object Array]';
-};
-
-function map (xs, f) {
-  if (xs.map) return xs.map(f);
-  var res = [];
-  for (var i = 0; i < xs.length; i++) {
-    res.push(f(xs[i], i));
-  }
-  return res;
-}
-
-var objectKeys = Object.keys || function (obj) {
-  var res = [];
-  for (var key in obj) {
-    if (Object.prototype.hasOwnProperty.call(obj, key)) res.push(key);
-  }
-  return res;
-};
-
-
-/***/ }),
-/* 17 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var Async = __webpack_require__(18);
+var Async = __webpack_require__(15);
 var EventProxy = __webpack_require__(2).EventProxy;
 var util = __webpack_require__(0);
 
@@ -12112,7 +11951,7 @@ module.exports.init = function (COS, task) {
 };
 
 /***/ }),
-/* 18 */
+/* 15 */
 /***/ (function(module, exports) {
 
 var eachLimit = function (arr, limit, iterator, callback) {

diff --git a/dist/cos-js-sdk-v5.min.js b/dist/cos-js-sdk-v5.min.js
diff --git a/lib/request.js b/lib/request.js
@@ -1,5 +1,3 @@
-var queryString = require('querystring');
-
 var $ = (function () {
     var deletedIds = [];
 
@@ -4100,6 +4098,43 @@ var $ = (function () {
 
 })();
 
+var stringifyPrimitive = function(v) {
+    switch (typeof v) {
+        case 'string':
+            return v;
+        case 'boolean':
+            return v ? 'true' : 'false';
+        case 'number':
+            return isFinite(v) ? v : '';
+        default:
+            return '';
+    }
+};
+
+var queryStringify = function(obj, sep, eq, name) {
+    sep = sep || '&';
+    eq = eq || '=';
+    if (obj === null) {
+        obj = undefined;
+    }
+    if (typeof obj === 'object') {
+        return Object.keys(obj).map(function(k) {
+            var ks = encodeURIComponent(stringifyPrimitive(k)) + eq;
+            if (Array.isArray(obj[k])) {
+                return obj[k].map(function(v) {
+                    return ks + encodeURIComponent(stringifyPrimitive(v));
+                }).join(sep);
+            } else {
+                return ks + encodeURIComponent(stringifyPrimitive(obj[k]));
+            }
+        }).filter(Boolean).join(sep);
+
+    }
+    if (!name) return '';
+    return encodeURIComponent(stringifyPrimitive(name)) + eq +
+        encodeURIComponent(stringifyPrimitive(obj));
+};
+
 var request = function (options, callback) {
 
     options = $.extend(true, {headers: {}, qs: {}}, options);
@@ -4116,7 +4151,7 @@ var request = function (options, callback) {
 
     // qs
     if (options.qs) {
-        var qsStr = queryString.stringify(options.qs);
+        var qsStr = queryStringify(options.qs);
         if (qsStr) {
             options.url += (options.url.indexOf('?') === -1 ? '?' : '&') + qsStr;
         }
@@ -4193,4 +4228,4 @@ var request = function (options, callback) {
 
 };
 
-module.exports = request;
+module.exports = request;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cos-js-sdk-v5",
-  "version": "0.5.21",
+  "version": "0.5.22",
   "description": "JavaScript SDK for [腾讯云对象存储](https://cloud.tencent.com/product/cos)",
   "main": "index.js",
   "scripts": {

diff --git a/src/cos.js b/src/cos.js
@@ -59,6 +59,6 @@ base.init(COS, task);
 advance.init(COS, task);
 
 COS.getAuthorization = util.getAuth;
-COS.version = '0.5.21';
+COS.version = '0.5.22';
 
 module.exports = COS;