Merge pull request #40 from EMResearch/js-refactoring

Js refactoring

Author: arcuri82

.gitignore

@@ -159,27 +159,35 @@ hs_err_pid*
 
 ### JavaScript
 /venv/
-/js_npm/rest/ncs/build/
 /js_npm/evomaster-client-js/
+/js_npm/rest/ncs/build/
+/js_npm/rest/ncs/instrumented/
 /js_npm/rest/ncs/node_modules/
 /js_npm/rest/ncs/em/EvoMasterTest.js
 /js_npm/rest/ncs/coverage/
 /js_npm/rest/cyclotron/node_modules/
 /js_npm/rest/cyclotron/build/
+/js_npm/rest/cyclotron/instrumented/
 /js_npm/rest/cyclotron/em/EvoMasterTest.js
 /js_npm/rest/cyclotron/em/samples
 /js_npm/rest/cyclotron/coverage/
 /js_npm/rest/scs/node_modules/
 /js_npm/rest/scs/build/
+/js_npm/rest/scs/instrumented/
 /js_npm/rest/scs/em/EvoMasterTest.js
 /js_npm/rest/disease-sh-api/node_modules/
 /js_npm/rest/disease-sh-api/build/
+/js_npm/rest/disease-sh-api/instrumented/
 /js_npm/rest/disease-sh-api/EvoMasterTest.js
 /js_npm/rest/disease-sh-api/redis/
 /js_npm/rest/realworld-app/node_modules/
 /js_npm/rest/realworld-app/build/
+/js_npm/rest/realworld-app/instrumented/
+/js_npm/rest/realworld-app/dist/
+/js_npm/rest/realworld-app/instrumented/
 /js_npm/rest/spacex-api/node_modules/
 /js_npm/rest/spacex-api/build/
+/js_npm/rest/spacex-api/instrumented/
 /js_npm/graphql/react-finland/build/
 /js_npm/graphql/react-finland/.idea/
 /js_npm/graphql/react-finland/node_modules/
@@ -190,7 +198,6 @@ hs_err_pid*
 /js_npm/graphql/ecommerce-server/instrumented/
 /js_npm/graphql/ecommerce-server/src/graphql/schemas/schema.gql
 
-
 #DotNet
 [Dd]ebug/
 [Bb]in/
@@ -212,3 +219,4 @@ dotnet_3/em/embedded/rest/SampleProjectDriver/logs/
 
 
 
+

README.md

@@ -104,7 +104,7 @@ We just re-implemented in different languages, and put them behind a web service
 
 ### GraphQL: Java/Kotlin
 
-* Spring-Pet-Clinic (Apache ), from [https://github.com/spring-petclinic/spring-petclinic-graphql]()
+* Spring-Pet-Clinic (Apache), from [https://github.com/spring-petclinic/spring-petclinic-graphql]()
 
 * Patio-Api (GPL), from [https://github.com/patio-team/patio-api]()
 
@@ -115,6 +115,12 @@ We just re-implemented in different languages, and put them behind a web service
 * SCS (not-known license, artificial string examples coming from different sources)
 
 
+### GraphQL: JavaScript/TypeScript
+
+* React-Finland (not-known license), from [https://github.com/ReactFinland/graphql-api](https://github.com/ReactFinland/graphql-api)
+
+* E-Commerce Server (MIT), from [https://github.com/react-shop/react-ecommerce](https://github.com/react-shop/react-ecommerce)
+
 ### RPC (Thrift/gRPC): Java
 
 * NCS (not-known license, artificial numerical examples coming from different sources)

js_npm/graphql/ecommerce-server/em/app-driver.js

@@ -6,9 +6,6 @@ const superagent = require("superagent");
 
 class AppController extends em.SutController {
 
-    setupForGeneratedTest() {
-    }
-
     getInfoForAuthentication() {
         let jwtLogin = new em.dto.JsonTokenPostLoginDto();
         jwtLogin.endpoint = "/graphql";

js_npm/graphql/ecommerce-server/package-lock.json

@@ -6,8 +6,8 @@
   "private": true,
   "license": "UNLICENSED",
   "scripts": {
-    "prebuild": "rimraf dist",
-    "build": "nest build && npm run instrument",
+    "prebuild": "rimraf build",
+    "build": "nest build",
     "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
     "start": "nest start",
     "dev": "nest start --watch",
@@ -19,8 +19,8 @@
     "test:cov": "jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
     "test:e2e": "jest --config ./test/jest-e2e.json",
-    "instrument": "rimraf instrumented && babel dist em -d instrumented/src --copy-files ",
-    "em": "node instrumented/src/em-main.js"
+    "em:run": "node instrumented/em/em-main.js",
+    "em:build": "npm run build && rimraf instrumented && babel build -d instrumented --copy-files && babel em -d instrumented/em --copy-files &&  babel em -d build/em --copy-files "
   },
   "dependencies": {
     "@nestjs/common": "^8.0.0",
@@ -78,7 +78,7 @@
   },
   "babel": {
     "only": [
-      "dist"
+      "build"
     ],
     "plugins": [
       "module:evomaster-client-js"
@@ -90,11 +90,8 @@
       "json",
       "ts"
     ],
-    "rootDir": "src",
-    "testRegex": ".*\\.spec\\.ts$",
-    "transform": {
-      "^.+\\.(t|j)s$": "ts-jest"
-    },
+    "rootDir": "build/em",
+    "testRegex": ".*Test.js$",
     "collectCoverageFrom": [
       "**/*.(t|j)s"
     ],

js_npm/graphql/ecommerce-server/package.json

@@ -8,7 +8,7 @@
     "allowSyntheticDefaultImports": true,
     "target": "es2017",
     "sourceMap": true,
-    "outDir": "./dist",
+    "outDir": "./build/src",
     "incremental": true,
     "skipLibCheck": true,
     "baseUrl": "./src",

js_npm/graphql/ecommerce-server/tsconfig.json

@@ -1,3 +1,5 @@
+require( "reflect-metadata");
+
 const http  = require("http");
 const {AddressInfo}  = require("net");
 
@@ -6,7 +8,6 @@ const em = require("evomaster-client-js");
 const createApp = require("../server/app").default;
 
 
-
 class AppController  extends em.SutController {
 
     setupForGeneratedTest(){

js_npm/graphql/react-finland/em/app-driver.js

@@ -1,4 +1,4 @@
-require( "reflect-metadata");
+
 
 const AppController = require("./app-driver");
 const em = require("evomaster-client-js");