@compassdigital/sdk.typescript 3.0.0-beta.10 → 3.0.0-beta.12

package/src/order.ts

@@ -376,12 +376,12 @@ export interface GetOrderCustomerOrdersBrandRequest extends GetOrderCustomerOrde
 
 // GET /order/location/brand/{id} - Get all orders for a location Brand
 
-export interface GetOrderBrandOrdersPath {
+export interface GetOrderLocationBrandPath {
   // The location brand ID
   id: string;
 }
 
-export interface GetOrderBrandOrdersQuery {
+export interface GetOrderLocationBrandQuery {
   // Filter orders by their pickup date. Only return orders that have a date greater than or equal to the date in milliseconds.
   pickup_start?: number;
   // Filter orders by their pickup date. Only return orders that have a date less than or equal to the date in milliseconds.
@@ -398,11 +398,11 @@ export interface GetOrderBrandOrdersQuery {
   limit?: number;
 }
 
-export type GetOrderBrandOrdersResponse = Orders;
+export type GetOrderLocationBrandResponse = Orders;
 
-export interface GetOrderBrandOrdersRequest
-  extends GetOrderBrandOrdersQuery,
-    GetOrderBrandOrdersPath {}
+export interface GetOrderLocationBrandRequest
+  extends GetOrderLocationBrandQuery,
+    GetOrderLocationBrandPath {}
 
 // GET /order/location/{id} - Get all orders for a location
 

package/template.ejs

@@ -1,5 +1,5 @@
 
-import { BaseServiceClient, RequestOptions } from "./base";
+import { BaseServiceClient, RequestOptions, ResponsePromise } from "./base";
 export * from "./base";
 
 export class ServiceClient extends BaseServiceClient {
@@ -14,7 +14,7 @@ export class ServiceClient extends BaseServiceClient {
    * @param <%- param.name %><%- param.description ? " - " + param.description : "" %>
 <% } -%>
    */
-  <%- name %>(<% for (let i = 0; i < params.length; i++) { %><%- i > 0 ? ", " : "" %><%- params[i].name %><%= params[i].required ? "" : "?" %>: <%- params[i].type %><% } %>): Promise<<%= response %>> {
+  <%- name %>(<% for (let i = 0; i < params.length; i++) { %><%- i > 0 ? ", " : "" %><%- params[i].name %><%= params[i].required ? "" : "?" %>: <%- params[i].type %><% } %>): ResponsePromise<<%= response %>> {
     return this.request(<% for (let i = 0; i < args.length; i++) { %><%- i > 0 ? ", " : "" %><%- args[i] %><% } %>);
   }
 <% } %>

package/test/client.test.ts

@@ -79,7 +79,7 @@ describe("ServiceClient", () => {
       intercept: async (req) => {
         attempts++;
         return { ok: false, status: 500, body: "something went wrong"};
-      }
+      },
     });
     try {
       const task = await api.get_task("", { retry: 5 });
@@ -103,7 +103,7 @@ describe("ServiceClient", () => {
           return { ok: false, status: 501, body: "" };
         }
       });
-      const task = await ServiceError.ignore([501], api.get_task(""));
+      const task = await api.get_task("").ignore(501);
       expect(task).toBeNull();
     });
 
@@ -113,7 +113,7 @@ describe("ServiceClient", () => {
           return { ok: false, status: 500, body: JSON.stringify({ code: 500.4, message: "uh oh" }) };
         }
       });
-      const task = await ServiceError.ignore([500.4], api.get_task(""));
+      const task = await api.get_task("").ignore(500.4);
       expect(task).toBeNull();
     });
 
@@ -131,5 +131,27 @@ describe("ServiceClient", () => {
         expect(ServiceError.code(err)).toBe(500.4);
       }
     });
+
+    test("either should be true with 200 response", async () => {
+      const api = new ServiceClient({
+        intercept: async (req) => {
+          return { ok: true, status: 200, body: "{}" };
+        }
+      });
+      const res = await api.get_task("{}").combine();
+      expect(res.ok).toBe(true);
+      expect(res.body).toBeTruthy();
+    });
+
+    test("either should be false with non-200 response", async () => {
+      const api = new ServiceClient({
+        intercept: async (req) => {
+          return { ok: false, status: 400, body: "{}" };
+        }
+      });
+      const res = await api.get_task("{}").combine();
+      expect(res.ok).toBe(false);
+      expect(res.err).toBeInstanceOf(ServiceError);
+    });
   });
 });

package/test/gen.test.ts

@@ -0,0 +1,22 @@
+
+import { OperationObject, OperationParams, Schema } from "@icholy/openapi-ts";
+import { CodeGenerator } from "../gen";
+
+describe("CodeGenerator", () => {
+    describe("inferName", () => {
+        const gen = new CodeGenerator();
+        test("/order/location/brand/{id}", () => {
+            const op: OperationObject = {
+                operationId: "get_brand_orders",
+            }
+            const name = gen.inferName({
+                method: "get",
+                params: new OperationParams(op),
+                path: "/order/location/brand/{id}",
+                obj: op,
+            }, { name: "order", swagger: "" });
+            expect(name.pascal).toBe("GetOrderLocationBrand");
+            expect(name.snake).toBe("get_order_location_brand");
+        });
+    });
+});