Merge pull request #15 from Print-one/main

Main -> Next

CHANGELOG.md

@@ -1,3 +1,12 @@
+## [1.2.1](https://github.com/Print-one/print-one-js/compare/v1.2.0...v1.2.1) (2024-04-15)
+
+
+### Bug Fixes
+
+* :bug: incorrect check in csv order test ([59a73ea](https://github.com/Print-one/print-one-js/commit/59a73ea4d118c20f3627e464dd90a395e30eaaef))
+* :bug: incorrect ts marking for undefined properties ([c09dd93](https://github.com/Print-one/print-one-js/commit/c09dd937e239d6efa9127def0852cdd7ab8d6e0c))
+* :bug: order creation not working with templateId ([8784076](https://github.com/Print-one/print-one-js/commit/878407679d44d4d21e57ac31087f4f00aa1772ad))
+
 # [1.2.0](https://github.com/Print-one/print-one-js/compare/v1.1.0...v1.2.0) (2024-04-04)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@print-one/print-one-js",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "The official javascript client for Print.one",
   "license": "MIT",
   "author": "Print.one",

src/PrintOne.ts

@@ -252,13 +252,8 @@ export class PrintOne {
    * @param data The order data
    */
   public async createOrder(data: CreateOrder): Promise<Order> {
-    let templateId: undefined | string;
-
-    if (data.template instanceof Template) {
-      templateId = data.template.id;
-    } else {
-      templateId = data.template;
-    }
+    const template = data.templateId ?? data.template;
+    const templateId = template instanceof Template ? template.id : template;
 
     const sendDateStr =
       data.sendDate instanceof Date
@@ -279,13 +274,8 @@ export class PrintOne {
   }
 
   public async createCsvOrder(data: CreateCsvOrder): Promise<CsvOrder> {
-    let templateId: undefined | string;
-
-    if (data.template instanceof Template) {
-      templateId = data.template.id;
-    } else {
-      templateId = data.template;
-    }
+    const template = data.templateId ?? data.template;
+    const templateId = template instanceof Template ? template.id : template;
 
     const formData = new FormData();
     formData.append(

src/models/CsvOrder.ts

@@ -14,11 +14,19 @@ export type CreateCsvOrder = {
     recipient: Address;
     mergeVariables?: Record<string, string>;
   };
-  template: Template | string;
   finish?: Finish;
   billingId?: string;
   sender?: Address;
-};
+} & (
+  | {
+      template: Template | string;
+      templateId?: undefined;
+    }
+  | {
+      template?: undefined;
+      templateId: string;
+    }
+);
 
 export type CreateBatchCsvOrder = Pick<CreateCsvOrder, "file" | "mapping">;
 

src/models/Order.ts

@@ -10,15 +10,23 @@ import { sleep } from "../utils";
 export type CreateOrder = {
   recipient: Address;
   sender?: Address;
-  template: Template | string;
   /**
    * @default GLOSSY
    */
   finish?: Finish;
   mergeVariables?: Record<string, unknown>;
   billingId?: string;
   sendDate?: Date | string;
-};
+} & (
+  | {
+      template: Template | string;
+      templateId?: undefined;
+    }
+  | {
+      template?: undefined;
+      templateId: string;
+    }
+);
 
 export class Order {
   private _data: IOrder;

test/CsvOrder.spec.ts

@@ -88,7 +88,7 @@ describe("getOrders", function () {
     // arrange
 
     // act
-    while (await order.getOrders({}).then((x) => x.data.length > 0)) {
+    while (await order.getOrders({}).then((x) => x.data.length < 1)) {
       await order.refresh();
       await sleep(1000);
     }