gd-sprest 8.4.4 → 8.4.6

package/@types/v2/drive.d.ts

@@ -29,5 +29,5 @@ export interface Idrive {
      * @param siteId - (Optional) The site id to target, current by default.
      * @param targetInfo - (Optional) The target information.
      */
-    (props?: { siteId?: string, targetInfo?: ITargetInfoProps }): IBaseExecution<drive>;
+    (props?: { siteId?: string, siteUrl?: string, targetInfo?: ITargetInfoProps }): IBaseExecution<drive>;
 }

package/@types/v2/drives.d.ts

@@ -28,7 +28,8 @@ export interface Idrives {
      * Get the libraries for a site.
      * @param id - (Optional) The drive id to target.
      * @param siteId - (Optional) The site id to target, current by default.
+     * @param siteUrl - (Optional) The site url to target, current by default.
      * @param targetInfo - (Optional) The target information.
      */
-    (props?: { driveId?: string, siteId?: string, targetInfo?: ITargetInfoProps }): IBaseExecution<driveCollection>;
+    (props?: { driveId?: string, siteId?: string, siteUrl?: string, targetInfo?: ITargetInfoProps }): IBaseExecution<driveCollection>;
 }

package/@types/v2/sites.d.ts

@@ -27,7 +27,7 @@ export const sites: Isites;
 export interface Isites {
     /**
      * Creates an instance of the site library.
-     * @param id - (Optional) The site id to target, current by default.
+     * @param siteId - (Optional) The site id to target, current by default.
      * @param targetInfo - (Optional) The target information.
      */
     (props?: { siteId?: string, targetInfo?: ITargetInfoProps }): siteMethods & sites;
@@ -35,6 +35,9 @@ export interface Isites {
     /** Returns the current web. */
     static getCurrentWeb(): IBaseExecution<sites> & siteMethods;
 
-    /** Returns a list from the current web. */
-    static getList(props: { siteId?: string, title: string }): IBaseExecution<list> & listMethods;
+    /** Returns a drive for a site. */
+    static getDrive(props: { siteId?: string, siteUrl?: string, libName?: string }): IBaseExecution<list> & listMethods;
+
+    /** Returns a list for a site. */
+    static getList(props: { siteId?: string, siteUrl?: string, listId?: string, listName?: string }): IBaseExecution<list> & listMethods;
 }

package/build/mapper/v2.js

@@ -128,6 +128,9 @@ exports.MapperV2 = {
         query: { argNames: ["oData"], requestType: utils_1.RequestType.OData },
     },
     list: {
+        properties: [
+            "items|listItems|([Name])|listItem"
+        ],
         activities: {
             requestType: utils_1.RequestType.Get
         },
@@ -211,6 +214,9 @@ exports.MapperV2 = {
         query: { argNames: ["oData"], requestType: utils_1.RequestType.OData },
     },
     lists: {
+        properties: [
+            "lists|lists|('[Name]')|list"
+        ],
         add: {
             args: ["values"],
             name: "",
@@ -267,6 +273,10 @@ exports.MapperV2 = {
         query: { argNames: ["oData"], requestType: utils_1.RequestType.OData },
     },
     sites: {
+        properties: [
+            "drives|drives|('[Name]')|drive", "items|listItems|([Name])|listItem",
+            "lists|lists|('[Name]')|list"
+        ],
         add: {
             args: ["values"],
             name: "",

package/build/rest.js

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

package/build/utils/request.js

@@ -43,18 +43,20 @@ exports.Request = {
                 // Update the object type
                 objType = resultsObjType;
             }
-            // Get the object type from the context
-            var metadataType = (obj["@odata.context"] || objType);
-            var values = metadataType.split("_api/v2.0/$metadata#");
-            if (values.length > 1) {
-                objType = values[1];
-            }
             else {
-                values = metadataType.split("/");
-                objType = values[values.length - 1].split("?")[0];
+                // Get the object type from the context
+                var metadataType = (obj["@odata.context"] || objType);
+                var values = metadataType.split("_api/v2.0/$metadata#");
+                if (values.length > 1) {
+                    objType = values[1];
+                }
+                else {
+                    values = metadataType.split("/");
+                    objType = values[values.length - 1].split("?")[0];
+                }
+                // Update the object type if it's a single instance
+                objType = objType.replace("s/$entity", "");
             }
-            // Update the object type if it's a single instance
-            objType = objType.replace("s/$entity", "");
             // Get the methods for this object type
             methods = mapper_1.MapperV2[objType];
             console.log("[gd-sprest] v2 response detected. Type is: " + objType, methods);
@@ -149,6 +151,7 @@ exports.Request = {
     },
     // Method to add properties to the base object
     addProperties: function (base, data) {
+        var isV2 = data["@odata.context"] ? true : false;
         // Parse the data properties
         for (var key in data) {
             var value = data[key];
@@ -162,6 +165,12 @@ exports.Request = {
                 base["etag"] = value["etag"];
                 continue;
             }
+            // See if this is the etag
+            if (key == "@odata.etag") {
+                // Set the etag value and continue
+                base["etag"] = value[key];
+                continue;
+            }
             // See if the base is a collection property
             if (value && value.__deferred && value.__deferred.uri) {
                 // Generate a method for the base property

package/build/v2/drive.js

@@ -1,23 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.drive = void 0;
-var contextInfo_1 = require("../lib/contextInfo");
 var utils_1 = require("../utils");
 /**
  * Drive
  * Returns the default library for a site.
  */
 exports.drive = (function (props) {
-    var _a;
     if (props === void 0) { props = {}; }
     var drive = new utils_1.Base(props.targetInfo);
     // Default the properties
     drive.targetInfo.defaultToWebFl = true;
     drive.targetInfo.requestType = utils_1.RequestType.GraphGet;
+    // See if the web url exists
+    if (props.siteUrl) {
+        // Set the settings
+        drive.targetInfo.url = props.siteUrl;
+    }
     // See if an endpoint is not defined
     if (drive.targetInfo.endpoint == undefined) {
         // Default the endpoint
-        drive.targetInfo.endpoint = "_api/v2.0/sites/" + (props.siteId || ((_a = contextInfo_1.ContextInfo === null || contextInfo_1.ContextInfo === void 0 ? void 0 : contextInfo_1.ContextInfo.siteId) === null || _a === void 0 ? void 0 : _a.replace(/[{}]/g, ''))) + "/drive";
+        drive.targetInfo.endpoint = "_api/v2.0/" + (props.siteId ? "sites/" + props.siteId.replace(/[{}]/g, '') : "") + "drive";
         // Add the methods
         utils_1.Request.addMethods(drive, { __metadata: { type: "@odata.context/_api/v2.0/$metadata#drive" } });
     }

package/build/v2/drives.js

@@ -1,23 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.drives = void 0;
-var contextInfo_1 = require("../lib/contextInfo");
 var utils_1 = require("../utils");
 /**
  * Drives
  * Returns the libraries for a site.
  */
 exports.drives = (function (props) {
-    var _a;
     if (props === void 0) { props = {}; }
     var drives = new utils_1.Base(props.targetInfo);
     // Default the properties
     drives.targetInfo.defaultToWebFl = true;
     drives.targetInfo.requestType = utils_1.RequestType.GraphGet;
+    // See if the web url exists
+    if (props.siteUrl) {
+        // Set the settings
+        drives.targetInfo.url = props.siteUrl;
+    }
     // See if an endpoint is not defined
     if (drives.targetInfo.endpoint == undefined) {
         // Default the endpoint
-        drives.targetInfo.endpoint = "_api/v2.0/sites/" + (props.siteId || ((_a = contextInfo_1.ContextInfo === null || contextInfo_1.ContextInfo === void 0 ? void 0 : contextInfo_1.ContextInfo.siteId) === null || _a === void 0 ? void 0 : _a.replace(/[{}]/g, ''))) + "/drives";
+        drives.targetInfo.endpoint = "_api/v2.0/" + (props.siteId ? "sites/" + props.siteId.replace(/[{}]/g, '') : "") + "drives";
         // See if the drive id was provided
         if (props.driveId) {
             // Append the id

package/build/v2/sites.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sites = void 0;
 var contextInfo_1 = require("../lib/contextInfo");
+var site_1 = require("../lib/site");
 var utils_1 = require("../utils");
 /**
  * Sites
@@ -22,5 +23,66 @@ exports.sites = (function (props) {
 });
 /** Returns the current web. */
 exports.sites.getCurrentWeb = function () { return exports.sites().sites(contextInfo_1.ContextInfo.webId.replace(/^\{|\}$/g, '')); };
-/** Returns a list by its title from the current web. */
-exports.sites.getList = function (props) { return exports.sites({ siteId: props.siteId }).lists(props.title); };
+/** Returns a drive */
+exports.sites.getDrive = (function (props) {
+    // Return a promise
+    return new Promise(function (resolve, reject) {
+        // Method to get the drive id
+        var getDriveId = function (siteId, libName) {
+            // Return a promise
+            return new Promise(function (resolve, reject) {
+                // Get the drives
+                exports.sites({ siteId: siteId }).drives().query({ Select: ["id", "name"] }).execute(function (drives) {
+                    // Parse the drives
+                    for (var i = 0; i < drives.results.length; i++) {
+                        var drive = drives.results[i];
+                        // See if this is the target library
+                        if (drive["name"] == libName) {
+                            // Resolve the request
+                            resolve(drive.id);
+                            return;
+                        }
+                    }
+                    // Not found
+                    reject();
+                }, reject);
+            });
+        };
+        // See if the site id exists
+        if (props.siteId) {
+            // Get the drive id
+            getDriveId(props.siteId, props.libName).then(function (driveId) {
+                // Resolve the request
+                resolve(exports.sites({ siteId: props.siteId }).drives(driveId));
+            }, reject);
+        }
+        else {
+            // Get the site
+            site_1.Site(props.siteUrl).query({ Select: ["Id"] }).execute(function (site) {
+                // Get the drive id
+                getDriveId(site.Id, props.libName).then(function (driveId) {
+                    // Resolve the request
+                    resolve(exports.sites({ siteId: site.Id }).drives(driveId));
+                }, reject);
+            }, reject);
+        }
+    });
+});
+/** Returns a list */
+exports.sites.getList = (function (props) {
+    // Return a promise
+    return new Promise(function (resolve, reject) {
+        // See if the site id exists
+        if (props.siteId) {
+            // Resolve the request
+            resolve(exports.sites({ siteId: props.siteId }).lists(props.listId || props.listName));
+        }
+        else {
+            // Get the site
+            site_1.Site(props.siteUrl).query({ Select: ["Id"] }).execute(function (site) {
+                // Resolve the request
+                resolve(exports.sites({ siteId: site.Id }).lists(props.listId || props.listName));
+            }, reject);
+        }
+    });
+});

package/dist/gd-sprest.d.ts

@@ -4468,7 +4468,7 @@ declare module 'gd-sprest/v2/drive' {
                 * @param siteId - (Optional) The site id to target, current by default.
                 * @param targetInfo - (Optional) The target information.
                 */
-            (props?: { siteId?: string, targetInfo?: ITargetInfoProps }): IBaseExecution<drive>;
+            (props?: { siteId?: string, siteUrl?: string, targetInfo?: ITargetInfoProps }): IBaseExecution<drive>;
     }
 }
 
@@ -4503,9 +4503,10 @@ declare module 'gd-sprest/v2/drives' {
                 * Get the libraries for a site.
                 * @param id - (Optional) The drive id to target.
                 * @param siteId - (Optional) The site id to target, current by default.
+                * @param siteUrl - (Optional) The site url to target, current by default.
                 * @param targetInfo - (Optional) The target information.
                 */
-            (props?: { driveId?: string, siteId?: string, targetInfo?: ITargetInfoProps }): IBaseExecution<driveCollection>;
+            (props?: { driveId?: string, siteId?: string, siteUrl?: string, targetInfo?: ITargetInfoProps }): IBaseExecution<driveCollection>;
     }
 }
 
@@ -4539,7 +4540,7 @@ declare module 'gd-sprest/v2/sites' {
     export interface Isites {
             /**
                 * Creates an instance of the site library.
-                * @param id - (Optional) The site id to target, current by default.
+                * @param siteId - (Optional) The site id to target, current by default.
                 * @param targetInfo - (Optional) The target information.
                 */
             (props?: { siteId?: string, targetInfo?: ITargetInfoProps }): siteMethods & sites;
@@ -4547,8 +4548,11 @@ declare module 'gd-sprest/v2/sites' {
             /** Returns the current web. */
             static getCurrentWeb(): IBaseExecution<sites> & siteMethods;
     
-            /** Returns a list from the current web. */
-            static getList(props: { siteId?: string, title: string }): IBaseExecution<list> & listMethods;
+            /** Returns a drive for a site. */
+            static getDrive(props: { siteId?: string, siteUrl?: string, libName?: string }): IBaseExecution<list> & listMethods;
+    
+            /** Returns a list for a site. */
+            static getList(props: { siteId?: string, siteUrl?: string, listId?: string, listName?: string }): IBaseExecution<list> & listMethods;
     }
 }