@lindle/sharepoint_requests 0.1.16 → 0.1.18

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

@@ -1,4 +1,9 @@
-import type { SHAREPOINT_VER, UploadFileProps } from '../../../types';
+import type { AxiosResponse } from 'axios';
+import type {
+  ItemID,
+  SHAREPOINT_VER,
+  UploadFileProps,
+} from '../../../types';
 import { fetchDigest } from '../digest';
 import type { RequestContext } from '../context';
 import { buildLibraryPath, encodeFileName } from './utils';
@@ -8,7 +13,7 @@ const SUPPORTED_VERSION: SHAREPOINT_VER = '2013';
 export async function uploadFile<V extends SHAREPOINT_VER = '2013'>(
   context: RequestContext<V>,
   { file, folderPath, overwrite = true }: UploadFileProps
-) {
+): Promise<AxiosResponse & { itemId?: ItemID }> {
   if (context.sharepointVersion !== SUPPORTED_VERSION) {
     throw new Error(
       'uploadFile is only supported for SharePoint 2013 REST endpoints.'
@@ -26,17 +31,39 @@ export async function uploadFile<V extends SHAREPOINT_VER = '2013'>(
   const encodedFileName = encodeFileName(file.name);
   requestUrl += `/Files/add(url='${encodedFileName}',overwrite=${
     overwrite ? 'true' : 'false'
-  })`;
+  })?$expand=ListItemAllFields&$select=ListItemAllFields/Id`;
 
   const digest = await fetchDigest(context.instance, context.baseURL);
 
-  const response = await context.instance.post(requestUrl, file, {
+  const response = (await context.instance.post(requestUrl, file, {
     headers: {
       'Content-Type': file.type || 'application/octet-stream',
       'X-RequestDigest': digest,
     },
     withCredentials: true,
-  });
+  })) as AxiosResponse & { itemId?: ItemID };
+
+  const responseData = response.data?.d ?? response.data;
+  const listItemFields = responseData?.ListItemAllFields;
+  const itemId =
+    listItemFields?.Id ??
+    listItemFields?.ID ??
+    responseData?.Id ??
+    responseData?.ID;
+
+  if (typeof itemId !== 'undefined') {
+    response.itemId = itemId;
+  } else if (listItemFields?.__deferred?.uri) {
+    const listItemResponse = await context.instance.get(
+      listItemFields.__deferred.uri
+    );
+    const deferredId =
+      listItemResponse.data?.d?.Id ?? listItemResponse.data?.Id;
+
+    if (typeof deferredId !== 'undefined') {
+      response.itemId = deferredId;
+    }
+  }
 
   return response;
 }

package/src/types.ts

@@ -108,20 +108,11 @@ export type DeleteFileProps = {
   folderPath?: string | string[];
 };
 
-export type ListData =
-  | {
-      [key: string]: any;
-      __metadata?: {
-        type: string;
-      };
-    }
-  | any;
-
-export type EmailProps = {
-  From: string;
-  To: string[] | string;
-  Subject?: string;
-  Body: string;
+export type EmailProps = {
+  From: string;
+  To: string[] | string;
+  Subject?: string;
+  Body: string;
 };
 
 export type _Deferred = {
@@ -130,16 +121,54 @@ export type _Deferred = {
   };
 };
 
-export type LookupField<T> = _Deferred & T;
-export type ChoiceField<T> = _Deferred & {
-  Value: T;
-  __metadata: Metadata;
-};
-
-export type PersonField = {
-  AboutMe?: string;
-  Account: string;
-  AccountName: string;
+declare const LOOKUP_FIELD_TAG: unique symbol;
+type LookupFieldMarker = {
+  [LOOKUP_FIELD_TAG]?: true;
+};
+
+export type LookupField<T> = _Deferred & T & LookupFieldMarker;
+export type ChoiceField<T> = _Deferred & {
+  Value: T;
+  __metadata: Metadata;
+};
+
+type MetadataEnvelope = {
+  __metadata?: {
+    type: string;
+  };
+};
+
+type EnsureRecord<T> = T extends Record<string, unknown>
+  ? T
+  : Record<string, unknown>;
+
+type LookupCreateValue =
+  | number
+  | string
+  | null
+  | {
+      lookupId: number | string;
+    }
+  | {
+      LookupId: number | string;
+    }
+  | {
+      results: (number | string)[];
+    };
+
+type NormalizeField<T> = T extends LookupField<unknown>
+  ? LookupCreateValue | LookupField<unknown>
+  : T;
+
+export type ListData<T = Record<string, unknown>> = Partial<{
+  [K in keyof EnsureRecord<T>]: NormalizeField<EnsureRecord<T>[K]>;
+}> &
+  MetadataEnvelope;
+
+export type PersonField = {
+  AboutMe?: string;
+  Account: string;
+  AccountName: string;
   AdministrativeSupervisor: string;
   AskMeAbout?: string;
   AskMeAbout0?: string;