@lindle/sharepoint_requests 0.1.18 → 0.1.19

package/dist/sharepoint_requests.esm.js

@@ -194,7 +194,7 @@ function fetchDigest(_x, _x2) {
 }
 function _fetchDigest() {
   _fetchDigest = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(instance, baseURL) {
-    var _response$data, response, formDigestValue, _t;
+    var _response$data, response, formDigestValue, cause, _t;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.p = _context.n) {
         case 0:
@@ -214,8 +214,8 @@ function _fetchDigest() {
         case 3:
           _context.p = 3;
           _t = _context.v;
-          console.error('Failed to retrieve the Form Digest Value:', _t);
-          throw new Error("Error retrieving Form Digest Value");
+          cause = _t instanceof Error ? _t.message : 'Unknown contextinfo error';
+          throw new Error("Error retrieving Form Digest Value: " + cause);
         case 4:
           return _context.a(2);
       }
@@ -224,6 +224,57 @@ function _fetchDigest() {
   return _fetchDigest.apply(this, arguments);
 }
 
+function sendEmail(_x, _x2) {
+  return _sendEmail.apply(this, arguments);
+}
+function _sendEmail() {
+  _sendEmail = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(context, _ref) {
+    var From, To, Subject, Body, httpRequest, response, _t, _t2, _t3, _t4, _t5;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          From = _ref.From, To = _ref.To, Subject = _ref.Subject, Body = _ref.Body;
+          httpRequest = '_api/SP.Utilities.Utility.SendEmail';
+          _t = context;
+          _t2 = httpRequest;
+          _context.n = 1;
+          return fetchDigest(context.instance, context.baseURL);
+        case 1:
+          _t3 = _context.v;
+          _t4 = {
+            'X-RequestDigest': _t3,
+            'X-Http-Method': 'POST',
+            'Content-Type': 'application/json;odata=verbose'
+          };
+          _t5 = JSON.stringify({
+            properties: {
+              __metadata: {
+                type: 'SP.Utilities.EmailProperties'
+              },
+              From: From,
+              To: {
+                results: Array.isArray(To) ? To : [To]
+              },
+              Body: Body,
+              Subject: Subject
+            }
+          });
+          _context.n = 2;
+          return _t.instance.call(_t, {
+            url: _t2,
+            method: 'POST',
+            headers: _t4,
+            data: _t5
+          });
+        case 2:
+          response = _context.v;
+          return _context.a(2, response);
+      }
+    }, _callee);
+  }));
+  return _sendEmail.apply(this, arguments);
+}
+
 var LOOKUP_ID_KEYS = ['lookupId', 'LookupId', 'lookupID', 'LookupID', 'Id', 'ID'];
 function isPlainObject(value) {
   return !!value && typeof value === 'object' && !Array.isArray(value);
@@ -393,39 +444,45 @@ function createListItem(_x2, _x3) {
 }
 function _createListItem() {
   _createListItem = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(context, listData) {
-    var metadataType, normalizedData, userMetadata, payload, response, _t, _t2, _t3, _t4, _t5;
+    var normalizedData, payload, metadataType, userMetadata, response, _t, _t2, _t3, _t4, _t5;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
+          normalizedData = normalizeListPayload(listData);
+          payload = normalizedData;
+          if (!(context.sharepointVersion === '2013')) {
+            _context2.n = 2;
+            break;
+          }
           _context2.n = 1;
           return resolveMetadataType(context);
         case 1:
           metadataType = _context2.v;
-          normalizedData = normalizeListPayload(listData);
           userMetadata = listData.__metadata;
           payload = _extends({}, normalizedData, {
             __metadata: _extends({}, userMetadata && typeof userMetadata === 'object' ? userMetadata : {}, {
               type: metadataType
             })
           });
+        case 2:
           _t = context;
           _t2 = context.endpoint;
           _t3 = JSON.stringify(payload);
-          _context2.n = 2;
+          _context2.n = 3;
           return fetchDigest(context.instance, context.baseURL);
-        case 2:
+        case 3:
           _t4 = _context2.v;
           _t5 = {
             'X-RequestDigest': _t4
           };
-          _context2.n = 3;
+          _context2.n = 4;
           return _t.instance.call(_t, {
             url: _t2,
             method: 'POST',
             data: _t3,
             headers: _t5
           });
-        case 3:
+        case 4:
           response = _context2.v;
           return _context2.a(2, response);
       }
@@ -434,33 +491,71 @@ function _createListItem() {
   return _createListItem.apply(this, arguments);
 }
 
+function escapeODataStringLiteral(value) {
+  return value.replace(/'/g, "''");
+}
+function buildListByTitleEndpoint(listName) {
+  return "_api/web/lists/GetByTitle('" + escapeODataStringLiteral(listName) + "')";
+}
+
+function buildLibraryPath(folderPath) {
+  if (!folderPath) {
+    return '';
+  }
+  var segments = Array.isArray(folderPath) ? folderPath : folderPath.split('/').filter(Boolean);
+  if (!segments.length) {
+    return '';
+  }
+  var escapedSegments = segments.map(function (segment) {
+    if (!segment.trim()) {
+      throw new Error('Folder path segments cannot be empty.');
+    }
+    var sanitized = segment.replace(/'/g, "''");
+    return "/Folders('" + encodeURIComponent(sanitized) + "')";
+  });
+  return escapedSegments.join('');
+}
+function encodeFileName(fileName) {
+  if (!fileName.trim()) {
+    throw new Error('File name cannot be empty.');
+  }
+  return encodeURIComponent(fileName.replace(/'/g, "''"));
+}
+
 function createAttachment(_x, _x2) {
   return _createAttachment.apply(this, arguments);
 }
 function _createAttachment() {
   _createAttachment = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(context, _ref) {
-    var file, itemId, requestUrl, response, _t, _t2, _t3, _t4, _t5;
+    var file, itemId, encodedFileName, requestUrl, response, _t, _t2, _t3, _t4, _t5;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
           file = _ref.file, itemId = _ref.itemId;
-          requestUrl = "_api/lists/getbytitle('" + context.listName + "')/items(" + itemId + ")/AttachmentFiles/add(FileName='" + file.name + "')";
+          if (!(context.sharepointVersion !== '2013')) {
+            _context.n = 1;
+            break;
+          }
+          throw new Error('createAttachment is only supported for SharePoint 2013 REST endpoints.');
+        case 1:
+          encodedFileName = encodeFileName(file.name);
+          requestUrl = buildListByTitleEndpoint(context.listName) + "/items(" + itemId + ")/AttachmentFiles/add(FileName='" + encodedFileName + "')";
           _t = context.instance;
           _t2 = requestUrl;
           _t3 = file;
-          _context.n = 1;
+          _context.n = 2;
           return fetchDigest(context.instance, context.baseURL);
-        case 1:
+        case 2:
           _t4 = _context.v;
           _t5 = {
             'X-RequestDigest': _t4
           };
-          _context.n = 2;
+          _context.n = 3;
           return _t.post.call(_t, _t2, _t3, {
             headers: _t5,
             withCredentials: true
           });
-        case 2:
+        case 3:
           response = _context.v;
           return _context.a(2, response);
       }
@@ -474,13 +569,24 @@ function deleteItem(_x, _x2) {
 }
 function _deleteItem() {
   _deleteItem = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(context, id) {
-    var response;
+    var requestDigest, url, response;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
           _context.n = 1;
-          return context.instance["delete"](context.endpoint + "(" + id + ")");
+          return fetchDigest(context.instance, context.baseURL);
         case 1:
+          requestDigest = _context.v;
+          url = context.sharepointVersion === '2013' ? buildListByTitleEndpoint(context.listName) + "/items(" + id + ")" : context.endpoint + "(" + id + ")";
+          _context.n = 2;
+          return context.instance.post(url, undefined, {
+            headers: {
+              'X-RequestDigest': requestDigest,
+              'IF-MATCH': '*',
+              'X-HTTP-Method': 'DELETE'
+            }
+          });
+        case 2:
           response = _context.v;
           return _context.a(2, response);
       }
@@ -489,30 +595,6 @@ function _deleteItem() {
   return _deleteItem.apply(this, arguments);
 }
 
-function buildLibraryPath(folderPath) {
-  if (!folderPath) {
-    return '';
-  }
-  var segments = Array.isArray(folderPath) ? folderPath : folderPath.split('/').filter(Boolean);
-  if (!segments.length) {
-    return '';
-  }
-  var escapedSegments = segments.map(function (segment) {
-    if (!segment.trim()) {
-      throw new Error('Folder path segments cannot be empty.');
-    }
-    var sanitized = segment.replace(/'/g, "''");
-    return "/Folders('" + encodeURIComponent(sanitized) + "')";
-  });
-  return escapedSegments.join('');
-}
-function encodeFileName(fileName) {
-  if (!fileName.trim()) {
-    throw new Error('File name cannot be empty.');
-  }
-  return encodeURIComponent(fileName.replace(/'/g, "''"));
-}
-
 var SUPPORTED_VERSION = '2013';
 function deleteFile(_x, _x2) {
   return _deleteFile.apply(this, arguments);
@@ -531,7 +613,7 @@ function _deleteFile() {
           throw new Error('deleteFile is only supported for SharePoint 2013 REST endpoints.');
         case 1:
           encodedFileName = encodeFileName(fileName);
-          requestUrl = "_api/web/lists/getbytitle('" + context.listName + "')/RootFolder";
+          requestUrl = buildListByTitleEndpoint(context.listName) + "/RootFolder";
           requestUrl += buildLibraryPath(folderPath);
           requestUrl += "/Files('" + encodedFileName + "')";
           _context.n = 2;
@@ -592,6 +674,7 @@ function getFiles(_x, _x2) {
 }
 function _getFiles() {
   _getFiles = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(context, options) {
+    var _ref, _response$data$d$resu, _response$data, _response$data2;
     var params, url, response, data, meta;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
@@ -607,7 +690,7 @@ function _getFiles() {
           });
         case 1:
           response = _context.v;
-          data = options != null && options.limit || !response.data.d.results ? response.data.d : response.data.d.results;
+          data = (_ref = (_response$data$d$resu = (_response$data = response.data) == null || (_response$data = _response$data.d) == null ? void 0 : _response$data.results) != null ? _response$data$d$resu : (_response$data2 = response.data) == null ? void 0 : _response$data2.d) != null ? _ref : response.data;
           meta = {
             url: url
           };
@@ -687,13 +770,19 @@ function _getOnly() {
         case 1:
           _yield$instance$get = _context.v;
           data = _yield$instance$get.data;
-          if (!data) {
+          if (data) {
             _context.n = 2;
             break;
           }
-          return _context.a(2, data.d.results ? data.d.results : data.d);
+          return _context.a(2, undefined);
         case 2:
-          return _context.a(2);
+          if (!data.d) {
+            _context.n = 3;
+            break;
+          }
+          return _context.a(2, data.d.results ? data.d.results : data.d);
+        case 3:
+          return _context.a(2, data);
       }
     }, _callee);
   }));
@@ -731,7 +820,7 @@ function updateListItem(_x2, _x3, _x4, _x5) {
 }
 function _updateListItem() {
   _updateListItem = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(context, id, data, digest) {
-    var formDigestValue, metadataType, normalizedData, userMetadata, payload, url, response, _t;
+    var formDigestValue, normalizedData, payload, metadataType, userMetadata, url, response, _t;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
@@ -746,19 +835,25 @@ function _updateListItem() {
           _t = _context2.v;
         case 2:
           formDigestValue = _t;
+          normalizedData = normalizeListPayload(data);
+          payload = normalizedData;
+          if (!(context.sharepointVersion === '2013')) {
+            _context2.n = 4;
+            break;
+          }
           _context2.n = 3;
           return resolveMetadataType$1(context);
         case 3:
           metadataType = _context2.v;
-          normalizedData = normalizeListPayload(data);
           userMetadata = data.__metadata;
           payload = _extends({}, normalizedData, {
             __metadata: _extends({}, userMetadata && typeof userMetadata === 'object' ? userMetadata : {}, {
               type: metadataType
             })
           });
-          url = "_api/lists/getbytitle('" + context.listName + "')/getItemById('" + id + "')";
-          _context2.n = 4;
+        case 4:
+          url = context.sharepointVersion === '2013' ? buildListByTitleEndpoint(context.listName) + "/items(" + id + ")" : context.endpoint + "(" + id + ")";
+          _context2.n = 5;
           return context.instance({
             url: url,
             method: 'POST',
@@ -766,10 +861,10 @@ function _updateListItem() {
             headers: {
               'X-RequestDigest': formDigestValue,
               'IF-MATCH': '*',
-              'X-Http-Method': 'PATCH'
+              'X-HTTP-Method': 'MERGE'
             }
           });
-        case 4:
+        case 5:
           response = _context2.v;
           return _context2.a(2, response);
       }
@@ -802,7 +897,7 @@ function _uploadFile() {
           }
           throw new Error('A file with a valid name must be provided.');
         case 2:
-          requestUrl = "_api/web/lists/getbytitle('" + context.listName + "')/RootFolder";
+          requestUrl = buildListByTitleEndpoint(context.listName) + "/RootFolder";
           requestUrl += buildLibraryPath(folderPath);
           encodedFileName = encodeFileName(file.name);
           requestUrl += "/Files/add(url='" + encodedFileName + "',overwrite=" + (overwrite ? 'true' : 'false') + ")?$expand=ListItemAllFields&$select=ListItemAllFields/Id";
@@ -851,63 +946,13 @@ function _uploadFile() {
   return _uploadFile.apply(this, arguments);
 }
 
-function sendEmail(_x, _x2) {
-  return _sendEmail.apply(this, arguments);
-}
-function _sendEmail() {
-  _sendEmail = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(context, _ref) {
-    var From, To, Subject, Body, httpRequest, response, _t, _t2, _t3, _t4, _t5;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
-        case 0:
-          From = _ref.From, To = _ref.To, Subject = _ref.Subject, Body = _ref.Body;
-          httpRequest = '_api/SP.Utilities.Utility.SendEmail';
-          _t = context;
-          _t2 = httpRequest;
-          _context.n = 1;
-          return fetchDigest(context.instance, context.baseURL);
-        case 1:
-          _t3 = _context.v;
-          _t4 = {
-            'X-RequestDigest': _t3,
-            'X-Http-Method': 'POST',
-            'Content-Type': 'application/json;odata=verbose'
-          };
-          _t5 = JSON.stringify({
-            properties: {
-              __metadata: {
-                type: 'SP.Utilities.EmailProperties'
-              },
-              From: From,
-              To: {
-                results: Array.isArray(To) ? To : [To]
-              },
-              Body: Body,
-              Subject: Subject
-            }
-          });
-          _context.n = 2;
-          return _t.instance.call(_t, {
-            url: _t2,
-            method: 'POST',
-            headers: _t4,
-            data: _t5
-          });
-        case 2:
-          response = _context.v;
-          return _context.a(2, response);
-      }
-    }, _callee);
-  }));
-  return _sendEmail.apply(this, arguments);
-}
-
 function typeAhead(_x, _x2, _x3) {
   return _typeAhead.apply(this, arguments);
 }
 function _typeAhead() {
   _typeAhead = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(instance, input, filter) {
-    var requestUrl, data, response;
+    var _response$data$d$Clie, _response$data, _response$data2;
+    var requestUrl, data, response, searchResults, parsed;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -939,7 +984,35 @@ function _typeAhead() {
           });
         case 1:
           response = _context.v;
-          return _context.a(2, response.data.d.ClientPeoplePickerSearchUser);
+          searchResults = (_response$data$d$Clie = (_response$data = response.data) == null || (_response$data = _response$data.d) == null ? void 0 : _response$data.ClientPeoplePickerSearchUser) != null ? _response$data$d$Clie : (_response$data2 = response.data) == null ? void 0 : _response$data2.ClientPeoplePickerSearchUser;
+          if (!(typeof searchResults === 'string')) {
+            _context.n = 3;
+            break;
+          }
+          parsed = JSON.parse(searchResults);
+          if (!(Array.isArray(parsed) && parsed.length > 0)) {
+            _context.n = 2;
+            break;
+          }
+          return _context.a(2, parsed[0]);
+        case 2:
+          throw new Error('People picker returned no results.');
+        case 3:
+          if (!(Array.isArray(searchResults) && searchResults.length > 0)) {
+            _context.n = 4;
+            break;
+          }
+          return _context.a(2, searchResults[0]);
+        case 4:
+          if (!(searchResults && typeof searchResults === 'object')) {
+            _context.n = 5;
+            break;
+          }
+          return _context.a(2, searchResults);
+        case 5:
+          throw new Error('Invalid people picker response.');
+        case 6:
+          return _context.a(2);
       }
     }, _callee);
   }));
@@ -985,13 +1058,19 @@ function getSiteUser(_x5, _x6) {
 }
 function _getSiteUser() {
   _getSiteUser = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(instance, searchValue) {
-    var requestUrl, response;
+    var safeSearchValue, response;
     return _regenerator().w(function (_context3) {
       while (1) switch (_context3.n) {
         case 0:
-          requestUrl = "_api/web/siteusers?&$filter=substringof('" + searchValue + "', Title) or substringof('" + searchValue + "', LoginName) or substringof('" + searchValue + "', Email)&$top=50&$expand=Groups";
+          safeSearchValue = escapeODataStringLiteral(searchValue);
           _context3.n = 1;
-          return instance.get(requestUrl);
+          return instance.get('_api/web/siteusers', {
+            params: {
+              $filter: "substringof('" + safeSearchValue + "', Title) or substringof('" + safeSearchValue + "', LoginName) or substringof('" + safeSearchValue + "', Email)",
+              $top: 50,
+              $expand: 'Groups'
+            }
+          });
         case 1:
           response = _context3.v;
           return _context3.a(2, response.data.d);
@@ -1062,6 +1141,12 @@ function _currentUserPermissions() {
             var BasePermissions = _ref.BasePermissions;
             return BasePermissions.High === High;
           });
+          if (result) {
+            _context6.n = 3;
+            break;
+          }
+          throw new Error("Unable to resolve current user permission for BasePermissions.High=\"" + High + "\".");
+        case 3:
           return _context6.a(2, result);
       }
     }, _callee6);
@@ -1073,155 +1158,160 @@ var HTTPSharePointRequests = /*#__PURE__*/function () {
   function HTTPSharePointRequests(baseURL, config) {
     var _this = this;
     this.baseURL = void 0;
-    this.endpoint = void 0;
-    this.listName = void 0;
     this.instance = void 0;
-    this.sharepointVersion = void 0;
-    this.listItemEntityTypeFullName = void 0;
-    this.lists = {
-      get: function get() {
-        _this.endpoint = '_api/web/lists';
-        _this.sharepointVersion = '2013';
-        return getListItems(_this.getContext());
-      }
-    };
-    this.folders = {
-      get: function get() {
-        _this.endpoint = '_api/web/folders';
-        _this.sharepointVersion = '2013';
-        getListItems(_this.getContext());
-      }
-    };
-    this.email = {
-      send: function send(props) {
-        _this.sharepointVersion = '2013';
-        return sendEmail(_this.getContext(), props);
-      }
-    };
+    this.listItemEntityTypeCache = void 0;
+    this.email = void 0;
     this.user = {
       properties: function properties() {
         return {
           get: function get() {
-            _this.sharepointVersion = '2013';
             return currentUserProperties(_this.instance);
           }
         };
       },
       searchSiteUser: function searchSiteUser(searchValue) {
-        _this.sharepointVersion = '2013';
         return getSiteUser(_this.instance, searchValue);
       },
       searchUser: function searchUser(input, filter) {
-        _this.sharepointVersion = '2013';
         return typeAhead(_this.instance, input, filter);
       },
       current: function current() {
-        _this.endpoint = '_api/web/currentUser';
-        _this.sharepointVersion = '2013';
         return {
           get: function get() {
-            return getOnly(_this.instance, _this.endpoint);
+            return getOnly(_this.instance, '_api/web/currentUser');
           }
         };
       },
       currentPermission: function currentPermission() {
         return {
           get: function get() {
-            _this.sharepointVersion = '2013';
-            return currentUserPermissions(_this.getContext());
+            return currentUserPermissions(_this.createContext({
+              endpoint: '_api/web/effectiveBasePermissions',
+              listName: '',
+              sharepointVersion: '2013'
+            }));
           }
         };
       }
     };
     this.baseURL = baseURL.endsWith('/') ? baseURL : baseURL + "/";
-    this.endpoint = '/api';
-    this.listName = '';
     this.instance = instance(this.baseURL, config);
-    this.sharepointVersion = '2013';
-    this.listItemEntityTypeFullName = undefined;
+    this.listItemEntityTypeCache = new Map();
+    this.email = Object.assign(function (from, to, subject, body) {
+      return _this.sendEmail({
+        From: from,
+        To: to,
+        Subject: subject,
+        Body: body
+      });
+    }, {
+      send: function send(props) {
+        return _this.sendEmail(props);
+      }
+    });
   }
   var _proto = HTTPSharePointRequests.prototype;
-  _proto.getContext = function getContext() {
+  _proto.createContext = function createContext(_ref) {
+    var endpoint = _ref.endpoint,
+      listName = _ref.listName,
+      sharepointVersion = _ref.sharepointVersion,
+      listItemEntityTypeFullName = _ref.listItemEntityTypeFullName,
+      resolveListItemEntityType = _ref.resolveListItemEntityType;
     return {
       instance: this.instance,
       baseURL: this.baseURL,
-      endpoint: this.endpoint,
-      listName: this.listName,
-      sharepointVersion: this.sharepointVersion,
-      listItemEntityTypeFullName: this.listItemEntityTypeFullName,
-      resolveListItemEntityType: this.resolveListItemEntityTypeFullName.bind(this)
+      endpoint: endpoint,
+      listName: listName,
+      sharepointVersion: sharepointVersion,
+      listItemEntityTypeFullName: listItemEntityTypeFullName,
+      resolveListItemEntityType: resolveListItemEntityType
     };
   };
   _proto.resolveListItemEntityTypeFullName = /*#__PURE__*/function () {
-    var _resolveListItemEntityTypeFullName = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
+    var _resolveListItemEntityTypeFullName = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(listName) {
       var _response$data$d$List, _response$data, _response$data2;
-      var response, entityType;
+      var cacheKey, cachedType, response, entityType;
       return _regenerator().w(function (_context) {
         while (1) switch (_context.n) {
           case 0:
-            if (!this.listItemEntityTypeFullName) {
+            cacheKey = listName;
+            cachedType = this.listItemEntityTypeCache.get(cacheKey);
+            if (!cachedType) {
               _context.n = 1;
               break;
             }
-            return _context.a(2, this.listItemEntityTypeFullName);
+            return _context.a(2, cachedType);
           case 1:
-            if (this.listName) {
-              _context.n = 2;
-              break;
-            }
-            throw new Error('List name is not set.');
+            _context.n = 2;
+            return this.instance.get(buildListByTitleEndpoint(listName) + "?$select=ListItemEntityTypeFullName");
           case 2:
-            if (!(this.sharepointVersion !== '2013')) {
-              _context.n = 3;
-              break;
-            }
-            this.listItemEntityTypeFullName = "SP.Data." + this.listName + "ListItem";
-            return _context.a(2, this.listItemEntityTypeFullName);
-          case 3:
-            _context.n = 4;
-            return this.instance.get("_api/web/lists/GetByTitle('" + this.listName + "')?$select=ListItemEntityTypeFullName");
-          case 4:
             response = _context.v;
             entityType = (_response$data$d$List = (_response$data = response.data) == null || (_response$data = _response$data.d) == null ? void 0 : _response$data.ListItemEntityTypeFullName) != null ? _response$data$d$List : (_response$data2 = response.data) == null ? void 0 : _response$data2.ListItemEntityTypeFullName;
             if (!(!entityType || typeof entityType !== 'string')) {
-              _context.n = 5;
+              _context.n = 3;
               break;
             }
-            throw new Error("Unable to resolve ListItemEntityTypeFullName for list \"" + this.listName + "\".");
-          case 5:
-            this.listItemEntityTypeFullName = entityType;
-            return _context.a(2, this.listItemEntityTypeFullName);
+            throw new Error("Unable to resolve ListItemEntityTypeFullName for list \"" + listName + "\".");
+          case 3:
+            this.listItemEntityTypeCache.set(cacheKey, entityType);
+            return _context.a(2, entityType);
         }
       }, _callee, this);
     }));
-    function resolveListItemEntityTypeFullName() {
+    function resolveListItemEntityTypeFullName(_x) {
       return _resolveListItemEntityTypeFullName.apply(this, arguments);
     }
     return resolveListItemEntityTypeFullName;
-  }()
-  /**
-   * @deprecated Use `from` instead.
-   */
-  ;
-  _proto.list = function list(listName) {
-    this.listName = listName;
-    this.endpoint = "_vti_bin/ListData.svc/" + listName;
-    this.sharepointVersion = '2010';
-    this.listItemEntityTypeFullName = undefined;
-    return this;
-  };
-  _proto.getDigest = function getDigest() {
-    return fetchDigest(this.instance, this.baseURL);
-  };
-  _proto.from = function from(listName, sharepoint_ver) {
+  }();
+  _proto.buildListScope = function buildListScope(listName, version) {
     var _this2 = this;
-    var version = sharepoint_ver != null ? sharepoint_ver : '2013';
-    this.listName = listName;
-    this.sharepointVersion = version;
-    this.listItemEntityTypeFullName = undefined;
-    this.endpoint = version === '2013' ? "_api/web/lists/GetByTitle('" + this.listName + "')/items" : "_vti_bin/ListData.svc/" + listName;
+    var listNameValue = String(listName);
+    var endpoint = version === '2013' ? buildListByTitleEndpoint(listNameValue) + "/items" : "_vti_bin/ListData.svc/" + encodeURIComponent(listNameValue);
+    var scopedEntityType;
+    var resolveListItemEntityType = /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
+        return _regenerator().w(function (_context2) {
+          while (1) switch (_context2.n) {
+            case 0:
+              if (!scopedEntityType) {
+                _context2.n = 1;
+                break;
+              }
+              return _context2.a(2, scopedEntityType);
+            case 1:
+              if (!(version !== '2013')) {
+                _context2.n = 2;
+                break;
+              }
+              scopedEntityType = "SP.Data." + listNameValue + "ListItem";
+              return _context2.a(2, scopedEntityType);
+            case 2:
+              _context2.n = 3;
+              return _this2.resolveListItemEntityTypeFullName(listNameValue);
+            case 3:
+              scopedEntityType = _context2.v;
+              return _context2.a(2, scopedEntityType);
+          }
+        }, _callee2);
+      }));
+      return function resolveListItemEntityType() {
+        return _ref2.apply(this, arguments);
+      };
+    }();
     var getContext = function getContext() {
-      return _this2.getContext();
+      return _this2.createContext({
+        endpoint: endpoint,
+        listName: listNameValue,
+        sharepointVersion: version,
+        listItemEntityTypeFullName: scopedEntityType,
+        resolveListItemEntityType: resolveListItemEntityType
+      });
+    };
+    var removeItem = function removeItem(id) {
+      return deleteItem(getContext(), id);
+    };
+    var removeFile = function removeFile(props) {
+      return deleteFile(getContext(), props);
     };
     return {
       create: function create(data) {
@@ -1233,60 +1323,142 @@ var HTTPSharePointRequests = /*#__PURE__*/function () {
       update: function update(id, data, digest) {
         return updateListItem(getContext(), id, data, digest);
       },
-      "delete": function _delete(id) {
-        return deleteItem(getContext(), id);
-      },
+      "delete": removeItem,
+      remove: removeItem,
       createFile: function createFile(props) {
         return createAttachment(getContext(), props);
       },
       uploadFile: function uploadFile$1(props) {
         return uploadFile(getContext(), props);
       },
-      deleteFile: function deleteFile$1(props) {
-        return deleteFile(getContext(), props);
-      },
+      deleteFile: removeFile,
+      removeFile: removeFile,
       fields: function fields(options) {
-        _this2.endpoint = !(options != null && options.fieldName) ? "_api/web/lists/GetByTitle('" + _this2.listName + "')/fields" : "_api/web/lists/GetByTitle('" + _this2.listName + "')/fields/getbytitle('" + options.fieldName + "')";
+        var fieldsEndpoint = !(options != null && options.fieldName) ? buildListByTitleEndpoint(listNameValue) + "/fields" : buildListByTitleEndpoint(listNameValue) + "/fields/getbytitle('" + escapeODataStringLiteral(String(options.fieldName)) + "')";
         return {
           get: function get() {
-            return getOnly(_this2.instance, _this2.endpoint, options);
+            return getOnly(_this2.instance, fieldsEndpoint, options);
           }
         };
+      },
+      items: {
+        create: function create(data) {
+          return createListItem(getContext(), data);
+        },
+        get: function get(options) {
+          return getListItems(getContext(), options);
+        },
+        update: function update(id, data, digest) {
+          return updateListItem(getContext(), id, data, digest);
+        },
+        "delete": removeItem,
+        remove: removeItem
+      },
+      files: {
+        attach: function attach(props) {
+          return createAttachment(getContext(), props);
+        },
+        upload: function upload(props) {
+          return uploadFile(getContext(), props);
+        },
+        "delete": removeFile,
+        remove: removeFile
+      }
+    };
+  }
+  /**
+   * @deprecated Use `from(listName, '2010')` instead.
+   */;
+  _proto.list = function list(listName) {
+    return this.from(listName, '2010');
+  };
+  _proto.from = function from(listName, sharepointVersion) {
+    var version = sharepointVersion != null ? sharepointVersion : '2013';
+    return this.buildListScope(listName, version);
+  };
+  _proto.field = function field(listName, fieldName, sharepointVersion) {
+    return this.from(listName, sharepointVersion).fields({
+      fieldName: fieldName
+    }).get();
+  };
+  _proto.lists = function lists(options) {
+    var context = this.createContext({
+      endpoint: '_api/web/lists',
+      listName: '',
+      sharepointVersion: '2013'
+    });
+    return {
+      get: function get() {
+        return getListItems(context, options);
+      }
+    };
+  };
+  _proto.getDigest = function getDigest() {
+    return fetchDigest(this.instance, this.baseURL);
+  };
+  _proto.folders = function folders(options) {
+    var context = this.createContext({
+      endpoint: '_api/web/folders',
+      listName: '',
+      sharepointVersion: '2013'
+    });
+    return {
+      get: function get() {
+        return getFiles(context, options);
       }
     };
   };
   _proto.folder = function folder(folderName) {
     var _this3 = this;
-    var filePath = ['Shared Documents'];
-    if (folderName) {
-      filePath = Array.isArray(folderName) ? [].concat(filePath, folderName) : [].concat(filePath, [folderName]);
-    }
-    this.endpoint = "_api/web/GetFolderByServerRelativeUrl('" + filePath.join('/') + "')";
-    this.sharepointVersion = '2013';
-    var getContext = function getContext() {
-      return _this3.getContext();
-    };
+    var defaultPath = ['Shared Documents'];
+    var segments = folderName ? Array.isArray(folderName) ? [].concat(defaultPath, folderName) : [].concat(defaultPath, folderName.split('/').filter(Boolean)) : defaultPath;
+    var serverRelativePath = escapeODataStringLiteral(segments.join('/'));
+    var baseEndpoint = "_api/web/GetFolderByServerRelativeUrl('" + serverRelativePath + "')";
     return {
       get: function get(options) {
-        if (!(options != null && options.type)) {
-          _this3.endpoint += '/Files';
-        } else {
-          _this3.endpoint += "/" + options.type;
-        }
-        return getFiles(getContext(), options);
+        var _options$type;
+        var folderType = (_options$type = options == null ? void 0 : options.type) != null ? _options$type : 'Files';
+        var endpoint = baseEndpoint + "/" + folderType;
+        var context = _this3.createContext({
+          endpoint: endpoint,
+          listName: '',
+          sharepointVersion: '2013'
+        });
+        return getFiles(context, _extends({}, options, {
+          type: folderType
+        }));
       }
     };
   };
   _proto.users = function users(options) {
-    var _this4 = this;
-    this.endpoint = '_api/web/SiteUserInfoList/items';
-    this.sharepointVersion = '2013';
+    var context = this.createContext({
+      endpoint: '_api/web/SiteUserInfoList/items',
+      listName: '',
+      sharepointVersion: '2013'
+    });
     return {
       get: function get() {
-        return getListItems(_this4.getContext(), options);
+        return getListItems(context, options);
       }
     };
   };
+  _proto.sendEmail = function sendEmail$1(props) {
+    var context = this.createContext({
+      endpoint: '_api/SP.Utilities.Utility.SendEmail',
+      listName: '',
+      sharepointVersion: '2013'
+    });
+    return sendEmail(context, props);
+  };
+  _proto.getCurrentUser = function getCurrentUser() {
+    return this.user.current().get();
+  };
+  _proto.currentUserProperties = function currentUserProperties() {
+    return this.user.properties().get();
+  };
+  _proto.currentUserPermission = function currentUserPermission() {
+    return this.user.currentPermission().get();
+  };
   return HTTPSharePointRequests;
 }();