@thisisagile/easy 15.12.13 → 15.13.1

package/src/domain/values/DateTime.ts

@@ -1,20 +1,15 @@
-import { choose, isA, isDate, isDefined, isNumber, isString, JsonValue, Optional, Value } from "../../types";
-import {
-  DateTime as LuxonDateTime,
-  DateTimeUnit as LuxonDateTimeUnit,
-  DurationUnit as LuxonDurationUnit,
-  Settings
-} from "luxon";
-import { ifDefined } from "../../utils";
+import { choose, isA, isDate, isDefined, isNumber, isString, JsonValue, Optional, Value } from '../../types';
+import { DateTime as LuxonDateTime, DateTimeUnit as LuxonDateTimeUnit, DurationUnit as LuxonDurationUnit, Settings } from 'luxon';
+import { ifDefined } from '../../utils';
 
-Settings.defaultZone = "utc";
+Settings.defaultZone = 'utc';
 
 export type DateTimeUnit = LuxonDateTimeUnit;
 export type DurationUnit = LuxonDurationUnit;
 export type Duration = Partial<Record<DurationUnit, number>>;
 
 export type DiffOptions = {
-  rounding: "floor" | "ceil" | "round";
+  rounding: 'floor' | 'ceil' | 'round';
 };
 
 export class DateTime extends Value<Optional<string>> {
@@ -44,7 +39,7 @@ export class DateTime extends Value<Optional<string>> {
   }
 
   protected get utc(): LuxonDateTime {
-    return this.luxon.setZone("utc");
+    return this.luxon.setZone('utc');
   }
 
   protected get luxon(): LuxonDateTime {
@@ -59,7 +54,7 @@ export class DateTime extends Value<Optional<string>> {
 
   from(param?: string | DateTime, other?: string): string {
     const date: Optional<DateTime> = isA<DateTime>(param) ? param : undefined;
-    const locale: string = isString(param) ? param : undefined ?? other ?? "en";
+    const locale: string = (isString(param) ? param : undefined) ?? other ?? 'en';
     return ifDefined(
       date,
       d => this.utc.setLocale(locale).toRelative({ base: d.utc }),
@@ -76,32 +71,32 @@ export class DateTime extends Value<Optional<string>> {
   }
 
   equals(dt: DateTime): boolean {
-    return this.utc.hasSame(dt.utc, "millisecond");
+    return this.utc.hasSame(dt.utc, 'millisecond');
   }
 
   add(n: number): DateTime;
   add(n: number, unit: DurationUnit): DateTime;
   add(duration: Duration): DateTime;
   add(n: number | Duration, unit?: DurationUnit): DateTime {
-    return new DateTime(this.luxon.plus(isNumber(n) ? { [unit ?? 'day' as string]: n } : n).toISO());
+    return new DateTime(this.luxon.plus(isNumber(n) ? { [unit ?? ('day' as string)]: n } : n).toISO());
   }
 
   subtract(n: number): DateTime;
   subtract(n: number, unit: DurationUnit): DateTime;
   subtract(duration: Duration): DateTime;
   subtract(n: number | Duration, unit?: DurationUnit): DateTime {
-    return new DateTime(this.luxon.minus(isNumber(n) ? { [unit ?? 'day' as string]: n } : n).toISO());
+    return new DateTime(this.luxon.minus(isNumber(n) ? { [unit ?? ('day' as string)]: n } : n).toISO());
   }
 
-  diff(other: DateTime, unit: DateTimeUnit = "day", opts?: DiffOptions): number {
-    return Math[opts?.rounding ?? "floor"](this.utc.diff(other.utc).as(unit));
+  diff(other: DateTime, unit: DateTimeUnit = 'day', opts?: DiffOptions): number {
+    return Math[opts?.rounding ?? 'floor'](this.utc.diff(other.utc).as(unit));
   }
 
-  startOf(unit: DateTimeUnit = "day"): DateTime {
+  startOf(unit: DateTimeUnit = 'day'): DateTime {
     return new DateTime(this.luxon.startOf(unit).toISO());
   }
 
-  endOf(unit: DateTimeUnit = "day"): DateTime {
+  endOf(unit: DateTimeUnit = 'day'): DateTime {
     return new DateTime(this.luxon.endOf(unit).toISO());
   }
 
@@ -110,7 +105,7 @@ export class DateTime extends Value<Optional<string>> {
   }
 
   toString(): string {
-    return this.value ?? "";
+    return this.value ?? '';
   }
 
   toJSON(): JsonValue {
@@ -121,12 +116,12 @@ export class DateTime extends Value<Optional<string>> {
     return this.luxon.toFormat(format);
   }
 
-  toLocale(locale = "nl-NL", format = "D"): string {
+  toLocale(locale = 'nl-NL', format = 'D'): string {
     return this.luxon.setLocale(locale).toFormat(format);
   }
 
   toFull(locale?: string): string {
-    return this.toLocale(locale, "DDD");
+    return this.toLocale(locale, 'DDD');
   }
 
   toDate(): Optional<Date> {

package/src/http/CacheControl.ts

@@ -1,11 +1,10 @@
-import { cacheAge, CacheAge, entries, isNumber, on } from "../types";
-import { ifDefined } from "../utils";
+import { cacheAge, CacheAge, entries, isNumber, on } from '../types';
+import { ifDefined } from '../utils';
 
 export class CacheControl {
-  name = "Cache-Control";
+  name = 'Cache-Control';
 
-  protected constructor(readonly enabled = true, private directives: Record<string, boolean | CacheAge | undefined> = {}) {
-  }
+  protected constructor(readonly enabled = true, private directives: Record<string, boolean | CacheAge | undefined> = {}) {}
 
   static disabled = () => new CacheControl(false);
 
@@ -21,27 +20,27 @@ export class CacheControl {
 
   static custom = (maxAge?: CacheAge, staleWhileRevalidate?: CacheAge) => new CacheControl().maxAge(maxAge).staleWhileRevalidate(staleWhileRevalidate);
 
-  readonly maxAge = (ca?: CacheAge): this => on(this, t => (t.directives["max-age"] = ca));
+  readonly maxAge = (ca?: CacheAge): this => on(this, t => (t.directives['max-age'] = ca));
 
-  readonly sharedMaxAge = (ca?: CacheAge): this => on(this, t => (t.directives["s-maxage"] = ca));
+  readonly sharedMaxAge = (ca?: CacheAge): this => on(this, t => (t.directives['s-maxage'] = ca));
 
-  readonly noCache = (a?: boolean): this => on(this, t => (t.directives["no-cache"] = a));
+  readonly noCache = (a?: boolean): this => on(this, t => (t.directives['no-cache'] = a));
 
-  readonly mustRevalidate = (a?: boolean): this => on(this, t => (t.directives["must-revalidate"] = a));
+  readonly mustRevalidate = (a?: boolean): this => on(this, t => (t.directives['must-revalidate'] = a));
 
-  readonly private = (a?: boolean): this => on(this, t => (t.directives["private"] = a));
+  readonly private = (a?: boolean): this => on(this, t => (t.directives['private'] = a));
 
-  readonly public = (a?: boolean): this => on(this, t => (t.directives["public"] = a));
+  readonly public = (a?: boolean): this => on(this, t => (t.directives['public'] = a));
 
-  readonly immutable = (a?: boolean): this => on(this, t => (t.directives["immutable"] = a));
+  readonly immutable = (a?: boolean): this => on(this, t => (t.directives['immutable'] = a));
 
-  readonly staleWhileRevalidate = (ca?: CacheAge): this => on(this, t => (t.directives["stale-while-revalidate"] = ca));
+  readonly staleWhileRevalidate = (ca?: CacheAge): this => on(this, t => (t.directives['stale-while-revalidate'] = ca));
 
   value = (): string => this.toString();
 
   toString(): string {
     return entries(this.directives)
       .mapDefined(([k, v]) => ifDefined(v, isNumber(v) ? `${k}=${cacheAge.toSeconds(v)}` : k))
-      .join(",");
+      .join(',');
   }
 }

package/src/services/ApiGateway.ts

@@ -1,6 +1,6 @@
-import { Api, RouteOptions } from "./Api";
-import { FetchOptions, Gateway, Json, Optional, PageList, toPageList, Uri, use } from "../types";
-import { RequestOptions } from "../http";
+import { Api, RouteOptions } from './Api';
+import { FetchOptions, Gateway, Json, Optional, PageList, toPageList, Uri, use } from '../types';
+import { RequestOptions } from '../http';
 
 export class ApiGateway extends Gateway<RouteOptions> {
   constructor(readonly api: Api = new Api()) {

package/src/services/RouteGateway.ts

@@ -1,7 +1,7 @@
-import { Api, RouteOptions } from "./Api";
-import { Func, Id, Json, JsonValue, List, Optional, PageList, toArray, Uri } from "../types";
-import { HttpStatus } from "../http";
-import { ApiGateway } from "./ApiGateway";
+import { Api, RouteOptions } from './Api';
+import { Func, Id, Json, JsonValue, List, Optional, PageList, toArray, Uri } from '../types';
+import { HttpStatus } from '../http';
+import { ApiGateway } from './ApiGateway';
 
 export class RouteGateway extends ApiGateway {
   constructor(readonly route: Func<Uri>, readonly routeId: Func<Uri>, readonly api: Api = new Api()) {

package/src/types/Array.ts

@@ -1,5 +1,5 @@
-import { isArray, isDefined } from "./Is";
-import { on, use } from "./Constructor";
+import { isArray, isDefined } from './Is';
+import { on, use } from './Constructor';
 
 export type OneOrMore<T> = T | Array<T>;
 export type ArrayLike<T> = OneOrMore<T>[];
@@ -14,18 +14,19 @@ export const toObject = <T>(key: keyof T, ...items: ArrayLike<T>): Record<string
   }, {});
 
 export const array = {
-  merge: (first: any[] = [], second: any[] = [], firstKey = "id", secondKey = "id"): any[] =>
+  merge: (first: any[] = [], second: any[] = [], firstKey = 'id', secondKey = 'id'): any[] =>
     first.map(f => ({
       ...f,
-      ...second.find(s => isDefined(s[secondKey]) && isDefined(f[firstKey]) && s[secondKey] === f[firstKey])
+      ...second.find(s => isDefined(s[secondKey]) && isDefined(f[firstKey]) && s[secondKey] === f[firstKey]),
     })),
-  switch: <T>(items: T[] = [], item: T): T[] => use([...items], res => {
-    on(res.indexOf(item), i => (i !== -1 ? res.splice(i, 1) : res.push(item)));
-    return res;
-  }),
+  switch: <T>(items: T[] = [], item: T): T[] =>
+    use([...items], res => {
+      on(res.indexOf(item), i => (i !== -1 ? res.splice(i, 1) : res.push(item)));
+      return res;
+    }),
   splitIn: <T>(items: T[] = [], length = 2): T[][] => {
     const res: T[][] = Array.from({ length }, () => []);
     items.forEach((i, index) => res[index % length].push(i));
     return res;
-  }
-};
+  },
+};

package/src/types/Falsy.ts

@@ -1,4 +1,4 @@
-type Falsy = false | 0 | -0 | 0n | '' | null | undefined;
+type Falsy = false | 0 | 0n | '' | null | undefined;
 type Truthy<T = unknown> = Exclude<T, Falsy>;
 
 export const isFalsy = (v?: unknown): v is Falsy => !v;

package/src/types/List.ts

@@ -1,14 +1,14 @@
-import { ArrayLike, toArray } from "./Array";
-import { Constructor, on } from "./Constructor";
-import { json, Json } from "./Json";
-import { isArray, isDefined, isEmpty } from "./Is";
-import { isA } from "./IsA";
-import { Get, GetProperty, ofGet, ofProperty } from "./Get";
-import { Id } from "./Id";
-import { asString } from "./Text";
-import { tryTo } from "./Try";
-import { meta } from "./Meta";
-import { Optional } from "./Types";
+import { ArrayLike, toArray } from './Array';
+import { Constructor, on } from './Constructor';
+import { json, Json } from './Json';
+import { isArray, isDefined, isEmpty } from './Is';
+import { isA } from './IsA';
+import { Get, GetProperty, ofGet, ofProperty } from './Get';
+import { Id } from './Id';
+import { asString } from './Text';
+import { tryTo } from './Try';
+import { meta } from './Meta';
+import { Optional } from './Types';
 
 export class List<T = unknown> extends Array<T> {
   asc(p: GetProperty<T, any>): List<T> {
@@ -200,14 +200,13 @@ export class List<T = unknown> extends Array<T> {
   }
 
   chunk(chunkSize: number): List<List<T>> {
-    return this.reduce((acc, _, index) =>
-      (index % chunkSize === 0) ? on(acc, a => a.push(this.slice(index, index + chunkSize))) : acc, toList<List<T>>());
+    return this.reduce((acc, _, index) => (index % chunkSize === 0 ? on(acc, a => a.push(this.slice(index, index + chunkSize))) : acc), toList<List<T>>());
   }
 }
 
 export const toList = <T = unknown>(...items: ArrayLike<T>): List<T> => new List<T>().add(...items);
 
-export const isList = <T>(l?: unknown): l is List<T> => isDefined(l) && isArray(l) && isA<List<T>>(l, "first", "last", "asc", "desc");
+export const isList = <T>(l?: unknown): l is List<T> => isDefined(l) && isArray(l) && isA<List<T>>(l, 'first', 'last', 'asc', 'desc');
 
 export const asList = <T>(c: Constructor<T>, items: unknown | unknown[] = []): List<T> => toList<T>(toArray(items).map(i => new c(i)));
 

package/src/types/Meta.ts

@@ -59,4 +59,3 @@ class PropertyMeta {
 export const meta = (subject: unknown): ClassMeta => new ClassMeta(subject ?? {});
 
 export const entries = <T = unknown>(subject: Record<string, T>): List<Entry<T>> => meta(subject).entries<T>();
-

package/src/utils/Base64.ts

@@ -1,7 +1,7 @@
-import { Json } from "../types";
+import { Json } from '../types';
 
 export const base64 = {
-  decode: (data: string): string => Buffer.from(data, "base64").toString("utf-8"),
-  encode: (data: string): string => Buffer.from(data, "utf-8").toString("base64"),
-  toJson: (data: string): Json => JSON.parse(base64.decode(data))
+  decode: (data: string): string => Buffer.from(data, 'base64').toString('utf-8'),
+  encode: (data: string): string => Buffer.from(data, 'utf-8').toString('base64'),
+  toJson: (data: string): Json => JSON.parse(base64.decode(data)),
 };

package/src/utils/Log.ts

@@ -1,4 +1,3 @@
-
 export function log<T>(t: T): T;
 export function log<T>(label: string, t: T): T;
 export function log<T>(labelOrT: string | T, t?: T): T {
@@ -9,4 +8,4 @@ export function log<T>(labelOrT: string | T, t?: T): T {
     console.log(labelOrT);
     return labelOrT as T;
   }
-}
+}

package/src/utils/Sentence.ts

@@ -12,10 +12,10 @@ class Topic extends Sentence {
   it = new Sentence('it', this);
   anything = new Sentence('anything', this);
   id = (id: Id) => new Sentence(`id '${id}'`, this);
-  your = (subject?: unknown) => new Sentence(`your ${subject ?? 'item'}`, this);
-  a = (subject?: unknown) => new Sentence(subject ? `a ${subject}` : 'an item', this);
-  an = (subject?: unknown) => new Sentence(`an ${subject ?? 'item'}`, this);
-  any = (subjects?: unknown) => new Sentence(`any ${subjects ?? 'items'}`, this);
+  your = (subject?: Text) => new Sentence(`your ${subject ?? 'item'}`, this);
+  a = (subject?: Text) => new Sentence(subject ? `a ${subject}` : 'an item', this);
+  an = (subject?: Text) => new Sentence(`an ${subject ?? 'item'}`, this);
+  any = (subjects?: Text) => new Sentence(`any ${subjects ?? 'items'}`, this);
 }
 
 class Verb extends Sentence {

package/src/validation/Contraints.ts

@@ -29,6 +29,9 @@ export const includes = (sub: string, message?: string): PropertyDecorator =>
 export const inList = (values: unknown[], message?: Text): PropertyDecorator =>
   constraint(v => isDefined(v) && isIn(v, values), message ?? 'Value {actual} must appear in list.');
 
+export const inOptionalList = (values: unknown[], message?: Text): PropertyDecorator =>
+  constraint(v => !isDefined(v) || isIn(v, values), message ?? 'Value {actual} must appear in list.');
+
 export const gt = (limit: number, message?: Text): PropertyDecorator => constraint(v => v > limit, message ?? `Value {actual} must be larger than '${limit}'.`);
 
 export const gte = (limit: number, message?: Text): PropertyDecorator =>