Move helpers below plugin.

mitchknife · mitchknife · commit 36362e6e0877 · 2025-02-10T06:20:51.000-08:00
diff --git a/conformance/src/fastify/conformanceApiPlugin.ts b/conformance/src/fastify/conformanceApiPlugin.ts
@@ -4,34 +4,6 @@
 import { FastifyPluginAsync, RegisterOptions } from 'fastify';
 import { IServiceResult, IServiceError } from 'facility-core';
 
-const standardErrorCodes: { [code: string]: number } = {
-  'NotModified': 304,
-  'InvalidRequest': 400,
-  'NotAuthenticated': 401,
-  'NotAuthorized': 403,
-  'NotFound': 404,
-  'Conflict': 409,
-  'RequestTooLarge': 413,
-  'TooManyRequests': 429,
-  'InternalError': 500,
-  'ServiceUnavailable': 503,
-  'NotAdmin': 403,
-  'TooHappy': 500,
-};
-
-function parseBoolean(value: string | undefined) {
-  if (typeof value === 'string') {
-    const lowerValue = value.toLowerCase();
-    if (lowerValue === 'true') {
-      return true;
-    }
-    if (lowerValue === 'false') {
-      return false;
-    }
-  }
-  return undefined;
-}
-
 export type ConformanceApiPluginOptions = RegisterOptions & {
   api: IConformanceApi;
   caseInsenstiveQueryStringKeys?: boolean;
@@ -829,6 +801,34 @@ const jsonSchemas = [
   } as const,
 ] as const;
 
+const standardErrorCodes: { [code: string]: number } = {
+  'NotModified': 304,
+  'InvalidRequest': 400,
+  'NotAuthenticated': 401,
+  'NotAuthorized': 403,
+  'NotFound': 404,
+  'Conflict': 409,
+  'RequestTooLarge': 413,
+  'TooManyRequests': 429,
+  'InternalError': 500,
+  'ServiceUnavailable': 503,
+  'NotAdmin': 403,
+  'TooHappy': 500,
+};
+
+function parseBoolean(value: string | undefined) {
+  if (typeof value === 'string') {
+    const lowerValue = value.toLowerCase();
+    if (lowerValue === 'true') {
+      return true;
+    }
+    if (lowerValue === 'false') {
+      return false;
+    }
+  }
+  return undefined;
+}
+
 /** API for a Facility test server. */
 export interface IConformanceApi {
   /** Gets API information. */
diff --git a/conformance/src/fastify/jsConformanceApiPlugin.js b/conformance/src/fastify/jsConformanceApiPlugin.js
@@ -3,34 +3,6 @@
 'use strict';
 
 
-const standardErrorCodes = {
-  'NotModified': 304,
-  'InvalidRequest': 400,
-  'NotAuthenticated': 401,
-  'NotAuthorized': 403,
-  'NotFound': 404,
-  'Conflict': 409,
-  'RequestTooLarge': 413,
-  'TooManyRequests': 429,
-  'InternalError': 500,
-  'ServiceUnavailable': 503,
-  'NotAdmin': 403,
-  'TooHappy': 500,
-};
-
-function parseBoolean(value) {
-  if (typeof value === 'string') {
-    const lowerValue = value.toLowerCase();
-    if (lowerValue === 'true') {
-      return true;
-    }
-    if (lowerValue === 'false') {
-      return false;
-    }
-  }
-  return undefined;
-}
-
 export const jsConformanceApiPlugin = async (fastify, opts) => {
   const { api, caseInsenstiveQueryStringKeys, includeErrorDetails } = opts;
 
@@ -821,3 +793,31 @@ const jsonSchemas = [
     enum: [ 'yes', 'no', 'maybe' ],
   },
 ];
+
+const standardErrorCodes = {
+  'NotModified': 304,
+  'InvalidRequest': 400,
+  'NotAuthenticated': 401,
+  'NotAuthorized': 403,
+  'NotFound': 404,
+  'Conflict': 409,
+  'RequestTooLarge': 413,
+  'TooManyRequests': 429,
+  'InternalError': 500,
+  'ServiceUnavailable': 503,
+  'NotAdmin': 403,
+  'TooHappy': 500,
+};
+
+function parseBoolean(value) {
+  if (typeof value === 'string') {
+    const lowerValue = value.toLowerCase();
+    if (lowerValue === 'true') {
+      return true;
+    }
+    if (lowerValue === 'false') {
+      return false;
+    }
+  }
+  return undefined;
+}
diff --git a/src/Facility.CodeGen.JavaScript/JavaScriptGenerator.cs b/src/Facility.CodeGen.JavaScript/JavaScriptGenerator.cs
@@ -589,12 +589,6 @@ private CodeGenOutput GenerateFastifyPluginOutput(ServiceInfo service)
 				}
 				WriteImports(code, facilityImports, "facility-core");
 
-				code.WriteLine();
-				WriteStandardErrorCodesVariable("standardErrorCodes", code, httpServiceInfo.ErrorSets);
-
-				code.WriteLine();
-				WriteParseBooleanFunction("parseBoolean", code);
-
 				if (TypeScript)
 				{
 					code.WriteLine();
@@ -832,6 +826,12 @@ private CodeGenOutput GenerateFastifyPluginOutput(ServiceInfo service)
 
 				WriteJsonSchemaDtos(code, service);
 
+				code.WriteLine();
+				WriteStandardErrorCodesVariable("standardErrorCodes", code, httpServiceInfo.ErrorSets);
+
+				code.WriteLine();
+				WriteParseBooleanFunction("parseBoolean", code);
+
 				if (TypeScript)
 					WriteTypes(code, httpServiceInfo);
 			});
