@thisisagile/easy 8.39.3 → 8.39.6

package/dist/utils/View.d.ts

@@ -1,22 +1,23 @@
 declare type Func<T = unknown> = (a: any) => T;
-export declare type Viewer = {
-    in?: {
-        key: string;
-        f?: Func;
-    };
-};
 export declare type InOut = {
     in?: Func | View;
     col?: string;
 };
 export declare const isInOut: (v: unknown) => v is InOut;
-declare type Views = {
+export declare type Views = {
     [key: string]: string | Func | InOut;
 };
+export declare type Viewer = {
+    in?: {
+        key: string;
+        f?: Func;
+    };
+};
+export declare const toViewers: (views: Views) => Viewer[];
 export declare class View {
-    readonly views: Viewer[];
     readonly startsFrom: 'scratch' | 'source';
-    constructor(views?: Viewer[], startsFrom?: 'scratch' | 'source');
+    readonly viewers: Viewer[];
+    constructor(views?: Views, startsFrom?: 'scratch' | 'source', viewers?: Viewer[]);
     from: (source: unknown) => unknown;
 }
 export declare const view: (views: Views, startsFrom?: "scratch" | "source" | undefined) => View;

package/dist/utils/View.js

@@ -1,17 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.view = exports.View = exports.isInOut = void 0;
+exports.view = exports.View = exports.toViewers = exports.isInOut = void 0;
 const types_1 = require("../types");
+const Traverse_1 = require("./Traverse");
+const Case_1 = require("./Case");
 const isInOut = (v) => (0, types_1.isObject)(v) && ((0, types_1.isFunction)(v.in) || v.in instanceof View);
 exports.isInOut = isInOut;
+const toViewer = (key, value) => (0, Case_1.choose)(value)
+    .type(types_1.isString, s => toViewer(key, (a) => (0, Traverse_1.traverse)(a, s)))
+    .type(types_1.isFunction, f => toViewer(key, { in: { key, f } }))
+    .else(m => m);
+const toViewers = (views) => (0, types_1.meta)(views)
+    .entries()
+    .map(([k, v]) => toViewer(k, v));
+exports.toViewers = toViewers;
 class View {
-    constructor(views = [], startsFrom = 'scratch') {
-        this.views = views;
+    constructor(views = {}, startsFrom = 'scratch', viewers = (0, exports.toViewers)(views)) {
         this.startsFrom = startsFrom;
-        this.from = (source) => (0, types_1.tryTo)((0, types_1.asJson)(source)).map(s => this.views.reduce((a, m) => ({ ...a, ...{ [m.in?.key ?? '']: m.in?.f && m.in.f(s) } }), this.startsFrom === 'scratch' ? {} : s)).value;
+        this.viewers = viewers;
+        this.from = (source) => (0, types_1.tryTo)((0, types_1.asJson)(source)).map(s => this.viewers.reduce((a, m) => ({ ...a, ...{ [m.in?.key ?? '']: m.in?.f && m.in.f(s) } }), this.startsFrom === 'scratch' ? {} : s)).value;
     }
 }
 exports.View = View;
-const view = (views, startsFrom) => new View([], startsFrom);
+const view = (views, startsFrom) => new View(views, startsFrom);
 exports.view = view;
 //# sourceMappingURL=View.js.map

package/dist/utils/View.js.map

@@ -1 +1 @@
-{"version":3,"file":"View.js","sourceRoot":"","sources":["../../src/utils/View.ts"],"names":[],"mappings":";;;AAAA,oCAA+D;AAOxD,MAAM,OAAO,GAAG,CAAC,CAAU,EAAc,EAAE,CAAC,IAAA,gBAAQ,EAAC,CAAC,CAAC,IAAI,CAAC,IAAA,kBAAU,EAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,YAAY,IAAI,CAAC,CAAC;AAAhG,QAAA,OAAO,WAAyF;AAI7G,MAAa,IAAI;IACf,YAAqB,QAAkB,EAAE,EAAW,aAAmC,SAAS;QAA3E,UAAK,GAAL,KAAK,CAAe;QAAW,eAAU,GAAV,UAAU,CAAkC;QAGhG,SAAI,GAAG,CAAC,MAAe,EAAW,EAAE,CAAC,IAAA,aAAK,EAAC,IAAA,cAAM,EAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAM,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAFhN,CAAC;CAGF;AALD,oBAKC;AAEM,MAAM,IAAI,GAAG,CAAC,KAAY,EAAE,UAAiC,EAAQ,EAAE,CAAC,IAAI,IAAI,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;AAA3F,QAAA,IAAI,QAAuF"}
+{"version":3,"file":"View.js","sourceRoot":"","sources":["../../src/utils/View.ts"],"names":[],"mappings":";;;AAAA,oCAA+E;AAC/E,yCAAsC;AACtC,iCAAgC;AAKzB,MAAM,OAAO,GAAG,CAAC,CAAU,EAAc,EAAE,CAAC,IAAA,gBAAQ,EAAC,CAAC,CAAC,IAAI,CAAC,IAAA,kBAAU,EAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,YAAY,IAAI,CAAC,CAAC;AAAhG,QAAA,OAAO,WAAyF;AAK7G,MAAM,QAAQ,GAAG,CAAC,GAAW,EAAE,KAAc,EAAU,EAAE,CACvD,IAAA,aAAM,EAAS,KAAK,CAAC;KAClB,IAAI,CAAC,gBAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAM,EAAE,EAAE,CAAC,IAAA,mBAAQ,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;KAC9D,IAAI,CAAC,kBAAU,EAAE,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;KACxD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAW,CAAC,CAAC;AAErB,MAAM,SAAS,GAAG,CAAC,KAAY,EAAY,EAAE,CAClD,IAAA,YAAI,EAAC,KAAK,CAAC;KACR,OAAO,EAAE;KACT,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAHxB,QAAA,SAAS,aAGe;AAErC,MAAa,IAAI;IACf,YAAY,QAAe,EAAE,EAAW,aAAmC,SAAS,EAAW,UAAoB,IAAA,iBAAS,EAAC,KAAK,CAAC;QAA3F,eAAU,GAAV,UAAU,CAAkC;QAAW,YAAO,GAAP,OAAO,CAA6B;QAGnI,SAAI,GAAG,CAAC,MAAe,EAAW,EAAE,CAAC,IAAA,aAAK,EAAC,IAAA,cAAM,EAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAM,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAFlN,CAAC;CAGF;AALD,oBAKC;AAGM,MAAM,IAAI,GAAG,CAAC,KAAY,EAAE,UAAiC,EAAQ,EAAE,CAAC,IAAI,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;AAA9F,QAAA,IAAI,QAA0F"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thisisagile/easy",
-  "version": "8.39.3",
+  "version": "8.39.6",
   "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.39.3",
+    "@thisisagile/easy-test": "8.39.6",
     "@types/form-urlencoded": "^4.4.0",
     "@types/jsonwebtoken": "^8.5.8",
     "@types/validator": "^13.7.1"

package/src/utils/View.ts

@@ -1,19 +1,32 @@
-import { asJson, isFunction, isObject, tryTo } from '../types';
+import { asJson, isFunction, isObject, isString, meta, tryTo } from '../types';
+import { traverse } from './Traverse';
+import { choose } from './Case';
 
 type Func<T = unknown> = (a: any) => T;
 
-export type Viewer = { in?: { key: string, f?: Func }};
-
 export type InOut = { in?: Func | View, col?: string };
 export const isInOut = (v: unknown): v is InOut => isObject(v) && (isFunction(v.in) || v.in instanceof View);
 
-type Views = { [key: string]: string | Func | InOut };
+export type Views = { [key: string]: string | Func | InOut };
+export type Viewer = { in?: { key: string, f?: Func }};
+
+const toViewer = (key: string, value: unknown): Viewer =>
+  choose<Viewer>(value)
+    .type(isString, s => toViewer(key, (a: any) => traverse(a, s)))
+    .type(isFunction, f => toViewer(key, { in: { key, f } }))
+    .else(m => m as Viewer);
+
+export const toViewers = (views: Views): Viewer[] =>
+  meta(views)
+    .entries()
+    .map(([k, v]) => toViewer(k, v));
 
 export class View {
-  constructor(readonly views: Viewer[] = [], readonly startsFrom: 'scratch' | 'source' = 'scratch') {
+  constructor(views: Views = {}, readonly startsFrom: 'scratch' | 'source' = 'scratch', readonly viewers: Viewer[] = toViewers(views)) {
   }
 
-  from = (source: unknown): unknown => tryTo(asJson(source)).map(s => this.views.reduce((a: any, m) => ({ ...a, ...{ [m.in?.key ?? '']: m.in?.f && m.in.f(s) } }), this.startsFrom === 'scratch' ? {} : s)).value;
+  from = (source: unknown): unknown => tryTo(asJson(source)).map(s => this.viewers.reduce((a: any, m) => ({ ...a, ...{ [m.in?.key ?? '']: m.in?.f && m.in.f(s) } }), this.startsFrom === 'scratch' ? {} : s)).value;
 }
 
-export const view = (views: Views, startsFrom?: 'scratch' | 'source'): View => new View([], startsFrom);
+
+export const view = (views: Views, startsFrom?: 'scratch' | 'source'): View => new View(views, startsFrom);