@ancon/wildcat-utils 1.44.0-r13-2-tz.9 → 1.44.0-r13-2-tz.11

package/outlet/searchNextOpeningMoment.js

@@ -1 +1 @@
-"use strict";const m=require("moment"),y=require("@ancon/wildcat-types"),O=require("../time/getTimeSpanParts.js"),c=require("./constants.js"),a=require("./getServiceIntervalTimeSpanMoment.js");function p(i,e){const t=i.clone().date()-e.date();return t!==0?i.subtract(t,"day"):i}function d(i){let e=null;const{intervals:n,exception:t}=i;if(t){const{state:r}=t;r||(e=t)}else{const r=n.sort((o,s)=>O(o.from).hours-O(s.from).hours),[l]=r;return l}return e}function g(i,e,n){var r,l;const t=[];if(e.exception){if(e.exception.state===y.IntervalState.Opened){const o=a(i,e.exception.from);n.isBefore(o)&&t.push({interval:e.exception,moment:o})}}else for(let o=0;o<e.intervals.length;o+=1){const s=e.intervals[o],u=a(i,s.from);n.isBefore(u)&&t.push({interval:s,moment:u})}return t.length<2?((r=t[0])==null?void 0:r.interval)??null:((l=t.sort((o,s)=>o.moment-n-(s.moment-n))[0])==null?void 0:l.interval)??null}function h(i,e){let n=null;const t=m(e).format(c.OutletMapKeyFormatter),r=g(t,i[t],e);if(r&&(n=a(t,r.from)),!n)for(let l=1;l<c.OutletTimelineDayCount;l+=1){const o=m(e).add(l,"d"),s=o.format(c.OutletMapKeyFormatter),u=i[s],f=d(u);if(f){n=a(s,f.from),n=p(n,o);break}}return n}module.exports=h;
+"use strict";const m=require("moment"),y=require("@ancon/wildcat-types"),O=require("../time/getTimeSpanParts.js"),a=require("./constants.js"),u=require("./getServiceIntervalTimeSpanMoment.js");function g(r,e){const t=r.clone().date()-e.date();return t!==0?r.subtract(t,"day"):r}function p(r){let e=null;const{intervals:n,exception:t}=r;if(t){const{state:i}=t;i||(e=t)}else{const i=n.sort((o,s)=>O(o.from).hours-O(s.from).hours),[l]=i;return l}return e}function d(r,e,n){var i,l;const t=[];if(e.exception){if(e.exception.state===y.IntervalState.Opened){const o=u(r,e.exception.from);n.clone().utc(!0).isBefore(o.clone().utc(!0))&&t.push({interval:e.exception,moment:o})}}else for(let o=0;o<e.intervals.length;o+=1){const s=e.intervals[o],c=u(r,s.from);console.log("relevantMoment",n.format()),console.log("openingMoment",c.format()),n.clone().utc(!0).isBefore(c.clone().utc(!0))&&t.push({interval:s,moment:c})}return t.length<2?((i=t[0])==null?void 0:i.interval)??null:((l=t.sort((o,s)=>o.moment-n-(s.moment-n))[0])==null?void 0:l.interval)??null}function h(r,e){let n=null;const t=m(e).format(a.OutletMapKeyFormatter),i=d(t,r[t],e);if(i&&(n=u(t,i.from)),!n)for(let l=1;l<a.OutletTimelineDayCount;l+=1){const o=m(e).add(l,"d"),s=o.format(a.OutletMapKeyFormatter),c=r[s],f=p(c);if(f){n=u(s,f.from),n=g(n,o);break}}return n}module.exports=h;

package/outlet/searchNextOpeningMoment.mjs

@@ -1,71 +1,71 @@
-import u from "moment";
+import a from "moment";
 import { IntervalState as p } from "@ancon/wildcat-types";
-import c from "../time/getTimeSpanParts.mjs";
-import { OutletMapKeyFormatter as O, OutletTimelineDayCount as y } from "./constants.mjs";
-import a from "./getServiceIntervalTimeSpanMoment.mjs";
-function d(i, e) {
-  const t = i.clone().date() - e.date();
-  return t !== 0 ? i.subtract(t, "day") : i;
+import m from "../time/getTimeSpanParts.mjs";
+import { OutletMapKeyFormatter as O, OutletTimelineDayCount as g } from "./constants.mjs";
+import c from "./getServiceIntervalTimeSpanMoment.mjs";
+function y(r, e) {
+  const t = r.clone().date() - e.date();
+  return t !== 0 ? r.subtract(t, "day") : r;
 }
-function g(i) {
+function d(r) {
   let e = null;
-  const { intervals: n, exception: t } = i;
+  const { intervals: n, exception: t } = r;
   if (t) {
-    const { state: r } = t;
-    r || (e = t);
+    const { state: i } = t;
+    i || (e = t);
   } else {
-    const r = n.sort(
-      (o, l) => c(o.from).hours - c(l.from).hours
-    ), [s] = r;
+    const i = n.sort(
+      (o, l) => m(o.from).hours - m(l.from).hours
+    ), [s] = i;
     return s;
   }
   return e;
 }
-function h(i, e, n) {
-  var r, s;
+function h(r, e, n) {
+  var i, s;
   const t = [];
   if (e.exception) {
     if (e.exception.state === p.Opened) {
-      const o = a(
-        i,
+      const o = c(
+        r,
         e.exception.from
       );
-      n.isBefore(o) && t.push({
+      n.clone().utc(!0).isBefore(o.clone().utc(!0)) && t.push({
         interval: e.exception,
         moment: o
       });
     }
   } else
     for (let o = 0; o < e.intervals.length; o += 1) {
-      const l = e.intervals[o], f = a(
-        i,
+      const l = e.intervals[o], f = c(
+        r,
         l.from
       );
-      n.isBefore(f) && t.push({ interval: l, moment: f });
+      console.log("relevantMoment", n.format()), console.log("openingMoment", f.format()), n.clone().utc(!0).isBefore(f.clone().utc(!0)) && t.push({ interval: l, moment: f });
     }
-  return t.length < 2 ? ((r = t[0]) == null ? void 0 : r.interval) ?? null : ((s = t.sort(
+  return t.length < 2 ? ((i = t[0]) == null ? void 0 : i.interval) ?? null : ((s = t.sort(
     // @ts-ignore TODO
     (o, l) => o.moment - n - (l.moment - n)
   )[0]) == null ? void 0 : s.interval) ?? null;
 }
-function S(i, e) {
+function S(r, e) {
   let n = null;
-  const t = u(e).format(O), r = h(
+  const t = a(e).format(O), i = h(
     t,
-    i[t],
+    r[t],
     e
   );
-  if (r && (n = a(
+  if (i && (n = c(
     t,
-    r.from
+    i.from
   )), !n)
-    for (let s = 1; s < y; s += 1) {
-      const o = u(e).add(s, "d"), l = o.format(O), f = i[l], m = g(f);
-      if (m) {
-        n = a(
+    for (let s = 1; s < g; s += 1) {
+      const o = a(e).add(s, "d"), l = o.format(O), f = r[l], u = d(f);
+      if (u) {
+        n = c(
           l,
-          m.from
-        ), n = d(n, o);
+          u.from
+        ), n = y(n, o);
         break;
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ancon/wildcat-utils",
-  "version": "1.44.0-r13-2-tz.9",
+  "version": "1.44.0-r13-2-tz.11",
   "private": false,
   "main": "index.js",
   "module": "index.mjs",