gd-sprest 8.6.0 → 8.6.2

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

@@ -57,6 +57,9 @@ export interface Isites {
      */
     (props?: { siteId?: string, webId?: string, targetInfo?: ITargetInfoProps }): IBaseQuery<site> & siteMethods;
 
+    /** Returns the current site. */
+    static getCurrentSite(): IBaseQuery<site> & siteMethods;
+
     /** Returns the current web. */
     static getCurrentWeb(): IBaseQuery<site> & siteMethods;
 

package/build/rest.js

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

package/build/utils/oData.js

@@ -70,6 +70,7 @@ var OData = /** @class */ (function () {
             this._top ? values.push("$top=" + this._top) : null;
             this._skip ? values.push("$skip=" + this._skip) : null;
             this._filter ? values.push("$filter=" + this._filter) : null;
+            this._search ? values.push("$search=" + this._search) : null;
             values.push(this.getQSValue("$expand", this._expand));
             this._custom ? values.push(this._custom) : null;
             // Parse the values

package/build/v2/sites.js

@@ -11,27 +11,42 @@ var common_1 = require("./common");
  * The sites graph endpoint.
  */
 exports.sites = (function (props) {
-    var _a;
     if (props === void 0) { props = {}; }
     var sites = new utils_1.Base(props.targetInfo);
     // Call the init event
     common_1.init();
     // Default the properties
     sites.targetInfo.defaultToWebFl = true;
-    sites.targetInfo.endpoint = "_api/v2.1/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, '')));
+    sites.targetInfo.endpoint = "_api/v2.1/sites" + (props.siteId ? "/" + props.siteId : "");
     sites.targetInfo.requestType = utils_1.RequestType.GraphGet;
-    // See if the web id is provided
-    if (props.webId) {
-        // Append the web id
-        sites.targetInfo.endpoint += "," + props.webId;
+    // See if the site id was provided
+    if (props.siteId) {
+        // Append the site id
+        sites.targetInfo.endpoint += "/" + props.siteId;
+        // See if the web id is provided
+        if (props.webId) {
+            // Append the web id
+            sites.targetInfo.endpoint += "," + props.webId;
+        }
     }
     // Add the methods
     utils_1.Request.addMethods(sites, { __metadata: { type: "@odata.context/_api/v2.1/$metadata#sites" } });
     // Return the sites
     return sites;
 });
+/** Returns the current site. */
+exports.sites.getCurrentSite = function () {
+    return exports.sites({
+        siteId: contextInfo_1.ContextInfo.siteId
+    });
+};
 /** Returns the current web. */
-exports.sites.getCurrentWeb = function () { return exports.sites().sites(contextInfo_1.ContextInfo.webId.replace(/^\{|\}$/g, '')); };
+exports.sites.getCurrentWeb = function () {
+    return exports.sites({
+        siteId: contextInfo_1.ContextInfo.siteId,
+        webId: contextInfo_1.ContextInfo.webId
+    });
+};
 /** Returns a drive */
 exports.sites.getDrive = function (props) {
     // Return a promise

package/dist/gd-sprest.d.ts

@@ -4570,6 +4570,9 @@ declare module 'gd-sprest/v2/sites' {
                 */
             (props?: { siteId?: string, webId?: string, targetInfo?: ITargetInfoProps }): IBaseQuery<site> & siteMethods;
     
+            /** Returns the current site. */
+            static getCurrentSite(): IBaseQuery<site> & siteMethods;
+    
             /** Returns the current web. */
             static getCurrentWeb(): IBaseQuery<site> & siteMethods;