@lindle/sharepoint_requests 0.1.17 → 0.1.19

package/src/root/internal/listRequests/deleteItem.ts

@@ -1,10 +1,24 @@
-import type { SHAREPOINT_VER } from '../../../types';
-import type { RequestContext } from '../context';
+import { SHAREPOINT_VER } from '../../../types';
+import { RequestContext } from '../context';
+import { fetchDigest } from '../digest';
+import { buildListByTitleEndpoint } from '../sharepointUrl';
 
 export async function deleteItem<V extends SHAREPOINT_VER = '2013'>(
   context: RequestContext<V>,
   id: number | string
 ) {
-  const response = await context.instance.delete(`${context.endpoint}(${id})`);
+  const requestDigest = await fetchDigest(context.instance, context.baseURL);
+  const url =
+    context.sharepointVersion === '2013'
+      ? `${buildListByTitleEndpoint(context.listName)}/items(${id})`
+      : `${context.endpoint}(${id})`;
+
+  const response = await context.instance.post(url, undefined, {
+    headers: {
+      'X-RequestDigest': requestDigest,
+      'IF-MATCH': '*',
+      'X-HTTP-Method': 'DELETE',
+    },
+  });
   return response;
 }

package/src/root/internal/listRequests/getFiles.ts

@@ -1,11 +1,8 @@
-import type { Folder_Options, SHAREPOINT_VER } from '../../../types';
+import { Folder_Options, SHAREPOINT_VER } from '../../../types';
 import { appendParamsToUrl, buildODataParams } from '../odata';
-import type { RequestContext } from '../context';
+import { RequestContext } from '../context';
 
-export async function getFiles<
-  T,
-  V extends SHAREPOINT_VER = '2013'
->(
+export async function getFiles<T, V extends SHAREPOINT_VER = '2013'>(
   context: RequestContext<V>,
   options?: Folder_Options<T>
 ) {
@@ -20,10 +17,7 @@ export async function getFiles<
     params,
   });
 
-  const data =
-    options?.limit || !response.data.d.results
-      ? response.data.d
-      : response.data.d.results;
+  const data = response.data?.d?.results ?? response.data?.d ?? response.data;
 
   const meta = { url };
 

package/src/root/internal/listRequests/getListItems.ts

@@ -1,14 +1,14 @@
-import type { Options, SPItem, SHAREPOINT_VER } from '../../../types';
+import { Options, SPItem, SHAREPOINT_VER } from '../../../types';
 import { appendParamsToUrl, buildODataParams } from '../odata';
-import type { RequestContext } from '../context';
+import { RequestContext } from '../context';
 
-export async function getListItems<
-  K,
-  V extends SHAREPOINT_VER = '2013'
->(
+export async function getListItems<K, V extends SHAREPOINT_VER = '2013'>(
   context: RequestContext<V>,
   options?: Options<K, V>
-): Promise<{ data: (K & Partial<SPItem<V>>)[]; meta: { url: URL } }> {
+): Promise<{
+  data: (K & Partial<SPItem<V>>) | (K & Partial<SPItem<V>>)[] | undefined;
+  meta: { url: URL };
+}> {
   const params = buildODataParams(options, ' ');
 
   const url = new URL(context.endpoint, context.instance.defaults.baseURL);
@@ -20,7 +20,8 @@ export async function getListItems<
     params,
   });
 
-  const rawData = response.data?.d?.results ?? response.data?.d ?? response.data;
+  const rawData =
+    response.data?.d?.results ?? response.data?.d ?? response.data;
   const cols = options?.cols;
   const keys = cols
     ? (Array.isArray(cols) ? cols : [cols]).filter(Boolean)
@@ -46,5 +47,11 @@ export async function getListItems<
 
   const meta = { url };
 
-  return { data: data as (K & Partial<SPItem<V>>)[], meta };
+  return {
+    data: data as
+      | (K & Partial<SPItem<V>>)
+      | (K & Partial<SPItem<V>>)[]
+      | undefined,
+    meta,
+  };
 }

package/src/root/internal/listRequests/getOnly.ts

@@ -1,18 +1,21 @@
-import type { AxiosInstance } from 'axios';
-import type { Options, SHAREPOINT_VER } from '../../../types';
+import { AxiosInstance } from 'axios';
+import { Options, SHAREPOINT_VER } from '../../../types';
 import { buildODataParams } from '../odata';
 
-export async function getOnly<
-  T,
-  V extends SHAREPOINT_VER = '2013'
->(
+export async function getOnly<T, V extends SHAREPOINT_VER = '2013'>(
   instance: AxiosInstance,
   endpoint: string,
   options?: Options<T, V>
 ) {
   const params = buildODataParams(options, ',');
   const { data } = await instance.get(endpoint, { params });
-  if (data) {
+  if (!data) {
+    return undefined;
+  }
+
+  if (data.d) {
     return data.d.results ? data.d.results : data.d;
   }
+
+  return data;
 }

package/src/root/internal/listRequests/normalizePayload.ts

@@ -0,0 +1,165 @@
+import { ListData } from '../../../types';
+
+type AnyRecord = Record<string, unknown>;
+
+const LOOKUP_ID_KEYS = [
+  'lookupId',
+  'LookupId',
+  'lookupID',
+  'LookupID',
+  'Id',
+  'ID',
+];
+
+function isPlainObject(value: unknown): value is AnyRecord {
+  return !!value && typeof value === 'object' && !Array.isArray(value);
+}
+
+function extractLookupPrimitive(
+  value: AnyRecord,
+  allowGenericId: boolean
+): unknown | undefined {
+  for (const key of LOOKUP_ID_KEYS) {
+    if (!allowGenericId && (key === 'Id' || key === 'ID')) {
+      continue;
+    }
+    if (value[key] !== undefined && value[key] !== null) {
+      return value[key];
+    }
+  }
+  return undefined;
+}
+
+function normalizeLookupValue(value: unknown): unknown {
+  if (Array.isArray(value)) {
+    return { results: value };
+  }
+
+  if (isPlainObject(value)) {
+    if (Array.isArray(value.results)) {
+      return { results: value.results };
+    }
+
+    const primitive = extractLookupPrimitive(value, true);
+    if (primitive !== undefined) {
+      return primitive;
+    }
+  }
+
+  if (typeof value === 'string') {
+    const trimmed = value.trim();
+    if (!trimmed) {
+      return value;
+    }
+    const numeric = Number(trimmed);
+    return Number.isNaN(numeric) ? trimmed : numeric;
+  }
+
+  return value;
+}
+
+function resolveLookupField(key: string, value: unknown) {
+  const lower = key.toLowerCase();
+  const endsWithId = lower.endsWith('id');
+  const endsWithRef = lower.endsWith('ref');
+  const endsWithLookup = lower.endsWith('lookup');
+  const hasLookupHint = endsWithId || endsWithRef || endsWithLookup;
+
+  if (value === undefined) {
+    return null;
+  }
+
+  if (Array.isArray(value)) {
+    const targetKey = endsWithId ? key : `${key}Id`;
+    return {
+      key: targetKey,
+      value: { results: value },
+    };
+  }
+
+  if (isPlainObject(value)) {
+    const primitive = extractLookupPrimitive(value, hasLookupHint);
+    if (primitive !== undefined) {
+      const targetKey = endsWithId ? key : `${key}Id`;
+      return {
+        key: targetKey,
+        value: normalizeLookupValue(primitive),
+      };
+    }
+
+    if (Array.isArray(value.results)) {
+      const targetKey = endsWithId ? key : `${key}Id`;
+      return {
+        key: targetKey,
+        value: { results: value.results },
+      };
+    }
+
+    if (!hasLookupHint) {
+      return null;
+    }
+  } else if (!hasLookupHint) {
+    return null;
+  }
+
+  const targetKey = endsWithId ? key : `${key}Id`;
+
+  if (value === null) {
+    return {
+      key: targetKey,
+      value: null,
+    };
+  }
+
+  if (typeof value === 'number') {
+    return {
+      key: targetKey,
+      value,
+    };
+  }
+
+  if (typeof value === 'string') {
+    const trimmed = value.trim();
+    if (!trimmed) {
+      return {
+        key: targetKey,
+        value: '',
+      };
+    }
+    const numeric = Number(trimmed);
+    return {
+      key: targetKey,
+      value: Number.isNaN(numeric) ? trimmed : numeric,
+    };
+  }
+
+  return null;
+}
+
+export function normalizeListPayload<D = Record<string, unknown>>(
+  data: ListData<D>
+): AnyRecord {
+  const result: AnyRecord = {};
+
+  if (!data) {
+    return result;
+  }
+
+  for (const [key, value] of Object.entries(data as AnyRecord)) {
+    if (key === '__metadata') {
+      continue;
+    }
+
+    const lookupField = resolveLookupField(key, value);
+    if (lookupField) {
+      result[lookupField.key] = lookupField.value;
+      continue;
+    }
+
+    if (value !== undefined) {
+      result[key] = value;
+    }
+  }
+
+  return result;
+}

package/src/root/internal/listRequests/updateListItem.ts

@@ -1,6 +1,8 @@
-import type { ListData, SHAREPOINT_VER } from '../../../types';
+import { ListData, SHAREPOINT_VER } from '../../../types';
 import { fetchDigest } from '../digest';
-import type { RequestContext } from '../context';
+import { RequestContext } from '../context';
+import { normalizeListPayload } from './normalizePayload';
+import { buildListByTitleEndpoint } from '../sharepointUrl';
 
 async function resolveMetadataType<V extends SHAREPOINT_VER>(
   context: RequestContext<V>
@@ -16,24 +18,40 @@ async function resolveMetadataType<V extends SHAREPOINT_VER>(
   return `SP.Data.${context.listName}ListItem`;
 }
 
-export async function updateListItem<V extends SHAREPOINT_VER = '2013'>(
+export async function updateListItem<
+  D = Record<string, unknown>,
+  V extends SHAREPOINT_VER = '2013'
+>(
   context: RequestContext<V>,
   id: number | string,
-  data: ListData,
+  data: ListData<D>,
   digest?: string
 ) {
   const formDigestValue =
     digest || (await fetchDigest(context.instance, context.baseURL));
 
-  const metadataType = await resolveMetadataType(context);
-  const payload = {
-    ...data,
-    __metadata: {
-      type: metadataType,
-    },
-  };
+  const normalizedData = normalizeListPayload(data);
+  let payload: Record<string, unknown> = normalizedData;
+
+  if (context.sharepointVersion === '2013') {
+    const metadataType = await resolveMetadataType(context);
+    const userMetadata = (data as { __metadata?: Record<string, unknown> })
+      .__metadata;
+    payload = {
+      ...normalizedData,
+      __metadata: {
+        ...(userMetadata && typeof userMetadata === 'object'
+          ? userMetadata
+          : {}),
+        type: metadataType,
+      },
+    };
+  }
 
-  const url = `_api/lists/getbytitle('${context.listName}')/getItemById('${id}')`;
+  const url =
+    context.sharepointVersion === '2013'
+      ? `${buildListByTitleEndpoint(context.listName)}/items(${id})`
+      : `${context.endpoint}(${id})`;
 
   const response = await context.instance({
     url,
@@ -42,7 +60,7 @@ export async function updateListItem<V extends SHAREPOINT_VER = '2013'>(
     headers: {
       'X-RequestDigest': formDigestValue,
       'IF-MATCH': '*',
-      'X-Http-Method': 'PATCH',
+      'X-HTTP-Method': 'MERGE',
     },
   });
 

package/src/root/internal/listRequests/uploadFile.ts

@@ -1,12 +1,9 @@
-import type { AxiosResponse } from 'axios';
-import type {
-  ItemID,
-  SHAREPOINT_VER,
-  UploadFileProps,
-} from '../../../types';
+import { AxiosResponse } from 'axios';
+import { ItemID, SHAREPOINT_VER, UploadFileProps } from '../../../types';
 import { fetchDigest } from '../digest';
-import type { RequestContext } from '../context';
+import { RequestContext } from '../context';
 import { buildLibraryPath, encodeFileName } from './utils';
+import { buildListByTitleEndpoint } from '../sharepointUrl';
 
 const SUPPORTED_VERSION: SHAREPOINT_VER = '2013';
 
@@ -24,7 +21,7 @@ export async function uploadFile<V extends SHAREPOINT_VER = '2013'>(
     throw new Error('A file with a valid name must be provided.');
   }
 
-  let requestUrl = `_api/web/lists/getbytitle('${context.listName}')/RootFolder`;
+  let requestUrl = `${buildListByTitleEndpoint(context.listName)}/RootFolder`;
 
   requestUrl += buildLibraryPath(folderPath);
 

package/src/root/internal/listRequests/utils.ts

@@ -11,7 +11,7 @@ export function buildLibraryPath(folderPath?: string | string[]) {
     return '';
   }
 
-  const escapedSegments = segments.map((segment) => {
+  const escapedSegments = segments.map(segment => {
     if (!segment.trim()) {
       throw new Error('Folder path segments cannot be empty.');
     }

package/src/root/internal/odata.ts

@@ -1,4 +1,4 @@
-import type { Folder_Options, Options, SHAREPOINT_VER } from '../../types';
+import { Folder_Options, Options, SHAREPOINT_VER } from '../../types';
 
 type QueryableOptions<T, V extends SHAREPOINT_VER = '2013'> =
   | Options<T, V>
@@ -16,9 +16,7 @@ export function buildODataParams<T, V extends SHAREPOINT_VER = '2013'>(
     $skip: skip,
     $select: Array.isArray(cols) ? cols.join(',') : cols,
     $filter: filter,
-    $orderby: Array.isArray(orderBy)
-      ? orderBy.join(orderBySeparator)
-      : orderBy,
+    $orderby: Array.isArray(orderBy) ? orderBy.join(orderBySeparator) : orderBy,
   };
 
   return params;

package/src/root/internal/sharepointUrl.ts

@@ -0,0 +1,7 @@
+export function escapeODataStringLiteral(value: string) {
+  return value.replace(/'/g, "''");
+}
+
+export function buildListByTitleEndpoint(listName: string) {
+  return `_api/web/lists/GetByTitle('${escapeODataStringLiteral(listName)}')`;
+}

package/src/root/internal/userRequests.ts

@@ -1,10 +1,7 @@
-import type { AxiosInstance } from 'axios';
-import type {
-  PersonField,
-  UserPermision,
-  UserProfile,
-} from '../../types';
-import type { RequestContext } from './context';
+import { AxiosInstance } from 'axios';
+import { PersonField, UserPermision, UserProfile } from '../../types';
+import { RequestContext } from './context';
+import { escapeODataStringLiteral } from './sharepointUrl';
 
 type RoleDefinition = {
   BasePermissions: {
@@ -46,7 +43,27 @@ export async function typeAhead(
     },
   });
 
-  return response.data.d.ClientPeoplePickerSearchUser;
+  const searchResults =
+    response.data?.d?.ClientPeoplePickerSearchUser ??
+    response.data?.ClientPeoplePickerSearchUser;
+
+  if (typeof searchResults === 'string') {
+    const parsed = JSON.parse(searchResults);
+    if (Array.isArray(parsed) && parsed.length > 0) {
+      return parsed[0] as PersonField;
+    }
+    throw new Error('People picker returned no results.');
+  }
+
+  if (Array.isArray(searchResults) && searchResults.length > 0) {
+    return searchResults[0] as PersonField;
+  }
+
+  if (searchResults && typeof searchResults === 'object') {
+    return searchResults as PersonField;
+  }
+
+  throw new Error('Invalid people picker response.');
 }
 
 export async function currentUserProperties(
@@ -77,9 +94,18 @@ export async function currentUserProperties(
   return profile;
 }
 
-export async function getSiteUser(instance: AxiosInstance, searchValue: string) {
-  const requestUrl = `_api/web/siteusers?&$filter=substringof('${searchValue}', Title) or substringof('${searchValue}', LoginName) or substringof('${searchValue}', Email)&$top=50&$expand=Groups`;
-  const response = await instance.get(requestUrl);
+export async function getSiteUser(
+  instance: AxiosInstance,
+  searchValue: string
+) {
+  const safeSearchValue = escapeODataStringLiteral(searchValue);
+  const response = await instance.get('_api/web/siteusers', {
+    params: {
+      $filter: `substringof('${safeSearchValue}', Title) or substringof('${safeSearchValue}', LoginName) or substringof('${safeSearchValue}', Email)`,
+      $top: 50,
+      $expand: 'Groups',
+    },
+  });
   return response.data.d;
 }
 
@@ -105,5 +131,11 @@ export async function currentUserPermissions(
     ({ BasePermissions }: RoleDefinition) => BasePermissions.High === High
   );
 
+  if (!result) {
+    throw new Error(
+      `Unable to resolve current user permission for BasePermissions.High="${High}".`
+    );
+  }
+
   return result as UserPermision;
 }