@thisisagile/easy 17.23.1 → 17.24.1

package/dist/utils/Promise.mjs

@@ -6,9 +6,12 @@ import {
   tuple2,
   tuple3,
   tuple4,
-  tuple5
-} from "../chunk-Q7FJUYZT.mjs";
-import "../chunk-AMIP3FS5.mjs";
+  tuple5,
+  tupleO
+} from "../chunk-HO3IEF5S.mjs";
+import "../chunk-KBB2WGTO.mjs";
+import "../chunk-TLYJ2G3X.mjs";
+import "../chunk-SSROJBD5.mjs";
 import "../chunk-CO2AFYVD.mjs";
 import "../chunk-BDA5LB4S.mjs";
 import "../chunk-SJGQU3OG.mjs";
@@ -26,6 +29,7 @@ export {
   tuple2,
   tuple3,
   tuple4,
-  tuple5
+  tuple5,
+  tupleO
 };
 //# sourceMappingURL=Promise.mjs.map

package/dist/utils/Seconds.mjs

@@ -1,7 +1,8 @@
 import {
   seconds
-} from "../chunk-DAG7KGVL.mjs";
-import "../chunk-AMIP3FS5.mjs";
+} from "../chunk-O4CJ7NSN.mjs";
+import "../chunk-TLYJ2G3X.mjs";
+import "../chunk-SSROJBD5.mjs";
 import "../chunk-CO2AFYVD.mjs";
 import "../chunk-BDA5LB4S.mjs";
 import "../chunk-SJGQU3OG.mjs";

package/dist/utils/Sentence.mjs

@@ -1,8 +1,9 @@
 import {
   text
-} from "../chunk-P4MEAARF.mjs";
-import "../chunk-5UXTE3WM.mjs";
-import "../chunk-AMIP3FS5.mjs";
+} from "../chunk-6ENYJKOF.mjs";
+import "../chunk-KBB2WGTO.mjs";
+import "../chunk-TLYJ2G3X.mjs";
+import "../chunk-SSROJBD5.mjs";
 import "../chunk-CO2AFYVD.mjs";
 import "../chunk-BDA5LB4S.mjs";
 import "../chunk-SJGQU3OG.mjs";

package/dist/utils/Sentence.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/Sentence.ts"],"sourcesContent":["import type { Text } from '../types/Text';\nimport { text } from '../types/Template';\nimport { Id } from '../types/Id';\n\nexport class Sentence implements Text {\n  constructor(\n    word: Text,\n    pre?: Sentence,\n    private sentence: Text[] = (pre?.sentence ?? []).concat(word)\n  ) {}\n\n  toString(): string {\n    return text(this.sentence.join(' ')).sentence.toString();\n  }\n}\n\nclass Topic extends Sentence {\n  it = new Sentence('it', this);\n  anything = new Sentence('anything', this);\n  id = (id: Id) => new Sentence(`id '${id}'`, this);\n  your = (subject?: Text) => new Sentence(`your ${subject ?? 'item'}`, this);\n  a = (subject?: Text) => new Sentence(subject ? `a ${subject}` : 'an item', this);\n  an = (subject?: Text) => new Sentence(`an ${subject ?? 'item'}`, this);\n  any = (subjects?: Text) => new Sentence(`any ${subjects ?? 'items'}`, this);\n}\n\nclass Verb extends Sentence {\n  add = new Topic('add', this);\n  check = new Topic('check', this);\n  fetch = new Topic('fetch', this);\n  find = new Topic('find', this);\n  like = new Topic('like', this);\n  process = new Topic('process', this);\n  remove = new Topic('remove', this);\n  translate = new Topic('translate', this);\n  update = new Topic('update', this);\n  validate = new Topic('validate', this);\n}\n\nclass Not extends Verb {}\n\nclass SupportVerb extends Verb {\n  not = new Not('not', this);\n}\n\nclass We extends Sentence {\n  could = new SupportVerb('could', this);\n  did = new SupportVerb('did', this);\n\n  added = new Topic('added', this);\n  checked = new Topic('checked', this);\n  fetched = new Topic('fetched', this);\n  found = new Topic('found', this);\n  liked = new Topic('liked', this);\n  processed = new Topic('processed', this);\n  removed = new Topic('removed', this);\n  translated = new Topic('translated', this);\n  updated = new Topic('updated', this);\n  validated = new Topic('validated', this);\n}\n\nexport const we = new We('we');\n"],"mappings":";;;;;;;;;;;;;;;;AAIO,IAAM,WAAN,MAA+B;AAAA,EACpC,YACE,MACA,KACQ,YAAoB,KAAK,YAAY,CAAC,GAAG,OAAO,IAAI,GAC5D;AADQ;AAAA,EACP;AAAA,EAEH,WAAmB;AACjB,WAAO,KAAK,KAAK,SAAS,KAAK,GAAG,CAAC,EAAE,SAAS,SAAS;AAAA,EACzD;AACF;AAEA,IAAM,QAAN,cAAoB,SAAS;AAAA,EAC3B,KAAK,IAAI,SAAS,MAAM,IAAI;AAAA,EAC5B,WAAW,IAAI,SAAS,YAAY,IAAI;AAAA,EACxC,KAAK,CAAC,OAAW,IAAI,SAAS,OAAO,EAAE,KAAK,IAAI;AAAA,EAChD,OAAO,CAAC,YAAmB,IAAI,SAAS,QAAQ,WAAW,MAAM,IAAI,IAAI;AAAA,EACzE,IAAI,CAAC,YAAmB,IAAI,SAAS,UAAU,KAAK,OAAO,KAAK,WAAW,IAAI;AAAA,EAC/E,KAAK,CAAC,YAAmB,IAAI,SAAS,MAAM,WAAW,MAAM,IAAI,IAAI;AAAA,EACrE,MAAM,CAAC,aAAoB,IAAI,SAAS,OAAO,YAAY,OAAO,IAAI,IAAI;AAC5E;AAEA,IAAM,OAAN,cAAmB,SAAS;AAAA,EAC1B,MAAM,IAAI,MAAM,OAAO,IAAI;AAAA,EAC3B,QAAQ,IAAI,MAAM,SAAS,IAAI;AAAA,EAC/B,QAAQ,IAAI,MAAM,SAAS,IAAI;AAAA,EAC/B,OAAO,IAAI,MAAM,QAAQ,IAAI;AAAA,EAC7B,OAAO,IAAI,MAAM,QAAQ,IAAI;AAAA,EAC7B,UAAU,IAAI,MAAM,WAAW,IAAI;AAAA,EACnC,SAAS,IAAI,MAAM,UAAU,IAAI;AAAA,EACjC,YAAY,IAAI,MAAM,aAAa,IAAI;AAAA,EACvC,SAAS,IAAI,MAAM,UAAU,IAAI;AAAA,EACjC,WAAW,IAAI,MAAM,YAAY,IAAI;AACvC;AAEA,IAAM,MAAN,cAAkB,KAAK;AAAC;AAExB,IAAM,cAAN,cAA0B,KAAK;AAAA,EAC7B,MAAM,IAAI,IAAI,OAAO,IAAI;AAC3B;AAEA,IAAM,KAAN,cAAiB,SAAS;AAAA,EACxB,QAAQ,IAAI,YAAY,SAAS,IAAI;AAAA,EACrC,MAAM,IAAI,YAAY,OAAO,IAAI;AAAA,EAEjC,QAAQ,IAAI,MAAM,SAAS,IAAI;AAAA,EAC/B,UAAU,IAAI,MAAM,WAAW,IAAI;AAAA,EACnC,UAAU,IAAI,MAAM,WAAW,IAAI;AAAA,EACnC,QAAQ,IAAI,MAAM,SAAS,IAAI;AAAA,EAC/B,QAAQ,IAAI,MAAM,SAAS,IAAI;AAAA,EAC/B,YAAY,IAAI,MAAM,aAAa,IAAI;AAAA,EACvC,UAAU,IAAI,MAAM,WAAW,IAAI;AAAA,EACnC,aAAa,IAAI,MAAM,cAAc,IAAI;AAAA,EACzC,UAAU,IAAI,MAAM,WAAW,IAAI;AAAA,EACnC,YAAY,IAAI,MAAM,aAAa,IAAI;AACzC;AAEO,IAAM,KAAK,IAAI,GAAG,IAAI;","names":[]}
+{"version":3,"sources":["../../src/utils/Sentence.ts"],"sourcesContent":["import type { Text } from '../types/Text';\nimport { Id } from '../types/Id';\nimport { text } from '../types/ToText';\n\nexport class Sentence implements Text {\n  constructor(\n    word: Text,\n    pre?: Sentence,\n    private sentence: Text[] = (pre?.sentence ?? []).concat(word)\n  ) {}\n\n  toString(): string {\n    return text(this.sentence.join(' ')).sentence.toString();\n  }\n}\n\nclass Topic extends Sentence {\n  it = new Sentence('it', this);\n  anything = new Sentence('anything', this);\n  id = (id: Id) => new Sentence(`id '${id}'`, this);\n  your = (subject?: Text) => new Sentence(`your ${subject ?? 'item'}`, this);\n  a = (subject?: Text) => new Sentence(subject ? `a ${subject}` : 'an item', this);\n  an = (subject?: Text) => new Sentence(`an ${subject ?? 'item'}`, this);\n  any = (subjects?: Text) => new Sentence(`any ${subjects ?? 'items'}`, this);\n}\n\nclass Verb extends Sentence {\n  add = new Topic('add', this);\n  check = new Topic('check', this);\n  fetch = new Topic('fetch', this);\n  find = new Topic('find', this);\n  like = new Topic('like', this);\n  process = new Topic('process', this);\n  remove = new Topic('remove', this);\n  translate = new Topic('translate', this);\n  update = new Topic('update', this);\n  validate = new Topic('validate', this);\n}\n\nclass Not extends Verb {}\n\nclass SupportVerb extends Verb {\n  not = new Not('not', this);\n}\n\nclass We extends Sentence {\n  could = new SupportVerb('could', this);\n  did = new SupportVerb('did', this);\n\n  added = new Topic('added', this);\n  checked = new Topic('checked', this);\n  fetched = new Topic('fetched', this);\n  found = new Topic('found', this);\n  liked = new Topic('liked', this);\n  processed = new Topic('processed', this);\n  removed = new Topic('removed', this);\n  translated = new Topic('translated', this);\n  updated = new Topic('updated', this);\n  validated = new Topic('validated', this);\n}\n\nexport const we = new We('we');\n"],"mappings":";;;;;;;;;;;;;;;;;AAIO,IAAM,WAAN,MAA+B;AAAA,EACpC,YACE,MACA,KACQ,YAAoB,KAAK,YAAY,CAAC,GAAG,OAAO,IAAI,GAC5D;AADQ;AAAA,EACP;AAAA,EAEH,WAAmB;AACjB,WAAO,KAAK,KAAK,SAAS,KAAK,GAAG,CAAC,EAAE,SAAS,SAAS;AAAA,EACzD;AACF;AAEA,IAAM,QAAN,cAAoB,SAAS;AAAA,EAC3B,KAAK,IAAI,SAAS,MAAM,IAAI;AAAA,EAC5B,WAAW,IAAI,SAAS,YAAY,IAAI;AAAA,EACxC,KAAK,CAAC,OAAW,IAAI,SAAS,OAAO,EAAE,KAAK,IAAI;AAAA,EAChD,OAAO,CAAC,YAAmB,IAAI,SAAS,QAAQ,WAAW,MAAM,IAAI,IAAI;AAAA,EACzE,IAAI,CAAC,YAAmB,IAAI,SAAS,UAAU,KAAK,OAAO,KAAK,WAAW,IAAI;AAAA,EAC/E,KAAK,CAAC,YAAmB,IAAI,SAAS,MAAM,WAAW,MAAM,IAAI,IAAI;AAAA,EACrE,MAAM,CAAC,aAAoB,IAAI,SAAS,OAAO,YAAY,OAAO,IAAI,IAAI;AAC5E;AAEA,IAAM,OAAN,cAAmB,SAAS;AAAA,EAC1B,MAAM,IAAI,MAAM,OAAO,IAAI;AAAA,EAC3B,QAAQ,IAAI,MAAM,SAAS,IAAI;AAAA,EAC/B,QAAQ,IAAI,MAAM,SAAS,IAAI;AAAA,EAC/B,OAAO,IAAI,MAAM,QAAQ,IAAI;AAAA,EAC7B,OAAO,IAAI,MAAM,QAAQ,IAAI;AAAA,EAC7B,UAAU,IAAI,MAAM,WAAW,IAAI;AAAA,EACnC,SAAS,IAAI,MAAM,UAAU,IAAI;AAAA,EACjC,YAAY,IAAI,MAAM,aAAa,IAAI;AAAA,EACvC,SAAS,IAAI,MAAM,UAAU,IAAI;AAAA,EACjC,WAAW,IAAI,MAAM,YAAY,IAAI;AACvC;AAEA,IAAM,MAAN,cAAkB,KAAK;AAAC;AAExB,IAAM,cAAN,cAA0B,KAAK;AAAA,EAC7B,MAAM,IAAI,IAAI,OAAO,IAAI;AAC3B;AAEA,IAAM,KAAN,cAAiB,SAAS;AAAA,EACxB,QAAQ,IAAI,YAAY,SAAS,IAAI;AAAA,EACrC,MAAM,IAAI,YAAY,OAAO,IAAI;AAAA,EAEjC,QAAQ,IAAI,MAAM,SAAS,IAAI;AAAA,EAC/B,UAAU,IAAI,MAAM,WAAW,IAAI;AAAA,EACnC,UAAU,IAAI,MAAM,WAAW,IAAI;AAAA,EACnC,QAAQ,IAAI,MAAM,SAAS,IAAI;AAAA,EAC/B,QAAQ,IAAI,MAAM,SAAS,IAAI;AAAA,EAC/B,YAAY,IAAI,MAAM,aAAa,IAAI;AAAA,EACvC,UAAU,IAAI,MAAM,WAAW,IAAI;AAAA,EACnC,aAAa,IAAI,MAAM,cAAc,IAAI;AAAA,EACzC,UAAU,IAAI,MAAM,WAAW,IAAI;AAAA,EACnC,YAAY,IAAI,MAAM,aAAa,IAAI;AACzC;AAEO,IAAM,KAAK,IAAI,GAAG,IAAI;","names":[]}

package/dist/utils/View.mjs

@@ -4,24 +4,24 @@ import {
   toViewer,
   view,
   views
-} from "../chunk-MBFLUJ5X.mjs";
-import "../chunk-SSROJBD5.mjs";
-import "../chunk-QL3DRPMM.mjs";
-import "../chunk-4BH22HLY.mjs";
-import "../chunk-7WCAHERW.mjs";
-import "../chunk-OWZ5I5IV.mjs";
+} from "../chunk-73VXBPTL.mjs";
+import "../chunk-BDKRR6H2.mjs";
+import "../chunk-JJQAGAQN.mjs";
+import "../chunk-GA7BBYC2.mjs";
+import "../chunk-YYIIQGLL.mjs";
 import "../chunk-OFGI5FLG.mjs";
-import "../chunk-7W67IZE4.mjs";
-import "../chunk-HL7ITJJT.mjs";
-import "../chunk-Q7FJUYZT.mjs";
-import "../chunk-A42HFDBS.mjs";
+import "../chunk-ST3P6VWM.mjs";
+import "../chunk-OVORFG3O.mjs";
+import "../chunk-HO3IEF5S.mjs";
+import "../chunk-HFBHENMJ.mjs";
 import "../chunk-WSBULPUZ.mjs";
-import "../chunk-TG7T4QPS.mjs";
-import "../chunk-P4MEAARF.mjs";
-import "../chunk-3LWQJAEJ.mjs";
-import "../chunk-QH2LF3L3.mjs";
-import "../chunk-5UXTE3WM.mjs";
-import "../chunk-AMIP3FS5.mjs";
+import "../chunk-ONWMWJ43.mjs";
+import "../chunk-6ENYJKOF.mjs";
+import "../chunk-FLJXHLSM.mjs";
+import "../chunk-LIDMZELG.mjs";
+import "../chunk-KBB2WGTO.mjs";
+import "../chunk-TLYJ2G3X.mjs";
+import "../chunk-SSROJBD5.mjs";
 import "../chunk-CO2AFYVD.mjs";
 import "../chunk-BDA5LB4S.mjs";
 import "../chunk-SJGQU3OG.mjs";

package/dist/validation/Contraints.mjs

@@ -17,21 +17,22 @@ import {
   required,
   rule,
   valid
-} from "../chunk-KWE3VWIW.mjs";
+} from "../chunk-Y5NBOPDI.mjs";
 import "../chunk-ADJAEGCT.mjs";
-import "../chunk-OWZ5I5IV.mjs";
+import "../chunk-YYIIQGLL.mjs";
 import "../chunk-OFGI5FLG.mjs";
-import "../chunk-7W67IZE4.mjs";
-import "../chunk-HL7ITJJT.mjs";
-import "../chunk-Q7FJUYZT.mjs";
-import "../chunk-A42HFDBS.mjs";
+import "../chunk-ST3P6VWM.mjs";
+import "../chunk-OVORFG3O.mjs";
+import "../chunk-HO3IEF5S.mjs";
+import "../chunk-HFBHENMJ.mjs";
 import "../chunk-WSBULPUZ.mjs";
-import "../chunk-TG7T4QPS.mjs";
-import "../chunk-P4MEAARF.mjs";
-import "../chunk-3LWQJAEJ.mjs";
-import "../chunk-QH2LF3L3.mjs";
-import "../chunk-5UXTE3WM.mjs";
-import "../chunk-AMIP3FS5.mjs";
+import "../chunk-ONWMWJ43.mjs";
+import "../chunk-6ENYJKOF.mjs";
+import "../chunk-FLJXHLSM.mjs";
+import "../chunk-LIDMZELG.mjs";
+import "../chunk-KBB2WGTO.mjs";
+import "../chunk-TLYJ2G3X.mjs";
+import "../chunk-SSROJBD5.mjs";
 import "../chunk-CO2AFYVD.mjs";
 import "../chunk-BDA5LB4S.mjs";
 import "../chunk-SJGQU3OG.mjs";

package/dist/validation/Validate.mjs

@@ -3,19 +3,20 @@ import {
   isValid,
   validate,
   validateReject
-} from "../chunk-OWZ5I5IV.mjs";
+} from "../chunk-YYIIQGLL.mjs";
 import "../chunk-OFGI5FLG.mjs";
-import "../chunk-7W67IZE4.mjs";
-import "../chunk-HL7ITJJT.mjs";
-import "../chunk-Q7FJUYZT.mjs";
-import "../chunk-A42HFDBS.mjs";
+import "../chunk-ST3P6VWM.mjs";
+import "../chunk-OVORFG3O.mjs";
+import "../chunk-HO3IEF5S.mjs";
+import "../chunk-HFBHENMJ.mjs";
 import "../chunk-WSBULPUZ.mjs";
-import "../chunk-TG7T4QPS.mjs";
-import "../chunk-P4MEAARF.mjs";
-import "../chunk-3LWQJAEJ.mjs";
-import "../chunk-QH2LF3L3.mjs";
-import "../chunk-5UXTE3WM.mjs";
-import "../chunk-AMIP3FS5.mjs";
+import "../chunk-ONWMWJ43.mjs";
+import "../chunk-6ENYJKOF.mjs";
+import "../chunk-FLJXHLSM.mjs";
+import "../chunk-LIDMZELG.mjs";
+import "../chunk-KBB2WGTO.mjs";
+import "../chunk-TLYJ2G3X.mjs";
+import "../chunk-SSROJBD5.mjs";
 import "../chunk-CO2AFYVD.mjs";
 import "../chunk-BDA5LB4S.mjs";
 import "../chunk-SJGQU3OG.mjs";

package/dist/validation/When.mjs

@@ -1,19 +1,20 @@
 import {
   When,
   when
-} from "../chunk-OWZ5I5IV.mjs";
+} from "../chunk-YYIIQGLL.mjs";
 import "../chunk-OFGI5FLG.mjs";
-import "../chunk-7W67IZE4.mjs";
-import "../chunk-HL7ITJJT.mjs";
-import "../chunk-Q7FJUYZT.mjs";
-import "../chunk-A42HFDBS.mjs";
+import "../chunk-ST3P6VWM.mjs";
+import "../chunk-OVORFG3O.mjs";
+import "../chunk-HO3IEF5S.mjs";
+import "../chunk-HFBHENMJ.mjs";
 import "../chunk-WSBULPUZ.mjs";
-import "../chunk-TG7T4QPS.mjs";
-import "../chunk-P4MEAARF.mjs";
-import "../chunk-3LWQJAEJ.mjs";
-import "../chunk-QH2LF3L3.mjs";
-import "../chunk-5UXTE3WM.mjs";
-import "../chunk-AMIP3FS5.mjs";
+import "../chunk-ONWMWJ43.mjs";
+import "../chunk-6ENYJKOF.mjs";
+import "../chunk-FLJXHLSM.mjs";
+import "../chunk-LIDMZELG.mjs";
+import "../chunk-KBB2WGTO.mjs";
+import "../chunk-TLYJ2G3X.mjs";
+import "../chunk-SSROJBD5.mjs";
 import "../chunk-CO2AFYVD.mjs";
 import "../chunk-BDA5LB4S.mjs";
 import "../chunk-SJGQU3OG.mjs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thisisagile/easy",
-  "version": "17.23.1",
+  "version": "17.24.1",
   "description": "Straightforward library for building domain-driven microservice architectures",
   "author": "Sander Hoogendoorn",
   "license": "MIT",

package/src/domain/DateTime.ts

@@ -21,7 +21,7 @@ export type DiffOptions = {
   rounding: 'floor' | 'ceil' | 'round';
 };
 
-type DatetimeInput = string | number | Date | DateTime | null;
+export type DatetimeInput = string | number | Date | DateTime | null;
 
 export class DateTime extends Value<Optional<string>> {
   protected readonly luxon: LuxonDateTime;

package/src/index.ts

@@ -117,7 +117,7 @@ export * from './utils/Sentence';
 export * from './utils/Traverse';
 export * from './utils/View';
 export * from './utils/Wait';
-
 export * from './validation/Contraints';
 export * from './validation/Validate';
 export * from './validation/When';
+export * from './types/ToText';

package/src/process/Scope.ts

@@ -1,10 +1,10 @@
 import { Enum } from '../types/Enum';
-import { text } from '../types/Template';
 import type { Text } from '../types/Text';
 import { kebab } from '../types/Text';
 import { List, toList } from '../types/List';
 import { isString } from '../types/Is';
 import { IdNamePlain } from '../types/IdName';
+import { text } from '../types/ToText';
 
 export class Scope extends Enum {
   protected constructor(

package/src/process/UseCase.ts

@@ -1,11 +1,11 @@
 import { Scope } from './Scope';
 import { App } from './App';
 import { Enum } from '../types/Enum';
-import { text } from '../types/Template';
 import { kebab, Text } from '../types/Text';
 import { List, toList } from '../types/List';
 import { isIn, isString } from '../types/Is';
 import { IdNamePlain } from '../types/IdName';
+import { text } from '../types/ToText';
 
 export class UseCase extends Enum {
   constructor(
@@ -17,6 +17,10 @@ export class UseCase extends Enum {
     super(name, id.toString());
   }
 
+  static byScopes<U extends UseCase>(...s: Scope[]): List<U> {
+    return this.filter(u => u.scopes.some(us => isIn(us, s)));
+  }
+
   with(...s: Scope[]): this {
     this.scopes.add(
       ...toList(s)
@@ -31,8 +35,4 @@ export class UseCase extends Enum {
       ...this.scopes.map(s => s?.for(item))
     );
   }
-
-  static byScopes<U extends UseCase>(...s: Scope[]): List<U> {
-    return this.filter(u => u.scopes.some(us => isIn(us, s)));
-  }
 }

package/src/types/AnyKey.ts

@@ -1,3 +1,11 @@
-export type AnyKey<T> = {
-  [Key in keyof T & (string | number)]: T[Key] extends object ? `${Key}` | `${Key}.${AnyKey<T[Key]>}` : `${Key}`;
+export type AnyKey<T, Visited = never> = {
+  [Key in keyof T & (string | number)]: T[Key] extends object
+    ? T[Key] extends (...args: unknown[]) => unknown
+      ? `${Key}` // don't recurse into function types
+      : T[Key] extends Visited
+        ? `${Key}` // already visiting this type -> break cycle
+        : Key extends keyof T[Key] & (string | number)
+          ? `${Key}` // nested type has same key (e.g. inAmsterdam().inAmsterdam()) -> break chain
+          : `${Key}` | `${Key}.${AnyKey<T[Key], Visited | T>}`
+    : `${Key}`;
 }[keyof T & (string | number)];

package/src/types/Context.ts

@@ -1,7 +1,8 @@
 import { Uuid } from './Uuid';
 import { Identity } from './Identity';
 import { Optional } from './Types';
-import { text } from './Template';
+
+import { text } from './ToText';
 
 export interface EnvContext {
   readonly domain: string;
@@ -35,9 +36,12 @@ export interface RequestContext {
   correlationId?: Uuid;
   lastError?: string;
   lastErrorStack?: string;
+  create: (f: () => void) => void;
+
   get<T>(key: string): T;
+
   set<T>(key: string, value: T): T;
-  create: (f: () => void) => void;
+
   wrap<T>(f: () => Promise<T>): Promise<T>;
 }
 

package/src/types/Exception.ts

@@ -2,7 +2,8 @@ import { asString, Text } from './Text';
 import { Enum } from './Enum';
 import { isDefined } from './Is';
 import { Id } from './Id';
-import { text } from './Template';
+
+import { text } from './ToText';
 
 export class Exception extends Enum {
   static readonly AlreadyExists = new Exception('Subject already exists');

package/src/types/List.ts

@@ -8,6 +8,10 @@ import type { Id } from './Id';
 import { asString } from './Text';
 import { Optional } from './Types';
 import { ifDefined, ifTrue } from '../utils/If';
+import { AnyKey } from './AnyKey';
+import { traverse } from '../utils/Traverse';
+
+type Pred<T> = (value: T, index: number, obj: T[]) => unknown;
 
 export class List<T = unknown> extends Array<T> {
   get ids(): List<Id> {
@@ -42,7 +46,7 @@ export class List<T = unknown> extends Array<T> {
     return this.sort((e1, e2) => (ofProperty(e1, p) < ofProperty(e2, p) ? 1 : -1));
   }
 
-  first(p?: (value: T, index: number, array: T[]) => unknown, params?: unknown): T {
+  first(p?: Pred<T>, params?: unknown): T {
     return (p ? this.find(p, params) : this[0]) as T;
   }
 
@@ -58,15 +62,15 @@ export class List<T = unknown> extends Array<T> {
     return value === this.first();
   }
 
-  next(p?: (value: T, index: number, array: T[]) => unknown, params?: unknown): T {
+  next(p?: Pred<T>, params?: unknown): T {
     return p ? this[this.findIndex(p, params) + 1] : this[0];
   }
 
-  prev(p?: (value: T, index: number, array: T[]) => unknown, params?: unknown): T {
+  prev(p?: Pred<T>, params?: unknown): T {
     return p ? this[this.findIndex(p, params) - 1] : this[0];
   }
 
-  last(p?: (value: T, index: number, array: T[]) => unknown, params?: unknown): T {
+  last(p?: Pred<T>, params?: unknown): T {
     return p ? this.filter(p, params).last() : this[this.length - 1];
   }
 
@@ -157,7 +161,7 @@ export class List<T = unknown> extends Array<T> {
     const seen = new Set<string>();
     return this.filter(item => !seen.has(JSON.stringify(item)) && seen.add(JSON.stringify(item)));
   }
-  filter(p: (value: T, index: number, array: T[]) => unknown, params?: unknown): List<T> {
+  filter(p: Pred<T>, params?: unknown): List<T> {
     return toList<T>(super.filter(p, params));
   }
 
@@ -224,10 +228,12 @@ export class List<T = unknown> extends Array<T> {
     return this.includes(item) ? this.remove(item) : this.add(item);
   }
 
-  switchOn(key: keyof T, item: T): List<T>;
-  switchOn(on: (value: T) => any, item: T): List<T>;
-  switchOn(on: keyof T | ((value: T) => any), item: T): List<T> {
-    return use(typeof on === 'function' ? this.find(on) : this.find(i => i[on] === item[on]), i => (i ? this.remove(i) : this.add(item)));
+  switchOn<U = T>(item: U, on: AnyKey<U>): List<T>;
+  switchOn<T>(item: T, on: Pred<T>): List<T>;
+  switchOn<U = T>(item: T, on: AnyKey<U> | Pred<T>): List<T> {
+    return use(typeof on === 'function' ? this.find(on) : use(traverse(item, on), v => this.find(i => traverse(i, on) === v)), i =>
+      i ? this.remove(i) : this.add(item)
+    );
   }
 
   defined(): List<NonNullable<T>> {
@@ -278,11 +284,11 @@ export class List<T = unknown> extends Array<T> {
   }
 
   //we needed to add U because of a Typescript issue with generics
-  update<U = T>(p: (value: T, index: number, array: T[]) => unknown, val: T | ((v: U) => T)): List<T> {
+  update<U = T>(p: Pred<T>, val: T | ((v: U) => T)): List<T> {
     return this.map((v, i, a) => (p(v, i, a) ? ofGet<T>(val, v, i, a) : v));
   }
 
-  updateFirst<U = T>(p: (value: T, index: number, array: T[]) => unknown, val: T | ((v: U) => T)) {
+  updateFirst<U = T>(p: Pred<T>, val: T | ((v: U) => T)) {
     const index = this.findIndex(p);
     return this.update((t, i) => p(t, i, this) && i == index, val);
   }

package/src/types/Template.ts

@@ -1,11 +1,8 @@
 import { List, toList } from './List';
-import { asString, capitalize, replaceAll, Text } from './Text';
+import { asString, Text } from './Text';
 import { toName } from './Constructor';
-import { Optional } from './Types';
-import { Get, ofGet } from './Get';
-import { isEmpty, isNotEmpty } from './Is';
-import { JsonValue } from './Json';
 import { entries } from './Object';
+import { text, textValue } from './ToText';
 
 export type TemplateOptions = { type?: Text; property?: Text; actual?: Text; subject?: Text };
 
@@ -47,150 +44,3 @@ export function template(tmpl: Text, subject: unknown, options: TemplateOptions
     ...options,
   });
 }
-
-export class ToText implements Text {
-  constructor(readonly subject: string) {}
-
-  get cap(): ToText {
-    return this.map(s => capitalize(s?.toLowerCase()));
-  }
-
-  get capFirst(): ToText {
-    return this.map(s => capitalize(s));
-  }
-
-  get title(): ToText {
-    return this.map(s =>
-      s
-        .split(' ')
-        .map(w => text(w).cap)
-        .join(' ')
-    );
-  }
-
-  get pascal(): ToText {
-    return this.title.replace(' ', '');
-  }
-
-  get lower(): ToText {
-    return this.map(s => s.toLowerCase());
-  }
-
-  get upper(): ToText {
-    return this.map(s => s.toUpperCase());
-  }
-
-  get camel(): ToText {
-    return this.title.trim.map(s => `${s.charAt(0).toLowerCase()}${s.slice(1)}`);
-  }
-
-  get kebab(): ToText {
-    return this.lower.replace(' ', '-');
-  }
-
-  get strictKebab(): ToText {
-    return this.map(s => s.replace(/[^a-z\d]+/gi, ' ').trim()).kebab;
-  }
-
-  get slug(): ToText {
-    return this.map(s =>
-      s
-        .replace(/ß/g, 'ss')
-        .normalize('NFKD')
-        .replace(/[\u0300-\u036F]/g, '')
-        .toLowerCase()
-        .replace(/[^a-z\d]+/g, '-')
-        .replace(/(^-)|(-$)/g, '')
-    );
-  }
-
-  get snake(): ToText {
-    return this.upper.replace(' ', '_');
-  }
-
-  get plural(): ToText {
-    return this.ifLike('') ?? this.add('s');
-  }
-
-  get space(): ToText {
-    return this.map(s => s.replace(/([a-z0-9])([A-Z])/g, '$1 $2').replace(/[_-]/g, ' '));
-  }
-
-  get sentence(): ToText {
-    return this.isEmpty ? this : this.map(s => `${s.charAt(0).toUpperCase()}${s.slice(1)}.`);
-  }
-
-  get initials(): ToText {
-    return this.map(s =>
-      s
-        .split(' ')
-        .map(w => w[0])
-        .join('')
-    );
-  }
-
-  get trim(): ToText {
-    return this.map(s => s.replace(/[- ,_#]/g, ''));
-  }
-
-  get isEmpty(): boolean {
-    return isEmpty(this.toString());
-  }
-
-  parse = (subject: unknown, options = {}): ToText => text(template(this.subject, subject, { type: toName(subject), ...options }));
-
-  is = (...others: unknown[]): boolean => others.some(o => this.toString() === text(o).toString());
-
-  equals = this.is;
-
-  isLike = (...others: unknown[]): boolean => others.some(o => this.trim.lower.is(text(o).trim.lower));
-
-  ifLike = (...others: unknown[]): Optional<this> => (this.isLike(...others) ? this : undefined);
-
-  endsWith = (end?: unknown): boolean => this.subject.endsWith(asString(end));
-
-  startsWith = (end?: unknown): boolean => this.subject.startsWith(asString(end));
-
-  first = (n: number): ToText => this.map(s => s.substring(0, n));
-
-  last = (n: number): ToText => this.map(s => s.substring(s.length - n));
-
-  map = (func: Get<string, string>): ToText => text(ofGet(func, this.subject));
-
-  replace = (search: Text, replace: Text): ToText => this.map(s => replaceAll(s, search, replace));
-
-  add = (add?: unknown, separator = ''): ToText => this.map(s => (isNotEmpty(add) ? `${s}${separator}${text(add)}` : s));
-
-  with = (separator: string, ...other: unknown[]): ToText =>
-    this.map(s =>
-      toList(s)
-        .add(...other.map(u => text(u).toString()))
-        .filter(s => isNotEmpty(s))
-        .join(separator)
-    );
-
-  split = (separator: string = ' '): List<string> => toList(this.subject.split(separator));
-
-  toString(): string {
-    return this.subject;
-  }
-
-  toJSON(): JsonValue {
-    return this.subject;
-  }
-}
-
-export function text(subject?: unknown, alt = ''): ToText {
-  const sub = subject ? asString(subject) : alt;
-  return new ToText(sub !== '[object Object]' ? sub : '');
-}
-
-export function textValue(subject: any, prop: string): string {
-  const p = prop.split('.');
-  const root = subject?.[p[0]];
-  const initial = typeof root === 'object' && root !== null ? root : text(root);
-  return p
-    .splice(1)
-    .reduce((t, s) => t?.[s], initial)
-    ?.toString() ?? '';
-}