@ancon/wildcat-utils 1.44.0-r13-2-tz.69 → 1.44.0-r13-2-tz.71

package/date/isDSTShiftPresentInOnDate.js

@@ -1 +1 @@
-"use strict";const s=require("moment"),o=require("./getTimezoneUtcOffsetDifference.js");function c(e){const t=s(e),n=t.clone().startOf("day"),f=t.clone().endOf("day");return!!o(n,f)}module.exports=c;
+"use strict";const s=require("moment"),f=require("./getTimezoneUtcOffsetDifference.js");function r(o){const t=s(o);console.log("isDSTShiftPresentInOnDate - dateMoment",t.format());const e=t.clone().startOf("day"),n=t.clone().endOf("day");return console.log("isDSTShiftPresentInOnDate s, e",e.format(),n.format()),!!f(e,n)}module.exports=r;

package/date/isDSTShiftPresentInOnDate.mjs

@@ -1,9 +1,15 @@
-import o from "moment";
+import f from "moment";
 import s from "./getTimezoneUtcOffsetDifference.mjs";
-function i(e) {
-  const t = o(e), n = t.clone().startOf("day"), f = t.clone().endOf("day");
-  return !!s(n, f);
+function c(o) {
+  const t = f(o);
+  console.log("isDSTShiftPresentInOnDate - dateMoment", t.format());
+  const e = t.clone().startOf("day"), n = t.clone().endOf("day");
+  return console.log(
+    "isDSTShiftPresentInOnDate s, e",
+    e.format(),
+    n.format()
+  ), !!s(e, n);
 }
 export {
-  i as default
+  c as default
 };

package/outlet/getOutletPickerTimesForDay.js

@@ -1 +1 @@
-"use strict";const D=require("@ancon/wildcat-types"),m=require("moment"),O=require("../date/isDSTShiftPresentInRange.js"),x=require("../date/isDSTShiftPresentInOnDate.js"),I=require("../date/getTimezoneUtcOffsetDifference.js"),_=require("./getPickerIntervalsForDay.js"),R=require("./getSettingsForOrderFormat.js"),M=require("./getServiceIntervalStart.js"),h=require("./types.js"),b=require("./generatePickerTimesForDay.js"),z=require("./getServiceIntervalEnd.js"),E=require("./getOutletNextReadyToOrderTime.js");require("../shared/constants.js");require("../date/createLocalTimezoneMoment.js");require("./getServiceIntervalsForOrderFormat.js");require("../time/getTimeSpanParts.js");require("./getNextTenthMinute.js");require("./getServiceIntervalTimeSpanMoment.js");require("./hoursAndMinutesToMinutes.js");require("../date/convertToSpecificTimezone.js");require("./isOutletAcceptingPreOrders.js");require("./getOutletTagInformation.js");require("./constants.js");require("./getOutletCurrentActiveOperatingHour.js");require("./getTimezoneAdjustedServiceInterval.js");require("./searchNextOpeningMoment.js");require("./getOutletNextServiceTimeOffset.js");function L(s,g,S,k){const{preparationTime:p="00:00:00"}=R(g,s==null?void 0:s.orderFormatSettings)??{},o=E(s,g);console.log("nextReadyOrderTime",o.format());let u=o.clone();const l=m(S);if(console.log("specificDateMoment",l.format()),l>o)u=o.clone().set({year:l.year(),month:l.month(),date:l.date()}),console.log("specificDateMoment > nextReadyOrderTime",u.format());else{const t=o.diff(l,"day");if(console.log("ELSE specificDateMoment > nextReadyOrderTime",t),t>0)return[]}let e=[];const v=_(u,s==null?void 0:s.serviceDateTimes,g);let q;v.forEach(t=>{!q&&t.type&&(e=[]);const i=M(u,t,p),d=z(u,t,p);console.log("intervalStartTime, intervalEndTime",i.format(),d.format()),i<o&&(console.log("Add the time that has already passed today"),i.add(o.valueOf()-i.valueOf(),"millisecond"));const n=b(i,d,e,void 0,k);if(n.length>0)switch(t.state){case D.IntervalState.Closed:{const a=n[0],f=n[n.length-1];e=e.filter(({timestamp:c})=>c<a.timestamp||c>f.timestamp);break}case D.IntervalState.Opened:default:{let a=n;const f=O(i,d);console.log("isDSTShiftInterval",f),f&&(a=n.filter(c=>{const r=m(c.timestamp).utc(!0),T=m(i).utc(!0);return console.log("=>",r.format(),T.format()),r.isSameOrAfter(T)})),e=e.concat(a);break}}q=t.type});const y=x(S);if(console.log("isDSTDay",y),e.length){const t=e[0],i=e[e.length-1];if(O(t.timestamp,i.timestamp)||y){const n=Math.max(m(t.timestamp).utcOffset(),m(i.timestamp).utcOffset()),a=e.map(r=>r.timeLabel),f=a.filter((r,T)=>a.indexOf(r)!==T),c=!!I(e[0].timestamp,m());return console.log(c),e.map(r=>{if(f.includes(r.timeLabel)||c){const P=m(r.timestamp).utcOffset()===n?h.PickerTimeTimezoneTag.Summer:h.PickerTimeTimezoneTag.Standard;return{...r,timezoneTag:P}}return r})}}return e}module.exports=L;
+"use strict";const y=require("@ancon/wildcat-types"),c=require("moment"),D=require("../date/isDSTShiftPresentInRange.js"),x=require("../date/isDSTShiftPresentInOnDate.js"),_=require("../date/getTimezoneUtcOffsetDifference.js"),I=require("./getPickerIntervalsForDay.js"),M=require("./getSettingsForOrderFormat.js"),R=require("./getServiceIntervalStart.js"),O=require("./types.js"),b=require("./generatePickerTimesForDay.js"),z=require("./getServiceIntervalEnd.js"),E=require("./getOutletNextReadyToOrderTime.js");require("../shared/constants.js");require("../date/createLocalTimezoneMoment.js");require("./getServiceIntervalsForOrderFormat.js");require("../time/getTimeSpanParts.js");require("./getNextTenthMinute.js");require("./getServiceIntervalTimeSpanMoment.js");require("./hoursAndMinutesToMinutes.js");require("../date/convertToSpecificTimezone.js");require("./isOutletAcceptingPreOrders.js");require("./getOutletTagInformation.js");require("./constants.js");require("./getOutletCurrentActiveOperatingHour.js");require("./getTimezoneAdjustedServiceInterval.js");require("./searchNextOpeningMoment.js");require("./getOutletNextServiceTimeOffset.js");function L(s,p,h,k){const{preparationTime:g="00:00:00"}=M(p,s==null?void 0:s.orderFormatSettings)??{},o=E(s,p);console.log("nextReadyOrderTime",o.format());let u=o.clone();const m=c(h);if(console.log("specificDateMoment",m.format()),m>o)u=o.clone().set({year:m.year(),month:m.month(),date:m.date()}),console.log("specificDateMoment > nextReadyOrderTime",u.format());else{const t=o.diff(m,"day");if(console.log("ELSE specificDateMoment > nextReadyOrderTime",t),t>0)return[]}let e=[];const v=I(u,s==null?void 0:s.serviceDateTimes,p);let q;if(v.forEach(t=>{!q&&t.type&&(e=[]);const i=R(u,t,g),d=z(u,t,g);console.log("intervalStartTime, intervalEndTime",i.format(),d.format()),i<o&&(console.log("Add the time that has already passed today"),i.add(o.valueOf()-i.valueOf(),"millisecond"));const n=b(i,d,e,void 0,k);if(n.length>0)switch(t.state){case y.IntervalState.Closed:{const l=n[0],a=n[n.length-1];e=e.filter(({timestamp:f})=>f<l.timestamp||f>a.timestamp);break}case y.IntervalState.Opened:default:{let l=n;const a=D(i,d);console.log("isDSTShiftInterval",a),a&&(l=n.filter(f=>{const T=c(f.timestamp).utc(!0),r=c(i).utc(!0);return console.log("=>",T.format(),r.format()),T.isSameOrAfter(r)})),e=e.concat(l);break}}q=t.type}),e.length){const t=e[0],i=e[e.length-1],d=D(t.timestamp,i.timestamp),n=x(t.timestamp);if(console.log("isDSTDay",n),d||n){const l=Math.max(c(t.timestamp).utcOffset(),c(i.timestamp).utcOffset()),a=e.map(r=>r.timeLabel),f=a.filter((r,S)=>a.indexOf(r)!==S),T=!!_(t.timestamp,c());return console.log(T),e.map(r=>{if(f.includes(r.timeLabel)||T){const P=c(r.timestamp).utcOffset()===l?O.PickerTimeTimezoneTag.Summer:O.PickerTimeTimezoneTag.Standard;return{...r,timezoneTag:P}}return r})}}return e}module.exports=L;

package/outlet/getOutletPickerTimesForDay.mjs

@@ -1,12 +1,12 @@
-import { IntervalState as h } from "@ancon/wildcat-types";
-import c from "moment";
-import u from "../date/isDSTShiftPresentInRange.mjs";
+import { IntervalState as O } from "@ancon/wildcat-types";
+import s from "moment";
+import h from "../date/isDSTShiftPresentInRange.mjs";
 import I from "../date/isDSTShiftPresentInOnDate.mjs";
-import R from "../date/getTimezoneUtcOffsetDifference.mjs";
-import M from "./getPickerIntervalsForDay.mjs";
+import M from "../date/getTimezoneUtcOffsetDifference.mjs";
+import R from "./getPickerIntervalsForDay.mjs";
 import b from "./getSettingsForOrderFormat.mjs";
 import E from "./getServiceIntervalStart.mjs";
-import { PickerTimeTimezoneTag as k } from "./types.mjs";
+import { PickerTimeTimezoneTag as u } from "./types.mjs";
 import z from "./generatePickerTimesForDay.mjs";
 import L from "./getServiceIntervalEnd.mjs";
 import F from "./getOutletNextReadyToOrderTime.mjs";
@@ -25,103 +25,101 @@ import "./getOutletCurrentActiveOperatingHour.mjs";
 import "./getTimezoneAdjustedServiceInterval.mjs";
 import "./searchNextOpeningMoment.mjs";
 import "./getOutletNextServiceTimeOffset.mjs";
-function ae(m, g, S, v) {
-  const { preparationTime: y = "00:00:00" } = b(g, m == null ? void 0 : m.orderFormatSettings) ?? {}, n = F(m, g);
+function ae(m, g, k, v) {
+  const { preparationTime: S = "00:00:00" } = b(g, m == null ? void 0 : m.orderFormatSettings) ?? {}, n = F(m, g);
   console.log("nextReadyOrderTime", n.format());
-  let p = n.clone();
-  const f = c(S);
-  if (console.log("specificDateMoment", f.format()), f > n)
-    p = n.clone().set({
-      year: f.year(),
-      month: f.month(),
-      date: f.date()
-    }), console.log("specificDateMoment > nextReadyOrderTime", p.format());
+  let l = n.clone();
+  const c = s(k);
+  if (console.log("specificDateMoment", c.format()), c > n)
+    l = n.clone().set({
+      year: c.year(),
+      month: c.month(),
+      date: c.date()
+    }), console.log("specificDateMoment > nextReadyOrderTime", l.format());
   else {
-    const t = n.diff(f, "day");
+    const t = n.diff(c, "day");
     if (console.log("ELSE specificDateMoment > nextReadyOrderTime", t), t > 0)
       return [];
   }
   let e = [];
-  const x = M(
-    p,
+  const x = R(
+    l,
     m == null ? void 0 : m.serviceDateTimes,
     g
   );
-  let D;
-  x.forEach((t) => {
-    !D && t.type && (e = []);
+  let y;
+  if (x.forEach((t) => {
+    !y && t.type && (e = []);
     const r = E(
-      p,
+      l,
       t,
-      y
-    ), T = L(
-      p,
+      S
+    ), d = L(
+      l,
       t,
-      y
+      S
     );
     console.log(
       "intervalStartTime, intervalEndTime",
       r.format(),
-      T.format()
+      d.format()
     ), r < n && (console.log("Add the time that has already passed today"), r.add(
       n.valueOf() - r.valueOf(),
       "millisecond"
     ));
     const o = z(
       r,
-      T,
+      d,
       e,
       void 0,
       v
     );
     if (o.length > 0)
       switch (t.state) {
-        case h.Closed: {
-          const a = o[0], l = o[o.length - 1];
+        case O.Closed: {
+          const f = o[0], a = o[o.length - 1];
           e = e.filter(
-            ({ timestamp: s }) => s < a.timestamp || s > l.timestamp
+            ({ timestamp: p }) => p < f.timestamp || p > a.timestamp
           );
           break;
         }
-        case h.Opened:
+        case O.Opened:
         default: {
-          let a = o;
-          const l = u(
+          let f = o;
+          const a = h(
             r,
-            T
+            d
           );
-          console.log("isDSTShiftInterval", l), l && (a = o.filter((s) => {
-            const i = c(s.timestamp).utc(!0), d = c(r).utc(!0);
+          console.log("isDSTShiftInterval", a), a && (f = o.filter((p) => {
+            const T = s(p.timestamp).utc(!0), i = s(r).utc(!0);
             return console.log(
               "=>",
-              i.format(),
-              d.format()
-            ), i.isSameOrAfter(d);
-          })), e = e.concat(a);
+              T.format(),
+              i.format()
+            ), T.isSameOrAfter(i);
+          })), e = e.concat(f);
           break;
         }
       }
-    D = t.type;
-  });
-  const O = I(S);
-  if (console.log("isDSTDay", O), e.length) {
-    const t = e[0], r = e[e.length - 1];
-    if (u(
+    y = t.type;
+  }), e.length) {
+    const t = e[0], r = e[e.length - 1], d = h(
       t.timestamp,
       r.timestamp
-    ) || O) {
-      const o = Math.max(
-        c(t.timestamp).utcOffset(),
-        c(r.timestamp).utcOffset()
-      ), a = e.map((i) => i.timeLabel), l = a.filter(
-        (i, d) => a.indexOf(i) !== d
-      ), s = !!R(
-        e[0].timestamp,
-        c()
+    ), o = I(t.timestamp);
+    if (console.log("isDSTDay", o), d || o) {
+      const f = Math.max(
+        s(t.timestamp).utcOffset(),
+        s(r.timestamp).utcOffset()
+      ), a = e.map((i) => i.timeLabel), p = a.filter(
+        (i, D) => a.indexOf(i) !== D
+      ), T = !!M(
+        t.timestamp,
+        s()
       );
-      return console.log(s), e.map((i) => {
-        if (l.includes(i.timeLabel) || s) {
-          const P = c(i.timestamp).utcOffset() === o ? k.Summer : k.Standard;
+      return console.log(T), e.map((i) => {
+        if (p.includes(i.timeLabel) || T) {
+          const P = s(i.timestamp).utcOffset() === f ? u.Summer : u.Standard;
           return { ...i, timezoneTag: P };
         }
         return i;

package/package.json

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