integreat 0.8.0-alpha.71 → 0.8.0-alpha.74

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.
@@ -0,0 +1,3 @@
1
+ module.exports = {
2
+ files: ['dist/**/*.test.js'],
3
+ }
package/ava.config.cjs ADDED
@@ -0,0 +1,5 @@
1
+ module.exports = {
2
+ extensions: ['ts'],
3
+ require: ['ts-node/register/transpile-only'],
4
+ files: ['src/**/*.test.ts']
5
+ }
package/dist/index.js CHANGED
@@ -15,7 +15,7 @@ Object.defineProperty(exports, "transformers", { enumerable: true, get: function
15
15
  var middleware_1 = require("./middleware");
16
16
  Object.defineProperty(exports, "middleware", { enumerable: true, get: function () { return middleware_1.default; } });
17
17
  exports.default = {
18
- version: '0.8.0-alpha.71',
18
+ version: '0.8.0-alpha.74',
19
19
  create: create_1.default,
20
20
  mergeDefinitions: mergeDefinitions_1.default,
21
21
  mergeResources: mergeResources_1.default,
@@ -1,5 +1,8 @@
1
1
  declare const _default: {
2
- data: (string | {
2
+ 'payload.data': (string | {
3
+ $transform: string;
4
+ })[];
5
+ 'response.data': (string | {
3
6
  $transform: string;
4
7
  })[];
5
8
  };
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.default = {
4
- data: ['data', { $transform: 'form' }],
4
+ 'payload.data': ['payload.data', { $transform: 'form' }],
5
+ 'response.data': ['response.data', { $transform: 'form' }],
5
6
  };
6
7
  //# sourceMappingURL=exchangeForm.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"exchangeForm.js","sourceRoot":"","sources":["../../src/mutations/exchangeForm.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;CACvC,CAAA"}
1
+ {"version":3,"file":"exchangeForm.js","sourceRoot":"","sources":["../../src/mutations/exchangeForm.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb,cAAc,EAAE,CAAC,cAAc,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;IACxD,eAAe,EAAE,CAAC,eAAe,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;CAC3D,CAAA"}
@@ -2,7 +2,7 @@ declare const _default: ({
2
2
  $direction: string;
3
3
  $flip: boolean;
4
4
  '.': string;
5
- options: {
5
+ 'meta.options': {
6
6
  '.': string;
7
7
  headers: {
8
8
  '.': string;
@@ -12,14 +12,24 @@ declare const _default: ({
12
12
  };
13
13
  };
14
14
  };
15
- data?: undefined;
15
+ payload?: undefined;
16
+ response?: undefined;
16
17
  } | {
17
18
  '.': string;
18
- data: (string | {
19
- $transform: string;
20
- })[];
19
+ payload: {
20
+ '.': string;
21
+ data: (string | {
22
+ $transform: string;
23
+ })[];
24
+ };
25
+ response: {
26
+ '.': string;
27
+ data: (string | {
28
+ $transform: string;
29
+ })[];
30
+ };
21
31
  $direction?: undefined;
22
32
  $flip?: undefined;
23
- options?: undefined;
33
+ 'meta.options'?: undefined;
24
34
  })[];
25
35
  export default _default;
@@ -5,10 +5,10 @@ exports.default = [
5
5
  $direction: 'rev',
6
6
  $flip: true,
7
7
  '.': '.',
8
- options: {
9
- '.': 'options',
8
+ 'meta.options': {
9
+ '.': 'meta.options',
10
10
  headers: {
11
- '.': 'options.headers',
11
+ '.': 'meta.options.headers',
12
12
  'Content-Type': {
13
13
  $transform: 'value',
14
14
  value: 'application/json',
@@ -18,7 +18,11 @@ exports.default = [
18
18
  },
19
19
  {
20
20
  '.': '.',
21
- data: ['data', { $transform: 'json' }],
21
+ payload: { '.': 'payload', data: ['payload.data', { $transform: 'json' }] },
22
+ response: {
23
+ '.': 'response',
24
+ data: ['response.data', { $transform: 'json' }],
25
+ },
22
26
  },
23
27
  ];
24
28
  //# sourceMappingURL=exchangeJson.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"exchangeJson.js","sourceRoot":"","sources":["../../src/mutations/exchangeJson.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb;QACE,UAAU,EAAE,KAAK;QACjB,KAAK,EAAE,IAAI;QACX,GAAG,EAAE,GAAG;QACR,OAAO,EAAE;YACP,GAAG,EAAE,SAAS;YACd,OAAO,EAAE;gBACP,GAAG,EAAE,iBAAiB;gBACtB,cAAc,EAAE;oBACd,UAAU,EAAE,OAAO;oBACnB,KAAK,EAAE,kBAAkB;iBAC1B;aACF;SACF;KACF;IACD;QACE,GAAG,EAAE,GAAG;QACR,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;KACvC;CACF,CAAA"}
1
+ {"version":3,"file":"exchangeJson.js","sourceRoot":"","sources":["../../src/mutations/exchangeJson.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb;QACE,UAAU,EAAE,KAAK;QACjB,KAAK,EAAE,IAAI;QACX,GAAG,EAAE,GAAG;QACR,cAAc,EAAE;YACd,GAAG,EAAE,cAAc;YACnB,OAAO,EAAE;gBACP,GAAG,EAAE,sBAAsB;gBAC3B,cAAc,EAAE;oBACd,UAAU,EAAE,OAAO;oBACnB,KAAK,EAAE,kBAAkB;iBAC1B;aACF;SACF;KACF;IACD;QACE,GAAG,EAAE,GAAG;QACR,OAAO,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,cAAc,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,EAAE;QAC3E,QAAQ,EAAE;YACR,GAAG,EAAE,UAAU;YACf,IAAI,EAAE,CAAC,eAAe,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;SAChD;KACF;CACF,CAAA"}
@@ -1,7 +1,8 @@
1
1
  declare const _default: {
2
2
  $direction: string;
3
3
  $flip: boolean;
4
- options: {
4
+ meta: string;
5
+ 'meta.options': {
5
6
  '.': string;
6
7
  uri: {
7
8
  $transform: string;
@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.default = {
4
4
  $direction: 'rev',
5
5
  $flip: true,
6
- options: {
7
- '.': 'options',
8
- uri: { $transform: 'template', templatePath: 'options.uri' },
6
+ meta: 'meta',
7
+ 'meta.options': {
8
+ '.': 'meta.options',
9
+ uri: { $transform: 'template', templatePath: 'meta.options.uri' },
9
10
  },
10
11
  };
11
12
  //# sourceMappingURL=exchangeUri.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"exchangeUri.js","sourceRoot":"","sources":["../../src/mutations/exchangeUri.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb,UAAU,EAAE,KAAK;IACjB,KAAK,EAAE,IAAI;IACX,OAAO,EAAE;QACP,GAAG,EAAE,SAAS;QACd,GAAG,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE;KAC7D;CACF,CAAA"}
1
+ {"version":3,"file":"exchangeUri.js","sourceRoot":"","sources":["../../src/mutations/exchangeUri.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb,UAAU,EAAE,KAAK;IACjB,KAAK,EAAE,IAAI;IACX,IAAI,EAAE,MAAM;IACZ,cAAc,EAAE;QACd,GAAG,EAAE,cAAc;QACnB,GAAG,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,kBAAkB,EAAE;KAClE;CACF,CAAA"}
@@ -1,6 +1,9 @@
1
1
  declare const _default: {
2
2
  'exchange:form': {
3
- data: (string | {
3
+ 'payload.data': (string | {
4
+ $transform: string;
5
+ })[];
6
+ 'response.data': (string | {
4
7
  $transform: string;
5
8
  })[];
6
9
  };
@@ -8,7 +11,7 @@ declare const _default: {
8
11
  $direction: string;
9
12
  $flip: boolean;
10
13
  '.': string;
11
- options: {
14
+ 'meta.options': {
12
15
  '.': string;
13
16
  headers: {
14
17
  '.': string;
@@ -18,20 +21,31 @@ declare const _default: {
18
21
  };
19
22
  };
20
23
  };
21
- data?: undefined;
24
+ payload?: undefined;
25
+ response?: undefined;
22
26
  } | {
23
27
  '.': string;
24
- data: (string | {
25
- $transform: string;
26
- })[];
28
+ payload: {
29
+ '.': string;
30
+ data: (string | {
31
+ $transform: string;
32
+ })[];
33
+ };
34
+ response: {
35
+ '.': string;
36
+ data: (string | {
37
+ $transform: string;
38
+ })[];
39
+ };
27
40
  $direction?: undefined;
28
41
  $flip?: undefined;
29
- options?: undefined;
42
+ 'meta.options'?: undefined;
30
43
  })[];
31
44
  'exchange:uri': {
32
45
  $direction: string;
33
46
  $flip: boolean;
34
- options: {
47
+ meta: string;
48
+ 'meta.options': {
35
49
  '.': string;
36
50
  uri: {
37
51
  $transform: string;
@@ -2,7 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const map_transform_1 = require("map-transform");
4
4
  const match_1 = require("./match");
5
- const mappingObject_1 = require("../../utils/mappingObject");
5
+ const mappingHelpers_1 = require("../../utils/mappingHelpers");
6
6
  const array_1 = require("../../utils/array");
7
7
  function mutate(mutator, data, fromService, noDefaults = false) {
8
8
  if (fromService) {
@@ -16,7 +16,7 @@ function mutateAction(mutator, isRequest, mapNoDefaults) {
16
16
  if (!mutator) {
17
17
  return (action) => action;
18
18
  }
19
- return (action, isIncoming = false) => (0, mappingObject_1.actionFromMappingObject)(action, mutate(mutator, (0, mappingObject_1.mappingObjectFromAction)(action, isRequest), isRequest ? !!isIncoming : !isIncoming, mapNoDefaults ||
19
+ return (action, isIncoming = false) => (0, mappingHelpers_1.populateActionAfterMapping)(action, mutate(mutator, (0, mappingHelpers_1.prepareActionForMapping)(action, isRequest), isRequest ? !!isIncoming : !isIncoming, mapNoDefaults ||
20
20
  (isRequest
21
21
  ? action.payload.sendNoDefaults
22
22
  : action.response?.returnNoDefaults)), isRequest);
@@ -24,9 +24,10 @@ function mutateAction(mutator, isRequest, mapNoDefaults) {
24
24
  const flattenIfOneOrNone = (arr) => arr.length <= 1 ? arr[0] : arr;
25
25
  function createEndpoint(serviceId, serviceOptions, mapOptions, serviceMutation, prepareOptions = (options) => options) {
26
26
  return function (endpointDef) {
27
- const mutation = flattenIfOneOrNone([...(0, array_1.ensureArray)(serviceMutation), endpointDef.mutation]
28
- .filter((item) => !!item)
29
- .map(map_transform_1.modify));
27
+ const mutation = flattenIfOneOrNone([
28
+ ...(0, array_1.ensureArray)(serviceMutation),
29
+ ...(0, array_1.ensureArray)(endpointDef.mutation),
30
+ ].map(map_transform_1.modify));
30
31
  const mutator = mutation ? (0, map_transform_1.mapTransform)(mutation, mapOptions) : null;
31
32
  const options = prepareOptions({
32
33
  ...serviceOptions,
@@ -1 +1 @@
1
- {"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/service/endpoints/create.ts"],"names":[],"mappings":";;AAAA,iDAKsB;AAItB,mCAA6B;AAC7B,6DAGkC;AAClC,6CAA+C;AAM/C,SAAS,MAAM,CACb,OAAqB,EACrB,IAAa,EACb,WAAoB,EACpB,UAAU,GAAG,KAAK;IAElB,IAAI,WAAW,EAAE;QACf,OAAO,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;KACnE;SAAM;QACL,OAAO,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;KAC3E;AACH,CAAC;AAED,SAAS,YAAY,CACnB,OAA4B,EAC5B,SAAkB,EAClB,aAAsB;IAEtB,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,CAAC,MAAc,EAAE,EAAE,CAAC,MAAM,CAAA;KAClC;IAED,OAAO,CAAC,MAAc,EAAE,UAAU,GAAG,KAAK,EAAE,EAAE,CAC5C,IAAA,uCAAuB,EACrB,MAAM,EACN,MAAM,CACJ,OAAO,EACP,IAAA,uCAAuB,EAAC,MAAM,EAAE,SAAS,CAAC,EAC1C,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,EACtC,aAAa;QACX,CAAC,SAAS;YACR,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc;YAC/B,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CACzC,EACD,SAAS,CACV,CAAA;AACL,CAAC;AAED,MAAM,kBAAkB,GAAG,CAAI,GAAQ,EAAW,EAAE,CAClD,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;AAKhC,SAAwB,cAAc,CACpC,SAAiB,EACjB,cAA+B,EAC/B,UAAsB,EACtB,eAA+B,EAC/B,iBAAiC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO;IAErD,OAAO,UAAU,WAAwB;QACvC,MAAM,QAAQ,GAAG,kBAAkB,CACjC,CAAC,GAAG,IAAA,mBAAW,EAAC,eAAe,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC;aACpD,MAAM,CAAC,CAAC,IAAI,EAAyB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;aAC/C,GAAG,CAAC,sBAAM,CAAC,CACf,CAAA;QACD,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAA,4BAAY,EAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QAEpE,MAAM,OAAO,GAAG,cAAc,CAC5B;YACE,GAAG,cAAc;YACjB,GAAG,WAAW,CAAC,OAAO;SACvB,EACD,SAAS,CACV,CAAA;QAED,MAAM,EACJ,EAAE,EACF,eAAe,GAAG,KAAK,EACvB,gBAAgB,GAAG,KAAK,EACxB,cAAc,GAAG,KAAK,EACtB,gBAAgB,GAAG,KAAK,EACxB,KAAK,GACN,GAAG,WAAW,CAAA;QAEf,OAAO;YACL,EAAE;YACF,eAAe;YACf,gBAAgB;YAChB,KAAK;YACL,OAAO;YACP,aAAa,EAAE,YAAY,CAAC,OAAO,EAAE,IAAI,EAAE,cAAc,CAAC;YAC1D,cAAc,EAAE,YAAY,CAAC,OAAO,EAAE,KAAK,EAAE,gBAAgB,CAAC;YAC9D,OAAO,EAAE,IAAA,eAAO,EAAC,WAAW,CAAC;SAC9B,CAAA;IACH,CAAC,CAAA;AACH,CAAC;AA3CD,iCA2CC"}
1
+ {"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/service/endpoints/create.ts"],"names":[],"mappings":";;AAAA,iDAKsB;AAItB,mCAA6B;AAC7B,+DAGmC;AACnC,6CAA+C;AAM/C,SAAS,MAAM,CACb,OAAqB,EACrB,IAAa,EACb,WAAoB,EACpB,UAAU,GAAG,KAAK;IAElB,IAAI,WAAW,EAAE;QACf,OAAO,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;KACnE;SAAM;QACL,OAAO,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;KAC3E;AACH,CAAC;AAED,SAAS,YAAY,CACnB,OAA4B,EAC5B,SAAkB,EAClB,aAAsB;IAEtB,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,CAAC,MAAc,EAAE,EAAE,CAAC,MAAM,CAAA;KAClC;IAED,OAAO,CAAC,MAAc,EAAE,UAAU,GAAG,KAAK,EAAE,EAAE,CAC5C,IAAA,2CAA0B,EACxB,MAAM,EACN,MAAM,CACJ,OAAO,EACP,IAAA,wCAAuB,EAAC,MAAM,EAAE,SAAS,CAAC,EAC1C,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,EACtC,aAAa;QACX,CAAC,SAAS;YACR,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc;YAC/B,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CACzC,EACD,SAAS,CACV,CAAA;AACL,CAAC;AAED,MAAM,kBAAkB,GAAG,CAAI,GAAQ,EAAW,EAAE,CAClD,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;AAKhC,SAAwB,cAAc,CACpC,SAAiB,EACjB,cAA+B,EAC/B,UAAsB,EACtB,eAA+B,EAC/B,iBAAiC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO;IAErD,OAAO,UAAU,WAAwB;QACvC,MAAM,QAAQ,GAAG,kBAAkB,CACjC;YACE,GAAG,IAAA,mBAAW,EAAC,eAAe,CAAC;YAC/B,GAAG,IAAA,mBAAW,EAAC,WAAW,CAAC,QAAQ,CAAC;SACrC,CAAC,GAAG,CAAC,sBAAM,CAAC,CACd,CAAA;QACD,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAA,4BAAY,EAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QAEpE,MAAM,OAAO,GAAG,cAAc,CAC5B;YACE,GAAG,cAAc;YACjB,GAAG,WAAW,CAAC,OAAO;SACvB,EACD,SAAS,CACV,CAAA;QAED,MAAM,EACJ,EAAE,EACF,eAAe,GAAG,KAAK,EACvB,gBAAgB,GAAG,KAAK,EACxB,cAAc,GAAG,KAAK,EACtB,gBAAgB,GAAG,KAAK,EACxB,KAAK,GACN,GAAG,WAAW,CAAA;QAEf,OAAO;YACL,EAAE;YACF,eAAe;YACf,gBAAgB;YAChB,KAAK;YACL,OAAO;YACP,aAAa,EAAE,YAAY,CAAC,OAAO,EAAE,IAAI,EAAE,cAAc,CAAC;YAC1D,cAAc,EAAE,YAAY,CAAC,OAAO,EAAE,KAAK,EAAE,gBAAgB,CAAC;YAC9D,OAAO,EAAE,IAAA,eAAO,EAAC,WAAW,CAAC;SAC9B,CAAA;IACH,CAAC,CAAA;AACH,CAAC;AA5CD,iCA4CC"}
@@ -6,6 +6,8 @@ export interface MapOptions {
6
6
  functions?: Record<string, CustomFunction>;
7
7
  dictionaries?: Dictionaries;
8
8
  mutateNull?: boolean;
9
+ fwdAlias?: string;
10
+ revAlias?: string;
9
11
  }
10
12
  export declare type MapDefinitions = Record<string, string | MapDefinition>;
11
13
  export interface IdentConfig {
@@ -9,6 +9,8 @@ function createMapOptions(schemas, mutations, functions, dictionaries) {
9
9
  },
10
10
  functions,
11
11
  dictionaries,
12
+ fwdAlias: 'from',
13
+ revAlias: 'to',
12
14
  };
13
15
  }
14
16
  exports.default = createMapOptions;
@@ -1 +1 @@
1
- {"version":3,"file":"createMapOptions.js","sourceRoot":"","sources":["../../src/utils/createMapOptions.ts"],"names":[],"mappings":";;AAIA,MAAM,oBAAoB,GAAG,CAC3B,OAA+B,EACA,EAAE,CACjC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAC5B,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,SAAS,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,EACzE,EAAE,CACH,CAAA;AAEH,SAAwB,gBAAgB,CACtC,OAA+B,EAC/B,SAAyC,EACzC,SAA0C,EAC1C,YAA2B;IAE3B,OAAO;QACL,SAAS,EAAE;YACT,GAAG,SAAS;YACZ,GAAG,oBAAoB,CAAC,OAAO,CAAC;SACjC;QACD,SAAS;QACT,YAAY;KACb,CAAA;AACH,CAAC;AAdD,mCAcC"}
1
+ {"version":3,"file":"createMapOptions.js","sourceRoot":"","sources":["../../src/utils/createMapOptions.ts"],"names":[],"mappings":";;AAIA,MAAM,oBAAoB,GAAG,CAC3B,OAA+B,EACA,EAAE,CACjC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAC5B,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,SAAS,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,EACzE,EAAE,CACH,CAAA;AAEH,SAAwB,gBAAgB,CACtC,OAA+B,EAC/B,SAAyC,EACzC,SAA0C,EAC1C,YAA2B;IAE3B,OAAO;QACL,SAAS,EAAE;YACT,GAAG,SAAS;YACZ,GAAG,oBAAoB,CAAC,OAAO,CAAC;SACjC;QACD,SAAS;QACT,YAAY;QACZ,QAAQ,EAAE,MAAM;QAChB,QAAQ,EAAE,IAAI;KACf,CAAA;AACH,CAAC;AAhBD,mCAgBC"}
@@ -17,5 +17,5 @@ export interface MappingObject {
17
17
  ident?: Ident;
18
18
  meta?: Meta;
19
19
  }
20
- export declare function mappingObjectFromAction(action: Action, isRequest?: boolean): MappingObject;
21
- export declare function actionFromMappingObject(action: Action, mappingObject?: MappingObject, isRequest?: boolean): Action;
20
+ export declare function prepareActionForMapping(action: Action, _isRequest?: boolean): Action;
21
+ export declare function populateActionAfterMapping(action: Action, mappedAction?: Partial<Action>, isRequest?: boolean): Action;
@@ -0,0 +1,49 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.populateActionAfterMapping = exports.prepareActionForMapping = void 0;
4
+ const isOkStatus = (status) => typeof status === 'string' && ['ok', 'queued'].includes(status);
5
+ function prepareActionForMapping(action, _isRequest = false) {
6
+ return action;
7
+ }
8
+ exports.prepareActionForMapping = prepareActionForMapping;
9
+ function populateActionAfterMapping(action, mappedAction, isRequest = false) {
10
+ if (!mappedAction) {
11
+ return action;
12
+ }
13
+ const actionStatus = action.response?.status;
14
+ const { type: actionType, payload: { data: requestData, ...params } = {}, response: { status: mappedStatus, error, paging, headers, data: responseData, params: responseParams, } = {}, meta: { options, ident } = {}, } = mappedAction;
15
+ const status = actionStatus &&
16
+ !isOkStatus(actionStatus) &&
17
+ (isOkStatus(mappedStatus) || actionStatus !== 'error')
18
+ ? actionStatus
19
+ : mappedStatus || actionStatus || null;
20
+ const { data, ...actionResponse } = action.response || {};
21
+ const response = !isRequest || status
22
+ ? {
23
+ ...actionResponse,
24
+ status: isOkStatus(status) && error ? 'error' : status,
25
+ ...(responseData ? { data: responseData } : {}),
26
+ ...(paging && { paging }),
27
+ ...(error && { error }),
28
+ ...(headers && { headers }),
29
+ ...(responseParams && { params: responseParams }),
30
+ }
31
+ : undefined;
32
+ return {
33
+ ...action,
34
+ type: actionType || action.type,
35
+ payload: {
36
+ ...action.payload,
37
+ ...params,
38
+ ...(requestData ? { data: requestData } : {}),
39
+ },
40
+ ...(response && { response }),
41
+ meta: {
42
+ ...action.meta,
43
+ ident: ident || action.meta?.ident,
44
+ ...(options && { options: { ...action?.meta?.options, ...options } }),
45
+ },
46
+ };
47
+ }
48
+ exports.populateActionAfterMapping = populateActionAfterMapping;
49
+ //# sourceMappingURL=mappingHelpers.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"mappingHelpers.js","sourceRoot":"","sources":["../../src/utils/mappingHelpers.ts"],"names":[],"mappings":";;;AAsBA,MAAM,UAAU,GAAG,CAAC,MAAsB,EAAE,EAAE,CAC5C,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;AAEjE,SAAgB,uBAAuB,CACrC,MAAc,EACd,UAAU,GAAG,KAAK;IAElB,OAAO,MAAM,CAAA;AACf,CAAC;AALD,0DAKC;AAED,SAAgB,0BAA0B,CACxC,MAAc,EACd,YAA8B,EAC9B,SAAS,GAAG,KAAK;IAEjB,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO,MAAM,CAAA;KACd;IACD,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAA;IAC5C,MAAM,EACJ,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,EAC9C,QAAQ,EAAE,EACR,MAAM,EAAE,YAAY,EACpB,KAAK,EACL,MAAM,EACN,OAAO,EACP,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,cAAc,GACvB,GAAG,EAAE,EACN,IAAI,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,GAC9B,GAAG,YAAY,CAAA;IAChB,MAAM,MAAM,GACV,YAAY;QACZ,CAAC,UAAU,CAAC,YAAY,CAAC;QACzB,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,YAAY,KAAK,OAAO,CAAC;QACpD,CAAC,CAAC,YAAY;QACd,CAAC,CAAC,YAAY,IAAI,YAAY,IAAI,IAAI,CAAA;IAC1C,MAAM,EAAE,IAAI,EAAE,GAAG,cAAc,EAAE,GAAG,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAA;IACzD,MAAM,QAAQ,GACZ,CAAC,SAAS,IAAI,MAAM;QAClB,CAAC,CAAC;YACE,GAAG,cAAc;YACjB,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM;YACtD,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/C,GAAG,CAAC,MAAM,IAAI,EAAE,MAAM,EAAE,CAAC;YACzB,GAAG,CAAC,KAAK,IAAI,EAAE,KAAK,EAAE,CAAC;YACvB,GAAG,CAAC,OAAO,IAAI,EAAE,OAAO,EAAE,CAAC;YAC3B,GAAG,CAAC,cAAc,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC;SAClD;QACH,CAAC,CAAC,SAAS,CAAA;IAEf,OAAO;QACL,GAAG,MAAM;QACT,IAAI,EAAE,UAAU,IAAI,MAAM,CAAC,IAAI;QAC/B,OAAO,EAAE;YACP,GAAG,MAAM,CAAC,OAAO;YACjB,GAAG,MAAM;YACT,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC9C;QACD,GAAG,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,CAAC;QAC7B,IAAI,EAAE;YACJ,GAAG,MAAM,CAAC,IAAI;YACd,KAAK,EAAE,KAAK,IAAI,MAAM,CAAC,IAAI,EAAE,KAAK;YAClC,GAAG,CAAC,OAAO,IAAI,EAAE,OAAO,EAAE,EAAE,GAAG,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,EAAE,CAAC;SACtE;KACF,CAAA;AACH,CAAC;AAzDD,gEAyDC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "integreat",
3
- "version": "0.8.0-alpha.71",
3
+ "version": "0.8.0-alpha.74",
4
4
  "description": "Node.js integration layer",
5
5
  "author": "Kjell-Morten Bratsberg Thorsen <kjellmorten@integreat.io> (https://integreat.io/)",
6
6
  "license": "ISC",
@@ -47,7 +47,7 @@
47
47
  "later": "^1.2.0",
48
48
  "luxon": "^2.3.1",
49
49
  "map-any": "^0.2.1",
50
- "map-transform": "0.4.0-alpha.5",
50
+ "map-transform": "0.4.0-alpha.10",
51
51
  "ms": "^2.1.3",
52
52
  "nanoid": "^3.3.1",
53
53
  "p-limit": "^3.1.0",
@@ -59,7 +59,7 @@
59
59
  "devDependencies": {
60
60
  "@integreat/ts-dev-setup": "^2.2.0",
61
61
  "@types/sinon": "^10.0.11",
62
- "integreat-transporter-http": "0.1.0-alpha.9",
62
+ "integreat-transporter-http": "0.1.0-alpha.16",
63
63
  "nock": "^13.2.4",
64
64
  "sinon": "^13.0.1"
65
65
  }
@@ -1,58 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.actionFromMappingObject = exports.mappingObjectFromAction = void 0;
4
- const isOkStatus = (status) => status !== null && ['ok', 'queued'].includes(status);
5
- function mappingObjectFromAction(action, isRequest = false) {
6
- const { type: actionType, payload: { data: requestData, ...requestParams }, response: { status = null, data: responseData, error, params: responseParams, paging, } = {}, meta: { options, ident, ...meta } = {}, } = action;
7
- return {
8
- action: actionType,
9
- status,
10
- params: { ...requestParams, ...responseParams },
11
- data: isRequest ? requestData : responseData,
12
- error,
13
- paging,
14
- ...(options ? { options } : {}),
15
- ident,
16
- meta,
17
- };
18
- }
19
- exports.mappingObjectFromAction = mappingObjectFromAction;
20
- function actionFromMappingObject(action, mappingObject, isRequest = false) {
21
- if (!mappingObject) {
22
- return action;
23
- }
24
- const actionStatus = action.response?.status;
25
- const { action: actionType, status: mappedStatus, data, paging, error, params, options, headers, ident, } = mappingObject;
26
- const status = actionStatus &&
27
- !isOkStatus(actionStatus) &&
28
- (isOkStatus(mappedStatus) || actionStatus !== 'error')
29
- ? actionStatus
30
- : mappedStatus || actionStatus || null;
31
- const response = !isRequest || status
32
- ? {
33
- ...action.response,
34
- ...(!isRequest && { data }),
35
- ...(paging && { paging }),
36
- ...(error && { error }),
37
- ...(headers && { headers }),
38
- status: isOkStatus(status) && error ? 'error' : status,
39
- }
40
- : undefined;
41
- return {
42
- ...action,
43
- type: actionType || action.type,
44
- payload: {
45
- ...action.payload,
46
- ...params,
47
- ...(isRequest && { data }),
48
- },
49
- ...(response && { response }),
50
- meta: {
51
- ...action.meta,
52
- ident: ident || action.meta?.ident,
53
- ...(options && { options: { ...action?.meta?.options, ...options } }),
54
- },
55
- };
56
- }
57
- exports.actionFromMappingObject = actionFromMappingObject;
58
- //# sourceMappingURL=mappingObject.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"mappingObject.js","sourceRoot":"","sources":["../../src/utils/mappingObject.ts"],"names":[],"mappings":"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"}