typeferry 0.12.0 → 0.13.1
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/README.md +5 -0
- package/dist/application/config.d.ts +47 -39
- package/dist/application/config.js +29 -16
- package/dist/application/config.js.map +1 -1
- package/dist/application/native-simulator-settings.js +1 -1
- package/dist/application/native-simulator-settings.js.map +1 -1
- package/dist/application/proxy.d.ts +5 -1
- package/dist/application/proxy.js +25 -4
- package/dist/application/proxy.js.map +1 -1
- package/dist/application/run-tests.js +1 -1
- package/dist/application/run-tests.js.map +1 -1
- package/dist/auth/client/native-session.js +4 -2
- package/dist/auth/client/native-session.js.map +1 -1
- package/dist/auth/client/oauth/use-google-login.js +2 -0
- package/dist/auth/client/oauth/use-google-login.js.map +1 -1
- package/dist/auth/server/cookie-utils.js +4 -3
- package/dist/auth/server/cookie-utils.js.map +1 -1
- package/dist/auth/server/device-info.js +8 -8
- package/dist/auth/server/device-info.js.map +1 -1
- package/dist/auth/server/oauth/google.js +11 -7
- package/dist/auth/server/oauth/google.js.map +1 -1
- package/dist/auth/server/session-manager.js +2 -2
- package/dist/auth/server/session-manager.js.map +1 -1
- package/dist/client/client-channel.d.ts +3 -11
- package/dist/client/client-channel.js +11 -4
- package/dist/client/client-channel.js.map +1 -1
- package/dist/client/client-http.d.ts +2 -2
- package/dist/client/client-http.js.map +1 -1
- package/dist/client/client.d.ts +13 -13
- package/dist/client/client.js +24 -11
- package/dist/client/client.js.map +1 -1
- package/dist/client/context-manager.d.ts +1 -1
- package/dist/client/logger.d.ts +1 -0
- package/dist/client/logger.js +12 -15
- package/dist/client/logger.js.map +1 -1
- package/dist/client/visibility-manager.d.ts +22 -11
- package/dist/client/visibility-manager.js +258 -42
- package/dist/client/visibility-manager.js.map +1 -1
- package/dist/ejson/adjust-types-from-json-value.d.ts +1 -1
- package/dist/ejson/adjust-types-from-json-value.js +4 -2
- package/dist/ejson/adjust-types-from-json-value.js.map +1 -1
- package/dist/ejson/base64.d.ts +1 -1
- package/dist/ejson/base64.js +1 -1
- package/dist/ejson/base64.js.map +1 -1
- package/dist/ejson/built-in-converters.d.ts +59 -1
- package/dist/ejson/built-in-converters.js +109 -125
- package/dist/ejson/built-in-converters.js.map +1 -1
- package/dist/ejson/clone.js +1 -1
- package/dist/ejson/clone.js.map +1 -1
- package/dist/ejson/custom-models.d.ts +10 -10
- package/dist/ejson/custom-models.js +22 -2
- package/dist/ejson/custom-models.js.map +1 -1
- package/dist/ejson/custom-types.d.ts +2 -1
- package/dist/ejson/custom-types.js.map +1 -1
- package/dist/ejson/equals.d.ts +4 -1
- package/dist/ejson/equals.js +6 -3
- package/dist/ejson/equals.js.map +1 -1
- package/dist/ejson/from-json-value.d.ts +1 -1
- package/dist/ejson/from-json-value.js +1 -1
- package/dist/ejson/from-json-value.js.map +1 -1
- package/dist/ejson/helpers/adjust-types-to-json-value.d.ts +1 -1
- package/dist/ejson/helpers/adjust-types-to-json-value.js +4 -2
- package/dist/ejson/helpers/adjust-types-to-json-value.js.map +1 -1
- package/dist/ejson/helpers/from-json-value-helper.d.ts +1 -1
- package/dist/ejson/helpers/from-json-value-helper.js +5 -3
- package/dist/ejson/helpers/from-json-value-helper.js.map +1 -1
- package/dist/ejson/helpers/to-json-value-helper.d.ts +1 -1
- package/dist/ejson/helpers/to-json-value-helper.js +3 -1
- package/dist/ejson/helpers/to-json-value-helper.js.map +1 -1
- package/dist/ejson/index.d.ts +14 -12
- package/dist/ejson/index.js +3 -3
- package/dist/ejson/index.js.map +1 -1
- package/dist/ejson/is-binary.d.ts +1 -1
- package/dist/ejson/is-binary.js +1 -1
- package/dist/ejson/is-binary.js.map +1 -1
- package/dist/ejson/parse.d.ts +1 -1
- package/dist/ejson/parse.js +1 -1
- package/dist/ejson/parse.js.map +1 -1
- package/dist/ejson/stable-stringify.d.ts +1 -6
- package/dist/ejson/stable-stringify.js +3 -1
- package/dist/ejson/stable-stringify.js.map +1 -1
- package/dist/ejson/to-json-value.d.ts +1 -1
- package/dist/ejson/to-json-value.js +1 -1
- package/dist/ejson/to-json-value.js.map +1 -1
- package/dist/ejson/utils.d.ts +15 -13
- package/dist/ejson/utils.js +39 -37
- package/dist/ejson/utils.js.map +1 -1
- package/dist/minimongo/NOTICE.md +30 -0
- package/dist/minimongo/README.md +329 -0
- package/dist/minimongo/components.d.ts +31 -0
- package/dist/minimongo/components.js +53 -0
- package/dist/minimongo/components.js.map +1 -0
- package/dist/minimongo/contracts.type-test.d.ts +1 -0
- package/dist/minimongo/contracts.type-test.js +21 -0
- package/dist/minimongo/contracts.type-test.js.map +1 -0
- package/dist/minimongo/cursor.d.ts +67 -0
- package/dist/minimongo/cursor.js +157 -0
- package/dist/minimongo/cursor.js.map +1 -0
- package/dist/minimongo/document-store.d.ts +31 -0
- package/dist/minimongo/document-store.js +48 -0
- package/dist/minimongo/document-store.js.map +1 -0
- package/dist/minimongo/errors.d.ts +14 -0
- package/dist/minimongo/errors.js +16 -0
- package/dist/minimongo/errors.js.map +1 -0
- package/dist/minimongo/events.d.ts +20 -0
- package/dist/minimongo/events.js +80 -0
- package/dist/minimongo/events.js.map +1 -0
- package/dist/minimongo/identity.d.ts +8 -0
- package/dist/minimongo/identity.js +15 -0
- package/dist/minimongo/identity.js.map +1 -0
- package/dist/minimongo/immutable.d.ts +6 -0
- package/dist/minimongo/immutable.js +17 -0
- package/dist/minimongo/immutable.js.map +1 -0
- package/dist/minimongo/index.d.ts +7 -0
- package/dist/minimongo/index.js +6 -0
- package/dist/minimongo/index.js.map +1 -0
- package/dist/minimongo/local-collection.d.ts +48 -0
- package/dist/minimongo/local-collection.js +129 -0
- package/dist/minimongo/local-collection.js.map +1 -0
- package/dist/minimongo/matcher.d.ts +27 -0
- package/dist/minimongo/matcher.js +457 -0
- package/dist/minimongo/matcher.js.map +1 -0
- package/dist/minimongo/modifier.d.ts +12 -0
- package/dist/minimongo/modifier.js +323 -0
- package/dist/minimongo/modifier.js.map +1 -0
- package/dist/minimongo/path.d.ts +17 -0
- package/dist/minimongo/path.js +126 -0
- package/dist/minimongo/path.js.map +1 -0
- package/dist/minimongo/projection.d.ts +5 -0
- package/dist/minimongo/projection.js +100 -0
- package/dist/minimongo/projection.js.map +1 -0
- package/dist/minimongo/sorter.d.ts +16 -0
- package/dist/minimongo/sorter.js +140 -0
- package/dist/minimongo/sorter.js.map +1 -0
- package/dist/minimongo/transform.d.ts +4 -0
- package/dist/minimongo/transform.js +30 -0
- package/dist/minimongo/transform.js.map +1 -0
- package/dist/minimongo/types.d.ts +169 -0
- package/dist/minimongo/types.js +2 -0
- package/dist/minimongo/types.js.map +1 -0
- package/dist/minimongo/value-semantics.d.ts +8 -0
- package/dist/minimongo/value-semantics.js +156 -0
- package/dist/minimongo/value-semantics.js.map +1 -0
- package/dist/mongodb/change-streams.js +14 -8
- package/dist/mongodb/change-streams.js.map +1 -1
- package/dist/mongodb/decorators/collection.js +4 -1
- package/dist/mongodb/decorators/collection.js.map +1 -1
- package/dist/mongodb/decorators/metadata.js +1 -1
- package/dist/mongodb/decorators/metadata.js.map +1 -1
- package/dist/mongodb/find-one-or-create.d.ts +2 -2
- package/dist/mongodb/find-one-or-create.js +1 -1
- package/dist/mongodb/find-one-or-create.js.map +1 -1
- package/dist/mongodb/live/engine.js.map +1 -1
- package/dist/mongodb/live/source.js +11 -5
- package/dist/mongodb/live/source.js.map +1 -1
- package/dist/mongodb/live/types.d.ts +1 -1
- package/dist/react/components/client-provider.d.ts +3 -2
- package/dist/react/components/client-provider.js +1 -1
- package/dist/react/components/client-provider.js.map +1 -1
- package/dist/react/contracts.type-test.d.ts +1 -0
- package/dist/react/contracts.type-test.js +21 -0
- package/dist/react/contracts.type-test.js.map +1 -0
- package/dist/react/hooks/use-auth.d.ts +5 -1
- package/dist/react/hooks/use-auth.js +4 -2
- package/dist/react/hooks/use-auth.js.map +1 -1
- package/dist/react/hooks/use-caller.d.ts +10 -5
- package/dist/react/hooks/use-caller.js +12 -8
- package/dist/react/hooks/use-caller.js.map +1 -1
- package/dist/react/hooks/use-channel.d.ts +1 -1
- package/dist/react/hooks/use-channel.js +1 -1
- package/dist/react/hooks/use-channel.js.map +1 -1
- package/dist/react/hooks/use-circuit-breaker.d.ts +14 -6
- package/dist/react/hooks/use-circuit-breaker.js +5 -2
- package/dist/react/hooks/use-circuit-breaker.js.map +1 -1
- package/dist/react/hooks/use-client.d.ts +1 -1
- package/dist/react/hooks/use-client.js +2 -0
- package/dist/react/hooks/use-client.js.map +1 -1
- package/dist/react/hooks/use-connection-state.d.ts +4 -4
- package/dist/react/hooks/use-connection-state.js +2 -0
- package/dist/react/hooks/use-connection-state.js.map +1 -1
- package/dist/react/hooks/use-deps-change.d.ts +1 -1
- package/dist/react/hooks/use-deps-change.js.map +1 -1
- package/dist/react/hooks/use-local-event.d.ts +2 -2
- package/dist/react/hooks/use-local-event.js +2 -2
- package/dist/react/hooks/use-local-event.js.map +1 -1
- package/dist/react/hooks/use-method-refresh.d.ts +24 -15
- package/dist/react/hooks/use-method-refresh.js +18 -22
- package/dist/react/hooks/use-method-refresh.js.map +1 -1
- package/dist/react/hooks/use-method.d.ts +12 -11
- package/dist/react/hooks/use-method.js +9 -5
- package/dist/react/hooks/use-method.js.map +1 -1
- package/dist/react/hooks/use-mongodb-live-publication.js +2 -0
- package/dist/react/hooks/use-mongodb-live-publication.js.map +1 -1
- package/dist/react/hooks/use-object.d.ts +2 -2
- package/dist/react/hooks/use-object.js.map +1 -1
- package/dist/react/hooks/use-subscribe.d.ts +1 -2
- package/dist/react/hooks/use-subscribe.js +11 -9
- package/dist/react/hooks/use-subscribe.js.map +1 -1
- package/dist/react/hooks/use-throttled-events.d.ts +1 -1
- package/dist/react/hooks/use-throttled-events.js +2 -0
- package/dist/react/hooks/use-throttled-events.js.map +1 -1
- package/dist/react/hooks/use-token-refresh.js +1 -1
- package/dist/react/hooks/use-token-refresh.js.map +1 -1
- package/dist/server/client-node.d.ts +17 -10
- package/dist/server/client-node.js +16 -13
- package/dist/server/client-node.js.map +1 -1
- package/dist/server/decorators/register.js +10 -6
- package/dist/server/decorators/register.js.map +1 -1
- package/dist/server/method.d.ts +1 -1
- package/dist/server/method.js +9 -6
- package/dist/server/method.js.map +1 -1
- package/dist/server/methods.js +2 -1
- package/dist/server/methods.js.map +1 -1
- package/dist/server/server-channel.d.ts +4 -2
- package/dist/server/server-channel.js +33 -20
- package/dist/server/server-channel.js.map +1 -1
- package/dist/server/server.d.ts +25 -12
- package/dist/server/server.js +18 -17
- package/dist/server/server.js.map +1 -1
- package/dist/server/transports/node-hono-transport.d.ts +4 -4
- package/dist/server/transports/node-hono-transport.js +66 -14
- package/dist/server/transports/node-hono-transport.js.map +1 -1
- package/dist/server/transports/redis-transport.d.ts +5 -4
- package/dist/server/transports/redis-transport.js +9 -4
- package/dist/server/transports/redis-transport.js.map +1 -1
- package/dist/server/transports/websocket-transport.d.ts +1 -1
- package/dist/server/transports/websocket-transport.js +6 -1
- package/dist/server/transports/websocket-transport.js.map +1 -1
- package/dist/server/transports/ws-shared.d.ts +2 -1
- package/dist/server/transports/ws-shared.js +4 -1
- package/dist/server/transports/ws-shared.js.map +1 -1
- package/dist/utils/errors.d.ts +1 -1
- package/dist/utils/errors.js.map +1 -1
- package/dist/utils/event-emitter.d.ts +1 -1
- package/dist/utils/event-emitter.js.map +1 -1
- package/dist/utils/events.d.ts +4 -4
- package/dist/utils/events.js.map +1 -1
- package/dist/utils/helpers.d.ts +4 -4
- package/dist/utils/helpers.js +4 -3
- package/dist/utils/helpers.js.map +1 -1
- package/dist/utils/intercept.d.ts +1 -2
- package/dist/utils/intercept.js.map +1 -1
- package/dist/utils/iterator.d.ts +6 -8
- package/dist/utils/iterator.js +3 -3
- package/dist/utils/iterator.js.map +1 -1
- package/dist/utils/presentation.d.ts +1 -1
- package/dist/utils/presentation.js +2 -0
- package/dist/utils/presentation.js.map +1 -1
- package/dist/utils/promise.d.ts +5 -5
- package/dist/utils/promise.js +2 -2
- package/dist/utils/promise.js.map +1 -1
- package/package.json +9 -2
|
@@ -2,136 +2,120 @@ import { decodeBase64, encodeBase64 } from './base64.js';
|
|
|
2
2
|
import { customTypes } from './custom-types.js';
|
|
3
3
|
import { EJSON } from './index.js';
|
|
4
4
|
import { hasOwn, isInfOrNaN, keysOf, lengthOf } from './utils.js';
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
5
|
+
function isRecord(value) {
|
|
6
|
+
return typeof value === 'object' && value !== null;
|
|
7
|
+
}
|
|
8
|
+
function requireRecord(value) {
|
|
9
|
+
if (!isRecord(value))
|
|
10
|
+
throw new TypeError('Invalid EJSON converter input');
|
|
11
|
+
return value;
|
|
12
|
+
}
|
|
13
|
+
function requireString(value) {
|
|
14
|
+
if (typeof value !== 'string')
|
|
15
|
+
throw new TypeError('Invalid EJSON string value');
|
|
16
|
+
return value;
|
|
17
|
+
}
|
|
18
|
+
export const dateConverter = {
|
|
19
|
+
matchJSONValue: value => isRecord(value) && hasOwn(value, '$date') && lengthOf(value) === 1,
|
|
20
|
+
matchObject: value => value instanceof Date,
|
|
21
|
+
toJSONValue: value => {
|
|
22
|
+
if (!(value instanceof Date))
|
|
23
|
+
throw new TypeError('Expected Date');
|
|
24
|
+
return { $date: value.getTime() };
|
|
25
|
+
},
|
|
26
|
+
fromJSONValue: value => new Date(Number(requireRecord(value)['$date'])),
|
|
27
|
+
};
|
|
28
|
+
export const regexpConverter = {
|
|
29
|
+
matchJSONValue: value => isRecord(value) &&
|
|
30
|
+
hasOwn(value, '$regexp') &&
|
|
31
|
+
hasOwn(value, '$flags') &&
|
|
32
|
+
lengthOf(value) === 2,
|
|
33
|
+
matchObject: value => value instanceof RegExp,
|
|
34
|
+
toJSONValue: value => {
|
|
35
|
+
if (!(value instanceof RegExp))
|
|
36
|
+
throw new TypeError('Expected RegExp');
|
|
37
|
+
return { $regexp: value.source, $flags: value.flags };
|
|
38
|
+
},
|
|
39
|
+
fromJSONValue: value => {
|
|
40
|
+
const record = requireRecord(value);
|
|
41
|
+
const pattern = requireString(record['$regexp']);
|
|
42
|
+
const flags = requireString(record['$flags'])
|
|
43
|
+
.slice(0, 50)
|
|
44
|
+
.replace(/[^gimuy]/g, '')
|
|
45
|
+
.replace(/(.)(?=.*\1)/g, '');
|
|
46
|
+
// eslint-disable-next-line security/detect-non-literal-regexp -- intentional EJSON deserialization
|
|
47
|
+
return new RegExp(pattern, flags);
|
|
20
48
|
},
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
// eslint-disable-next-line security/detect-non-literal-regexp -- intentional for EJSON deserialization
|
|
38
|
-
return new RegExp(obj.$regexp, obj.$flags
|
|
39
|
-
// Cut off flags at 50 chars to avoid abusing RegExp for DOS.
|
|
40
|
-
.slice(0, 50)
|
|
41
|
-
.replace(/[^gimuy]/g, '')
|
|
42
|
-
.replace(/(.)(?=.*\1)/g, ''));
|
|
43
|
-
},
|
|
49
|
+
};
|
|
50
|
+
export const infNaNConverter = {
|
|
51
|
+
matchJSONValue: value => isRecord(value) && hasOwn(value, '$InfNaN') && lengthOf(value) === 1,
|
|
52
|
+
matchObject: isInfOrNaN,
|
|
53
|
+
toJSONValue: value => ({
|
|
54
|
+
$InfNaN: Number.isNaN(value) ? 0 : value === Infinity ? 1 : -1,
|
|
55
|
+
}),
|
|
56
|
+
fromJSONValue: value => Number(requireRecord(value)['$InfNaN']) / 0,
|
|
57
|
+
};
|
|
58
|
+
export const binaryConverter = {
|
|
59
|
+
matchJSONValue: value => isRecord(value) && hasOwn(value, '$binary') && lengthOf(value) === 1,
|
|
60
|
+
matchObject: value => EJSON.isBinary(value),
|
|
61
|
+
toJSONValue: value => {
|
|
62
|
+
if (!EJSON.isBinary(value))
|
|
63
|
+
throw new TypeError('Expected EJSON binary');
|
|
64
|
+
return { $binary: encodeBase64(value) };
|
|
44
65
|
},
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
sign = 0;
|
|
56
|
-
}
|
|
57
|
-
else if (obj === Infinity) {
|
|
58
|
-
sign = 1;
|
|
59
|
-
}
|
|
60
|
-
else {
|
|
61
|
-
sign = -1;
|
|
62
|
-
}
|
|
63
|
-
return { $InfNaN: sign };
|
|
64
|
-
},
|
|
65
|
-
fromJSONValue(obj) {
|
|
66
|
-
return obj.$InfNaN / 0;
|
|
67
|
-
},
|
|
66
|
+
fromJSONValue: value => decodeBase64(requireString(requireRecord(value)['$binary'])),
|
|
67
|
+
};
|
|
68
|
+
export const escapeConverter = {
|
|
69
|
+
matchJSONValue: value => isRecord(value) && hasOwn(value, '$escape') && lengthOf(value) === 1,
|
|
70
|
+
matchObject: value => {
|
|
71
|
+
if (!isRecord(value))
|
|
72
|
+
return false;
|
|
73
|
+
const keyCount = lengthOf(value);
|
|
74
|
+
return ((keyCount === 1 || keyCount === 2) &&
|
|
75
|
+
builtinConverters.some(converter => converter.matchJSONValue(value)));
|
|
68
76
|
},
|
|
69
|
-
{
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
(obj && hasOwn(obj, '$Uint8ArrayPolyfill')));
|
|
77
|
-
},
|
|
78
|
-
toJSONValue(obj) {
|
|
79
|
-
return { $binary: encodeBase64(obj) };
|
|
80
|
-
},
|
|
81
|
-
fromJSONValue(obj) {
|
|
82
|
-
return decodeBase64(obj.$binary);
|
|
83
|
-
},
|
|
77
|
+
toJSONValue: value => {
|
|
78
|
+
const record = requireRecord(value);
|
|
79
|
+
const escaped = {};
|
|
80
|
+
for (const key of keysOf(record)) {
|
|
81
|
+
escaped[key] = EJSON.toJSONValue(record[key]);
|
|
82
|
+
}
|
|
83
|
+
return { $escape: escaped };
|
|
84
84
|
},
|
|
85
|
-
{
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
if (obj) {
|
|
93
|
-
const keyCount = lengthOf(obj);
|
|
94
|
-
if (keyCount === 1 || keyCount === 2) {
|
|
95
|
-
match = builtinConverters.some(converter => converter.matchJSONValue(obj));
|
|
96
|
-
}
|
|
97
|
-
}
|
|
98
|
-
return match;
|
|
99
|
-
},
|
|
100
|
-
toJSONValue(obj) {
|
|
101
|
-
const newObj = {};
|
|
102
|
-
keysOf(obj).forEach(key => {
|
|
103
|
-
newObj[key] = EJSON.toJSONValue(obj[key]);
|
|
104
|
-
});
|
|
105
|
-
return { $escape: newObj };
|
|
106
|
-
},
|
|
107
|
-
fromJSONValue(obj) {
|
|
108
|
-
const newObj = {};
|
|
109
|
-
keysOf(obj.$escape).forEach(key => {
|
|
110
|
-
newObj[key] = EJSON.fromJSONValue(obj.$escape[key]);
|
|
111
|
-
});
|
|
112
|
-
return newObj;
|
|
113
|
-
},
|
|
85
|
+
fromJSONValue: value => {
|
|
86
|
+
const escaped = requireRecord(requireRecord(value)['$escape']);
|
|
87
|
+
const result = {};
|
|
88
|
+
for (const key of keysOf(escaped)) {
|
|
89
|
+
result[key] = EJSON.fromJSONValue(escaped[key]);
|
|
90
|
+
}
|
|
91
|
+
return result;
|
|
114
92
|
},
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
return { $type: obj.typeName(), $value: jsonValue };
|
|
126
|
-
},
|
|
127
|
-
fromJSONValue(obj) {
|
|
128
|
-
const typeName = obj.$type;
|
|
129
|
-
if (!customTypes.has(typeName)) {
|
|
130
|
-
throw new Error(`Custom EJSON type ${typeName} is not defined`);
|
|
131
|
-
}
|
|
132
|
-
const converter = customTypes.get(typeName);
|
|
133
|
-
return converter(obj.$value);
|
|
134
|
-
},
|
|
93
|
+
};
|
|
94
|
+
export const customConverter = {
|
|
95
|
+
matchJSONValue: value => isRecord(value) &&
|
|
96
|
+
hasOwn(value, '$type') &&
|
|
97
|
+
hasOwn(value, '$value') &&
|
|
98
|
+
lengthOf(value) === 2,
|
|
99
|
+
matchObject: value => EJSON._isCustomType(value),
|
|
100
|
+
toJSONValue: value => {
|
|
101
|
+
const custom = value;
|
|
102
|
+
return { $type: custom.typeName(), $value: custom.toJSONValue() };
|
|
135
103
|
},
|
|
104
|
+
fromJSONValue: value => {
|
|
105
|
+
const record = requireRecord(value);
|
|
106
|
+
const typeName = requireString(record['$type']);
|
|
107
|
+
const factory = customTypes.get(typeName);
|
|
108
|
+
if (!factory)
|
|
109
|
+
throw new Error(`Custom EJSON type ${typeName} is not defined`);
|
|
110
|
+
return factory(record['$value']);
|
|
111
|
+
},
|
|
112
|
+
};
|
|
113
|
+
export const builtinConverters = [
|
|
114
|
+
dateConverter,
|
|
115
|
+
regexpConverter,
|
|
116
|
+
infNaNConverter,
|
|
117
|
+
binaryConverter,
|
|
118
|
+
escapeConverter,
|
|
119
|
+
customConverter,
|
|
136
120
|
];
|
|
137
121
|
//# sourceMappingURL=built-in-converters.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"built-in-converters.js","sourceRoot":"","sources":["../../src/ejson/built-in-converters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAC/B,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"built-in-converters.js","sourceRoot":"","sources":["../../src/ejson/built-in-converters.ts"],"names":[],"mappings":"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"}
|
package/dist/ejson/clone.js
CHANGED
|
@@ -27,7 +27,7 @@ function cloneSpecialTypes(val, internalClone) {
|
|
|
27
27
|
if (EJSON.isBinary(val)) {
|
|
28
28
|
const ret = EJSON.newBinary(val.length);
|
|
29
29
|
for (let i = 0; i < val.length; i++)
|
|
30
|
-
ret[i] = val[i];
|
|
30
|
+
ret[i] = val[i] ?? 0;
|
|
31
31
|
return { handled: true, result: ret };
|
|
32
32
|
}
|
|
33
33
|
if (isFunction(val.clone)) {
|
package/dist/ejson/clone.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clone.js","sourceRoot":"","sources":["../../src/ejson/clone.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAC/B,OAAO,EACL,WAAW,EACX,UAAU,EACV,QAAQ,EACR,kBAAkB,EAClB,MAAM,GACP,MAAM,SAAS,CAAA;AAEhB,SAAS,cAAc,CAAC,GAAQ;IAC9B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,CAAA;IACzD,IAAI,GAAG,KAAK,IAAI;QAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAA;IACxD,IAAI,GAAG,YAAY,IAAI;QACrB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,EAAE,CAAA;IAC3D,IAAI,GAAG,YAAY,MAAM;QAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,CAAA;IAChE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAA;AAC3B,CAAC;AAED,SAAS,iBAAiB,CACxB,GAAQ,EACR,aAA8B;IAE9B,IAAI,GAAG,CAAC,SAAS,KAAK,UAAU,IAAI,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC7D,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAA;IAClD,CAAC;IAED;;;;OAIG;IACH,IACE,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,KAAK,OAAO,IAAI,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAClE,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,EAC5B,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAA;IAC3D,CAAC;IAED,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,GAAG,GAAG,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QACvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE;YAAE,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"clone.js","sourceRoot":"","sources":["../../src/ejson/clone.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,33 +1,33 @@
|
|
|
1
1
|
declare class Address {
|
|
2
2
|
city: string;
|
|
3
3
|
state: string;
|
|
4
|
-
constructor(city:
|
|
4
|
+
constructor(city: string, state: string);
|
|
5
5
|
typeName(): string;
|
|
6
6
|
toJSONValue(): {
|
|
7
7
|
city: string;
|
|
8
8
|
state: string;
|
|
9
9
|
};
|
|
10
|
-
equals(other:
|
|
10
|
+
equals(other: unknown): boolean;
|
|
11
11
|
}
|
|
12
12
|
declare class Person {
|
|
13
13
|
name: string;
|
|
14
14
|
birthDate: Date;
|
|
15
15
|
address: Address;
|
|
16
|
-
constructor(name:
|
|
16
|
+
constructor(name: string, birthDate: Date, address: Address);
|
|
17
17
|
typeName(): string;
|
|
18
18
|
toJSONValue(): {
|
|
19
19
|
name: string;
|
|
20
|
-
birthDate:
|
|
21
|
-
address:
|
|
20
|
+
birthDate: unknown;
|
|
21
|
+
address: unknown;
|
|
22
22
|
};
|
|
23
|
-
equals(other:
|
|
23
|
+
equals(other: unknown): boolean;
|
|
24
24
|
}
|
|
25
25
|
declare class Holder {
|
|
26
|
-
value:
|
|
27
|
-
constructor(value:
|
|
26
|
+
value: unknown;
|
|
27
|
+
constructor(value: unknown);
|
|
28
28
|
typeName(): string;
|
|
29
|
-
toJSONValue():
|
|
30
|
-
equals(other:
|
|
29
|
+
toJSONValue(): unknown;
|
|
30
|
+
equals(other: unknown): boolean;
|
|
31
31
|
}
|
|
32
32
|
export declare const CustomModels: {
|
|
33
33
|
Address: typeof Address;
|
|
@@ -62,9 +62,29 @@ class Holder {
|
|
|
62
62
|
return other instanceof Holder && EJSON.equals(this.value, other.value);
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
|
+
function isRecord(value) {
|
|
66
|
+
return typeof value === 'object' && value !== null;
|
|
67
|
+
}
|
|
68
|
+
function requireRecord(value) {
|
|
69
|
+
if (!isRecord(value)) {
|
|
70
|
+
throw new TypeError('Invalid custom EJSON value');
|
|
71
|
+
}
|
|
72
|
+
return value;
|
|
73
|
+
}
|
|
65
74
|
const addTypes = () => {
|
|
66
|
-
EJSON.addType('Person', value =>
|
|
67
|
-
|
|
75
|
+
EJSON.addType('Person', value => {
|
|
76
|
+
const record = requireRecord(value);
|
|
77
|
+
const birthDate = EJSON.fromJSONValue(record['birthDate']);
|
|
78
|
+
const address = EJSON.fromJSONValue(record['address']);
|
|
79
|
+
if (!(birthDate instanceof Date) || !(address instanceof Address)) {
|
|
80
|
+
throw new TypeError('Invalid Person EJSON value');
|
|
81
|
+
}
|
|
82
|
+
return new Person(String(record['name']), birthDate, address);
|
|
83
|
+
});
|
|
84
|
+
EJSON.addType('Address', value => {
|
|
85
|
+
const record = requireRecord(value);
|
|
86
|
+
return new Address(String(record['city']), String(record['state']));
|
|
87
|
+
});
|
|
68
88
|
EJSON.addType('Holder', value => new Holder(value));
|
|
69
89
|
};
|
|
70
90
|
export const CustomModels = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom-models.js","sourceRoot":"","sources":["../../src/ejson/custom-models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,CAAA;AAEzB,MAAM,OAAO;IACX,IAAI,CAAQ;IACZ,KAAK,CAAQ;IAEb,YAAY,
|
|
1
|
+
{"version":3,"file":"custom-models.js","sourceRoot":"","sources":["../../src/ejson/custom-models.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1,2 @@
|
|
|
1
|
-
export
|
|
1
|
+
export type EJSONTypeFactory = (value: unknown) => unknown;
|
|
2
|
+
export declare const customTypes: Map<string, EJSONTypeFactory>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom-types.js","sourceRoot":"","sources":["../../src/ejson/custom-types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"custom-types.js","sourceRoot":"","sources":["../../src/ejson/custom-types.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,GAAG,EAA4B,CAAA"}
|
package/dist/ejson/equals.d.ts
CHANGED
package/dist/ejson/equals.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { EJSON } from './index.js';
|
|
2
|
-
import { hasOwn, isFunction, isObject, keysOf } from './utils.js';
|
|
2
|
+
import { hasOwn, isFunction, isObject, isObjectRecord, keysOf } from './utils.js';
|
|
3
3
|
function areBothNaN(a, b) {
|
|
4
4
|
return Number.isNaN(a) && Number.isNaN(b);
|
|
5
5
|
}
|
|
@@ -39,9 +39,10 @@ function compareKeysOrderSensitive(a, aKeys, b, bKeys, options) {
|
|
|
39
39
|
const ret = aKeys.every(key => {
|
|
40
40
|
if (i >= bKeys.length)
|
|
41
41
|
return false;
|
|
42
|
-
|
|
42
|
+
const bKey = bKeys[i];
|
|
43
|
+
if (bKey === undefined || key !== bKey)
|
|
43
44
|
return false;
|
|
44
|
-
if (!EJSON.equals(a[key], b[
|
|
45
|
+
if (!EJSON.equals(a[key], b[bKey], options))
|
|
45
46
|
return false;
|
|
46
47
|
i++;
|
|
47
48
|
return true;
|
|
@@ -106,6 +107,8 @@ export const equals = (a, b, options) => {
|
|
|
106
107
|
const customResult = handleCustomTypes(a, b);
|
|
107
108
|
if (customResult !== null)
|
|
108
109
|
return customResult;
|
|
110
|
+
if (!isObjectRecord(a) || !isObjectRecord(b))
|
|
111
|
+
return false;
|
|
109
112
|
const aKeys = keysOf(a);
|
|
110
113
|
const bKeys = keysOf(b);
|
|
111
114
|
const keyOrderSensitive = !!(options && options.keyOrderSensitive);
|
package/dist/ejson/equals.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"equals.js","sourceRoot":"","sources":["../../src/ejson/equals.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAC/B,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"equals.js","sourceRoot":"","sources":["../../src/ejson/equals.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const fromJSONValue: (item:
|
|
1
|
+
export declare const fromJSONValue: (item: unknown) => unknown;
|
|
@@ -2,7 +2,7 @@ import { adjustTypesFromJSONValue } from './adjust-types-from-json-value.js';
|
|
|
2
2
|
import { fromJSONValueHelper } from './helpers/from-json-value-helper.js';
|
|
3
3
|
import { EJSON } from './index.js';
|
|
4
4
|
import { isObject } from './utils.js';
|
|
5
|
-
export const fromJSONValue = item => {
|
|
5
|
+
export const fromJSONValue = (item) => {
|
|
6
6
|
let changed = fromJSONValueHelper(item);
|
|
7
7
|
if (changed === item && isObject(item)) {
|
|
8
8
|
changed = EJSON.clone(item);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"from-json-value.js","sourceRoot":"","sources":["../../src/ejson/from-json-value.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAA;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAA;AACtE,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAElC,MAAM,CAAC,MAAM,aAAa,GAAG,
|
|
1
|
+
{"version":3,"file":"from-json-value.js","sourceRoot":"","sources":["../../src/ejson/from-json-value.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAA;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAA;AACtE,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAElC,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAa,EAAW,EAAE;IACtD,IAAI,OAAO,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAA;IAEvC,IAAI,OAAO,KAAK,IAAI,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACvC,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAC3B,wBAAwB,CAAC,OAAO,CAAC,CAAA;IACnC,CAAC;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const adjustTypesToJSONValue: (obj:
|
|
1
|
+
export declare const adjustTypesToJSONValue: (obj: unknown) => unknown;
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* for both arrays and objects, in-place modification.
|
|
3
3
|
*/
|
|
4
|
-
import { isInfOrNaN, isObject, keysOf } from '../utils.js';
|
|
4
|
+
import { isInfOrNaN, isObject, isObjectRecord, keysOf } from '../utils.js';
|
|
5
5
|
import { toJSONValueHelper } from './to-json-value-helper.js';
|
|
6
|
-
export const adjustTypesToJSONValue = obj => {
|
|
6
|
+
export const adjustTypesToJSONValue = (obj) => {
|
|
7
7
|
// Is it an atom that we need to adjust?
|
|
8
8
|
if (obj === null) {
|
|
9
9
|
return null;
|
|
@@ -17,6 +17,8 @@ export const adjustTypesToJSONValue = obj => {
|
|
|
17
17
|
return obj;
|
|
18
18
|
}
|
|
19
19
|
// Iterate over array or object structure.
|
|
20
|
+
if (!isObjectRecord(obj))
|
|
21
|
+
return obj;
|
|
20
22
|
keysOf(obj).forEach(key => {
|
|
21
23
|
const value = obj[key];
|
|
22
24
|
if (!isObject(value) && value !== undefined && !isInfOrNaN(value)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adjust-types-to-json-value.js","sourceRoot":"","sources":["../../../src/ejson/helpers/adjust-types-to-json-value.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"adjust-types-to-json-value.js","sourceRoot":"","sources":["../../../src/ejson/helpers/adjust-types-to-json-value.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAE1D,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,GAAY,EAAW,EAAE;IAC9D,wCAAwC;IACxC,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QACjB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,YAAY,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAA;IAC3C,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAC/B,OAAO,YAAY,CAAA;IACrB,CAAC;IAED,6BAA6B;IAC7B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACnB,OAAO,GAAG,CAAA;IACZ,CAAC;IAED,0CAA0C;IAC1C,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC;QAAE,OAAO,GAAG,CAAA;IAEpC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACxB,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,CAAA;QACtB,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;YAClE,OAAM,CAAC,WAAW;QACpB,CAAC;QAED,MAAM,OAAO,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAA;QACxC,IAAI,OAAO,EAAE,CAAC;YACZ,GAAG,CAAC,GAAG,CAAC,GAAG,OAAO,CAAA;YAClB,OAAM,CAAC,qBAAqB;QAC9B,CAAC;QACD,wDAAwD;QACxD,2BAA2B;QAC3B,sBAAsB,CAAC,KAAK,CAAC,CAAA;IAC/B,CAAC,CAAC,CAAA;IACF,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const fromJSONValueHelper: (value:
|
|
1
|
+
export declare const fromJSONValueHelper: (value: unknown) => unknown;
|
|
@@ -5,14 +5,16 @@
|
|
|
5
5
|
* EJSON.fromJSONValue
|
|
6
6
|
*/
|
|
7
7
|
import { builtinConverters } from '../built-in-converters.js';
|
|
8
|
-
import {
|
|
9
|
-
export const fromJSONValueHelper = value => {
|
|
10
|
-
if (
|
|
8
|
+
import { isObjectRecord, keysOf } from '../utils.js';
|
|
9
|
+
export const fromJSONValueHelper = (value) => {
|
|
10
|
+
if (isObjectRecord(value)) {
|
|
11
11
|
const keys = keysOf(value);
|
|
12
12
|
if (keys.length <= 2 &&
|
|
13
13
|
keys.every(k => typeof k === 'string' && k.substr(0, 1) === '$')) {
|
|
14
14
|
for (let i = 0; i < builtinConverters.length; i++) {
|
|
15
15
|
const converter = builtinConverters[i];
|
|
16
|
+
if (!converter)
|
|
17
|
+
continue;
|
|
16
18
|
if (converter.matchJSONValue(value)) {
|
|
17
19
|
return converter.fromJSONValue(value);
|
|
18
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"from-json-value-helper.js","sourceRoot":"","sources":["../../../src/ejson/helpers/from-json-value-helper.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"from-json-value-helper.js","sourceRoot":"","sources":["../../../src/ejson/helpers/from-json-value-helper.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAEjD,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,KAAc,EAAW,EAAE;IAC7D,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;QAC1B,IACE,IAAI,CAAC,MAAM,IAAI,CAAC;YAChB,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,GAAG,CAAC,EAChE,CAAC;YACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAClD,MAAM,SAAS,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAA;gBACtC,IAAI,CAAC,SAAS;oBAAE,SAAQ;gBACxB,IAAI,SAAS,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;oBACpC,OAAO,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;gBACvC,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const toJSONValueHelper: (item:
|
|
1
|
+
export declare const toJSONValueHelper: (item: unknown) => unknown;
|
|
@@ -3,9 +3,11 @@
|
|
|
3
3
|
* the item isn't itself replaceable, but maybe some fields in it are)
|
|
4
4
|
*/
|
|
5
5
|
import { builtinConverters } from '../built-in-converters.js';
|
|
6
|
-
export const toJSONValueHelper = item => {
|
|
6
|
+
export const toJSONValueHelper = (item) => {
|
|
7
7
|
for (let i = 0; i < builtinConverters.length; i++) {
|
|
8
8
|
const converter = builtinConverters[i];
|
|
9
|
+
if (!converter)
|
|
10
|
+
continue;
|
|
9
11
|
if (converter.matchObject(item)) {
|
|
10
12
|
return converter.toJSONValue(item);
|
|
11
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"to-json-value-helper.js","sourceRoot":"","sources":["../../../src/ejson/helpers/to-json-value-helper.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAE1D,MAAM,CAAC,MAAM,iBAAiB,GAAG,
|
|
1
|
+
{"version":3,"file":"to-json-value-helper.js","sourceRoot":"","sources":["../../../src/ejson/helpers/to-json-value-helper.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAE1D,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,IAAa,EAAW,EAAE;IAC1D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAClD,MAAM,SAAS,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAA;QACtC,IAAI,CAAC,SAAS;YAAE,SAAQ;QACxB,IAAI,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;YAChC,OAAO,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QACpC,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA"}
|