Merge branch 'feature/runtime-changes-before-proxy' into develop

acttoreact · May 6, 2020 · bbae5ae · bbae5ae
2 parents bf3c94b + 5f4ef82
commit bbae5ae
Show file tree

Hide file tree

Showing 33 changed files with 449 additions and 424 deletions.
diff --git a/index.ts b/index.ts
@@ -1,7 +1,7 @@
 import path from 'path';
 import chokidar from 'chokidar';
 
-import { targetPath, runtimePath } from './settings';
+import { targetPath, proxyPath } from './settings';
 import initWatchers from './utils/initWatchers';
 import { ensureDir } from './tools/fs';
 import isJest from './tools/isJest';
@@ -16,7 +16,7 @@ interface Process {
 
 const pendingProcesses: Process[] = [];
 const serverPath = path.resolve(__dirname, targetPath);
-const runtimeDestPath = path.resolve(__dirname, runtimePath);
+const proxyDestPath = path.resolve(__dirname, proxyPath);
 
 let runningProcess: 'start' | 'stop' = null;
 
@@ -93,7 +93,7 @@ export const restart = start;
  * Inits API Watcher by ensuring destination path and running start process
  */
 const init = async (): Promise<void> => {
-  await ensureDir(runtimeDestPath);
+  await ensureDir(proxyDestPath);
   await start();
 };
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -45,15 +45,15 @@
     "typescript": "^3.5.3",
     "winston": "^3.2.1",
     "winston-transport": "^4.3.0",
-    "snyk": "^1.317.0"
+    "snyk": "^1.319.0"
   },
   "devDependencies": {
     "@types/jest": "^25.1.1",
-    "@types/node": "^13.13.4",
+    "@types/node": "^13.13.5",
     "@types/rimraf": "^3.0.0",
     "@typescript-eslint/eslint-plugin": "^2.31.0",
     "@typescript-eslint/parser": "^2.31.0",
-    "babel-jest": "^25.5.1",
+    "babel-jest": "^25.4.0",
     "better-docs": "^2.0.1",
     "coveralls": "^3.0.11",
     "eslint": "^6.8.0",
@@ -62,7 +62,7 @@
     "eslint-plugin-import": "^2.18.2",
     "eslint-plugin-jsx-a11y": "^6.2.3",
     "eslint-plugin-react": "^7.14.2",
-    "jest": "^25.5.4",
+    "jest": "^25.4.0",
     "jsdoc": "^3.6.3",
     "ts-jest": "^25.4.0",
     "ts-node-dev": "^1.0.0-pre.40",

diff --git a/settings/index.ts b/settings/index.ts
@@ -14,6 +14,6 @@ export const apiPath = 'api';
 export const modelPath = 'model';
 
 /**
- * Default runtime target path, where watcher will copy api files once validated
+ * Default proxy target path, where watcher will generate proxy for API and Model
  */
-export const runtimePath = './.a2r/runtime';
+export const proxyPath = './.a2r/proxy';
diff --git a/test/mocks/.a2r/runtime/api/documented.ts → test/mocks/server/init-ok/api/ok.ts b/test/mocks/.a2r/runtime/api/documented.ts → test/mocks/server/init-ok/api/ok.ts
diff --git a/test/mocks/.a2r/runtime/model/documented.ts → test/mocks/server/init-ok/model/ok.ts b/test/mocks/.a2r/runtime/model/documented.ts → test/mocks/server/init-ok/model/ok.ts
diff --git a/test/mocks/server/stress-validator/folder/file-0.ts b/test/mocks/server/stress-validator/folder/file-0.ts
@@ -0,0 +1 @@
+// test file
diff --git a/test/mocks/server/stress-validator/folder/file-1.ts b/test/mocks/server/stress-validator/folder/file-1.ts
@@ -0,0 +1 @@
+// test file
diff --git a/test/mocks/server/stress-validator/folder/file-2.ts b/test/mocks/server/stress-validator/folder/file-2.ts
@@ -0,0 +1 @@
+// test file
diff --git a/test/mocks/server/stress-validator/folder/file-3.ts b/test/mocks/server/stress-validator/folder/file-3.ts
@@ -0,0 +1 @@
+// test file
diff --git a/test/mocks/server/stress-validator/folder/file-4.ts b/test/mocks/server/stress-validator/folder/file-4.ts
@@ -0,0 +1 @@
+// test file
diff --git a/test/mocks/server/stress-validator/folder/file.ts b/test/mocks/server/stress-validator/folder/file.ts
@@ -0,0 +1 @@
+// test file
diff --git a/test/mocks/server/stress-validator/folder/last-file.ts b/test/mocks/server/stress-validator/folder/last-file.ts
@@ -0,0 +1 @@
+// test file
diff --git a/test/mocks/working-server/api/documented.ts b/test/mocks/working-server/api/documented.ts
diff --git a/test/mocks/working-server/model/documented.ts b/test/mocks/working-server/model/documented.ts