fix: Change Bytes generated type to Uint8Array

Author: unlight

README.md

@@ -757,3 +757,8 @@ import { generate } from 'prisma-nestjs-graphql/generate';
 - JSON type for the code first approach - https://github.com/nestjs/graphql/issues/111#issuecomment-631452899
 - https://github.com/paljs/prisma-tools/tree/master/packages/plugins
 - https://github.com/wasp-lang/wasp
+
+## TODO
+
+- keyof typeof SortOrder -> `SortOrder`
+- dummy-createfriends.input.ts -> `create-friends`

src/helpers/get-property-type.ts

@@ -7,7 +7,7 @@ export function getPropertyType(args: {
   type: string;
   location: FieldLocation;
 }): string[] {
-  const { type, location } = args;
+  const { location, type } = args;
   switch (type) {
     case 'Float':
     case 'Int': {
@@ -32,7 +32,7 @@ export function getPropertyType(args: {
       return ['null'];
     }
     case 'Bytes': {
-      return ['Buffer'];
+      return ['Uint8Array'];
     }
     case 'BigInt': {
       return ['bigint', 'number'];

src/test/compatibility.ts

@@ -1,27 +1,27 @@
-/* eslint-disable prefer-const, unicorn/no-null */
+/* eslint-disable @typescript-eslint/no-unused-expressions, prefer-const, unicorn/no-null */
+import { Field } from '@nestjs/graphql';
 import { Prisma, PrismaClient } from '@prisma/client';
 import * as P from '@prisma/client';
 
-import { Dummy } from '../../@generated/dummy/dummy.model';
-import { DummyCreateInput } from '../../@generated/dummy/dummy-create.input';
-import { DateTimeFilter } from '../../@generated/prisma/date-time-filter.input';
-import { DecimalFilter } from '../../@generated/prisma/decimal-filter.input';
-import { IntFilter } from '../../@generated/prisma/int-filter.input';
-import { StringFilter } from '../../@generated/prisma/string-filter.input';
-import { FindManyUserArgs } from '../../@generated/user/find-many-user.args';
-import { User } from '../../@generated/user/user.model';
-import { UserAggregateArgs } from '../../@generated/user/user-aggregate.args';
-import { UserCount } from '../../@generated/user/user-count.output';
-import { UserCreateInput } from '../../@generated/user/user-create.input';
-import { UserCreateWithoutArticlesInput } from '../../@generated/user/user-create-without-articles.input';
-import { UserCreateWithoutCommentsInput } from '../../@generated/user/user-create-without-comments.input';
-import { UserGroupByArgs } from '../../@generated/user/user-group-by.args';
-import { UserListRelationFilter } from '../../@generated/user/user-list-relation-filter.input';
-import { UserMaxOrderByAggregateInput } from '../../@generated/user/user-max-order-by-aggregate.input';
-import { UserScalarFieldEnum } from '../../@generated/user/user-scalar-field.enum';
-import { UserWhereInput } from '../../@generated/user/user-where.input';
-import { UserWhereUniqueInput } from '../../@generated/user/user-where-unique.input';
-import { Field } from '@nestjs/graphql';
+import { Dummy } from '../../@generated/dummy/dummy.model.ts';
+import { DummyCreateInput } from '../../@generated/dummy/dummy-create.input.ts';
+import { DateTimeFilter } from '../../@generated/prisma/date-time-filter.input.ts';
+import { DecimalFilter } from '../../@generated/prisma/decimal-filter.input.ts';
+import { IntFilter } from '../../@generated/prisma/int-filter.input.ts';
+import { StringFilter } from '../../@generated/prisma/string-filter.input.ts';
+import { FindManyUserArgs } from '../../@generated/user/find-many-user.args.ts';
+import { User } from '../../@generated/user/user.model.ts';
+import { UserAggregateArgs } from '../../@generated/user/user-aggregate.args.ts';
+import { UserCount } from '../../@generated/user/user-count.output.ts';
+import { UserCreateInput } from '../../@generated/user/user-create.input.ts';
+import { UserCreateWithoutArticlesInput } from '../../@generated/user/user-create-without-articles.input.ts';
+import { UserCreateWithoutCommentsInput } from '../../@generated/user/user-create-without-comments.input.ts';
+import { UserGroupByArgs } from '../../@generated/user/user-group-by.args.ts';
+import { UserListRelationFilter } from '../../@generated/user/user-list-relation-filter.input.ts';
+import { UserMaxOrderByAggregateInput } from '../../@generated/user/user-max-order-by-aggregate.input.ts';
+import { UserScalarFieldEnum } from '../../@generated/user/user-scalar-field.enum.ts';
+import { UserWhereInput } from '../../@generated/user/user-where.input.ts';
+import { UserWhereUniqueInput } from '../../@generated/user/user-where-unique.input.ts';
 
 let $prisma = new PrismaClient();
 
@@ -124,8 +124,8 @@ let $prisma = new PrismaClient();
   x;
 }
 {
-  let x: DummyCreateInput = { id: '1', decimal: 0 as any };
-  let p: Prisma.DummyCreateInput = { id: '2', decimal: 0 as any };
+  let x: DummyCreateInput = { decimal: 0 as any, id: '1' };
+  let p: Prisma.DummyCreateInput = { decimal: 0 as any, id: '2' };
   p = x;
   p;
   x;
@@ -140,14 +140,21 @@ let $prisma = new PrismaClient();
   let x: UserMaxOrderByAggregateInput = {};
   let p: Prisma.UserMaxOrderByAggregateInput = {};
   p = x; // To prisma
-  x = p; // To object type
+  // FIXME: Skip is not assignable to type asc | desc | undefined
+  // x = p; // Prisma to own object type
 }
 {
   let x: UserCreateInput = {} as unknown as UserCreateInput;
   let p: Prisma.UserCreateInput = {} as unknown as Prisma.UserCreateInput;
   p = x;
   p;
 }
+{
+  let x: Dummy['bytes'] = null as unknown as P.Dummy['bytes'];
+  let p: P.Dummy['bytes'] = null as unknown as Dummy['bytes'];
+  x;
+  p;
+}
 {
   let x: Dummy = {} as unknown as Dummy;
   let p: P.Dummy = {} as unknown as P.Dummy;
@@ -171,13 +178,13 @@ let $prisma = new PrismaClient();
   void $prisma.user
     .findMany({
       include: {
-        articles: true,
-        profile: true,
         _count: true,
+        articles: true,
         comments: true,
         favoriteArticles: true,
         followers: true,
         following: true,
+        profile: true,
       },
     })
     .then(users => {

src/test/compound.spec.ts

@@ -10,6 +10,11 @@ let sourceFiles: SourceFile[];
 describe('compound index', () => {
   before(async () => {
     ({ project, sourceFiles } = await testGenerate({
+      options: [
+        `outputFilePattern = "{name}.{type}.ts"`,
+        `fields_Validator_from = "class-validator"`,
+        `fields_Validator_input = true`,
+      ],
       schema: `
                 model User {
                   id    Int    @id
@@ -24,18 +29,13 @@ describe('compound index', () => {
                   id    Int    @id
                 }
                 `,
-      options: [
-        `outputFilePattern = "{name}.{type}.ts"`,
-        `fields_Validator_from = "class-validator"`,
-        `fields_Validator_input = true`,
-      ],
     }));
   });
 
   it('user unique input compound', () => {
     const s = testSourceFile({
-      project,
       class: 'UserEmailNameCompoundUniqueInput',
+      project,
     });
 
     const minLength = s.classFile.getProperty('name')?.getDecorator('MinLength');
@@ -44,8 +44,8 @@ describe('compound index', () => {
 
   it('compound uniq where must be wrapped to prisma atleast', () => {
     const s = testSourceFile({
-      project,
       class: 'FindManyUserArgs',
+      project,
       property: 'cursor',
     });
 
@@ -58,6 +58,7 @@ describe('compound index', () => {
 describe('compound primary key', () => {
   before(async () => {
     ({ project, sourceFiles } = await testGenerate({
+      options: [`outputFilePattern = "{name}.{type}.ts"`],
       schema: `
                 model User {
                   firstname String
@@ -67,14 +68,13 @@ describe('compound primary key', () => {
                   @@id([firstname, surname])
                 }
                 `,
-      options: [`outputFilePattern = "{name}.{type}.ts"`],
     }));
   });
 
   it('compound primary key atleast keys', () => {
     const s = testSourceFile({
-      project,
       class: 'FindFirstUserArgs',
+      project,
       property: 'cursor',
     });