@ancon/wildcat-utils 1.32.0 → 1.32.1

package/outlet/getListOutletOpeningHoursTable.js

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

package/outlet/getListOutletOpeningHoursTable.mjs

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

package/package.json

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