@lindle/sharepoint_requests 0.1.16 → 0.1.18

package/dist/root/index.d.ts

@@ -27,17 +27,19 @@ declare class HTTPSharePointRequests<T extends {
     };
     getDigest(): Promise<string>;
     from<K extends Extract<keyof T['LISTS'], string>, V extends SHAREPOINT_VER = '2013'>(listName: K, sharepoint_ver?: V): {
-        create: (data: ListData) => Promise<import("axios").AxiosResponse<any, any, {}>>;
+        create: (data: ListData<T["LISTS"][K]>) => Promise<import("axios").AxiosResponse<any, any, {}>>;
         get: (options?: Options<T["LISTS"][K], V>) => Promise<{
             data: (T["LISTS"][K] & Partial<import("../types").SPItem<V>>)[];
             meta: {
                 url: URL;
             };
         }>;
-        update: (id: ItemID, data: ListData, digest?: string) => Promise<import("axios").AxiosResponse<any, any, {}>>;
+        update: (id: ItemID, data: ListData<T["LISTS"][K]>, digest?: string) => Promise<import("axios").AxiosResponse<any, any, {}>>;
         delete: (id: ItemID) => Promise<import("axios").AxiosResponse<any, any, {}>>;
         createFile: (props: CreateFileProps) => Promise<import("axios").AxiosResponse<any, any, {}>>;
-        uploadFile: (props: UploadFileProps) => Promise<import("axios").AxiosResponse<any, any, {}>>;
+        uploadFile: (props: UploadFileProps) => Promise<import("axios").AxiosResponse<any, any, {}> & {
+            itemId?: ItemID;
+        }>;
         deleteFile: (props: DeleteFileProps) => Promise<import("axios").AxiosResponse<any, any, {}>>;
         fields: (options?: Field_Options<T["LISTS"][K], V>) => {
             get: () => Promise<any>;

package/dist/root/internal/listRequests/createListItem.d.ts

@@ -1,3 +1,3 @@
 import type { ListData, SHAREPOINT_VER } from '../../../types';
 import type { RequestContext } from '../context';
-export declare function createListItem<V extends SHAREPOINT_VER = '2013'>(context: RequestContext<V>, listData: ListData): Promise<import("axios").AxiosResponse<any, any, {}>>;
+export declare function createListItem<D = Record<string, unknown>, V extends SHAREPOINT_VER = '2013'>(context: RequestContext<V>, listData: ListData<D>): Promise<import("axios").AxiosResponse<any, any, {}>>;

package/dist/root/internal/listRequests/normalizePayload.d.ts

@@ -0,0 +1,4 @@
+import type { ListData } from '../../../types';
+type AnyRecord = Record<string, unknown>;
+export declare function normalizeListPayload<D = Record<string, unknown>>(data: ListData<D>): AnyRecord;
+export {};

package/dist/root/internal/listRequests/updateListItem.d.ts

@@ -1,3 +1,3 @@
 import type { ListData, SHAREPOINT_VER } from '../../../types';
 import type { RequestContext } from '../context';
-export declare function updateListItem<V extends SHAREPOINT_VER = '2013'>(context: RequestContext<V>, id: number | string, data: ListData, digest?: string): Promise<import("axios").AxiosResponse<any, any, {}>>;
+export declare function updateListItem<D = Record<string, unknown>, V extends SHAREPOINT_VER = '2013'>(context: RequestContext<V>, id: number | string, data: ListData<D>, digest?: string): Promise<import("axios").AxiosResponse<any, any, {}>>;

package/dist/root/internal/listRequests/uploadFile.d.ts

@@ -1,3 +1,6 @@
-import type { SHAREPOINT_VER, UploadFileProps } from '../../../types';
+import type { AxiosResponse } from 'axios';
+import type { ItemID, SHAREPOINT_VER, UploadFileProps } from '../../../types';
 import type { RequestContext } from '../context';
-export declare function uploadFile<V extends SHAREPOINT_VER = '2013'>(context: RequestContext<V>, { file, folderPath, overwrite }: UploadFileProps): Promise<import("axios").AxiosResponse<any, any, {}>>;
+export declare function uploadFile<V extends SHAREPOINT_VER = '2013'>(context: RequestContext<V>, { file, folderPath, overwrite }: UploadFileProps): Promise<AxiosResponse & {
+    itemId?: ItemID;
+}>;

package/dist/sharepoint_requests.cjs.development.js

@@ -7,6 +7,11 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 var axios = require('axios');
 var axios__default = _interopDefault(axios);
 
+function _arrayLikeToArray(r, a) {
+  (null == a || a > r.length) && (a = r.length);
+  for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
+  return n;
+}
 function asyncGeneratorStep(n, t, e, r, o, a, c) {
   try {
     var i = n[a](c),
@@ -32,6 +37,23 @@ function _asyncToGenerator(n) {
     });
   };
 }
+function _createForOfIteratorHelperLoose(r, e) {
+  var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
+  if (t) return (t = t.call(r)).next.bind(t);
+  if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) {
+    t && (r = t);
+    var o = 0;
+    return function () {
+      return o >= r.length ? {
+        done: !0
+      } : {
+        done: !1,
+        value: r[o++]
+      };
+    };
+  }
+  throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
 function _extends() {
   return _extends = Object.assign ? Object.assign.bind() : function (n) {
     for (var e = 1; e < arguments.length; e++) {
@@ -149,6 +171,13 @@ function _regeneratorDefine(e, r, n, t) {
     }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2));
   }, _regeneratorDefine(e, r, n, t);
 }
+function _unsupportedIterableToArray(r, a) {
+  if (r) {
+    if ("string" == typeof r) return _arrayLikeToArray(r, a);
+    var t = {}.toString.call(r).slice(8, -1);
+    return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0;
+  }
+}
 
 var defaultConfig = {
   headers: {
@@ -202,6 +231,144 @@ function _fetchDigest() {
   return _fetchDigest.apply(this, arguments);
 }
 
+var LOOKUP_ID_KEYS = ['lookupId', 'LookupId', 'lookupID', 'LookupID', 'Id', 'ID'];
+function isPlainObject(value) {
+  return !!value && typeof value === 'object' && !Array.isArray(value);
+}
+function extractLookupPrimitive(value, allowGenericId) {
+  for (var _iterator = _createForOfIteratorHelperLoose(LOOKUP_ID_KEYS), _step; !(_step = _iterator()).done;) {
+    var key = _step.value;
+    if (!allowGenericId && (key === 'Id' || key === 'ID')) {
+      continue;
+    }
+    if (value[key] !== undefined && value[key] !== null) {
+      return value[key];
+    }
+  }
+  return undefined;
+}
+function normalizeLookupValue(value) {
+  if (Array.isArray(value)) {
+    return {
+      results: value
+    };
+  }
+  if (isPlainObject(value)) {
+    if (Array.isArray(value.results)) {
+      return {
+        results: value.results
+      };
+    }
+    var primitive = extractLookupPrimitive(value, true);
+    if (primitive !== undefined) {
+      return primitive;
+    }
+  }
+  if (typeof value === 'string') {
+    var trimmed = value.trim();
+    if (!trimmed) {
+      return value;
+    }
+    var numeric = Number(trimmed);
+    return Number.isNaN(numeric) ? trimmed : numeric;
+  }
+  return value;
+}
+function resolveLookupField(key, value) {
+  var lower = key.toLowerCase();
+  var endsWithId = lower.endsWith('id');
+  var endsWithRef = lower.endsWith('ref');
+  var endsWithLookup = lower.endsWith('lookup');
+  var hasLookupHint = endsWithId || endsWithRef || endsWithLookup;
+  if (value === undefined) {
+    return null;
+  }
+  if (Array.isArray(value)) {
+    var _targetKey = endsWithId ? key : key + "Id";
+    return {
+      key: _targetKey,
+      value: {
+        results: value
+      }
+    };
+  }
+  if (isPlainObject(value)) {
+    var primitive = extractLookupPrimitive(value, hasLookupHint);
+    if (primitive !== undefined) {
+      var _targetKey2 = endsWithId ? key : key + "Id";
+      return {
+        key: _targetKey2,
+        value: normalizeLookupValue(primitive)
+      };
+    }
+    if (Array.isArray(value.results)) {
+      var _targetKey3 = endsWithId ? key : key + "Id";
+      return {
+        key: _targetKey3,
+        value: {
+          results: value.results
+        }
+      };
+    }
+    if (!hasLookupHint) {
+      return null;
+    }
+  } else if (!hasLookupHint) {
+    return null;
+  }
+  var targetKey = endsWithId ? key : key + "Id";
+  if (value === null) {
+    return {
+      key: targetKey,
+      value: null
+    };
+  }
+  if (typeof value === 'number') {
+    return {
+      key: targetKey,
+      value: value
+    };
+  }
+  if (typeof value === 'string') {
+    var trimmed = value.trim();
+    if (!trimmed) {
+      return {
+        key: targetKey,
+        value: ''
+      };
+    }
+    var numeric = Number(trimmed);
+    return {
+      key: targetKey,
+      value: Number.isNaN(numeric) ? trimmed : numeric
+    };
+  }
+  return null;
+}
+function normalizeListPayload(data) {
+  var result = {};
+  if (!data) {
+    return result;
+  }
+  for (var _i = 0, _Object$entries = Object.entries(data); _i < _Object$entries.length; _i++) {
+    var _Object$entries$_i = _Object$entries[_i],
+      key = _Object$entries$_i[0],
+      value = _Object$entries$_i[1];
+    if (key === '__metadata') {
+      continue;
+    }
+    var lookupField = resolveLookupField(key, value);
+    if (lookupField) {
+      result[lookupField.key] = lookupField.value;
+      continue;
+    }
+    if (value !== undefined) {
+      result[key] = value;
+    }
+  }
+  return result;
+}
+
 function resolveMetadataType(_x) {
   return _resolveMetadataType.apply(this, arguments);
 }
@@ -233,7 +400,7 @@ function createListItem(_x2, _x3) {
 }
 function _createListItem() {
   _createListItem = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(context, listData) {
-    var metadataType, payload, response, _t, _t2, _t3, _t4, _t5;
+    var metadataType, normalizedData, userMetadata, payload, response, _t, _t2, _t3, _t4, _t5;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
@@ -241,10 +408,12 @@ function _createListItem() {
           return resolveMetadataType(context);
         case 1:
           metadataType = _context2.v;
-          payload = _extends({}, listData, {
-            __metadata: {
+          normalizedData = normalizeListPayload(listData);
+          userMetadata = listData.__metadata;
+          payload = _extends({}, normalizedData, {
+            __metadata: _extends({}, userMetadata && typeof userMetadata === 'object' ? userMetadata : {}, {
               type: metadataType
-            }
+            })
           });
           _t = context;
           _t2 = context.endpoint;
@@ -569,7 +738,7 @@ function updateListItem(_x2, _x3, _x4, _x5) {
 }
 function _updateListItem() {
   _updateListItem = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(context, id, data, digest) {
-    var formDigestValue, metadataType, payload, url, response, _t;
+    var formDigestValue, metadataType, normalizedData, userMetadata, payload, url, response, _t;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
@@ -588,10 +757,12 @@ function _updateListItem() {
           return resolveMetadataType$1(context);
         case 3:
           metadataType = _context2.v;
-          payload = _extends({}, data, {
-            __metadata: {
+          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;
@@ -620,7 +791,8 @@ function uploadFile(_x, _x2) {
 }
 function _uploadFile() {
   _uploadFile = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(context, _ref) {
-    var file, folderPath, _ref$overwrite, overwrite, requestUrl, encodedFileName, digest, response;
+    var _response$data$d, _response$data, _ref2, _ref3, _listItemFields$Id, _listItemFields$__def;
+    var file, folderPath, _ref$overwrite, overwrite, requestUrl, encodedFileName, digest, response, responseData, listItemFields, itemId, _listItemResponse$dat, _listItemResponse$dat2, _listItemResponse$dat3, listItemResponse, deferredId;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -640,7 +812,7 @@ function _uploadFile() {
           requestUrl = "_api/web/lists/getbytitle('" + context.listName + "')/RootFolder";
           requestUrl += buildLibraryPath(folderPath);
           encodedFileName = encodeFileName(file.name);
-          requestUrl += "/Files/add(url='" + encodedFileName + "',overwrite=" + (overwrite ? 'true' : 'false') + ")";
+          requestUrl += "/Files/add(url='" + encodedFileName + "',overwrite=" + (overwrite ? 'true' : 'false') + ")?$expand=ListItemAllFields&$select=ListItemAllFields/Id";
           _context.n = 3;
           return fetchDigest(context.instance, context.baseURL);
         case 3:
@@ -655,6 +827,30 @@ function _uploadFile() {
           });
         case 4:
           response = _context.v;
+          responseData = (_response$data$d = (_response$data = response.data) == null ? void 0 : _response$data.d) != null ? _response$data$d : response.data;
+          listItemFields = responseData == null ? void 0 : responseData.ListItemAllFields;
+          itemId = (_ref2 = (_ref3 = (_listItemFields$Id = listItemFields == null ? void 0 : listItemFields.Id) != null ? _listItemFields$Id : listItemFields == null ? void 0 : listItemFields.ID) != null ? _ref3 : responseData == null ? void 0 : responseData.Id) != null ? _ref2 : responseData == null ? void 0 : responseData.ID;
+          if (!(typeof itemId !== 'undefined')) {
+            _context.n = 5;
+            break;
+          }
+          response.itemId = itemId;
+          _context.n = 7;
+          break;
+        case 5:
+          if (!(listItemFields != null && (_listItemFields$__def = listItemFields.__deferred) != null && _listItemFields$__def.uri)) {
+            _context.n = 7;
+            break;
+          }
+          _context.n = 6;
+          return context.instance.get(listItemFields.__deferred.uri);
+        case 6:
+          listItemResponse = _context.v;
+          deferredId = (_listItemResponse$dat = (_listItemResponse$dat2 = listItemResponse.data) == null || (_listItemResponse$dat2 = _listItemResponse$dat2.d) == null ? void 0 : _listItemResponse$dat2.Id) != null ? _listItemResponse$dat : (_listItemResponse$dat3 = listItemResponse.data) == null ? void 0 : _listItemResponse$dat3.Id;
+          if (typeof deferredId !== 'undefined') {
+            response.itemId = deferredId;
+          }
+        case 7:
           return _context.a(2, response);
       }
     }, _callee);