@thisisagile/easy 8.39.5 → 8.39.11

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.
@@ -4,6 +4,8 @@ export declare type InOut = {
4
4
  col?: string;
5
5
  };
6
6
  export declare const isInOut: (v: unknown) => v is InOut;
7
+ export declare const isColOnly: (v: unknown) => v is InOut;
8
+ export declare const isInOnly: (v: unknown) => v is InOut;
7
9
  export declare type Views = {
8
10
  [key: string]: string | Func | InOut;
9
11
  };
@@ -1,13 +1,28 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.view = exports.View = exports.toViewers = exports.isInOut = void 0;
3
+ exports.view = exports.View = exports.toViewers = exports.isInOnly = exports.isColOnly = exports.isInOut = void 0;
4
4
  const types_1 = require("../types");
5
5
  const Traverse_1 = require("./Traverse");
6
- const isInOut = (v) => (0, types_1.isObject)(v) && ((0, types_1.isFunction)(v.in) || v.in instanceof View);
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);
7
8
  exports.isInOut = isInOut;
9
+ const isColOnly = (v) => (0, types_1.isObject)(v) && (0, types_1.isDefined)(v.col) && !(0, types_1.isDefined)(v.in);
10
+ exports.isColOnly = isColOnly;
11
+ const isInOnly = (v) => (0, types_1.isObject)(v) && !(0, types_1.isDefined)(v.col) && (0, types_1.isFunction)(v.in);
12
+ exports.isInOnly = isInOnly;
13
+ const toFunc = (a, key, io) => (0, Case_1.choose)(io)
14
+ .case(i => (0, types_1.isDefined)(i.col) && !(0, types_1.isDefined)(i.in), (i) => (a) => (0, Traverse_1.traverse)(a, i.col))
15
+ .else(() => undefined);
16
+ const toViewer = (key, value) => (0, Case_1.choose)(value)
17
+ .type(types_1.isString, s => toViewer(key, (a) => (0, Traverse_1.traverse)(a, s)))
18
+ .type(exports.isColOnly, io => toViewer(key, io.col))
19
+ .type(types_1.isFunction, f => toViewer(key, { in: { key, f } }))
20
+ .type(exports.isInOnly, io => toViewer(key, { in: { key, f: io.in } }))
21
+ .type(exports.isInOut, io => toViewer(key, (a) => io?.in && (io.in instanceof View ? io.in.from((0, Traverse_1.traverse)(a, io.col)) : io.in((0, Traverse_1.traverse)(a, io.col)))))
22
+ .else(m => m);
8
23
  const toViewers = (views) => (0, types_1.meta)(views)
9
24
  .entries()
10
- .map(([key, v]) => ({ in: { key, f: a => (0, Traverse_1.traverse)(a, v) } }));
25
+ .map(([k, v]) => toViewer(k, v));
11
26
  exports.toViewers = toViewers;
12
27
  class View {
13
28
  constructor(views = {}, startsFrom = 'scratch', viewers = (0, exports.toViewers)(views)) {
@@ -1 +1 @@
1
- {"version":3,"file":"View.js","sourceRoot":"","sources":["../../src/utils/View.ts"],"names":[],"mappings":";;;AAAA,oCAAqE;AACrE,yCAAsC;AAK/B,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;AAKtG,MAAM,SAAS,GAAG,CAAC,KAAY,EAAY,EAAE,CAClD,IAAA,YAAI,EAAC,KAAK,CAAC;KACR,OAAO,EAAE;KACT,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAC,EAAE,EAAE,EAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,IAAA,mBAAQ,EAAC,CAAC,EAAE,CAAW,CAAC,EAAC,EAAC,CAAC,CAAC,CAAC;AAH3D,QAAA,SAAS,aAGkD;AAExE,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"}
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.5",
3
+ "version": "8.39.11",
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.5",
34
+ "@thisisagile/easy-test": "8.39.11",
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,18 +1,35 @@
1
- import { asJson, isFunction, isObject, meta, tryTo } from '../types';
1
+ import { asJson, isDefined, isFunction, isObject, isString, meta, tryTo } from '../types';
2
2
  import { traverse } from './Traverse';
3
+ import { choose } from './Case';
3
4
 
4
5
  type Func<T = unknown> = (a: any) => T;
5
6
 
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);
9
+ export const isColOnly = (v: unknown): v is InOut => isObject(v) && isDefined(v.col) && !isDefined(v.in);
10
+ export const isInOnly = (v: unknown): v is InOut => isObject(v) && !isDefined(v.col) && isFunction(v.in);
8
11
 
9
12
  export type Views = { [key: string]: string | Func | InOut };
10
- export type Viewer = { in?: { key: string, f?: Func }};
13
+ export type Viewer = { in?: { key: string, f?: Func } };
14
+
15
+ const toFunc = (a: unknown, key: string, io: InOut): Func =>
16
+ choose<Func, InOut>(io)
17
+ .case(i => isDefined(i.col) && !isDefined(i.in), (i: InOut) => (a: any) => traverse(a, i.col))
18
+ .else(() => undefined);
19
+
20
+ const toViewer = (key: string, value: unknown): Viewer =>
21
+ choose<Viewer>(value)
22
+ .type(isString, s => toViewer(key, (a: any) => traverse(a, s)))
23
+ .type(isColOnly, io => toViewer(key, io.col))
24
+ .type(isFunction, f => toViewer(key, { in: { key, f } }))
25
+ .type(isInOnly, io => toViewer(key, { in: { key, f: io.in } }))
26
+ .type(isInOut, io => toViewer(key, (a: any) => io?.in && (io.in instanceof View ? io.in.from(traverse(a, io.col)) : io.in(traverse(a, io.col)))))
27
+ .else(m => m as Viewer);
11
28
 
12
29
  export const toViewers = (views: Views): Viewer[] =>
13
30
  meta(views)
14
31
  .entries()
15
- .map(([key, v]) => ({in: {key, f: a => traverse(a, v as string)}}));
32
+ .map(([k, v]) => toViewer(k, v));
16
33
 
17
34
  export class View {
18
35
  constructor(views: Views = {}, readonly startsFrom: 'scratch' | 'source' = 'scratch', readonly viewers: Viewer[] = toViewers(views)) {