Update service generator to use Prisma namespace (#1853)

* fix: service generator prisma types * chore: update tests Co-authored-by: Daniel Choudhury <dannychoudhury@gmail.com>
redwoodjs · Mar 5, 2021 · 437eefb · 437eefb
1 parent 751d342
commit 437eefb
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 38 deletions.
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.ts
@@ -1,22 +1,18 @@
-import {
-  UserProfileWhereUniqueInput,
-  UserProfileCreateInput,
-  UserProfileUpdateInput,
-} from '@prisma/client'
+import { Prisma } from '@prisma/client'
 import { db } from 'src/lib/db'
 
 export const userProfiles = () => {
   return db.userProfile.findMany()
 }
 
-export const userProfile = ({ id }: UserProfileWhereUniqueInput) => {
+export const userProfile = ({ id }: Prisma.UserProfileWhereUniqueInput) => {
   return db.userProfile.findUnique({
     where: { id },
   })
 }
 
 interface CreateUserProfileArgs {
-  input: UserProfileCreateInput
+  input: Prisma.UserProfileCreateInput
 }
 
 export const createUserProfile = ({ input }: CreateUserProfileArgs) => {
@@ -26,8 +22,8 @@ export const createUserProfile = ({ input }: CreateUserProfileArgs) => {
 }
 
 interface UpdateUserProfileArgs {
-  where: UserProfileWhereUniqueInput
-  input: UserProfileUpdateInput
+  where: Prisma.UserProfileWhereUniqueInput
+  input: Prisma.UserProfileUpdateInput
 }
 
 export const updateUserProfile = ({ id, input }: UpdateUserProfileArgs) => {
@@ -37,7 +33,7 @@ export const updateUserProfile = ({ id, input }: UpdateUserProfileArgs) => {
   })
 }
 
-export const deleteUserProfile = ({ id }: UserProfileWhereUniqueInput) => {
+export const deleteUserProfile = ({ id }: Prisma.UserProfileWhereUniqueInput) => {
   return db.userProfile.delete({
     where: { id },
   })

diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_belongsTo.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_belongsTo.ts
@@ -1,4 +1,4 @@
-import { UserWhereUniqueInput } from '@prisma/client'
+import { Prisma } from '@prisma/client'
 import { ResolverArgs } from '@redwoodjs/api/dist/types'
 import { db } from 'src/lib/db'
 
@@ -7,6 +7,6 @@ export const users = () => {
 }
 
 export const User = {
-  identity: (_obj, { root }: ResolverArgs<UserWhereUniqueInput>) =>
+  identity: (_obj, { root }: ResolverArgs<Prisma.UserWhereUniqueInput>) =>
     db.user.findUnique({ where: { id: root.id } }).identity(),
 }
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.ts
@@ -1,22 +1,18 @@
-import {
-  PostWhereUniqueInput,
-  PostCreateInput,
-  PostUpdateInput,
-} from '@prisma/client'
+import { Prisma } from '@prisma/client'
 import { db } from 'src/lib/db'
 
 export const posts = () => {
   return db.post.findMany()
 }
 
-export const post = ({ id }: PostWhereUniqueInput) => {
+export const post = ({ id }: Prisma.PostWhereUniqueInput) => {
   return db.post.findUnique({
     where: { id },
   })
 }
 
 interface CreatePostArgs {
-  input: PostCreateInput
+  input: Prisma.PostCreateInput
 }
 
 export const createPost = ({ input }: CreatePostArgs) => {
@@ -26,8 +22,8 @@ export const createPost = ({ input }: CreatePostArgs) => {
 }
 
 interface UpdatePostArgs {
-  where: PostWhereUniqueInput
-  input: PostUpdateInput
+  where: Prisma.PostWhereUniqueInput
+  input: Prisma.PostUpdateInput
 }
 
 export const updatePost = ({ id, input }: UpdatePostArgs) => {
@@ -37,7 +33,7 @@ export const updatePost = ({ id, input }: UpdatePostArgs) => {
   })
 }
 
-export const deletePost = ({ id }: PostWhereUniqueInput) => {
+export const deletePost = ({ id }: Prisma.PostWhereUniqueInput) => {
   return db.post.delete({
     where: { id },
   })

diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_hasMany.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_hasMany.ts
@@ -1,4 +1,4 @@
-import { UserWhereUniqueInput } from '@prisma/client'
+import { Prisma } from '@prisma/client'
 import { ResolverArgs } from '@redwoodjs/api/dist/types'
 import { db } from 'src/lib/db'
 
@@ -7,6 +7,6 @@ export const users = () => {
 }
 
 export const User = {
-  userProfiles: (_obj, { root }: ResolverArgs<UserWhereUniqueInput>) =>
+  userProfiles: (_obj, { root }: ResolverArgs<Prisma.UserWhereUniqueInput>) =>
     db.user.findUnique({ where: { id: root.id } }).userProfiles(),
 }
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_multiple.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_multiple.ts
@@ -1,4 +1,4 @@
-import { UserWhereUniqueInput } from '@prisma/client'
+import { Prisma } from '@prisma/client'
 import { ResolverArgs } from '@redwoodjs/api/dist/types'
 import { db } from 'src/lib/db'
 
@@ -7,8 +7,8 @@ export const users = () => {
 }
 
 export const User = {
-  userProfiles: (_obj, { root }: ResolverArgs<UserWhereUniqueInput>) =>
+  userProfiles: (_obj, { root }: ResolverArgs<Prisma.UserWhereUniqueInput>) =>
     db.user.findUnique({ where: { id: root.id } }).userProfiles(),
-  identity: (_obj, { root }: ResolverArgs<UserWhereUniqueInput>) =>
+  identity: (_obj, { root }: ResolverArgs<Prisma.UserWhereUniqueInput>) =>
     db.user.findUnique({ where: { id: root.id } }).identity(),
 }
diff --git a/packages/cli/src/commands/generate/service/templates/service.ts.template b/packages/cli/src/commands/generate/service/templates/service.ts.template
@@ -1,23 +1,19 @@
-<% if (crud || relations.length > 0) { %>import {
-  ${singularPascalName}WhereUniqueInput,<% if (crud) { %>
-  ${singularPascalName}CreateInput,
-  ${singularPascalName}UpdateInput,<% } %>
-} from '@prisma/client'
+<% if (crud || relations.length > 0) { %>import { Prisma } from '@prisma/client'
 <% } %><% if (relations.length) { %>import { ResolverArgs } from '@redwoodjs/api/dist/types'
 <% } %>import { db } from 'src/lib/db'
 
 export const ${pluralCamelName} = () => {
   return db.${singularCamelName}.findMany()
 }<% if (crud) { %>
 
-export const ${singularCamelName} = ({ id }: ${singularPascalName}WhereUniqueInput) => {
+export const ${singularCamelName} = ({ id }: Prisma.${singularPascalName}WhereUniqueInput) => {
   return db.${singularCamelName}.findUnique({
     where: { id },
   })
 }
 
 interface Create${singularPascalName}Args {
-  input: ${singularPascalName}CreateInput
+  input: Prisma.${singularPascalName}CreateInput
 }
 
 export const create${singularPascalName} = ({ input }: Create${singularPascalName}Args) => {
@@ -27,8 +23,8 @@ export const create${singularPascalName} = ({ input }: Create${singularPascalNam
 }
 
 interface Update${singularPascalName}Args {
-  where: ${singularPascalName}WhereUniqueInput
-  input: ${singularPascalName}UpdateInput
+  where: Prisma.${singularPascalName}WhereUniqueInput
+  input: Prisma.${singularPascalName}UpdateInput
 }
 
 export const update${singularPascalName} = ({ id, input }: Update${singularPascalName}Args) => {
@@ -38,12 +34,12 @@ export const update${singularPascalName} = ({ id, input }: Update${singularPasca
   })
 }
 
-export const delete${singularPascalName} = ({ id }: ${singularPascalName}WhereUniqueInput) => {
+export const delete${singularPascalName} = ({ id }: Prisma.${singularPascalName}WhereUniqueInput) => {
   return db.${singularCamelName}.delete({
     where: { id },
   })
 }<% } %><% if (relations.length) { %>
 
 export const ${singularPascalName} = {<% relations.forEach(relation => { %>
-  ${relation}: (_obj, { root }: ResolverArgs<${singularPascalName}WhereUniqueInput>) => db.${singularCamelName}.findUnique({ where: { id: root.id } }).${relation}(),<% }) %>
+  ${relation}: (_obj, { root }: ResolverArgs<Prisma.${singularPascalName}WhereUniqueInput>) => db.${singularCamelName}.findUnique({ where: { id: root.id } }).${relation}(),<% }) %>
 }<% } %>