@nixxie-cms/core 1.0.3 → 2.0.0

package/src/types/next-fields.ts

@@ -1,6 +1,6 @@
 import Decimal from 'decimal.js'
 import { g } from '../types/schema'
-import type { BaseListTypeInfo } from './type-info'
+import type { BaseCollectionTypeInfo } from './type-info'
 import type { BaseFieldTypeInfo, CommonFieldConfig } from './config'
 import type { DatabaseProvider } from './core'
 import type {
@@ -24,16 +24,16 @@ export { Decimal }
 
 export type BaseItem = { id: { toString(): string }; [key: string]: unknown }
 
-export type ListGraphQLTypes<ListTypeInfo extends BaseListTypeInfo> = {
-  types: GraphQLTypesForList<ListTypeInfo>
+export type CollectionGraphQLTypes<CollectionTypeInfo extends BaseCollectionTypeInfo> = {
+  types: GraphQLTypesForCollection<CollectionTypeInfo>
 }
 
-export type FieldData<ListTypeInfo extends BaseListTypeInfo = BaseListTypeInfo> = {
+export type FieldData<CollectionTypeInfo extends BaseCollectionTypeInfo = BaseCollectionTypeInfo> = {
   lists: {
-    [Key in keyof ListTypeInfo['all']['lists']]: ListGraphQLTypes<ListTypeInfo['all']['lists'][Key]>
+    [Key in keyof CollectionTypeInfo['all']['lists']]: CollectionGraphQLTypes<CollectionTypeInfo['all']['lists'][Key]>
   }
   provider: DatabaseProvider
-  listKey: ListTypeInfo['key']
+  listKey: CollectionTypeInfo['key']
   fieldKey: string
 }
 
@@ -62,8 +62,8 @@ export type SimpleFieldTypeInfo<Scalar extends ScalarNames> = {
   }
 }
 
-export type FieldTypeFunc<ListTypeInfo extends BaseListTypeInfo> = (
-  data: FieldData<ListTypeInfo>
+export type FieldTypeFunc<CollectionTypeInfo extends BaseCollectionTypeInfo> = (
+  data: FieldData<CollectionTypeInfo>
 ) => NextFieldType<
   DBField,
   GArg<GInputType> | undefined,
@@ -71,7 +71,7 @@ export type FieldTypeFunc<ListTypeInfo extends BaseListTypeInfo> = (
   GArg<GNullableInputType, false>,
   GArg<GNullableInputType, false>,
   GArg<GNullableInputType, false>,
-  ListTypeInfo
+  CollectionTypeInfo
 >
 
 export type NextFieldType<
@@ -81,7 +81,7 @@ export type NextFieldType<
   UniqueWhereArg extends GArg<GNullableInputType, false> = GArg<GNullableInputType, false>,
   OrderByArg extends GArg<GNullableInputType, false> = GArg<GNullableInputType, false>,
   FilterArg extends GArg<GNullableInputType, false> = GArg<GNullableInputType, false>,
-  ListTypeInfo extends BaseListTypeInfo = BaseListTypeInfo,
+  CollectionTypeInfo extends BaseCollectionTypeInfo = BaseCollectionTypeInfo,
 > = {
   dbField: TDBField
 } & FieldTypeWithoutDBField<
@@ -91,7 +91,7 @@ export type NextFieldType<
   UniqueWhereArg,
   OrderByArg,
   FilterArg,
-  ListTypeInfo
+  CollectionTypeInfo
 >
 
 export type ScalarPrismaTypes = {
@@ -391,7 +391,7 @@ export type FieldTypeWithoutDBField<
   UniqueWhereArg extends GArg<GNullableInputType, false> = GArg<GNullableInputType, false>,
   OrderByArg extends GArg<GNullableInputType, false> = GArg<GNullableInputType, false>,
   FilterArg extends GArg<GNullableInputType, false> = GArg<GNullableInputType, false>,
-  ListTypeInfo extends BaseListTypeInfo = BaseListTypeInfo,
+  CollectionTypeInfo extends BaseCollectionTypeInfo = BaseCollectionTypeInfo,
   FieldTypeInfo extends BaseFieldTypeInfo = BaseFieldTypeInfo,
 > = {
   input?: {
@@ -407,11 +407,11 @@ export type FieldTypeWithoutDBField<
   getAdminMeta?: () => JSONValue
   unreferencedConcreteInterfaceImplementations?: readonly g<typeof g.object<any>>[]
   __nxTelemetryFieldTypeName?: string
-} & CommonFieldConfig<ListTypeInfo, FieldTypeInfo>
+} & CommonFieldConfig<CollectionTypeInfo, FieldTypeInfo>
 
 type AnyInputObj = GInputObjectType<Record<string, GArg<GInputType>>>
 
-export type GraphQLTypesForList<ListTypeInfo extends BaseListTypeInfo = BaseListTypeInfo> = {
+export type GraphQLTypesForCollection<CollectionTypeInfo extends BaseCollectionTypeInfo = BaseCollectionTypeInfo> = {
   create: AnyInputObj | typeof g.Empty
   update: AnyInputObj | typeof g.Empty
   uniqueWhere: GInputObjectType<{
@@ -420,17 +420,17 @@ export type GraphQLTypesForList<ListTypeInfo extends BaseListTypeInfo = BaseList
   }>
   where: AnyInputObj
   orderBy: AnyInputObj
-  output: GObjectType<ListTypeInfo['item'], NixxieContext<ListTypeInfo['all']>>
+  output: GObjectType<CollectionTypeInfo['item'], NixxieContext<CollectionTypeInfo['all']>>
   findManyArgs: FindManyArgs
   relateTo: {
     one: {
       create: GInputObjectType<{
-        create?: GArg<GraphQLTypesForList<ListTypeInfo>['create']>
-        connect: GArg<GraphQLTypesForList<ListTypeInfo>['uniqueWhere']>
+        create?: GArg<GraphQLTypesForCollection<CollectionTypeInfo>['create']>
+        connect: GArg<GraphQLTypesForCollection<CollectionTypeInfo>['uniqueWhere']>
       }>
       update: GInputObjectType<{
-        create?: GArg<GraphQLTypesForList<ListTypeInfo>['create']>
-        connect: GArg<GraphQLTypesForList<ListTypeInfo>['uniqueWhere']>
+        create?: GArg<GraphQLTypesForCollection<CollectionTypeInfo>['create']>
+        connect: GArg<GraphQLTypesForCollection<CollectionTypeInfo>['uniqueWhere']>
         disconnect: GArg<typeof g.Boolean>
       }>
     }
@@ -441,32 +441,32 @@ export type GraphQLTypesForList<ListTypeInfo extends BaseListTypeInfo = BaseList
         none: GArg<AnyInputObj>
       }>
       create: GInputObjectType<{
-        create?: GArg<GList<GNonNull<GraphQLTypesForList<ListTypeInfo>['create']>>>
-        connect: GArg<GList<GNonNull<GraphQLTypesForList<ListTypeInfo>['uniqueWhere']>>>
-        set: GArg<GList<GNonNull<GraphQLTypesForList<ListTypeInfo>['uniqueWhere']>>>
+        create?: GArg<GList<GNonNull<GraphQLTypesForCollection<CollectionTypeInfo>['create']>>>
+        connect: GArg<GList<GNonNull<GraphQLTypesForCollection<CollectionTypeInfo>['uniqueWhere']>>>
+        set: GArg<GList<GNonNull<GraphQLTypesForCollection<CollectionTypeInfo>['uniqueWhere']>>>
       }>
       update: GInputObjectType<{
-        create?: GArg<GList<GNonNull<GraphQLTypesForList<ListTypeInfo>['create']>>>
-        connect: GArg<GList<GNonNull<GraphQLTypesForList<ListTypeInfo>['uniqueWhere']>>>
-        disconnect: GArg<GList<GNonNull<GraphQLTypesForList<ListTypeInfo>['uniqueWhere']>>>
-        set: GArg<GList<GNonNull<GraphQLTypesForList<ListTypeInfo>['uniqueWhere']>>>
+        create?: GArg<GList<GNonNull<GraphQLTypesForCollection<CollectionTypeInfo>['create']>>>
+        connect: GArg<GList<GNonNull<GraphQLTypesForCollection<CollectionTypeInfo>['uniqueWhere']>>>
+        disconnect: GArg<GList<GNonNull<GraphQLTypesForCollection<CollectionTypeInfo>['uniqueWhere']>>>
+        set: GArg<GList<GNonNull<GraphQLTypesForCollection<CollectionTypeInfo>['uniqueWhere']>>>
       }>
     }
   }
 }
 
 export type FindManyArgs = {
-  where: GArg<GNonNull<GraphQLTypesForList['where']>, true>
-  orderBy: GArg<GNonNull<GList<GNonNull<GraphQLTypesForList['orderBy']>>>, true>
+  where: GArg<GNonNull<GraphQLTypesForCollection['where']>, true>
+  orderBy: GArg<GNonNull<GList<GNonNull<GraphQLTypesForCollection['orderBy']>>>, true>
   take: GArg<typeof g.Int>
   skip: GArg<GNonNull<typeof g.Int>, true>
-  cursor: GArg<GraphQLTypesForList['uniqueWhere']>
+  cursor: GArg<GraphQLTypesForCollection['uniqueWhere']>
 }
 
 export type FindManyArgsValue = InferValueFromArgs<FindManyArgs>
 
 // fieldType(dbField)(fieldInfo) => { ...fieldInfo, dbField };
-export function fieldType<TDBField extends DBField, ListTypeInfo extends BaseListTypeInfo>(
+export function fieldType<TDBField extends DBField, CollectionTypeInfo extends BaseCollectionTypeInfo>(
   dbField: TDBField
 ) {
   return function fieldTypeWrapper<
@@ -483,7 +483,7 @@ export function fieldType<TDBField extends DBField, ListTypeInfo extends BaseLis
       UniqueWhereArg,
       OrderByArg,
       FilterArg,
-      ListTypeInfo
+      CollectionTypeInfo
     >
   ): NextFieldType<
     DBField,

package/src/types/type-info.ts

@@ -1,38 +1,38 @@
-import type { BaseItem } from './next-fields'
-import type { NixxieContext } from '../types'
-
-type GraphQLInput = Record<string, any>
-
-export type BaseListTypeInfo<Session = any> = {
-  key: string
-  fields: string
-  actions: string
-  item: BaseItem
-  inputs: {
-    create: GraphQLInput
-    update: GraphQLInput
-    where: GraphQLInput
-    uniqueWhere: { readonly id?: string | number | null } & GraphQLInput
-    orderBy: Record<string, 'asc' | 'desc' | null>
-  }
-
-  /**
-   * WARNING: may change in patch
-   */
-  prisma: {
-    create: Record<string, any>
-    update: Record<string, any>
-  }
-  all: BaseNixxieTypeInfo<Session>
-
-  isSingleton: boolean
-}
-
-export type NixxieContextFromListTypeInfo<ListTypeInfo extends BaseListTypeInfo> =
-  NixxieContext<ListTypeInfo['all']>
-
-export type BaseNixxieTypeInfo<Session = any> = {
-  lists: Record<string, BaseListTypeInfo<Session>>
-  prisma: any
-  session: Session
-}
+import type { BaseItem } from './next-fields'
+import type { NixxieContext } from '../types'
+
+type GraphQLInput = Record<string, any>
+
+export type BaseCollectionTypeInfo<Session = any> = {
+  key: string
+  fields: string
+  actions: string
+  item: BaseItem
+  inputs: {
+    create: GraphQLInput
+    update: GraphQLInput
+    where: GraphQLInput
+    uniqueWhere: { readonly id?: string | number | null } & GraphQLInput
+    orderBy: Record<string, 'asc' | 'desc' | null>
+  }
+
+  /**
+   * WARNING: may change in patch
+   */
+  prisma: {
+    create: Record<string, any>
+    update: Record<string, any>
+  }
+  all: BaseNixxieTypeInfo<Session>
+
+  isSingleton: boolean
+}
+
+export type NixxieContextFromCollectionTypeInfo<CollectionTypeInfo extends BaseCollectionTypeInfo> =
+  NixxieContext<CollectionTypeInfo['all']>
+
+export type BaseNixxieTypeInfo<Session = any> = {
+  lists: Record<string, BaseCollectionTypeInfo<Session>>
+  prisma: any
+  session: Session
+}

package/src/types/type-tests.ts

@@ -1,21 +1,21 @@
-import type { NixxieContext } from './context'
-import type { BaseListTypeInfo } from './type-info'
-
-const someContext: NixxieContext<{
-  lists: {
-    Singleton: BaseListTypeInfo & { isSingleton: true }
-    List: BaseListTypeInfo & { isSingleton: false }
-    ListOrSingleton: BaseListTypeInfo
-  }
-  prisma: any
-  session: any
-}> = undefined!
-
-someContext.query.Singleton.findOne({})
-someContext.query.Singleton.findOne({ where: { id: '1' } })
-// @ts-expect-error
-someContext.query.List.findOne({})
-someContext.query.List.findOne({ where: { id: '1' } })
-// @ts-expect-error
-someContext.query.ListOrSingleton.findOne({})
-someContext.query.ListOrSingleton.findOne({ where: { id: '1' } })
+import type { NixxieContext } from './context'
+import type { BaseCollectionTypeInfo } from './type-info'
+
+const someContext: NixxieContext<{
+  lists: {
+    Singleton: BaseCollectionTypeInfo & { isSingleton: true }
+    List: BaseCollectionTypeInfo & { isSingleton: false }
+    ListOrSingleton: BaseCollectionTypeInfo
+  }
+  prisma: any
+  session: any
+}> = undefined!
+
+someContext.query.Singleton.findOne({})
+someContext.query.Singleton.findOne({ where: { id: '1' } })
+// @ts-expect-error
+someContext.query.List.findOne({})
+someContext.query.List.findOne({ where: { id: '1' } })
+// @ts-expect-error
+someContext.query.ListOrSingleton.findOne({})
+someContext.query.ListOrSingleton.findOne({ where: { id: '1' } })