npm - @odynn/awayz-flights - Versions diffs - 0.2.1 → 0.2.3 - Mend

@odynn/awayz-flights 0.2.1 → 0.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/components/FlightResult/FlightResult.js +73 -59
package/dist/hooks/useFlightSearch/useFlightSearch.js +23 -24
package/dist/lib/hooks/useFlightSearch/useFlightSearch.types.d.ts +14 -2
package/dist/utils/flightUtils.js +204 -166
package/package.json +1 -1

package/dist/components/FlightResult/FlightResult.js CHANGED Viewed

@@ -1,60 +1,56 @@
-import { jsx as r, jsxs as e } from "react/jsx-runtime";
-import k, { useState as d, useMemo as E } from "react";
-import { g as f, E as N, F as I, a as M } from "../../FlightItinerary-DgpK1LYF.js";
-import { DEFAULT_AIRLINE_PROGRAM as R, getFlightNumber as T, getLogoPath as B, getAirlineProgram as L } from "../../utils/flightUtils.js";
-import { h as u } from "../../arrayExtensions-DWKenJCh.js";
-import { g as $ } from "../../dateUtils-DeNLG5hw.js";
-import { EPaymentType as v } from "../../enums/EPaymentType.js";
-import '../../assets/FlightResult.css';function b(i) {
+import { jsx as r, jsxs as e, Fragment as E } from "react/jsx-runtime";
+import I, { useState as f, useMemo as T } from "react";
+import { g as N, E as u, F as R, a as B } from "../../FlightItinerary-DgpK1LYF.js";
+import { DEFAULT_AIRLINE_PROGRAM as L, getFlightNumber as $, getLogoPath as x, getAirlineProgram as M } from "../../utils/flightUtils.js";
+import { h as v } from "../../arrayExtensions-DWKenJCh.js";
+import { g as b } from "../../dateUtils-DeNLG5hw.js";
+import { EPaymentType as o } from "../../enums/EPaymentType.js";
+import { CashValue as F } from "@odynn/awayz-core";
+import '../../assets/FlightResult.css';function j(i) {
   if (!i || isNaN(i) || i < 0) return "N/A";
-  let n = i == null ? void 0 : i.toString().split(".")[0];
-  return n == null ? void 0 : n.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+  let a = i == null ? void 0 : i.toString().split(".")[0];
+  return a == null ? void 0 : a.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
 }
-const x = (i, n) => {
-  if (i <= 0) return "N/A";
-  var s = new Intl.NumberFormat("en-US", {
-    style: "currency",
-    currency: n
-  });
-  return i ? s.format(Math.round(i)).toString().split(".")[0] : s.format(0);
-}, z = ({ details: i, onClick: n }) => {
-  const [s, y] = d(!1), o = i.origin, c = i.destination, g = i.flightDetails, D = !i.paymentOptions || i.paymentOptions.length === 1, [S, F] = d(R), C = async () => {
-    const t = await L(i.airlineProgram);
-    F(t);
-  }, { flightNumbers: h, airlines: P } = E(() => {
-    const t = [], a = [];
-    return i.flightDetails.slices.forEach((A) => {
-      A.segments.forEach((l) => {
-        const p = T(l);
-        t.includes(p) || t.push(p);
-        const m = l.operatingCarrierFlightNumber ? l.operatingCarrier : l.marketingCarrier;
-        a.some((O) => O.airline === m.name) || a.push({
-          logo: B(m.iataCode),
+const K = ({ details: i, onClick: a }) => {
+  const [g, y] = f(!1), c = i.origin, l = i.destination, p = i.flightDetails, C = !i.paymentOptions || i.paymentOptions.length === 1, [D, S] = f(L), P = async () => {
+    const n = await M(i.airlineProgram);
+    S(n);
+  }, { flightNumbers: h, airlines: A } = T(() => {
+    const n = [], t = [];
+    return i.flightDetails.slices.forEach((O) => {
+      O.segments.forEach((s) => {
+        const d = $(s);
+        n.includes(d) || n.push(d);
+        const m = s.operatingCarrierFlightNumber ? s.operatingCarrier : s.marketingCarrier;
+        t.some((k) => k.airline === m.name) || t.push({
+          logo: x(m.iataCode),
           airline: m.name
         });
       });
-    }), C(), { flightNumbers: t, airlines: a };
+    }), P(), { flightNumbers: n, airlines: t };
   }, [i.flightDetails.slices]);
-  return /* @__PURE__ */ r("div", { className: "flight-result", onClick: () => n(i), children: /* @__PURE__ */ e("div", { className: "content", children: [
+  return /* @__PURE__ */ r("div", { className: "flight-result", onClick: () => {
+    i.cash > 0 ? a(i, o.CASH) : a(i, o.POINTS);
+  }, children: /* @__PURE__ */ e("div", { className: "content", children: [
     /* @__PURE__ */ r("div", { className: "flight-info", children: /* @__PURE__ */ e("div", { className: "flight-locations", children: [
-      /* @__PURE__ */ r("div", { className: "airlines", children: P.map((t, a) => /* @__PURE__ */ r(k.Fragment, { children: /* @__PURE__ */ r("div", { className: "tip", children: /* @__PURE__ */ r("img", { src: t.logo, alt: t.airline }) }, a) }, a)) }),
+      /* @__PURE__ */ r("div", { className: "airlines", children: A.map((n, t) => /* @__PURE__ */ r(I.Fragment, { children: /* @__PURE__ */ r("div", { className: "tip", children: /* @__PURE__ */ r("img", { src: n.logo, alt: n.airline }) }, t) }, t)) }),
       /* @__PURE__ */ e("div", { className: "flight-location", children: [
         /* @__PURE__ */ e("p", { children: [
-          o.city,
+          c.city,
           ",",
-          f(o.country)
+          N(c.country)
         ] }),
-        /* @__PURE__ */ r("p", { children: u(i.departureTime).format(
+        /* @__PURE__ */ r("p", { children: v(i.departureTime).format(
           // isMobile
           //   ? EDateFormats.FlightTime
           //   :
-          N.FlightShortDate
+          u.FlightShortDate
         ) })
       ] }),
       /* @__PURE__ */ e("div", { className: "flight-duration", children: [
         /* @__PURE__ */ r("span", { className: "line" }),
         /* @__PURE__ */ e("p", { children: [
-          $(g.slices[0].duration),
+          b(p.slices[0].duration),
           " ",
           " - ",
           i.numberOfStops > 0 ? `${i.numberOfStops} Stop${i.numberOfStops > 1 ? "s" : ""}` : "Direct"
@@ -63,16 +59,16 @@ const x = (i, n) => {
       ] }),
       /* @__PURE__ */ e("div", { children: [
         /* @__PURE__ */ e("p", { children: [
-          c.city,
+          l.city,
           ", ",
-          f(c.country)
+          N(l.country)
         ] }),
         /* @__PURE__ */ e("p", { children: [
-          u(i.arrivalTime).format(
+          v(i.arrivalTime).format(
             // isMobile
             //   ? EDateFormats.FlightTime
             //   :
-            N.FlightShortDate
+            u.FlightShortDate
           ),
           " "
         ] })
@@ -84,13 +80,13 @@ const x = (i, n) => {
           "div",
           {
             className: "flight-detail",
-            onClick: (t) => {
-              t.stopPropagation(), y(!s);
+            onClick: (n) => {
+              n.stopPropagation(), y(!g);
             },
             children: [
               /* @__PURE__ */ r("p", { children: "Aircraft" }),
               /* @__PURE__ */ e("p", { className: "chevron-text", children: [
-                /* @__PURE__ */ r(I, {}),
+                /* @__PURE__ */ r(R, {}),
                 /* @__PURE__ */ e("span", { children: [
                   h[0],
                   h.length > 1 && /* @__PURE__ */ e("sup", { children: [
@@ -117,12 +113,18 @@ const x = (i, n) => {
           "div",
           {
             className: "cash-value",
-            onClick: (t) => {
-              t.stopPropagation(), n(i, v.CASH);
+            onClick: (n) => {
+              n.stopPropagation(), a(i, o.CASH);
             },
             children: [
-              /* @__PURE__ */ r("p", { children: D ? "Book For" : "From" }),
-              /* @__PURE__ */ r("p", { children: x(i.cash, "USD") })
+              /* @__PURE__ */ r("p", { children: C ? "Book For" : "From" }),
+              /* @__PURE__ */ r("p", { children: /* @__PURE__ */ r(
+                F,
+                {
+                  amount: i.cash,
+                  currency: i.currency
+                }
+              ) })
             ]
           }
         ),
@@ -130,27 +132,39 @@ const x = (i, n) => {
           "div",
           {
             className: "points-value",
-            onClick: (t) => {
-              t.stopPropagation(), n(i, v.POINTS);
+            onClick: (n) => {
+              n.stopPropagation(), a(i, o.POINTS);
             },
             children: [
-              /* @__PURE__ */ r("img", { src: S.programLogo }),
-              /* @__PURE__ */ r("p", { children: `${b(i.points)} miles` })
+              /* @__PURE__ */ r("img", { src: D.programLogo }),
+              /* @__PURE__ */ e("p", { children: [
+                `${j(i.points)} miles`,
+                i.cashFee.amount > 0 && /* @__PURE__ */ e(E, { children: [
+                  " + ",
+                  /* @__PURE__ */ r(
+                    F,
+                    {
+                      amount: i.cashFee.amount,
+                      currency: i.cashFee.currency
+                    }
+                  )
+                ] })
+              ] })
             ]
           }
         )
       ] })
     ] }),
-    /* @__PURE__ */ r("div", { className: `flight-details ${s ? "is-open" : ""}`, children: /* @__PURE__ */ r("div", { className: "inner", children: /* @__PURE__ */ r(
-      M,
+    /* @__PURE__ */ r("div", { className: `flight-details ${g ? "is-open" : ""}`, children: /* @__PURE__ */ r("div", { className: "inner", children: /* @__PURE__ */ r(
+      B,
       {
-        itinerary: g.slices[0].segments,
-        origin: o,
-        destination: c
+        itinerary: p.slices[0].segments,
+        origin: c,
+        destination: l
       }
     ) }) })
   ] }) });
 };
 export {
-  z as FlightResult
+  K as FlightResult
 };

package/dist/hooks/useFlightSearch/useFlightSearch.js CHANGED Viewed

@@ -60,8 +60,8 @@ function oe(o, t, r) {
           o(n.id = g);
           break;
         case "retry":
-          const b = parseInt(g, 10);
-          isNaN(b) || t(n.retry = b);
+          const m = parseInt(g, 10);
+          isNaN(m) || t(n.retry = m);
           break;
       }
     }
@@ -90,34 +90,34 @@ var ae = function(o, t) {
 const x = "text/event-stream", ie = 1e3, z = "last-event-id";
 function ue(o, t) {
   var { signal: r, headers: n, onopen: s, onmessage: v, onclose: c, onerror: u, openWhenHidden: a, fetch: d } = t, g = ae(t, ["signal", "headers", "onopen", "onmessage", "onclose", "onerror", "openWhenHidden", "fetch"]);
-  return new Promise((b, _) => {
+  return new Promise((m, _) => {
     const p = Object.assign({}, n);
     p.accept || (p.accept = x);
-    let m;
+    let y;
     function w() {
-      m.abort(), document.hidden || T();
+      y.abort(), document.hidden || T();
     }
     a || document.addEventListener("visibilitychange", w);
     let F = ie, E = 0;
     function S() {
-      document.removeEventListener("visibilitychange", w), window.clearTimeout(E), m.abort();
+      document.removeEventListener("visibilitychange", w), window.clearTimeout(E), y.abort();
     }
     r == null || r.addEventListener("abort", () => {
-      S(), b();
+      S(), m();
     });
     const q = d ?? window.fetch, P = s ?? ce;
     async function T() {
       var C;
-      m = new AbortController();
+      y = new AbortController();
       try {
-        const O = await q(o, Object.assign(Object.assign({}, g), { headers: p, signal: m.signal }));
+        const O = await q(o, Object.assign(Object.assign({}, g), { headers: p, signal: y.signal }));
         await P(O), await ne(O.body, re(oe((h) => {
           h ? p[z] = h : delete p[z];
         }, (h) => {
           F = h;
-        }, v))), c == null || c(), S(), b();
+        }, v))), c == null || c(), S(), m();
       } catch (O) {
-        if (!m.signal.aborted)
+        if (!y.signal.aborted)
           try {
             const h = (C = u == null ? void 0 : u(O)) !== null && C !== void 0 ? C : F;
             window.clearTimeout(E), E = window.setTimeout(T, h);
@@ -147,17 +147,17 @@ const de = 3 * 60 * 1e3, $ = (o) => {
   const { token: o, config: t } = ee(), [r, n] = N(""), [s, v] = N([]), [c, u] = N(!1), a = K(null), {
     inboundResults: d,
     outboundResults: g,
-    setInboundResults: b,
+    setInboundResults: m,
     setOutboundResults: _,
     partialOfferRequestId: p,
-    setPartialOfferRequestId: m
+    setPartialOfferRequestId: y
   } = Z(), w = ({
     data: e,
     previousResults: l,
     inbound: f
   }) => {
     const i = V(e, l);
-    return (f ? b : _)(G(i)), i;
+    return (f ? m : _)(G(i)), i;
   }, {
     mutate: F,
     status: E,
@@ -197,13 +197,12 @@ const de = 3 * 60 * 1e3, $ = (o) => {
       }
     },
     onSuccess: (e) => {
-      console.log({ result: e });
       const { success: l, data: f, partialOfferRequestId: i } = e;
       if (!l) {
         console.log("oh lol, it didn't work");
         return;
       }
-      w({ data: f }), i && m(i);
+      w({ data: f }), i && y(i);
     },
     onError: (e) => {
       console.error("Error in outbound flight search:", e);
@@ -278,19 +277,19 @@ const de = 3 * 60 * 1e3, $ = (o) => {
       signal: j.signal,
       onmessage(A) {
         try {
-          const y = W(JSON.parse(A.data));
-          if (y.success === !1)
+          const b = W(JSON.parse(A.data));
+          if (b.success === !1)
             return;
-          if (y.close === !0) {
+          if (b.close === !0) {
             R();
             return;
           }
-          y.flights && (I = 0, i = w({
-            data: y.flights,
+          b.flights && (console.log({ parsed: b.flights }), I = 0, i = w({
+            data: b.flights,
             previousResults: i
-          })), y.ping && (I++, I >= t.flightsConfig.streamTimeoutPingCount && R());
-        } catch (y) {
-          console.error("Error parsing message:", y), R();
+          })), b.ping && (I++, I >= t.flightsConfig.streamTimeoutPingCount && R());
+        } catch (b) {
+          console.error("Error parsing message:", b), R();
         }
       },
       onerror(A) {

package/dist/lib/hooks/useFlightSearch/useFlightSearch.types.d.ts CHANGED Viewed

@@ -75,10 +75,13 @@ export interface IFlightPaymentOption {
     id: string;
     cash: number;
     points: number;
-    cashFeeCurrency: string;
-    cashFeeAmount: number;
+    cashFee: {
+        amount: number;
+        currency: string;
+    };
     baseCurrency: string;
     fareBrandName: string;
+    program: string;
     baggages?: {
         type: EBaggage | null;
         quantity: number;
@@ -101,6 +104,10 @@ export interface IFlightResult {
     destination: IAirportLocation;
     cash: number;
     points: number;
+    cashFee: {
+        amount: number;
+        currency: string;
+    };
     numberOfStops: number;
     departureTime: Date;
     arrivalTime: Date;
@@ -110,6 +117,7 @@ export interface IFlightResult {
     durationMinutes: number;
     flightDetails: IFlightOffer;
     paymentOptions: IFlightPaymentOption[];
+    currency: string;
 }
 export interface IAirportLocation {
     city: string;
@@ -149,6 +157,10 @@ export interface IFlightOffer {
     partial: boolean;
     owner: IOwner;
     id: string;
+    cashFee: {
+        amount: number;
+        currency: string;
+    };
 }
 export interface IPaymentRequirements {
     requiresInstantPayment: boolean;

package/dist/utils/flightUtils.js CHANGED Viewed

@@ -1,39 +1,40 @@
-import { h as f } from "../arrayExtensions-DWKenJCh.js";
-import { c as R } from "../dateUtils-DeNLG5hw.js";
+import { h as F } from "../arrayExtensions-DWKenJCh.js";
+import { c as K } from "../dateUtils-DeNLG5hw.js";
 import "react";
-import { awayzClient as K } from "@odynn/awayz-core";
-import { WalletService as j } from "../services/wallet/WalletService.js";
-import { ERewardProgramCategories as q } from "../services/wallet/WalletService.types.js";
-const B = (i) => i == null ? void 0 : i.map((e) => {
-  var c, a, s, n, t, o, g, r, d, A, M, I, F, L, w, u, y, l, C, h, b, m, p, D, T, k, z, v, O, G, _, $, Z, P;
+import { awayzClient as q } from "@odynn/awayz-core";
+import { WalletService as Q } from "../services/wallet/WalletService.js";
+import { ERewardProgramCategories as V } from "../services/wallet/WalletService.types.js";
+const B = (s) => s == null ? void 0 : s.map((e) => {
+  var r, t, a, n, i, o, m, w, g, M, P, N, A, L, h, d, p, c, y, C, b, l, u, D, k, O, z, v, f, _, $, Z, E, G;
   return {
     id: e.id,
     points: (e == null ? void 0 : e.points) >= 0 ? e.points : -1,
     partial: e == null ? void 0 : e.partial,
     origin: {
-      city: ((c = e.slices[0].segments[0].origin) == null ? void 0 : c.cityName) || ((s = (a = e.slices[0].segments[0].origin) == null ? void 0 : a.city) == null ? void 0 : s.name),
-      country: ((n = e.slices[0].segments[0].origin) == null ? void 0 : n.iataCountryCode) || ((o = (t = e.slices[0].segments[0].origin) == null ? void 0 : t.city) == null ? void 0 : o.iataCountryCode),
-      airportCode: ((g = e.slices[0].segments[0].origin) == null ? void 0 : g.iataCityCode) || ((d = (r = e.slices[0].segments[0].origin) == null ? void 0 : r.city) == null ? void 0 : d.iataCode),
+      city: ((r = e.slices[0].segments[0].origin) == null ? void 0 : r.cityName) || ((a = (t = e.slices[0].segments[0].origin) == null ? void 0 : t.city) == null ? void 0 : a.name),
+      country: ((n = e.slices[0].segments[0].origin) == null ? void 0 : n.iataCountryCode) || ((o = (i = e.slices[0].segments[0].origin) == null ? void 0 : i.city) == null ? void 0 : o.iataCountryCode),
+      airportCode: ((m = e.slices[0].segments[0].origin) == null ? void 0 : m.iataCityCode) || ((g = (w = e.slices[0].segments[0].origin) == null ? void 0 : w.city) == null ? void 0 : g.iataCode),
       coordinates: {
-        latitude: (M = (A = e.slices[0].segments[0].origin) == null ? void 0 : A.city) == null ? void 0 : M.latitude,
-        longitude: (F = (I = e.slices[0].segments[0].origin) == null ? void 0 : I.city) == null ? void 0 : F.longitude
+        latitude: (P = (M = e.slices[0].segments[0].origin) == null ? void 0 : M.city) == null ? void 0 : P.latitude,
+        longitude: (A = (N = e.slices[0].segments[0].origin) == null ? void 0 : N.city) == null ? void 0 : A.longitude
       }
     },
     destination: {
-      city: ((w = (L = e.slices[0].segments.getLast()) == null ? void 0 : L.destination) == null ? void 0 : w.cityName) || ((l = (y = (u = e.slices[0].segments.getLast()) == null ? void 0 : u.destination) == null ? void 0 : y.city) == null ? void 0 : l.name),
-      country: ((h = (C = e.slices[0].segments.getLast()) == null ? void 0 : C.destination) == null ? void 0 : h.iataCountryCode) || ((p = (m = (b = e.slices[0].segments.getLast()) == null ? void 0 : b.destination) == null ? void 0 : m.city) == null ? void 0 : p.iataCountryCode),
-      airportCode: ((T = (D = e.slices[0].segments.getLast()) == null ? void 0 : D.destination) == null ? void 0 : T.iataCityCode) || ((v = (z = (k = e.slices[0].segments.getLast()) == null ? void 0 : k.destination) == null ? void 0 : z.city) == null ? void 0 : v.iataCode),
+      city: ((h = (L = e.slices[0].segments.getLast()) == null ? void 0 : L.destination) == null ? void 0 : h.cityName) || ((c = (p = (d = e.slices[0].segments.getLast()) == null ? void 0 : d.destination) == null ? void 0 : p.city) == null ? void 0 : c.name),
+      country: ((C = (y = e.slices[0].segments.getLast()) == null ? void 0 : y.destination) == null ? void 0 : C.iataCountryCode) || ((u = (l = (b = e.slices[0].segments.getLast()) == null ? void 0 : b.destination) == null ? void 0 : l.city) == null ? void 0 : u.iataCountryCode),
+      airportCode: ((k = (D = e.slices[0].segments.getLast()) == null ? void 0 : D.destination) == null ? void 0 : k.iataCityCode) || ((v = (z = (O = e.slices[0].segments.getLast()) == null ? void 0 : O.destination) == null ? void 0 : z.city) == null ? void 0 : v.iataCode),
       coordinates: {
-        latitude: (_ = (G = (O = e.slices[0].segments.getLast()) == null ? void 0 : O.destination) == null ? void 0 : G.city) == null ? void 0 : _.latitude,
-        longitude: (P = (Z = ($ = e.slices[0].segments.getLast()) == null ? void 0 : $.destination) == null ? void 0 : Z.city) == null ? void 0 : P.longitude
+        latitude: ($ = (_ = (f = e.slices[0].segments.getLast()) == null ? void 0 : f.destination) == null ? void 0 : _.city) == null ? void 0 : $.latitude,
+        longitude: (G = (E = (Z = e.slices[0].segments.getLast()) == null ? void 0 : Z.destination) == null ? void 0 : E.city) == null ? void 0 : G.longitude
       }
     },
     airline: e.owner.name,
-    cash: parseFloat(e.totalAmount),
-    flightNumber: U(e.slices[0].segments[0]),
+    cash: e.totalAmount ? parseFloat(e.totalAmount) : 0,
+    currency: e.baseCurrency,
+    flightNumber: j(e.slices[0].segments[0]),
     awayzGroupId: e.slices[0].comparisonKey || e.awayzRouteId || e.awayzGroupId || e.id,
-    departureTime: f(e.slices[0].segments[0].departingAt).toDate(),
-    arrivalTime: f(
+    departureTime: F(e.slices[0].segments[0].departingAt).toDate(),
+    arrivalTime: F(
       e.slices[0].segments[e.slices[0].segments.length - 1].arrivingAt
     ).toDate(),
     numberOfStops: e.slices[0].segments.length - 1,
@@ -41,191 +42,228 @@ const B = (i) => i == null ? void 0 : i.map((e) => {
     duration: e.slices[0].duration,
     airlineProgram: e.airlineProgram,
     paymentOptions: [],
-    durationMinutes: R({
-      departureTime: f(e.slices[0].segments[0].departingAt),
-      arrivalTime: f(e.slices[0].segments.getLast().arrivingAt),
+    durationMinutes: K({
+      departureTime: F(e.slices[0].segments[0].departingAt),
+      arrivalTime: F(e.slices[0].segments.getLast().arrivingAt),
       originTimeZone: e.slices[0].segments[0].origin.timeZone,
       destinationTimeZone: e.slices[0].segments.getLast().destination.timeZone,
       duration: e.slices[0].duration
-    })
+    }),
+    cashFee: e.cashFee
   };
-}), J = (i, e) => {
+}), ee = (s, e) => {
   if (!(e != null && e.length))
-    return B(i);
-  const c = [...e], a = [], s = {};
-  for (const t of i) {
-    const o = t.slices[0].segments, g = o[0], r = {
-      iataCode: g.operatingCarrier.iataCode,
-      flightNumber: N(
-        g.operatingCarrierFlightNumber
+    return B(s);
+  const r = [...e], t = [], a = {};
+  for (const i of s) {
+    const o = i.slices[0].segments, m = o[0], w = {
+      iataCode: m.operatingCarrier.iataCode,
+      flightNumber: T(
+        m.operatingCarrierFlightNumber
       )
-    }, d = {
-      iataCode: g.marketingCarrier.iataCode,
-      flightNumber: N(
-        g.marketingCarrierFlightNumber
+    }, g = {
+      iataCode: m.marketingCarrier.iataCode,
+      flightNumber: T(
+        m.marketingCarrierFlightNumber
       )
-    }, A = t.awayzMatchId, M = `${r.iataCode}_${d.iataCode}-${d.flightNumber}`, I = t.awayzMarketerMatchId, F = !!r.flightNumber && r.flightNumber != "", L = !!d.flightNumber && d.flightNumber != "", w = c.filter((u, y) => {
-      const l = u.flightDetails, C = u.flightDetails.slices[0].segments[0].operatingCarrierFlightNumber, h = l.id && // TODO: Maybe expand on this - Id check ensures it is a duffel flight
-      !!C && C !== "";
-      if (!(l.slices[0].segments.length === (o == null ? void 0 : o.length) && !l.slices[0].segments.find(
-        (p, D) => p.departingAt !== o[D].departingAt || p.arrivingAt !== o[D].arrivingAt || p.duration !== o[D].duration
+    }, M = i.awayzMatchId, P = `${w.iataCode}_${g.iataCode}-${g.flightNumber}`, N = i.awayzMarketerMatchId, A = !!w.flightNumber && w.flightNumber != "", L = !!g.flightNumber && g.flightNumber != "", h = r.filter((d, p) => {
+      const c = d.flightDetails, y = d.flightDetails.slices[0].segments[0].operatingCarrierFlightNumber, C = c.id && // TODO: Maybe expand on this - Id check ensures it is a duffel flight
+      !!y && y !== "";
+      if (!(c.slices[0].segments.length === (o == null ? void 0 : o.length) && !c.slices[0].segments.find(
+        (u, D) => u.departingAt !== o[D].departingAt || u.arrivingAt !== o[D].arrivingAt || u.duration !== o[D].duration
       )))
         return !1;
-      let m = !1;
-      return (L && F && l.awayzMatchId === A || !h && l.awayzMatchId === M || F && !L && l.awayzMarketerMatchId === I) && (m = !0), m && (s[l.id] = y), m;
+      let l = !1;
+      return (L && A && c.awayzMatchId === M || !C && c.awayzMatchId === P || A && !L && c.awayzMarketerMatchId === N) && (l = !0), l && (a[c.id] = p), l;
     });
-    if (w.length) {
-      t.slices[0].comparisonKey = w[0].awayzGroupId;
-      const u = w.find((y) => {
-        var h, b, m, p;
-        const l = (h = y.flightDetails.slices[0].fareBrandName) == null ? void 0 : h.toLowerCase(), C = (b = t.slices[0].fareBrandName) == null ? void 0 : b.toLowerCase();
-        return C === l || // Special Case for AC Only match on first word
+    if (h.length) {
+      i.slices[0].comparisonKey = h[0].awayzGroupId;
+      const d = h.find((p) => {
+        var C, b, l, u;
+        const c = (C = p.flightDetails.slices[0].fareBrandName) == null ? void 0 : C.toLowerCase(), y = (b = i.slices[0].fareBrandName) == null ? void 0 : b.toLowerCase();
+        return y === c || // Special Case for AC Only match on first word
         // Due to differences in scraped points data and Duffel format
-        d.iataCode === "AC" && ((m = C.split(" ")) == null ? void 0 : m[0]) === ((p = l.split(" ")) == null ? void 0 : p[0]);
+        g.iataCode === "AC" && ((l = y.split(" ")) == null ? void 0 : l[0]) === ((u = c.split(" ")) == null ? void 0 : u[0]);
       });
-      if (u) {
-        const y = s[u.id], l = {
-          ...t,
-          ...u,
-          points: t.points,
-          airlineProgram: t.airlineProgram,
+      if (d) {
+        const p = a[d.id], c = {
+          ...i,
+          ...d,
+          points: i.points,
+          airlineProgram: i.airlineProgram,
           flightDetails: {
-            ...t,
-            ...u.flightDetails,
-            points: t.points,
-            airlineProgram: t.airlineProgram
+            ...i,
+            ...d.flightDetails,
+            points: i.points,
+            airlineProgram: i.airlineProgram
           }
         };
-        c[y] = l;
+        r[p] = c;
       } else
-        a.push(t);
+        t.push(i);
     } else
-      a.push(t);
+      t.push(i);
   }
   return [
-    ...c,
-    ...B(a) ?? []
+    ...r,
+    ...B(t) ?? []
   ];
-}, U = (i) => {
-  const e = i.operatingCarrierFlightNumber ? i.operatingCarrier : i.marketingCarrier, c = i.operatingCarrierFlightNumber ?? i.marketingCarrierFlightNumber;
-  return e.iataCode + " " + N(c);
-}, X = ({
-  originCode: i,
+}, j = (s) => {
+  const e = s.operatingCarrierFlightNumber ? s.operatingCarrier : s.marketingCarrier, r = s.operatingCarrierFlightNumber ?? s.marketingCarrierFlightNumber;
+  return e.iataCode + " " + T(r);
+}, te = ({
+  originCode: s,
   destinationCode: e,
-  departureDate: c,
-  cabinClass: a,
-  passengerCount: s,
+  departureDate: r,
+  cabinClass: t,
+  passengerCount: a,
   paymentType: n
 }) => {
-  let t = "/flights/search/one-way/points-cash?";
-  return t += `origin=${i}`, t += `&destination=${e}`, t += `&departure_date=${c}`, t += `&cabin_class=${a}`, t += `&adults=${s}`, t += `&cash_or_points=[${n}]`, t;
-}, ee = (i) => {
-  const e = i.reduce((a, s) => {
-    const n = s.flightDetails.slices[0].segments.map((t) => N(U(t))).join("_");
-    return a[n] || (a[n] = []), a[n].push(s), a;
-  }, {});
-  return Object.values(e).map(
-    (a) => {
-      const s = a[0], { origin: n, destination: t } = s, o = a.filter((r) => r.cash > 0).reduce((r, d) => Math.min(r, d.cash), 1 / 0), g = a.filter((r) => r.points > 0).reduce((r, d) => Math.min(r, d.points), 1 / 0);
-      return {
-        id: s.awayzGroupId,
-        partial: s.partial,
-        origin: {
-          city: n.city,
-          country: n.country,
-          airportCode: n.airportCode,
-          coordinates: n.coordinates
-        },
-        destination: {
-          city: t.city,
-          country: t.country,
-          airportCode: t.airportCode,
-          coordinates: t.coordinates
-        },
-        airline: s.airline,
-        flightNumber: s.flightNumber,
-        paymentOptions: a.map((r) => ({
-          id: r.id,
-          cash: r.cash,
-          points: r.points,
-          cashFeeCurrency: r.flightDetails.baseCurrency,
-          //TODO: Add Cash Fee Amount
-          cashFeeAmount: 0,
-          baseCurrency: r.flightDetails.baseCurrency,
-          fareBrandName: r.flightDetails.slices[0].fareBrandName,
-          conditions: {
-            //TODO: Add Refund and Change Conditions
-            refundBeforeDeparture: !0,
-            changeBeforeDeparture: !0
+  let i = "/flights/search/one-way/points-cash?";
+  return i += `origin=${s}`, i += `&destination=${e}`, i += `&departure_date=${r}`, i += `&cabin_class=${t}`, i += `&adults=${a}`, i += `&cash_or_points=[${n}]`, i;
+}, se = (s) => {
+  const e = {};
+  s.forEach((t) => {
+    const a = t.flightDetails.slices[0].segments.map((n) => j(n)).join("_");
+    if (e[a]) {
+      const n = U(t);
+      e[a].flight.paymentOptions.push(n);
+      const i = I(
+        e[a].flight.paymentOptions
+      );
+      e[a].flight.cash = i.lowestCash, e[a].flight.points = i.lowestPoints;
+    } else {
+      const { origin: n, destination: i } = t, o = [U(t)], m = I(o);
+      e[a] = {
+        programs: [],
+        flight: {
+          id: t.awayzGroupId,
+          partial: t.partial,
+          origin: {
+            city: n.city,
+            country: n.country,
+            airportCode: n.airportCode,
+            coordinates: n.coordinates
           },
-          carrier: {
-            iataCode: r.flightDetails.slices[0].segments[0].marketingCarrier.iataCode,
-            name: r.flightDetails.slices[0].segments[0].marketingCarrier.name
-          }
-        })),
-        numberOfStops: s.numberOfStops,
-        departureTime: s.departureTime,
-        arrivalTime: s.arrivalTime,
-        awayzGroupId: s.awayzGroupId,
-        duration: s.duration,
-        airlineProgram: s.airlineProgram,
-        durationMinutes: R({
-          departureTime: f(
-            s.flightDetails.slices[0].segments[0].departingAt
-          ),
-          arrivalTime: f(
-            s.flightDetails.slices[0].segments.getLast().arrivingAt
-          ),
-          originTimeZone: s.flightDetails.slices[0].segments[0].origin.timeZone,
-          destinationTimeZone: s.flightDetails.slices[0].segments.getLast().destination.timeZone,
-          duration: s.flightDetails.slices[0].duration
-        }),
-        cash: o === 1 / 0 ? -1 : o,
-        points: g === 1 / 0 ? -1 : g,
-        flightDetails: s.flightDetails
+          destination: {
+            city: i.city,
+            country: i.country,
+            airportCode: i.airportCode,
+            coordinates: i.coordinates
+          },
+          airline: t.airline,
+          flightNumber: t.flightNumber,
+          paymentOptions: o,
+          numberOfStops: t.numberOfStops,
+          departureTime: t.departureTime,
+          arrivalTime: t.arrivalTime,
+          awayzGroupId: t.awayzGroupId,
+          duration: t.duration,
+          airlineProgram: t.airlineProgram,
+          durationMinutes: K({
+            departureTime: F(
+              t.flightDetails.slices[0].segments[0].departingAt
+            ),
+            arrivalTime: F(
+              t.flightDetails.slices[0].segments.getLast().arrivingAt
+            ),
+            originTimeZone: t.flightDetails.slices[0].segments[0].origin.timeZone,
+            destinationTimeZone: t.flightDetails.slices[0].segments.getLast().destination.timeZone,
+            duration: t.flightDetails.slices[0].duration
+          }),
+          cash: m.lowestCash,
+          points: m.lowestPoints,
+          flightDetails: t.flightDetails,
+          currency: t.flightDetails.baseCurrency,
+          cashFee: t.cashFee
+        }
       };
     }
-  );
-}, N = (i) => i ? i.replace(/^0+/, "") : "", te = (i) => `https://assets.duffel.com/img/airlines/for-light-background/full-color-logo/${i}.svg`, S = "/img/logo/odynn-eye.svg", E = {
-  categoryLogo: S,
-  programLogo: S,
+    t.airlineProgram && !e[a].programs.includes(t.airlineProgram) && e[a].programs.push(t.airlineProgram);
+  });
+  const r = [];
+  return Object.values(e).forEach((t) => {
+    t.programs.length > 0 ? t.programs.forEach((a) => {
+      const n = I(
+        t.flight.paymentOptions.filter(
+          (i) => i.program === a || i.cash > 0
+        )
+      );
+      r.push({
+        ...t.flight,
+        airlineProgram: a,
+        cash: n.lowestCash,
+        points: n.lowestPoints
+      });
+    }) : r.push(t.flight);
+  }), r;
+}, T = (s) => s ? s.replace(/^0+/, "") : "", ie = (s) => `https://assets.duffel.com/img/airlines/for-light-background/full-color-logo/${s}.svg`, R = "/img/logo/odynn-eye.svg", S = {
+  categoryLogo: R,
+  programLogo: R,
   awayzActive: [],
   mainProgram: "Unknown",
   displayProgram: "Unknown",
   id: "Unknown",
   totalAccumulatedPoints: 0,
-  category: q.Airline,
+  category: V.Airline,
   colour: "#fff",
   // Using App Foreground Colour
   url: "https://www.odynn.com"
-}, ie = async (i) => {
-  const { airlines: e } = await K.ensureQueryData({
+}, ae = async (s) => {
+  const { airlines: e } = await q.ensureQueryData({
     queryKey: ["walletAwards"],
-    queryFn: j.getAwards,
+    queryFn: Q.getAwards,
     staleTime: 864e5
     // 24 hours
   });
-  let c = e.find(
-    (a) => {
-      var s, n, t, o;
-      return ((n = (s = a.mainProgram) == null ? void 0 : s.toLowerCase()) == null ? void 0 : n.includes(i == null ? void 0 : i.toLowerCase())) || ((o = (t = a.displayProgram) == null ? void 0 : t.toLowerCase()) == null ? void 0 : o.includes(i == null ? void 0 : i.toLowerCase()));
+  let r = e.find(
+    (t) => {
+      var a, n, i, o;
+      return ((n = (a = t.mainProgram) == null ? void 0 : a.toLowerCase()) == null ? void 0 : n.includes(s == null ? void 0 : s.toLowerCase())) || ((o = (i = t.displayProgram) == null ? void 0 : i.toLowerCase()) == null ? void 0 : o.includes(s == null ? void 0 : s.toLowerCase()));
     }
-  ) ?? E;
-  return c || (c = {
-    ...E,
-    mainProgram: i,
-    displayProgram: i,
-    id: i
-  }), c;
+  ) ?? S;
+  return r || (r = {
+    ...S,
+    mainProgram: s,
+    displayProgram: s,
+    id: s
+  }), r;
+}, U = (s) => (console.log({ flight: s }), {
+  id: s.id,
+  cash: s.cash,
+  points: s.points,
+  program: s.airlineProgram,
+  baseCurrency: s.flightDetails.baseCurrency,
+  fareBrandName: s.flightDetails.slices[0].fareBrandName,
+  cashFee: s.cashFee,
+  conditions: {
+    //TODO: Add Refund and Change Conditions
+    refundBeforeDeparture: !0,
+    changeBeforeDeparture: !0
+  },
+  carrier: {
+    iataCode: s.flightDetails.slices[0].segments[0].marketingCarrier.iataCode,
+    name: s.flightDetails.slices[0].segments[0].marketingCarrier.name
+  }
+}), I = (s) => {
+  const e = Math.min(
+    ...s.filter((t) => t.cash > 0).map((t) => t.cash)
+  ), r = Math.min(
+    ...s.filter((t) => t.points > 0).map((t) => t.points)
+  );
+  return {
+    lowestCash: e === 1 / 0 ? -1 : e,
+    lowestPoints: r === 1 / 0 ? -1 : r
+  };
 };
 export {
-  E as DEFAULT_AIRLINE_PROGRAM,
-  X as buildFlightSearchQuery,
-  ie as getAirlineProgram,
-  U as getFlightNumber,
-  te as getLogoPath,
-  ee as groupFlightResults,
+  S as DEFAULT_AIRLINE_PROGRAM,
+  te as buildFlightSearchQuery,
+  ae as getAirlineProgram,
+  j as getFlightNumber,
+  ie as getLogoPath,
+  se as groupFlightResults,
   B as mapFlightDetailsToResults,
-  J as parseFlightDetails,
-  N as removeLeadingZeros
+  ee as parseFlightDetails,
+  T as removeLeadingZeros
 };

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@odynn/awayz-flights",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "type": "module",
   "files": [
     "dist"