@ancon/wildcat-utils 1.44.0-r13-2-tz.21 → 1.44.0-r13-2-tz.22

package/outlet/searchNextOpeningMoment.js

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

package/outlet/searchNextOpeningMoment.mjs

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

package/package.json

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