@thisisagile/easy 8.39.4 → 8.39.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/utils/View.d.ts +8 -8
  2. package/dist/utils/View.js +17 -5
  3. package/dist/utils/View.js.map +1 -1
  4. package/package.json +2 -2
  5. package/src/utils/View.ts +24 -6
package/dist/utils/View.d.ts CHANGED
@@ -1,19 +1,19 @@
1
1
  declare type Func<T = unknown> = (a: any) => T;
2
- export declare type Viewer = {
3
- in?: {
4
- key: string;
5
- f?: Func;
6
- };
7
- };
8
2
  export declare type InOut = {
9
3
  in?: Func | View;
10
4
  col?: string;
11
5
  };
12
6
  export declare const isInOut: (v: unknown) => v is InOut;
13
- declare type Views = {
7
+ export declare type Views = {
14
8
  [key: string]: string | Func | InOut;
15
9
  };
16
- export declare const toViewer: (views: Views) => Viewer[];
10
+ export declare type Viewer = {
11
+ in?: {
12
+ key: string;
13
+ f?: Func;
14
+ };
15
+ };
16
+ export declare const toViewers: (views: Views) => Viewer[];
17
17
  export declare class View {
18
18
  readonly startsFrom: 'scratch' | 'source';
19
19
  readonly viewers: Viewer[];
package/dist/utils/View.js CHANGED
@@ -1,13 +1,25 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.view = exports.View = exports.toViewer = exports.isInOut = void 0;
3
+ exports.view = exports.View = exports.toViewers = exports.isInOut = void 0;
4
4
  const types_1 = require("../types");
5
- const isInOut = (v) => (0, types_1.isObject)(v) && ((0, types_1.isFunction)(v.in) || v.in instanceof View);
5
+ const Traverse_1 = require("./Traverse");
6
+ const Case_1 = require("./Case");
7
+ const isInOut = (v) => (0, types_1.isObject)(v) && ((0, types_1.isDefined)(v.col) || (0, types_1.isFunction)(v.in) || v.in instanceof View);
6
8
  exports.isInOut = isInOut;
7
- const toViewer = (views) => [];
8
- exports.toViewer = toViewer;
9
+ const toFunc = (a, key, io) => (0, Case_1.choose)(io)
10
+ .case(i => (0, types_1.isDefined)(i.col) && !(0, types_1.isDefined)(i.in), (i) => (a) => (0, Traverse_1.traverse)(a, i.col))
11
+ .else(() => undefined);
12
+ const toViewer = (key, value) => (0, Case_1.choose)(value)
13
+ .type(types_1.isString, s => toViewer(key, (a) => (0, Traverse_1.traverse)(a, s)))
14
+ .type(types_1.isFunction, f => toViewer(key, { in: { key, f } }))
15
+ .type(exports.isInOut, io => toViewer(key, (a) => toFunc(a, key, io)(a)))
16
+ .else(m => m);
17
+ const toViewers = (views) => (0, types_1.meta)(views)
18
+ .entries()
19
+ .map(([k, v]) => toViewer(k, v));
20
+ exports.toViewers = toViewers;
9
21
  class View {
10
- constructor(views = {}, startsFrom = 'scratch', viewers = (0, exports.toViewer)(views)) {
22
+ constructor(views = {}, startsFrom = 'scratch', viewers = (0, exports.toViewers)(views)) {
11
23
  this.startsFrom = startsFrom;
12
24
  this.viewers = viewers;
13
25
  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;
package/dist/utils/View.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"View.js","sourceRoot":"","sources":["../../src/utils/View.ts"],"names":[],"mappings":";;;AAAA,oCAA+D;AAMxD,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;AAGtG,MAAM,QAAQ,GAAG,CAAC,KAAY,EAAY,EAAE,CAAC,EAAE,CAAC;AAA1C,QAAA,QAAQ,YAAkC;AAEvD,MAAa,IAAI;IACf,YAAY,QAAe,EAAE,EAAW,aAAmC,SAAS,EAAW,UAAoB,IAAA,gBAAQ,EAAC,KAAK,CAAC;QAA1F,eAAU,GAAV,UAAU,CAAkC;QAAW,YAAO,GAAP,OAAO,CAA4B;QAGlI,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"}
1
+ {"version":3,"file":"View.js","sourceRoot":"","sources":["../../src/utils/View.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@thisisagile/easy",
3
- "version": "8.39.4",
3
+ "version": "8.39.8",
4
4
  "description": "Straightforward library for building domain-driven microservice architectures",
5
5
  "author": "Sander Hoogendoorn",
6
6
  "license": "MIT",
@@ -31,7 +31,7 @@
31
31
  "access": "public"
32
32
  },
33
33
  "devDependencies": {
34
- "@thisisagile/easy-test": "8.39.4",
34
+ "@thisisagile/easy-test": "8.39.8",
35
35
  "@types/form-urlencoded": "^4.4.0",
36
36
  "@types/jsonwebtoken": "^8.5.8",
37
37
  "@types/validator": "^13.7.1"
package/src/utils/View.ts CHANGED
@@ -1,16 +1,34 @@
1
- import { asJson, isFunction, isObject, tryTo } from '../types';
1
+ import { asJson, isDefined, isFunction, isObject, isString, meta, tryTo } from '../types';
2
+ import { traverse } from './Traverse';
3
+ import { choose } from './Case';
2
4
 
3
5
  type Func<T = unknown> = (a: any) => T;
4
6
 
5
- export type Viewer = { in?: { key: string, f?: Func }};
6
7
  export type InOut = { in?: Func | View, col?: string };
7
- export const isInOut = (v: unknown): v is InOut => isObject(v) && (isFunction(v.in) || v.in instanceof View);
8
+ export const isInOut = (v: unknown): v is InOut => isObject(v) && (isDefined(v.col) || isFunction(v.in) || v.in instanceof View);
8
9
 
9
- type Views = { [key: string]: string | Func | InOut };
10
- export const toViewer = (views: Views): Viewer[] => [];
10
+ export type Views = { [key: string]: string | Func | InOut };
11
+ export type Viewer = { in?: { key: string, f?: Func } };
12
+
13
+ const toFunc = (a: unknown, key: string, io: InOut): Func =>
14
+ choose<Func, InOut>(io)
15
+ .case(i => isDefined(i.col) && !isDefined(i.in), (i: InOut) => (a: any) => traverse(a, i.col))
16
+ .else(() => undefined);
17
+
18
+ const toViewer = (key: string, value: unknown): Viewer =>
19
+ choose<Viewer>(value)
20
+ .type(isString, s => toViewer(key, (a: any) => traverse(a, s)))
21
+ .type(isFunction, f => toViewer(key, { in: { key, f } }))
22
+ .type(isInOut, io => toViewer(key, (a: any) => toFunc(a, key, io)(a)))
23
+ .else(m => m as Viewer);
24
+
25
+ export const toViewers = (views: Views): Viewer[] =>
26
+ meta(views)
27
+ .entries()
28
+ .map(([k, v]) => toViewer(k, v));
11
29
 
12
30
  export class View {
13
- constructor(views: Views = {}, readonly startsFrom: 'scratch' | 'source' = 'scratch', readonly viewers: Viewer[] = toViewer(views)) {
31
+ constructor(views: Views = {}, readonly startsFrom: 'scratch' | 'source' = 'scratch', readonly viewers: Viewer[] = toViewers(views)) {
14
32
  }
15
33
 
16
34
  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;