@thisisagile/easy 14.2.12 → 15.0.0

package/dist/utils/View.d.ts

@@ -1,21 +1,17 @@
-import { Constructor, DontInfer, Json, List, PageList } from '../types';
+import { Constructor, DontInfer, Json, List, PageList, Primitive } from '../types';
 type Func<T = unknown> = (a: any, key?: string) => T;
-export type InOut = {
-    in?: Func | View<any>;
-    col?: string;
-};
-type Views<V = Json> = Partial<Record<keyof V, string | Func | InOut | number | boolean | undefined>>;
 type Viewer = {
-    in: {
-        key: string;
-        f: Func;
-    };
+    key: string;
+    f: Func;
 };
+type ViewType = Primitive | Constructor | Func | View | undefined;
+type ViewRecord<V = Json> = Partial<Record<keyof V, ViewType>>;
+export declare const toViewer: (key: string, value: ViewType) => Viewer;
 export declare class View<V = Json> {
     private views;
     readonly startsFrom: 'scratch' | 'source';
     readonly viewers: Viewer[];
-    constructor(views?: Views<V>, startsFrom?: 'scratch' | 'source', viewers?: Viewer[]);
+    constructor(views?: Partial<Record<keyof V, ViewType>>, startsFrom?: 'scratch' | 'source', viewers?: Viewer[]);
     get fromSource(): View<V>;
     from<T = unknown>(source: PageList<T>): PageList<V>;
     from<T = unknown>(source: List<T>): List<V>;
@@ -24,15 +20,17 @@ export declare class View<V = Json> {
     same: (one?: unknown, another?: unknown) => boolean;
     private reduce;
 }
-export declare const skip: () => undefined;
-export declare const view: <V = Json>(views: Partial<Record<keyof DontInfer<V>, string | number | boolean | Func<unknown> | InOut | undefined>>) => View<V>;
+export declare const isSimpleView: (a: unknown) => a is View<Json>;
+export declare const view: <V = Json>(views: Partial<Record<keyof DontInfer<V>, ViewType>>) => View<V>;
 export declare const views: {
-    ignore: () => undefined;
-    skip: () => undefined;
-    keep: (a: unknown, key?: string) => unknown;
-    keepOr: (alt?: unknown) => (a: unknown, key?: string) => unknown;
-    or: (key: string, alt?: string) => (a: unknown) => {};
+    ignore: symbol;
+    keep: symbol;
+    skip: symbol;
     value: (value: unknown) => () => unknown;
-    to: <T>(ctor: Constructor<T>) => (a: unknown, key?: string) => T;
+    or: {
+        key: (altKey: string) => (a: unknown, key?: string) => unknown;
+        value: (altValue: unknown) => (a: unknown, key?: string) => unknown;
+        func: (altFunc: Func) => (a: unknown, key?: string) => unknown;
+    };
 };
 export {};

package/dist/utils/View.js

@@ -1,58 +1,60 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.views = exports.view = exports.skip = exports.View = void 0;
+exports.views = exports.view = exports.isSimpleView = exports.View = exports.toViewer = void 0;
 const types_1 = require("../types");
 const Traverse_1 = require("./Traverse");
-const isColOnly = (v) => (0, types_1.isObject)(v) && (0, types_1.isDefined)(v.col) && !(0, types_1.isDefined)(v.in);
-const isInOnly = (v) => (0, types_1.isObject)(v) && !(0, types_1.isDefined)(v.col) && (0, types_1.isFunction)(v.in);
-const isColAndFunction = (v) => (0, types_1.isObject)(v) && (0, types_1.isDefined)(v.col) && (0, types_1.isFunction)(v.in);
-const isColAndView = (v) => (0, types_1.isObject)(v) && (0, types_1.isDefined)(v.col) && v.in instanceof View;
-const toFunc = (a, col, f = a => a) => (0, types_1.tryTo)((0, Traverse_1.traverse)(a, col)).map(v => ((0, types_1.isArray)(v) ? () => v.map(i => f(i, col)) : (a) => f((0, Traverse_1.traverse)(a, col)))).value;
+const ignore = Symbol('view.ignore');
+const keep = Symbol('view.keep');
 const toViewer = (key, value) => (0, types_1.choose)(value)
-    .is.not.defined(v => v, () => toViewer(key, () => undefined))
-    .type(types_1.isBoolean, b => toViewer(key, () => b))
-    .type(types_1.isNumber, n => toViewer(key, () => n))
-    .type(types_1.isString, s => toViewer(key, (a) => toFunc(a, s)(a)))
-    .type(isColOnly, io => toViewer(key, io.col))
-    .type(types_1.isFunction, f => toViewer(key, { in: { key, f } }))
-    .type(isInOnly, io => toViewer(key, { in: { key, f: io.in } }))
-    .type(isColAndFunction, io => toViewer(key, { in: { key, f: (a) => toFunc(a, io.col, io.in)(a) } }))
-    .type(isColAndView, io => toViewer(key, { in: { key, f: (a) => io.in.from((0, Traverse_1.traverse)(a, io.col)) } }))
-    .else(v => v);
-const toViewers = (views) => (0, types_1.meta)(views)
-    .entries()
-    .map(([k, v]) => toViewer(k, v));
+    .is.not.defined(v => v, { key, f: () => undefined })
+    .type(types_1.isBoolean, b => ({ key, f: () => b }))
+    .equals(ignore, { key, f: () => undefined })
+    .equals(0, { key, f: () => undefined })
+    .equals(keep, { key, f: (a) => (0, Traverse_1.traverse)(a, key) })
+    .equals(1, { key, f: (a) => (0, Traverse_1.traverse)(a, key) })
+    .type(types_1.isString, s => ({ key, f: (a) => (0, Traverse_1.traverse)(a, s) }))
+    .type(types_1.isConstructor, c => ({
+    key,
+    f: (a, key) => (0, types_1.use)((0, Traverse_1.traverse)(a, key), v => (0, types_1.isArray)(v) ? v.map(i => new c(i)) : new c(v))
+}))
+    .type(exports.isSimpleView, f => ({ key, f: (a) => f.from((0, Traverse_1.traverse)(a, key)) }))
+    .type(types_1.isFunction, f => ({ key, f }))
+    .else(v => ({ key, f: () => v }));
+exports.toViewer = toViewer;
+const toViewers = (views) => (0, types_1.meta)(views).entries().map(([k, v]) => (0, exports.toViewer)(k, v));
 class View {
     constructor(views = {}, startsFrom = 'scratch', viewers = toViewers(views)) {
         this.views = views;
         this.startsFrom = startsFrom;
         this.viewers = viewers;
         this.same = (one, another) => (0, types_1.isEqual)(this.from(one), this.from(another));
-        this.reduce = (i) => this.viewers.reduce((a, v) => types_1.json.set(a, v.in.key, v.in.f(i, v.in.key)), this.startsFrom === 'scratch' ? {} : i);
+        this.reduce = (source) => (0, types_1.use)((0, types_1.asJson)(source), src => this.viewers.reduce((acc, v) => types_1.json.set(acc, v.key, v.f(src, v.key)), this.startsFrom === 'scratch' ? {} : src));
     }
     get fromSource() {
         return new View(this.views, 'source', this.viewers);
     }
     from(source) {
         if ((0, types_1.isPageList)(source))
-            return (0, types_1.toPageList)(source.map(s => this.reduce((0, types_1.asJson)(s))), source);
+            return (0, types_1.toPageList)(source.map(s => this.reduce(s)), source);
         if ((0, types_1.isArray)(source))
-            return source.map(s => this.reduce((0, types_1.asJson)(s)));
-        return this.reduce((0, types_1.asJson)(source));
+            return source.map(s => this.reduce(s));
+        return this.reduce(source);
     }
 }
 exports.View = View;
-const skip = () => undefined;
-exports.skip = skip;
+const isSimpleView = (a) => a instanceof View;
+exports.isSimpleView = isSimpleView;
 const view = (views) => new View(views);
 exports.view = view;
 exports.views = {
-    ignore: () => undefined,
-    skip: () => undefined,
-    keep: (a, key) => (0, Traverse_1.traverse)(a, key),
-    keepOr: (alt) => (a, key) => (0, Traverse_1.traverse)(a, key) ?? alt,
-    or: (key, alt = '') => (a) => (0, Traverse_1.traverse)(a, key) ?? alt,
+    ignore,
+    keep,
+    skip: ignore,
     value: (value) => () => value,
-    to: (ctor) => (a, key) => new ctor((0, Traverse_1.traverse)(a, key)),
+    or: {
+        key: (altKey) => (a, key) => (0, Traverse_1.traverse)(a, key) ?? (0, Traverse_1.traverse)(a, altKey),
+        value: (altValue) => (a, key) => (0, Traverse_1.traverse)(a, key) ?? altValue,
+        func: (altFunc) => (a, key) => (0, Traverse_1.traverse)(a, key) ?? altFunc(a, key),
+    },
 };
 //# 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":"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"}
+{"version":3,"file":"View.js","sourceRoot":"","sources":["../../src/utils/View.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thisisagile/easy",
-  "version": "14.2.12",
+  "version": "15.0.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": "14.2.12",
+    "@thisisagile/easy-test": "15.0.0",
     "@types/form-urlencoded": "^4.4.0",
     "@types/jsonwebtoken": "^8.5.9",
     "@types/luxon": "3.2.0",

package/src/utils/View.ts

@@ -1,114 +1,91 @@
 import {
-  asJson,
-  choose,
-  Constructor,
-  DontInfer,
-  isArray,
-  isBoolean,
-  isDefined,
-  isEqual,
-  isFunction,
-  isNumber,
-  isObject,
-  isPageList,
-  isString,
-  Json,
-  json,
-  List,
-  meta,
-  PageList,
-  toPageList,
-  tryTo,
+    asJson,
+    choose,
+    Constructor,
+    DontInfer,
+    isArray,
+    isBoolean,
+    isConstructor,
+    isEqual,
+    isFunction,
+    isPageList,
+    isString,
+    json,
+    Json,
+    List,
+    meta,
+    PageList,
+    Primitive,
+    toPageList,
+    use,
 } from '../types';
-import { traverse } from './Traverse';
+import {traverse} from './Traverse';
 
 type Func<T = unknown> = (a: any, key?: string) => T;
+type Viewer = { key: string; f: Func };
 
-export type InOut = { in?: Func | View<any>; col?: string };
+type ViewType = Primitive | Constructor | Func | View | undefined;
+type ViewRecord<V = Json> = Partial<Record<keyof V, ViewType>>;
 
-const isColOnly = (v: unknown): v is InOut => isObject(v) && isDefined(v.col) && !isDefined(v.in);
-const isInOnly = (v: unknown): v is InOut => isObject(v) && !isDefined(v.col) && isFunction(v.in);
-const isColAndFunction = (
-  v: unknown
-): v is {
-  col: string;
-  in: Func;
-} => isObject(v) && isDefined(v.col) && isFunction(v.in);
-const isColAndView = (
-  v: unknown
-): v is {
-  col: string;
-  in: View;
-} => isObject(v) && isDefined(v.col) && v.in instanceof View;
+const ignore = Symbol('view.ignore');
+const keep = Symbol('view.keep');
 
-type Views<V = Json> = Partial<Record<keyof V, string | Func | InOut | number | boolean | undefined>>;
-type Viewer = { in: { key: string; f: Func } };
+export const toViewer = (key: string, value: ViewType): Viewer =>
+    choose(value)
+        .is.not.defined(v => v, {key, f: () => undefined} as Viewer)
+        .type(isBoolean, b => ({key, f: () => b}))
+        .equals(ignore, {key, f: () => undefined})
+        .equals(0, {key, f: () => undefined})
+        .equals(keep, {key, f: (a: any) => traverse(a, key)})
+        .equals(1, {key, f: (a: any) => traverse(a, key)})
+        .type(isString, s => ({key, f: (a: any) => traverse(a, s)}))
+        .type(isConstructor, c => ({
+            key,
+            f: (a, key) => use(traverse(a, key), v => isArray(v) ? v.map(i => new c(i)) : new c(v))
+        }))
+        .type(isSimpleView, f => ({key, f: (a: any) => f.from(traverse(a, key))}))
+        .type(isFunction, f => ({key, f}))
+        .else(v => ({key, f: () => v}));
 
-const toFunc = (a: any, col: string, f: Func = a => a): Func =>
-  tryTo(traverse(a, col)).map(v => (isArray(v) ? () => v.map(i => f(i, col)) : (a: any) => f(traverse(a, col)))).value;
-
-const toViewer = (key: string, value: unknown): Viewer =>
-  choose(value)
-    .is.not.defined(
-      v => v,
-      () => toViewer(key, () => undefined)
-    )
-    .type(isBoolean, b => toViewer(key, () => b))
-    .type(isNumber, n => toViewer(key, () => n))
-    .type(isString, s => toViewer(key, (a: any) => toFunc(a, s)(a)))
-    .type(isColOnly, io => toViewer(key, io.col))
-    .type(isFunction, f => toViewer(key, { in: { key, f } }))
-    .type(isInOnly, io => toViewer(key, { in: { key, f: io.in } }))
-    .type(isColAndFunction, io => toViewer(key, { in: { key, f: (a: any) => toFunc(a, io.col, io.in)(a) } }))
-    .type(isColAndView, io => toViewer(key, { in: { key, f: (a: any) => io.in.from(traverse(a, io.col)) } }))
-    .else(v => v as Viewer);
-
-const toViewers = (views: Views): Viewer[] =>
-  meta(views)
-    .entries()
-    .map(([k, v]) => toViewer(k, v));
+const toViewers = (views: ViewRecord): Viewer[] => meta(views).entries<ViewType>().map(([k, v]) => toViewer(k, v));
 
 export class View<V = Json> {
-  constructor(private views: Views<V> = {} as Views<V>, readonly startsFrom: 'scratch' | 'source' = 'scratch', readonly viewers: Viewer[] = toViewers(views)) {}
+    constructor(private views = {} as ViewRecord<V>, readonly startsFrom: 'scratch' | 'source' = 'scratch', readonly viewers: Viewer[] = toViewers(views)) {
+    }
 
-  get fromSource(): View<V> {
-    return new View(this.views, 'source', this.viewers);
-  }
+    get fromSource(): View<V> {
+        return new View(this.views, 'source', this.viewers);
+    }
 
-  from<T = unknown>(source: PageList<T>): PageList<V>;
-  from<T = unknown>(source: List<T>): List<V>;
-  from<T = unknown>(source: T[]): V[];
-  from<T = unknown>(source: T): V;
-  from<T = unknown>(source: PageList<T> | List<T> | T[] | T): PageList<V> | List<V> | V[] | V {
-    if (isPageList(source))
-      return toPageList(
-        source.map(s => this.reduce(asJson(s))),
-        source
-      );
-    if (isArray(source)) return source.map(s => this.reduce(asJson(s)));
-    return this.reduce(asJson(source));
-  }
+    from<T = unknown>(source: PageList<T>): PageList<V>;
+    from<T = unknown>(source: List<T>): List<V>;
+    from<T = unknown>(source: T[]): V[];
+    from<T = unknown>(source: T): V;
+    from<T = unknown>(source: PageList<T> | List<T> | T[] | T): PageList<V> | List<V> | V[] | V {
+        if (isPageList(source)) return toPageList(source.map(s => this.reduce(s)), source);
+        if (isArray(source)) return source.map(s => this.reduce(s));
+        return this.reduce(source);
+    }
 
-  same = (one?: unknown, another?: unknown): boolean => isEqual(this.from(one), this.from(another));
+    same = (one?: unknown, another?: unknown): boolean => isEqual(this.from(one), this.from(another));
 
-  private reduce = (i: any): any => this.viewers.reduce((a: any, v) => json.set(a, v.in.key, v.in.f(i, v.in.key)), this.startsFrom === 'scratch' ? {} : i);
+    private reduce = (source: any): any => use(asJson(source), src => this.viewers.reduce((acc, v) => json.set(acc, v.key, v.f(src, v.key)), this.startsFrom === 'scratch' ? {} : src));
 }
 
-export const skip = () => undefined;
-export const view = <V = Json>(views: Views<DontInfer<V>>): View<V> => new View<V>(views);
+export const isSimpleView = (a: unknown): a is View => a instanceof View;
+
+export const view = <V = Json>(views: ViewRecord<DontInfer<V>>): View<V> => new View<V>(views);
 
 export const views = {
-  ignore: () => undefined,
-  skip: () => undefined,
-  keep: (a: unknown, key?: string) => traverse(a, key),
-  keepOr: (alt?: unknown) => (a: unknown, key?: string) => traverse(a, key) ?? alt,
-  or:
-    (key: string, alt = '') =>
-    (a: unknown) =>
-      traverse(a, key) ?? alt,
-  value: (value: unknown) => () => value,
-  to:
-    <T>(ctor: Constructor<T>) =>
-    (a: unknown, key?: string) =>
-      new ctor(traverse(a, key)),
+    ignore,
+    keep,
+    skip: ignore,
+    value: (value: unknown) => () => value,
+    or: {
+        key: (altKey: string) => (a: unknown, key?: string) => traverse(a, key) ?? traverse(a, altKey),
+        value: (altValue: unknown) => (a: unknown, key?: string) => traverse(a, key) ?? altValue,
+        func: (altFunc: Func) => (a: unknown, key?: string) => traverse(a, key) ?? altFunc(a, key),
+    },
 };
+
+// spread: (a: any, key: string) => ({...a, ...(use(traverse(a, key), v => isObject(v) ? v : ({[key]: v})))}),