Merge branch 'main' into set-up-google-analytics

bin/counterfact.js

@@ -6,7 +6,7 @@ import { program } from "commander";
 import open from "open";
 
 import { generate } from "../src/typescript-generator/generate.js";
-import { start } from "../src/start.js";
+import { start } from "../src/server/start.js";
 
 const DEFAULT_PORT = 3100;
 

src/counterfact.js → src/server/counterfact.js

@@ -6,7 +6,8 @@ import os from "node:os";
 import $RefParser from "json-schema-ref-parser";
 import yaml from "js-yaml";
 
-import { readFile } from "./read-file.js";
+import { readFile } from "../util/read-file.js";
+
 import { Registry } from "./registry.js";
 import { Dispatcher } from "./dispatcher.js";
 import { koaMiddleware } from "./koa-middleware.js";
@@ -39,7 +40,7 @@ export async function counterfact(
   )}/`;
 
   fs.copyFile(
-    nodePath.join(__dirname, "../templates/response-builder-factory.ts"),
+    nodePath.join(__dirname, "../../templates/response-builder-factory.ts"),
     nodePath.join(basePath, "response-builder-factory.ts")
   );
 

src/start.js → src/server/start.js

@@ -5,8 +5,9 @@ import bodyParser from "koa-bodyparser";
 import { koaSwagger } from "koa2-swagger-ui";
 import yaml from "js-yaml";
 
+import { readFile } from "../util/read-file.js";
+
 import { counterfact } from "./counterfact.js";
-import { readFile } from "./read-file.js";
 
 const DEFAULT_PORT = 3100;
 

src/typescript-generator/specification.js

@@ -2,7 +2,7 @@ import nodePath from "node:path";
 
 import yaml from "js-yaml";
 
-import { readFile } from "../read-file.js";
+import { readFile } from "../util/read-file.js";
 
 import { Requirement } from "./requirement.js";
 

test/context-registry.test.js → test/server/context-registry.test.js

@@ -1,4 +1,7 @@
-import { ContextRegistry, parentPath } from "../src/context-registry.js";
+import {
+  ContextRegistry,
+  parentPath,
+} from "../../src/server/context-registry.js";
 
 describe("moduleRegistry", () => {
   it("finds a context that exactly matches the path", () => {

test/counterfact.test.js → test/server/counterfact.test.js

@@ -1,9 +1,8 @@
 import supertest from "supertest";
 import Koa from "koa";
 
-import { counterfact } from "../src/counterfact.js";
-
-import { withTemporaryFiles } from "./lib/with-temporary-files.js";
+import { counterfact } from "../../src/server/counterfact.js";
+import { withTemporaryFiles } from "../lib/with-temporary-files.js";
 
 describe("integration test", () => {
   it("finds a path", async () => {

test/dispatcher.test.js → test/server/dispatcher.test.js

@@ -1,6 +1,6 @@
-import { Dispatcher } from "../src/dispatcher.js";
-import { ContextRegistry } from "../src/context-registry.js";
-import { Registry } from "../src/registry.js";
+import { Dispatcher } from "../../src/server/dispatcher.js";
+import { ContextRegistry } from "../../src/server/context-registry.js";
+import { Registry } from "../../src/server/registry.js";
 
 describe("a dispatcher", () => {
   it("dispatches a get request to a server and returns the response", async () => {

test/koa-middleware.test.js → test/server/koa-middleware.test.js

@@ -1,7 +1,7 @@
-import { Registry } from "../src/registry.js";
-import { Dispatcher } from "../src/dispatcher.js";
-import { koaMiddleware } from "../src/koa-middleware.js";
-import { ContextRegistry } from "../src/context-registry.js";
+import { Registry } from "../../src/server/registry.js";
+import { Dispatcher } from "../../src/server/dispatcher.js";
+import { koaMiddleware } from "../../src/server/koa-middleware.js";
+import { ContextRegistry } from "../../src/server/context-registry.js";
 
 describe("koa middleware", () => {
   it("passes the request to the dispatcher and returns the response", async () => {

test/module-loader.test.js → test/server/module-loader.test.js

@@ -1,10 +1,9 @@
 import { once } from "node:events";
 
-import { ModuleLoader } from "../src/module-loader.js";
-import { Registry } from "../src/registry.js";
-import { ContextRegistry } from "../src/context-registry.js";
-
-import { withTemporaryFiles } from "./lib/with-temporary-files.js";
+import { ModuleLoader } from "../../src/server/module-loader.js";
+import { Registry } from "../../src/server/registry.js";
+import { ContextRegistry } from "../../src/server/context-registry.js";
+import { withTemporaryFiles } from "../lib/with-temporary-files.js";
 
 describe("a module loader", () => {
   it("finds a file and adds it to the registry", async () => {

test/registry.test.js → test/server/registry.test.js

@@ -1,4 +1,4 @@
-import { Registry } from "../src/registry.js";
+import { Registry } from "../../src/server/registry.js";
 
 describe("a scripted server", () => {
   it("knows if a handler exists for a request method at a path", () => {

test/response-builder.test.js → test/server/response-builder.test.js

@@ -1,4 +1,4 @@
-import { createResponseBuilder } from "../src/response-builder.js";
+import { createResponseBuilder } from "../../src/server/response-builder.js";
 
 describe("a response builder", () => {
   it("starts building a response object when the status is selected", () => {

test/start.test.js → test/server/start.test.js

@@ -1,4 +1,4 @@
-import { landingPageBody } from "../src/start.js";
+import { landingPageBody } from "../../src/server/start.js";
 
 describe("start", () => {
   it("renders the landing page", () => {

test/tools.test.js → test/server/tools.test.js

@@ -1,4 +1,4 @@
-import { Tools } from "../src/tools.js";
+import { Tools } from "../../src/server/tools.js";
 
 describe("tools", () => {
   it("oneOf()", () => {

test/transpiler.test.js → test/server/transpiler.test.js

@@ -2,9 +2,8 @@ import { once } from "node:events";
 import fs from "node:fs/promises";
 import { constants as fsConstants } from "node:fs";
 
-import { Transpiler } from "../src/transpiler.js";
-
-import { withTemporaryFiles } from "./lib/with-temporary-files.js";
+import { Transpiler } from "../../src/server/transpiler.js";
+import { withTemporaryFiles } from "../lib/with-temporary-files.js";
 
 const TYPESCRIPT_SOURCE = "const x:number = 1;\n";
 const JAVASCRIPT_SOURCE = "var x = 1;\n";