integreat 0.8.0-alpha.83 → 0.8.0-alpha.86
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.
- package/dist/create.d.ts +3 -0
- package/dist/create.js +4 -0
- package/dist/create.js.map +1 -1
- package/dist/index.js +1 -1
- package/dist/service/Connection.d.ts +1 -1
- package/dist/service/Connection.js +6 -4
- package/dist/service/Connection.js.map +1 -1
- package/dist/service/index.d.ts +2 -1
- package/dist/service/index.js +2 -2
- package/dist/service/index.js.map +1 -1
- package/dist/transformers/form.js +1 -1
- package/dist/transformers/form.js.map +1 -1
- package/dist/transformers/formatDate.d.ts +1 -1
- package/dist/transformers/formatDate.js +1 -1
- package/dist/transformers/formatDate.js.map +1 -1
- package/dist/transformers/index.d.ts +2 -2
- package/dist/transformers/json.js +1 -1
- package/dist/transformers/json.js.map +1 -1
- package/dist/transformers/ms.d.ts +1 -1
- package/dist/transformers/ms.js +1 -1
- package/dist/transformers/ms.js.map +1 -1
- package/dist/transformers/removeTypePrefixOnId.js +1 -1
- package/dist/transformers/removeTypePrefixOnId.js.map +1 -1
- package/dist/transformers/round.d.ts +1 -1
- package/dist/transformers/uriPart.js +2 -2
- package/dist/transformers/uriPart.js.map +1 -1
- package/dist/transformers/xml/index.js +1 -1
- package/dist/transformers/xml/index.js.map +1 -1
- package/dist/types.d.ts +1 -1
- package/package.json +4 -4
package/dist/create.d.ts
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
import EventEmitter = require('node:events');
|
|
1
3
|
import { Dictionaries, CustomFunction, MapDefinition } from 'map-transform';
|
|
2
4
|
import { Middleware, Transporter, Dispatch, ScheduleDef, Action, Response, ActionHandler } from './types';
|
|
3
5
|
import { ServiceDef, IdentConfig, AuthDef, Authenticator, Service } from './service/types';
|
|
@@ -28,5 +30,6 @@ export interface Instance<ResponseData = unknown> {
|
|
|
28
30
|
dispatchScheduled: (from: Date, to: Date) => Promise<Action[]>;
|
|
29
31
|
listen: () => Promise<Response>;
|
|
30
32
|
close: () => Promise<Response>;
|
|
33
|
+
on: (eventName: string, listener: (...args: unknown[]) => void) => EventEmitter;
|
|
31
34
|
}
|
|
32
35
|
export default function create({ services: serviceDefs, schemas: schemaDefs, mutations, auths: authDefs, identConfig, queueService, dictionaries, schedules: scheduleDefs, }: Definitions, { transporters, transformers, handlers, authenticators }: Resources, middlewareForDispatch?: Middleware[], middlewareForService?: Middleware[]): Instance;
|
package/dist/create.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const EventEmitter = require("node:events");
|
|
3
4
|
const Auth_1 = require("./service/Auth");
|
|
4
5
|
const handlers_1 = require("./handlers");
|
|
5
6
|
const builtIns_1 = require("./transformers/builtIns");
|
|
@@ -18,6 +19,7 @@ function create({ services: serviceDefs, schemas: schemaDefs, mutations, auths:
|
|
|
18
19
|
if (!Array.isArray(serviceDefs) || !Array.isArray(schemaDefs)) {
|
|
19
20
|
throw new TypeError('Please provide Integreat with at least services and schemas');
|
|
20
21
|
}
|
|
22
|
+
const emitter = new EventEmitter();
|
|
21
23
|
const schemas = schemaDefs
|
|
22
24
|
.map(schema_1.default)
|
|
23
25
|
.reduce(indexUtils_2.indexById, {});
|
|
@@ -34,6 +36,7 @@ function create({ services: serviceDefs, schemas: schemaDefs, mutations, auths:
|
|
|
34
36
|
schemas,
|
|
35
37
|
mapOptions,
|
|
36
38
|
middleware: middlewareForService,
|
|
39
|
+
emit: emitter.emit.bind(emitter),
|
|
37
40
|
}))
|
|
38
41
|
.reduce(indexUtils_2.indexById, {});
|
|
39
42
|
const dispatch = (0, dispatch_1.default)({
|
|
@@ -54,6 +57,7 @@ function create({ services: serviceDefs, schemas: schemaDefs, mutations, auths:
|
|
|
54
57
|
dispatchScheduled,
|
|
55
58
|
listen: async () => (0, listen_1.default)(Object.values(services), dispatch),
|
|
56
59
|
close: async () => (0, close_1.default)(Object.values(services)),
|
|
60
|
+
on: (eventName, listener) => emitter.on(eventName, listener),
|
|
57
61
|
};
|
|
58
62
|
}
|
|
59
63
|
exports.default = create;
|
package/dist/create.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../src/create.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../src/create.ts"],"names":[],"mappings":"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"}
|
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.
|
|
18
|
+
version: '0.8.0-alpha.86',
|
|
19
19
|
create: create_1.default,
|
|
20
20
|
mergeDefinitions: mergeDefinitions_1.default,
|
|
21
21
|
mergeResources: mergeResources_1.default,
|
|
@@ -6,7 +6,7 @@ export interface ConnectionObject extends Record<string, unknown> {
|
|
|
6
6
|
}
|
|
7
7
|
export default class Connection {
|
|
8
8
|
#private;
|
|
9
|
-
constructor(transporter: Transporter, options: EndpointOptions);
|
|
9
|
+
constructor(transporter: Transporter, options: EndpointOptions, emit: (eventType: string, ...args: unknown[]) => void);
|
|
10
10
|
connect(auth?: Record<string, unknown> | null): Promise<boolean>;
|
|
11
11
|
disconnect(): Promise<void>;
|
|
12
12
|
get status(): string | null;
|
|
@@ -10,21 +10,23 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
10
10
|
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
11
11
|
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
12
12
|
};
|
|
13
|
-
var _Connection_transporter, _Connection_options, _Connection_connection;
|
|
13
|
+
var _Connection_transporter, _Connection_options, _Connection_connection, _Connection_emit;
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
const isSuccessStatus = (status) => typeof status === 'string' && ['ok', 'noaction'].includes(status);
|
|
16
16
|
class Connection {
|
|
17
|
-
constructor(transporter, options) {
|
|
17
|
+
constructor(transporter, options, emit) {
|
|
18
18
|
_Connection_transporter.set(this, void 0);
|
|
19
19
|
_Connection_options.set(this, void 0);
|
|
20
20
|
_Connection_connection.set(this, void 0);
|
|
21
|
+
_Connection_emit.set(this, void 0);
|
|
21
22
|
__classPrivateFieldSet(this, _Connection_transporter, transporter, "f");
|
|
22
23
|
__classPrivateFieldSet(this, _Connection_options, options, "f");
|
|
23
24
|
__classPrivateFieldSet(this, _Connection_connection, null, "f");
|
|
25
|
+
__classPrivateFieldSet(this, _Connection_emit, emit, "f");
|
|
24
26
|
}
|
|
25
27
|
async connect(auth) {
|
|
26
28
|
if (typeof __classPrivateFieldGet(this, _Connection_transporter, "f").connect === 'function') {
|
|
27
|
-
__classPrivateFieldSet(this, _Connection_connection, (await __classPrivateFieldGet(this, _Connection_transporter, "f").connect(__classPrivateFieldGet(this, _Connection_options, "f"), auth || null, __classPrivateFieldGet(this, _Connection_connection, "f")?.status === 'ok' ? __classPrivateFieldGet(this, _Connection_connection, "f") : null)) || { status: 'ok' }, "f");
|
|
29
|
+
__classPrivateFieldSet(this, _Connection_connection, (await __classPrivateFieldGet(this, _Connection_transporter, "f").connect(__classPrivateFieldGet(this, _Connection_options, "f"), auth || null, __classPrivateFieldGet(this, _Connection_connection, "f")?.status === 'ok' ? __classPrivateFieldGet(this, _Connection_connection, "f") : null, __classPrivateFieldGet(this, _Connection_emit, "f"))) || { status: 'ok' }, "f");
|
|
28
30
|
}
|
|
29
31
|
else {
|
|
30
32
|
__classPrivateFieldSet(this, _Connection_connection, { status: 'ok' }, "f");
|
|
@@ -48,5 +50,5 @@ class Connection {
|
|
|
48
50
|
}
|
|
49
51
|
}
|
|
50
52
|
exports.default = Connection;
|
|
51
|
-
_Connection_transporter = new WeakMap(), _Connection_options = new WeakMap(), _Connection_connection = new WeakMap();
|
|
53
|
+
_Connection_transporter = new WeakMap(), _Connection_options = new WeakMap(), _Connection_connection = new WeakMap(), _Connection_emit = new WeakMap();
|
|
52
54
|
//# sourceMappingURL=Connection.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Connection.js","sourceRoot":"","sources":["../../src/service/Connection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAQA,MAAM,eAAe,GAAG,CAAC,MAAsB,EAAE,EAAE,CACjD,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;AAEnE,MAAqB,UAAU;
|
|
1
|
+
{"version":3,"file":"Connection.js","sourceRoot":"","sources":["../../src/service/Connection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAQA,MAAM,eAAe,GAAG,CAAC,MAAsB,EAAE,EAAE,CACjD,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;AAEnE,MAAqB,UAAU;IAM7B,YACE,WAAwB,EACxB,OAAwB,EACxB,IAAqD;QARvD,0CAAyB;QACzB,sCAAyB;QACzB,yCAAoC;QACpC,mCAAsD;QAOpD,uBAAA,IAAI,2BAAgB,WAAW,MAAA,CAAA;QAC/B,uBAAA,IAAI,uBAAY,OAAO,MAAA,CAAA;QACvB,uBAAA,IAAI,0BAAe,IAAI,MAAA,CAAA;QACvB,uBAAA,IAAI,oBAAS,IAAI,MAAA,CAAA;IACnB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAqC;QACjD,IAAI,OAAO,uBAAA,IAAI,+BAAa,CAAC,OAAO,KAAK,UAAU,EAAE;YACnD,uBAAA,IAAI,0BAAe,CAAC,MAAM,uBAAA,IAAI,+BAAa,CAAC,OAAO,CACjD,uBAAA,IAAI,2BAAS,EACb,IAAI,IAAI,IAAI,EACZ,uBAAA,IAAI,8BAAY,EAAE,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,uBAAA,IAAI,8BAAY,CAAC,CAAC,CAAC,IAAI,EAC3D,uBAAA,IAAI,wBAAM,CACX,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAA,CAAA;SACvB;aAAM;YACL,uBAAA,IAAI,0BAAe,EAAE,MAAM,EAAE,IAAI,EAAE,MAAA,CAAA;SACpC;QACD,OAAO,eAAe,CAAC,uBAAA,IAAI,8BAAY,EAAE,MAAM,CAAC,CAAA;IAClD,CAAC;IAED,KAAK,CAAC,UAAU;QACd,IAAI,OAAO,uBAAA,IAAI,+BAAa,CAAC,UAAU,KAAK,UAAU,EAAE;YACtD,MAAM,uBAAA,IAAI,+BAAa,CAAC,UAAU,CAAC,uBAAA,IAAI,8BAAY,CAAC,CAAA;SACrD;QACD,uBAAA,IAAI,0BAAe,IAAI,MAAA,CAAA;IACzB,CAAC;IAED,IAAI,MAAM;QACR,OAAO,uBAAA,IAAI,8BAAY,EAAE,MAAM,IAAI,IAAI,CAAA;IACzC,CAAC;IAED,IAAI,KAAK;QACP,OAAO,uBAAA,IAAI,8BAAY,EAAE,KAAK,IAAI,IAAI,CAAA;IACxC,CAAC;IAED,IAAI,MAAM;QACR,OAAO,uBAAA,IAAI,8BAAY,IAAI,IAAI,CAAA;IACjC,CAAC;CACF;AAjDD,6BAiDC"}
|
package/dist/service/index.d.ts
CHANGED
|
@@ -8,6 +8,7 @@ interface Resources {
|
|
|
8
8
|
schemas: Record<string, Schema>;
|
|
9
9
|
mapOptions?: MapOptions;
|
|
10
10
|
middleware?: Middleware[];
|
|
11
|
+
emit?: (eventType: string, ...args: unknown[]) => void;
|
|
11
12
|
}
|
|
12
|
-
declare const _default: ({ transporters, auths, schemas, mapOptions, middleware, }: Resources) => ({ id: serviceId, transporter: transporterId, auth, incomingIdent, meta, options, mutation, endpoints: endpointDefs, }: ServiceDef) => Service;
|
|
13
|
+
declare const _default: ({ transporters, auths, schemas, mapOptions, middleware, emit, }: Resources) => ({ id: serviceId, transporter: transporterId, auth, incomingIdent, meta, options, mutation, endpoints: endpointDefs, }: ServiceDef) => Service;
|
|
13
14
|
export default _default;
|
package/dist/service/index.js
CHANGED
|
@@ -58,7 +58,7 @@ const sendToTransporter = (transporter, connection, serviceId) => async function
|
|
|
58
58
|
return (0, createError_1.createErrorOnAction)(action, `Error retrieving from service '${serviceId}': ${error.message}`);
|
|
59
59
|
}
|
|
60
60
|
};
|
|
61
|
-
exports.default = ({ transporters, auths, schemas, mapOptions = {}, middleware = [], }) => ({ id: serviceId, transporter: transporterId, auth, incomingIdent, meta, options = {}, mutation, endpoints: endpointDefs = [], }) => {
|
|
61
|
+
exports.default = ({ transporters, auths, schemas, mapOptions = {}, middleware = [], emit = () => undefined, }) => ({ id: serviceId, transporter: transporterId, auth, incomingIdent, meta, options = {}, mutation, endpoints: endpointDefs = [], }) => {
|
|
62
62
|
if (typeof serviceId !== 'string' || serviceId === '') {
|
|
63
63
|
throw new TypeError(`Can't create service without an id.`);
|
|
64
64
|
}
|
|
@@ -71,7 +71,7 @@ exports.default = ({ transporters, auths, schemas, mapOptions = {}, middleware =
|
|
|
71
71
|
const getEndpointMapper = (0, endpoints_1.default)(serviceId, endpointDefs, options, mapOptions, mutation, isTransporter(transporter) ? transporter.prepareOptions : undefined);
|
|
72
72
|
const runThroughMiddleware = middleware.length > 0 ? (0, dispatch_1.compose)(...middleware) : (fn) => fn;
|
|
73
73
|
let connection = isTransporter(transporter)
|
|
74
|
-
? new Connection_1.default(transporter, options)
|
|
74
|
+
? new Connection_1.default(transporter, options, emit)
|
|
75
75
|
: null;
|
|
76
76
|
return {
|
|
77
77
|
id: serviceId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/service/index.ts"],"names":[],"mappings":";;AAAA,kCAAkC;AAClC,wCAAwC;AACxC,2CAA+C;AAC/C,sDAA+E;AAG/E,6CAAqC;AAGrC,oDAAgD;AAChD,oCAAsC;AACtC,kDAA0C;AAC1C,kDAAiD;AACjD,+CAAgD;AAChD,0CAAqC;AAErC,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/service/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,6 +30,6 @@ const stringifyForm = (data) => (0, is_1.isDataObject)(data)
|
|
|
30
30
|
: `${key}=${formatValue(data[key])}`)
|
|
31
31
|
.join('&')
|
|
32
32
|
: null;
|
|
33
|
-
const form = (_operands, _options) => (data,
|
|
33
|
+
const form = (_operands, _options) => (data, state) => state.rev ? stringifyForm((0, array_1.getFirstIfArray)(data)) : parseForm(data);
|
|
34
34
|
exports.default = form;
|
|
35
35
|
//# sourceMappingURL=form.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"form.js","sourceRoot":"","sources":["../../src/transformers/form.ts"],"names":[],"mappings":";;AAEA,0CAAgD;AAChD,oCAAoD;AAEpD,MAAM,WAAW,GAAG,CAAC,KAAa,EAAE,EAAE;IACpC,IAAI;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;KACzB;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,KAAK,CAAA;KACb;AACH,CAAC,CAAA;AAED,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,EAAE,CAClC,OAAO,IAAI,KAAK,QAAQ;IACtB,CAAC,CAAC,IAAI;SACD,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SAC9B,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QACtB,CAAC,GAAG,CAAC,EACH,OAAO,KAAK,KAAK,WAAW;YAC1B,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,WAAW,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;KACjE,CAAC,CAAC;SACF,MAAM,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,GAAG,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC;IAC3D,CAAC,CAAC,IAAI,CAAA;AAEV,MAAM,YAAY,GAAG,CAAC,KAAc,EAAE,EAAE,CACtC,IAAA,aAAQ,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;AACzD,MAAM,WAAW,GAAG,CAAC,KAAc,EAAE,EAAE,CACrC,kBAAkB,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAE9D,MAAM,aAAa,GAAG,CAAC,IAAa,EAAE,EAAE,CACtC,IAAA,iBAAY,EAAC,IAAI,CAAC;IAChB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;SACd,GAAG,CAAC,CAAC,GAAW,EAAE,EAAE,CACnB,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,WAAW;QAC9B,CAAC,CAAC,GAAG;QACL,CAAC,CAAC,GAAG,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CACvC;SACA,IAAI,CAAC,GAAG,CAAC;IACd,CAAC,CAAC,IAAI,CAAA;AAEV,MAAM,IAAI,GAAmB,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"form.js","sourceRoot":"","sources":["../../src/transformers/form.ts"],"names":[],"mappings":";;AAEA,0CAAgD;AAChD,oCAAoD;AAEpD,MAAM,WAAW,GAAG,CAAC,KAAa,EAAE,EAAE;IACpC,IAAI;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;KACzB;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,KAAK,CAAA;KACb;AACH,CAAC,CAAA;AAED,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,EAAE,CAClC,OAAO,IAAI,KAAK,QAAQ;IACtB,CAAC,CAAC,IAAI;SACD,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SAC9B,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QACtB,CAAC,GAAG,CAAC,EACH,OAAO,KAAK,KAAK,WAAW;YAC1B,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,WAAW,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;KACjE,CAAC,CAAC;SACF,MAAM,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,GAAG,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC;IAC3D,CAAC,CAAC,IAAI,CAAA;AAEV,MAAM,YAAY,GAAG,CAAC,KAAc,EAAE,EAAE,CACtC,IAAA,aAAQ,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;AACzD,MAAM,WAAW,GAAG,CAAC,KAAc,EAAE,EAAE,CACrC,kBAAkB,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAE9D,MAAM,aAAa,GAAG,CAAC,IAAa,EAAE,EAAE,CACtC,IAAA,iBAAY,EAAC,IAAI,CAAC;IAChB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;SACd,GAAG,CAAC,CAAC,GAAW,EAAE,EAAE,CACnB,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,WAAW;QAC9B,CAAC,CAAC,GAAG;QACL,CAAC,CAAC,GAAG,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CACvC;SACA,IAAI,CAAC,GAAG,CAAC;IACd,CAAC,CAAC,IAAI,CAAA;AAEV,MAAM,IAAI,GAAmB,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CACpE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,IAAA,uBAAe,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;AAEpE,kBAAe,IAAI,CAAA"}
|
|
@@ -44,7 +44,7 @@ function formatDateRev(value, format) {
|
|
|
44
44
|
}
|
|
45
45
|
return format === 'ISO' ? date.setZone('utc').toISO() : date.toFormat(format);
|
|
46
46
|
}
|
|
47
|
-
exports.default = ({ format = 'ISO' }) => function formatDate(value, { rev }) {
|
|
47
|
+
exports.default = ({ format = 'ISO' }) => function formatDate(value, { rev = false }) {
|
|
48
48
|
return rev ? formatDateRev(value, format) : formatDateFwd(value, format);
|
|
49
49
|
};
|
|
50
50
|
//# sourceMappingURL=formatDate.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formatDate.js","sourceRoot":"","sources":["../../src/transformers/formatDate.ts"],"names":[],"mappings":";;AAAA,oCAAoC;AACpC,+BAA+B;AAC/B,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAA;AAM1B,SAAS,UAAU,CAAC,KAAc,EAAE,MAAc;IAChD,IAAI,IAAA,WAAM,EAAC,KAAK,CAAC,EAAE;QACjB,OAAO,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;KAClC;SAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QACpC,IAAI,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QAC7C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;SAC/B;QACD,OAAO,IAAI,CAAA;KACZ;SAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QACpC,OAAO,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;KAClC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,SAAS,aAAa,CAAC,KAAc,EAAE,MAAc;IACnD,IAAI,KAAK,KAAK,IAAI,EAAE;QAClB,OAAO,IAAI,CAAA;KACZ;SAAM,IAAI,IAAA,WAAM,EAAC,KAAK,CAAC,EAAE;QACxB,OAAO,KAAK,CAAA;KACb;SAAM;QACL,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QACtC,IAAI,IAAI,IAAI,IAAI,CAAC,OAAO,EAAE;YACxB,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAA;SACvB;KACF;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,SAAS,aAAa,CAAC,KAAc,EAAE,MAAc;IACnD,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE;QACzC,OAAO,KAAK,CAAA;KACb;IACD,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;IACtC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;QAC1B,OAAO,SAAS,CAAA;KACjB;IACD,OAAO,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;AAC/E,CAAC;AAED,kBAAe,CAAC,EAAE,MAAM,GAAG,KAAK,EAAY,EAAE,EAAE,CAC9C,SAAS,UAAU,CACjB,KAAc,EACd,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"formatDate.js","sourceRoot":"","sources":["../../src/transformers/formatDate.ts"],"names":[],"mappings":";;AAAA,oCAAoC;AACpC,+BAA+B;AAC/B,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAA;AAM1B,SAAS,UAAU,CAAC,KAAc,EAAE,MAAc;IAChD,IAAI,IAAA,WAAM,EAAC,KAAK,CAAC,EAAE;QACjB,OAAO,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;KAClC;SAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QACpC,IAAI,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QAC7C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;SAC/B;QACD,OAAO,IAAI,CAAA;KACZ;SAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QACpC,OAAO,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;KAClC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,SAAS,aAAa,CAAC,KAAc,EAAE,MAAc;IACnD,IAAI,KAAK,KAAK,IAAI,EAAE;QAClB,OAAO,IAAI,CAAA;KACZ;SAAM,IAAI,IAAA,WAAM,EAAC,KAAK,CAAC,EAAE;QACxB,OAAO,KAAK,CAAA;KACb;SAAM;QACL,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QACtC,IAAI,IAAI,IAAI,IAAI,CAAC,OAAO,EAAE;YACxB,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAA;SACvB;KACF;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,SAAS,aAAa,CAAC,KAAc,EAAE,MAAc;IACnD,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE;QACzC,OAAO,KAAK,CAAA;KACb;IACD,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;IACtC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;QAC1B,OAAO,SAAS,CAAA;KACjB;IACD,OAAO,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;AAC/E,CAAC;AAED,kBAAe,CAAC,EAAE,MAAM,GAAG,KAAK,EAAY,EAAE,EAAE,CAC9C,SAAS,UAAU,CACjB,KAAc,EACd,EAAE,GAAG,GAAG,KAAK,EAAqB;IAElC,OAAO,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;AAC1E,CAAC,CAAA"}
|
|
@@ -2,13 +2,13 @@ import round from './round';
|
|
|
2
2
|
declare const _default: {
|
|
3
3
|
form: import("map-transform").CustomFunction<import("map-transform/dist/types").Operands>;
|
|
4
4
|
formatDate: ({ format }: import("./formatDate").Operands) => (value: unknown, { rev }: {
|
|
5
|
-
rev
|
|
5
|
+
rev?: boolean | undefined;
|
|
6
6
|
}) => string | Date | null | undefined;
|
|
7
7
|
hash: import("map-transform").CustomFunction<import("map-transform/dist/types").Operands>;
|
|
8
8
|
json: import("map-transform").CustomFunction<import("map-transform/dist/types").Operands>;
|
|
9
9
|
lowercase: import("map-transform").CustomFunction<import("map-transform/dist/types").Operands>;
|
|
10
10
|
ms: () => (value: unknown, { rev }: {
|
|
11
|
-
rev
|
|
11
|
+
rev?: boolean | undefined;
|
|
12
12
|
}) => number | Date | null | undefined;
|
|
13
13
|
not: import("map-transform").CustomFunction<import("map-transform/dist/types").Operands>;
|
|
14
14
|
removeTypePrefixOnId: import("map-transform").CustomFunction<import("map-transform/dist/types").Operands>;
|
|
@@ -17,6 +17,6 @@ function parse(data) {
|
|
|
17
17
|
function stringify(data) {
|
|
18
18
|
return JSON.stringify(data);
|
|
19
19
|
}
|
|
20
|
-
const json = (_operands, _options) => (data,
|
|
20
|
+
const json = (_operands, _options) => (data, state) => state.rev ? stringify(data) : parse(data);
|
|
21
21
|
exports.default = json;
|
|
22
22
|
//# sourceMappingURL=json.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/transformers/json.ts"],"names":[],"mappings":";;AACA,oCAAsC;AAEtC,MAAM,QAAQ,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAA,aAAQ,EAAC,IAAI,CAAC,CAAA;AAEzE,SAAS,KAAK,CAAC,IAAa;IAC1B,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC5B,IAAI;YACF,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;SACxB;QAAC,MAAM,GAAE;KACX;SAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE;QACzB,OAAO,IAAI,CAAA;KACZ;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,SAAS,SAAS,CAAC,IAAa;IAC9B,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;AAC7B,CAAC;AAED,MAAM,IAAI,GAAmB,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/transformers/json.ts"],"names":[],"mappings":";;AACA,oCAAsC;AAEtC,MAAM,QAAQ,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAA,aAAQ,EAAC,IAAI,CAAC,CAAA;AAEzE,SAAS,KAAK,CAAC,IAAa;IAC1B,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC5B,IAAI;YACF,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;SACxB;QAAC,MAAM,GAAE;KACX;SAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE;QACzB,OAAO,IAAI,CAAA;KACZ;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,SAAS,SAAS,CAAC,IAAa;IAC9B,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;AAC7B,CAAC;AAED,MAAM,IAAI,GAAmB,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CACpE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;AAE3C,kBAAe,IAAI,CAAA"}
|
package/dist/transformers/ms.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const date_1 = require("./builtIns/date");
|
|
4
|
-
exports.default = () => function ms(value, { rev }) {
|
|
4
|
+
exports.default = () => function ms(value, { rev = false }) {
|
|
5
5
|
const date = (0, date_1.castDate)(value);
|
|
6
6
|
if (rev) {
|
|
7
7
|
return date instanceof Date ? date?.getTime() : undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ms.js","sourceRoot":"","sources":["../../src/transformers/ms.ts"],"names":[],"mappings":";;AAAA,0CAA0C;AAE1C,kBAAe,GAAG,EAAE,CAClB,SAAS,EAAE,CACT,KAAc,EACd,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"ms.js","sourceRoot":"","sources":["../../src/transformers/ms.ts"],"names":[],"mappings":";;AAAA,0CAA0C;AAE1C,kBAAe,GAAG,EAAE,CAClB,SAAS,EAAE,CACT,KAAc,EACd,EAAE,GAAG,GAAG,KAAK,EAAqB;IAElC,MAAM,IAAI,GAAG,IAAA,eAAQ,EAAC,KAAK,CAAC,CAAA;IAE5B,IAAI,GAAG,EAAE;QACP,OAAO,IAAI,YAAY,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;KAC1D;IAED,OAAO,IAAI,IAAI,SAAS,CAAA;AAC1B,CAAC,CAAA"}
|
|
@@ -21,6 +21,6 @@ const removeTypePrefixOnIdRev = (item) => {
|
|
|
21
21
|
}
|
|
22
22
|
return item;
|
|
23
23
|
};
|
|
24
|
-
const removeTypePrefixOnId = (_operands, _options) => (value,
|
|
24
|
+
const removeTypePrefixOnId = (_operands, _options) => (value, state) => state.rev ? removeTypePrefixOnIdRev(value) : removeTypePrefixOnIdFwd(value);
|
|
25
25
|
exports.default = removeTypePrefixOnId;
|
|
26
26
|
//# sourceMappingURL=removeTypePrefixOnId.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"removeTypePrefixOnId.js","sourceRoot":"","sources":["../../src/transformers/removeTypePrefixOnId.ts"],"names":[],"mappings":";;AACA,oCAAyC;AAEzC,MAAM,uBAAuB,GAAG,CAAC,IAAa,EAAE,EAAE;IAChD,IAAI,IAAA,gBAAW,EAAC,IAAI,CAAC,EAAE;QACrB,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI,CAAA;QAEhC,IAAI,EAAE,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,CAAC,EAAE;YACnC,MAAM,OAAO,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;YAC1C,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAA;SAChD;KACF;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,MAAM,uBAAuB,GAAG,CAAC,IAAa,EAAE,EAAE;IAChD,IAAI,IAAA,gBAAW,EAAC,IAAI,CAAC,EAAE;QACrB,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI,CAAA;QAEhC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,CAAC,EAAE;YACpC,MAAM,OAAO,GAAG,GAAG,IAAI,IAAI,EAAE,EAAE,CAAA;YAC/B,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAA;SAChD;KACF;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,MAAM,oBAAoB,
|
|
1
|
+
{"version":3,"file":"removeTypePrefixOnId.js","sourceRoot":"","sources":["../../src/transformers/removeTypePrefixOnId.ts"],"names":[],"mappings":";;AACA,oCAAyC;AAEzC,MAAM,uBAAuB,GAAG,CAAC,IAAa,EAAE,EAAE;IAChD,IAAI,IAAA,gBAAW,EAAC,IAAI,CAAC,EAAE;QACrB,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI,CAAA;QAEhC,IAAI,EAAE,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,CAAC,EAAE;YACnC,MAAM,OAAO,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;YAC1C,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAA;SAChD;KACF;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,MAAM,uBAAuB,GAAG,CAAC,IAAa,EAAE,EAAE;IAChD,IAAI,IAAA,gBAAW,EAAC,IAAI,CAAC,EAAE;QACrB,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI,CAAA;QAEhC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,CAAC,EAAE;YACpC,MAAM,OAAO,GAAG,GAAG,IAAI,IAAI,EAAE,EAAE,CAAA;YAC/B,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAA;SAChD;KACF;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,MAAM,oBAAoB,GACxB,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CACxC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAA;AAE/E,kBAAe,oBAAoB,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export interface Operands {
|
|
2
2
|
precision?: number;
|
|
3
3
|
}
|
|
4
|
-
export default function round({ precision, }: Operands): (value: unknown,
|
|
4
|
+
export default function round({ precision, }: Operands): (value: unknown, state: unknown) => number | undefined;
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const mapAny = require("map-any");
|
|
4
4
|
const is_1 = require("../utils/is");
|
|
5
|
-
const uriPart = (_operands, _options) => (value,
|
|
5
|
+
const uriPart = (_operands, _options) => (value, state) => mapAny(function (value) {
|
|
6
6
|
if (value === null || value === undefined) {
|
|
7
7
|
return undefined;
|
|
8
8
|
}
|
|
@@ -13,7 +13,7 @@ const uriPart = (_operands, _options) => (value, context) => mapAny(function (va
|
|
|
13
13
|
else if (typeof part === 'object') {
|
|
14
14
|
return undefined;
|
|
15
15
|
}
|
|
16
|
-
return
|
|
16
|
+
return state.rev ? encodeURIComponent(part) : decodeURIComponent(part);
|
|
17
17
|
}, value);
|
|
18
18
|
exports.default = uriPart;
|
|
19
19
|
//# sourceMappingURL=uriPart.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uriPart.js","sourceRoot":"","sources":["../../src/transformers/uriPart.ts"],"names":[],"mappings":";;AAAA,kCAAkC;AAElC,oCAAoC;AAEpC,MAAM,OAAO,GAAmB,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"uriPart.js","sourceRoot":"","sources":["../../src/transformers/uriPart.ts"],"names":[],"mappings":";;AAAA,kCAAkC;AAElC,oCAAoC;AAEpC,MAAM,OAAO,GAAmB,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CACxE,MAAM,CAAC,UAAU,KAAK;IACpB,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE;QACzC,OAAO,SAAS,CAAA;KACjB;IAED,IAAI,IAAI,GAAG,KAAK,CAAA;IAChB,IAAI,IAAA,WAAM,EAAC,IAAI,CAAC,EAAE;QAChB,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAA;KAC1B;SAAM,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QACnC,OAAO,SAAS,CAAA;KACjB;IAED,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAA;AACxE,CAAC,EAAE,KAAK,CAAC,CAAA;AAEX,kBAAe,OAAO,CAAA"}
|
|
@@ -2,6 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const parse_1 = require("./parse");
|
|
4
4
|
const stringify_1 = require("./stringify");
|
|
5
|
-
const xml = ({ namespaces }, _options) => (data,
|
|
5
|
+
const xml = ({ namespaces }, _options) => (data, state) => state.rev ? (0, stringify_1.default)(data, namespaces) : (0, parse_1.default)(data, namespaces);
|
|
6
6
|
exports.default = xml;
|
|
7
7
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transformers/xml/index.ts"],"names":[],"mappings":";;AACA,mCAA2B;AAC3B,2CAAmC;AAoBnC,MAAM,GAAG,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transformers/xml/index.ts"],"names":[],"mappings":";;AACA,mCAA2B;AAC3B,2CAAmC;AAoBnC,MAAM,GAAG,GACP,CAAC,EAAE,UAAU,EAAY,EAAE,QAAQ,EAAE,EAAE,CACvC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CACd,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAA,mBAAS,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,IAAA,eAAK,EAAC,IAAI,EAAE,UAAU,CAAC,CAAA;AAErE,kBAAe,GAAG,CAAA"}
|
package/dist/types.d.ts
CHANGED
|
@@ -128,7 +128,7 @@ export interface Connection extends Record<string, unknown> {
|
|
|
128
128
|
export interface Transporter {
|
|
129
129
|
authentication: string | null;
|
|
130
130
|
prepareOptions: (options: Record<string, unknown>, serviceId: string) => Record<string, unknown>;
|
|
131
|
-
connect: (options: Record<string, unknown>, authentication: Record<string, unknown> | null, connection: Connection | null) => Promise<Connection | null>;
|
|
131
|
+
connect: (options: Record<string, unknown>, authentication: Record<string, unknown> | null, connection: Connection | null, emit: (eventType: string, ...args: unknown[]) => void) => Promise<Connection | null>;
|
|
132
132
|
send: (action: Action, connection: Connection | null) => Promise<Response>;
|
|
133
133
|
shouldListen?: (options: EndpointOptions) => boolean;
|
|
134
134
|
listen?: (dispatch: Dispatch, connection: Connection | null) => Promise<Response>;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "integreat",
|
|
3
|
-
"version": "0.8.0-alpha.
|
|
3
|
+
"version": "0.8.0-alpha.86",
|
|
4
4
|
"description": "Node.js integration layer",
|
|
5
5
|
"author": "Kjell-Morten Bratsberg Thorsen <kjellmorten@integreat.io> (https://integreat.io/)",
|
|
6
6
|
"license": "ISC",
|
|
@@ -43,12 +43,12 @@
|
|
|
43
43
|
"@types/uuid": "^8.3.4",
|
|
44
44
|
"debug": "^4.3.4",
|
|
45
45
|
"dot-prop": "^6.0.1",
|
|
46
|
-
"got": "^11.8.
|
|
46
|
+
"got": "^11.8.5",
|
|
47
47
|
"html-entities": "^2.3.3",
|
|
48
48
|
"later": "^1.2.0",
|
|
49
49
|
"luxon": "^2.4.0",
|
|
50
50
|
"map-any": "^0.2.1",
|
|
51
|
-
"map-transform": "0.4.0-alpha.
|
|
51
|
+
"map-transform": "0.4.0-alpha.13",
|
|
52
52
|
"ms": "^2.1.3",
|
|
53
53
|
"nanoid": "^3.3.4",
|
|
54
54
|
"p-limit": "^3.1.0",
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
"@integreat/ts-dev-setup": "^2.3.0",
|
|
63
63
|
"@types/sinon": "^10.0.11",
|
|
64
64
|
"integreat-transporter-http": "0.1.0-alpha.25",
|
|
65
|
-
"nock": "^13.2.
|
|
65
|
+
"nock": "^13.2.6",
|
|
66
66
|
"sinon": "^14.0.0"
|
|
67
67
|
}
|
|
68
68
|
}
|