@thisisagile/easy 10.15.2 → 11.1.1

package/dist/domain/values/DateTime.d.ts

@@ -1,16 +1,16 @@
-import { Value } from '../../types';
-import { Moment } from 'moment';
-import 'moment/min/locales';
-export declare type DateTimeUnit = 'year' | 'years' | 'y' | 'quarter' | 'quarters' | 'Q' | 'month' | 'months' | 'M' | 'week' | 'weeks' | 'w' | 'day' | 'days' | 'd' | 'hour' | 'hours' | 'h' | 'minute' | 'minutes' | 'm' | 'second' | 'seconds' | 's' | 'millisecond' | 'milliseconds' | 'ms';
+import { JsonValue, Value } from '../../types';
+import { DateTime as LuxonDateTime, DateTimeUnit as LuxonDateTimeUnit } from 'luxon';
+export declare type DateTimeUnit = LuxonDateTimeUnit;
 export declare class DateTime extends Value<string | undefined> {
     constructor(value?: string | number | Date, format?: string);
     static get now(): DateTime;
     get isValid(): boolean;
     get fromNow(): string;
     from(date?: DateTime): string;
-    from(locales?: string | string[]): string;
-    from(date?: DateTime, locales?: string | string[]): string;
-    protected get utc(): Moment;
+    from(locale?: string): string;
+    from(date?: DateTime, locale?: string): string;
+    protected get utc(): LuxonDateTime;
+    protected get luxon(): LuxonDateTime;
     isAfter(dt: DateTime): boolean;
     isBefore(dt: DateTime): boolean;
     equals(dt: DateTime): boolean;
@@ -19,9 +19,11 @@ export declare class DateTime extends Value<string | undefined> {
     diff: (other: DateTime, unit?: DateTimeUnit) => number;
     startOf: (unit?: DateTimeUnit) => DateTime;
     endOf: (unit?: DateTimeUnit) => DateTime;
+    withZone: (zone: string) => DateTime;
     toString(): string;
-    toLocale: (locales?: string | string[], format?: string) => string;
-    toFull: (...locales: string[]) => string;
+    toJSON(): JsonValue;
+    toLocale: (locale?: string, format?: string) => string;
+    toFull: (locale?: string) => string;
     toDate(): Date | undefined;
 }
 export declare const isDateTime: (dt?: unknown) => dt is DateTime;

package/dist/domain/values/DateTime.js

@@ -1,58 +1,62 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isDateTime = exports.DateTime = void 0;
 const types_1 = require("../../types");
-const moment_1 = __importDefault(require("moment"));
-const utils_1 = require("../../utils");
-require("moment/min/locales");
+const luxon_1 = require("luxon");
+luxon_1.Settings.defaultZone = 'utc';
 class DateTime extends types_1.Value {
     constructor(value, format) {
-        super((0, types_1.tryTo)(value)
-            .is.defined()
-            .map(v => moment_1.default.utc(v, format, true).toISOString())
-            .orElse());
-        this.add = (n, unit = 'days') => new DateTime(this.utc.add(n, unit).toISOString());
-        this.subtract = (n, unit = 'days') => new DateTime(this.utc.subtract(n, unit).toISOString());
-        this.diff = (other, unit = 'days') => this.utc.diff(other.utc, unit);
-        this.startOf = (unit = 'day') => new DateTime(this.utc.startOf(unit).toISOString());
-        this.endOf = (unit = 'day') => new DateTime(this.utc.endOf(unit).toISOString());
-        this.toLocale = (locales = 'nl-NL', format = 'L') => this.utc.locale(locales).format(format);
-        this.toFull = (...locales) => this.toLocale((0, utils_1.ifNotEmpty)(locales, locales), 'LL');
+        super((0, types_1.choose)(value)
+            .type(types_1.isString, v => (format ? luxon_1.DateTime.fromFormat(v, format, { setZone: true }) : luxon_1.DateTime.fromISO(v, { setZone: true })).toISO())
+            .type(types_1.isNumber, v => luxon_1.DateTime.fromMillis(v).toISO())
+            .type(types_1.isDate, v => luxon_1.DateTime.fromJSDate(v).toISO())
+            .else(undefined));
+        this.add = (n, unit = 'day') => new DateTime(this.luxon.plus({ [unit]: n }).toISO());
+        this.subtract = (n, unit = 'day') => new DateTime(this.luxon.minus({ [unit]: n }).toISO());
+        this.diff = (other, unit = 'day') => Math.floor(this.utc.diff(other.utc).as(unit));
+        this.startOf = (unit = 'day') => new DateTime(this.luxon.startOf(unit).toISO());
+        this.endOf = (unit = 'day') => new DateTime(this.luxon.endOf(unit).toISO());
+        this.withZone = (zone) => new DateTime(this.utc.setZone(zone).toISO());
+        this.toLocale = (locale = 'nl-NL', format = 'D') => this.luxon.setLocale(locale).toFormat(format);
+        this.toFull = (locale) => this.toLocale(locale, 'DDD');
     }
     static get now() {
-        return new DateTime(moment_1.default.utc().toISOString());
+        return new DateTime(luxon_1.DateTime.utc().toISO());
     }
     get isValid() {
-        return (0, types_1.isDefined)(this.value) && this.utc.isValid();
+        return (0, types_1.isDefined)(this.value) && this.utc.isValid;
     }
     get fromNow() {
         return this.from();
     }
     from(param, other) {
         const date = (0, types_1.isA)(param) ? param : undefined;
-        const locales = (0, types_1.isString)(param) || (0, types_1.isArray)(param) ? param : (0, types_1.isString)(other) || (0, types_1.isArray)(other) ? other : 'en';
-        return (0, types_1.isDefined)(date) ? this.utc.locale(locales).from(date.utc) : this.utc.locale(locales).fromNow();
+        const locale = (0, types_1.isString)(param) ? param : undefined ?? other ?? 'en';
+        return (0, types_1.isDefined)(date) ? this.utc.setLocale(locale).toRelative({ base: date.utc }) : this.utc.setLocale(locale).toRelative();
     }
     get utc() {
-        return moment_1.default.utc(this.value);
+        return this.luxon.setZone('utc');
+    }
+    get luxon() {
+        return luxon_1.DateTime.fromISO(this.value, { setZone: true });
     }
     isAfter(dt) {
-        return this.utc.isAfter(moment_1.default.utc(dt.value));
+        return this.utc > dt.utc;
     }
     isBefore(dt) {
-        return this.utc.isBefore(moment_1.default.utc(dt.value));
+        return this.utc < dt.utc;
     }
     equals(dt) {
-        return this.utc.isSame(moment_1.default.utc(dt.value));
+        return this.utc.hasSame(dt.utc, 'millisecond');
     }
     toString() {
         return this.value ?? '';
     }
+    toJSON() {
+        return this.utc.toISO();
+    }
     toDate() {
-        return this.isValid ? this.utc.toDate() : undefined;
+        return this.isValid ? this.utc.toJSDate() : undefined;
     }
 }
 exports.DateTime = DateTime;

package/dist/domain/values/DateTime.js.map

@@ -1 +1 @@
-{"version":3,"file":"DateTime.js","sourceRoot":"","sources":["../../../src/domain/values/DateTime.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DateTime.js","sourceRoot":"","sources":["../../../src/domain/values/DateTime.ts"],"names":[],"mappings":"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"}

package/dist/types/PageList.d.ts

@@ -12,6 +12,7 @@ export declare type PageOptions = {
 export declare type PageList<T> = List<T> & Omit<PageOptions, 'sort'> & {
     total?: number;
 };
+export declare const isPageList: <T>(l?: T[] | undefined) => l is PageList<T>;
 export declare const toPageList: <T>(items?: T[] | undefined, options?: Omit<PageOptions, 'sort'> & {
     total?: number;
 }) => PageList<T>;

package/dist/types/PageList.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.asPageList = exports.toPageList = void 0;
+exports.asPageList = exports.toPageList = exports.isPageList = void 0;
 const List_1 = require("./List");
 const Constructor_1 = require("./Constructor");
+const IsA_1 = require("./IsA");
+const isPageList = (l) => (0, List_1.isList)(l) && (0, IsA_1.isA)(l, 'total');
+exports.isPageList = isPageList;
 const toPageList = (items, options) => {
     const list = (0, List_1.toList)(...(items ?? []));
     list.take = options?.take ?? 250;

package/dist/types/PageList.js.map

@@ -1 +1 @@
-{"version":3,"file":"PageList.js","sourceRoot":"","sources":["../../src/types/PageList.ts"],"names":[],"mappings":";;;AAAA,iCAAsC;AACtC,+CAAuD;AAQhD,MAAM,UAAU,GAAG,CAAI,KAAW,EAAE,OAAwD,EAAe,EAAE;IAClH,MAAM,IAAI,GAAG,IAAA,aAAM,EAAI,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAQ,CAAC;IAChD,IAAI,CAAC,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,GAAG,CAAC;IACjC,IAAI,CAAC,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,CAAC,CAAC;IAC/B,IAAI,CAAC,KAAK,GAAG,OAAO,EAAE,KAAK,CAAC;IAC5B,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AANW,QAAA,UAAU,cAMrB;AAEK,MAAM,UAAU,GAAG,CAAO,CAAe,EAAE,QAAQ,IAAA,kBAAU,GAAK,EAAe,EAAE,CACxF,IAAA,kBAAU,EACR,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,yBAAW,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EACjC,KAAK,CACN,CAAC;AAJS,QAAA,UAAU,cAInB"}
+{"version":3,"file":"PageList.js","sourceRoot":"","sources":["../../src/types/PageList.ts"],"names":[],"mappings":";;;AAAA,iCAA8C;AAC9C,+CAAuD;AACvD,+BAA4B;AAQrB,MAAM,UAAU,GAAG,CAAI,CAAO,EAAoB,EAAE,CAAC,IAAA,aAAM,EAAI,CAAC,CAAC,IAAI,IAAA,SAAG,EAAC,CAAC,EAAE,OAAO,CAAC,CAAC;AAA/E,QAAA,UAAU,cAAqE;AAErF,MAAM,UAAU,GAAG,CAAI,KAAW,EAAE,OAAwD,EAAe,EAAE;IAClH,MAAM,IAAI,GAAG,IAAA,aAAM,EAAI,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAQ,CAAC;IAChD,IAAI,CAAC,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,GAAG,CAAC;IACjC,IAAI,CAAC,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,CAAC,CAAC;IAC/B,IAAI,CAAC,KAAK,GAAG,OAAO,EAAE,KAAK,CAAC;IAC5B,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AANW,QAAA,UAAU,cAMrB;AAEK,MAAM,UAAU,GAAG,CAAO,CAAe,EAAE,QAAQ,IAAA,kBAAU,GAAK,EAAe,EAAE,CACxF,IAAA,kBAAU,EACR,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,yBAAW,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EACjC,KAAK,CACN,CAAC;AAJS,QAAA,UAAU,cAInB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thisisagile/easy",
-  "version": "10.15.2",
+  "version": "11.1.1",
   "description": "Straightforward library for building domain-driven microservice architectures",
   "author": "Sander Hoogendoorn",
   "license": "MIT",
@@ -31,9 +31,10 @@
     "access": "public"
   },
   "devDependencies": {
-    "@thisisagile/easy-test": "10.15.2",
+    "@thisisagile/easy-test": "11.1.1",
     "@types/form-urlencoded": "^4.4.0",
     "@types/jsonwebtoken": "^8.5.8",
+    "@types/luxon": "2.3.2",
     "@types/validator": "^13.7.2"
   },
   "dependencies": {
@@ -41,7 +42,7 @@
     "axios": "^0.27.2",
     "form-urlencoded": "^6.0.6",
     "jsonwebtoken": "^8.5.1",
-    "moment": "^2.29.3",
+    "luxon": "^2.4.0",
     "reflect-metadata": "^0.1.13",
     "uuid": "^8.3.2",
     "validator": "^13.7.0"

package/src/domain/values/DateTime.ts

@@ -1,53 +1,27 @@
-import { isA, isArray, isDefined, isString, tryTo, Value } from '../../types';
-import moment, { Moment } from 'moment';
-import { ifNotEmpty } from '../../utils';
-import 'moment/min/locales';
-
-export type DateTimeUnit =
-  | 'year'
-  | 'years'
-  | 'y'
-  | 'quarter'
-  | 'quarters'
-  | 'Q'
-  | 'month'
-  | 'months'
-  | 'M'
-  | 'week'
-  | 'weeks'
-  | 'w'
-  | 'day'
-  | 'days'
-  | 'd'
-  | 'hour'
-  | 'hours'
-  | 'h'
-  | 'minute'
-  | 'minutes'
-  | 'm'
-  | 'second'
-  | 'seconds'
-  | 's'
-  | 'millisecond'
-  | 'milliseconds'
-  | 'ms';
+import { choose, isA, isDate, isDefined, isNumber, isString, JsonValue, Value } from '../../types';
+import { DateTime as LuxonDateTime, DateTimeUnit as LuxonDateTimeUnit, Settings } from 'luxon';
+
+Settings.defaultZone = 'utc';
+
+export type DateTimeUnit = LuxonDateTimeUnit;
 
 export class DateTime extends Value<string | undefined> {
   constructor(value?: string | number | Date, format?: string) {
     super(
-      tryTo(value)
-        .is.defined()
-        .map(v => moment.utc(v, format, true).toISOString())
-        .orElse()
+      choose(value)
+        .type(isString, v => (format ? LuxonDateTime.fromFormat(v, format, { setZone: true }) : LuxonDateTime.fromISO(v, { setZone: true })).toISO())
+        .type(isNumber, v => LuxonDateTime.fromMillis(v).toISO())
+        .type(isDate, v => LuxonDateTime.fromJSDate(v).toISO())
+        .else(undefined as unknown as string)
     );
   }
 
   static get now(): DateTime {
-    return new DateTime(moment.utc().toISOString());
+    return new DateTime(LuxonDateTime.utc().toISO());
   }
 
   get isValid(): boolean {
-    return isDefined(this.value) && this.utc.isValid();
+    return isDefined(this.value) && this.utc.isValid;
   }
 
   /**
@@ -58,50 +32,60 @@ export class DateTime extends Value<string | undefined> {
   }
 
   from(date?: DateTime): string;
-  from(locales?: string | string[]): string;
-  from(date?: DateTime, locales?: string | string[]): string;
-  from(param?: string | string[] | DateTime, other?: string | string[]): string {
+  from(locale?: string): string;
+  from(date?: DateTime, locale?: string): string;
+  from(param?: string | DateTime, other?: string): string {
     const date: DateTime | undefined = isA<DateTime>(param) ? param : undefined;
-    const locales: string | string[] = isString(param) || isArray<string>(param) ? param : isString(other) || isArray<string>(other) ? other : 'en';
-    return isDefined(date) ? this.utc.locale(locales).from(date.utc) : this.utc.locale(locales).fromNow();
+    const locale: string = isString(param) ? param : undefined ?? other ?? 'en';
+    return isDefined(date) ? (this.utc.setLocale(locale).toRelative({ base: date.utc }) as string) : (this.utc.setLocale(locale).toRelative() as string);
+  }
+
+  protected get utc(): LuxonDateTime {
+    return this.luxon.setZone('utc');
   }
 
-  protected get utc(): Moment {
-    return moment.utc(this.value);
+  protected get luxon(): LuxonDateTime {
+    return LuxonDateTime.fromISO(this.value as string, { setZone: true });
   }
 
   isAfter(dt: DateTime): boolean {
-    return this.utc.isAfter(moment.utc(dt.value));
+    return this.utc > dt.utc;
   }
 
   isBefore(dt: DateTime): boolean {
-    return this.utc.isBefore(moment.utc(dt.value));
+    return this.utc < dt.utc;
   }
 
   equals(dt: DateTime): boolean {
-    return this.utc.isSame(moment.utc(dt.value));
+    return this.utc.hasSame(dt.utc, 'millisecond');
   }
 
-  add = (n: number, unit: DateTimeUnit = 'days'): DateTime => new DateTime(this.utc.add(n, unit).toISOString());
+  add = (n: number, unit: DateTimeUnit = 'day'): DateTime => new DateTime(this.luxon.plus({ [unit]: n }).toISO());
 
-  subtract = (n: number, unit: DateTimeUnit = 'days'): DateTime => new DateTime(this.utc.subtract(n, unit).toISOString());
+  subtract = (n: number, unit: DateTimeUnit = 'day'): DateTime => new DateTime(this.luxon.minus({ [unit]: n }).toISO());
 
-  diff = (other: DateTime, unit: DateTimeUnit = 'days'): number => this.utc.diff(other.utc, unit);
+  diff = (other: DateTime, unit: DateTimeUnit = 'day'): number => Math.floor(this.utc.diff(other.utc).as(unit));
 
-  startOf = (unit: DateTimeUnit = 'day'): DateTime => new DateTime(this.utc.startOf(unit).toISOString());
+  startOf = (unit: DateTimeUnit = 'day'): DateTime => new DateTime(this.luxon.startOf(unit).toISO());
 
-  endOf = (unit: DateTimeUnit = 'day'): DateTime => new DateTime(this.utc.endOf(unit).toISOString());
+  endOf = (unit: DateTimeUnit = 'day'): DateTime => new DateTime(this.luxon.endOf(unit).toISO());
+
+  withZone = (zone: string): DateTime => new DateTime(this.utc.setZone(zone).toISO());
 
   toString(): string {
     return this.value ?? '';
   }
 
-  toLocale = (locales: string | string[] = 'nl-NL', format = 'L'): string => this.utc.locale(locales).format(format);
+  toJSON(): JsonValue {
+    return this.utc.toISO() as unknown as JsonValue;
+  }
+
+  toLocale = (locale = 'nl-NL', format = 'D'): string => this.luxon.setLocale(locale).toFormat(format);
 
-  toFull = (...locales: string[]): string => this.toLocale(ifNotEmpty(locales, locales), 'LL');
+  toFull = (locale?: string): string => this.toLocale(locale, 'DDD');
 
   toDate(): Date | undefined {
-    return this.isValid ? this.utc.toDate() : undefined;
+    return this.isValid ? this.utc.toJSDate() : undefined;
   }
 }
 

package/src/types/PageList.ts

@@ -1,5 +1,6 @@
-import { List, toList } from './List';
+import { isList, List, toList } from './List';
 import { Construct, ofConstruct } from './Constructor';
+import { isA } from './IsA';
 
 export type Sort = { key: string; value: -1 | 1 };
 
@@ -7,6 +8,8 @@ export type PageOptions = { take?: number; skip?: number; sort?: Sort[] };
 
 export type PageList<T> = List<T> & Omit<PageOptions, 'sort'> & { total?: number };
 
+export const isPageList = <T>(l?: T[]): l is PageList<T> => isList<T>(l) && isA(l, 'total');
+
 export const toPageList = <T>(items?: T[], options?: Omit<PageOptions, 'sort'> & { total?: number }): PageList<T> => {
   const list = toList<T>(...(items ?? [])) as any;
   list.take = options?.take ?? 250;
@@ -20,3 +23,4 @@ export const asPageList = <T, U>(c: Construct<T>, items = toPageList<U>()): Page
     items.map(i => ofConstruct(c, i)),
     items
   );
+