files.com 1.0.291 → 1.0.292

package/_VERSION

@@ -1 +1 @@
-1.0.291
+1.0.292

package/lib/models/File.js

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 var _typeof = require("@babel/runtime/helpers/typeof");
 exports.__esModule = true;
 exports.default = void 0;
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -18,6 +19,7 @@ var _Logger = _interopRequireDefault(require("../Logger"));
 var _utils = require("../utils");
 var _FileAction = _interopRequireDefault(require("./FileAction"));
 var _FileUploadPart = _interopRequireDefault(require("./FileUploadPart"));
+var _excluded = ["determinePartUploadUri"];
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -902,30 +904,31 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
     return _ref16.apply(this, arguments);
   };
 }());
-(0, _defineProperty2.default)(File, "_determinePartUploadUri", function (fileUploadPart) {
-  return fileUploadPart.upload_uri;
-});
 /**
  * @note see File.copy() for list of supported params
  */
 (0, _defineProperty2.default)(File, "uploadStream", /*#__PURE__*/function () {
-  var _ref17 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee17(destinationPath, readableStream, params, options) {
-    var firstFileUploadPart, file;
+  var _ref17 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee17(destinationPath, readableStream, params, optionsRaw) {
+    var _ref18, determinePartUploadUriRaw, options, firstFileUploadPart, determinePartUploadUri, file;
     return _regenerator.default.wrap(function _callee17$(_context17) {
       while (1) switch (_context17.prev = _context17.next) {
         case 0:
-          _context17.next = 2;
+          _ref18 = optionsRaw || {}, determinePartUploadUriRaw = _ref18.determinePartUploadUri, options = (0, _objectWithoutProperties2.default)(_ref18, _excluded);
+          _context17.next = 3;
           return File._openUpload(destinationPath, params, options);
-        case 2:
+        case 3:
           firstFileUploadPart = _context17.sent;
           if (firstFileUploadPart) {
-            _context17.next = 5;
+            _context17.next = 6;
             break;
           }
           return _context17.abrupt("return");
-        case 5:
-          _context17.prev = 5;
-          _context17.next = 8;
+        case 6:
+          determinePartUploadUri = determinePartUploadUriRaw || function (fileUploadPart) {
+            return fileUploadPart.upload_uri;
+          };
+          _context17.prev = 7;
+          _context17.next = 10;
           return new Promise(function (resolve, reject) {
             var part = 0;
             var chunks = [];
@@ -935,7 +938,7 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
               reject(error);
             });
             readableStream.on('data', /*#__PURE__*/function () {
-              var _ref18 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee15(chunk) {
+              var _ref19 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee15(chunk) {
                 var nextLength, excessLength, chunkBuffer, tailLength, lastChunkForPart, firstChunkForNextPart, buffer, nextFileUploadPart, upload_uri, uploadPromise;
                 return _regenerator.default.wrap(function _callee15$(_context15) {
                   while (1) switch (_context15.prev = _context15.next) {
@@ -960,7 +963,7 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
                       return File._continueUpload(destinationPath, ++part, firstFileUploadPart, options);
                     case 13:
                       nextFileUploadPart = _context15.sent;
-                      upload_uri = File._determinePartUploadUri(nextFileUploadPart);
+                      upload_uri = determinePartUploadUri(nextFileUploadPart);
                       uploadPromise = _Api.default.sendFilePart(upload_uri, 'PUT', buffer);
                       if (!firstFileUploadPart.parallel_parts) {
                         _context15.next = 20;
@@ -995,7 +998,7 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
                 }, _callee15, null, [[0, 31]]);
               }));
               return function (_x20) {
-                return _ref18.apply(this, arguments);
+                return _ref19.apply(this, arguments);
               };
             }());
             readableStream.on('end', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee16() {
@@ -1013,7 +1016,7 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
                     return File._continueUpload(destinationPath, ++part, firstFileUploadPart, options);
                   case 5:
                     nextFileUploadPart = _context16.sent;
-                    upload_uri = File._determinePartUploadUri(nextFileUploadPart);
+                    upload_uri = determinePartUploadUri(nextFileUploadPart);
                     concurrentUploads.push(_Api.default.sendFilePart(upload_uri, 'PUT', buffer));
                   case 8:
                     _context16.next = 10;
@@ -1038,18 +1041,18 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
               }, _callee16, null, [[0, 17]]);
             })));
           });
-        case 8:
+        case 10:
           file = _context17.sent;
           return _context17.abrupt("return", file);
-        case 12:
-          _context17.prev = 12;
-          _context17.t0 = _context17["catch"](5);
+        case 14:
+          _context17.prev = 14;
+          _context17.t0 = _context17["catch"](7);
           errors.handleErrorResponse(_context17.t0);
-        case 15:
+        case 17:
         case "end":
           return _context17.stop();
       }
-    }, _callee17, null, [[5, 12]]);
+    }, _callee17, null, [[7, 14]]);
   }));
   return function (_x16, _x17, _x18, _x19) {
     return _ref17.apply(this, arguments);
@@ -1060,7 +1063,7 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
  * @note see File.copy() for list of supported params
  */
 (0, _defineProperty2.default)(File, "uploadData", /*#__PURE__*/function () {
-  var _ref20 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee18(destinationPath, data, params, options) {
+  var _ref21 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee18(destinationPath, data, params, options) {
     return _regenerator.default.wrap(function _callee18$(_context18) {
       while (1) switch (_context18.prev = _context18.next) {
         case 0:
@@ -1078,14 +1081,14 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
     }, _callee18);
   }));
   return function (_x21, _x22, _x23, _x24) {
-    return _ref20.apply(this, arguments);
+    return _ref21.apply(this, arguments);
   };
 }());
 /**
  * @note see File.copy() for list of supported params
  */
 (0, _defineProperty2.default)(File, "uploadFile", /*#__PURE__*/function () {
-  var _ref21 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee19(destinationPath, sourceFilePath, params, options) {
+  var _ref22 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee19(destinationPath, sourceFilePath, params, options) {
     var _require4, openDiskFileReadStream, stream;
     return _regenerator.default.wrap(function _callee19$(_context19) {
       while (1) switch (_context19.prev = _context19.next) {
@@ -1106,7 +1109,7 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
     }, _callee19);
   }));
   return function (_x25, _x26, _x27, _x28) {
-    return _ref21.apply(this, arguments);
+    return _ref22.apply(this, arguments);
   };
 }());
 // Parameters:
@@ -1125,7 +1128,7 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
 //   structure - string - If copying folder, copy just the structure?
 //   with_rename - boolean - Allow file rename instead of overwrite?
 (0, _defineProperty2.default)(File, "create", /*#__PURE__*/function () {
-  var _ref22 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee20(path) {
+  var _ref23 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee20(path) {
     var params,
       options,
       response,
@@ -1220,7 +1223,7 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
     }, _callee20);
   }));
   return function (_x29) {
-    return _ref22.apply(this, arguments);
+    return _ref23.apply(this, arguments);
   };
 }());
 // Parameters:
@@ -1229,7 +1232,7 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
 //   with_previews - boolean - Include file preview information?
 //   with_priority_color - boolean - Include file priority color information?
 (0, _defineProperty2.default)(File, "find", /*#__PURE__*/function () {
-  var _ref23 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee21(path) {
+  var _ref24 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee21(path) {
     var params,
       options,
       response,
@@ -1276,7 +1279,7 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
     }, _callee21);
   }));
   return function (_x30) {
-    return _ref23.apply(this, arguments);
+    return _ref24.apply(this, arguments);
   };
 }());
 (0, _defineProperty2.default)(File, "get", function (path) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "files.com",
-  "version": "1.0.291",
+  "version": "1.0.292",
   "description": "Files.com SDK for JavaScript",
   "keywords": [
     "files.com",

package/src/models/File.js

@@ -76,20 +76,20 @@ class File {
     return Api.sendRequest(`/files/${encodeURIComponent(firstFileUploadPart.path)}`, 'POST', params, options)
   }
 
-  static _determinePartUploadUri = fileUploadPart => {
-    return fileUploadPart.upload_uri
-  }
-
   /**
    * @note see File.copy() for list of supported params
    */
-  static uploadStream = async (destinationPath, readableStream, params, options) => {
+  static uploadStream = async (destinationPath, readableStream, params, optionsRaw) => {
+    const { determinePartUploadUri: determinePartUploadUriRaw, ...options } = optionsRaw || {}
+
     const firstFileUploadPart = await File._openUpload(destinationPath, params, options)
 
     if (!firstFileUploadPart) {
       return
     }
 
+    const determinePartUploadUri = determinePartUploadUriRaw || (fileUploadPart => fileUploadPart.upload_uri)
+
     try {
       const file = await new Promise((resolve, reject) => {
         let part = 0
@@ -120,7 +120,7 @@ class File {
               const buffer = Buffer.concat(chunks)
               const nextFileUploadPart = await File._continueUpload(destinationPath, ++part, firstFileUploadPart, options)
 
-              const upload_uri = this._determinePartUploadUri(nextFileUploadPart)
+              const upload_uri = determinePartUploadUri(nextFileUploadPart)
               const uploadPromise = Api.sendFilePart(upload_uri, 'PUT', buffer)
 
               if (firstFileUploadPart.parallel_parts) {
@@ -148,7 +148,7 @@ class File {
               const buffer = Buffer.concat(chunks)
               const nextFileUploadPart = await File._continueUpload(destinationPath, ++part, firstFileUploadPart, options)
 
-              const upload_uri = this._determinePartUploadUri(nextFileUploadPart)
+              const upload_uri = determinePartUploadUri(nextFileUploadPart)
               concurrentUploads.push(Api.sendFilePart(upload_uri, 'PUT', buffer))
             }