chore: #211 order by

mondrian-framework · Dec 21, 2023 · c51930b · c51930b
1 parent f2fc5b5
commit c51930b
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 52 deletions.
diff --git a/packages/module/src/retrieve.ts b/packages/module/src/retrieve.ts
@@ -69,26 +69,56 @@ type SelectType<T extends model.Type, C extends Capabilities>
   : [T] extends [(() => infer T1 extends model.Type)] ? SelectType<T1, C>
   : never : {}
 
-// prettier-ignore
-type OrderByType<T extends model.Type, C extends Capabilities>
-  = [C] extends [{ readonly orderBy: true }]
-  ? [T] extends [model.EntityType<any, infer Ts>] ? { readonly orderBy?: OrderByFields<Ts>[] } 
-  : [T] extends [model.ArrayType<any, infer T1>] ? SelectType<T1, AllCapabilities>
-  : [T] extends [model.OptionalType<infer T1>] ? SelectType<T1, C>
-  : [T] extends [model.NullableType<infer T1>] ? SelectType<T1, C>
-  : [T] extends [(() => infer T1 extends model.Type)] ? SelectType<T1, C>
-  : never : {}
+type OrderByType<T extends model.Type, C extends Capabilities> = [C] extends [{ readonly orderBy: true }]
+  ? { readonly orderBy?: OrderBy<T>[] }
+  : {}
 
-type OrderByFields<Ts extends model.Types> = { readonly [K in keyof Ts]?: OrderByField<Ts[K]> }
 // prettier-ignore
-type OrderByField<T extends model.Type> 
+type OrderBy<T extends model.Type>
   = [T] extends [model.EntityType<any, infer Ts>] ? OrderByFields<Ts>
   : [T] extends [model.ObjectType<any, infer Ts>] ? OrderByFields<Ts>
-  : [T] extends [model.ArrayType<any, any>] ? { readonly _count?: SortDirection }
-  : [T] extends [model.OptionalType<infer T1>] ? OrderByField<T1>
-  : [T] extends [model.NullableType<infer T1>] ? OrderByField<T1>
-  : [T] extends [(() => infer T1 extends model.Type)] ? OrderByField<T1>
+  : [T] extends [model.ArrayType<any, infer T1>] ? OrderByArray<T1>
+  : [T] extends [model.OptionalType<infer T1>] ? OrderBy<T1>
+  : [T] extends [model.NullableType<infer T1>] ? OrderBy<T1>
+  : [T] extends [(() => infer T1 extends model.Type)] ? OrderBy<T1>
   : SortDirection
+const orderBy = utils.memoizeTypeTransformation(orderByInternal)
+function orderByInternal(type: model.Type): model.Type {
+  return model.match(type, {
+    entity: ({ fields, options }) => orderByFields(fields, `${options?.name ?? randomUUID()}OrderBy`),
+    object: ({ fields, options }) => orderByFields(fields, `${options?.name ?? randomUUID()}OrderBy`),
+    array: ({ wrappedType }) => orderByArray(wrappedType),
+    wrapper: ({ wrappedType }) => orderBy(wrappedType),
+    otherwise: () => SortDirection,
+  })
+}
+
+type OrderByFields<Ts extends model.Types> = { readonly [K in keyof Ts]?: OrderBy<Ts[K]> }
+function orderByFields(fields: model.Types, name?: string): model.ObjectType<any, any> {
+  return model.object(
+    mapObject(fields, (_, fieldType) => model.optional(orderBy(fieldType))),
+    { name },
+  )
+}
+
+// prettier-ignore
+type OrderByArray<T extends model.Type>
+  = [T] extends [model.OptionalType<infer T1>] ? OrderByArray<T1>
+  : [T] extends [model.NullableType<infer T1>] ? OrderByArray<T1>
+  : [T] extends [model.EntityType<any, any>] ? { readonly _count?: SortDirection } 
+  : [T] extends [(() => infer T1 extends model.Type)] ? OrderByArray<T1>
+  : SortDirection
+function orderByArray(type: model.Type): model.Type {
+  return model.match(type, {
+    optional: ({ wrappedType }) => orderByArray(wrappedType),
+    nullable: ({ wrappedType }) => orderByArray(wrappedType),
+    entity: () => model.object({ _count: model.optional(SortDirection) }),
+    otherwise: () => SortDirection,
+  })
+}
+
+export const SortDirection = () => model.enumeration(['asc', 'desc'], { name: 'SortDirection' })
+export type SortDirection = model.Infer<typeof SortDirection>
 
 // prettier-ignore
 type WhereType<T extends model.Type, C extends Capabilities> 
@@ -240,7 +270,7 @@ function retrieve(
   return model.object({
     ...(capabilities.select ? { select: model.optional(entitySelect(entity)) } : {}),
     ...(capabilities.where ? { where: model.optional(entityWhere(entity)) } : {}),
-    ...(capabilities.orderBy ? { orderBy: model.array(entityOrderBy(entity)).optional() } : {}),
+    ...(capabilities.orderBy ? { orderBy: model.array(orderBy(entity)).optional() } : {}),
     ...(capabilities.skip ? { skip: model.integer({ minimum: 0 }).optional() } : {}),
     ...(capabilities.take ? { take: model.integer({ minimum: 0, maximum: 20 }).optional() } : {}),
     //distinct: model.unknown(),
@@ -353,29 +383,6 @@ function where(type: model.Type): model.Type {
   })
 }
 
-const entityOrderBy = utils.memoizeTypeTransformation<model.Lazy<model.EntityType<model.Mutability, model.Types>>>(
-  (type) => {
-    const entity = model.concretise(type)
-    return model.object(
-      mapObject(entity.fields, (_, fieldType) => model.optional(orderBy(fieldType))),
-      { name: `${entity.options?.name ?? randomUUID()}OrderBy` },
-    )
-  },
-)
-
-export const sortDirection = () => model.enumeration(['asc', 'desc'], { name: 'SortDirection' })
-export type SortDirection = model.Infer<typeof sortDirection>
-
-function orderBy(type: model.Type): model.Type {
-  return model.match(type, {
-    wrapper: ({ wrappedType }) => orderBy(wrappedType),
-    array: () => model.object({ _count: model.optional(sortDirection) }),
-    entity: (_, entity) => entityOrderBy(entity),
-    object: ({ fields }) => model.object(mapObject(fields, (_, fieldType) => model.optional(orderBy(fieldType)))),
-    otherwise: () => sortDirection,
-  })
-}
-
 export type MergeOptions = {
   orderByOrder?: 'left-before' | 'right-before'
   skipOrder?: 'left-before' | 'right-before'

diff --git a/packages/module/tests/retrieve.test.ts b/packages/module/tests/retrieve.test.ts
@@ -16,10 +16,13 @@ const user = () =>
     },
   )
 const metadata = () =>
-  model.object({
-    registeredAt: model.datetime(),
-    loggedInAt: model.datetime(),
-  })
+  model.object(
+    {
+      registeredAt: model.datetime(),
+      loggedInAt: model.datetime(),
+    },
+    { name: 'Metadata' },
+  )
 const post = () =>
   model.entity(
     {
@@ -414,14 +417,17 @@ describe('fromType', () => {
     const userOrderBy = () =>
       model.object(
         {
-          name: model.optional(retrieve.sortDirection),
+          name: model.optional(retrieve.SortDirection),
           bestFriend: model.optional(userOrderBy),
-          posts: model.object({ _count: model.optional(retrieve.sortDirection) }).optional(),
+          posts: model.object({ _count: model.optional(retrieve.SortDirection) }).optional(),
           metadata: model
-            .object({
-              registeredAt: model.optional(retrieve.sortDirection),
-              loggedInAt: model.optional(retrieve.sortDirection),
-            })
+            .object(
+              {
+                registeredAt: model.optional(retrieve.SortDirection),
+                loggedInAt: model.optional(retrieve.SortDirection),
+              },
+              { name: 'MetadataOrderBy' },
+            )
             .optional(),
         },
         { name: 'UserOrderBy' },
@@ -430,10 +436,10 @@ describe('fromType', () => {
     const postOrderBy = () =>
       model.object(
         {
-          title: model.optional(retrieve.sortDirection),
-          content: model.optional(retrieve.sortDirection),
+          title: model.optional(retrieve.SortDirection),
+          content: model.optional(retrieve.SortDirection),
           author: model.optional(userOrderBy),
-          tags: model.object({ _count: model.optional(retrieve.sortDirection) }).optional(),
+          tags: model.optional(retrieve.SortDirection),
         },
         { name: 'PostOrderBy' },
       )