@aleleba/create-node-ts-graphql-server 1.3.0 → 1.4.0

package/README.md

@@ -7,6 +7,7 @@ Tech(Library or Framework) | Version |
 Jest (Testing) | 29.5.0
 Typescript | 4.9.5
 GraphQL | 16.6.0
+Type GraphQL | 2.0.0-beta.1
 
 ## Setup
 To create a new project run in the terminal:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aleleba/create-node-ts-graphql-server",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Node with Typescript and GraphQL Server",
   "bin": "./bin/cli.js",
   "main": "index.js",
@@ -35,6 +35,7 @@
   "dependencies": {
     "@graphql-tools/schema": "^9.0.16",
     "body-parser": "^1.20.2",
+    "class-validator": "^0.14.0",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
     "dotenv": "^16.0.3",
@@ -45,6 +46,8 @@
     "graphql-subscriptions": "^2.0.0",
     "graphql-tools": "^8.3.18",
     "graphql-ws": "^5.12.0",
+    "reflect-metadata": "^0.1.13",
+    "type-graphql": "^2.0.0-beta.1",
     "web-push": "^3.5.0",
     "ws": "^8.12.1"
   },

package/schema.gql

@@ -0,0 +1,28 @@
+# -----------------------------------------------
+# !!! THIS FILE WAS GENERATED BY TYPE-GRAPHQL !!!
+# !!!   DO NOT MODIFY THIS FILE BY YOURSELF   !!!
+# -----------------------------------------------
+
+type Mutation {
+  testMutation: TestMutation!
+}
+
+type Query {
+  test: Test!
+}
+
+type Test {
+  text: Text!
+}
+
+type TestMutation {
+  textMutation(text: String!): TextMutation!
+}
+
+type Text {
+  text: String!
+}
+
+type TextMutation {
+  text: String!
+}

package/src/GraphQL/resolvers/test.resolver.ts

@@ -0,0 +1,18 @@
+'use strict';
+
+import { Query, Resolver, Mutation, Arg } from 'type-graphql';
+import { Test, TestMutation } from '@GraphQL/schema/test.schema';
+
+@Resolver(() => Test)
+export class TestResolver {
+    @Query(() => Test)
+    async test() {
+        return {};
+    }
+
+    @Mutation(() => TestMutation)
+    async testMutation() {
+        return {};
+    }   
+}
+

package/src/GraphQL/schema/index.ts

@@ -1,17 +1,10 @@
-import { makeExecutableSchema } from '@graphql-tools/schema';
-import resolvers from'@GraphQL/resolvers';
-import Test from '@GraphQL/schema/Test.gql';
+'use strict'
 
-// The GraphQL schema
-const rootTypes = `
-  type Query {
-    test: Test
-  }
-  type Mutation {
-      testMutation: TestMutation
-  }
-`;
+import { buildSchemaSync } from "type-graphql"
+import { TestResolver } from "@GraphQL/resolvers/test.resolver";
 
-const typeDefs = [ rootTypes, Test ];
-
-export default makeExecutableSchema({typeDefs, resolvers});
+const schema = buildSchemaSync({
+        resolvers: [TestResolver],
+        emitSchemaFile: true,
+    })
+export default schema

package/src/GraphQL/schema/test.schema.ts

@@ -0,0 +1,36 @@
+'use strict';
+
+import { Field, ObjectType, Arg } from "type-graphql";
+import { getTest, addText } from '@controllerGraphQL';
+
+@ObjectType()
+export class Test {
+    @Field(() => Text)
+    async text(){
+        return {
+            text: await getTest({})
+        }
+    }
+}
+
+@ObjectType()
+export class Text {
+    @Field()
+    text?: string 
+}
+
+@ObjectType()
+export class TestMutation {
+    @Field(type => TextMutation)
+    async textMutation(@Arg('text') text?: string){
+        return {
+            text: await addText({text})
+        }
+    }
+}
+
+@ObjectType()
+export class TextMutation {
+    @Field()
+    text?: string
+}

package/src/GraphQL/server.ts

@@ -1,8 +1,10 @@
 'use strict';
+
 import express from 'express'; //express
 import { graphqlHTTP } from 'express-graphql';
 import { config } from '@config';
-import schema from '@GraphQL/schema';
+import schema from '@src/GraphQL/schema';
+
 
 const server = express.Router();//Router de Express
 
@@ -17,8 +19,6 @@ server.use(
 	}),
 );
 
-
-
 // DO NOT DO app.listen() unless we're testing this directly
 if (require.main === module) {
 	const app = express();

package/src/controllers/controllerGraphQL/index.ts

@@ -1,6 +1,7 @@
 'use strict';
 
 import { getTestModel, addTextModel } from '@models';
+import { TextMutation } from '@src/GraphQL/schema/test.schema';
 
 // eslint-disable-next-line
 export const getTest = async ({}) => {
@@ -8,11 +9,6 @@ export const getTest = async ({}) => {
 };
 
 // eslint-disable-next-line
-export const addText = async ({args}: {
-	rootValue: any
-	args: { text: string }
-	context: any
-}) => {
-	const text = args.text;
+export const addText = async ({ text }: TextMutation) => {
 	return addTextModel({ text });
 };

package/src/index.ts

@@ -1,5 +1,6 @@
 'use strict';
 
+import "reflect-metadata";
 import ws from 'ws'; // yarn add ws
 import express from 'express'; //express
 import cors from 'cors';

package/src/models/index.ts

@@ -1,9 +1,11 @@
 'use strict';
 
+import { TextMutation } from "@GraphQL/schema/test.schema";
+
 export const getTestModel = async () => {
 	return 'This is the text response for Test Query from a model';
 };
 
-export const addTextModel = async ({ text }: {text: string}) => {
+export const addTextModel = async ({ text }: TextMutation) => {
 	return `Simulate to insert some text: ${text} from a model`;
 };

package/src/tests/server/index.test.ts

@@ -2,17 +2,21 @@ import server from '@src';
 import supertest from 'supertest';
 describe('global server tests', () => {
     let request: supertest.SuperTest<supertest.Test>;
-    beforeEach(() => {
-        request = supertest(server);
-      });
+    beforeEach( async () => {
+      request = await supertest(server);
+    });
+
     it('should return Test data from test Query', async () => {
         const bodyResponse = {
             data: {
-              test: { test: 'This is the text response for Test Query from a model' }
+              test: {
+                text: {
+                  text: "This is the text response for Test Query from a model"
+                }
+              }
             }
         }
-
-        const response = await request.get('/graphql?query=%7B%0A%20%20test%7B%0A%20%20%20%20test%0A%20%20%7D%0A%7D%0A')
+        const response = await request.get('/graphql?query=%7B%0A%20%20test%7B%0A%20%20%20%20text%7B%0A%20%20%20%20%20%20text%0A%20%20%20%20%7D%0A%20%20%7D%0A%7D%0A%0A')
         .set('Accept', 'application/json')
         expect(response.status).toEqual(200);
         expect(response.body).toEqual(bodyResponse);
@@ -21,14 +25,21 @@ describe('global server tests', () => {
     it('should return Test data from test Mutation', async () => {
         const bodyResponse = {
             data: {
-                testMutation: {
-                    testMutation: 'Simulate to insert some text: test text from a model'
+              testMutation: {
+                textMutation: {
+                  text: "Simulate to insert some text: testing text from a model"
                 }
+              }
             }
         }
-
         const response = await request.post('/graphql')
-        .send({"query":"mutation{\n testMutation{\n testMutation(text: \"test text\")\n }\n}\n","variables":null})
+        .send({'query': `mutation{
+            testMutation{
+              textMutation(text: "testing text"){
+                text
+              }
+            }
+        }`})
         .set('Accept', 'application/json')
         expect(response.status).toEqual(200);
         expect(response.body).toEqual(bodyResponse);

package/tsconfig.json

@@ -2,12 +2,14 @@
     "compilerOptions": {
       "module": "commonjs",
       "esModuleInterop": true,
-      "target": "es6",
+      "target": "es2018",
       "moduleResolution": "node",
       "sourceMap": true,
       "typeRoots" : ["./src/@types", "./node_modules/@types"],
       "strict": true,
       "forceConsistentCasingInFileNames": true,
+      "emitDecoratorMetadata": true,
+      "experimentalDecorators": true,
       "baseUrl": ".",
       "paths": {
         "@src/*": ["src/*"],
@@ -26,5 +28,5 @@
         "@config": ["config"]
       }
     },
-    "lib": ["es2015"]
+    "lib": ["es2018", "esnext.asynciterable"]
 }

package/src/GraphQL/resolvers/index.ts

@@ -1,23 +0,0 @@
-'use strict';
-
-import { getTest, addText } from '@controllerGraphQL';
-
-// A map of functions which return data for the schema.
-const resolvers = {
-	Query: {
-		// eslint-disable-next-line
-		test: (rootValue: any, args: any, context: any) => ({}),
-	},
-	Mutation: {
-		// eslint-disable-next-line
-		testMutation: (rootValue: any, args: any, context: any) => ({}),
-	},
-	Test: {
-		test: (rootValue: any, args: any, context: any) => getTest({rootValue, args, context})
-	},
-	TestMutation: {
-		testMutation: (rootValue: any, args: any, context: any) => addText({rootValue, args, context})
-	}
-};
-
-export default resolvers;

package/src/GraphQL/schema/Test.gql

@@ -1,13 +0,0 @@
-module.exports = `
-
-  """Test Query"""
-  type Test {
-    test: String
-  }
-
-  """Esta es la Data de LogIn, Si los datos no son correctos devuelve el usuario Null y la conexion en False"""
-  type TestMutation {
-    testMutation(text: String): String
-  }
-  
-`