working test-harness

Author: seriousme

README.md

@@ -102,7 +102,7 @@ See the [generator examples](#examples) section for a demo.
 ```
 
   -p <name>                   The name of the project to generate
-  --projectName=<name>        [default: generatedProject]
+  --projectName=<name>        [default: generated-javascript-project]
 
   -b <dir> --baseDir=<dir>    Directory to generate the project in.
                               This directory must already exist.
@@ -161,7 +161,7 @@ as the pet returned by service.js does not match the response schema.
 
 <a name="generatorExamples"></a>
 ### Generator
-The folder [examples/generatedProject](examples/generatedProject) contains the result of running `openapi-glue -l --baseDir=examples examples/petstore/petstore-swagger.v2.yaml`. The generated code can be started using `npm start` in `examples/generatedProject` (you will need to run `npm i` in the generated folder first)
+The folder [examples/generated-javascript-project](examples/generated-javascript-project) contains the result of running `openapi-glue -l --baseDir=examples examples/petstore/petstore-swagger.v2.yaml`. The generated code can be started using `npm start` in `examples/generated-javascript-project` (you will need to run `npm i` in the generated folder first)
 <a name="Notes"></a>
 ## Notes
 - the plugin ignores information in a v3 specification under `server/url` as there could be multiple values here, use the `prefix` [option](#pluginOptions) if you need to prefix your routes. See the [servers documentation](docs/servers.md) for more details.

bin/openapi-glue-cli.js

@@ -7,6 +7,8 @@ import argvParser from "minimist";
 import { exit } from "process";
 const __filename = fileURLToPath(import.meta.url);
 
+const validTypes = new Set(["javascript", "standaloneJS"]);
+
 function usage() {
 	console.log(`
 Usage:
@@ -26,7 +28,7 @@ Options:
 
   -t <type> --type=<type>     Type of project to generate, possible options:
                               javascript (default)
-                              standalone-js
+                              standaloneJS
  
  The following options are only usefull for testing the openapi-glue plugin:
   -c --checksumOnly           Don't generate the project on disk but
@@ -49,7 +51,6 @@ const argvOptions = {
 	},
 
 	default: {
-		projectName: "generatedProject",
 		baseDir: process.cwd(),
 		checksumOnly: false,
 		localPlugin: false,
@@ -64,11 +65,17 @@ if (!argv.specification) {
 	usage();
 }
 
+if (!validTypes.has(argv.type)) {
+	console.log(`Unknown type: ${argv.type}`);
+	usage();
+}
+
+const projectName = argv.projectName || `generated-${argv.type}-project`;
 const specPath = resolve(process.cwd(), argv.specification);
 const generator = new Generator(argv.checksumOnly, argv.localPlugin);
 const handler = (str) =>
 	/* c8 ignore next */
-	argv.checksumOnly ? JSON.stringify(str, null, 2) : str;
+	argv.checksumOnly ? JSON.stringify(str, null, "\t") : str;
 if (generator.localPlugin) {
 	console.log(`Using local plugin at: ${generator.localPlugin}
   `);
@@ -78,11 +85,7 @@ try {
 	await generator.parse(specPath);
 	console.log(
 		handler(
-			await generator.generateProject(
-				argv.baseDir,
-				argv.projectName,
-				argv.type,
-			),
+			await generator.generateProject(argv.baseDir, projectName, argv.type),
 		),
 	);
 } catch (e) {

docs/securityHandlers.md

@@ -44,4 +44,4 @@ will return errors originating from the securityHandlers as well in `err.errors`
 
 You can use `err.errors` also to trigger other behaviour in a registered error handler.
 
-For a more elaborate example see the [examples/generatedProject](/examples/generatedProject) folder.
+For a more elaborate example see the [examples/generated-javascript-project](/examples/generated-javascript-project) folder.

examples/generatedProject/README.md renamed to examples/generated-javascript-project/README.md

@@ -1,4 +1,4 @@
-# generatedProject
+# generated-javascript-project
 
 This directory contains a fastify plugin that was autogenerated using 
 [fastify-openapi-glue](https://github.com/seriousme/fastify-openapi-glue) and 

examples/generatedProject/index.js renamed to examples/generated-javascript-project/index.js

@@ -1,5 +1,5 @@
 // Fastify plugin autogenerated by fastify-openapi-glue
-import openapiGlue from "fastify-openapi-glue";
+import openapiGlue from "../../lib/templates/index.js";
 import { Service } from "./service.js";
 import { Security } from "./security.js";
 const localFile = (fileName) => new URL(fileName, import.meta.url).pathname;