Restructure conformance folder structure.

heymb · heymb · Sep 18, 2023 · Sep 18, 2023 · Dec 15, 2023 · Dec 15, 2023
commit dd18f5a8635b8a3713c4f569944dcaab7b095ae1
diff --git a/conformance/package.json b/conformance/package.json
@@ -4,9 +4,9 @@
   "description": "Tests the ConformanceApi client.",
   "scripts": {
     "build": "tsc",
-    "test": "npm run --silent build && mocha dist/ts/test/conformanceApiTests.js",
-    "fastify:ts": "npm run --silent build && fastify start -p 4117 -w -l info -P dist/ts/src/fastify/app.js",
-    "fastify:js": "npm run --silent build && fastify start -p 4117 -w -l info -P dist/js/src/fastify/app.js"
+    "test": "npm run --silent build && mocha dist/test/conformanceApiTests.js",
+    "fastify:ts": "npm run --silent build && fastify start -p 4117 -w -l info -P dist/src/ts/fastify/app.js",
+    "fastify:js": "npm run --silent build && fastify start -p 4117 -w -l info -P dist/src/js/fastify/app.js"
   },
   "repository": {
     "type": "git",

diff --git a/conformance/js/src/conformanceApi.js → conformance/src/js/conformanceApi.js b/conformance/js/src/conformanceApi.js → conformance/src/js/conformanceApi.js
diff --git a/conformance/js/src/fastify/app.js → conformance/src/js/fastify/app.js b/conformance/js/src/fastify/app.js → conformance/src/js/fastify/app.js
@@ -1,4 +1,4 @@
-import { ConformanceApiService } from "../../../ts/src/conformanceApiService.js";
+import { ConformanceApiService } from "../../ts/conformanceApiService.js";
 import conformanceTestsJson from "../../../ConformanceTests.json";
 import { conformanceApiPlugin } from "./conformanceApiPlugin.js";
 

diff --git a/...ce/js/src/fastify/conformanceApiPlugin.js → ...ce/src/js/fastify/conformanceApiPlugin.js b/...ce/js/src/fastify/conformanceApiPlugin.js → ...ce/src/js/fastify/conformanceApiPlugin.js
diff --git a/conformance/ts/src/conformanceApi.ts → conformance/src/ts/conformanceApi.ts b/conformance/ts/src/conformanceApi.ts → conformance/src/ts/conformanceApi.ts
diff --git a/conformance/ts/src/conformanceApiService.ts → conformance/src/ts/conformanceApiService.ts b/conformance/ts/src/conformanceApiService.ts → conformance/src/ts/conformanceApiService.ts
diff --git a/conformance/ts/src/conformanceApiTypes.ts → conformance/src/ts/conformanceApiTypes.ts b/conformance/ts/src/conformanceApiTypes.ts → conformance/src/ts/conformanceApiTypes.ts
diff --git a/conformance/ts/src/fastify/app.ts → conformance/src/ts/fastify/app.ts b/conformance/ts/src/fastify/app.ts → conformance/src/ts/fastify/app.ts
@@ -1,13 +1,18 @@
 import { FastifyPluginAsync } from "fastify";
 import { ConformanceApiService } from "../conformanceApiService.js";
-import conformanceTestsJson from '../../../ConformanceTests.json';
+import conformanceTestsJson from "../../../ConformanceTests.json";
 import { conformanceApiPlugin } from "./conformanceApiPlugin.js";
 
 export type AppOptions = {};
 const options: AppOptions = {};
 
-const app: FastifyPluginAsync<AppOptions> = async (fastify, opts): Promise<void> => {
-	fastify.register(conformanceApiPlugin, { api: new ConformanceApiService(conformanceTestsJson.tests) });
+const app: FastifyPluginAsync<AppOptions> = async (
+	fastify,
+	opts
+): Promise<void> => {
+	fastify.register(conformanceApiPlugin, {
+		api: new ConformanceApiService(conformanceTestsJson.tests),
+	});
 };
 
 export default app;

diff --git a/...ce/ts/src/fastify/conformanceApiPlugin.ts → ...ce/src/ts/fastify/conformanceApiPlugin.ts b/...ce/ts/src/fastify/conformanceApiPlugin.ts → ...ce/src/ts/fastify/conformanceApiPlugin.ts
diff --git a/conformance/ts/test/conformanceApiTests.ts → conformance/test/conformanceApiTests.ts b/conformance/ts/test/conformanceApiTests.ts → conformance/test/conformanceApiTests.ts
@@ -1,21 +1,21 @@
-import { createHttpClient } from '../src/conformanceApi';
-import { expect, should } from 'chai';
-import fetch from 'node-fetch';
-import conformanceTestsJson from '../../ConformanceTests.json';
+import { createHttpClient } from "../src/ts/conformanceApi";
+import { expect, should } from "chai";
+import fetch from "node-fetch";
+import conformanceTestsJson from "../ConformanceTests.json";
 
 should();
 
 const httpClient = createHttpClient({
 	fetch: (uri, request) => {
-		return fetch('http://localhost:4117/' + uri, request);
-	}
+		return fetch("http://localhost:4117/" + uri, request);
+	},
 });
 
-describe('tests', () => {
-
+describe("tests", () => {
 	conformanceTestsJson.tests.forEach((data: any) => {
 		it(data.test, async () => {
-			return ((httpClient as any)[data.method](data.request))
+			return (httpClient as any)
+				[data.method](data.request)
 				.then((result: any) => {
 					expect({
 						error: result.error ?? undefined,
@@ -27,5 +27,4 @@ describe('tests', () => {
 				});
 		});
 	});
-
 });
diff --git a/conformance/tsconfig.json b/conformance/tsconfig.json
@@ -13,7 +13,8 @@
     "allowJs": true
   },
   "include": [
-    "ts/**/*.ts",
-    "js/**/*.js"
-  ]
+    "src/**/*.ts",
+    "src/**/*.js",
+    "test/**/*.ts"
+  ],
 }
diff --git a/tools/Build/Build.cs b/tools/Build/Build.cs
@@ -46,8 +46,8 @@ void CodeGen(bool verify)
 
 		RunDotNet("FacilityConformance", "fsd", "--output", "conformance/ConformanceApi.fsd", verifyOption);
 		RunDotNet("FacilityConformance", "json", "--output", "conformance/ConformanceTests.json", verifyOption);
-		RunCodeGen("conformance/ConformanceApi.fsd", "conformance/js/src/", "--fastify", "--indent", "2", "--disable-eslint");
-		RunCodeGen("conformance/ConformanceApi.fsd", "conformance/ts/src/", "--typescript", "--fastify", "--indent", "2", "--disable-eslint");
+		RunCodeGen("conformance/ConformanceApi.fsd", "conformance/src/js/", "--fastify", "--indent", "2", "--disable-eslint");
+		RunCodeGen("conformance/ConformanceApi.fsd", "conformance/src/ts/", "--typescript", "--fastify", "--indent", "2", "--disable-eslint");
 
 		void RunCodeGen(params string?[] args) =>
 			RunDotNet(new[] { "run", "--no-build", "--project", $"src/{codegen}", "-f", "net6.0", "-c", configuration, "--", "--newline", "lf", verifyOption }.Concat(args));