gd-sprest 9.7.2 → 9.7.4

package/build/utils/request.js

@@ -1,41 +1,27 @@
-"use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Request = void 0;
-var base_1 = require("./base");
-var batch_1 = require("./batch");
-var lib_1 = require("../lib");
-var executor_1 = require("../helper/executor");
-var helper_1 = require("./helper");
-var mapper_1 = require("../mapper");
-var requestType_1 = require("./requestType");
-var targetInfo_1 = require("./targetInfo");
-var xhrRequest_1 = require("./xhrRequest");
+import { Base } from "./base";
+import { Batch } from "./batch";
+import { ContextInfo, Graph } from "../lib";
+import { Executor } from "../helper/executor";
+import { Helper } from "./helper";
+import { Mapper, MapperV2, Mapper_Custom } from "../mapper";
+import { RequestType } from "./requestType";
+import { TargetInfo } from "./targetInfo";
+import { XHRRequest } from "./xhrRequest";
 /**
  * Request
  */
-exports.Request = {
+export const Request = {
     // Method to add the methods to base object
-    addMethods: function (base, data, resultsObjType) {
+    addMethods: (base, data, resultsObjType) => {
         var _a, _b;
-        var obj = base;
-        var isCollection = data.results && data.results.length > 0;
-        var methods = null;
+        let obj = base;
+        let isCollection = data.results && data.results.length > 0;
+        let methods = null;
         // Determine the metadata
-        var metadata = isCollection ? data.results[0].__metadata : data.__metadata;
+        let metadata = isCollection ? data.results[0].__metadata : data.__metadata;
         // Get the object type
-        var objType = metadata && metadata.type ? metadata.type : obj.targetInfo.endpoint;
-        var isV2 = ((_b = (_a = obj === null || obj === void 0 ? void 0 : obj.parent) === null || _a === void 0 ? void 0 : _a.targetInfo) === null || _b === void 0 ? void 0 : _b.endpoint.startsWith("_api/v2.0/")) ||
+        let objType = metadata && metadata.type ? metadata.type : obj.targetInfo.endpoint;
+        let isV2 = ((_b = (_a = obj === null || obj === void 0 ? void 0 : obj.parent) === null || _a === void 0 ? void 0 : _a.targetInfo) === null || _b === void 0 ? void 0 : _b.endpoint.startsWith("_api/v2.0/")) ||
             obj["@odata.context"] || objType.startsWith("@odata.context") ? true : false;
         if (isV2) {
             // See if we are overriding the object type
@@ -45,8 +31,8 @@ exports.Request = {
             }
             else {
                 // Get the object type from the context
-                var metadataType = (obj["@odata.context"] || objType);
-                var values = metadataType.split("_api/v2.0/$metadata#");
+                let metadataType = (obj["@odata.context"] || objType);
+                let values = metadataType.split("_api/v2.0/$metadata#");
                 if (values.length > 1) {
                     objType = values[1];
                 }
@@ -58,12 +44,12 @@ exports.Request = {
                 objType = objType.replace("s/$entity", "");
             }
             // Get the methods for this object type
-            methods = mapper_1.MapperV2[objType];
+            methods = MapperV2[objType];
         }
         // Else, get the methods from the default mapper, otherwise get it from the custom mapper
-        else if ((methods = mapper_1.Mapper[objType + (isCollection ? ".Collection" : "")]) == null) {
+        else if ((methods = Mapper[objType + (isCollection ? ".Collection" : "")]) == null) {
             // Determine the object type
-            var values = objType.split('/');
+            let values = objType.split('/');
             objType = values[values.length - 1];
             values = objType.split('.');
             objType = (values[values.length - 1]).toLowerCase();
@@ -98,25 +84,24 @@ exports.Request = {
                 objType = "tenantapps";
             }
             // Get the methods for the base object
-            methods = mapper_1.Mapper_Custom[objType];
+            methods = Mapper_Custom[objType];
         }
         // Ensure methods exist
         if (methods) {
             // Parse the methods
-            for (var methodName in methods) {
+            for (let methodName in methods) {
                 // Get the method information
-                var methodInfo = methods[methodName] ? methods[methodName] : {};
+                let methodInfo = methods[methodName] ? methods[methodName] : {};
                 // See if the base is the "Properties" definition for the object
                 if (methodName == "properties") {
                     // Parse the properties
-                    for (var _i = 0, methodInfo_1 = methodInfo; _i < methodInfo_1.length; _i++) {
-                        var property = methodInfo_1[_i];
-                        var propInfo = property.split("|");
+                    for (let property of methodInfo) {
+                        let propInfo = property.split("|");
                         // Get the metadata type
-                        var propName = propInfo[0];
-                        var propType = propInfo.length > 1 ? propInfo[1] : null;
-                        var subPropName = propInfo.length > 2 ? propInfo[2] : null;
-                        var subPropType = propInfo.length > 3 ? propInfo[3] : null;
+                        let propName = propInfo[0];
+                        let propType = propInfo.length > 1 ? propInfo[1] : null;
+                        let subPropName = propInfo.length > 2 ? propInfo[2] : null;
+                        let subPropType = propInfo.length > 3 ? propInfo[3] : null;
                         // See if the property is null or is a collection
                         if (obj[propName] == null || (obj[propName].__deferred && obj[propName].__deferred.uri)) {
                             // See if the base property has a sub-property defined for it
@@ -149,10 +134,10 @@ exports.Request = {
         }
     },
     // Method to add properties to the base object
-    addProperties: function (base, data) {
+    addProperties: (base, data) => {
         // Parse the data properties
         for (var key in data) {
-            var value = data[key];
+            let value = data[key];
             // Skip the results
             if (key == "results") {
                 continue;
@@ -196,7 +181,7 @@ exports.Request = {
                     // Ensure the collection is an object
                     if (base[key].results.length == 0 || typeof (base[key].results[0]) === "object") {
                         // Create the base property as a new request
-                        var objCollection = new base_1.Base(base.targetInfo);
+                        let objCollection = new Base(base.targetInfo);
                         objCollection["results"] = base[key].results;
                         // See no results exist
                         if (objCollection["results"].length == 0) {
@@ -206,11 +191,11 @@ exports.Request = {
                         // Update the endpoint for the base request to point to the base property
                         objCollection.targetInfo.endpoint = (objCollection.targetInfo.endpoint.split("?")[0] + "/" + key).replace(/\//g, "/");
                         // Add the methods
-                        exports.Request.addMethods(objCollection, objCollection);
+                        Request.addMethods(objCollection, objCollection);
                         // Update the data collection
-                        helper_1.Helper.updateDataCollection(base, objCollection["results"]);
+                        Helper.updateDataCollection(base, objCollection["results"]);
                         // Update the expanded properties
-                        helper_1.Helper.updateExpandedProperties(base);
+                        Helper.updateExpandedProperties(base);
                         // Update the property
                         base[key] = objCollection;
                     }
@@ -226,13 +211,13 @@ exports.Request = {
         }
     },
     // Method to execute the request
-    execute: function (base, args) {
-        var reject = null;
-        var resolve = null;
-        var waitFl = false;
+    execute: (base, args) => {
+        let reject = null;
+        let resolve = null;
+        let waitFl = false;
         // Parse the arguments
-        for (var i = 0; i < args.length; i++) {
-            var arg = args[i];
+        for (let i = 0; i < args.length; i++) {
+            let arg = args[i];
             // Check the type
             switch (typeof (arg)) {
                 case "boolean":
@@ -265,9 +250,9 @@ exports.Request = {
         // See if we are waiting for the responses to complete
         if (waitFl) {
             // Wait for the responses to execute
-            exports.Request.waitForRequestsToComplete(base, function () {
+            Request.waitForRequestsToComplete(base, () => {
                 // Execute this request
-                exports.Request.executeRequest(base, true, function (response, errorFl) {
+                Request.executeRequest(base, true, (response, errorFl) => {
                     // See if there was an error
                     if (errorFl) {
                         // Set the wait flag
@@ -278,11 +263,11 @@ exports.Request = {
                     // Else, see if there is a resolve method
                     else if (resolve) {
                         // Execute the callback and see if it returns a promise
-                        var returnVal = resolve(response);
-                        var waitFunc = returnVal ? returnVal.done || returnVal.then : null;
+                        let returnVal = resolve(response);
+                        let waitFunc = returnVal ? returnVal.done || returnVal.then : null;
                         if (waitFunc && typeof (waitFunc) === "function") {
                             // Wait for the promise to complete
-                            waitFunc(function () {
+                            waitFunc(() => {
                                 // Set the wait flag
                                 base.base.waitFlags[base.responseIndex] = true;
                                 // Set the base to this object, and clear requests
@@ -315,7 +300,7 @@ exports.Request = {
         }
         else {
             // Execute this request
-            exports.Request.executeRequest(base, true, function (response, errorFl) {
+            Request.executeRequest(base, true, (response, errorFl) => {
                 // See if there was an error
                 if (errorFl) {
                     // Set the wait flag
@@ -325,10 +310,10 @@ exports.Request = {
                 }
                 else {
                     // Execute the resolve and see if it returns a promise
-                    var returnVal = resolve ? resolve(response) : null;
+                    let returnVal = resolve ? resolve(response) : null;
                     if (returnVal && typeof (returnVal.done) === "function") {
                         // Wait for the promise to complete
-                        returnVal.done(function () {
+                        returnVal.done(() => {
                             // Set the wait flag
                             base.base.waitFlags[base.responseIndex] = true;
                         });
@@ -341,7 +326,7 @@ exports.Request = {
             });
         }
         // See if this is a query request
-        if (base.targetInfo.requestType == requestType_1.RequestType.OData) {
+        if (base.targetInfo.requestType == RequestType.OData) {
             // Return the parent for chaining purposes
             return base.parent;
         }
@@ -349,9 +334,9 @@ exports.Request = {
         return base;
     },
     // Method to execute the request
-    executeRequest: function (base, asyncFl, callback) {
+    executeRequest: (base, asyncFl, callback) => {
         // Execution method
-        var execute = function (targetInfo, batchIdx, onComplete) {
+        let execute = (targetInfo, batchIdx, onComplete) => {
             // See if this is an asynchronous request
             if (asyncFl) {
                 // See if this is not a batch request, and it already exists
@@ -361,19 +346,19 @@ exports.Request = {
                 }
                 else {
                     // Create the request
-                    base.xhr = new xhrRequest_1.XHRRequest(asyncFl, targetInfo, function () {
+                    base.xhr = new XHRRequest(asyncFl, targetInfo, () => {
                         // Update the response and status
                         base.response = base.xhr.response;
                         base.status = base.xhr.status;
-                        var errorFl = !(base.status >= 200 && base.status < 300);
+                        let errorFl = !(base.status >= 200 && base.status < 300);
                         // See if we are returning a file buffer
-                        if (base.requestType == requestType_1.RequestType.GetBuffer) {
+                        if (base.requestType == RequestType.GetBuffer) {
                             // Execute the callback
                             callback ? callback(base.response, errorFl) : null;
                         }
                         else {
                             // Update the data object
-                            exports.Request.updateDataObject(base, isBatchRequest, batchIdx);
+                            Request.updateDataObject(base, isBatchRequest, batchIdx);
                             // Ensure this isn't a batch request
                             if (!isBatchRequest) {
                                 // See if this is an xml response
@@ -383,14 +368,14 @@ exports.Request = {
                                 }
                                 else {
                                     // Validate the data collection
-                                    exports.Request.validateDataCollectionResults(base).then(
+                                    Request.validateDataCollectionResults(base).then(
                                     // Success
-                                    function () {
+                                    () => {
                                         // Execute the callback
                                         callback ? callback(base, errorFl) : null;
                                     }, 
                                     // Error
-                                    function () {
+                                    () => {
                                         // Execute the callback and set the error flag
                                         callback ? callback(base, true) : null;
                                     });
@@ -409,17 +394,17 @@ exports.Request = {
             // Else, we haven't executed this request
             else {
                 // Create the request
-                base.xhr = new xhrRequest_1.XHRRequest(asyncFl, targetInfo);
+                base.xhr = new XHRRequest(asyncFl, targetInfo);
                 // Update the response and status
                 base.response = base.xhr.response;
                 base.status = base.xhr.status;
                 // See if we are returning a file buffer
-                if (base.requestType == requestType_1.RequestType.GetBuffer) {
+                if (base.requestType == RequestType.GetBuffer) {
                     // Return the response
                     return base.response;
                 }
                 // Update the base object
-                exports.Request.updateDataObject(base, isBatchRequest, batchIdx);
+                Request.updateDataObject(base, isBatchRequest, batchIdx);
                 // See if the base is a collection and has more results
                 if (base["@odata.nextLink"] || (base["d"] && base["d"].__next)) {
                     // Add the "next" method to get the next set of results
@@ -432,25 +417,25 @@ exports.Request = {
             }
         };
         // See if this is a batch request
-        var isBatchRequest = base.base && base.base.batchRequests && base.base.batchRequests.length > 0;
+        let isBatchRequest = base.base && base.base.batchRequests && base.base.batchRequests.length > 0;
         if (isBatchRequest) {
-            var batchIdx_1 = 0;
-            var root_1 = helper_1.Helper.getRootParent(base);
+            let batchIdx = 0;
+            let root = Helper.getRootParent(base);
             // Parse the requests
-            (0, executor_1.Executor)(base.base.batchRequests, function (batchRequest) {
+            Executor(base.base.batchRequests, batchRequest => {
                 // Do nothing if the stop flag is set
-                if (root_1.stopFl) {
+                if (root.stopFl) {
                     return;
                 }
                 // Return a promise
-                return new Promise(function (resolve) {
+                return new Promise(resolve => {
                     // Execute the request
-                    execute(batch_1.Batch.getTargetInfo(base.targetInfo.url, batchRequest, base.targetInfo.requestDigest, base.targetInfo.requestHeader, base.targetInfo.endpoint.indexOf("_api/v2") >= 0), batchIdx_1++, function () {
+                    execute(Batch.getTargetInfo(base.targetInfo.url, batchRequest, base.targetInfo.requestDigest, base.targetInfo.requestHeader, base.targetInfo.endpoint.indexOf("_api/v2") >= 0), batchIdx++, () => {
                         // Resolve the request
                         resolve(null);
                     });
                 });
-            }).then(function () {
+            }).then(() => {
                 // Execute the callback if it exists
                 callback ? callback(base.base.batchRequests, false) : null;
                 // Clear the batch requests
@@ -459,19 +444,18 @@ exports.Request = {
         }
         else {
             // Execute the request
-            return execute(new targetInfo_1.TargetInfo(base.targetInfo));
+            return execute(new TargetInfo(base.targetInfo));
         }
     },
     // Method to parse the xml
-    parseXML: function (xml, objData) {
-        if (objData === void 0) { objData = {}; }
-        var results = null;
+    parseXML: (xml, objData = {}) => {
+        let results = null;
         // See if the element has children
         if (xml.hasChildNodes()) {
             // Parse the child nodes
-            for (var i = 0; i < xml.childNodes.length; i++) {
-                var childNode = xml.childNodes[i];
-                var childPropName = childNode.nodeName.replace("d:", "");
+            for (let i = 0; i < xml.childNodes.length; i++) {
+                let childNode = xml.childNodes[i];
+                let childPropName = childNode.nodeName.replace("d:", "");
                 // See if this is a text element
                 if (childPropName == "#text") {
                     // Return the value
@@ -482,13 +466,13 @@ exports.Request = {
                     // Ensure the results exist
                     results = results || [];
                     // Append the object
-                    results.push(exports.Request.parseXML(childNode));
+                    results.push(Request.parseXML(childNode));
                 }
                 else {
                     // Read the value properties
-                    var childType = childNode.getAttribute("m:type");
+                    let childType = childNode.getAttribute("m:type");
                     // Get the value
-                    var value = exports.Request.parseXML(childNode);
+                    let value = Request.parseXML(childNode);
                     if (value) {
                         // Update the value based on the type
                         switch (childType) {
@@ -519,29 +503,27 @@ exports.Request = {
             return xml.nodeValue;
         }
         // Return the collection if it exists, otherwise the object
-        return results ? { results: results } : objData;
+        return results ? { results } : objData;
     },
     // Method to convert the input arguments into an object
-    updateDataObject: function (base, isBatchRequest, batchIdx) {
+    updateDataObject: (base, isBatchRequest = false, batchIdx = 0) => {
         var _a;
-        if (isBatchRequest === void 0) { isBatchRequest = false; }
-        if (batchIdx === void 0) { batchIdx = 0; }
         // Ensure the request was successful
         if ((base.status >= 200 && base.status < 300) || (isBatchRequest && base.status == 422)) {
             // Return if we are expecting a buffer
-            if (base.requestType == requestType_1.RequestType.GetBuffer) {
+            if (base.requestType == RequestType.GetBuffer) {
                 return;
             }
             // Parse the responses
-            var batchRequestIdx = 0;
-            var responses = isBatchRequest ? base.response.split("\n") : [base.response];
-            for (var i = 0; i < responses.length; i++) {
-                var data = null;
+            let batchRequestIdx = 0;
+            let responses = isBatchRequest ? base.response.split("\n") : [base.response];
+            for (let i = 0; i < responses.length; i++) {
+                let data = null;
                 // Set the response
-                var response = responses[i];
+                let response = responses[i];
                 response = response === "" && !isBatchRequest ? "{}" : response;
                 // Set the xml flag
-                var isXML = response.indexOf("<?xml") == 0;
+                let isXML = response.indexOf("<?xml") == 0;
                 if (isXML) {
                     // Append the response while data exists
                     while (responses[i + 1] && responses[i + 1].indexOf("--batchresponse") != 0) {
@@ -557,48 +539,48 @@ exports.Request = {
                     continue;
                 }
                 // Set the object based on the request type
-                var obj = isBatchRequest ? Object.create(base) : base;
+                let obj = isBatchRequest ? Object.create(base) : base;
                 // Set the exists flag
                 obj["existsFl"] = typeof (obj["Exists"]) === "boolean" ? obj["Exists"] : data.error == null;
                 // See if this is xml
                 if (isXML) {
-                    var objData = {};
+                    let objData = {};
                     // Convert the xml to an object
-                    var parser = new DOMParser();
-                    var xmlDoc = parser.parseFromString(data, "application/xml").firstChild;
-                    objData[xmlDoc.nodeName.replace("d:", "")] = exports.Request.parseXML(xmlDoc);
+                    let parser = new DOMParser();
+                    let xmlDoc = parser.parseFromString(data, "application/xml").firstChild;
+                    objData[xmlDoc.nodeName.replace("d:", "")] = Request.parseXML(xmlDoc);
                     // See if this is a REST request
                     if (objData.entry && objData.entry.content && objData.entry.content["m:properties"]) {
                         // Set the object to the properties
                         objData = objData.entry.content["m:properties"];
                         // Update the metadata
-                        helper_1.Helper.updateMetadata(obj, objData);
+                        Helper.updateMetadata(obj, objData);
                         // Update the base object's properties
-                        exports.Request.addProperties(obj, objData);
+                        Request.addProperties(obj, objData);
                         // Add the methods
-                        exports.Request.addMethods(obj, objData, objData["@odata.context"]);
+                        Request.addMethods(obj, objData, objData["@odata.context"]);
                         // See if we are not bypassing the processing of the response
                         if (base.targetInfo.disableProcessing != true) {
                             // Update the data collection
-                            helper_1.Helper.updateDataCollection(obj, objData["results"]);
+                            Helper.updateDataCollection(obj, objData["results"]);
                             // Update the expanded properties
-                            helper_1.Helper.updateExpandedProperties(obj);
+                            Helper.updateExpandedProperties(obj);
                         }
                         // Update the search results
-                        helper_1.Helper.updateSearchResults(obj);
+                        Helper.updateSearchResults(obj);
                     }
                     else {
                         // Update the object
-                        obj = __assign(__assign({}, obj), objData);
+                        obj = Object.assign(Object.assign({}, obj), objData);
                         // Update the search results
-                        helper_1.Helper.updateSearchResults(obj);
+                        Helper.updateSearchResults(obj);
                     }
                 }
                 // Else, see if the data properties exists
                 else if (data.d) {
                     // Get the endpoint method to see if it's part of the response
-                    var endpointInfo = ((_a = base.targetInfo.endpoint) === null || _a === void 0 ? void 0 : _a.split('/')) || "";
-                    var endpointMethod = endpointInfo ? endpointInfo[endpointInfo.length - 1] || "" : "";
+                    let endpointInfo = ((_a = base.targetInfo.endpoint) === null || _a === void 0 ? void 0 : _a.split('/')) || "";
+                    let endpointMethod = endpointInfo ? endpointInfo[endpointInfo.length - 1] || "" : "";
                     endpointMethod = endpointMethod ? endpointMethod[0].toUpperCase() + endpointMethod.substring(1) : "";
                     if (endpointMethod && data.d[endpointMethod]) {
                         // Update the response to be that object
@@ -607,50 +589,50 @@ exports.Request = {
                     // Save a reference to it
                     obj["d"] = data.d;
                     // Update the metadata
-                    helper_1.Helper.updateMetadata(obj, data.d);
+                    Helper.updateMetadata(obj, data.d);
                     // Update the base object's properties
-                    exports.Request.addProperties(obj, data.d);
+                    Request.addProperties(obj, data.d);
                     // Add the methods
-                    exports.Request.addMethods(obj, data.d, data["@odata.context"]);
+                    Request.addMethods(obj, data.d, data["@odata.context"]);
                     // See if we are not bypassing the processing of the response
                     if (base.targetInfo.disableProcessing != true) {
                         // Update the data collection
-                        helper_1.Helper.updateDataCollection(obj, data.d.results);
+                        Helper.updateDataCollection(obj, data.d.results);
                         // Update the expanded properties
-                        helper_1.Helper.updateExpandedProperties(obj);
+                        Helper.updateExpandedProperties(obj);
                     }
                     // Update the search results
-                    helper_1.Helper.updateSearchResults(obj);
+                    Helper.updateSearchResults(obj);
                 }
                 // Else, see if this is a graph request
                 else if (data["@odata.context"] || data["odata.type"] || data["odata.metadata"]) {
                     // Save a reference to it
                     obj["d"] = data;
                     // Update the base object's properties
-                    exports.Request.addProperties(obj, data);
+                    Request.addProperties(obj, data);
                     // Add the methods
-                    exports.Request.addMethods(obj, data, data["@odata.context"] || data["odata.type"] || data["odata.metadata"]);
+                    Request.addMethods(obj, data, data["@odata.context"] || data["odata.type"] || data["odata.metadata"]);
                     // See if we are not bypassing the processing of the response
                     if (base.targetInfo.disableProcessing != true) {
                         // Update the data collection
-                        helper_1.Helper.updateDataCollection(obj, data.value);
+                        Helper.updateDataCollection(obj, data.value);
                         // Update the expanded properties
-                        helper_1.Helper.updateExpandedProperties(obj);
+                        Helper.updateExpandedProperties(obj);
                     }
                 }
                 else {
                     // Update the base object's properties
-                    exports.Request.addProperties(obj, data);
+                    Request.addProperties(obj, data);
                     // See if the response is an array
                     if (typeof (data) === "object" && typeof (data.length) === "number" && typeof (data.push) === "function") {
                         // Update the data collection
-                        helper_1.Helper.updateDataCollection(obj, data);
+                        Helper.updateDataCollection(obj, data);
                     }
                 }
                 // See if the batch request exists
                 if (isBatchRequest) {
                     // Get the batch request
-                    var batchRequest = base.base.batchRequests[batchIdx][batchRequestIdx++];
+                    let batchRequest = base.base.batchRequests[batchIdx][batchRequestIdx++];
                     if (batchRequest == null) {
                         // Update the batch indexes
                         batchIdx++;
@@ -658,7 +640,7 @@ exports.Request = {
                         // Ensure the requests exist
                         if (base.base.batchRequests[batchIdx]) {
                             // Update the batch request
-                            var batch = base.base.batchRequests[batchIdx];
+                            let batch = base.base.batchRequests[batchIdx];
                             batchRequest = batch ? batch[batchRequestIdx++] : null;
                         }
                         else {
@@ -675,21 +657,21 @@ exports.Request = {
             // See if this was a batch request
             if (isBatchRequest) {
                 // Process the callbacks
-                batch_1.Batch.processCallbacks(base.base.batchRequests[batchIdx]);
+                Batch.processCallbacks(base.base.batchRequests[batchIdx]);
             }
         }
     },
     // Method to validate the data collection results
-    validateDataCollectionResults: function (base) {
+    validateDataCollectionResults: (base) => {
         // Return a promise
-        return new Promise(function (resolve, reject) {
+        return new Promise((resolve, reject) => {
             // Method to validate the request
-            var request = function (xhr, resolve) {
+            let request = (xhr, resolve) => {
                 var _a;
                 // Validate the response
                 if (xhr && xhr.status < 400 && typeof (xhr.response) === "string" && xhr.response.length > 0) {
                     // Try to convert the response and ensure the data property exists
-                    var data = null;
+                    let data = null;
                     try {
                         data = JSON.parse(xhr.response);
                     }
@@ -708,26 +690,26 @@ exports.Request = {
                     // See if there are more items to get
                     if (base.nextFl) {
                         // Get the root base object
-                        var root = helper_1.Helper.getRootParent(base);
+                        let root = Helper.getRootParent(base);
                         // See if we are getting all items in the base request
                         if (base.getAllItemsFl && root.stopFl != true) {
                             // Create the target information to query the next set of results
-                            var targetInfo = Object.create(base.targetInfo);
-                            targetInfo.accessToken = base.targetInfo.accessToken || (base.xhr.isGraph ? lib_1.Graph.Token : null);
+                            let targetInfo = Object.create(base.targetInfo);
+                            targetInfo.accessToken = base.targetInfo.accessToken || (base.xhr.isGraph ? Graph.Token : null);
                             targetInfo.endpoint = "";
                             targetInfo.url = data["@odata.nextLink"] || data.d.__next;
                             // Create a new object
-                            new xhrRequest_1.XHRRequest(true, new targetInfo_1.TargetInfo(targetInfo), function (xhr) {
+                            new XHRRequest(true, new TargetInfo(targetInfo), (xhr) => {
                                 var _a, _b;
                                 // Convert the response and see if values were returned
-                                var data = JSON.parse(xhr.response);
+                                let data = JSON.parse(xhr.response);
                                 if (data.d || data.value) {
                                     // See if we are not bypassing the processing of the response
                                     if (base.targetInfo.disableProcessing != true) {
                                         // Update the data collection
-                                        helper_1.Helper.updateDataCollection(base, ((_a = data.d) === null || _a === void 0 ? void 0 : _a.results) || data.value);
+                                        Helper.updateDataCollection(base, ((_a = data.d) === null || _a === void 0 ? void 0 : _a.results) || data.value);
                                         // Update the expanded properties
-                                        helper_1.Helper.updateExpandedProperties(base);
+                                        Helper.updateExpandedProperties(base);
                                     }
                                     // Append the raw data results
                                     if ((_b = base["d"]) === null || _b === void 0 ? void 0 : _b.results) {
@@ -767,15 +749,15 @@ exports.Request = {
         });
     },
     // Method to wait for the parent requests to complete
-    waitForRequestsToComplete: function (base, callback, requestIdx) {
+    waitForRequestsToComplete: (base, callback, requestIdx) => {
         // Ensure a callback exists and is a function
         if (typeof (callback) === "function") {
             // Loop until the requests have completed
-            var intervalId_1 = lib_1.ContextInfo.window.setInterval(function () {
-                var counter = 0;
+            let intervalId = ContextInfo.window.setInterval(() => {
+                let counter = 0;
                 // Parse the responses to the requests
-                for (var i = 0; i < base.base.responses.length; i++) {
-                    var response = base.base.responses[i];
+                for (let i = 0; i < base.base.responses.length; i++) {
+                    let response = base.base.responses[i];
                     // See if we are waiting until a specified index
                     if (requestIdx == counter++) {
                         break;
@@ -790,7 +772,7 @@ exports.Request = {
                     }
                 }
                 // Clear the interval
-                lib_1.ContextInfo.window.clearInterval(intervalId_1);
+                ContextInfo.window.clearInterval(intervalId);
                 // Execute the callback
                 callback();
             }, 10);