@thisisagile/easy 7.8.13 → 7.8.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.
@@ -1,5 +1,6 @@
1
1
  import { Value } from '../../types';
2
2
  import { Moment } from 'moment';
3
+ export declare type DateTimeUnit = "years" | "quarters" | "months" | "weeks" | "days" | "hours" | "minutes" | "seconds" | "milliseconds";
3
4
  export declare class DateTime extends Value<string | undefined> {
4
5
  constructor(value?: string | number | Date);
5
6
  protected get utc(): Moment;
@@ -8,8 +9,9 @@ export declare class DateTime extends Value<string | undefined> {
8
9
  get fromNow(): string;
9
10
  isAfter(dt: DateTime): boolean;
10
11
  isBefore(dt: DateTime): boolean;
11
- add: (n: number) => DateTime;
12
- subtract: (n: number) => DateTime;
12
+ add: (n: number, unit?: DateTimeUnit) => DateTime;
13
+ subtract: (n: number, unit?: DateTimeUnit) => DateTime;
14
+ diff: (other: DateTime, unit?: DateTimeUnit) => number;
13
15
  toString(): string;
14
16
  toLocale(locales?: string | string[], options?: Intl.DateTimeFormatOptions): string;
15
17
  toDate(): Date | undefined;
@@ -10,8 +10,9 @@ const utils_1 = require("../../utils");
10
10
  class DateTime extends types_1.Value {
11
11
  constructor(value) {
12
12
  super(utils_1.ifDefined(value, moment_1.default.utc(value, true).toISOString()));
13
- this.add = (n) => new DateTime(this.utc.add(n, 'days').toISOString());
14
- this.subtract = (n) => new DateTime(this.utc.subtract(n, 'days').toISOString());
13
+ this.add = (n, unit = 'days') => new DateTime(this.utc.add(n, unit).toISOString());
14
+ this.subtract = (n, unit = 'days') => new DateTime(this.utc.subtract(n, unit).toISOString());
15
+ this.diff = (other, unit = 'days') => this.utc.diff(other.utc, unit);
15
16
  }
16
17
  get utc() {
17
18
  return moment_1.default.utc(this.value);
@@ -1 +1 @@
1
- {"version":3,"file":"DateTime.js","sourceRoot":"","sources":["../../../src/domain/values/DateTime.ts"],"names":[],"mappings":";;;;;;AAAA,uCAA+C;AAC/C,oDAAwC;AACxC,uCAAwC;AAExC,MAAa,QAAS,SAAQ,aAAyB;IACrD,YAAY,KAA8B;QACxC,KAAK,CAAC,iBAAS,CAAC,KAAK,EAAE,gBAAM,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QA2BjE,QAAG,GAAG,CAAC,CAAS,EAAY,EAAE,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAEnF,aAAQ,GAAG,CAAC,CAAS,EAAY,EAAE,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;IA5B7F,CAAC;IAED,IAAc,GAAG;QACf,OAAO,gBAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,MAAM,KAAK,GAAG;QACZ,OAAO,IAAI,QAAQ,CAAC,gBAAM,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;IAClD,CAAC;IAED,IAAI,OAAO;QACT,OAAO,iBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IACrD,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9C,CAAC;IAED,OAAO,CAAC,EAAY;QAClB,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAM,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAChD,CAAC;IAED,QAAQ,CAAC,EAAY;QACnB,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,gBAAM,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IACjD,CAAC;IAMD,QAAQ;QACN,OAAO,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;IAC1B,CAAC;IAED,QAAQ,CAAC,UAA6B,OAAO,EAAE,UAAsC,EAAE;QACrF,OAAO,IAAI,CAAC,MAAM,EAAE,EAAE,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;IACnE,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACtD,CAAC;CACF;AA5CD,4BA4CC"}
1
+ {"version":3,"file":"DateTime.js","sourceRoot":"","sources":["../../../src/domain/values/DateTime.ts"],"names":[],"mappings":";;;;;;AAAA,uCAA+C;AAC/C,oDAAwC;AACxC,uCAAwC;AAIxC,MAAa,QAAS,SAAQ,aAAyB;IACrD,YAAY,KAA8B;QACxC,KAAK,CAAC,iBAAS,CAAC,KAAK,EAAE,gBAAM,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QA2BjE,QAAG,GAAG,CAAC,CAAS,EAAE,OAAqB,MAAM,EAAY,EAAE,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAE9G,aAAQ,GAAG,CAAC,CAAS,EAAE,OAAqB,MAAM,EAAY,EAAE,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAExH,SAAI,GAAG,CAAC,KAAe,EAAE,OAAqB,MAAM,EAAU,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IA9BhG,CAAC;IAED,IAAc,GAAG;QACf,OAAO,gBAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,MAAM,KAAK,GAAG;QACZ,OAAO,IAAI,QAAQ,CAAC,gBAAM,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;IAClD,CAAC;IAED,IAAI,OAAO;QACT,OAAO,iBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IACrD,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9C,CAAC;IAED,OAAO,CAAC,EAAY;QAClB,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAM,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAChD,CAAC;IAED,QAAQ,CAAC,EAAY;QACnB,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,gBAAM,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IACjD,CAAC;IAQD,QAAQ;QACN,OAAO,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;IAC1B,CAAC;IAED,QAAQ,CAAC,UAA6B,OAAO,EAAE,UAAsC,EAAE;QACrF,OAAO,IAAI,CAAC,MAAM,EAAE,EAAE,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;IACnE,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACtD,CAAC;CACF;AA9CD,4BA8CC"}
@@ -28,7 +28,7 @@ HttpStatus.NotAuthorized = new HttpStatus('Not authorized', 401);
28
28
  HttpStatus.Forbidden = new HttpStatus('Forbidden', 403);
29
29
  HttpStatus.NotFound = new HttpStatus('Not found', 404);
30
30
  HttpStatus.Conflict = new HttpStatus('Conflict', 409);
31
- HttpStatus.ImATeapot = new HttpStatus("I'm a teapot", 418);
31
+ HttpStatus.ImATeapot = new HttpStatus('I\'m a teapot', 418);
32
32
  HttpStatus.InternalServerError = new HttpStatus('Internal server error', 500);
33
33
  HttpStatus.NotImplemented = new HttpStatus('Not implemented', 501);
34
34
  HttpStatus.BadGateway = new HttpStatus('Bad gateway', 502);
@@ -1 +1 @@
1
- {"version":3,"file":"HttpStatus.js","sourceRoot":"","sources":["../../src/http/HttpStatus.ts"],"names":[],"mappings":";;;AAAA,oCAA4C;AAE5C,MAAa,UAAW,SAAQ,YAAI;IAkBlC,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,aAAa,CAAC;IAClD,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC;IACzC,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC;IACzC,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,EAAY,CAAC;IAC3B,CAAC;;AAhCH,gCAiCC;AAhCQ,aAAE,GAAG,IAAI,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AAC/B,kBAAO,GAAG,IAAI,UAAU,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;AACzC,oBAAS,GAAG,IAAI,UAAU,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;AAC9C,0BAAe,GAAG,IAAI,UAAU,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;AAC1D,2BAAgB,GAAG,IAAI,UAAU,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;AAC5D,gBAAK,GAAG,IAAI,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;AACrC,qBAAU,GAAG,IAAI,UAAU,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;AAChD,wBAAa,GAAG,IAAI,UAAU,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;AACtD,oBAAS,GAAG,IAAI,UAAU,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;AAC7C,mBAAQ,GAAG,IAAI,UAAU,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;AAC5C,mBAAQ,GAAG,IAAI,UAAU,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;AAC3C,oBAAS,GAAG,IAAI,UAAU,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;AAChD,8BAAmB,GAAG,IAAI,UAAU,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC;AACnE,yBAAc,GAAG,IAAI,UAAU,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC;AACxD,qBAAU,GAAG,IAAI,UAAU,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;AAChD,6BAAkB,GAAG,IAAI,UAAU,CAAC,qBAAqB,EAAE,GAAG,CAAC,CAAC;AAmBlE,MAAM,YAAY,GAAG,CAAC,CAAW,EAAmB,EAAE,CAAC,YAAI,CAAa,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;AAArF,QAAA,YAAY,gBAAyE;AAE3F,MAAM,YAAY,GAAG,CAAC,CAAoB,EAAc,EAAE,CAAC,CAAC,oBAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AAAhG,QAAA,YAAY,gBAAoF"}
1
+ {"version":3,"file":"HttpStatus.js","sourceRoot":"","sources":["../../src/http/HttpStatus.ts"],"names":[],"mappings":";;;AAAA,oCAA4C;AAE5C,MAAa,UAAW,SAAQ,YAAI;IAkBlC,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,aAAa,CAAC;IAClD,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC;IACzC,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC;IACzC,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,EAAY,CAAC;IAC3B,CAAC;;AAhCH,gCAiCC;AAhCQ,aAAE,GAAG,IAAI,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AAC/B,kBAAO,GAAG,IAAI,UAAU,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;AACzC,oBAAS,GAAG,IAAI,UAAU,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;AAC9C,0BAAe,GAAG,IAAI,UAAU,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;AAC1D,2BAAgB,GAAG,IAAI,UAAU,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;AAC5D,gBAAK,GAAG,IAAI,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;AACrC,qBAAU,GAAG,IAAI,UAAU,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;AAChD,wBAAa,GAAG,IAAI,UAAU,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;AACtD,oBAAS,GAAG,IAAI,UAAU,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;AAC7C,mBAAQ,GAAG,IAAI,UAAU,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;AAC5C,mBAAQ,GAAG,IAAI,UAAU,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;AAC3C,oBAAS,GAAG,IAAI,UAAU,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;AACjD,8BAAmB,GAAG,IAAI,UAAU,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC;AACnE,yBAAc,GAAG,IAAI,UAAU,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC;AACxD,qBAAU,GAAG,IAAI,UAAU,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;AAChD,6BAAkB,GAAG,IAAI,UAAU,CAAC,qBAAqB,EAAE,GAAG,CAAC,CAAC;AAmBlE,MAAM,YAAY,GAAG,CAAC,CAAW,EAAmB,EAAE,CAAC,YAAI,CAAa,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;AAArF,QAAA,YAAY,gBAAyE;AAE3F,MAAM,YAAY,GAAG,CAAC,CAAoB,EAAc,EAAE,CAAC,CAAC,oBAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AAAhG,QAAA,YAAY,gBAAoF"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@thisisagile/easy",
3
- "version": "7.8.13",
3
+ "version": "7.8.15",
4
4
  "description": "Straightforward library for building domain-driven microservice architectures",
5
5
  "author": "Sander Hoogendoorn",
6
6
  "license": "MIT",
@@ -31,7 +31,7 @@
31
31
  "access": "public"
32
32
  },
33
33
  "devDependencies": {
34
- "@thisisagile/easy-test": "7.8.13",
34
+ "@thisisagile/easy-test": "7.8.15",
35
35
  "@types/form-urlencoded": "^4.4.0",
36
36
  "@types/jsonwebtoken": "^8.5.5",
37
37
  "@types/uuid": "^8.3.1",
@@ -2,6 +2,8 @@ import { isDefined, Value } from '../../types';
2
2
  import moment, { Moment } from 'moment';
3
3
  import { ifDefined } from '../../utils';
4
4
 
5
+ export type DateTimeUnit = "years" | "quarters" | "months" | "weeks" | "days" | "hours" | "minutes" | "seconds" | "milliseconds";
6
+
5
7
  export class DateTime extends Value<string | undefined> {
6
8
  constructor(value?: string | number | Date) {
7
9
  super(ifDefined(value, moment.utc(value, true).toISOString()));
@@ -31,9 +33,11 @@ export class DateTime extends Value<string | undefined> {
31
33
  return this.utc.isBefore(moment.utc(dt.value));
32
34
  }
33
35
 
34
- add = (n: number): DateTime => new DateTime(this.utc.add(n, 'days').toISOString());
36
+ add = (n: number, unit: DateTimeUnit = 'days'): DateTime => new DateTime(this.utc.add(n, unit).toISOString());
37
+
38
+ subtract = (n: number, unit: DateTimeUnit = 'days'): DateTime => new DateTime(this.utc.subtract(n, unit).toISOString());
35
39
 
36
- subtract = (n: number): DateTime => new DateTime(this.utc.subtract(n, 'days').toISOString());
40
+ diff = (other: DateTime, unit: DateTimeUnit = 'days'): number => this.utc.diff(other.utc, unit);
37
41
 
38
42
  toString(): string {
39
43
  return this.value ?? '';
@@ -12,7 +12,7 @@ export class HttpStatus extends Enum {
12
12
  static Forbidden = new HttpStatus('Forbidden', 403);
13
13
  static NotFound = new HttpStatus('Not found', 404);
14
14
  static Conflict = new HttpStatus('Conflict', 409);
15
- static ImATeapot = new HttpStatus("I'm a teapot", 418);
15
+ static ImATeapot = new HttpStatus('I\'m a teapot', 418);
16
16
  static InternalServerError = new HttpStatus('Internal server error', 500);
17
17
  static NotImplemented = new HttpStatus('Not implemented', 501);
18
18
  static BadGateway = new HttpStatus('Bad gateway', 502);
@@ -37,4 +37,4 @@ export class HttpStatus extends Enum {
37
37
 
38
38
  export const isHttpStatus = (s?: unknown): s is HttpStatus => isAn<HttpStatus>(s, 'id', 'status');
39
39
 
40
- export const toHttpStatus = (s: HttpStatus | Code): HttpStatus => (isHttpStatus(s) ? s : HttpStatus.byId(s));
40
+ export const toHttpStatus = (s: HttpStatus | Code): HttpStatus => (isHttpStatus(s) ? s : HttpStatus.byId(s));