fix(json-api-nestjs-sdk): Fix check for relation and add type for met…

…a data
klerick · Dec 5, 2024 · 9bbe9fd · 9bbe9fd
1 parent 7953371
commit 9bbe9fd
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 7 deletions.
diff --git a/libs/json-api/json-api-nestjs-sdk/src/lib/service/json-api-utils.service.ts b/libs/json-api/json-api-nestjs-sdk/src/lib/service/json-api-utils.service.ts
@@ -144,9 +144,19 @@ export class JsonApiUtilsService {
           httpParams = httpParams.set(
             `filter[${key}][${operand}]`,
             Array.isArray(filter)
-              ? filter.join(',')
+              ? filter
+                  .map((f) =>
+                    this.jsonApiSdkConfig.dateFields.includes(key) &&
+                    f instanceof Date
+                      ? f.toJSON()
+                      : f.toString()
+                  )
+                  .join(',')
               : filter === null
               ? 'null'
+              : this.jsonApiSdkConfig.dateFields.includes(key) &&
+                filter instanceof Date
+              ? filter.toJSON()
               : filter.toString()
           );
         }
@@ -177,6 +187,14 @@ export class JsonApiUtilsService {
     body: ResourceObject<E, 'array'>,
     includeEntity?: QueryParams<E>['include']
   ): E[];
+  convertResponseData<E, M>(
+    body: ResourceObject<E, 'object', M>,
+    includeEntity?: QueryParams<E>['include']
+  ): E;
+  convertResponseData<E, M>(
+    body: ResourceObject<E, 'array', M>,
+    includeEntity?: QueryParams<E>['include']
+  ): E[];
   convertResponseData<E>(
     body: ResourceObject<E, 'array'> | ResourceObject<E>,
     includeEntity?: QueryParams<E>['include']
@@ -241,7 +259,7 @@ export class JsonApiUtilsService {
     return result;
   }
 
-  private createEntityInstance<E>(name: string): E {
+  createEntityInstance<E>(name: string): E {
     const entityName = kebabToCamel(name);
     return Function('return new class ' + entityName + '{}')();
   }
@@ -297,9 +315,8 @@ export class JsonApiUtilsService {
 
     const relationships = ObjectTyped.entries(entity)
       .filter(([key, val]) => {
-        if (key === 'id') return false;
+        if (key === ID_KEY) return false;
         const item = Array.isArray(val) ? val[0] : val;
-        // console.log(key, val, isRelation(item));
         return isRelation(item);
       })
       .reduce((acum, [key, val]) => {

diff --git a/libs/json-api/json-api-nestjs-sdk/src/lib/utils/index.ts b/libs/json-api/json-api-nestjs-sdk/src/lib/utils/index.ts
@@ -33,9 +33,12 @@ export function getTypeForReq(str: string): string {
 }
 
 export function isRelation(val: any): boolean {
-  return !(
+  const result = !(
     val === null ||
     !val ||
     ['String', 'Boolean', 'Number', 'Date'].includes(val.constructor.name)
   );
+
+  if (!result) return result;
+  return ID_KEY in val;
 }
diff --git a/libs/json-api/json-shared-type/src/types/response-body.ts b/libs/json-api/json-shared-type/src/types/response-body.ts
@@ -50,8 +50,16 @@ export type ResourceData<T> = MainData & {
   links: Omit<Links, 'related'>;
 };
 
-export type ResourceObject<T, R extends 'object' | 'array' = 'object'> = {
-  meta: R extends 'array' ? PageProps & DebugMetaProps : DebugMetaProps;
+export type MetaProps<T, R = null> = R extends null ? T : T & R;
+
+export type ResourceObject<
+  T,
+  R extends 'object' | 'array' = 'object',
+  M = null
+> = {
+  meta: R extends 'array'
+    ? MetaProps<PageProps & DebugMetaProps, M>
+    : MetaProps<DebugMetaProps, M>;
   data: R extends 'array' ? ResourceData<T>[] : ResourceData<T>;
   included?: Include<T>[];
 };