@secondcloset/types 2.7.25 → 2.7.28-beta.mini-732.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@secondcloset/types",
-  "version": "2.7.25",
+  "version": "2.7.28-beta.mini-732.1",
   "description": "secondcloset type declaration and definitions",
   "main": "src/index.ts",
   "scripts": {
@@ -19,6 +19,6 @@
   },
   "homepage": "https://github.com/SecondCloset/types#readme",
   "devDependencies": {
-    "typescript": "^3.9.5"
+    "typescript": "^4.6.3"
   }
 }

package/src/_common/facility.ts

@@ -1,3 +1,5 @@
+import { Version } from ".";
+import { Common } from "..";
 import { ServiceArea } from "./serviceArea";
 
 export type FacilityCode =
@@ -32,19 +34,35 @@ export type FacilityCity =
   | "Medley"
   | "Houston";
 
-export interface Facility {
-  id: number;
-  name: FacilityCode;
-  phone: string;
-  email: string;
-  address: {
-    table: {
-      street: string;
-      city: FacilityCity;
-      province: string;
-      country: string;
-      postal_code: string;
+export type Facility<V = Version> = V extends "V1"
+  ? {
+      id: number;
+      name: FacilityCode;
+      phone: string;
+      email: string;
+      address: {
+        table: {
+          street: string;
+          city: FacilityCity;
+          province: string;
+          country: string;
+          postal_code: string;
+        };
+      };
+      service_area: ServiceArea;
+    }
+  : {
+      id: string;
+      name: FacilityCode;
+      enabled: boolean;
+      service_area: ServiceArea;
+      address: {
+        street: string;
+        city: string;
+        province: string;
+        country: string;
+        postal_code: string;
+      };
+      created_at: string;
+      updated_at: string;
     };
-  };
-  service_area: ServiceArea;
-}

package/src/_common/index.ts

@@ -1,3 +1,4 @@
+export type Version = "V1" | "V2";
 export * from "./facility";
 export * from "./serviceArea";
 export * from "./user";
@@ -7,4 +8,4 @@ export * from "./organization";
 export * from "./credential";
 export * from "./file";
 export * from "./note";
-export * from "./activityHistory";
+export * from "./activityHistory";

package/src/_common/organization.ts

@@ -2,8 +2,7 @@ import { BaseImage } from "./image";
 import { BaseAddress } from "./address";
 import { BaseUser } from "./user";
 import { Carrier } from "../fulfillment";
-import { ServiceArea } from "./serviceArea";
-import { FacilityCode } from "./facility";
+import { Facility } from "./facility";
 
 export type OrganizationConfigKey =
   | "default_fulfilled_from"
@@ -74,21 +73,6 @@ export interface Organization extends BaseOrganization {
   facility_service_areas?: FacilityServiceArea[];
 }
 
-interface Facility {
-  id: string;
-  name: FacilityCode | string;
-  enabled: boolean;
-  service_area: ServiceArea;
-  address: {
-    street: string;
-    city: string;
-    province: string;
-    country: string;
-    postal_code: string;
-  };
-  created_at: string;
-  updated_at: string;
-}
 export interface Region {
   id?: string;
   region_code: string;
@@ -97,7 +81,7 @@ export interface Region {
   country_name: string;
 }
 export interface FacilityServiceArea {
-  facility: Facility;
+  facility: Facility<"V2">;
   default_regions: Region[];
   organization_regions: Region[];
 }

package/src/fulfillment/order/order.ts

@@ -30,7 +30,7 @@ export type OrderPlatform =
   | "shipstaion"
   | "external_api";
 
-interface Address extends BaseAddress {
+export interface FulfillmentOrderAddress extends BaseAddress {
   customer_id: string;
   contact_name: string;
   customer_phone_number: string | null;
@@ -57,7 +57,7 @@ export interface Order {
   shipping_service: string | null;
   signature_required?: boolean;
   customer: Customer;
-  address: Address;
+  address: FulfillmentOrderAddress;
   created_at: string;
   updated_at: string;
   organization: Organization;

package/src/fulfillment/shipment/package.ts

@@ -13,6 +13,7 @@ export interface Package {
   id: string;
   package_id: null | string;
   logistics_shipment_id: string;
+  shipment_ids: string[];
   weight_value: string;
   weight_unit: string;
   length_value: string;

package/src/logistics/index.ts

@@ -1,2 +1,3 @@
 export * from "./shippingRate";
-export * from "./availability"
+export * from "./availability";
+export * from "./serviceArea";

package/src/logistics/serviceArea.ts

@@ -0,0 +1,14 @@
+import { FacilityCode, ServiceArea as ServiceAreaCode } from "../_common";
+
+export interface ServiceArea {
+  id: number;
+  facilities: FacilityCode[];
+  name: ServiceAreaCode;
+  humanized_name: string;
+  timezone: string;
+  address: { country: string; province: string };
+  standard_boundary: { latitude: number; longitude: number }[];
+  extended_boundary: { latitude: number; longitude: number }[];
+  created_at: string;
+  updated_at: string;
+}