From 481513cfc3e12c82fe2e3735dc04c1c11ff05ae9 Mon Sep 17 00:00:00 2001
From: SKairinos <stefan.kairinos@ocado.com>
Date: Fri, 31 May 2024 11:32:14 +0000
Subject: [PATCH 1/2] fix: rtk helpers

---
 src/helpers/rtkQuery.ts | 263 ++++++++++++++++++++++++++--------------
 1 file changed, 172 insertions(+), 91 deletions(-)

diff --git a/src/helpers/rtkQuery.ts b/src/helpers/rtkQuery.ts
index 610a9636..351934a0 100644
--- a/src/helpers/rtkQuery.ts
+++ b/src/helpers/rtkQuery.ts
@@ -1,3 +1,5 @@
+import type { FetchBaseQueryError } from "@reduxjs/toolkit/query";
+
 // -----------------------------------------------------------------------------
 // Model Types
 // -----------------------------------------------------------------------------
@@ -5,48 +7,31 @@
 // The fields of a model.
 export type Fields = Record<string, unknown>;
 
+export type TagId = string | number;
+
+export type Tag<Type extends string> = {
+  type: Type;
+  id: TagId;
+};
+
 /**
  * A data model.
- *  ID: The type of ID.
- *  ReadAndWrite: The fields that can both be read from and written to.
- *  ReadOnly: The fields that can only be read from. 'id' is a mandatory
- *    read-only field.
- *  WriteOnly: The fields that can only be written to.
+ *  Id: The type of Id.
+ *  Data: The data fields.
  */
-export type Model<
-  ID,
-  ReadAndWrite extends Fields = Fields,
-  ReadOnly extends Fields = Fields,
-  WriteOnly extends Fields = Fields
-> = ReadAndWrite & {
-  _readOnly: ReadOnly & { id: ID; };
-  _writeOnly: WriteOnly;
-};
+export type Model<Id extends TagId, MFields extends Fields = Fields> = {
+  id: Id;
+} & Omit<MFields, "id">;
 
-// Gets the type of a model's ID.
-export type ID<M extends Model<any>> = M['_readOnly']['id'];
+export type Result<M extends Model<any>, MFields extends keyof M = "id"> = Pick<
+  M,
+  "id" | MFields
+>;
 
-// Gets the types of a model's readable fields.
-export type ReadFields<M extends Model<any>> =
-  Omit<M, '_readOnly' | '_writeOnly'> & M['_readOnly'];
-
-// Gets the types of a model's writeable fields.
-export type WriteFields<M extends Model<any>> =
-  Omit<M, '_readOnly' | '_writeOnly'> & M['_writeOnly'];
-
-// Gets the types of a model's readable and writeable fields.
-export type ReadAndWriteFields<M extends Model<any>> =
-  Omit<M, '_readOnly' | '_writeOnly'> & M['_readOnly'] & M['_writeOnly'];
-
-// An array of tags with ID's.
-export type TagArray<
-  Type extends string,
-  M extends Model<any>,
-  LookupField extends keyof ReadFields<M> = 'id'
-> = Array<{
-  type: Type;
-  id: ReadFields<M>[LookupField];
-}>;
+export type Arg<M extends Model<any>, MFields extends keyof M> = Pick<
+  M,
+  MFields
+>;
 
 // -----------------------------------------------------------------------------
 // CRUD Types
@@ -55,103 +40,199 @@ export type TagArray<
 
 // Create
 
-export type CreateResult<M extends Model<any>> = ReadFields<M>;
+export type CreateResult<
+  M extends Model<any>,
+  MFields extends keyof M = "id",
+> = Result<M, MFields>;
 
-export type CreateArg<M extends Model<any>> = WriteFields<M>;
+export type CreateArg<
+  M extends Model<any>,
+  MFields extends keyof Omit<M, "id">,
+> = Arg<M, MFields>;
 
-export type BulkCreateResult<M extends Model<any>> = Array<CreateResult<M>>;
+export type BulkCreateResult<
+  M extends Model<any>,
+  MFields extends keyof M = "id",
+  ExtraFields extends Fields = Fields,
+> = Array<Result<M, MFields> & ExtraFields>;
 
-export interface BulkCreateArg<M extends Model<any>> {
-  data: Array<CreateArg<M>>;
-}
+export type BulkCreateArg<
+  M extends Model<any>,
+  MFields extends keyof Omit<M, "id">,
+  ExtraFields extends Fields = Fields,
+> = Array<Arg<M, MFields> & ExtraFields>;
 
 // Read
 
-export type RetrieveResult<M extends Model<any>> = ReadFields<M>;
-
-export type RetrieveArg<
+export type RetrieveResult<
   M extends Model<any>,
-  LookupField extends keyof ReadAndWriteFields<M> = 'id'
-> = Pick<ReadAndWriteFields<M>, LookupField>;
+  MFields extends keyof M = "id",
+> = Result<M, MFields>;
+
+export type RetrieveArg<M extends Model<any>> = M["id"];
 
-export interface ListResult<M extends Model<any>> {
+export interface ListResult<
+  M extends Model<any>,
+  MFields extends keyof M = "id",
+  ExtraFields extends Fields = Fields,
+> {
   count: number;
   offset: number;
   limit: number;
   maxLimit: number;
-  data: Array<RetrieveResult<M>>;
+  data: Array<Result<M, MFields> & ExtraFields>;
 }
 
-export type ListArg<Filters extends Fields = Fields> =
-  null | Partial<Filters>;
+export type ListArg<Filters extends Fields = Fields> = {
+  limit: number;
+  offset: number;
+} & Partial<Omit<Filters, "limit" | "offset">>;
 
 // Update
 
-export type UpdateResult<M extends Model<any>> = ReadFields<M>;
+export type UpdateResult<
+  M extends Model<any>,
+  MFields extends keyof M = "id",
+> = Result<M, MFields>;
 
 export type UpdateArg<
   M extends Model<any>,
-  LookupField extends keyof ReadAndWriteFields<M> = 'id'
-> = Pick<ReadAndWriteFields<M>, LookupField> & Partial<WriteFields<M>>;
+  MFields extends keyof Omit<M, "id">,
+  ExtraFields extends Fields = Fields,
+> = [M["id"], Arg<M, MFields> & ExtraFields];
 
-export type BulkUpdateResult<M extends Model<any>> = Array<UpdateResult<M>>;
+export type BulkUpdateResult<
+  M extends Model<any>,
+  MFields extends keyof M = "id",
+  ExtraFields extends Fields = Fields,
+> = Array<Result<M, MFields> & ExtraFields>;
 
-export interface BulkUpdateArg<
+export type BulkUpdateArg<
   M extends Model<any>,
-  LookupField extends keyof ReadAndWriteFields<M> = 'id'
-> {
-  data: Array<UpdateArg<M, LookupField>>;
-}
+  MFields extends keyof Omit<M, "id">,
+  ExtraFields extends Fields = Fields,
+> = Record<M["id"], Arg<M, MFields> & ExtraFields>;
+
+export type PartialUpdateResult<
+  M extends Model<any>,
+  MFields extends keyof M = "id",
+> = Result<M, MFields>;
+
+export type PartialUpdateArg<
+  M extends Model<any>,
+  MFields extends keyof Omit<M, "id">,
+  ExtraFields extends Fields = Fields,
+> = [M["id"], Partial<Arg<M, MFields> & ExtraFields>];
+
+export type BulkPartialUpdateResult<
+  M extends Model<any>,
+  MFields extends keyof M = "id",
+  ExtraFields extends Fields = Fields,
+> = Array<Result<M, MFields> & ExtraFields>;
+
+export type BulkPartialUpdateArg<
+  M extends Model<any>,
+  MFields extends keyof Omit<M, "id">,
+  ExtraFields extends Fields = Fields,
+> = Record<M["id"], Partial<Arg<M, MFields> & ExtraFields>>;
 
 // Delete
 
 export type DestroyResult = null;
 
-export type DestroyArg<
-  M extends Model<any>,
-  LookupField extends keyof ReadAndWriteFields<M> = 'id'
-> = Pick<ReadAndWriteFields<M>, LookupField>;
+export type DestroyArg<M extends Model<any>> = M["id"];
 
 export type BulkDestroyResult = null;
 
-export interface BulkDestroyArg<
-  M extends Model<any>,
-  LookupField extends keyof ReadAndWriteFields<M> = 'id'
-> {
-  LookupField: Array<DestroyArg<M, LookupField>[LookupField]>;
-}
+export type BulkDestroyArg<M extends Model<any>> = Array<M["id"]>;
 
 // -----------------------------------------------------------------------------
 // Functions
 // -----------------------------------------------------------------------------
 
-export function searchParamsToString(arg: ListArg): string {
-  if (arg !== null) {
-    const searchParams = Object.entries(arg)
+export function buildUrl(
+  url: string,
+  params: {
+    search?: Fields;
+    url?: Fields;
+  }
+): string {
+  if (params.url) {
+    Object.entries(params.url).forEach(([key, value]) => {
+      url = url.replace(`<${key}>`, String(value));
+    });
+  }
+
+  if (params.search) {
+    const searchParams = Object.entries(params.search)
       .filter(([_, value]) => value !== undefined)
       .map(([key, value]) => [key, String(value)]);
 
     if (searchParams.length !== 0) {
-      return `?${new URLSearchParams(searchParams).toString()}`;
+      url += `?${new URLSearchParams(searchParams).toString()}`;
     }
   }
 
-  return '';
+  return url;
 }
 
-export function tagData<
-  Type extends string,
-  M extends Model<any>,
-  LookupField extends keyof ReadFields<M> = 'id'
->(
-  result: ListResult<M> | BulkCreateResult<M>,
-  type: Type,
-  lookupField: LookupField = 'id' as LookupField
-): TagArray<Type, M, LookupField> {
-  const data = 'data' in result ? result.data : result;
-
-  return data.map((result) => ({
-    type,
-    id: result[lookupField]
-  })) as TagArray<Type, M, LookupField>;
+export function isTagId(value: unknown): boolean {
+  return typeof value === "number" || typeof value === "string";
+}
+
+export function tagData<Type extends string, M extends Model<any>>(
+  type: Type
+): (
+  result:
+    | Result<M, any>
+    | Array<Result<M, any>>
+    | ListResult<M, any>
+    | null
+    | undefined,
+  error: FetchBaseQueryError | undefined,
+  arg:
+    | Arg<M, any>
+    | Array<Arg<M, any>>
+    | [M["id"], Arg<M, any>]
+    | Record<M["id"], any>
+    | ListArg<any>
+    | Array<M["id"]>
+    | string
+    | number
+    | undefined
+) => Array<Tag<Type>> {
+  return (result, error, arg) => {
+    if (!error) {
+      if (arg) {
+        if (isTagId(arg)) return [{ type, id: arg as TagId }];
+
+        if (Array.isArray(arg) && arg.length > 0) {
+          if (isTagId(arg[0])) {
+            if (arg.length === 2 && !isTagId(arg[1])) {
+              return [{ type, id: (arg as [M["id"], Arg<M, any>])[0] }];
+            }
+
+            return (arg as Array<M["id"]>).map((id) => ({ type, id }));
+          }
+        }
+      }
+
+      if (result) {
+        if ("id" in result) {
+          return [{ type, id: result["id"] as TagId }];
+        }
+
+        if (Array.isArray(result)) {
+          return result.map((result) => ({ type, id: result["id"] as TagId }));
+        }
+
+        return (result as ListResult<M, any>).data.map((result) => ({
+          type,
+          id: result["id"] as TagId,
+        }));
+      }
+    }
+
+    return [];
+  };
 }

From 01d60dbbd4ee57682427e69aec24b27bbd9ced1e Mon Sep 17 00:00:00 2001
From: SKairinos <stefan.kairinos@ocado.com>
Date: Fri, 31 May 2024 12:00:47 +0000
Subject: [PATCH 2/2] fix: type

---
 src/helpers/rtkQuery.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/helpers/rtkQuery.ts b/src/helpers/rtkQuery.ts
index 351934a0..bc6fa7e5 100644
--- a/src/helpers/rtkQuery.ts
+++ b/src/helpers/rtkQuery.ts
@@ -194,7 +194,7 @@ export function tagData<Type extends string, M extends Model<any>>(
     | Arg<M, any>
     | Array<Arg<M, any>>
     | [M["id"], Arg<M, any>]
-    | Record<M["id"], any>
+    | Record<M["id"], Arg<M, any>>
     | ListArg<any>
     | Array<M["id"]>
     | string