Merge branch 'feature/simplify-types' into main

Author: oleg-yasenytsky

src/lib/create-form-data.ts

@@ -1,4 +1,5 @@
-import { CreateFormDataConfig, FormValue } from '../types/create-form-data';
+import { CreateFormDataConfig } from '../types/create-form-data';
+import { PrimitiveTypes } from '../types/primitive-types';
 
 import { getKeyString } from './utils/get-key-string';
 
@@ -8,8 +9,8 @@ import { getKeyString } from './utils/get-key-string';
  * @param config - configuration object
  * @param formData - form data instance
  */
-const fillFormData = (
-  value: FormValue | Record<string, FormValue | Array<FormValue>>,
+const fillFormData = <T extends object>(
+  value: T | T[] | PrimitiveTypes,
   config: CreateFormDataConfig,
   formData: FormData
 ): void => {
@@ -42,49 +43,53 @@ const fillFormData = (
       });
     }
   } else if (typeof value === 'object') {
-    if (value instanceof File || value instanceof Blob) {
+    if (value instanceof File) {
+      formData.append(
+        keyPrefix,
+        value,
+        value.name
+      );
+    }
+    else if(value instanceof Blob){
       formData.append(
         keyPrefix,
         value,
-        'name' in value ? value.name : undefined
       );
     } else {
       Object.keys(value).forEach((key) => {
         const keyString = getKeyString(keyPrefix, key, index);
-        fillFormData(value[key], { ...config, keyPrefix: keyString }, formData);
+        fillFormData(value[key as keyof object], { ...config, keyPrefix: keyString }, formData);
       });
     }
   } else {
-    const simpleValue = value.toString();
-    if (simpleValue === '' && !allowEmptyValues) {
+    const primitiveValue = value.toString();
+    if (primitiveValue === '' && !allowEmptyValues) {
       return;
     }
-    formData.append(keyPrefix, simpleValue);
+    formData.append(keyPrefix, primitiveValue);
   }
 };
 
+const defaultConfig = {
+  keyPrefix: '',
+  index: null,
+  booleanMapper: (val: boolean) => (val ? '1' : '0'),
+  allowNullableValues: false,
+  allowEmptyValues: false,
+}
 /**
  *  fill form data recursive function
  * @param value - form value
  * @param options - configuration object
  * @param existingFormData - optional existing form data instance
  */
-export const createFormData = (
-  value: Record<string, FormValue> | FormData,
+export const createFormData = <T extends object>(
+  value: T | FormData,
   options?: Partial<CreateFormDataConfig>,
   existingFormData?: FormData
 ): FormData => {
   // create config from default and argument options
-  const config = Object.assign(
-    {
-      keyPrefix: '',
-      index: null,
-      booleanMapper: (val: boolean) => (val ? '1' : '0'),
-      allowNullableValues: false,
-      allowEmptyValues: false,
-    },
-    options || {}
-  );
+  const config = Object.assign({...defaultConfig},options || {});
 
   // return form data if value instanceof FormData
   if (value instanceof FormData) {
@@ -97,6 +102,6 @@ export const createFormData = (
   }
   // fill form data by form value and return
   const formData = existingFormData || new FormData();
-  fillFormData(value, config, formData);
+  fillFormData({...value}, config, formData);
   return formData;
 };

src/lib/create-url-params.ts

@@ -1,67 +1,64 @@
 import {
-  ArrayRecordType,
-  CreateURLParamsConfig,
-  RecordValue,
+  CreateURLParamsConfig
 } from '../types/create-url-params';
 
 import { getKeyString } from './utils/get-key-string';
 
-export const createURLParams = (
-  value: Readonly<Record<string, RecordValue>> | ArrayRecordType,
+const defaultConfig: CreateURLParamsConfig = {
+  keyPrefix: '',
+  toString: false,
+  index: null,
+  booleanMapper: (val: boolean) => (val ? '1' : '0')
+};
+
+export const createURLParams = <T extends object>(
+  value: T | T[] | null | undefined,
   config?: Partial<CreateURLParamsConfig>
-): Record<string, RecordValue> => {
+): object => {
   const { keyPrefix, toString, index, booleanMapper }: CreateURLParamsConfig =
-    Object.assign(
-      {
-        keyPrefix: '',
-        toString: false,
-        index: null,
-        booleanMapper: (val: boolean) => (val ? '1' : '0'),
-      },
-      config || {}
-    );
+    Object.assign({ ...defaultConfig }, config || {});
 
   if (value === undefined || value === null) {
     return {};
   }
 
   if (Array.isArray(value)) {
-    return value.reduce((acc: Record<string, RecordValue>, curr, i) => {
+    return value.reduce((acc: object, curr, i) => {
       if (typeof curr === 'object') {
         return {
           ...acc,
           ...createURLParams(curr, {
             ...config,
             keyPrefix,
-            index: i,
-          }),
+            index: i
+          })
         };
       }
-      if (!keyPrefix) {
+      if (!keyPrefix || curr === null || curr === undefined) {
         return acc;
       }
       const value =
         typeof curr === 'boolean'
           ? booleanMapper(curr)
           : toString
-          ? String(curr)
-          : curr;
+            ? String(curr)
+            : curr;
       return { ...acc, [`${keyPrefix}[${i}]`]: value };
     }, {});
   }
 
   return Object.keys(value).reduce(
-    (acc: Record<string, RecordValue>, key: string) => {
+    (acc: object, key: string) => {
       const keyString = getKeyString(keyPrefix, key, index);
-      const item = value[key];
+      const item = value[key as keyof object];
 
       if (Array.isArray(item)) {
         return {
           ...acc,
           ...createURLParams(item, {
             ...config,
-            keyPrefix: keyString,
-          }),
+            keyPrefix: keyString
+          })
         };
       }
 
@@ -72,7 +69,7 @@ export const createURLParams = (
       if (item && typeof item === 'object') {
         return {
           ...acc,
-          ...createURLParams(item, { ...config, keyPrefix: keyString }),
+          ...createURLParams(item, { ...config, keyPrefix: keyString })
         };
       }
 

src/types/create-form-data.ts

@@ -1,14 +1,3 @@
-import { PrimitiveTypes } from './primitive-types';
-
-type Value = PrimitiveTypes | Date | File | Blob;
-
-type ArrayFormValue = Array<Record<string, FormValue> | FormValue>;
-
-export type FormValue =
-  | ArrayFormValue
-  | Record<string, ArrayFormValue | Value>
-  | Value;
-
 export interface CreateFormDataConfig {
   keyPrefix: string;
   index: number | null;

src/types/create-url-params.ts

@@ -1,14 +1,3 @@
-import { PrimitiveTypes } from './primitive-types';
-
-export type ArrayRecordType = Array<
-  Record<string, RecordValue> | string | number | boolean
->;
-
-export type RecordValue =
-  | PrimitiveTypes
-  | Record<string, PrimitiveTypes>
-  | ArrayRecordType;
-
 export interface CreateURLParamsConfig {
   keyPrefix: string;
   toString: boolean;