@ancon/wildcat-utils 1.40.28 → 1.40.29

package/outlet/generatePickerTimesForDay.js

@@ -1 +1 @@
-"use strict";const a=require("moment");function u(r,i,n,c=6e5,s){const l=r.valueOf(),f=i.valueOf(),m=[];for(let e=l;e<=f;e+=c){const t=s?a(e).locale(s):a(e),o=t.valueOf();n.some(d=>d.timestamp===o)||m.push({timestamp:o,timeLabel:t.format("HH:mm"),dayLabel:t.format("dddd")})}return m}module.exports=u;
+"use strict";const r=require("moment");function f(i,n,c,s=6e5,m){const l=i.valueOf(),d=n.valueOf()-s,o=[];for(let e=l;e<=d;e+=s){const t=m?r(e).locale(m):r(e),a=t.valueOf();c.some(u=>u.timestamp===a)||o.push({timestamp:a,timeLabel:t.format("HH:mm"),dayLabel:t.format("dddd")})}return o}module.exports=f;

package/outlet/generatePickerTimesForDay.mjs

@@ -1,15 +1,15 @@
-import a from "moment";
-function u(r, i, n, f = 6e5, m) {
-  const l = r.valueOf(), c = i.valueOf(), s = [];
-  for (let e = l; e <= c; e += f) {
-    const t = m ? a(e).locale(m) : a(e), o = t.valueOf();
-    n.some((d) => d.timestamp === o) || s.push({
-      timestamp: o,
+import r from "moment";
+function u(i, n, l, m = 6e5, s) {
+  const c = i.valueOf(), d = n.valueOf() - m, o = [];
+  for (let e = c; e <= d; e += m) {
+    const t = s ? r(e).locale(s) : r(e), a = t.valueOf();
+    l.some((f) => f.timestamp === a) || o.push({
+      timestamp: a,
       timeLabel: t.format("HH:mm"),
       dayLabel: t.format("dddd")
     });
   }
-  return s;
+  return o;
 }
 export {
   u as default

package/outlet/getOutletPickerTimesForDay.js

@@ -1 +1 @@
-"use strict";const f=require("@ancon/wildcat-types"),O=require("moment"),S=require("./getPickerIntervalsForDay.js"),h=require("./getSettingsForOrderFormat.js"),k=require("./getServiceIntervalStart.js"),l=require("./generatePickerTimesForDay.js"),T=require("./getServiceIntervalEnd.js"),_=require("./getOutletNextReadyToOrderTime.js");require("../shared/constants.js");require("./getServiceIntervalsForOrderFormat.js");require("./getNextTenthMinute.js");require("./hoursAndMinutesToMinutes.js");require("./isOutletAcceptingPreOrders.js");require("./getOutletTagInformation.js");require("./constants.js");require("./getOutletCurrentActiveOperatingHour.js");require("./getMomentFromDateAndTimeString.js");require("./searchNextOpeningMoment.js");function D(e,o,p,y){const{preparationTime:m="00:00:00"}=h(o,e==null?void 0:e.orderFormatSettings)??{},n=_(e,o);let s=n.clone();const a=O(p);a>n&&(s=n.clone().set({year:a.year(),month:a.month(),date:a.date()}));let r=[];const g=S(s.isoWeekday(),e==null?void 0:e.serviceDateTimes,o);let q;return g.forEach(t=>{!q&&t.type&&(r=[]);const c=k(s,t,m,e==null?void 0:e.timeZoneOffset),u=T(s,t,m,e==null?void 0:e.timeZoneOffset);c<n&&c.add(n.valueOf()-c.valueOf(),"millisecond");const i=l(c,u,r,void 0,y);i.length>0&&t.state===f.IntervalState.Closed?r=r.filter(d=>d.timestamp<i[0].timestamp||d.timestamp>i[i.length-1].timestamp):i.length>0&&t.state===f.IntervalState.Open&&(r=r.concat(i)),q=t.type}),r}module.exports=D;
+"use strict";const f=require("@ancon/wildcat-types"),O=require("moment"),S=require("./getPickerIntervalsForDay.js"),h=require("./getSettingsForOrderFormat.js"),l=require("./getServiceIntervalStart.js"),T=require("./generatePickerTimesForDay.js"),_=require("./getServiceIntervalEnd.js"),k=require("./getOutletNextReadyToOrderTime.js");require("../shared/constants.js");require("./getServiceIntervalsForOrderFormat.js");require("./getNextTenthMinute.js");require("./hoursAndMinutesToMinutes.js");require("./isOutletAcceptingPreOrders.js");require("./getOutletTagInformation.js");require("./constants.js");require("./getOutletCurrentActiveOperatingHour.js");require("./getMomentFromDateAndTimeString.js");require("./searchNextOpeningMoment.js");function D(e,o,p,y){const{preparationTime:m="00:00:00"}=h(o,e==null?void 0:e.orderFormatSettings)??{},n=k(e,o);let s=n.clone();const a=O(p);a>n&&(s=n.clone().set({year:a.year(),month:a.month(),date:a.date()}));let r=[];const g=S(s,e==null?void 0:e.serviceDateTimes,o);let q;return g.forEach(t=>{!q&&t.type&&(r=[]);const c=l(s,t,m,e==null?void 0:e.timeZoneOffset),u=_(s,t,m,e==null?void 0:e.timeZoneOffset);c<n&&c.add(n.valueOf()-c.valueOf(),"millisecond");const i=T(c,u,r,void 0,y);i.length>0&&t.state===f.IntervalState.Closed?r=r.filter(d=>d.timestamp<i[0].timestamp||d.timestamp>i[i.length-1].timestamp):i.length>0&&t.state===f.IntervalState.Open&&(r=r.concat(i)),q=t.type}),r}module.exports=D;

package/outlet/getOutletPickerTimesForDay.mjs

@@ -1,6 +1,6 @@
 import { IntervalState as d } from "@ancon/wildcat-types";
-import k from "moment";
-import S from "./getPickerIntervalsForDay.mjs";
+import S from "moment";
+import k from "./getPickerIntervalsForDay.mjs";
 import T from "./getSettingsForOrderFormat.mjs";
 import D from "./getServiceIntervalStart.mjs";
 import F from "./generatePickerTimesForDay.mjs";
@@ -16,51 +16,51 @@ import "./constants.mjs";
 import "./getOutletCurrentActiveOperatingHour.mjs";
 import "./getMomentFromDateAndTimeString.mjs";
 import "./searchNextOpeningMoment.mjs";
-function J(e, p, y, g) {
-  const { preparationTime: s = "00:00:00" } = T(p, e == null ? void 0 : e.orderFormatSettings) ?? {}, m = P(e, p);
-  let o = m.clone();
-  const n = k(y);
-  n > m && (o = m.clone().set({
-    year: n.year(),
-    month: n.month(),
-    date: n.date()
+function K(r, a, g, y) {
+  const { preparationTime: s = "00:00:00" } = T(a, r == null ? void 0 : r.orderFormatSettings) ?? {}, m = P(r, a);
+  let n = m.clone();
+  const o = S(g);
+  o > m && (n = m.clone().set({
+    year: o.year(),
+    month: o.month(),
+    date: o.date()
   }));
-  let r = [];
-  const O = S(
-    o.isoWeekday(),
-    e == null ? void 0 : e.serviceDateTimes,
-    p
+  let e = [];
+  const O = k(
+    n,
+    r == null ? void 0 : r.serviceDateTimes,
+    a
   );
   let f;
   return O.forEach((i) => {
-    !f && i.type && (r = []);
-    const a = D(
-      o,
+    !f && i.type && (e = []);
+    const p = D(
+      n,
       i,
       s,
-      e == null ? void 0 : e.timeZoneOffset
+      r == null ? void 0 : r.timeZoneOffset
     ), h = x(
-      o,
+      n,
       i,
       s,
-      e == null ? void 0 : e.timeZoneOffset
+      r == null ? void 0 : r.timeZoneOffset
     );
-    a < m && a.add(
-      m.valueOf() - a.valueOf(),
+    p < m && p.add(
+      m.valueOf() - p.valueOf(),
       "millisecond"
     );
     const t = F(
-      a,
+      p,
       h,
-      r,
+      e,
       void 0,
-      g
+      y
     );
-    t.length > 0 && i.state === d.Closed ? r = r.filter(
+    t.length > 0 && i.state === d.Closed ? e = e.filter(
       (c) => c.timestamp < t[0].timestamp || c.timestamp > t[t.length - 1].timestamp
-    ) : t.length > 0 && i.state === d.Open && (r = r.concat(t)), f = i.type;
-  }), r;
+    ) : t.length > 0 && i.state === d.Open && (e = e.concat(t)), f = i.type;
+  }), e;
 }
 export {
-  J as default
+  K as default
 };

package/outlet/getPickerIntervalsForDay.d.ts

@@ -1,4 +1,5 @@
 import { OrderFormat, ServiceDateTime, ServiceDateTimeInterval } from '@ancon/wildcat-types';
+import { Moment } from 'moment';
 /**
  * Returns the intervals for the specified weekday index (0-6) and order format (optional)
  *
@@ -7,4 +8,4 @@ import { OrderFormat, ServiceDateTime, ServiceDateTimeInterval } from '@ancon/wi
  * @param orderFormat
  * @returns
  */
-export default function getPickerIntervalsForDay(weekdayIndex: number, serviceDateTimes: ServiceDateTime[], orderFormat?: OrderFormat): ServiceDateTimeInterval[];
+export default function getPickerIntervalsForDay(date: Moment, serviceDateTimes: ServiceDateTime[], orderFormat?: OrderFormat): ServiceDateTimeInterval[];

package/outlet/getPickerIntervalsForDay.js

@@ -1 +1 @@
-"use strict";const f=require("@ancon/wildcat-types"),o=require("moment"),d=require("../shared/constants.js"),m=require("./getServiceIntervalsForOrderFormat.js");function p(t,i,n){return m(n,i).reduce((e,r)=>{const u=r.dayOfWeek===f.DayOfWeek.Everyday,a=!!r.type;if(u){if(a){const s=o(r.fromDate),y=o().isoWeekday(t);return s.isSame(y,"isoWeek")&&t===s.isoWeekday()&&e.push(r),e}return e.push(r),e}return r.dayOfWeek===d.DaysOfWeekMap[t]&&e.push(r),e},[])}module.exports=p;
+"use strict";const f=require("@ancon/wildcat-types"),s=require("moment"),D=require("../shared/constants.js"),c=require("./getServiceIntervalsForOrderFormat.js");function p(r,o,n){return c(n,o).reduce((t,e)=>{const a=e.dayOfWeek===f.DayOfWeek.Everyday,i=!!e.type,u=r.isoWeekday();if(a){if(i){const y=s(e.fromDate),d=s(e.toDate);return r.isBetween(y,d,"day","[]")&&t.push(e),t}return t.push(e),t}return e.dayOfWeek===D.DaysOfWeekMap[u]&&t.push(e),t},[])}module.exports=p;

package/outlet/getPickerIntervalsForDay.mjs

@@ -1,26 +1,26 @@
-import { DayOfWeek as p } from "@ancon/wildcat-types";
-import s from "moment";
-import { DaysOfWeekMap as u } from "../shared/constants.mjs";
-import y from "./getServiceIntervalsForOrderFormat.mjs";
-function D(o, f, m) {
-  return y(
-    m,
-    f
+import { DayOfWeek as d } from "@ancon/wildcat-types";
+import o from "moment";
+import { DaysOfWeekMap as p } from "../shared/constants.mjs";
+import u from "./getServiceIntervalsForOrderFormat.mjs";
+function w(t, s, n) {
+  return u(
+    n,
+    s
   ).reduce(
     (r, e) => {
-      const i = e.dayOfWeek === p.Everyday, a = !!e.type;
-      if (i) {
-        if (a) {
-          const t = s(e.fromDate), n = s().isoWeekday(o);
-          return t.isSame(n, "isoWeek") && o === t.isoWeekday() && r.push(e), r;
+      const a = e.dayOfWeek === d.Everyday, f = !!e.type, m = t.isoWeekday();
+      if (a) {
+        if (f) {
+          const i = o(e.fromDate), y = o(e.toDate);
+          return t.isBetween(i, y, "day", "[]") && r.push(e), r;
         }
         return r.push(e), r;
       }
-      return e.dayOfWeek === u[o] && r.push(e), r;
+      return e.dayOfWeek === p[m] && r.push(e), r;
     },
     []
   );
 }
 export {
-  D as default
+  w as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ancon/wildcat-utils",
-  "version": "1.40.28",
+  "version": "1.40.29",
   "private": false,
   "main": "index.js",
   "module": "index.mjs",