@ancon/wildcat-utils 1.40.9 → 1.40.10

package/outlet/getListOutletOpeningHoursTable.js

@@ -1 +1 @@
-"use strict";const F=require("moment"),r=require("@ancon/wildcat-types"),g=require("../shared/isWithinFlag.js"),I=require("../shared/generateId.js"),c=[{id:r.OrderFormat.EatIn,name:"eatIn"},{id:r.OrderFormat.TakeAway,name:"takeaway"},{id:r.OrderFormat.TableOrder,name:"tableOrder"},{id:r.OrderFormat.Delivery,name:"delivery"}];function v(e){const o=F.utc(e).subtract(1,"day").startOf("day"),t=[];for(let s=0,d=o;s<7;s+=1)d=d.clone().add(1,"day").startOf("day"),t.push(d.clone());return t}function W(e){return[...e].sort((o,t)=>o.isoWeekday()-t.isoWeekday())}function k(e){return e.split(":").map(Number)}function T(e,o,t){const[s,d]=k(e.start),[p,m]=k(e.duration),[n,y]=k(t||"00:00:00");if(e.type===r.IntervalType.Interval){let i=o.clone().add(s,"hour").add(d,"minute");const a=i.clone().add(n,"hour").add(y,"minute").date()-o.date();a!==0&&(i=i.subtract(a,"day"));const f=i.clone().add(p,"hour").add(m,"minute");return{id:e.id,start:i.toISOString(),end:f.toISOString()}}if(e.type===r.IntervalType.Exception){const i=F(e.fromDate),u=F(e.toDate);if(o.isBetween(i,u,void 0,"[]")){const a=o.clone().add(s,"hour").add(d,"minute"),f=a.clone().add(p,"hour").add(m,"minute");return{id:e.id,start:a.toISOString(),end:f.toISOString(),reason:e.reason}}return null}throw new Error("Invalid interval type")}function S(e,o,t,s){const d={[r.DayOfWeek.Monday]:1,[r.DayOfWeek.Tuesday]:2,[r.DayOfWeek.Wednesday]:3,[r.DayOfWeek.Thursday]:4,[r.DayOfWeek.Friday]:5,[r.DayOfWeek.Saturday]:6,[r.DayOfWeek.Sunday]:7,[r.DayOfWeek.Everyday]:null};for(let p=0;p<o.length;p+=1){const m=o[p],n=m.isoWeekday(),y=e.dayOfWeek,u=(d[y]??null)===n||y===r.DayOfWeek.Everyday;if(t[n]||(t[n]={isoWeekday:n,key:"",open:[],adjusted:[],closed:[]}),u){const a=T(e,m,s);a&&(t[n].key+=a.id,e.type===r.IntervalType.Interval&&e.state===r.IntervalState.Open?t[n].open.push(a):e.type===r.IntervalType.Interval&&e.state===r.IntervalState.Closed?t[n].closed.push(a):e.type===r.IntervalType.Exception&&e.state===r.IntervalState.Open?t[n].adjusted.push(a):e.type===r.IntervalType.Exception&&e.state===r.IntervalState.Closed&&t[n].closed.push(a))}}}function h(e){switch(e.type){case r.IntervalType.Exception:return I("interval-exception");case r.IntervalType.Interval:return I("interval-normal");default:return I("interval-unknown")}}function D(e){const o=e.reduce((t,s)=>(c.forEach(d=>{g(d.id,s.orderFormats)&&(t[d.id]||(t[d.id]={orderFormat:d,intervals:[]}),t[d.id].intervals.push(...s.intervals.sort((p,m)=>p.dayOfWeek-m.dayOfWeek)))}),t),{});return Object.values(o)}function M(e,o){const t=o.reduce((s,d)=>d<=e?s+1:s,0);return e-t}function H(e){const{mergedTables:o}=e.reduce((t,s,d)=>{const p=t.mergedTables.findIndex(m=>m!==s&&!m.orderFormats.some(n=>s.orderFormats.some(y=>y.id===n.id))&&m.openingHours.every(n=>s.openingHours.some(y=>y.key===n.key))&&s.openingHours.every(n=>m.openingHours.some(y=>y.key===n.key)));if(p>=0){if(t.skipOrderFormats.some(u=>s.orderFormats.every(a=>a.id===u.id)))return t;const n=t.mergedTables[p];t.mergedTables.splice(p,1,{...n,orderFormats:[...s.orderFormats,...n.orderFormats]});const y=n.orderFormats.filter(u=>!t.skipOrderFormats.some(a=>a.id===u.id));y.length>0&&t.skipOrderFormats.push(...y);const i=M(d,[...t.removedIndexes]);return t.mergedTables.splice(i,1),t.removedIndexes.push(d),t}return t},{mergedTables:[...e],removedIndexes:[],skipOrderFormats:[]});return o}function x(e){return e.map(o=>({...o,intervals:o.intervals.map(t=>({...t,id:h(t)}))}))}function E(e,o){const t=D(x(e.serviceDateTimes)),s=v(o),d=W(s),p=t.reduce((i,u)=>(i[u.orderFormat.id]||(i[u.orderFormat.id]={}),u.intervals.reduce((a,f)=>(S(f,d,a,e.timeZoneOffset),a),i[u.orderFormat.id]),i),{}),m={[r.OrderFormat.EatIn]:c[0],[r.OrderFormat.TakeAway]:c[1],[r.OrderFormat.TableOrder]:c[2],[r.OrderFormat.Delivery]:c[3]},n=Object.entries(p).map(([i,u])=>({orderFormats:[m[Number(i)]],openingHours:Object.entries(u).map(([a,f])=>({isoWeekday:Number(a),key:f.key,open:f.open.sort((l,O)=>l.start.localeCompare(O.start)),adjusted:f.adjusted.sort((l,O)=>l.start.localeCompare(O.start)),closed:f.closed.sort((l,O)=>l.start.localeCompare(O.start))}))}));return H(n).sort((i,u)=>i.orderFormats[0].id-u.orderFormats[0].id)}module.exports=E;
+"use strict";const F=require("moment"),r=require("@ancon/wildcat-types"),g=require("../shared/isWithinFlag.js"),k=require("../shared/generateId.js"),l=[{id:r.OrderFormat.EatIn,name:"eatIn"},{id:r.OrderFormat.TakeAway,name:"takeaway"},{id:r.OrderFormat.TableOrder,name:"tableOrder"},{id:r.OrderFormat.Delivery,name:"delivery"},{id:r.OrderFormat.BoxPickup,name:"boxPickup"}];function v(e){const o=F.utc(e).subtract(1,"day").startOf("day"),t=[];for(let s=0,d=o;s<7;s+=1)d=d.clone().add(1,"day").startOf("day"),t.push(d.clone());return t}function W(e){return[...e].sort((o,t)=>o.isoWeekday()-t.isoWeekday())}function I(e){return e.split(":").map(Number)}function T(e,o,t){const[s,d]=I(e.start),[p,m]=I(e.duration),[n,y]=I(t||"00:00:00");if(e.type===r.IntervalType.Interval){let i=o.clone().add(s,"hour").add(d,"minute");const a=i.clone().add(n,"hour").add(y,"minute").date()-o.date();a!==0&&(i=i.subtract(a,"day"));const f=i.clone().add(p,"hour").add(m,"minute");return{id:e.id,start:i.toISOString(),end:f.toISOString()}}if(e.type===r.IntervalType.Exception){const i=F(e.fromDate),u=F(e.toDate);if(o.isBetween(i,u,void 0,"[]")){const a=o.clone().add(s,"hour").add(d,"minute"),f=a.clone().add(p,"hour").add(m,"minute");return{id:e.id,start:a.toISOString(),end:f.toISOString(),reason:e.reason}}return null}throw new Error("Invalid interval type")}function S(e,o,t,s){const d={[r.DayOfWeek.Monday]:1,[r.DayOfWeek.Tuesday]:2,[r.DayOfWeek.Wednesday]:3,[r.DayOfWeek.Thursday]:4,[r.DayOfWeek.Friday]:5,[r.DayOfWeek.Saturday]:6,[r.DayOfWeek.Sunday]:7,[r.DayOfWeek.Everyday]:null};for(let p=0;p<o.length;p+=1){const m=o[p],n=m.isoWeekday(),y=e.dayOfWeek,u=(d[y]??null)===n||y===r.DayOfWeek.Everyday;if(t[n]||(t[n]={isoWeekday:n,key:"",open:[],adjusted:[],closed:[]}),u){const a=T(e,m,s);a&&(t[n].key+=a.id,e.type===r.IntervalType.Interval&&e.state===r.IntervalState.Open?t[n].open.push(a):e.type===r.IntervalType.Interval&&e.state===r.IntervalState.Closed?t[n].closed.push(a):e.type===r.IntervalType.Exception&&e.state===r.IntervalState.Open?t[n].adjusted.push(a):e.type===r.IntervalType.Exception&&e.state===r.IntervalState.Closed&&t[n].closed.push(a))}}}function h(e){switch(e.type){case r.IntervalType.Exception:return k("interval-exception");case r.IntervalType.Interval:return k("interval-normal");default:return k("interval-unknown")}}function D(e){const o=e.reduce((t,s)=>(l.forEach(d=>{g(d.id,s.orderFormats)&&(t[d.id]||(t[d.id]={orderFormat:d,intervals:[]}),t[d.id].intervals.push(...s.intervals.sort((p,m)=>p.dayOfWeek-m.dayOfWeek)))}),t),{});return Object.values(o)}function x(e,o){const t=o.reduce((s,d)=>d<=e?s+1:s,0);return e-t}function M(e){const{mergedTables:o}=e.reduce((t,s,d)=>{const p=t.mergedTables.findIndex(m=>m!==s&&!m.orderFormats.some(n=>s.orderFormats.some(y=>y.id===n.id))&&m.openingHours.every(n=>s.openingHours.some(y=>y.key===n.key))&&s.openingHours.every(n=>m.openingHours.some(y=>y.key===n.key)));if(p>=0){if(t.skipOrderFormats.some(u=>s.orderFormats.every(a=>a.id===u.id)))return t;const n=t.mergedTables[p];t.mergedTables.splice(p,1,{...n,orderFormats:[...s.orderFormats,...n.orderFormats]});const y=n.orderFormats.filter(u=>!t.skipOrderFormats.some(a=>a.id===u.id));y.length>0&&t.skipOrderFormats.push(...y);const i=x(d,[...t.removedIndexes]);return t.mergedTables.splice(i,1),t.removedIndexes.push(d),t}return t},{mergedTables:[...e],removedIndexes:[],skipOrderFormats:[]});return o}function H(e){return e.map(o=>({...o,intervals:o.intervals.map(t=>({...t,id:h(t)}))}))}function E(e,o){const t=D(H(e.serviceDateTimes)),s=v(o),d=W(s),p=t.reduce((i,u)=>(i[u.orderFormat.id]||(i[u.orderFormat.id]={}),u.intervals.reduce((a,f)=>(S(f,d,a,e.timeZoneOffset),a),i[u.orderFormat.id]),i),{}),m={[r.OrderFormat.EatIn]:l[0],[r.OrderFormat.TakeAway]:l[1],[r.OrderFormat.TableOrder]:l[2],[r.OrderFormat.Delivery]:l[3],[r.OrderFormat.BoxPickup]:l[4]},n=Object.entries(p).map(([i,u])=>({orderFormats:[m[Number(i)]],openingHours:Object.entries(u).map(([a,f])=>({isoWeekday:Number(a),key:f.key,open:f.open.sort((O,c)=>O.start.localeCompare(c.start)),adjusted:f.adjusted.sort((O,c)=>O.start.localeCompare(c.start)),closed:f.closed.sort((O,c)=>O.start.localeCompare(c.start))}))}));return M(n).sort((i,u)=>i.orderFormats[0].id-u.orderFormats[0].id)}module.exports=E;

package/outlet/getListOutletOpeningHoursTable.mjs

@@ -1,12 +1,13 @@
 import S from "moment";
-import { OrderFormat as l, DayOfWeek as y, IntervalType as c, IntervalState as g } from "@ancon/wildcat-types";
+import { OrderFormat as y, DayOfWeek as l, IntervalType as c, IntervalState as g } from "@ancon/wildcat-types";
 import h from "../shared/isWithinFlag.mjs";
 import F from "../shared/generateId.mjs";
-const I = [
-  { id: l.EatIn, name: "eatIn" },
-  { id: l.TakeAway, name: "takeaway" },
-  { id: l.TableOrder, name: "tableOrder" },
-  { id: l.Delivery, name: "delivery" }
+const k = [
+  { id: y.EatIn, name: "eatIn" },
+  { id: y.TakeAway, name: "takeaway" },
+  { id: y.TableOrder, name: "tableOrder" },
+  { id: y.Delivery, name: "delivery" },
+  { id: y.BoxPickup, name: "boxPickup" }
 ];
 function v(e) {
   const o = S.utc(e).subtract(1, "day").startOf("day"), t = [];
@@ -20,7 +21,7 @@ function T(e) {
 function W(e) {
   return e.split(":").map(Number);
 }
-function M(e, o, t) {
+function x(e, o, t) {
   const [n, s] = W(e.start), [m, u] = W(
     e.duration
   ), [r, p] = W(t || "00:00:00");
@@ -50,19 +51,19 @@ function M(e, o, t) {
   }
   throw new Error("Invalid interval type");
 }
-function H(e, o, t, n) {
+function M(e, o, t, n) {
   const s = {
-    [y.Monday]: 1,
-    [y.Tuesday]: 2,
-    [y.Wednesday]: 3,
-    [y.Thursday]: 4,
-    [y.Friday]: 5,
-    [y.Saturday]: 6,
-    [y.Sunday]: 7,
-    [y.Everyday]: null
+    [l.Monday]: 1,
+    [l.Tuesday]: 2,
+    [l.Wednesday]: 3,
+    [l.Thursday]: 4,
+    [l.Friday]: 5,
+    [l.Saturday]: 6,
+    [l.Sunday]: 7,
+    [l.Everyday]: null
   };
   for (let m = 0; m < o.length; m += 1) {
-    const u = o[m], r = u.isoWeekday(), p = e.dayOfWeek, i = (s[p] ?? null) === r || p === y.Everyday;
+    const u = o[m], r = u.isoWeekday(), p = e.dayOfWeek, i = (s[p] ?? null) === r || p === l.Everyday;
     if (t[r] || (t[r] = {
       isoWeekday: r,
       key: "",
@@ -70,7 +71,7 @@ function H(e, o, t, n) {
       adjusted: [],
       closed: []
     }), i) {
-      const d = M(
+      const d = x(
         e,
         u,
         n
@@ -79,7 +80,7 @@ function H(e, o, t, n) {
     }
   }
 }
-function x(e) {
+function H(e) {
   switch (e.type) {
     case c.Exception:
       return F("interval-exception");
@@ -91,7 +92,7 @@ function x(e) {
 }
 function E(e) {
   const o = e.reduce(
-    (t, n) => (I.forEach((s) => {
+    (t, n) => (k.forEach((s) => {
       h(s.id, n.orderFormats) && (t[s.id] || (t[s.id] = {
         orderFormat: s,
         intervals: []
@@ -105,11 +106,11 @@ function E(e) {
   );
   return Object.values(o);
 }
-function D(e, o) {
+function b(e, o) {
   const t = o.reduce((n, s) => s <= e ? n + 1 : n, 0);
   return e - t;
 }
-function b(e) {
+function D(e) {
   const { mergedTables: o } = e.reduce(
     (t, n, s) => {
       const m = t.mergedTables.findIndex(
@@ -137,7 +138,7 @@ function b(e) {
           (i) => !t.skipOrderFormats.some((d) => d.id === i.id)
         );
         p.length > 0 && t.skipOrderFormats.push(...p);
-        const a = D(s, [...t.removedIndexes]);
+        const a = b(s, [...t.removedIndexes]);
         return t.mergedTables.splice(a, 1), t.removedIndexes.push(s), t;
       }
       return t;
@@ -151,15 +152,15 @@ function j(e) {
     ...o,
     intervals: o.intervals.map((t) => ({
       ...t,
-      id: x(t)
+      id: H(t)
     }))
   }));
 }
-function R(e, o) {
+function N(e, o) {
   const t = E(
     j(e.serviceDateTimes)
   ), n = v(o), s = T(n), m = t.reduce(
-    (a, i) => (a[i.orderFormat.id] || (a[i.orderFormat.id] = {}), i.intervals.reduce((d, f) => (H(
+    (a, i) => (a[i.orderFormat.id] || (a[i.orderFormat.id] = {}), i.intervals.reduce((d, f) => (M(
       f,
       s,
       d,
@@ -167,10 +168,11 @@ function R(e, o) {
     ), d), a[i.orderFormat.id]), a),
     {}
   ), u = {
-    [l.EatIn]: I[0],
-    [l.TakeAway]: I[1],
-    [l.TableOrder]: I[2],
-    [l.Delivery]: I[3]
+    [y.EatIn]: k[0],
+    [y.TakeAway]: k[1],
+    [y.TableOrder]: k[2],
+    [y.Delivery]: k[3],
+    [y.BoxPickup]: k[4]
   }, r = Object.entries(
     m
   ).map(([a, i]) => ({
@@ -180,21 +182,21 @@ function R(e, o) {
         isoWeekday: Number(d),
         key: f.key,
         open: f.open.sort(
-          (O, k) => O.start.localeCompare(k.start)
+          (O, I) => O.start.localeCompare(I.start)
         ),
         adjusted: f.adjusted.sort(
-          (O, k) => O.start.localeCompare(k.start)
+          (O, I) => O.start.localeCompare(I.start)
         ),
         closed: f.closed.sort(
-          (O, k) => O.start.localeCompare(k.start)
+          (O, I) => O.start.localeCompare(I.start)
         )
       })
     )
   }));
-  return b(r).sort(
+  return D(r).sort(
     (a, i) => a.orderFormats[0].id - i.orderFormats[0].id
   );
 }
 export {
-  R as default
+  N as default
 };

package/package.json

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