@thisisagile/easy 8.39.2 → 8.39.3

package/dist/utils/View.d.ts

@@ -4,23 +4,20 @@ export declare type Viewer = {
         key: string;
         f?: Func;
     };
-    out?: {
-        key: string;
-        f?: Func;
-    };
 };
-declare type InOut = {
+export declare type InOut = {
     in?: Func | View;
-    out?: Func | View;
     col?: string;
 };
+export declare const isInOut: (v: unknown) => v is InOut;
 declare type Views = {
     [key: string]: string | Func | InOut;
 };
 export declare class View {
     readonly views: Viewer[];
-    readonly from: 'scratch' | 'source';
-    constructor(views?: Viewer[], from?: 'scratch' | 'source');
+    readonly startsFrom: 'scratch' | 'source';
+    constructor(views?: Viewer[], startsFrom?: 'scratch' | 'source');
+    from: (source: unknown) => unknown;
 }
-export declare const view: (map: Views, from?: "scratch" | "source" | undefined) => View;
+export declare const view: (views: Views, startsFrom?: "scratch" | "source" | undefined) => View;
 export {};

package/dist/utils/View.js

@@ -1,13 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.view = exports.View = void 0;
+exports.view = exports.View = exports.isInOut = void 0;
+const types_1 = require("../types");
+const isInOut = (v) => (0, types_1.isObject)(v) && ((0, types_1.isFunction)(v.in) || v.in instanceof View);
+exports.isInOut = isInOut;
 class View {
-    constructor(views = [], from = 'scratch') {
+    constructor(views = [], startsFrom = 'scratch') {
         this.views = views;
-        this.from = from;
+        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;
     }
 }
 exports.View = View;
-const view = (map, from) => new View([], from);
+const view = (views, startsFrom) => new View([], 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":";;;AAOA,MAAa,IAAI;IACf,YAAqB,QAAkB,EAAE,EAAW,OAA6B,SAAS;QAArE,UAAK,GAAL,KAAK,CAAe;QAAW,SAAI,GAAJ,IAAI,CAAkC;IAC1F,CAAC;CACF;AAHD,oBAGC;AAEM,MAAM,IAAI,GAAG,CAAC,GAAU,EAAE,IAA2B,EAAQ,EAAE,CAAC,IAAI,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;AAA7E,QAAA,IAAI,QAAyE"}
+{"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"}

package/package.json

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

package/src/utils/View.ts

@@ -1,13 +1,19 @@
+import { asJson, isFunction, isObject, tryTo } from '../types';
+
 type Func<T = unknown> = (a: any) => T;
-export type Viewer = { in?: { key: string, f?: Func }, out?: { key: string, f?: Func } };
 
-type InOut = { in?: Func | View, out?: Func | View, col?: string };
-type Views = { [key: string]: string | Func | InOut };
+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 class View {
-  constructor(readonly views: Viewer[] = [], readonly from: 'scratch' | 'source' = 'scratch') {
+  constructor(readonly views: Viewer[] = [], readonly startsFrom: 'scratch' | 'source' = 'scratch') {
   }
+
+  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;
 }
 
-export const view = (map: Views, from?: 'scratch' | 'source'): View => new View([], from);
+export const view = (views: Views, startsFrom?: 'scratch' | 'source'): View => new View([], startsFrom);