@ancon/wildcat-utils 1.44.0-r13-2-tz.13 → 1.44.0-r13-2-tz.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -6,4 +6,4 @@ import { Moment, MomentInput } from 'moment';
6
6
  * @param timeSpan - Service interval time span.
7
7
  * @returns The generated Moment object
8
8
  */
9
- export default function getServiceIntervalTimeSpanMoment(date: MomentInput, timeSpan: string): Moment;
9
+ export default function getServiceIntervalTimeSpanMoment(date: MomentInput, timeSpan: string, utcOffset?: number): Moment;
@@ -1 +1 @@
1
- "use strict";const o=require("moment"),m=require("../time/getTimeSpanParts.js");function i(t,n){const e=m(n);return o(t).hour(e.hours).minute(e.minutes).second(0).millisecond(0)}module.exports=i;
1
+ "use strict";const m=require("moment"),r=require("../time/getTimeSpanParts.js");function s(i,o,e){const t=r(o),n=m(i);return e!==void 0&&n.utcOffset(e),n.hour(t.hours).minute(t.minutes).second(0).millisecond(0)}module.exports=s;
@@ -1,9 +1,9 @@
1
- import n from "moment";
2
- import o from "../time/getTimeSpanParts.mjs";
3
- function c(t, m) {
4
- const e = o(m);
5
- return n(t).hour(e.hours).minute(e.minutes).second(0).millisecond(0);
1
+ import i from "moment";
2
+ import r from "../time/getTimeSpanParts.mjs";
3
+ function d(m, n, e) {
4
+ const t = r(n), o = i(m);
5
+ return e !== void 0 && o.utcOffset(e), o.hour(t.hours).minute(t.minutes).second(0).millisecond(0);
6
6
  }
7
7
  export {
8
- c as default
8
+ d as default
9
9
  };
@@ -1 +1 @@
1
- "use strict";const m=require("moment"),y=require("@ancon/wildcat-types"),O=require("../time/getTimeSpanParts.js"),a=require("./constants.js"),u=require("./getServiceIntervalTimeSpanMoment.js");function g(r,e){const t=r.clone().date()-e.date();return t!==0?r.subtract(t,"day"):r}function p(r){let e=null;const{intervals:n,exception:t}=r;if(t){const{state:i}=t;i||(e=t)}else{const i=n.sort((o,s)=>O(o.from).hours-O(s.from).hours),[l]=i;return l}return e}function d(r,e,n){var i,l;const t=[];if(e.exception){if(e.exception.state===y.IntervalState.Opened){const o=u(r,e.exception.from);n.clone().utc(!0).isBefore(o.clone().utc(!0))&&t.push({interval:e.exception,moment:o})}}else for(let o=0;o<e.intervals.length;o+=1){const s=e.intervals[o],c=u(r,s.from);console.log("relevantMoment",n.format()),console.log("openingMoment",c.format()),n.clone().utc(!0).isBefore(c.clone().utc(!0))&&t.push({interval:s,moment:c})}return t.length<2?((i=t[0])==null?void 0:i.interval)??null:((l=t.sort((o,s)=>o.moment-n-(s.moment-n))[0])==null?void 0:l.interval)??null}function h(r,e){let n=null;const t=m(e).format(a.OutletMapKeyFormatter),i=d(t,r[t],e);if(i&&(n=u(t,i.from)),!n)for(let l=1;l<a.OutletTimelineDayCount;l+=1){const o=m(e).add(l,"d"),s=o.format(a.OutletMapKeyFormatter),c=r[s],f=p(c);if(f){n=u(s,f.from),n=g(n,o);break}}return n}module.exports=h;
1
+ "use strict";const a=require("moment"),g=require("@ancon/wildcat-types"),O=require("../time/getTimeSpanParts.js"),f=require("./constants.js"),u=require("./getServiceIntervalTimeSpanMoment.js");function y(r,e){const t=r.clone().date()-e.date();return t!==0?r.subtract(t,"day"):r}function p(r){let e=null;const{intervals:n,exception:t}=r;if(t){const{state:s}=t;s||(e=t)}else{const s=n.sort((o,i)=>O(o.from).hours-O(i.from).hours),[l]=s;return l}return e}function h(r,e,n){var s,l;const t=[];if(e.exception){if(e.exception.state===g.IntervalState.Opened){const o=u(r,e.exception.from);n.clone().utc(!0).isBefore(o.clone().utc(!0))&&t.push({interval:e.exception,moment:o})}}else for(let o=0;o<e.intervals.length;o+=1){const i=e.intervals[o],c=u(r,i.from);console.log("relevantMoment",n.format()),console.log("openingMoment",c.format(),u(r,i.from,a().utcOffset()).format()),n.clone().utc(!0).isBefore(c.clone().utc(!0))&&t.push({interval:i,moment:c})}return t.length<2?((s=t[0])==null?void 0:s.interval)??null:((l=t.sort((o,i)=>o.moment-n-(i.moment-n))[0])==null?void 0:l.interval)??null}function v(r,e){let n=null;const t=a(e).format(f.OutletMapKeyFormatter),s=h(t,r[t],e);if(s&&(n=u(t,s.from)),!n)for(let l=1;l<f.OutletTimelineDayCount;l+=1){const o=a(e).add(l,"d"),i=o.format(f.OutletMapKeyFormatter),c=r[i],m=p(c);if(m){n=u(i,m.from),n=y(n,o);break}}return n}module.exports=v;
@@ -1,4 +1,4 @@
1
- import a from "moment";
1
+ import u from "moment";
2
2
  import { IntervalState as p } from "@ancon/wildcat-types";
3
3
  import m from "../time/getTimeSpanParts.mjs";
4
4
  import { OutletMapKeyFormatter as O, OutletTimelineDayCount as g } from "./constants.mjs";
@@ -7,22 +7,22 @@ function y(r, e) {
7
7
  const t = r.clone().date() - e.date();
8
8
  return t !== 0 ? r.subtract(t, "day") : r;
9
9
  }
10
- function d(r) {
10
+ function h(r) {
11
11
  let e = null;
12
12
  const { intervals: n, exception: t } = r;
13
13
  if (t) {
14
- const { state: i } = t;
15
- i || (e = t);
14
+ const { state: l } = t;
15
+ l || (e = t);
16
16
  } else {
17
- const i = n.sort(
18
- (o, l) => m(o.from).hours - m(l.from).hours
19
- ), [s] = i;
20
- return s;
17
+ const l = n.sort(
18
+ (o, i) => m(o.from).hours - m(i.from).hours
19
+ ), [f] = l;
20
+ return f;
21
21
  }
22
22
  return e;
23
23
  }
24
- function h(r, e, n) {
25
- var i, s;
24
+ function v(r, e, n) {
25
+ var l, f;
26
26
  const t = [];
27
27
  if (e.exception) {
28
28
  if (e.exception.state === p.Opened) {
@@ -37,34 +37,42 @@ function h(r, e, n) {
37
37
  }
38
38
  } else
39
39
  for (let o = 0; o < e.intervals.length; o += 1) {
40
- const l = e.intervals[o], f = c(
40
+ const i = e.intervals[o], s = c(
41
41
  r,
42
- l.from
42
+ i.from
43
43
  );
44
- console.log("relevantMoment", n.format()), console.log("openingMoment", f.format()), n.clone().utc(!0).isBefore(f.clone().utc(!0)) && t.push({ interval: l, moment: f });
44
+ console.log("relevantMoment", n.format()), console.log(
45
+ "openingMoment",
46
+ s.format(),
47
+ c(
48
+ r,
49
+ i.from,
50
+ u().utcOffset()
51
+ ).format()
52
+ ), n.clone().utc(!0).isBefore(s.clone().utc(!0)) && t.push({ interval: i, moment: s });
45
53
  }
46
- return t.length < 2 ? ((i = t[0]) == null ? void 0 : i.interval) ?? null : ((s = t.sort(
54
+ return t.length < 2 ? ((l = t[0]) == null ? void 0 : l.interval) ?? null : ((f = t.sort(
47
55
  // @ts-ignore TODO
48
- (o, l) => o.moment - n - (l.moment - n)
49
- )[0]) == null ? void 0 : s.interval) ?? null;
56
+ (o, i) => o.moment - n - (i.moment - n)
57
+ )[0]) == null ? void 0 : f.interval) ?? null;
50
58
  }
51
59
  function S(r, e) {
52
60
  let n = null;
53
- const t = a(e).format(O), i = h(
61
+ const t = u(e).format(O), l = v(
54
62
  t,
55
63
  r[t],
56
64
  e
57
65
  );
58
- if (i && (n = c(
66
+ if (l && (n = c(
59
67
  t,
60
- i.from
68
+ l.from
61
69
  )), !n)
62
- for (let s = 1; s < g; s += 1) {
63
- const o = a(e).add(s, "d"), l = o.format(O), f = r[l], u = d(f);
64
- if (u) {
70
+ for (let f = 1; f < g; f += 1) {
71
+ const o = u(e).add(f, "d"), i = o.format(O), s = r[i], a = h(s);
72
+ if (a) {
65
73
  n = c(
66
- l,
67
- u.from
74
+ i,
75
+ a.from
68
76
  ), n = y(n, o);
69
77
  break;
70
78
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ancon/wildcat-utils",
3
- "version": "1.44.0-r13-2-tz.13",
3
+ "version": "1.44.0-r13-2-tz.15",
4
4
  "private": false,
5
5
  "main": "index.js",
6
6
  "module": "index.mjs",