Merge branch 'master' into modernize

Author: djhi

README.md

@@ -119,7 +119,7 @@ type Mutation {
   createPost(data: String): Post
   createManyPost(data: [{data:String}]): [Post]
   updatePost(data: String): Post
-  removePost(id: ID!): Post
+  deletePost(id: ID!): Post
 }
 type Post {
     id: ID!

package.json

@@ -1,6 +1,6 @@
 {
     "name": "json-graphql-server",
-    "version": "3.1.2",
+    "version": "3.2.0",
     "type": "module",
     "main": "./dist/json-graphql-server.cjs",
     "module": "./dist/json-graphql-server.js",

src/introspection/getSchemaFromData.spec.ts

@@ -107,28 +107,28 @@ const QueryType = new GraphQLObjectType({
 
 test('creates one type per data type', () => {
     const typeMap = getSchemaFromData(
-        data,
+        data
     ).getTypeMap() as ObjMap<GraphQLObjectType>;
     expect(typeMap.Post.name).toEqual(PostType.name);
     expect(Object.keys(typeMap.Post.getFields())).toEqual(
-        Object.keys(PostType.getFields()),
+        Object.keys(PostType.getFields())
     );
     expect(typeMap.User.name).toEqual(UserType.name);
     expect(Object.keys(typeMap.User.getFields())).toEqual(
-        Object.keys(UserType.getFields()),
+        Object.keys(UserType.getFields())
     );
 });
 
 test('creates one field per relationship', () => {
     const typeMap = getSchemaFromData(
-        data,
+        data
     ).getTypeMap() as ObjMap<GraphQLObjectType>;
     expect(Object.keys(typeMap.Post.getFields())).toContain('User');
 });
 
 test('creates one field per reverse relationship', () => {
     const typeMap = getSchemaFromData(
-        data,
+        data
     ).getTypeMap() as ObjMap<GraphQLObjectType>;
     expect(Object.keys(typeMap.User.getFields())).toContain('Posts');
 });
@@ -137,7 +137,7 @@ test('creates three query fields per data type', () => {
     // biome-ignore lint/style/noNonNullAssertion: It's only a test
     const queries = getSchemaFromData(data).getQueryType()!.getFields();
     expect((queries.Post.type as GraphQLObjectType).name).toEqual(
-        PostType.name,
+        PostType.name
     );
     expect(queries.Post.args).toEqual([
         expect.objectContaining({
@@ -159,7 +159,7 @@ test('creates three query fields per data type', () => {
     expect(queries._allPostsMeta.type.toString()).toEqual('ListMetadata');
 
     expect((queries.User.type as GraphQLObjectType).name).toEqual(
-        UserType.name,
+        UserType.name
     );
     expect(queries.User.args).toEqual([
         expect.objectContaining({
@@ -185,7 +185,7 @@ test('creates three mutation fields per data type', () => {
     // biome-ignore lint/style/noNonNullAssertion: It's only a test
     const mutations = getSchemaFromData(data).getMutationType()!.getFields();
     expect((mutations.createPost.type as GraphQLObjectType).name).toEqual(
-        PostType.name,
+        PostType.name
     );
     expect(mutations.createPost.args).toEqual([
         expect.objectContaining({
@@ -202,7 +202,7 @@ test('creates three mutation fields per data type', () => {
         }),
     ]);
     expect((mutations.updatePost.type as GraphQLObjectType).name).toEqual(
-        PostType.name,
+        PostType.name
     );
     expect(mutations.updatePost.args).toEqual([
         expect.objectContaining({
@@ -223,16 +223,25 @@ test('creates three mutation fields per data type', () => {
         }),
     ]);
     expect((mutations.removePost.type as GraphQLObjectType).name).toEqual(
-        PostType.name,
+        PostType.name
     );
     expect(mutations.removePost.args).toEqual([
         expect.objectContaining({
             name: 'id',
             type: new GraphQLNonNull(GraphQLID),
         }),
     ]);
+    expect((mutations.deletePost.type as GraphQLObjectType).name).toEqual(
+        PostType.name
+    );
+    expect(mutations.deletePost.args).toEqual([
+        expect.objectContaining({
+            name: 'id',
+            type: new GraphQLNonNull(GraphQLID),
+        }),
+    ]);
     expect((mutations.createUser.type as GraphQLObjectType).name).toEqual(
-        UserType.name,
+        UserType.name
     );
     expect(mutations.createUser.args).toEqual([
         expect.objectContaining({
@@ -241,7 +250,7 @@ test('creates three mutation fields per data type', () => {
         }),
     ]);
     expect((mutations.updateUser.type as GraphQLObjectType).name).toEqual(
-        UserType.name,
+        UserType.name
     );
     expect(mutations.updateUser.args).toEqual([
         expect.objectContaining({
@@ -254,14 +263,23 @@ test('creates three mutation fields per data type', () => {
         }),
     ]);
     expect((mutations.removeUser.type as GraphQLObjectType).name).toEqual(
-        UserType.name,
+        UserType.name
     );
     expect(mutations.removeUser.args).toEqual([
         expect.objectContaining({
             name: 'id',
             type: new GraphQLNonNull(GraphQLID),
         }),
     ]);
+    expect((mutations.deleteUser.type as GraphQLObjectType).name).toEqual(
+        UserType.name
+    );
+    expect(mutations.deleteUser.args).toEqual([
+        expect.objectContaining({
+            name: 'id',
+            type: new GraphQLNonNull(GraphQLID),
+        }),
+    ]);
 });
 
 test('creates the mutation *Input type for createMany', () => {

src/introspection/getSchemaFromData.ts

@@ -72,9 +72,11 @@ import type { Data } from '../types';
  * //     createPost(data: String): Post
  * //     updatePost(data: String): Post
  * //     removePost(id: ID!): Boolean
+ * //     deletePost(id: ID!): Boolean
  * //     createUser(data: String): User
  * //     updateUser(data: String): User
  * //     removeUser(id: ID!): Boolean
+ * //     deleteUser(id: ID!): Boolean
  * // }
  */
 export default (data: Data) => {
@@ -196,6 +198,12 @@ export default (data: Data) => {
                         id: { type: new GraphQLNonNull(GraphQLID) },
                     },
                 };
+                fields[`delete${type.name}`] = {
+                    type: typesByName[type.name],
+                    args: {
+                        id: { type: new GraphQLNonNull(GraphQLID) },
+                    },
+                };
                 return fields;
             },
             {} as Record<string, any>,

src/resolver/index.ts

@@ -25,6 +25,7 @@ const getMutationResolvers = (entityName: string, data: Entity[]) => ({
     [`createMany${entityName}`]: createMany(data),
     [`update${entityName}`]: update(data),
     [`remove${entityName}`]: remove(data),
+    [`delete${entityName}`]: remove(data),
 });
 
 export default (data: Data) => {