@ancon/wildcat-utils 1.44.0-r13-2-tz.52 → 1.44.0-r13-2-tz.54

package/outlet/getOutletPickerTimesForDay.js

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

package/outlet/getOutletPickerTimesForDay.mjs

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

package/outlet/types.d.ts

@@ -32,7 +32,7 @@ export declare type PickerTime = {
     timestamp: number;
     timeLabel: string;
     dayLabel: string;
-    /** This is available if the picker time is in an interval that has a DST shift */
+    /** This is available for time label duplicated picker times in an interval that has a DST shift */
     timezoneTag?: PickerTimeTimezoneTag;
 };
 export declare type PickerDay = PickerTime[];

package/package.json

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