@odynn/awayz-flights 0.2.3 → 0.2.4

package/dist/components/FlightResult/FlightResult.js

@@ -1,56 +1,57 @@
-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 { jsx as r, jsxs as e, Fragment as I } from "react/jsx-runtime";
+import T, { useState as N, useMemo as R } from "react";
+import { g as u, E as v, F as B, a as L } from "../../FlightItinerary-DgpK1LYF.js";
+import { DEFAULT_AIRLINE_PROGRAM as $, getFlightNumber as x, getLogoPath as M, getAirlineProgram as b } from "../../utils/flightUtils.js";
+import { h as F } from "../../arrayExtensions-DWKenJCh.js";
+import { g as j } 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) {
+import { CashValue as y } from "@odynn/awayz-core";
+import '../../assets/FlightResult.css';function H(i) {
   if (!i || isNaN(i) || i < 0) return "N/A";
   let a = i == null ? void 0 : i.toString().split(".")[0];
   return a == null ? void 0 : a.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
 }
-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 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 n = await b(i.airlineProgram);
+    P(n);
+  }, { flightNumbers: h, airlines: O } = R(() => {
     const n = [], t = [];
-    return i.flightDetails.slices.forEach((O) => {
-      O.segments.forEach((s) => {
-        const d = $(s);
-        n.includes(d) || n.push(d);
+    return i.flightDetails.slices.forEach((k) => {
+      k.segments.forEach((s) => {
+        const f = x(s);
+        n.includes(f) || n.push(f);
         const m = s.operatingCarrierFlightNumber ? s.operatingCarrier : s.marketingCarrier;
-        t.some((k) => k.airline === m.name) || t.push({
-          logo: x(m.iataCode),
+        t.some((E) => E.airline === m.name) || t.push({
+          logo: M(m.iataCode),
           airline: m.name
         });
       });
-    }), P(), { flightNumbers: n, airlines: t };
+    }), A(), { flightNumbers: n, airlines: t };
   }, [i.flightDetails.slices]);
   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: 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__ */ r("div", { className: "airlines", children: O.map((n, t) => /* @__PURE__ */ r(T.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: [
           c.city,
           ",",
-          N(c.country)
+          u(c.country)
         ] }),
-        /* @__PURE__ */ r("p", { children: v(i.departureTime).format(
+        /* @__PURE__ */ r("p", { children: F(i.departureTime).format(
           // isMobile
           //   ? EDateFormats.FlightTime
           //   :
-          u.FlightShortDate
+          v.FlightShortDate
         ) })
       ] }),
       /* @__PURE__ */ e("div", { className: "flight-duration", children: [
         /* @__PURE__ */ r("span", { className: "line" }),
         /* @__PURE__ */ e("p", { children: [
-          b(p.slices[0].duration),
+          j(p.slices[0].duration),
           " ",
           " - ",
           i.numberOfStops > 0 ? `${i.numberOfStops} Stop${i.numberOfStops > 1 ? "s" : ""}` : "Direct"
@@ -61,14 +62,14 @@ const K = ({ details: i, onClick: a }) => {
         /* @__PURE__ */ e("p", { children: [
           l.city,
           ", ",
-          N(l.country)
+          u(l.country)
         ] }),
         /* @__PURE__ */ e("p", { children: [
-          v(i.arrivalTime).format(
+          F(i.arrivalTime).format(
             // isMobile
             //   ? EDateFormats.FlightTime
             //   :
-            u.FlightShortDate
+            v.FlightShortDate
           ),
           " "
         ] })
@@ -81,12 +82,12 @@ const K = ({ details: i, onClick: a }) => {
           {
             className: "flight-detail",
             onClick: (n) => {
-              n.stopPropagation(), y(!g);
+              n.stopPropagation(), C(!g);
             },
             children: [
               /* @__PURE__ */ r("p", { children: "Aircraft" }),
               /* @__PURE__ */ e("p", { className: "chevron-text", children: [
-                /* @__PURE__ */ r(R, {}),
+                /* @__PURE__ */ r(B, {}),
                 /* @__PURE__ */ e("span", { children: [
                   h[0],
                   h.length > 1 && /* @__PURE__ */ e("sup", { children: [
@@ -117,9 +118,9 @@ const K = ({ details: i, onClick: a }) => {
               n.stopPropagation(), a(i, o.CASH);
             },
             children: [
-              /* @__PURE__ */ r("p", { children: C ? "Book For" : "From" }),
+              /* @__PURE__ */ r("p", { children: D ? "Book For" : "From" }),
               /* @__PURE__ */ r("p", { children: /* @__PURE__ */ r(
-                F,
+                y,
                 {
                   amount: i.cash,
                   currency: i.currency
@@ -136,13 +137,13 @@ const K = ({ details: i, onClick: a }) => {
               n.stopPropagation(), a(i, o.POINTS);
             },
             children: [
-              /* @__PURE__ */ r("img", { src: D.programLogo }),
+              /* @__PURE__ */ r("img", { src: S.programLogo }),
               /* @__PURE__ */ e("p", { children: [
-                `${j(i.points)} miles`,
-                i.cashFee.amount > 0 && /* @__PURE__ */ e(E, { children: [
+                `${H(i.points)} miles`,
+                ((d = i.cashFee) == null ? void 0 : d.amount) > 0 && /* @__PURE__ */ e(I, { children: [
                   " + ",
                   /* @__PURE__ */ r(
-                    F,
+                    y,
                     {
                       amount: i.cashFee.amount,
                       currency: i.cashFee.currency
@@ -156,7 +157,7 @@ const K = ({ details: i, onClick: a }) => {
       ] })
     ] }),
     /* @__PURE__ */ r("div", { className: `flight-details ${g ? "is-open" : ""}`, children: /* @__PURE__ */ r("div", { className: "inner", children: /* @__PURE__ */ r(
-      B,
+      L,
       {
         itinerary: p.slices[0].segments,
         origin: c,
@@ -166,5 +167,5 @@ const K = ({ details: i, onClick: a }) => {
   ] }) });
 };
 export {
-  K as FlightResult
+  Q as FlightResult
 };

package/dist/hooks/useFlightSearch/useFlightSearch.js

@@ -47,21 +47,21 @@ function oe(o, t, r) {
     if (c.length === 0)
       r == null || r(n), n = U();
     else if (u > 0) {
-      const a = s.decode(c.subarray(0, u)), d = u + (c[u + 1] === 32 ? 2 : 1), g = s.decode(c.subarray(d));
+      const a = s.decode(c.subarray(0, u)), d = u + (c[u + 1] === 32 ? 2 : 1), b = s.decode(c.subarray(d));
       switch (a) {
         case "data":
           n.data = n.data ? n.data + `
-` + g : g;
+` + b : b;
           break;
         case "event":
-          n.event = g;
+          n.event = b;
           break;
         case "id":
-          o(n.id = g);
+          o(n.id = b);
           break;
         case "retry":
-          const m = parseInt(g, 10);
-          isNaN(m) || t(n.retry = m);
+          const g = parseInt(b, 10);
+          isNaN(g) || t(n.retry = g);
           break;
       }
     }
@@ -89,35 +89,35 @@ 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((m, _) => {
+  var { signal: r, headers: n, onopen: s, onmessage: v, onclose: c, onerror: u, openWhenHidden: a, fetch: d } = t, b = ae(t, ["signal", "headers", "onopen", "onmessage", "onclose", "onerror", "openWhenHidden", "fetch"]);
+  return new Promise((g, _) => {
     const p = Object.assign({}, n);
     p.accept || (p.accept = x);
-    let y;
+    let m;
     function w() {
-      y.abort(), document.hidden || T();
+      m.abort(), document.hidden || T();
     }
     a || document.addEventListener("visibilitychange", w);
     let F = ie, E = 0;
     function S() {
-      document.removeEventListener("visibilitychange", w), window.clearTimeout(E), y.abort();
+      document.removeEventListener("visibilitychange", w), window.clearTimeout(E), m.abort();
     }
     r == null || r.addEventListener("abort", () => {
-      S(), m();
+      S(), g();
     });
     const q = d ?? window.fetch, P = s ?? ce;
     async function T() {
       var C;
-      y = new AbortController();
+      m = new AbortController();
       try {
-        const O = await q(o, Object.assign(Object.assign({}, g), { headers: p, signal: y.signal }));
+        const O = await q(o, Object.assign(Object.assign({}, b), { headers: p, signal: m.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(), m();
+        }, v))), c == null || c(), S(), g();
       } catch (O) {
-        if (!y.signal.aborted)
+        if (!m.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);
@@ -146,18 +146,18 @@ const de = 3 * 60 * 1e3, $ = (o) => {
 }, Ee = () => {
   const { token: o, config: t } = ee(), [r, n] = N(""), [s, v] = N([]), [c, u] = N(!1), a = K(null), {
     inboundResults: d,
-    outboundResults: g,
-    setInboundResults: m,
+    outboundResults: b,
+    setInboundResults: g,
     setOutboundResults: _,
     partialOfferRequestId: p,
-    setPartialOfferRequestId: y
+    setPartialOfferRequestId: m
   } = Z(), w = ({
     data: e,
     previousResults: l,
     inbound: f
   }) => {
     const i = V(e, l);
-    return (f ? m : _)(G(i)), i;
+    return (f ? g : _)(G(i)), i;
   }, {
     mutate: F,
     status: E,
@@ -202,7 +202,7 @@ const de = 3 * 60 * 1e3, $ = (o) => {
         console.log("oh lol, it didn't work");
         return;
       }
-      w({ data: f }), i && y(i);
+      w({ data: f }), i && m(i);
     },
     onError: (e) => {
       console.error("Error in outbound flight search:", e);
@@ -277,19 +277,19 @@ const de = 3 * 60 * 1e3, $ = (o) => {
       signal: j.signal,
       onmessage(A) {
         try {
-          const b = W(JSON.parse(A.data));
-          if (b.success === !1)
+          const y = W(JSON.parse(A.data));
+          if (y.success === !1)
             return;
-          if (b.close === !0) {
+          if (y.close === !0) {
             R();
             return;
           }
-          b.flights && (console.log({ parsed: b.flights }), I = 0, i = w({
-            data: b.flights,
+          y.flights && (I = 0, i = w({
+            data: y.flights,
             previousResults: i
-          })), b.ping && (I++, I >= t.flightsConfig.streamTimeoutPingCount && R());
-        } catch (b) {
-          console.error("Error parsing message:", b), R();
+          })), y.ping && (I++, I >= t.flightsConfig.streamTimeoutPingCount && R());
+        } catch (y) {
+          console.error("Error parsing message:", y), R();
         }
       },
       onerror(A) {
@@ -320,7 +320,7 @@ const de = 3 * 60 * 1e3, $ = (o) => {
     inboundError: T,
     roundTripFaresError: h,
     // Results
-    outboundResults: g,
+    outboundResults: b,
     inboundResults: d,
     roundTripFares: s,
     // Mutation triggers

package/dist/utils/flightUtils.js

@@ -5,7 +5,7 @@ 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;
+  var r, t, a, n, i, o, m, h, g, M, P, N, A, L, w, d, p, c, y, C, b, l, u, D, k, O, z, f, v, _, $, Z, E, G;
   return {
     id: e.id,
     points: (e == null ? void 0 : e.points) >= 0 ? e.points : -1,
@@ -13,18 +13,18 @@ const B = (s) => s == null ? void 0 : s.map((e) => {
     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),
+      airportCode: ((m = e.slices[0].segments[0].origin) == null ? void 0 : m.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),
+      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 = (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),
+      airportCode: ((k = (D = e.slices[0].segments.getLast()) == null ? void 0 : D.destination) == null ? void 0 : k.iataCityCode) || ((f = (z = (O = e.slices[0].segments.getLast()) == null ? void 0 : O.destination) == null ? void 0 : z.city) == null ? void 0 : f.iataCode),
       coordinates: {
-        latitude: ($ = (_ = (f = e.slices[0].segments.getLast()) == null ? void 0 : f.destination) == null ? void 0 : _.city) == null ? void 0 : $.latitude,
+        latitude: ($ = (_ = (v = e.slices[0].segments.getLast()) == null ? void 0 : v.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
       }
     },
@@ -56,7 +56,7 @@ const B = (s) => s == null ? void 0 : s.map((e) => {
     return B(s);
   const r = [...e], t = [], a = {};
   for (const i of s) {
-    const o = i.slices[0].segments, m = o[0], w = {
+    const o = i.slices[0].segments, m = o[0], h = {
       iataCode: m.operatingCarrier.iataCode,
       flightNumber: T(
         m.operatingCarrierFlightNumber
@@ -66,7 +66,7 @@ const B = (s) => s == null ? void 0 : s.map((e) => {
       flightNumber: T(
         m.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 = 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(
@@ -76,9 +76,9 @@ const B = (s) => s == null ? void 0 : s.map((e) => {
       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 (h.length) {
-      i.slices[0].comparisonKey = h[0].awayzGroupId;
-      const d = h.find((p) => {
+    if (w.length) {
+      i.slices[0].comparisonKey = w[0].awayzGroupId;
+      const d = w.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
@@ -228,7 +228,7 @@ const B = (s) => s == null ? void 0 : s.map((e) => {
     displayProgram: s,
     id: s
   }), r;
-}, U = (s) => (console.log({ flight: s }), {
+}, U = (s) => ({
   id: s.id,
   cash: s.cash,
   points: s.points,

package/package.json

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