@odynn/awayz-flights 0.2.5 → 0.2.7

package/dist/components/FlightResult/FlightResult.js

@@ -13,7 +13,7 @@ import '../../assets/FlightResult.css';function H(i) {
 }
 const Q = ({ details: i, onClick: a }) => {
   var d;
-  const [g, C] = N(!1), c = i.origin, l = i.destination, p = i.flightDetails, D = !i.paymentOptions || i.paymentOptions.length === 1, [S, P] = N($), A = async () => {
+  const [g, C] = N(!1), c = i.origin, l = i.destination, p = i.flightDetails, S = !i.paymentOptions || i.paymentOptions.length === 1, [D, P] = N($), A = async () => {
     const n = await b(i.airlineProgram);
     P(n);
   }, { flightNumbers: h, airlines: O } = R(() => {
@@ -105,7 +105,7 @@ const Q = ({ details: i, onClick: a }) => {
         ] }),
         /* @__PURE__ */ e("div", { className: "flight-detail", children: [
           /* @__PURE__ */ r("p", { children: "Marketing Carrier" }),
-          /* @__PURE__ */ r("p", { children: i.flightDetails.slices[0].segments[0].marketingCarrier.name })
+          /* @__PURE__ */ r("p", { children: i.airline })
         ] })
       ] }),
       /* @__PURE__ */ e("div", { className: "booking-options", children: [
@@ -118,7 +118,7 @@ const Q = ({ details: i, onClick: a }) => {
               n.stopPropagation(), a(i, o.CASH);
             },
             children: [
-              /* @__PURE__ */ r("p", { children: D ? "Book For" : "From" }),
+              /* @__PURE__ */ r("p", { children: S ? "Book For" : "From" }),
               /* @__PURE__ */ r("p", { children: /* @__PURE__ */ r(
                 y,
                 {
@@ -137,7 +137,7 @@ const Q = ({ details: i, onClick: a }) => {
               n.stopPropagation(), a(i, o.POINTS);
             },
             children: [
-              /* @__PURE__ */ r("img", { src: S.programLogo }),
+              /* @__PURE__ */ r("img", { src: D.programLogo }),
               /* @__PURE__ */ e("p", { children: [
                 `${H(i.points)} miles`,
                 ((d = i.cashFee) == null ? void 0 : d.amount) > 0 && /* @__PURE__ */ e(I, { children: [

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

@@ -86,10 +86,7 @@ export interface IFlightPaymentOption {
         type: EBaggage | null;
         quantity: number;
     }[];
-    conditions: {
-        refundBeforeDeparture?: boolean;
-        changeBeforeDeparture?: boolean;
-    };
+    conditions: IOfferConditions;
     carrier: {
         iataCode: string;
         name: string;

package/dist/utils/flightUtils.js

@@ -4,28 +4,28 @@ import "react";
 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 G = (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, f, z, v, _, $, Z, B, E;
+const S = (s) => s == null ? void 0 : s.map((e) => {
+  var n, t, r, a, i, o, l, h, g, M, P, N, A, L, w, d, p, c, y, C, b, m, u, D, O, T, z, f, v, E, _, $, Z, 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: ((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),
+      city: ((n = e.slices[0].segments[0].origin) == null ? void 0 : n.cityName) || ((r = (t = e.slices[0].segments[0].origin) == null ? void 0 : t.city) == null ? void 0 : r.name),
+      country: ((a = e.slices[0].segments[0].origin) == null ? void 0 : a.iataCountryCode) || ((o = (i = e.slices[0].segments[0].origin) == null ? void 0 : i.city) == null ? void 0 : o.iataCountryCode),
+      airportCode: ((l = e.slices[0].segments[0].origin) == null ? void 0 : l.iataCityCode) || ((g = (h = e.slices[0].segments[0].origin) == null ? void 0 : h.city) == null ? void 0 : g.iataCode),
       coordinates: {
         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: ((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) || ((z = (f = (O = e.slices[0].segments.getLast()) == null ? void 0 : O.destination) == null ? void 0 : f.city) == null ? void 0 : z.iataCode),
+      city: ((w = (L = e.slices[0].segments.getLast()) == null ? void 0 : L.destination) == null ? void 0 : w.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 = (m = (b = e.slices[0].segments.getLast()) == null ? void 0 : b.destination) == null ? void 0 : m.city) == null ? void 0 : u.iataCountryCode),
+      airportCode: ((O = (D = e.slices[0].segments.getLast()) == null ? void 0 : D.destination) == null ? void 0 : O.iataCityCode) || ((f = (z = (T = e.slices[0].segments.getLast()) == null ? void 0 : T.destination) == null ? void 0 : z.city) == null ? void 0 : f.iataCode),
       coordinates: {
-        latitude: ($ = (_ = (v = e.slices[0].segments.getLast()) == null ? void 0 : v.destination) == null ? void 0 : _.city) == null ? void 0 : $.latitude,
-        longitude: (E = (B = (Z = e.slices[0].segments.getLast()) == null ? void 0 : Z.destination) == null ? void 0 : B.city) == null ? void 0 : E.longitude
+        latitude: (_ = (E = (v = e.slices[0].segments.getLast()) == null ? void 0 : v.destination) == null ? void 0 : E.city) == null ? void 0 : _.latitude,
+        longitude: (G = (Z = ($ = e.slices[0].segments.getLast()) == null ? void 0 : $.destination) == null ? void 0 : Z.city) == null ? void 0 : G.longitude
       }
     },
     airline: e.owner.name,
@@ -53,39 +53,39 @@ const G = (s) => s == null ? void 0 : s.map((e) => {
   };
 }), ee = (s, e) => {
   if (!(e != null && e.length))
-    return G(s);
-  const r = [...e], t = [], a = {};
+    return S(s);
+  const n = [...e], t = [], r = {};
   for (const i of s) {
-    const o = i.slices[0].segments, m = o[0], w = {
-      iataCode: m.operatingCarrier.iataCode,
-      flightNumber: T(
-        m.operatingCarrierFlightNumber
+    const o = i.slices[0].segments, l = o[0], h = {
+      iataCode: l.operatingCarrier.iataCode,
+      flightNumber: k(
+        l.operatingCarrierFlightNumber
       )
     }, g = {
-      iataCode: m.marketingCarrier.iataCode,
-      flightNumber: T(
-        m.marketingCarrierFlightNumber
+      iataCode: l.marketingCarrier.iataCode,
+      flightNumber: k(
+        l.marketingCarrierFlightNumber
       )
-    }, 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) => {
+    }, M = i.awayzMatchId, P = `${h.iataCode}_${g.iataCode}-${g.flightNumber}`, N = i.awayzMarketerMatchId, A = !!h.flightNumber && h.flightNumber != "", L = !!g.flightNumber && g.flightNumber != "", w = n.filter((d, p) => {
       const c = d.flightDetails, y = d.flightDetails.slices[0].segments[0].operatingCarrierFlightNumber, C = c.id && !!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 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;
+      let m = !1;
+      return (L && A && c.awayzMatchId === M || !C && c.awayzMatchId === P || A && !L && c.awayzMarketerMatchId === N) && (m = !0), m && (r[c.id] = p), m;
     });
-    if (h.length) {
-      i.slices[0].comparisonKey = h[0].awayzGroupId;
-      const d = h.find((p) => {
-        var C, b, l, u;
+    if (w.length) {
+      i.slices[0].comparisonKey = w[0].awayzGroupId;
+      const d = w.find((p) => {
+        var C, b, m, 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
-        g.iataCode === "AC" && ((l = y.split(" ")) == null ? void 0 : l[0]) === ((u = c.split(" ")) == null ? void 0 : u[0]);
+        g.iataCode === "AC" && ((m = y.split(" ")) == null ? void 0 : m[0]) === ((u = c.split(" ")) == null ? void 0 : u[0]);
       });
       if (d) {
-        const p = a[d.id], c = {
+        const p = r[d.id], c = {
           ...i,
           ...d,
           points: i.points,
@@ -97,52 +97,52 @@ const G = (s) => s == null ? void 0 : s.map((e) => {
             airlineProgram: i.airlineProgram
           }
         };
-        r[p] = c;
+        n[p] = c;
       } else
         t.push(i);
     } else
       t.push(i);
   }
   return [
-    ...r,
-    ...G(t) ?? []
+    ...n,
+    ...S(t) ?? []
   ];
 }, j = (s) => {
-  const e = s.operatingCarrierFlightNumber ? s.operatingCarrier : s.marketingCarrier, r = s.operatingCarrierFlightNumber ?? s.marketingCarrierFlightNumber;
-  return e.iataCode + " " + T(r);
+  const e = s.operatingCarrierFlightNumber ? s.operatingCarrier : s.marketingCarrier, n = s.operatingCarrierFlightNumber ?? s.marketingCarrierFlightNumber;
+  return e.iataCode + " " + k(n);
 }, te = ({
   originCode: s,
   destinationCode: e,
-  departureDate: r,
+  departureDate: n,
   cabinClass: t,
-  passengerCount: a,
-  paymentType: n
+  passengerCount: r,
+  paymentType: a
 }) => {
   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;
+  return i += `origin=${s}`, i += `&destination=${e}`, i += `&departure_date=${n}`, i += `&cabin_class=${t}`, i += `&adults=${r}`, i += `&cash_or_points=[${a}]`, 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 r = t.flightDetails.slices[0].segments.map((a) => j(a)).join("_");
+    if (e[r]) {
+      const a = U(t);
+      e[r].flight.paymentOptions.push(a);
       const i = I(
-        e[a].flight.paymentOptions
+        e[r].flight.paymentOptions
       );
-      e[a].flight.cash = i.lowestCash, e[a].flight.points = i.lowestPoints;
+      e[r].flight.cash = i.lowestCash, e[r].flight.points = i.lowestPoints;
     } else {
-      const { origin: n, destination: i } = t, o = [U(t)], m = I(o);
-      e[a] = {
+      const { origin: a, destination: i } = t, o = [U(t)], l = I(o);
+      e[r] = {
         programs: [],
         flight: {
           id: t.awayzGroupId,
           partial: t.partial,
           origin: {
-            city: n.city,
-            country: n.country,
-            airportCode: n.airportCode,
-            coordinates: n.coordinates
+            city: a.city,
+            country: a.country,
+            airportCode: a.airportCode,
+            coordinates: a.coordinates
           },
           destination: {
             city: i.city,
@@ -170,33 +170,52 @@ const G = (s) => s == null ? void 0 : s.map((e) => {
             destinationTimeZone: t.flightDetails.slices[0].segments.getLast().destination.timeZone,
             duration: t.flightDetails.slices[0].duration
           }),
-          cash: m.lowestCash,
-          points: m.lowestPoints,
+          cash: l.lowestCash,
+          points: l.lowestPoints,
           flightDetails: t.flightDetails,
           currency: t.flightDetails.baseCurrency,
           cashFee: t.cashFee
         }
       };
     }
-    t.airlineProgram && !e[a].programs.includes(t.airlineProgram) && e[a].programs.push(t.airlineProgram);
+    t.airlineProgram && !e[r].programs.includes(t.airlineProgram) && e[r].programs.push(t.airlineProgram);
   });
-  const r = [];
+  const n = [];
   return Object.values(e).forEach((t) => {
+    const r = [
+      ...new Set(
+        t.flight.paymentOptions.map((a) => a.carrier.name)
+      )
+    ];
     t.programs.length > 0 ? t.programs.forEach((a) => {
-      const n = I(
+      r.forEach((i) => {
+        const o = I(
+          t.flight.paymentOptions.filter(
+            (l) => l.program === a || l.cash > 0 && l.carrier.name === i
+          )
+        );
+        n.push({
+          ...t.flight,
+          airline: i,
+          airlineProgram: a,
+          cash: o.lowestCash,
+          points: o.lowestPoints
+        });
+      });
+    }) : r.forEach((a) => {
+      const { lowestCash: i } = I(
         t.flight.paymentOptions.filter(
-          (i) => i.program === a || i.cash > 0
+          (o) => o.carrier.name === a
         )
       );
-      r.push({
+      n.push({
         ...t.flight,
-        airlineProgram: a,
-        cash: n.lowestCash,
-        points: n.lowestPoints
+        airline: a,
+        cash: i
       });
-    }) : 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 = {
+    });
+  }), n;
+}, k = (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", B = {
   categoryLogo: R,
   programLogo: R,
   awayzActive: [],
@@ -215,56 +234,50 @@ const G = (s) => s == null ? void 0 : s.map((e) => {
     staleTime: 864e5
     // 24 hours
   });
-  let r = e.find(
+  let n = 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()));
+      var r, a, i, o;
+      return ((a = (r = t.mainProgram) == null ? void 0 : r.toLowerCase()) == null ? void 0 : a.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()));
     }
-  ) ?? S;
-  return r || (r = {
-    ...S,
+  ) ?? B;
+  return n || (n = {
+    ...B,
     mainProgram: s,
     displayProgram: s,
     id: s
-  }), r;
-}, U = (s) => {
-  var e, r, t, a;
-  return {
-    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: {
-      refundBeforeDeparture: (r = (e = s.flightDetails.conditions) == null ? void 0 : e.refundBeforeDeparture) == null ? void 0 : r.allowed,
-      changeBeforeDeparture: (a = (t = s.flightDetails.conditions) == null ? void 0 : t.changeBeforeDeparture) == null ? void 0 : a.allowed
-    },
-    carrier: {
-      iataCode: s.flightDetails.slices[0].segments[0].marketingCarrier.iataCode,
-      name: s.flightDetails.slices[0].segments[0].marketingCarrier.name
-    }
-  };
-}, I = (s) => {
+  }), n;
+}, U = (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: s.flightDetails.conditions,
+  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(
+  ), n = 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
+    lowestPoints: n === 1 / 0 ? -1 : n
   };
 };
 export {
-  S as DEFAULT_AIRLINE_PROGRAM,
+  B as DEFAULT_AIRLINE_PROGRAM,
   te as buildFlightSearchQuery,
   ae as getAirlineProgram,
   j as getFlightNumber,
   ie as getLogoPath,
   se as groupFlightResults,
-  G as mapFlightDetailsToResults,
+  S as mapFlightDetailsToResults,
   ee as parseFlightDetails,
-  T as removeLeadingZeros
+  k as removeLeadingZeros
 };

package/package.json

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