@thisisagile/easy 17.11.24 → 17.11.26

package/dist/resources/Req.d.ts

@@ -11,7 +11,7 @@ export declare class Req<T = unknown> implements Omit<PageOptions, 'sort'> {
     readonly headers: Record<string, OneOrMore<string>>;
     readonly skip: Optional<number>;
     readonly take: Optional<number>;
-    constructor(path: Json, query: Json, body: T, headers: Record<string, OneOrMore<string>>);
+    constructor(path: Json | undefined, query: Json | undefined, body: T, headers: Record<string, OneOrMore<string>>);
     get id(): Id;
     get q(): JsonValue;
     get: (key: Text) => any;

package/dist/services/MappedRouteGateway.mjs

@@ -1,6 +1,6 @@
 import {
   Mapper
-} from "../chunk-P3IR2KG5.mjs";
+} from "../chunk-GPSPH4NX.mjs";
 import "../chunk-WJZFE5NE.mjs";
 import {
   RouteGateway

package/dist/sql/Table.mjs

@@ -23,7 +23,7 @@ import "../chunk-W4SWU2TX.mjs";
 import {
   Mapper,
   mappings
-} from "../chunk-P3IR2KG5.mjs";
+} from "../chunk-GPSPH4NX.mjs";
 import "../chunk-WJZFE5NE.mjs";
 import "../chunk-OKPGJD64.mjs";
 import {

package/dist/utils/Mapper.mjs

@@ -2,7 +2,7 @@ import {
   Mapper,
   isMapping,
   mappings
-} from "../chunk-P3IR2KG5.mjs";
+} from "../chunk-GPSPH4NX.mjs";
 import "../chunk-WJZFE5NE.mjs";
 import "../chunk-GCY5A63A.mjs";
 import "../chunk-MDXL65W4.mjs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thisisagile/easy",
-  "version": "17.11.24",
+  "version": "17.11.26",
   "description": "Straightforward library for building domain-driven microservice architectures",
   "author": "Sander Hoogendoorn",
   "license": "MIT",

package/src/utils/Mapper.ts

@@ -57,7 +57,7 @@ export class Mapper extends State implements Mapping {
 
   // All names op properties (in target) that are NOT properties in source
   private get droppedOut(): List<string> {
-    return this.get('droppedOut', () => this.properties.filter(([, p]) => !this.keys.some(k => k === p.property ?? '')).map(([k]) => k));
+    return this.get('droppedOut', () => this.properties.filter(([, p]) => !this.keys.some(k => k === (p.property ?? ''))).map(([k]) => k));
   }
 
   public in(from: Json = {}): Json {

package/dist/chunk-P3IR2KG5.mjs.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/utils/Mapper.ts"],"sourcesContent":["import { Property, PropertyOptions } from './Property';\nimport { State } from './State';\nimport { ifNotEmpty } from './If';\nimport { json, Json, JsonValue } from '../types/Json';\nimport { Optional } from '../types/Types';\nimport { TypeGuard } from '../types/TypeGuard';\nimport { isA } from '../types/IsA';\nimport { List, toList } from '../types/List';\nimport { meta } from '../types/Meta';\nimport { isEmpty } from '../types/Is';\nimport { Get, ofGet } from '../types/Get';\nimport { Construct, ofConstruct } from '../types/Constructor';\n\nexport type Mapping = {\n  property: string;\n  in: (source?: Json, key?: string) => Optional<JsonValue>;\n  out: (source?: Json, key?: string) => Optional<JsonValue>;\n};\nexport const isMapping: TypeGuard<Mapping> = (m?: unknown): m is Mapping => isA<Mapping>(m, 'in', 'out');\n\nexport type MapStartFrom = 'scratch' | 'source';\nexport type MapOptions = { startFrom: MapStartFrom };\n\nexport class Mapper extends State implements Mapping {\n  protected readonly map = mappings;\n\n  constructor(\n    readonly options: MapOptions = { startFrom: 'scratch' },\n    readonly property = ''\n  ) {\n    super();\n  }\n\n  // All properties that are a mapping\n  get properties(): List<[string, Mapping]> {\n    return this.get('props', () =>\n      meta(this)\n        .entries<Mapping>()\n        .filter(([, v]) => isMapping(v))\n    );\n  }\n\n  // All names of properties (in target) that have a Mapping\n  get keys(): List<string> {\n    return this.get('keys', () => this.properties.map(([k]) => k));\n  }\n\n  // All names of properties (in source) that are named in a Mapping\n  get columns(): List<string> {\n    return this.get('columns', () => this.properties.mapDefined(([, p]) => ifNotEmpty(p.property, p.property))).distinct();\n  }\n\n  // All names of properties (in source) that are NOT properties in target\n  private get droppedIn(): List<string> {\n    return this.get('droppedIn', () => this.columns.filter(c => !this.keys.some(k => k === c)));\n  }\n\n  // All names op properties (in target) that are NOT properties in source\n  private get droppedOut(): List<string> {\n    return this.get('droppedOut', () => this.properties.filter(([, p]) => !this.keys.some(k => k === p.property ?? '')).map(([k]) => k));\n  }\n\n  public in(from: Json = {}): Json {\n    return json.omit(\n      this.properties.reduce((a, [k, p]) => json.merge(a, { [k]: p.in({ ...a, ...from }) }), this.options.startFrom === 'source' ? from : {}),\n      ...this.droppedIn\n    );\n  }\n\n  public out(to: Json = {}): Json {\n    return json.omit(\n      this.properties.reduce(\n        (a, [k, p]) => json.merge(a, isEmpty(p.property) ? p.out(to, k) : { [p.property ?? '']: p.out({ ...a, ...to }, k) }),\n        this.options.startFrom === 'source' ? to : {}\n      ),\n      ...this.droppedOut\n    );\n  }\n\n  toString(): string {\n    return this.constructor.name;\n  }\n}\n\nexport const mappings = {\n  item: (property: string, options?: PropertyOptions): Property => new Property(property, options),\n  ignore: (property = ''): Mapping => ({\n    property,\n    in: (): Optional<JsonValue> => undefined,\n    out: (): Optional<JsonValue> => undefined,\n  }),\n  skipIn: (property: string): Mapping => ({\n    property,\n    in: (): Optional<JsonValue> => undefined,\n    out: (source: Json = {}): JsonValue => source[property],\n  }),\n  skipOut: (property: string): Mapping => ({\n    property,\n    in: (source: Json = {}): JsonValue => source[property],\n    out: (): Optional<JsonValue> => undefined,\n  }),\n  func: (property: string, funcIn: Get<Optional<JsonValue>, Json>, funcOut: Get<Optional<JsonValue>, Json>): Mapping => ({\n    property,\n    in: (source: Json = {}): Optional<JsonValue> => ofGet(funcIn, source),\n    out: (source: Json = {}): Optional<JsonValue> => ofGet(funcOut, source),\n  }),\n  add: (funcIn: Get<JsonValue, Json>): Mapping => ({\n    property: '',\n    in: (source: Json = {}): JsonValue => ofGet(funcIn, source),\n    out: (): Optional<JsonValue> => undefined,\n  }),\n  map: (mapper: Construct<Mapper>, property = ''): Mapping => ({\n    property,\n    in: (source: Json = {}): JsonValue => ofConstruct(mapper).in(isEmpty(property) ? source : (source[property] as Json)),\n    out: (source: Json = {}, key = ''): JsonValue => ofConstruct(mapper).out(isEmpty(key) ? source : (source[key] as Json)),\n  }),\n  propsToList: (...maps: Mapping[]): Mapping => ({\n    property: '',\n    in: (source: Json = {}): JsonValue => toList(maps.map(m => ofConstruct(m).in(source))).toJSON(),\n    out: (source: Json = {}, key = ''): JsonValue =>\n      maps.reduce((a: Json, m, i) => {\n        const res = toList(source[key])[i];\n        const out = m.out(res as Json);\n        return { ...a, [m.property]: out ?? {} };\n      }, {}),\n  }),\n  list: (mapper: Mapping, property: string): Mapping => ({\n    property: property,\n    in: (source: Json = {}): JsonValue =>\n      toList(source[property])\n        .map((v: any) => mapper.in(v))\n        .toJSON(),\n    out: (source: Json = {}, key = ''): JsonValue =>\n      toList(isEmpty(key) ? source : (source[key] as Json))\n        .map((v: any) => mapper.out(v))\n        .toJSON(),\n  }),\n};\n"],"mappings":"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","names":[]}