add field config

keystonejs · Jan 12, 2023 · e201b49 · e201b49
1 parent cb2e8d3
commit e201b49
Show file tree

Hide file tree

Showing 21 changed files with 128 additions and 28 deletions.
diff --git a/examples/custom-prisma-multischema/schema.graphql b/examples/custom-prisma-multischema/schema.graphql
@@ -159,7 +159,8 @@ input PostRelateToManyForCreateInput {
 type PhoneNumber {
   id: ID!
   label: String
-  user: User
+  user(where: UserWhereInput! = {}, orderBy: [UserOrderByInput!]! = [], take: Int, skip: Int! = 0): [User!]
+  userCount(where: UserWhereInput! = {}): Int
   type: String
   value: String
 }
@@ -173,11 +174,17 @@ input PhoneNumberWhereInput {
   OR: [PhoneNumberWhereInput!]
   NOT: [PhoneNumberWhereInput!]
   id: IDFilter
-  user: UserWhereInput
+  user: UserManyRelationFilter
   type: StringNullableFilter
   value: StringFilter
 }
 
+input UserManyRelationFilter {
+  every: UserWhereInput
+  some: UserWhereInput
+  none: UserWhereInput
+}
+
 input StringNullableFilter {
   equals: String
   in: [String!]
@@ -214,15 +221,16 @@ input PhoneNumberOrderByInput {
 }
 
 input PhoneNumberUpdateInput {
-  user: UserRelateToOneForUpdateInput
+  user: UserRelateToManyForUpdateInput
   type: String
   value: String
 }
 
-input UserRelateToOneForUpdateInput {
-  create: UserCreateInput
-  connect: UserWhereUniqueInput
-  disconnect: Boolean
+input UserRelateToManyForUpdateInput {
+  disconnect: [UserWhereUniqueInput!]
+  set: [UserWhereUniqueInput!]
+  create: [UserCreateInput!]
+  connect: [UserWhereUniqueInput!]
 }
 
 input PhoneNumberUpdateArgs {
@@ -231,14 +239,14 @@ input PhoneNumberUpdateArgs {
 }
 
 input PhoneNumberCreateInput {
-  user: UserRelateToOneForCreateInput
+  user: UserRelateToManyForCreateInput
   type: String
   value: String
 }
 
-input UserRelateToOneForCreateInput {
-  create: UserCreateInput
-  connect: UserWhereUniqueInput
+input UserRelateToManyForCreateInput {
+  create: [UserCreateInput!]
+  connect: [UserWhereUniqueInput!]
 }
 
 type Post {
@@ -297,6 +305,12 @@ input PostUpdateInput {
   author: UserRelateToOneForUpdateInput
 }
 
+input UserRelateToOneForUpdateInput {
+  create: UserCreateInput
+  connect: UserWhereUniqueInput
+  disconnect: Boolean
+}
+
 input PostUpdateArgs {
   where: PostWhereUniqueInput!
   data: PostUpdateInput!
@@ -310,6 +324,11 @@ input PostCreateInput {
   author: UserRelateToOneForCreateInput
 }
 
+input UserRelateToOneForCreateInput {
+  create: UserCreateInput
+  connect: UserWhereUniqueInput
+}
+
 """
 The `JSON` scalar type represents JSON values as specified by [ECMA-404](http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf).
 """

diff --git a/examples/custom-prisma-multischema/schema.prisma b/examples/custom-prisma-multischema/schema.prisma
@@ -18,7 +18,7 @@ model User {
   id           String        @id @default(cuid())
   name         String        @default("") @map("RealName")
   email        String        @unique @default("")
-  password     String?
+  password     String?       @map("Password")
   roles        String        @default("")
   phoneNumbers PhoneNumber[] @relation("PhoneNumber_user")
   posts        Post[]        @relation("Post_author")
@@ -27,23 +27,21 @@ model User {
 }
 
 model PhoneNumber {
-  id     String  @id @default(cuid())
-  user   User?   @relation("PhoneNumber_user", fields: [userId], references: [id])
-  userId String? @map("user")
-  type   String?
-  value  String  @default("")
+  id    String  @id @default(cuid())
+  user  User[]  @relation("PhoneNumber_user")
+  type  String? @map("Type")
+  value String  @default("")
 
-  @@index([userId])
   @@schema("Content")
 }
 
 model Post {
   id          String    @id @default(cuid())
   title       String    @default("")
   status      String    @default("draft")
-  content     Json      @default("[{\"type\":\"paragraph\",\"children\":[{\"text\":\"\"}]}]")
+  content     Json      @default("[{\"type\":\"paragraph\",\"children\":[{\"text\":\"\"}]}]") @map("Content")
   publishDate DateTime?
-  author      User?     @relation("Post_author", fields: [authorId], references: [id])
+  author      User?     @relation("Post_author", fields: [authorId], references: [id], onUpdate: Cascade, onDelete: Cascade)
   authorId    String?   @map("author")
 
   @@index([authorId])

diff --git a/examples/custom-prisma-multischema/schema.ts b/examples/custom-prisma-multischema/schema.ts
@@ -25,10 +25,16 @@ const User: Lists.User = list({
       isIndexed: 'unique',
       validation: { isRequired: true },
     }),
-    password: password(),
+    password: password({ db: { extendPrismaField: list => list + ' @map("Password")' } }),
     roles: text({}),
     phoneNumbers: relationship({
       ref: 'PhoneNumber.user',
+      db: {
+        extendPrismaField: field => {
+          console.log('Phone Number - User: ', field);
+          return field;
+        },
+      },
       many: true,
       ui: {
         displayMode: 'cards',
@@ -38,7 +44,10 @@ const User: Lists.User = list({
         linkToItem: true,
       },
     }),
-    posts: relationship({ ref: 'Post.author', many: true }),
+    posts: relationship({
+      ref: 'Post.author',
+      many: true,
+    }),
     randomNumber: virtual({
       field: graphql.field({
         type: graphql.Float,
@@ -78,7 +87,16 @@ export const lists: Lists = {
           },
         },
       }),
-      user: relationship({ ref: 'User.phoneNumbers' }),
+      user: relationship({
+        ref: 'User.phoneNumbers',
+        many: true,
+        db: {
+          extendPrismaField: field => {
+            console.log('Phone Number: ', field);
+            return field;
+          },
+        },
+      }),
       type: select({
         options: [
           { label: 'Home', value: 'home' },
@@ -88,6 +106,9 @@ export const lists: Lists = {
         ui: {
           displayMode: 'segmented-control',
         },
+        db: {
+          extendPrismaField: list => list + ' @map("Type")',
+        },
       }),
       value: text({}),
     },
@@ -129,9 +150,19 @@ export const lists: Lists = {
         ],
         links: true,
         dividers: true,
+        db: {
+          extendPrismaField: list => list + ' @map("Content")',
+        },
       }),
       publishDate: timestamp(),
       author: relationship({
+        db: {
+          extendPrismaField: () =>
+            `\nauthor User? @relation("Post_author", fields: [authorId], references: [id], onUpdate: Cascade, onDelete: Cascade) 
+            authorId String? @map("author")
+            
+            @@index([authorId])`,
+        },
         ref: 'User.posts',
         ui: {
           displayMode: 'cards',

diff --git a/packages/core/src/fields/types/bigInt/index.ts b/packages/core/src/fields/types/bigInt/index.ts
@@ -34,6 +34,7 @@ export type BigIntFieldConfig<ListTypeInfo extends BaseListTypeInfo> =
     db?: {
       isNullable?: boolean;
       map?: string;
+      extendPrismaField?: (field: string) => string;
     };
   };
 
@@ -111,6 +112,7 @@ export const bigInt =
           ? { kind: 'autoincrement' }
           : undefined,
       map: config.db?.map,
+      extendPrismaField: config.db?.extendPrismaField,
     })({
       ...config,
       hooks: {

diff --git a/packages/core/src/fields/types/calendarDay/index.ts b/packages/core/src/fields/types/calendarDay/index.ts
@@ -28,6 +28,7 @@ export type CalendarDayFieldConfig<ListTypeInfo extends BaseListTypeInfo> =
     };
     db?: {
       isNullable?: boolean;
+      extendPrismaField?: (field: string) => string;
       map?: string;
     };
   };
@@ -84,6 +85,7 @@ export const calendarDay =
             }
           : undefined,
       map: config.db?.map,
+      extendPrismaField: config.db?.extendPrismaField,
       nativeType: usesNativeDateType ? 'Date' : undefined,
     })({
       ...config,

diff --git a/packages/core/src/fields/types/checkbox/index.ts b/packages/core/src/fields/types/checkbox/index.ts
@@ -17,7 +17,10 @@ export type CheckboxFieldConfig<ListTypeInfo extends BaseListTypeInfo> =
       read?: { isNonNull?: boolean };
       create?: { isNonNull?: boolean };
     };
-    db?: { map?: string };
+    db?: {
+      map?: string;
+      extendPrismaField?: (field: string) => string;
+    };
   };
 
 export const checkbox =
@@ -39,6 +42,7 @@ export const checkbox =
       scalar: 'Boolean',
       default: { kind: 'literal', value: defaultValue },
       map: config.db?.map,
+      extendPrismaField: config.db?.extendPrismaField,
     })({
       ...config,
       input: {

diff --git a/packages/core/src/fields/types/decimal/index.ts b/packages/core/src/fields/types/decimal/index.ts
@@ -28,7 +28,11 @@ export type DecimalFieldConfig<ListTypeInfo extends BaseListTypeInfo> =
     defaultValue?: string;
     isIndexed?: boolean | 'unique';
     graphql?: { create?: { isNonNull?: boolean }; read?: { isNonNull?: boolean } };
-    db?: { isNullable?: boolean; map?: string };
+    db?: {
+      isNullable?: boolean;
+      map?: string;
+      extendPrismaField?: (field: string) => string;
+    };
   };
 
 function parseDecimalValueOption(meta: FieldData, value: string, name: string) {
@@ -121,6 +125,7 @@ export const decimal =
       default:
         defaultValue === undefined ? undefined : { kind: 'literal' as const, value: defaultValue },
       map: config.db?.map,
+      extendPrismaField: config.db?.extendPrismaField,
     } as const;
     return fieldType(dbField)({
       ...config,

diff --git a/packages/core/src/fields/types/file/index.ts b/packages/core/src/fields/types/file/index.ts
@@ -10,6 +10,9 @@ import { graphql } from '../../..';
 
 export type FileFieldConfig<ListTypeInfo extends BaseListTypeInfo> = {
   storage: string;
+  db?: {
+    extendPrismaField?: (field: string) => string;
+  };
 } & CommonFieldConfig<ListTypeInfo>;
 
 const FileFieldInput = graphql.inputObject({
@@ -70,6 +73,7 @@ export const file =
         filesize: { kind: 'scalar', scalar: 'Int', mode: 'optional' },
         filename: { kind: 'scalar', scalar: 'String', mode: 'optional' },
       },
+      extendPrismaField: config.db?.extendPrismaField,
     })({
       ...config,
       hooks: storage.preserve

diff --git a/packages/core/src/fields/types/float/index.ts b/packages/core/src/fields/types/float/index.ts
@@ -35,6 +35,7 @@ export type FloatFieldConfig<ListTypeInfo extends BaseListTypeInfo> =
     db?: {
       isNullable?: boolean;
       map?: string;
+      extendPrismaField?: (field: string) => string;
     };
   };
 
@@ -101,6 +102,7 @@ export const float =
       default:
         typeof defaultValue === 'number' ? { kind: 'literal', value: defaultValue } : undefined,
       map: config.db?.map,
+      extendPrismaField: config.db?.extendPrismaField,
     })({
       ...config,
       hooks: {

diff --git a/packages/core/src/fields/types/image/index.ts b/packages/core/src/fields/types/image/index.ts
@@ -12,6 +12,9 @@ import { SUPPORTED_IMAGE_EXTENSIONS } from './utils';
 
 export type ImageFieldConfig<ListTypeInfo extends BaseListTypeInfo> = {
   storage: string;
+  db?: {
+    extendPrismaField?: (field: string) => string;
+  };
 } & CommonFieldConfig<ListTypeInfo>;
 
 const ImageExtensionEnum = graphql.enum({
@@ -82,6 +85,7 @@ export const image =
 
     return fieldType({
       kind: 'multi',
+      extendPrismaField: config.db?.extendPrismaField,
       fields: {
         filesize: { kind: 'scalar', scalar: 'Int', mode: 'optional' },
         extension: { kind: 'scalar', scalar: 'String', mode: 'optional' },

diff --git a/packages/core/src/fields/types/integer/index.ts b/packages/core/src/fields/types/integer/index.ts
@@ -34,6 +34,7 @@ export type IntegerFieldConfig<ListTypeInfo extends BaseListTypeInfo> =
     db?: {
       isNullable?: boolean;
       map?: string;
+      extendPrismaField?: (field: string) => string;
     };
   };
 
@@ -125,6 +126,7 @@ export const integer =
           ? { kind: 'autoincrement' }
           : undefined,
       map: config.db?.map,
+      extendPrismaField: config.db?.extendPrismaField,
     })({
       ...config,
       hooks: {

diff --git a/packages/core/src/fields/types/json/index.ts b/packages/core/src/fields/types/json/index.ts
@@ -10,7 +10,7 @@ import { graphql } from '../../..';
 export type JsonFieldConfig<ListTypeInfo extends BaseListTypeInfo> =
   CommonFieldConfig<ListTypeInfo> & {
     defaultValue?: JSONValue;
-    db?: { map?: string };
+    db?: { map?: string; extendPrismaField?: (field: string) => string };
   };
 
 export const json =
@@ -47,6 +47,7 @@ export const json =
             ? undefined
             : { kind: 'literal', value: JSON.stringify(defaultValue) },
         map: config.db?.map,
+        extendPrismaField: config.db?.extendPrismaField,
       }
     );
   };
diff --git a/packages/core/src/fields/types/multiselect/index.ts b/packages/core/src/fields/types/multiselect/index.ts
@@ -42,6 +42,7 @@ export type MultiselectFieldConfig<ListTypeInfo extends BaseListTypeInfo> =
       };
       db?: {
         map?: string;
+        extendPrismaField?: (field: string) => string;
       };
     };
 
@@ -150,6 +151,7 @@ export const multiselect =
       {
         mode: 'required',
         map: config?.db?.map,
+        extendPrismaField: config.db?.extendPrismaField,
         default: { kind: 'literal', value: JSON.stringify(defaultValue) },
       }
     );