npm - @odynn/awayz-flights - Versions diffs - 0.5.7 → 0.5.9 - Mend

@odynn/awayz-flights 0.5.7 → 0.5.9

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 (8) hide show

package/dist/{FlightResult-7HBkr7Al.js → FlightResult-CXQqIDcc.js} +101 -95
package/dist/components/FlightResult/FlightResult.js +1 -1
package/dist/components/index.js +1 -1
package/dist/lib/hooks/useFlightSearch/useFlightSearch.types.d.ts +2 -0
package/dist/lib/utils/flightUtils.d.ts +1 -1
package/dist/main.js +1 -1
package/dist/utils/flightUtils.js +94 -87
package/package.json +1 -1

package/dist/{FlightResult-7HBkr7Al.js → FlightResult-CXQqIDcc.js} RENAMED Viewed

@@ -1,73 +1,73 @@
-import { jsx as r, jsxs as s, Fragment as Y } from "react/jsx-runtime";
-import { RewardsService as J, CashValue as C, EToolTipPosition as I, EInvalidAmountDisplayOption as W } from "@odynn/awayz-core";
-import { useQuery as X } from "@tanstack/react-query";
-import { g as Z } from "./index-7zRjF0bU.js";
-import { G as w, g as M, a as d, E as N, F as V, b as B } from "./FlightItinerary-Dy-2zMYt.js";
-import { E as ii } from "./enums-DxmoBOKL.js";
+import { jsx as r, jsxs as s, Fragment as Q } from "react/jsx-runtime";
+import { RewardsService as Y, CashValue as k, EToolTipPosition as A, EInvalidAmountDisplayOption as J } from "@odynn/awayz-core";
+import { useQuery as W } from "@tanstack/react-query";
+import { g as X } from "./index-7zRjF0bU.js";
+import { G as Z, g as I, a as f, E as d, F as w, b as V } from "./FlightItinerary-Dy-2zMYt.js";
+import { E as B } from "./enums-DxmoBOKL.js";
 import "./arrayExtensions-DFLvtO8l.js";
-import ri, { useState as b, useMemo as L } from "react";
-import { h as u } from "./moment-BGjjqtLQ.js";
-import { useTranslation as ei } from "react-i18next";
-import { EPaymentType as v } from "./enums/EPaymentType.js";
-import { isSameDayFlight as si } from "./utils/flightDateUtils.js";
-import { DEFAULT_AIRLINE_PROGRAM as oi, getFlightNumber as ti, getFullLogoPath as ni, getLogoPath as ai, getAirlineProgram as ci } from "./utils/flightUtils.js";
-import './assets/FlightResult.css';const li = (i, o, a = o + "s") => i === 1 ? o : a;
-function mi(i) {
+import ii, { useState as M, useMemo as C } from "react";
+import { h as N } from "./moment-BGjjqtLQ.js";
+import { useTranslation as ri } from "react-i18next";
+import { EPaymentType as u } from "./enums/EPaymentType.js";
+import { isSameDayFlight as ei } from "./utils/flightDateUtils.js";
+import { DEFAULT_AIRLINE_PROGRAM as si, getFlightNumber as ni, getLogoPath as ti, getAirlineProgram as oi } from "./utils/flightUtils.js";
+import './assets/FlightResult.css';const ai = (i, n, a = n + "s") => i === 1 ? n : a;
+function ci(i) {
   if (!i || isNaN(i) || i < 0) return "N/A";
-  let o = i == null ? void 0 : i.toString().split(".")[0];
-  return o == null ? void 0 : o.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+  let n = i == null ? void 0 : i.toString().split(".")[0];
+  return n == null ? void 0 : n.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
 }
-function _(i) {
-  return w({ attr: { viewBox: "0 0 512 512" }, child: [{ tag: "path", attr: { d: "M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM216 336l24 0 0-64-24 0c-13.3 0-24-10.7-24-24s10.7-24 24-24l48 0c13.3 0 24 10.7 24 24l0 88 8 0c13.3 0 24 10.7 24 24s-10.7 24-24 24l-80 0c-13.3 0-24-10.7-24-24s10.7-24 24-24zm40-208a32 32 0 1 1 0 64 32 32 0 1 1 0-64z" }, child: [] }] })(i);
+function L(i) {
+  return Z({ attr: { viewBox: "0 0 512 512" }, child: [{ tag: "path", attr: { d: "M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM216 336l24 0 0-64-24 0c-13.3 0-24-10.7-24-24s10.7-24 24-24l48 0c13.3 0 24 10.7 24 24l0 88 8 0c13.3 0 24 10.7 24 24s-10.7 24-24 24l-80 0c-13.3 0-24-10.7-24-24s10.7-24 24-24zm40-208a32 32 0 1 1 0 64 32 32 0 1 1 0-64z" }, child: [] }] })(i);
 }
-const Ei = ({
+const Ti = ({
   details: i,
-  onClick: o,
+  onClick: n,
   showBestValue: a = !1,
-  onShowBestValueCalculation: n,
-  customStyling: $ = !1
+  onShowBestValueCalculation: o,
+  customStyling: S = !1
 }) => {
-  const { t: c } = ei(), [D, S] = b(!1), m = i.origin, p = i.destination, E = i.flightDetails, k = i.paymentOptions || [];
-  let O = i.airlineLogo;
-  const R = k.filter((e) => e.points === -1).length === 1, z = k.filter((e) => e.points > -1).length === 1, [U, x] = b(oi), G = async () => {
-    const e = await ci(i.airlineProgram);
-    x(e);
-  }, { flightNumbers: y, airlines: K } = L(() => {
+  const { t: c } = ri(), [D, _] = M(!1), m = i.origin, p = i.destination, E = i.flightDetails, O = i.paymentOptions || [], $ = O.filter((e) => e.points === -1).length === 1, R = O.filter((e) => e.points > -1).length === 1, [z, U] = M(si), x = async () => {
+    const e = await oi(i.airlineProgram);
+    U(e);
+  }, { flightNumbers: v, airlines: G } = C(() => {
     const e = [], t = [];
     return i.flightDetails.slices.forEach((g) => {
-      g.segments.forEach((f) => {
-        const l = ti(f);
-        e.includes(l) || e.push(l), O = ni(f.marketingCarrier.iataCode);
-        const T = f.operatingCarrier;
-        t.some((Q) => Q.airline === T.name) || t.push({
-          logo: ai(T.iataCode),
+      g.segments.forEach((P) => {
+        const l = ni(P);
+        e.includes(l) || e.push(l);
+        const T = P.operatingCarrier;
+        t.some((H) => H.airline === T.name) || t.push({
+          logo: ti(T.iataCode),
           airline: T.name
         });
       });
-    }), G(), { flightNumbers: e, airlines: t };
-  }, [i.flightDetails.slices]), j = () => {
-    i.cash > 0 ? o(i, v.CASH) : o(i, v.POINTS);
-  }, q = !si(
+    }), x(), { flightNumbers: e, airlines: t };
+  }, [i.flightDetails.slices]), K = () => {
+    i.cash > 0 ? n(i, u.CASH) : n(i, u.POINTS);
+  }, j = !ei(
     i.departureTime,
     i.arrivalTime
-  ), P = i == null ? void 0 : i.airlineProgram, { data: A } = X({
-    queryKey: [ii.VALUE_CENTS, P],
-    queryFn: () => J.getPointsPerCent(P ?? ""),
+  ), y = i == null ? void 0 : i.airlineProgram, { data: b } = W({
+    queryKey: [B.VALUE_CENTS, y],
+    queryFn: () => Y.getPointsPerCent(y ?? ""),
     staleTime: 1 / 0,
     placeholderData: 0,
-    enabled: !!P && a
-  }), H = () => {
+    enabled: !!y && a
+  }), q = () => {
     var l;
-    if (!i || !A || !i.points || !i.cash)
+    if (!i || !b || !i.points || !i.cash)
       return {
         pointsCashValue: 0,
-        isBestValue: !1
+        bestValueStatus: "none"
+        /* NONE */
       };
-    const e = A * i.points / 100, t = ((l = i.cashFee) == null ? void 0 : l.amount) || 0;
+    const e = b * i.points / 100, t = ((l = i.cashFee) == null ? void 0 : l.amount) || 0;
     return {
-      isPointsBestValue: e + t < i.cash
+      bestValueStatus: e + t < i.cash ? "points" : "cash"
+      /* CASH */
     };
-  }, { isPointsBestValue: h } = H(), F = L(() => {
+  }, { bestValueStatus: h } = q(), F = C(() => {
     var e, t;
     return (t = (e = i.paymentOptions) == null ? void 0 : e.find(
       (g) => g.program === i.airlineProgram
@@ -76,11 +76,11 @@ const Ei = ({
   return /* @__PURE__ */ r(
     "div",
     {
-      className: `${$ ? "" : "awayz-"}flight-result`,
-      onClick: j,
+      className: `${S ? "" : "awayz-"}flight-result`,
+      onClick: K,
       children: /* @__PURE__ */ s("div", { className: "content", children: [
         /* @__PURE__ */ r("div", { className: "flight-info", children: /* @__PURE__ */ s("div", { className: "flight-locations", children: [
-          /* @__PURE__ */ r("div", { className: "airlines", children: K.map((e, t) => /* @__PURE__ */ r(ri.Fragment, { children: /* @__PURE__ */ s("div", { className: "tip", children: [
+          /* @__PURE__ */ r("div", { className: "airlines", children: G.map((e, t) => /* @__PURE__ */ r(ii.Fragment, { children: /* @__PURE__ */ s("div", { className: "tip", children: [
             /* @__PURE__ */ r("img", { src: e.logo, alt: e.airline }),
             /* @__PURE__ */ r("span", { className: "right", children: e.airline })
           ] }, t) }, t)) }),
@@ -88,23 +88,23 @@ const Ei = ({
             /* @__PURE__ */ s("p", { className: "show-desktop", children: [
               m.city,
               ",",
-              M(m.country)
+              I(m.country)
             ] }),
-            /* @__PURE__ */ r("p", { className: "show-desktop", children: u(i.departureTime).format(
-              c(d.DATE_TIME_MEDIUM, N.FlightShortDate)
+            /* @__PURE__ */ r("p", { className: "show-desktop", children: N(i.departureTime).format(
+              c(f.DATE_TIME_MEDIUM, d.FlightShortDate)
             ) }),
             /* @__PURE__ */ r("p", { className: "show-mobile", children: m.airportCode }),
-            /* @__PURE__ */ r("p", { className: "show-mobile", children: u(i.departureTime).format(
-              c(d.TIME_ONLY, N.FlightTime)
+            /* @__PURE__ */ r("p", { className: "show-mobile", children: N(i.departureTime).format(
+              c(f.TIME_ONLY, d.FlightTime)
             ) })
           ] }),
           /* @__PURE__ */ s("div", { className: "flight-duration", children: [
             /* @__PURE__ */ r("span", { className: "line" }),
             /* @__PURE__ */ s("p", { children: [
-              Z(E.slices[0].duration),
+              X(E.slices[0].duration),
               " ",
               " - ",
-              i.numberOfStops > 0 ? `${i.numberOfStops} ${li(
+              i.numberOfStops > 0 ? `${i.numberOfStops} ${ai(
                 i.numberOfStops,
                 "Stop"
               )}` : "Direct"
@@ -115,17 +115,17 @@ const Ei = ({
             /* @__PURE__ */ s("p", { className: "show-desktop", children: [
               p.city,
               ", ",
-              M(p.country)
+              I(p.country)
             ] }),
             /* @__PURE__ */ s("p", { className: "show-desktop", children: [
-              u(i.arrivalTime).format(
-                c(d.DATE_TIME_MEDIUM, N.FlightShortDate)
+              N(i.arrivalTime).format(
+                c(f.DATE_TIME_MEDIUM, d.FlightShortDate)
               ),
               " "
             ] }),
             /* @__PURE__ */ r("p", { className: "show-mobile", children: p.airportCode }),
-            /* @__PURE__ */ r("p", { className: "show-mobile", children: u(i.arrivalTime).format(
-              c(d.TIME_ONLY, N.FlightTime)
+            /* @__PURE__ */ r("p", { className: "show-mobile", children: N(i.arrivalTime).format(
+              c(f.TIME_ONLY, d.FlightTime)
             ) })
           ] })
         ] }) }),
@@ -135,17 +135,17 @@ const Ei = ({
             {
               className: "flight-detail",
               onClick: (e) => {
-                e.stopPropagation(), S(!D);
+                e.stopPropagation(), _(!D);
               },
               children: [
                 /* @__PURE__ */ r("p", { children: "Aircraft" }),
                 /* @__PURE__ */ s("p", { className: "chevron-text", children: [
-                  /* @__PURE__ */ r(V, {}),
+                  /* @__PURE__ */ r(w, {}),
                   /* @__PURE__ */ s("span", { children: [
-                    y[0],
-                    y.length > 1 && /* @__PURE__ */ s("sup", { children: [
+                    v[0],
+                    v.length > 1 && /* @__PURE__ */ s("sup", { children: [
                       "+",
-                      y.length - 1
+                      v.length - 1
                     ] })
                   ] })
                 ] })
@@ -156,34 +156,40 @@ const Ei = ({
             i.cash > 0 && /* @__PURE__ */ s(
               "div",
               {
-                className: `amount-value ${!h && a ? "show-best-value-flag" : ""}`,
+                className: `amount-value ${h === "cash" && a ? "show-best-value-flag" : ""}`,
                 onClick: (e) => {
-                  e.stopPropagation(), o(i, v.CASH);
+                  e.stopPropagation(), n(i, u.CASH);
                 },
                 children: [
-                  /* @__PURE__ */ r("img", { src: O, alt: "marketing carrier logo" }),
+                  /* @__PURE__ */ r(
+                    "img",
+                    {
+                      src: i.marketingLogo ?? i.airlineLogo,
+                      alt: "marketing carrier logo"
+                    }
+                  ),
                   /* @__PURE__ */ s("div", { children: [
-                    /* @__PURE__ */ r("label", { children: R ? "Book For" : "From" }),
+                    /* @__PURE__ */ r("label", { children: $ ? "Book For" : "From" }),
                     /* @__PURE__ */ r(
-                      C,
+                      k,
                       {
                         amount: i.cash,
                         currency: i.currency,
-                        position: I.LEFT
+                        position: A.LEFT
                       }
                     )
                   ] }),
-                  !h && a && /* @__PURE__ */ s(
+                  h === "cash" && a && /* @__PURE__ */ s(
                     "div",
                     {
                       className: "best-value-flag tip",
                       onClick: (e) => {
-                        e.stopPropagation(), n == null || n(i);
+                        e.stopPropagation(), o == null || o(i);
                       },
                       children: [
-                        n && /* @__PURE__ */ r(_, {}),
+                        o && /* @__PURE__ */ r(L, {}),
                         /* @__PURE__ */ r("p", { children: "Best Value" }),
-                        n && /* @__PURE__ */ r("span", { children: "Click to learn more" })
+                        o && /* @__PURE__ */ r("span", { children: "Click to learn more" })
                       ]
                     }
                   )
@@ -193,40 +199,40 @@ const Ei = ({
             i.points > 0 && /* @__PURE__ */ s(
               "div",
               {
-                className: `amount-value ${h && a ? "show-best-value-flag" : ""}`,
+                className: `amount-value ${h === "points" && a ? "show-best-value-flag" : ""}`,
                 onClick: (e) => {
-                  e.stopPropagation(), o(i, v.POINTS);
+                  e.stopPropagation(), n(i, u.POINTS);
                 },
                 children: [
-                  h && a && /* @__PURE__ */ s(
+                  h === "points" && a && /* @__PURE__ */ s(
                     "div",
                     {
                       className: "best-value-flag tip",
                       onClick: (e) => {
-                        e.stopPropagation(), n == null || n(i);
+                        e.stopPropagation(), o == null || o(i);
                       },
                       children: [
-                        n && /* @__PURE__ */ r(_, {}),
+                        o && /* @__PURE__ */ r(L, {}),
                         /* @__PURE__ */ r("p", { children: "Best Value" }),
-                        n && /* @__PURE__ */ r("span", { children: "Click to learn more" })
+                        o && /* @__PURE__ */ r("span", { children: "Click to learn more" })
                       ]
                     }
                   ),
-                  /* @__PURE__ */ r("img", { src: U.programLogo }),
+                  /* @__PURE__ */ r("img", { src: z.programLogo }),
                   /* @__PURE__ */ s("div", { children: [
-                    /* @__PURE__ */ r("label", { children: z ? "Book For" : "From" }),
+                    /* @__PURE__ */ r("label", { children: R ? "Book For" : "From" }),
                     /* @__PURE__ */ s("p", { children: [
-                      `${mi(i.points)} ${c("miles")}`,
-                      !!F && /* @__PURE__ */ s(Y, { children: [
+                      `${ci(i.points)} ${c("miles")}`,
+                      !!F && /* @__PURE__ */ s(Q, { children: [
                         " + ",
                         /* @__PURE__ */ r(
-                          C,
+                          k,
                           {
                             amount: F.amount,
                             currency: F.currency,
                             customDisplay: "No fee",
-                            zeroDisplayOption: W.CUSTOM,
-                            position: I.LEFT
+                            zeroDisplayOption: J.CUSTOM,
+                            position: A.LEFT
                           }
                         )
                       ] })
@@ -238,12 +244,12 @@ const Ei = ({
           ] })
         ] }),
         /* @__PURE__ */ r("div", { className: `flight-details ${D ? "is-open" : ""}`, children: /* @__PURE__ */ r("div", { className: "inner", children: /* @__PURE__ */ r(
-          B,
+          V,
           {
             itinerary: E.slices[0].segments,
             origin: m,
             destination: p,
-            isMultiDayFlight: q
+            isMultiDayFlight: j
           }
         ) }) })
       ] })
@@ -251,6 +257,6 @@ const Ei = ({
   );
 };
 export {
-  Ei as F,
-  mi as c
+  Ti as F,
+  ci as c
 };

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

@@ -1,7 +1,7 @@
 import "react/jsx-runtime";
 import "@odynn/awayz-core";
 import "@tanstack/react-query";
-import { F as x } from "../../FlightResult-7HBkr7Al.js";
+import { F as x } from "../../FlightResult-CXQqIDcc.js";
 import "../../index-7zRjF0bU.js";
 import "../../FlightItinerary-Dy-2zMYt.js";
 import "../../enums-DxmoBOKL.js";

package/dist/components/index.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { F as l } from "../FlightResult-7HBkr7Al.js";
+import { F as l } from "../FlightResult-CXQqIDcc.js";
 export {
   l as FlightResult
 };

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

@@ -128,6 +128,7 @@ export interface IFlightPaymentOption {
         iataCode: string;
         name: string;
     };
+    cabinClass?: string;
 }
 export interface IFlightResult {
     id: string;
@@ -149,6 +150,7 @@ export interface IFlightResult {
     awayzGroupId: string;
     duration: string;
     airlineProgram: string;
+    marketingLogo?: string;
     durationMinutes: number;
     flightDetails: IFlightOffer;
     paymentOptions: IFlightPaymentOption[];

package/dist/lib/utils/flightUtils.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
-import { IFlightOffer, IFlightResult } from '../hooks/useFlightSearch/useFlightSearch.types';
 import { ISegment } from '@type-op/shared';
+import { IFlightOffer, IFlightResult } from '../hooks/useFlightSearch/useFlightSearch.types';
 import { IAirlineProgram } from '../services/wallet/WalletService.types';
 import { ECabinClass } from '../types/ECabinClass';
 /**

package/dist/main.js CHANGED Viewed

@@ -1,7 +1,7 @@
 import { useFlightSearch as o } from "./hooks/useFlightSearch/useFlightSearch.js";
 import { useAirportSearch as g } from "./hooks/useAirportSearch/useAirportSearch.js";
 import { EBaggage as s } from "./hooks/useFlightSearch/useFlightSearch.types.js";
-import { F as f, c as l } from "./FlightResult-7HBkr7Al.js";
+import { F as f, c as l } from "./FlightResult-CXQqIDcc.js";
 import { EPaymentType as x } from "./enums/EPaymentType.js";
 import { DEFAULT_AIRLINE_PROGRAM as C, getAirlineProgram as E, getFlightNumber as F, getLogoPath as c } from "./utils/flightUtils.js";
 import { isSameDayFlight as y } from "./utils/flightDateUtils.js";

package/dist/utils/flightUtils.js CHANGED Viewed

@@ -1,37 +1,40 @@
-import { mapBaggageType as j } from "../hooks/useFlightSearch/useFlightSearch.types.js";
-import { h as p } from "../moment-BGjjqtLQ.js";
+import { awayzClient as j } from "@odynn/awayz-core";
 import { d as B, D as Q } from "../index-7zRjF0bU.js";
 import "../arrayExtensions-DFLvtO8l.js";
 import "react";
-import { awayzClient as V } from "@odynn/awayz-core";
+import { h as p } from "../moment-BGjjqtLQ.js";
+import { mapBaggageType as V } from "../hooks/useFlightSearch/useFlightSearch.types.js";
 import { WalletService as Y } from "../services/wallet/WalletService.js";
 import { ERewardProgramCategories as x } from "../services/wallet/WalletService.types.js";
 const ne = (t) => t == null ? void 0 : t.map((e) => {
-  var i, n, m, c, s, a, r, o, g, l, d, C, w, b, D, F, L, A, T, P, k, h, O, v, R, E, I, _, z, M, S, Z, $, G;
+  var n, r, g, m, s, a, i, o, l, c, d, y, C, b, F, D, L, k, A, T, P, O, h, v, R, E, I, _, M, z, N, S, Z, $;
   return {
     id: e.id,
     points: (e == null ? void 0 : e.points) >= 0 ? e.points : -1,
     partial: e == null ? void 0 : e.partial,
     origin: {
-      city: ((i = e.slices[0].segments[0].origin) == null ? void 0 : i.cityName) || ((m = (n = e.slices[0].segments[0].origin) == null ? void 0 : n.city) == null ? void 0 : m.name),
-      country: ((c = e.slices[0].segments[0].origin) == null ? void 0 : c.iataCountryCode) || ((a = (s = e.slices[0].segments[0].origin) == null ? void 0 : s.city) == null ? void 0 : a.iataCountryCode),
-      airportCode: ((r = e.slices[0].segments[0].origin) == null ? void 0 : r.iataCityCode) || ((g = (o = e.slices[0].segments[0].origin) == null ? void 0 : o.city) == null ? void 0 : g.iataCode),
+      city: ((n = e.slices[0].segments[0].origin) == null ? void 0 : n.cityName) || ((g = (r = e.slices[0].segments[0].origin) == null ? void 0 : r.city) == null ? void 0 : g.name),
+      country: ((m = e.slices[0].segments[0].origin) == null ? void 0 : m.iataCountryCode) || ((a = (s = e.slices[0].segments[0].origin) == null ? void 0 : s.city) == null ? void 0 : a.iataCountryCode),
+      airportCode: ((i = e.slices[0].segments[0].origin) == null ? void 0 : i.iataCityCode) || ((l = (o = e.slices[0].segments[0].origin) == null ? void 0 : o.city) == null ? void 0 : l.iataCode),
       coordinates: {
-        latitude: (d = (l = e.slices[0].segments[0].origin) == null ? void 0 : l.city) == null ? void 0 : d.latitude,
-        longitude: (w = (C = e.slices[0].segments[0].origin) == null ? void 0 : C.city) == null ? void 0 : w.longitude
+        latitude: (d = (c = e.slices[0].segments[0].origin) == null ? void 0 : c.city) == null ? void 0 : d.latitude,
+        longitude: (C = (y = e.slices[0].segments[0].origin) == null ? void 0 : y.city) == null ? void 0 : C.longitude
       }
     },
     destination: {
-      city: ((D = (b = e.slices[0].segments.getLast()) == null ? void 0 : b.destination) == null ? void 0 : D.cityName) || ((A = (L = (F = e.slices[0].segments.getLast()) == null ? void 0 : F.destination) == null ? void 0 : L.city) == null ? void 0 : A.name),
-      country: ((P = (T = e.slices[0].segments.getLast()) == null ? void 0 : T.destination) == null ? void 0 : P.iataCountryCode) || ((O = (h = (k = e.slices[0].segments.getLast()) == null ? void 0 : k.destination) == null ? void 0 : h.city) == null ? void 0 : O.iataCountryCode),
+      city: ((F = (b = e.slices[0].segments.getLast()) == null ? void 0 : b.destination) == null ? void 0 : F.cityName) || ((k = (L = (D = e.slices[0].segments.getLast()) == null ? void 0 : D.destination) == null ? void 0 : L.city) == null ? void 0 : k.name),
+      country: ((T = (A = e.slices[0].segments.getLast()) == null ? void 0 : A.destination) == null ? void 0 : T.iataCountryCode) || ((h = (O = (P = e.slices[0].segments.getLast()) == null ? void 0 : P.destination) == null ? void 0 : O.city) == null ? void 0 : h.iataCountryCode),
       airportCode: ((R = (v = e.slices[0].segments.getLast()) == null ? void 0 : v.destination) == null ? void 0 : R.iataCityCode) || ((_ = (I = (E = e.slices[0].segments.getLast()) == null ? void 0 : E.destination) == null ? void 0 : I.city) == null ? void 0 : _.iataCode),
       coordinates: {
-        latitude: (S = (M = (z = e.slices[0].segments.getLast()) == null ? void 0 : z.destination) == null ? void 0 : M.city) == null ? void 0 : S.latitude,
-        longitude: (G = ($ = (Z = e.slices[0].segments.getLast()) == null ? void 0 : Z.destination) == null ? void 0 : $.city) == null ? void 0 : G.longitude
+        latitude: (N = (z = (M = e.slices[0].segments.getLast()) == null ? void 0 : M.destination) == null ? void 0 : z.city) == null ? void 0 : N.latitude,
+        longitude: ($ = (Z = (S = e.slices[0].segments.getLast()) == null ? void 0 : S.destination) == null ? void 0 : Z.city) == null ? void 0 : $.longitude
       }
     },
     airline: e.owner.name,
-    airlineLogo: y(
+    airlineLogo: u(
+      e.slices[0].segments[0].operatingCarrier.iataCode
+    ),
+    marketingLogo: u(
       e.slices[0].segments[0].marketingCarrier.iataCode
     ),
     cash: e.totalAmount ? parseFloat(e.totalAmount) : 0,
@@ -58,41 +61,41 @@ const ne = (t) => t == null ? void 0 : t.map((e) => {
     cabinClass: e.slices[0].segments[0].passengers[0].cabinClass || e.slices[0].segments[0].passengers[0].cabin.name || e.slices[0].segments[0].passengers[0].cabinClassMarketingName || e.slices[0].segments[0].passengers[0].cabin.marketingName
   };
 }), K = (t) => {
-  const e = t.operatingCarrierFlightNumber ? t.operatingCarrier : t.marketingCarrier, i = t.operatingCarrierFlightNumber ?? t.marketingCarrierFlightNumber;
-  return e.iataCode + " " + W(i);
+  const e = t.operatingCarrierFlightNumber ? t.operatingCarrier : t.marketingCarrier, n = t.operatingCarrierFlightNumber ?? t.marketingCarrierFlightNumber;
+  return e.iataCode + " " + W(n);
 }, re = ({
   originCode: t,
   destinationCode: e,
-  departureDate: i,
-  cabinClass: n,
-  passengerCount: m,
-  paymentType: c
+  departureDate: n,
+  cabinClass: r,
+  passengerCount: g,
+  paymentType: m
 }) => {
   let s = "/flights/search/one-way/points-cash?";
-  return s += `origin=${t}`, s += `&destination=${e}`, s += `&departure_date=${i}`, s += `&cabin_class=${n}`, s += `&adults=${m}`, s += `&cash_or_points=[${c}]`, s;
-}, H = (t) => t.flightDetails.slices[0].segments.map((i) => K(i)).join("_"), oe = (t) => {
+  return s += `origin=${t}`, s += `&destination=${e}`, s += `&departure_date=${n}`, s += `&cabin_class=${r}`, s += `&adults=${g}`, s += `&cash_or_points=[${m}]`, s;
+}, H = (t) => t.flightDetails.slices[0].segments.map((n) => K(n)).join("_"), oe = (t) => {
   const e = {};
   t.forEach((s) => {
     const a = H(s);
     if (e[a]) {
-      const r = U(s);
-      e[a].flight.paymentOptions.push(r);
-      const o = u(
+      const i = U(s);
+      e[a].flight.paymentOptions.push(i);
+      const o = w(
         e[a].flight.paymentOptions
       );
       e[a].flight.cash = o.lowestCash, e[a].flight.points = o.lowestPoints;
     } else {
-      const { origin: r, destination: o } = s, g = [U(s)], l = u(g);
+      const { origin: i, destination: o } = s, l = [U(s)], c = w(l);
       e[a] = {
         programs: [],
         flight: {
           id: s.awayzGroupId,
           partial: s.partial,
           origin: {
-            city: r.city,
-            country: r.country,
-            airportCode: r.airportCode,
-            coordinates: r.coordinates
+            city: i.city,
+            country: i.country,
+            airportCode: i.airportCode,
+            coordinates: i.coordinates
           },
           destination: {
             city: o.city,
@@ -101,11 +104,14 @@ const ne = (t) => t == null ? void 0 : t.map((e) => {
             coordinates: o.coordinates
           },
           airline: s.airline,
-          airlineLogo: y(
+          airlineLogo: u(
+            s.flightDetails.slices[0].segments[0].operatingCarrier.iataCode
+          ),
+          marketingLogo: u(
             s.flightDetails.slices[0].segments[0].marketingCarrier.iataCode
           ),
           flightNumber: s.flightNumber,
-          paymentOptions: g,
+          paymentOptions: l,
           numberOfStops: s.numberOfStops,
           departureTime: s.departureTime,
           arrivalTime: s.arrivalTime,
@@ -123,8 +129,8 @@ const ne = (t) => t == null ? void 0 : t.map((e) => {
             destinationTimeZone: s.flightDetails.slices[0].segments.getLast().destination.timeZone,
             duration: s.flightDetails.slices[0].duration
           }),
-          cash: l.lowestCash,
-          points: l.lowestPoints,
+          cash: c.lowestCash,
+          points: c.lowestPoints,
           flightDetails: s.flightDetails,
           currency: s.flightDetails.baseCurrency,
           cashFee: s.cashFee,
@@ -134,65 +140,65 @@ const ne = (t) => t == null ? void 0 : t.map((e) => {
     }
     s.airlineProgram && !e[a].programs.includes(s.airlineProgram) && e[a].programs.push(s.airlineProgram);
   });
-  const i = [];
+  const n = [];
   Object.values(e).forEach((s) => {
     const a = [
       ...new Set(
-        s.flight.paymentOptions.map((r) => r.carrier.name)
+        s.flight.paymentOptions.map((i) => i.carrier.name)
       )
     ];
-    s.programs.length > 0 ? s.programs.forEach((r) => {
+    s.programs.length > 0 ? s.programs.forEach((i) => {
       a.forEach((o) => {
-        var l;
-        const g = u(
+        var c;
+        const l = w(
           s.flight.paymentOptions.filter(
-            (d) => d.program === r || d.cash > 0 && d.carrier.name === o
+            (d) => d.program === i || d.cash > 0 && d.carrier.name === o
           )
         );
-        i.push({
+        n.push({
           ...s.flight,
           airline: o,
-          airlineLogo: y(
-            (l = s.flight.paymentOptions.find(
+          airlineLogo: u(
+            (c = s.flight.paymentOptions.find(
               (d) => d.carrier.name === o
-            )) == null ? void 0 : l.carrier.iataCode
+            )) == null ? void 0 : c.carrier.iataCode
           ),
-          airlineProgram: r,
-          cash: g.lowestCash,
-          points: g.lowestPoints
+          airlineProgram: i,
+          cash: l.lowestCash,
+          points: l.lowestPoints
         });
       });
-    }) : a.forEach((r) => {
-      var g;
-      const { lowestCash: o } = u(
+    }) : a.forEach((i) => {
+      var l;
+      const { lowestCash: o } = w(
         s.flight.paymentOptions.filter(
-          (l) => l.carrier.name === r
+          (c) => c.carrier.name === i
         )
       );
-      i.push({
+      n.push({
         ...s.flight,
-        airline: r,
-        airlineLogo: y(
-          (g = s.flight.paymentOptions.find(
-            (l) => l.carrier.name === r
-          )) == null ? void 0 : g.carrier.iataCode
+        airline: i,
+        airlineLogo: u(
+          (l = s.flight.paymentOptions.find(
+            (c) => c.carrier.name === i
+          )) == null ? void 0 : l.carrier.iataCode
         ),
         cash: o
       });
     });
   });
-  const { cashlessResults: n, otherResults: m } = i.reduce(
+  const { cashlessResults: r, otherResults: g } = n.reduce(
     (s, a) => (a.cash <= 0 && a.points > 0 ? s.cashlessResults.push(a) : a.cash > 0 && s.otherResults.push(a), s),
     { cashlessResults: [], otherResults: [] }
-  ), c = m;
-  return n.forEach((s) => {
-    c.find(
-      (r) => r.awayzGroupId === s.awayzGroupId
-    ) || c.push(s);
-  }), c;
-}, W = (t) => t ? t.replace(/^0+/, "") : "", ce = (t) => `https://assets.duffel.com/img/airlines/for-light-background/full-color-logo/${t}.svg`, y = (t) => `${Q}${t}.svg`, N = "/img/logo/odynn-eye.svg", q = {
-  categoryLogo: N,
-  programLogo: N,
+  ), m = g;
+  return r.forEach((s) => {
+    m.find(
+      (i) => i.awayzGroupId === s.awayzGroupId
+    ) || m.push(s);
+  }), m;
+}, W = (t) => t ? t.replace(/^0+/, "") : "", ce = (t) => `https://assets.duffel.com/img/airlines/for-light-background/full-color-logo/${t}.svg`, u = (t) => `${Q}${t}.svg`, G = "/img/logo/odynn-eye.svg", q = {
+  categoryLogo: G,
+  programLogo: G,
   awayzActive: [],
   mainProgram: "Unknown",
   displayProgram: "Unknown",
@@ -203,30 +209,30 @@ const ne = (t) => t == null ? void 0 : t.map((e) => {
   // Using App Foreground Colour
   url: "https://www.odynn.com"
 }, me = async (t) => {
-  const { airlines: e } = await V.ensureQueryData({
+  const { airlines: e } = await j.ensureQueryData({
     queryKey: ["walletAwards"],
     queryFn: Y.getAwards,
     staleTime: 864e5
     // 24 hours
   });
-  let i = e.find(
-    (n) => {
-      var m, c, s, a;
-      return ((c = (m = n.mainProgram) == null ? void 0 : m.toLowerCase()) == null ? void 0 : c.includes(t == null ? void 0 : t.toLowerCase())) || ((a = (s = n.displayProgram) == null ? void 0 : s.toLowerCase()) == null ? void 0 : a.includes(t == null ? void 0 : t.toLowerCase()));
+  let n = e.find(
+    (r) => {
+      var g, m, s, a;
+      return ((m = (g = r.mainProgram) == null ? void 0 : g.toLowerCase()) == null ? void 0 : m.includes(t == null ? void 0 : t.toLowerCase())) || ((a = (s = r.displayProgram) == null ? void 0 : s.toLowerCase()) == null ? void 0 : a.includes(t == null ? void 0 : t.toLowerCase()));
     }
   ) ?? q;
-  return i || (i = {
+  return n || (n = {
     ...q,
     mainProgram: t,
     displayProgram: t,
     id: t
-  }), i;
+  }), n;
 }, U = (t) => {
-  var n, m, c, s;
-  const i = (((c = (m = (n = t.flightDetails.slices.getFirst()) == null ? void 0 : n.segments.getFirst()) == null ? void 0 : m.passengers.getFirst()) == null ? void 0 : c.baggages) ?? []).map(
-    (a) => ({
-      type: j(a.type),
-      quantity: a.quantity
+  var g, m, s, a, i, o, l, c, d, y;
+  const e = ((s = (m = (g = t.flightDetails.slices.getFirst()) == null ? void 0 : g.segments.getFirst()) == null ? void 0 : m.passengers.getFirst()) == null ? void 0 : s.baggages) ?? [], n = ((o = (i = (a = t.flightDetails.slices.getFirst()) == null ? void 0 : a.segments.getFirst()) == null ? void 0 : i.passengers.getFirst()) == null ? void 0 : o.cabinClass) ?? ((d = (c = (l = t.flightDetails.slices.getFirst()) == null ? void 0 : l.segments.getFirst()) == null ? void 0 : c.passengers.getFirst()) == null ? void 0 : d.cabinClassMarketingName), r = e.map(
+    (C) => ({
+      type: V(C.type),
+      quantity: C.quantity
     })
   );
   return {
@@ -235,24 +241,25 @@ const ne = (t) => t == null ? void 0 : t.map((e) => {
     points: t.points,
     program: t.airlineProgram,
     baseCurrency: t.flightDetails.baseCurrency,
-    fareBrandName: (s = t.flightDetails.slices.getFirst()) == null ? void 0 : s.fareBrandName,
+    fareBrandName: (y = t.flightDetails.slices.getFirst()) == null ? void 0 : y.fareBrandName,
+    cabinClass: n,
     cashFee: t.cashFee,
     conditions: t.flightDetails.conditions,
-    baggages: i,
+    baggages: r,
     carrier: {
       iataCode: t.flightDetails.slices.getFirst().segments.getFirst().marketingCarrier.iataCode,
       name: t.flightDetails.slices.getFirst().segments.getFirst().marketingCarrier.name
     }
   };
-}, u = (t) => {
+}, w = (t) => {
   const e = Math.min(
-    ...t.filter((n) => n.cash > 0).map((n) => n.cash)
-  ), i = Math.min(
-    ...t.filter((n) => n.points > 0).map((n) => n.points)
+    ...t.filter((r) => r.cash > 0).map((r) => r.cash)
+  ), n = Math.min(
+    ...t.filter((r) => r.points > 0).map((r) => r.points)
   );
   return {
     lowestCash: e === 1 / 0 ? -1 : e,
-    lowestPoints: i === 1 / 0 ? -1 : i
+    lowestPoints: n === 1 / 0 ? -1 : n
   };
 };
 export {
@@ -260,7 +267,7 @@ export {
   re as buildFlightSearchQuery,
   me as getAirlineProgram,
   K as getFlightNumber,
-  y as getFullLogoPath,
+  u as getFullLogoPath,
   ce as getLogoPath,
   oe as groupFlightResults,
   ne as mapDataToFlightDetails,

package/package.json CHANGED Viewed

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