Generate new result type methods for Conjure services

scripts/run-integration-tests.sh

@@ -5,4 +5,8 @@ set -euo pipefail
 ./build/downloads/bin/conjure-verification-server ./build/resources/verification-server-test-cases.json ./build/resources/verification-server-api.conjure.json &
 SERVER_PID=$!
 yarn karma start --single-run --browsers ChromeHeadless karma.conf.js
-kill -kill ${SERVER_PID}
+
+if ps -p ${SERVER_PID} > /dev/null
+then
+    kill -kill ${SERVER_PID}
+fi

src/commands/generate/__tests__/resources/services/optionalService.ts

@@ -5,6 +5,7 @@ const __undefined: undefined = undefined;
 
 export interface IOptionalService {
     foo(header: string, name?: string | null): Promise<void>;
+    fooOrError(header: string, name?: string | null): Promise<{ status: "success", response: void }>;
 }
 
 export class OptionalService {
@@ -29,4 +30,15 @@ export class OptionalService {
             __undefined
         );
     }
+
+    public async fooOrError(header: string, name?: string | null): Promise<{ status: "success", response: void }> {
+        try {
+            return { status: "success", response: await this.foo(header, name) }
+        } catch (e: any) {
+            if (e == null || e.body == null) {
+                throw e;
+            }
+            throw e;
+        }
+    }
 }

src/commands/generate/__tests__/resources/services/outOfOrderPathService.ts

@@ -5,6 +5,7 @@ const __undefined: undefined = undefined;
 
 export interface IOutOfOrderPathService {
     foo(param1: string, param2: string): Promise<void>;
+    fooOrError(param1: string, param2: string): Promise<{ status: "success", response: void }>;
 }
 
 export class OutOfOrderPathService {
@@ -29,4 +30,15 @@ export class OutOfOrderPathService {
             __undefined
         );
     }
+
+    public async fooOrError(param1: string, param2: string): Promise<{ status: "success", response: void }> {
+        try {
+            return { status: "success", response: await this.foo(param1, param2) }
+        } catch (e: any) {
+            if (e == null || e.body == null) {
+                throw e;
+            }
+            throw e;
+        }
+    }
 }

src/commands/generate/__tests__/resources/services/paramTypeService.ts

@@ -5,6 +5,7 @@ const __undefined: undefined = undefined;
 
 export interface IParamTypeService {
     foo(body: string, header: string, path: string, query: string): Promise<void>;
+    fooOrError(body: string, header: string, path: string, query: string): Promise<{ status: "success", response: void }>;
 }
 
 export class ParamTypeService {
@@ -31,4 +32,15 @@ export class ParamTypeService {
             __undefined
         );
     }
+
+    public async fooOrError(body: string, header: string, path: string, query: string): Promise<{ status: "success", response: void }> {
+        try {
+            return { status: "success", response: await this.foo(body, header, path, query) }
+        } catch (e: any) {
+            if (e == null || e.body == null) {
+                throw e;
+            }
+            throw e;
+        }
+    }
 }

src/commands/generate/__tests__/resources/services/primitiveService.ts

@@ -5,6 +5,7 @@ const __undefined: undefined = undefined;
 
 export interface IPrimitiveService {
     getPrimitive(): Promise<number>;
+    getPrimitiveOrError(): Promise<{ status: "success", response: number }>;
 }
 
 export class PrimitiveService {
@@ -25,4 +26,15 @@ export class PrimitiveService {
             __undefined
         );
     }
+
+    public async getPrimitiveOrError(): Promise<{ status: "success", response: number }> {
+        try {
+            return { status: "success", response: await this.getPrimitive() }
+        } catch (e: any) {
+            if (e == null || e.body == null) {
+                throw e;
+            }
+            throw e;
+        }
+    }
 }

src/commands/generate/__tests__/resources/services/serviceWithSafelongHeader.ts

@@ -5,6 +5,7 @@ const __undefined: undefined = undefined;
 
 export interface IServiceWithSafelongHeader {
     foo(investigation: number): Promise<void>;
+    fooOrError(investigation: number): Promise<{ status: "success", response: void }>;
 }
 
 export class ServiceWithSafelongHeader {
@@ -27,4 +28,15 @@ export class ServiceWithSafelongHeader {
             __undefined
         );
     }
+
+    public async fooOrError(investigation: number): Promise<{ status: "success", response: void }> {
+        try {
+            return { status: "success", response: await this.foo(investigation) }
+        } catch (e: any) {
+            if (e == null || e.body == null) {
+                throw e;
+            }
+            throw e;
+        }
+    }
 }