@thisisagile/easy 8.20.0 → 8.23.0

package/dist/domain/structs/Weight.d.ts

@@ -5,4 +5,8 @@ export declare class Weight extends Struct {
     readonly uow: UnitOfWeight;
     sizeInG: () => number;
     gte: (w: Weight) => boolean;
+    lte: (w: Weight) => boolean;
+    between: (lower: Weight, upper?: Weight) => boolean;
+    sum: (add: Weight) => Weight;
 }
+export declare const weight: (value: number, uow?: UnitOfWeight | undefined) => Weight;

package/dist/domain/structs/Weight.js

@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Weight = void 0;
+exports.weight = exports.Weight = void 0;
 const enums_1 = require("../enums");
 const validation_1 = require("../../validation");
 const Struct_1 = require("../Struct");
@@ -20,6 +20,9 @@ class Weight extends Struct_1.Struct {
         this.uow = enums_1.UnitOfWeight.byId(this.state.uow, enums_1.UnitOfWeight.G);
         this.sizeInG = () => this.value * this.uow.gMultiplier;
         this.gte = (w) => this.sizeInG() >= w.sizeInG();
+        this.lte = (w) => this.sizeInG() <= w.sizeInG();
+        this.between = (lower, upper = (0, exports.weight)(Number.MAX_VALUE, this.uow)) => this.gte(lower) && this.lte(upper);
+        this.sum = (add) => (0, exports.weight)((this.sizeInG() + add.sizeInG()) / this.uow.gMultiplier, this.uow);
     }
 }
 __decorate([
@@ -27,4 +30,6 @@ __decorate([
     __metadata("design:type", Number)
 ], Weight.prototype, "value", void 0);
 exports.Weight = Weight;
+const weight = (value, uow) => new Weight({ value, uow });
+exports.weight = weight;
 //# sourceMappingURL=Weight.js.map

package/dist/domain/structs/Weight.js.map

@@ -1 +1 @@
-{"version":3,"file":"Weight.js","sourceRoot":"","sources":["../../../src/domain/structs/Weight.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAwC;AACxC,iDAA4C;AAC5C,sCAAmC;AAEnC,MAAa,MAAO,SAAQ,eAAM;IAAlC;;QACuB,UAAK,GAAW,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;QAC7C,QAAG,GAAiB,oBAAY,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,oBAAY,CAAC,CAAC,CAAC,CAAC;QAC/E,YAAO,GAAG,GAAW,EAAE,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC;QAE1D,QAAG,GAAG,CAAC,CAAS,EAAW,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;IAC9D,CAAC;CAAA;AALa;IAAX,IAAA,qBAAQ,GAAE;;qCAA2C;AADxD,wBAMC"}
+{"version":3,"file":"Weight.js","sourceRoot":"","sources":["../../../src/domain/structs/Weight.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAwC;AACxC,iDAA4C;AAC5C,sCAAmC;AAEnC,MAAa,MAAO,SAAQ,eAAM;IAAlC;;QACuB,UAAK,GAAW,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;QAC7C,QAAG,GAAiB,oBAAY,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,oBAAY,CAAC,CAAC,CAAC,CAAC;QAC/E,YAAO,GAAG,GAAW,EAAE,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC;QAE1D,QAAG,GAAG,CAAC,CAAS,EAAW,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;QAE5D,QAAG,GAAG,CAAC,CAAS,EAAW,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;QAG5D,YAAO,GAAG,CAAC,KAAa,EAAE,KAAK,GAAG,IAAA,cAAM,EAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC5G,QAAG,GAAG,CAAC,GAAW,EAAU,EAAE,CAAC,IAAA,cAAM,EAAC,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IAC3G,CAAC;CAAA;AAXa;IAAX,IAAA,qBAAQ,GAAE;;qCAA2C;AADxD,wBAYC;AAEM,MAAM,MAAM,GAAG,CAAC,KAAa,EAAE,GAAkB,EAAU,EAAE,CAAC,IAAI,MAAM,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;AAAnF,QAAA,MAAM,UAA6E"}

package/dist/types/Number.d.ts

@@ -0,0 +1,2 @@
+import { Get } from './Get';
+export declare const asNumber: (n: unknown, alt?: Get<number, any> | undefined) => number;

package/dist/types/Number.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.asNumber = void 0;
+const Get_1 = require("./Get");
+const Try_1 = require("./Try");
+const Is_1 = require("./Is");
+const Text_1 = require("./Text");
+const asNumber = (n, alt) => (0, Try_1.tryTo)(() => (0, Text_1.asString)(n)).map(s => parseInt(s)).filter(n => (0, Is_1.isNumber)(n)).or((0, Get_1.ofGet)(alt) ?? NaN);
+exports.asNumber = asNumber;
+//# sourceMappingURL=Number.js.map

package/dist/types/Number.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Number.js","sourceRoot":"","sources":["../../src/types/Number.ts"],"names":[],"mappings":";;;AAAA,+BAAmC;AACnC,+BAA8B;AAC9B,6BAAgC;AAChC,iCAAkC;AAE3B,MAAM,QAAQ,GAAG,CAAC,CAAU,EAAE,GAAiB,EAAU,EAAE,CAAC,IAAA,WAAK,EAAC,GAAG,EAAE,CAAC,IAAA,eAAQ,EAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,aAAQ,EAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,WAAK,EAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC;AAApJ,QAAA,QAAQ,YAA4I"}

package/dist/types/index.d.ts

@@ -17,6 +17,7 @@ export * from './Json';
 export * from './List';
 export * from './Message';
 export * from './Meta';
+export * from './Number';
 export * from './Result';
 export * from './Results';
 export * from './Tag';

package/dist/types/index.js

@@ -29,6 +29,7 @@ __exportStar(require("./Json"), exports);
 __exportStar(require("./List"), exports);
 __exportStar(require("./Message"), exports);
 __exportStar(require("./Meta"), exports);
+__exportStar(require("./Number"), exports);
 __exportStar(require("./Result"), exports);
 __exportStar(require("./Results"), exports);
 __exportStar(require("./Tag"), exports);

package/dist/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAAwB;AACxB,4CAA0B;AAC1B,gDAA8B;AAC9B,4CAA0B;AAC1B,yCAAuB;AACvB,gDAA8B;AAC9B,8CAA4B;AAC5B,yCAAuB;AACvB,4CAA0B;AAC1B,wCAAsB;AACtB,uCAAqB;AACrB,6CAA2B;AAC3B,uCAAqB;AACrB,wCAAsB;AACtB,2CAAyB;AACzB,yCAAuB;AACvB,yCAAuB;AACvB,4CAA0B;AAC1B,yCAAuB;AACvB,2CAAyB;AACzB,4CAA0B;AAC1B,wCAAsB;AACtB,6CAA2B;AAC3B,yCAAuB;AACvB,wCAAsB;AACtB,wCAAsB;AACtB,yCAAuB;AACvB,gDAA8B;AAC9B,0CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAAwB;AACxB,4CAA0B;AAC1B,gDAA8B;AAC9B,4CAA0B;AAC1B,yCAAuB;AACvB,gDAA8B;AAC9B,8CAA4B;AAC5B,yCAAuB;AACvB,4CAA0B;AAC1B,wCAAsB;AACtB,uCAAqB;AACrB,6CAA2B;AAC3B,uCAAqB;AACrB,wCAAsB;AACtB,2CAAyB;AACzB,yCAAuB;AACvB,yCAAuB;AACvB,4CAA0B;AAC1B,yCAAuB;AACvB,2CAAyB;AACzB,2CAAyB;AACzB,4CAA0B;AAC1B,wCAAsB;AACtB,6CAA2B;AAC3B,yCAAuB;AACvB,wCAAsB;AACtB,wCAAsB;AACtB,yCAAuB;AACvB,gDAA8B;AAC9B,0CAAwB"}

package/dist/utils/Sentence.d.ts

@@ -1,5 +1,5 @@
 import { Id, Text } from '../types';
-export declare class Sentence {
+export declare class Sentence implements Text {
     private sentence;
     constructor(word: Text, pre?: Sentence, sentence?: Text[]);
     toString(): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thisisagile/easy",
-  "version": "8.20.0",
+  "version": "8.23.0",
   "description": "Straightforward library for building domain-driven microservice architectures",
   "author": "Sander Hoogendoorn",
   "license": "MIT",
@@ -31,7 +31,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@thisisagile/easy-test": "8.20.0",
+    "@thisisagile/easy-test": "8.23.0",
     "@types/form-urlencoded": "^4.4.0",
     "@types/jsonwebtoken": "^8.5.8",
     "@types/validator": "^13.7.0"

package/src/domain/structs/Weight.ts

@@ -8,4 +8,12 @@ export class Weight extends Struct {
   sizeInG = (): number => this.value * this.uow.gMultiplier;
 
   gte = (w: Weight): boolean => this.sizeInG() >= w.sizeInG();
-}
+  // gt = (w: Weight): boolean => this.sizeInG() > w.sizeInG();
+  lte = (w: Weight): boolean => this.sizeInG() <= w.sizeInG();
+  // lt = (w: Weight): boolean => this.sizeInG() < w.sizeInG();
+
+  between = (lower: Weight, upper = weight(Number.MAX_VALUE, this.uow)) => this.gte(lower) && this.lte(upper);
+  sum = (add: Weight): Weight => weight((this.sizeInG() + add.sizeInG()) / this.uow.gMultiplier, this.uow);
+}
+
+export const weight = (value: number, uow?: UnitOfWeight): Weight => new Weight({ value, uow });

package/src/types/Number.ts

@@ -0,0 +1,6 @@
+import { Get, ofGet } from './Get';
+import { tryTo } from './Try';
+import { isNumber } from './Is';
+import { asString } from './Text';
+
+export const asNumber = (n: unknown, alt?: Get<number>): number => tryTo(() => asString(n)).map(s => parseInt(s)).filter(n => isNumber(n)).or(ofGet(alt) ?? NaN);

package/src/types/index.ts

@@ -17,6 +17,7 @@ export * from './Json';
 export * from './List';
 export * from './Message';
 export * from './Meta';
+export * from './Number';
 export * from './Result';
 export * from './Results';
 export * from './Tag';

package/src/utils/Sentence.ts

@@ -1,6 +1,6 @@
 import { Id, text, Text } from '../types';
 
-export class Sentence {
+export class Sentence implements Text {
   constructor(word: Text, pre?: Sentence, private sentence: Text[] = (pre?.sentence ?? []).concat(word)) {}
 
   toString(): string {