@ancon/wildcat-utils 1.40.27 → 1.40.29

package/hangfire/createHangfirePoller.d.ts

@@ -28,6 +28,7 @@ declare class HangfirePoller {
     constructor(options?: Partial<HangfirePollerConfig>);
     private stopTimer;
     private startTimer;
+    private waitForNetworkOnline;
     private executeWorkerRequest;
     private deleteWorker;
     createWorker(groupId: string, { workerId, url, headers, }: {

package/hangfire/createHangfirePoller.js

@@ -1 +1 @@
-"use strict";var f=Object.defineProperty;var p=(i,e,r)=>e in i?f(i,e,{enumerable:!0,configurable:!0,writable:!0,value:r}):i[e]=r;var o=(i,e,r)=>(p(i,typeof e!="symbol"?e+"":e,r),r);Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const b=require("axios"),n=require("@ancon/wildcat-types"),u=require("../error/createCodedError.js"),m=require("../api/isNoContentResponse.js");class g{constructor(e){o(this,"busyWorkers",new Set);o(this,"enabledGroups",new Set);o(this,"groups",new Map);o(this,"workerByIdMap",new Map);o(this,"timer",null);o(this,"config",{maxGroupsSize:50,maxWorkersSize:20,getIsNetworkOnline(){return!0},async getRequestHeaders(){return{}},debug(...e){console.log(...e)}});this.config={...this.config,...e??null}}stopTimer(){this.timer!=null&&(this.config.debug("*stop timer*"),clearInterval(this.timer),this.timer=null)}startTimer(){if(this.timer!=null)throw u(new Error("Timer already started"),n.ErrorCode.GenericUnexpectedHangfireError);this.config.debug("*start timer*"),this.timer=setInterval(()=>{this.config.debug("*tick*",{busyWorkers:this.busyWorkers.size,enabledGroups:this.enabledGroups.size,groups:this.groups}),this.enabledGroups.forEach(e=>{const r=this.groups.get(e);r&&r.forEach(s=>this.executeWorkerRequest(s))}),this.groups.size<1&&this.stopTimer()},5e3)}async executeWorkerRequest(e,r=!1){const s=this.config.getIsNetworkOnline();!(r!==!0&&this.busyWorkers.has(e.workerId))&&s&&(this.busyWorkers.add(e.workerId),b({url:e.url,method:"get",headers:{...await this.config.getRequestHeaders(),...e.headers}}).then(t=>{t&&!m(t)?(e.resolve(t),this.deleteWorker(e.groupId,e.workerId)):this.busyWorkers.delete(e.workerId)}).catch(t=>{e.reject(t),this.deleteWorker(e.groupId,e.workerId)}))}deleteWorker(e,r){const s=this.groups.get(e);s&&(this.config.debug("*delete worker*",s.size,s),s.delete(r),this.workerByIdMap.delete(r),this.busyWorkers.delete(r),s.size<1&&(this.groups.delete(e),this.enabledGroups.delete(e),this.enabledGroups.size<1&&this.stopTimer()))}createWorker(e,{workerId:r,url:s,headers:h}){if(!this.groups.has(e)){if(this.groups.size>=this.config.maxGroupsSize){const a=u(new Error("Max number of Hangfire groups exceeded"),n.ErrorCode.GenericUnexpectedHangfireError,{count:this.groups.size});throw this.destroy(),a}this.groups.set(e,new Map)}const t=this.groups.get(e);return new Promise((a,l)=>{if(t.has(r))throw u(new Error("Duplicate Hangfire worker ID"),n.ErrorCode.GenericUnexpectedHangfireError);if(t.size>=this.config.maxWorkersSize){const c=u(new Error("Max number of Hangfire workers in group exceeded"),n.ErrorCode.GenericUnexpectedHangfireError,{groupId:e,count:t.size});throw l(c),this.destroy(),c}const d={workerId:r,groupId:e,url:s,resolve:a,reject:l,headers:h};t.set(r,d),this.workerByIdMap.set(r,d),this.enabledGroups.has(e)||this.enabledGroups.add(e),this.timer==null&&this.enabledGroups.size>0&&this.startTimer()})}triggerWorker(e){this.config.debug("*triggerWorker*");const r=this.workerByIdMap.get(e);r&&this.executeWorkerRequest(r,!0)}enableWorkers(e){this.config.debug("*enable*",e),this.enabledGroups.add(e),this.groups.has(e)&&this.timer==null&&this.startTimer()}disableWorkers(e){this.config.debug("*disable*",e),this.enabledGroups.delete(e),this.enabledGroups.size<1&&this.stopTimer()}destroy(){this.config.debug("*destroy*"),this.groups.clear(),this.stopTimer()}}function k(i){return new g(i)}exports.HangfirePoller=g;exports.default=k;
+"use strict";var f=Object.defineProperty;var p=(s,e,r)=>e in s?f(s,e,{enumerable:!0,configurable:!0,writable:!0,value:r}):s[e]=r;var o=(s,e,r)=>(p(s,typeof e!="symbol"?e+"":e,r),r);Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const b=require("axios"),u=require("@ancon/wildcat-types"),a=require("../error/createCodedError.js"),k=require("../api/isNoContentResponse.js"),w=require("../shared/wait.js");class g{constructor(e){o(this,"busyWorkers",new Set);o(this,"enabledGroups",new Set);o(this,"groups",new Map);o(this,"workerByIdMap",new Map);o(this,"timer",null);o(this,"config",{maxGroupsSize:50,maxWorkersSize:20,getIsNetworkOnline(){return!0},async getRequestHeaders(){return{}},debug(...e){console.log(...e)}});this.config={...this.config,...e??null}}stopTimer(){this.timer!=null&&(this.config.debug("*stop timer*"),clearInterval(this.timer),this.timer=null)}startTimer(){if(this.timer!=null)throw a(new Error("Timer already started"),u.ErrorCode.GenericUnexpectedHangfireError);this.config.debug("*start timer*"),this.timer=setInterval(()=>{this.config.debug("*tick*",{busyWorkers:this.busyWorkers.size,enabledGroups:this.enabledGroups.size,groups:this.groups}),this.enabledGroups.forEach(e=>{const r=this.groups.get(e);r&&r.forEach(t=>this.executeWorkerRequest(t))}),this.groups.size<1&&this.stopTimer()},5e3)}async waitForNetworkOnline(e=5){let r=0;for(;!this.config.getIsNetworkOnline()&&r<e+1;)r+=1,await w(1e3)}async executeWorkerRequest(e,r=!1){const t=r!==!0&&this.busyWorkers.has(e.workerId);this.config.debug("*executeWorkerRequest*",{workerId:e.workerId,isBusy:t,force:r}),t?this.config.debug("*executeWorkerRequest* worker is busy",e.workerId):(this.busyWorkers.add(e.workerId),await this.waitForNetworkOnline(),this.config.debug("*executeWorkerRequest* request",{isNetworkOnline:this.config.getIsNetworkOnline()}),b({url:e.url,method:"get",headers:{...await this.config.getRequestHeaders(),...e.headers}}).then(i=>{i&&!k(i)?(e.resolve(i),this.deleteWorker(e.groupId,e.workerId)):this.busyWorkers.delete(e.workerId)}).catch(i=>{e.reject(i),this.deleteWorker(e.groupId,e.workerId)}))}deleteWorker(e,r){const t=this.groups.get(e);t&&(this.config.debug("*delete worker*",t.size,t),t.delete(r),this.workerByIdMap.delete(r),this.busyWorkers.delete(r),t.size<1&&(this.groups.delete(e),this.enabledGroups.delete(e),this.enabledGroups.size<1&&this.stopTimer()))}createWorker(e,{workerId:r,url:t,headers:i}){if(!this.groups.has(e)){if(this.groups.size>=this.config.maxGroupsSize){const h=a(new Error("Max number of Hangfire groups exceeded"),u.ErrorCode.GenericUnexpectedHangfireError,{count:this.groups.size});throw this.destroy(),h}this.groups.set(e,new Map)}const n=this.groups.get(e);return new Promise((h,l)=>{if(n.has(r))throw a(new Error("Duplicate Hangfire worker ID"),u.ErrorCode.GenericUnexpectedHangfireError);if(n.size>=this.config.maxWorkersSize){const c=a(new Error("Max number of Hangfire workers in group exceeded"),u.ErrorCode.GenericUnexpectedHangfireError,{groupId:e,count:n.size});throw l(c),this.destroy(),c}const d={workerId:r,groupId:e,url:t,resolve:h,reject:l,headers:i};n.set(r,d),this.workerByIdMap.set(r,d),this.enabledGroups.has(e)||this.enabledGroups.add(e),this.timer==null&&this.enabledGroups.size>0&&this.startTimer()})}triggerWorker(e){this.config.debug("*triggerWorker*");const r=this.workerByIdMap.get(e);r?this.executeWorkerRequest(r,!0):this.config.debug("*triggerWorker* worker not found",e)}enableWorkers(e){this.config.debug("*enable*",e),this.enabledGroups.add(e),this.groups.has(e)&&this.timer==null&&this.startTimer()}disableWorkers(e){this.config.debug("*disable*",e),this.enabledGroups.delete(e),this.enabledGroups.size<1&&this.stopTimer()}destroy(){this.config.debug("*destroy*"),this.groups.clear(),this.stopTimer()}}function m(s){return new g(s)}exports.HangfirePoller=g;exports.default=m;

package/hangfire/createHangfirePoller.mjs

@@ -1,11 +1,12 @@
-var g = Object.defineProperty;
-var f = (i, e, r) => e in i ? g(i, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : i[e] = r;
-var o = (i, e, r) => (f(i, typeof e != "symbol" ? e + "" : e, r), r);
+var c = Object.defineProperty;
+var f = (s, e, r) => e in s ? c(s, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : s[e] = r;
+var o = (s, e, r) => (f(s, typeof e != "symbol" ? e + "" : e, r), r);
 import p from "axios";
-import { ErrorCode as n } from "@ancon/wildcat-types";
+import { ErrorCode as a } from "@ancon/wildcat-types";
 import h from "../error/createCodedError.mjs";
-import m from "../api/isNoContentResponse.mjs";
-class b {
+import b from "../api/isNoContentResponse.mjs";
+import m from "../shared/wait.mjs";
+class k {
   constructor(e) {
     /** Workers currently executing a request */
     o(this, "busyWorkers", /* @__PURE__ */ new Set());
@@ -41,7 +42,7 @@ class b {
     if (this.timer != null)
       throw h(
         new Error("Timer already started"),
-        n.GenericUnexpectedHangfireError
+        a.GenericUnexpectedHangfireError
       );
     this.config.debug("*start timer*"), this.timer = setInterval(() => {
       this.config.debug("*tick*", {
@@ -50,76 +51,90 @@ class b {
         groups: this.groups
       }), this.enabledGroups.forEach((e) => {
         const r = this.groups.get(e);
-        r && r.forEach((s) => this.executeWorkerRequest(s));
+        r && r.forEach((t) => this.executeWorkerRequest(t));
       }), this.groups.size < 1 && this.stopTimer();
     }, 5e3);
   }
+  async waitForNetworkOnline(e = 5) {
+    let r = 0;
+    for (; !this.config.getIsNetworkOnline() && r < e + 1; )
+      r += 1, await m(1e3);
+  }
   async executeWorkerRequest(e, r = !1) {
-    const s = this.config.getIsNetworkOnline();
-    !(r !== !0 && this.busyWorkers.has(e.workerId)) && s && (this.busyWorkers.add(e.workerId), p({
+    const t = r !== !0 && this.busyWorkers.has(e.workerId);
+    this.config.debug("*executeWorkerRequest*", {
+      workerId: e.workerId,
+      isBusy: t,
+      force: r
+    }), t ? this.config.debug(
+      "*executeWorkerRequest* worker is busy",
+      e.workerId
+    ) : (this.busyWorkers.add(e.workerId), await this.waitForNetworkOnline(), this.config.debug("*executeWorkerRequest* request", {
+      isNetworkOnline: this.config.getIsNetworkOnline()
+    }), p({
       url: e.url,
       method: "get",
       headers: {
         ...await this.config.getRequestHeaders(),
         ...e.headers
       }
-    }).then((t) => {
-      t && !m(t) ? (e.resolve(t), this.deleteWorker(e.groupId, e.workerId)) : this.busyWorkers.delete(e.workerId);
-    }).catch((t) => {
-      e.reject(t), this.deleteWorker(e.groupId, e.workerId);
+    }).then((i) => {
+      i && !b(i) ? (e.resolve(i), this.deleteWorker(e.groupId, e.workerId)) : this.busyWorkers.delete(e.workerId);
+    }).catch((i) => {
+      e.reject(i), this.deleteWorker(e.groupId, e.workerId);
     }));
   }
   deleteWorker(e, r) {
-    const s = this.groups.get(e);
-    s && (this.config.debug("*delete worker*", s.size, s), s.delete(r), this.workerByIdMap.delete(r), this.busyWorkers.delete(r), s.size < 1 && (this.groups.delete(e), this.enabledGroups.delete(e), this.enabledGroups.size < 1 && this.stopTimer()));
+    const t = this.groups.get(e);
+    t && (this.config.debug("*delete worker*", t.size, t), t.delete(r), this.workerByIdMap.delete(r), this.busyWorkers.delete(r), t.size < 1 && (this.groups.delete(e), this.enabledGroups.delete(e), this.enabledGroups.size < 1 && this.stopTimer()));
   }
   createWorker(e, {
     workerId: r,
-    url: s,
-    headers: u
+    url: t,
+    headers: i
   }) {
     if (!this.groups.has(e)) {
       if (this.groups.size >= this.config.maxGroupsSize) {
-        const a = h(
+        const u = h(
           new Error("Max number of Hangfire groups exceeded"),
-          n.GenericUnexpectedHangfireError,
+          a.GenericUnexpectedHangfireError,
           { count: this.groups.size }
         );
-        throw this.destroy(), a;
+        throw this.destroy(), u;
       }
       this.groups.set(e, /* @__PURE__ */ new Map());
     }
-    const t = this.groups.get(e);
-    return new Promise((a, l) => {
-      if (t.has(r))
+    const n = this.groups.get(e);
+    return new Promise((u, l) => {
+      if (n.has(r))
         throw h(
           new Error("Duplicate Hangfire worker ID"),
-          n.GenericUnexpectedHangfireError
+          a.GenericUnexpectedHangfireError
         );
-      if (t.size >= this.config.maxWorkersSize) {
-        const c = h(
+      if (n.size >= this.config.maxWorkersSize) {
+        const d = h(
           new Error("Max number of Hangfire workers in group exceeded"),
-          n.GenericUnexpectedHangfireError,
-          { groupId: e, count: t.size }
+          a.GenericUnexpectedHangfireError,
+          { groupId: e, count: n.size }
         );
-        throw l(c), this.destroy(), c;
+        throw l(d), this.destroy(), d;
       }
-      const d = {
+      const g = {
         workerId: r,
         groupId: e,
-        url: s,
-        resolve: a,
+        url: t,
+        resolve: u,
         reject: l,
-        headers: u
+        headers: i
       };
-      t.set(r, d), this.workerByIdMap.set(r, d), this.enabledGroups.has(e) || this.enabledGroups.add(e), this.timer == null && this.enabledGroups.size > 0 && this.startTimer();
+      n.set(r, g), this.workerByIdMap.set(r, g), this.enabledGroups.has(e) || this.enabledGroups.add(e), this.timer == null && this.enabledGroups.size > 0 && this.startTimer();
     });
   }
   /** Trigger a worker to execute immediately, ignoring busy state */
   triggerWorker(e) {
     this.config.debug("*triggerWorker*");
     const r = this.workerByIdMap.get(e);
-    r && this.executeWorkerRequest(r, !0);
+    r ? this.executeWorkerRequest(r, !0) : this.config.debug("*triggerWorker* worker not found", e);
   }
   /** May be called either before or after `createWorker()` */
   enableWorkers(e) {
@@ -132,10 +147,10 @@ class b {
     this.config.debug("*destroy*"), this.groups.clear(), this.stopTimer();
   }
 }
-function x(i) {
-  return new b(i);
+function E(s) {
+  return new k(s);
 }
 export {
-  b as HangfirePoller,
-  x as default
+  k as HangfirePoller,
+  E as default
 };

package/hangfire/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./isHangfireResponse.js"),r=require("./createHangfirePoller.js"),i=require("./createMakeHangfireRequest.js");require("../api/isAcceptedResponse.js");require("axios");require("@ancon/wildcat-types");require("../error/createCodedError.js");require("../api/isNoContentResponse.js");exports.isHangfireResponse=e;exports.createHangfirePoller=r.default;exports.createMakeHangfireRequest=i;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./isHangfireResponse.js"),r=require("./createHangfirePoller.js"),i=require("./createMakeHangfireRequest.js");require("../api/isAcceptedResponse.js");require("axios");require("@ancon/wildcat-types");require("../error/createCodedError.js");require("../api/isNoContentResponse.js");require("../shared/wait.js");exports.isHangfireResponse=e;exports.createHangfirePoller=r.default;exports.createMakeHangfireRequest=i;

package/hangfire/index.mjs

@@ -1,13 +1,14 @@
-import { default as p } from "./isHangfireResponse.mjs";
-import { default as s } from "./createHangfirePoller.mjs";
-import { default as n } from "./createMakeHangfireRequest.mjs";
+import { default as m } from "./isHangfireResponse.mjs";
+import { default as l } from "./createHangfirePoller.mjs";
+import { default as u } from "./createMakeHangfireRequest.mjs";
 import "../api/isAcceptedResponse.mjs";
 import "axios";
 import "@ancon/wildcat-types";
 import "../error/createCodedError.mjs";
 import "../api/isNoContentResponse.mjs";
+import "../shared/wait.mjs";
 export {
-  s as createHangfirePoller,
-  n as createMakeHangfireRequest,
-  p as isHangfireResponse
+  l as createHangfirePoller,
+  u as createMakeHangfireRequest,
+  m as isHangfireResponse
 };

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.27",
+  "version": "1.40.29",
   "private": false,
   "main": "index.js",
   "module": "index.mjs",