gd-sprest 9.3.8 → 9.3.9

package/build/rest.js

@@ -9,7 +9,7 @@ var sptypes_1 = require("./sptypes");
  * SharePoint REST Library
  */
 exports.$REST = {
-    __ver: 9.38,
+    __ver: 9.39,
     AppContext: function (siteUrl) { return Lib.Site.getAppContext(siteUrl); },
     Apps: Lib.Apps,
     ContextInfo: Lib.ContextInfo,

package/build/utils/batch.js

@@ -71,23 +71,23 @@ var Batch = /** @class */ (function () {
         // See if this is v2
         if (isV2) {
             // Create the batch requests
-            batchRequests = Batch.createBatchV2(requests);
+            batchRequests.push(Batch.createBatchV2(batchId, requests));
         }
         else {
             // Create the batch requests
             batchRequests.push(Batch.createBatch(batchId, requests));
-            // End the batch request
-            batchRequests.push("--" + batchId + "--");
         }
+        // End the batch request
+        batchRequests.push("--" + batchId + "--");
         // Return the target information
         return new _1.TargetInfo({
             url: url,
             endpoint: (isV2 ? "_api/v2.0/" : "") + "$batch",
             method: "POST",
-            data: isV2 ? { requests: batchRequests } : batchRequests.join("\r\n"),
+            data: batchRequests.join("\r\n"),
             requestDigest: requestDigest,
             requestHeader: {
-                "Content-Type": isV2 ? "application/json" : 'multipart/mixed; boundary="' + batchId + '"'
+                "Content-Type": 'multipart/mixed; boundary="' + batchId + '"'
             }
         });
     };
@@ -145,29 +145,49 @@ var Batch = /** @class */ (function () {
         return request.join("\r\n");
     };
     // Method to generate a batch request
-    Batch.createBatchV2 = function (requests) {
+    Batch.createBatchV2 = function (batchId, requests) {
         var batch = [];
         // Parse the requests
         for (var i = 0; i < requests.length; i++) {
             var request = requests[i];
             // Create the batch request
-            var batchRequest = {
-                id: (i + 1).toString(),
-                method: request.targetInfo.requestMethod,
-                url: request.targetInfo.requestUrl
-            };
-            // See if a body is set
-            if (request.targetInfo.requestData) {
-                batchRequest.body = request.targetInfo.requestData;
-                batchRequest.headers = {
-                    "Content-Type": "application/json"
-                };
+            batch.push("--" + batchId);
+            // Determine if the batch requires a change set
+            var requiresChangeset = request && request.targetInfo.requestMethod != "GET";
+            if (requiresChangeset) {
+                // Create a change set
+                batch.push("Content-Type: multipart/mixed; boundary=" + request.changesetId);
+                batch.push("");
+                batch.push("--" + request.changesetId);
+                batch.push("Content-Type: application/http");
+                batch.push("Content-Transfer-Encoding: binary");
+                batch.push("");
+                batch.push(request.targetInfo.requestMethod + " " + request.targetInfo.requestUrl + " HTTP/1.1");
+                batch.push("Content-Type: application/json;odata=verbose");
+                // See if we are making a delete/update
+                if (request.targetInfo.requestMethod == "DELETE" || request.targetInfo.requestMethod == "MERGE") {
+                    // Append the header for deleting/updating
+                    batch.push("IF-MATCH: *");
+                }
+                batch.push("");
+                request.targetInfo.requestData ? batch.push(request.targetInfo.requestData) : null;
+                batch.push("");
+                batch.push("--" + request.changesetId + "--");
+            }
+            else {
+                // Create a change set
+                batch.push("Content-Type: application/http");
+                batch.push("Content-Transfer-Encoding: binary");
+                batch.push("");
+                batch.push("GET " + request.targetInfo.requestUrl + " HTTP/1.1");
+                batch.push("Accept: application/json");
+                batch.push("");
+                request.targetInfo.requestData ? batch.push(request.targetInfo.requestData) : null;
+                batch.push("");
             }
-            // Add the batch request
-            batch.push(batchRequest);
         }
-        // Return the batch requests
-        return batch;
+        // Return the batch request
+        return batch.join("\r\n");
     };
     // Process the batch request callbacks
     Batch.processCallbacks = function (batchRequests) {