@deenruv/inpost 1.0.16 → 1.0.17-dev.5

package/dist/api/shipments/index.d.ts

@@ -7,7 +7,7 @@ export declare class Shipment {
     label(args?: {
         format?: 'Pdf' | 'Zpl' | 'Epl';
         type?: 'normal' | 'A6' | 'dpi300';
-    }): Promise<ReadableStream<Uint8Array>>;
+    }): Promise<ReadableStream<Uint8Array<ArrayBuffer>> | null>;
     buy(body: {
         offer_id: number;
     }): Promise<import("../../index.js").Shipment>;

package/dist/index.test.js

@@ -9,6 +9,15 @@ const promises_1 = require("fs/promises");
 const node_path_1 = require("node:path");
 const node_stream_1 = require("node:stream");
 const { INPOST_HOST: host = "sandbox-api-shipx-pl.easypack24.net", INPOST_API_KEY: apiKey, } = process.env;
+const shipmentId = (shipment) => {
+    (0, node_assert_1.ok)(typeof shipment.id === "number", "Expected shipment id to be present");
+    return shipment.id;
+};
+const firstOfferId = (shipment) => {
+    const offerId = shipment.offers?.[0]?.id;
+    (0, node_assert_1.ok)(typeof offerId === "number", "Expected shipment first offer id to be present");
+    return offerId;
+};
 (0, node_test_1.describe)("inpost client tests", { skip: !apiKey }, () => {
     const client = new index_js_1.Client({ host, apiKey });
     (0, node_test_1.it)("lists organizations", () => (0, node_assert_1.doesNotReject)(client.organizations().list()));
@@ -65,23 +74,25 @@ const { INPOST_HOST: host = "sandbox-api-shipx-pl.easypack24.net", INPOST_API_KE
         while (!shipment.status || shipment.status === "created") {
             console.log("Waiting for shipment to be created...");
             await new Promise((resolve) => setTimeout(resolve, 500));
-            shipment = await client.shipments().get(shipment.id).fetch();
+            shipment = await client.shipments().get(shipmentId(shipment)).fetch();
         }
+        const offerId = firstOfferId(shipment);
         shipment = await client
             .shipments()
-            .get(shipment.id)
-            .buy({ offer_id: shipment.offers[0].id });
-        let found = shipment.transactions?.find((t) => t.status === "success" && t.offer_id === shipment.offers?.[0].id);
+            .get(shipmentId(shipment))
+            .buy({ offer_id: offerId });
+        let found = shipment.transactions?.find((t) => t.status === "success" && t.offer_id === offerId);
         while (!found) {
             console.log("Waiting for transaction to succeed...");
             await new Promise((resolve) => setTimeout(resolve, 500));
-            shipment = await client.shipments().get(shipment.id).fetch();
+            shipment = await client.shipments().get(shipmentId(shipment)).fetch();
             found = shipment.transactions?.find((t) => t.status === "success");
             if (!found) {
+                const retryOfferId = firstOfferId(shipment);
                 await client
                     .shipments()
-                    .get(shipment.id)
-                    .buy({ offer_id: shipment.offers[0].id });
+                    .get(shipmentId(shipment))
+                    .buy({ offer_id: retryOfferId });
             }
         }
         while (!shipment.status ||
@@ -89,10 +100,11 @@ const { INPOST_HOST: host = "sandbox-api-shipx-pl.easypack24.net", INPOST_API_KE
             shipment.status === "offer_selected") {
             console.log("Waiting for shipment to be ready...");
             await new Promise((resolve) => setTimeout(resolve, 500));
-            shipment = await client.shipments().get(shipment.id).fetch();
+            shipment = await client.shipments().get(shipmentId(shipment)).fetch();
         }
         const tmp = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "test-inpost-label"));
-        const label = await client.shipments().get(shipment.id).label();
+        const label = await client.shipments().get(shipmentId(shipment)).label();
+        (0, node_assert_1.ok)(label, "Expected shipment label response body to be present");
         await label.pipeTo(node_stream_1.Writable.toWeb((0, fs_1.createWriteStream)((0, node_path_1.join)(tmp, "label.pdf"))));
         await (0, promises_1.rm)(tmp, { force: true, recursive: true });
     }));

package/dist/validators/optional.d.ts

@@ -1 +1 @@
-export declare const isOptional: <T>(fn: (v: unknown) => v is T) => (v: unknown) => v is T;
+export declare const isOptional: <T>(fn: (v: unknown) => v is T) => (v: unknown) => v is T | undefined | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deenruv/inpost",
-  "version": "1.0.16",
+  "version": "1.0.17-dev.5",
   "type": "commonjs",
   "main": "./dist/index.js",
   "module": "./dist/index.js",

package/src/index.test.ts

@@ -1,5 +1,5 @@
 import { describe, it } from "node:test";
-import { doesNotReject, notEqual } from "node:assert";
+import { doesNotReject, notEqual, ok } from "node:assert";
 import { Client, CountryCode } from "./index.js";
 import { createWriteStream } from "fs";
 import { tmpdir } from "node:os";
@@ -15,6 +15,22 @@ const {
   INPOST_API_KEY: string;
 };
 
+type ShipmentWithGeneratedFields = {
+  id?: number;
+  offers?: Array<{ id: number }>;
+};
+
+const shipmentId = (shipment: ShipmentWithGeneratedFields) => {
+  ok(typeof shipment.id === "number", "Expected shipment id to be present");
+  return shipment.id;
+};
+
+const firstOfferId = (shipment: ShipmentWithGeneratedFields) => {
+  const offerId = shipment.offers?.[0]?.id;
+  ok(typeof offerId === "number", "Expected shipment first offer id to be present");
+  return offerId;
+};
+
 describe("inpost client tests", { skip: !apiKey }, () => {
   const client = new Client({ host, apiKey });
   it("lists organizations", () => doesNotReject(client.organizations().list()));
@@ -81,28 +97,30 @@ describe("inpost client tests", { skip: !apiKey }, () => {
       while (!shipment.status || shipment.status === "created") {
         console.log("Waiting for shipment to be created...");
         await new Promise((resolve) => setTimeout(resolve, 500));
-        shipment = await client.shipments().get(shipment.id).fetch();
+        shipment = await client.shipments().get(shipmentId(shipment)).fetch();
       }
 
+      const offerId = firstOfferId(shipment);
       shipment = await client
         .shipments()
-        .get(shipment.id)
-        .buy({ offer_id: shipment.offers[0].id });
+        .get(shipmentId(shipment))
+        .buy({ offer_id: offerId });
 
       let found = shipment.transactions?.find(
-        (t) => t.status === "success" && t.offer_id === shipment.offers?.[0].id,
+        (t) => t.status === "success" && t.offer_id === offerId,
       );
 
       while (!found) {
         console.log("Waiting for transaction to succeed...");
         await new Promise((resolve) => setTimeout(resolve, 500));
-        shipment = await client.shipments().get(shipment.id).fetch();
+        shipment = await client.shipments().get(shipmentId(shipment)).fetch();
         found = shipment.transactions?.find((t) => t.status === "success");
         if (!found) {
+          const retryOfferId = firstOfferId(shipment);
           await client
             .shipments()
-            .get(shipment.id)
-            .buy({ offer_id: shipment.offers[0].id });
+            .get(shipmentId(shipment))
+            .buy({ offer_id: retryOfferId });
         }
       }
 
@@ -113,10 +131,11 @@ describe("inpost client tests", { skip: !apiKey }, () => {
       ) {
         console.log("Waiting for shipment to be ready...");
         await new Promise((resolve) => setTimeout(resolve, 500));
-        shipment = await client.shipments().get(shipment.id).fetch();
+        shipment = await client.shipments().get(shipmentId(shipment)).fetch();
       }
       const tmp = await mkdtemp(join(tmpdir(), "test-inpost-label"));
-      const label = await client.shipments().get(shipment.id).label();
+      const label = await client.shipments().get(shipmentId(shipment)).label();
+      ok(label, "Expected shipment label response body to be present");
       await label.pipeTo(
         Writable.toWeb(
           createWriteStream(join(tmp, "label.pdf")),

package/tsconfig.tsbuildinfo

@@ -0,0 +1 @@
+{"root":["./src/error.ts","./src/index.test.ts","./src/index.ts","./src/api/organizations.ts","./src/api/shipments.ts","./src/api/organizations/index.ts","./src/api/organizations/shipments.ts","./src/api/shipments/index.ts","./src/middleware/auth.ts","./src/middleware/endpoint.ts","./src/middleware/expect_200.ts","./src/middleware/get.ts","./src/middleware/index.ts","./src/middleware/json_request.ts","./src/middleware/json_response.ts","./src/middleware/middleware.ts","./src/middleware/post.ts","./src/middleware/values.ts","./src/models/address.ts","./src/models/carrier.ts","./src/models/country_code.ts","./src/models/currency_code.ts","./src/models/index.ts","./src/models/money.ts","./src/models/offer.ts","./src/models/organization.ts","./src/models/parcel.ts","./src/models/person.ts","./src/models/service.ts","./src/models/shipment.ts","./src/models/transaction.ts","./src/validators/address.ts","./src/validators/array.ts","./src/validators/carrier.ts","./src/validators/is_country_code.ts","./src/validators/is_currency_code.ts","./src/validators/is_money.ts","./src/validators/is_parcel.ts","./src/validators/is_shipment.ts","./src/validators/number.ts","./src/validators/object.ts","./src/validators/optional.ts","./src/validators/organization.ts","./src/validators/person.ts","./src/validators/services.ts","./src/validators/string.ts"],"version":"6.0.3"}