@thisisagile/easy 15.15.2 → 15.15.3

package/dist/process/Scope.d.ts

@@ -1,6 +1,9 @@
-import { Enum, IdName, Text } from '../types';
+import { Enum, IdName, List, Text } from '../types';
 export declare class Scope extends Enum {
     readonly name: string;
-    protected constructor(name: string, id?: Text);
+    readonly subs: List<Scope>;
+    protected constructor(name: string, id?: Text, subs?: List<Scope>);
     for(item: string | IdName): Scope;
+    combines(...scopes: Scope[]): this;
+    expand(): List<Scope>;
 }

package/dist/process/Scope.js

@@ -23,16 +23,21 @@ __export(Scope_exports, {
 module.exports = __toCommonJS(Scope_exports);
 var import_types = require("../types");
 class Scope extends import_types.Enum {
-  // static readonly Basic = new Scope('Basic');
-  // static readonly Auth = new Scope('Authorization', 'auth');
-  // static readonly Admin = new Scope('Administration', 'admin');
-  constructor(name, id = (0, import_types.text)(name).kebab) {
+  constructor(name, id = (0, import_types.text)(name).kebab, subs = (0, import_types.toList)()) {
     super(name, id.toString());
     this.name = name;
+    this.subs = subs;
   }
   for(item) {
     return new Scope(`${this.name} ${(0, import_types.isString)(item) ? (0, import_types.text)(item).title : item.name}`, (0, import_types.kebab)(`${this.id} ${(0, import_types.isString)(item) ? item : item.id}`));
   }
+  combines(...scopes) {
+    this.subs.add(scopes);
+    return this;
+  }
+  expand() {
+    return this.subs.flatMap((s) => s.expand()).add(this).distinct();
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/process/Scope.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/process/Scope.ts"],"sourcesContent":["import { Enum, IdName, isString, kebab, Text, text } from '../types';\n\nexport class Scope extends Enum {\n  // static readonly Basic = new Scope('Basic');\n  // static readonly Auth = new Scope('Authorization', 'auth');\n  // static readonly Admin = new Scope('Administration', 'admin');\n\n  protected constructor(readonly name: string, id: Text = text(name).kebab) {\n    super(name, id.toString());\n  }\n\n  for(item: string | IdName): Scope {\n    return new Scope(`${this.name} ${isString(item) ? text(item).title : item.name}`, kebab(`${this.id} ${isString(item) ? item : item.id}`));\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA0D;AAEnD,MAAM,cAAc,kBAAK;AAAA;AAAA;AAAA;AAAA,EAKpB,YAAqB,MAAc,SAAW,mBAAK,IAAI,EAAE,OAAO;AACxE,UAAM,MAAM,GAAG,SAAS,CAAC;AADI;AAAA,EAE/B;AAAA,EAEA,IAAI,MAA8B;AAChC,WAAO,IAAI,MAAM,GAAG,KAAK,IAAI,QAAI,uBAAS,IAAI,QAAI,mBAAK,IAAI,EAAE,QAAQ,KAAK,IAAI,QAAI,oBAAM,GAAG,KAAK,EAAE,QAAI,uBAAS,IAAI,IAAI,OAAO,KAAK,EAAE,EAAE,CAAC;AAAA,EAC1I;AACF;","names":[]}
+{"version":3,"sources":["../../src/process/Scope.ts"],"sourcesContent":["import { Enum, IdName, isString, kebab, List, Text, text, toList } from '../types';\n\nexport class Scope extends Enum {\n\n  protected constructor(readonly name: string, id: Text = text(name).kebab, readonly subs: List<Scope> = toList()) {\n    super(name, id.toString());\n  }\n\n  for(item: string | IdName): Scope {\n    return new Scope(`${this.name} ${isString(item) ? text(item).title : item.name}`, kebab(`${this.id} ${isString(item) ? item : item.id}`));\n  }\n\n  combines(...scopes: Scope[]): this {\n    this.subs.add(scopes);\n    return this;\n  }\n\n  expand(): List<Scope> {\n    return this.subs.flatMap(s => s.expand()).add(this).distinct();\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAwE;AAEjE,MAAM,cAAc,kBAAK;AAAA,EAEpB,YAAqB,MAAc,SAAW,mBAAK,IAAI,EAAE,OAAgB,WAAoB,qBAAO,GAAG;AAC/G,UAAM,MAAM,GAAG,SAAS,CAAC;AADI;AAAoD;AAAA,EAEnF;AAAA,EAEA,IAAI,MAA8B;AAChC,WAAO,IAAI,MAAM,GAAG,KAAK,IAAI,QAAI,uBAAS,IAAI,QAAI,mBAAK,IAAI,EAAE,QAAQ,KAAK,IAAI,QAAI,oBAAM,GAAG,KAAK,EAAE,QAAI,uBAAS,IAAI,IAAI,OAAO,KAAK,EAAE,EAAE,CAAC;AAAA,EAC1I;AAAA,EAEA,YAAY,QAAuB;AACjC,SAAK,KAAK,IAAI,MAAM;AACpB,WAAO;AAAA,EACT;AAAA,EAEA,SAAsB;AACpB,WAAO,KAAK,KAAK,QAAQ,OAAK,EAAE,OAAO,CAAC,EAAE,IAAI,IAAI,EAAE,SAAS;AAAA,EAC/D;AACF;","names":[]}

package/dist/process/Scope.mjs

@@ -1,16 +1,21 @@
 import "../chunk-4N72FQFX.mjs";
-import { Enum, isString, kebab, text } from "../types";
+import { Enum, isString, kebab, text, toList } from "../types";
 class Scope extends Enum {
-  // static readonly Basic = new Scope('Basic');
-  // static readonly Auth = new Scope('Authorization', 'auth');
-  // static readonly Admin = new Scope('Administration', 'admin');
-  constructor(name, id = text(name).kebab) {
+  constructor(name, id = text(name).kebab, subs = toList()) {
     super(name, id.toString());
     this.name = name;
+    this.subs = subs;
   }
   for(item) {
     return new Scope(`${this.name} ${isString(item) ? text(item).title : item.name}`, kebab(`${this.id} ${isString(item) ? item : item.id}`));
   }
+  combines(...scopes) {
+    this.subs.add(scopes);
+    return this;
+  }
+  expand() {
+    return this.subs.flatMap((s) => s.expand()).add(this).distinct();
+  }
 }
 export {
   Scope

package/dist/process/Scope.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/process/Scope.ts"],"sourcesContent":["import { Enum, IdName, isString, kebab, Text, text } from '../types';\n\nexport class Scope extends Enum {\n  // static readonly Basic = new Scope('Basic');\n  // static readonly Auth = new Scope('Authorization', 'auth');\n  // static readonly Admin = new Scope('Administration', 'admin');\n\n  protected constructor(readonly name: string, id: Text = text(name).kebab) {\n    super(name, id.toString());\n  }\n\n  for(item: string | IdName): Scope {\n    return new Scope(`${this.name} ${isString(item) ? text(item).title : item.name}`, kebab(`${this.id} ${isString(item) ? item : item.id}`));\n  }\n}\n"],"mappings":";AAAA,SAAS,MAAc,UAAU,OAAa,YAAY;AAEnD,MAAM,cAAc,KAAK;AAAA;AAAA;AAAA;AAAA,EAKpB,YAAqB,MAAc,KAAW,KAAK,IAAI,EAAE,OAAO;AACxE,UAAM,MAAM,GAAG,SAAS,CAAC;AADI;AAAA,EAE/B;AAAA,EAEA,IAAI,MAA8B;AAChC,WAAO,IAAI,MAAM,GAAG,KAAK,IAAI,IAAI,SAAS,IAAI,IAAI,KAAK,IAAI,EAAE,QAAQ,KAAK,IAAI,IAAI,MAAM,GAAG,KAAK,EAAE,IAAI,SAAS,IAAI,IAAI,OAAO,KAAK,EAAE,EAAE,CAAC;AAAA,EAC1I;AACF;","names":[]}
+{"version":3,"sources":["../../src/process/Scope.ts"],"sourcesContent":["import { Enum, IdName, isString, kebab, List, Text, text, toList } from '../types';\n\nexport class Scope extends Enum {\n\n  protected constructor(readonly name: string, id: Text = text(name).kebab, readonly subs: List<Scope> = toList()) {\n    super(name, id.toString());\n  }\n\n  for(item: string | IdName): Scope {\n    return new Scope(`${this.name} ${isString(item) ? text(item).title : item.name}`, kebab(`${this.id} ${isString(item) ? item : item.id}`));\n  }\n\n  combines(...scopes: Scope[]): this {\n    this.subs.add(scopes);\n    return this;\n  }\n\n  expand(): List<Scope> {\n    return this.subs.flatMap(s => s.expand()).add(this).distinct();\n  }\n}\n"],"mappings":";AAAA,SAAS,MAAc,UAAU,OAAmB,MAAM,cAAc;AAEjE,MAAM,cAAc,KAAK;AAAA,EAEpB,YAAqB,MAAc,KAAW,KAAK,IAAI,EAAE,OAAgB,OAAoB,OAAO,GAAG;AAC/G,UAAM,MAAM,GAAG,SAAS,CAAC;AADI;AAAoD;AAAA,EAEnF;AAAA,EAEA,IAAI,MAA8B;AAChC,WAAO,IAAI,MAAM,GAAG,KAAK,IAAI,IAAI,SAAS,IAAI,IAAI,KAAK,IAAI,EAAE,QAAQ,KAAK,IAAI,IAAI,MAAM,GAAG,KAAK,EAAE,IAAI,SAAS,IAAI,IAAI,OAAO,KAAK,EAAE,EAAE,CAAC;AAAA,EAC1I;AAAA,EAEA,YAAY,QAAuB;AACjC,SAAK,KAAK,IAAI,MAAM;AACpB,WAAO;AAAA,EACT;AAAA,EAEA,SAAsB;AACpB,WAAO,KAAK,KAAK,QAAQ,OAAK,EAAE,OAAO,CAAC,EAAE,IAAI,IAAI,EAAE,SAAS;AAAA,EAC/D;AACF;","names":[]}

package/dist/types/Identity.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/types/Identity.ts"],"sourcesContent":["import { Id } from './Id';\n\nexport type Identity = {\n  id: Id;\n  user?: string;\n};\n\nexport type IdName = { id: Id; name: string, slug?: string };\n"],"mappings":";;;;;;;;;;;;;;AAAA;AAAA;","names":[]}
+{"version":3,"sources":["../../src/types/Identity.ts"],"sourcesContent":["import { Id } from './Id';\n\nexport type Identity = { id: Id; user?: string };\n\nexport type IdName = { id: Id; name: string, slug?: string };\n"],"mappings":";;;;;;;;;;;;;;AAAA;AAAA;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thisisagile/easy",
-  "version": "15.15.2",
+  "version": "15.15.3",
   "description": "Straightforward library for building domain-driven microservice architectures",
   "author": "Sander Hoogendoorn",
   "license": "MIT",
@@ -33,7 +33,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@thisisagile/easy-test": "15.15.2",
+    "@thisisagile/easy-test": "15.15.3",
     "@types/form-urlencoded": "^4.4.0",
     "@types/jsonwebtoken": "^9.0.2",
     "@types/luxon": "3.2.0",

package/src/process/Scope.ts

@@ -1,15 +1,21 @@
-import { Enum, IdName, isString, kebab, Text, text } from '../types';
+import { Enum, IdName, isString, kebab, List, Text, text, toList } from '../types';
 
 export class Scope extends Enum {
-  // static readonly Basic = new Scope('Basic');
-  // static readonly Auth = new Scope('Authorization', 'auth');
-  // static readonly Admin = new Scope('Administration', 'admin');
 
-  protected constructor(readonly name: string, id: Text = text(name).kebab) {
+  protected constructor(readonly name: string, id: Text = text(name).kebab, readonly subs: List<Scope> = toList()) {
     super(name, id.toString());
   }
 
   for(item: string | IdName): Scope {
     return new Scope(`${this.name} ${isString(item) ? text(item).title : item.name}`, kebab(`${this.id} ${isString(item) ? item : item.id}`));
   }
+
+  combines(...scopes: Scope[]): this {
+    this.subs.add(scopes);
+    return this;
+  }
+
+  expand(): List<Scope> {
+    return this.subs.flatMap(s => s.expand()).add(this).distinct();
+  }
 }

package/src/types/Identity.ts

@@ -1,8 +1,5 @@
 import { Id } from './Id';
 
-export type Identity = {
-  id: Id;
-  user?: string;
-};
+export type Identity = { id: Id; user?: string };
 
 export type IdName = { id: Id; name: string, slug?: string };