gd-sprest 8.7.9 → 8.8.1

package/@types/utils/batch.d.ts

@@ -9,4 +9,15 @@ export interface IBatchRequest {
     changesetId?: string;
     response?: IBase;
     targetInfo: ITargetInfo;
+}
+
+/**
+ * V2 Batch Request
+ */
+export interface IBatchRequestV2 {
+    body?: object | string;
+    headers?: { [key: string]: string };
+    id: string;
+    method: string;
+    url: string;
 }

package/build/rest.js

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

package/build/utils/batch.js

@@ -64,22 +64,30 @@ var Batch = /** @class */ (function () {
         return base;
     };
     // Method to generate a batch request
-    Batch.getTargetInfo = function (url, requests, requestDigest) {
+    Batch.getTargetInfo = function (url, requests, requestDigest, isV2) {
+        if (isV2 === void 0) { isV2 = false; }
         var batchId = "batch_" + lib_1.ContextInfo.generateGUID();
         var batchRequests = [];
-        // Create the batch request
-        batchRequests.push(Batch.createBatch(batchId, requests));
-        // End the batch request
-        batchRequests.push("--" + batchId + "--");
+        // See if this is v2
+        if (isV2) {
+            // Create the batch requests
+            batchRequests = Batch.createBatchV2(requests);
+        }
+        else {
+            // Create the batch requests
+            batchRequests.push(Batch.createBatch(batchId, requests));
+            // End the batch request
+            batchRequests.push("--" + batchId + "--");
+        }
         // Return the target information
         return new _1.TargetInfo({
             url: url,
-            endpoint: "$batch",
+            endpoint: (isV2 ? "_api/v2.0/" : "") + "$batch",
             method: "POST",
-            data: batchRequests.join("\r\n"),
+            data: isV2 ? { requests: batchRequests } : batchRequests.join("\r\n"),
             requestDigest: requestDigest,
             requestHeader: {
-                "Content-Type": 'multipart/mixed; boundary="' + batchId + '"'
+                "Content-Type": isV2 ? "application/json" : 'multipart/mixed; boundary="' + batchId + '"'
             }
         });
     };
@@ -136,6 +144,31 @@ var Batch = /** @class */ (function () {
         // Return the batch request
         return request.join("\r\n");
     };
+    // Method to generate a batch request
+    Batch.createBatchV2 = function (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"
+                };
+            }
+            // Add the batch request
+            batch.push(batchRequest);
+        }
+        // Return the batch requests
+        return batch;
+    };
     // Process the batch request callbacks
     Batch.processCallbacks = function (batchRequests) {
         if (batchRequests === void 0) { batchRequests = []; }

package/build/utils/request.js

@@ -429,7 +429,7 @@ exports.Request = {
                 // Return a promise
                 return new Promise(function (resolve) {
                     // Execute the request
-                    execute(batch_1.Batch.getTargetInfo(base.targetInfo.url, batchRequest, base.targetInfo.requestDigest), batchIdx_1++, function () {
+                    execute(batch_1.Batch.getTargetInfo(base.targetInfo.url, batchRequest, base.targetInfo.requestDigest, base.targetInfo.endpoint.indexOf("_api/v2") >= 0), batchIdx_1++, function () {
                         // Resolve the request
                         resolve(null);
                     });

package/build/v2/sites.js

@@ -186,7 +186,7 @@ exports.sites.getList = function (props) {
                     // Find the list
                     findList(info.siteId, info.webId, props.listName).then(function (listId) {
                         // Resolve the request
-                        resolve((0, exports.sites)({ siteId: info.siteId }).lists(listId));
+                        resolve((0, exports.sites)({ siteId: info.siteId, webId: info.webId }).lists(listId));
                     }, reject);
                 }
             }, reject);

package/dist/gd-sprest.d.ts

@@ -7174,13 +7174,24 @@ declare module 'gd-sprest/utils/batch' {
     import { ITargetInfo } from "gd-sprest/utils/targetInfo";
     
     /**
-      * Batch Request
-      */
+        * Batch Request
+        */
     export interface IBatchRequest {
-        callback?: any;
-        changesetId?: string;
-        response?: IBase;
-        targetInfo: ITargetInfo;
+            callback?: any;
+            changesetId?: string;
+            response?: IBase;
+            targetInfo: ITargetInfo;
+    }
+    
+    /**
+        * V2 Batch Request
+        */
+    export interface IBatchRequestV2 {
+            body?: object | string;
+            headers?: { [key: string]: string };
+            id: string;
+            method: string;
+            url: string;
     }
 }