@nmshd/runtime 2.4.4 → 2.4.6
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 +2 -0
- package/dist/buildInformation.js +5 -5
- package/dist/types/transport/RelationshipTemplateDTO.d.ts +1 -0
- package/dist/useCases/transport/account/GetIdentityInfo.js +1 -1
- package/dist/useCases/transport/account/GetIdentityInfo.js.map +1 -1
- package/dist/useCases/transport/challenges/ChallengeMapper.js +1 -1
- package/dist/useCases/transport/challenges/ChallengeMapper.js.map +1 -1
- package/dist/useCases/transport/devices/DeviceMapper.js +5 -5
- package/dist/useCases/transport/devices/DeviceMapper.js.map +1 -1
- package/dist/useCases/transport/files/FileMapper.js +1 -1
- package/dist/useCases/transport/files/FileMapper.js.map +1 -1
- package/dist/useCases/transport/relationshipTemplates/RelationshipTemplateMapper.js +1 -0
- package/dist/useCases/transport/relationshipTemplates/RelationshipTemplateMapper.js.map +1 -1
- package/dist/useCases/transport/relationships/RelationshipMapper.js +1 -1
- package/dist/useCases/transport/relationships/RelationshipMapper.js.map +1 -1
- package/dist/useCases/transport/tokens/TokenMapper.js +1 -1
- package/dist/useCases/transport/tokens/TokenMapper.js.map +1 -1
- package/lib-web/nmshd.runtime.js +81 -39
- package/lib-web/nmshd.runtime.js.map +1 -1
- package/lib-web/nmshd.runtime.min.js +2 -2
- package/lib-web/nmshd.runtime.min.js.map +1 -1
- package/package.json +12 -12
- package/ui5.yaml +1 -1
package/README.md
CHANGED
|
@@ -13,6 +13,8 @@ Both the Enmeshed Connector and the official Enmeshed Apps implement this runtim
|
|
|
13
13
|
|
|
14
14
|
You can find the documentation for Enmeshed on [enmeshed.eu](https://enmeshed.eu).
|
|
15
15
|
|
|
16
|
+
To get started developing in this repository, see the [developer's guide](README_dev.md).
|
|
17
|
+
|
|
16
18
|
## Feedback
|
|
17
19
|
|
|
18
20
|
Please file any bugs or feature requests by creating an [issue](https://github.com/nmshd/feedback/issues).
|
package/dist/buildInformation.js
CHANGED
|
@@ -7,11 +7,11 @@ const content_1 = require("@nmshd/content");
|
|
|
7
7
|
const crypto_1 = require("@nmshd/crypto");
|
|
8
8
|
const transport_1 = require("@nmshd/transport");
|
|
9
9
|
exports.buildInformation = {
|
|
10
|
-
version: "2.4.
|
|
11
|
-
build: "
|
|
12
|
-
date: "2023-
|
|
13
|
-
commit: "
|
|
14
|
-
dependencies: {"@js-soft/docdb-querytranslator":"1.1.0","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"2.0.
|
|
10
|
+
version: "2.4.6",
|
|
11
|
+
build: "150",
|
|
12
|
+
date: "2023-03-15T08:03:17+00:00",
|
|
13
|
+
commit: "437886e882de0d6c2207d27273e8779b86d83a5a",
|
|
14
|
+
dependencies: {"@js-soft/docdb-querytranslator":"1.1.0","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"2.0.8","@js-soft/ts-utils":"^2.3.1","@nmshd/consumption":"3.1.3","@nmshd/content":"2.3.2","@nmshd/crypto":"2.0.4","@nmshd/transport":"2.0.4","ajv":"^8.12.0","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","json-stringify-safe":"^5.0.1","lodash":"^4.17.21","luxon":"^3.3.0","qrcode":"1.5.1","reflect-metadata":"0.1.13","ts-simple-nameof":"1.3.1","typescript-ioc":"3.2.2"},
|
|
15
15
|
libraries: {
|
|
16
16
|
serval: ts_serval_1.buildInformation,
|
|
17
17
|
consumption: consumption_1.buildInformation,
|
|
@@ -26,7 +26,7 @@ let GetIdentityInfoUseCase = class GetIdentityInfoUseCase extends common_1.UseCa
|
|
|
26
26
|
const identity = this.identityController.identity;
|
|
27
27
|
return ts_utils_1.Result.ok({
|
|
28
28
|
address: identity.address.toString(),
|
|
29
|
-
publicKey: identity.publicKey.
|
|
29
|
+
publicKey: identity.publicKey.toBase64(false)
|
|
30
30
|
});
|
|
31
31
|
}
|
|
32
32
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetIdentityInfo.js","sourceRoot":"","sources":["../../../../src/useCases/transport/account/GetIdentityInfo.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAA2C;AAC3C,gDAAsD;AACtD,mDAAwC;AACxC,yCAAuC;AAOhC,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,gBAAsC;IAC9E,YAA4C,kBAAsC;QAC9E,KAAK,EAAE,CAAC;QADgC,uBAAkB,GAAlB,kBAAkB,CAAoB;IAElF,CAAC;IAES,eAAe;QACrB,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC;QAElD,OAAO,iBAAM,CAAC,EAAE,CAAC;YACb,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE;YACpC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"GetIdentityInfo.js","sourceRoot":"","sources":["../../../../src/useCases/transport/account/GetIdentityInfo.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAA2C;AAC3C,gDAAsD;AACtD,mDAAwC;AACxC,yCAAuC;AAOhC,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,gBAAsC;IAC9E,YAA4C,kBAAsC;QAC9E,KAAK,EAAE,CAAC;QADgC,uBAAkB,GAAlB,kBAAkB,CAAoB;IAElF,CAAC;IAES,eAAe;QACrB,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC;QAElD,OAAO,iBAAM,CAAC,EAAE,CAAC;YACb,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE;YACpC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC;SAChD,CAAC,CAAC;IACP,CAAC;CACJ,CAAA;AAbY,sBAAsB;IACX,WAAA,uBAAM,CAAA;qCAAsC,8BAAkB;GADzE,sBAAsB,CAalC;AAbY,wDAAsB"}
|
|
@@ -10,7 +10,7 @@ class ChallengeMapper {
|
|
|
10
10
|
createdBy: challenge.createdBy,
|
|
11
11
|
createdByDevice: challenge.createdByDevice,
|
|
12
12
|
type: challenge.type,
|
|
13
|
-
signature: signedChallenge.signature.toBase64(),
|
|
13
|
+
signature: signedChallenge.signature.toBase64(false),
|
|
14
14
|
challengeString: signedChallenge.challenge
|
|
15
15
|
};
|
|
16
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChallengeMapper.js","sourceRoot":"","sources":["../../../../src/useCases/transport/challenges/ChallengeMapper.ts"],"names":[],"mappings":";;;AAGA,MAAa,eAAe;IACjB,MAAM,CAAC,cAAc,CAAC,eAAgC;QACzD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QACxD,OAAO;YACH,EAAE,EAAE,SAAS,CAAC,EAAE;YAChB,SAAS,EAAE,SAAS,CAAC,SAAS;YAC9B,SAAS,EAAE,SAAS,CAAC,SAAS;YAC9B,eAAe,EAAE,SAAS,CAAC,eAAe;YAC1C,IAAI,EAAE,SAAS,CAAC,IAAI;YACpB,SAAS,EAAE,eAAe,CAAC,SAAS,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"ChallengeMapper.js","sourceRoot":"","sources":["../../../../src/useCases/transport/challenges/ChallengeMapper.ts"],"names":[],"mappings":";;;AAGA,MAAa,eAAe;IACjB,MAAM,CAAC,cAAc,CAAC,eAAgC;QACzD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QACxD,OAAO;YACH,EAAE,EAAE,SAAS,CAAC,EAAE;YAChB,SAAS,EAAE,SAAS,CAAC,SAAS;YAC9B,SAAS,EAAE,SAAS,CAAC,SAAS;YAC9B,eAAe,EAAE,SAAS,CAAC,eAAe;YAC1C,IAAI,EAAE,SAAS,CAAC,IAAI;YACpB,SAAS,EAAE,eAAe,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC;YACpD,eAAe,EAAE,eAAe,CAAC,SAAS;SAC7C,CAAC;IACN,CAAC;CACJ;AAbD,0CAaC"}
|
|
@@ -16,7 +16,7 @@ class DeviceMapper {
|
|
|
16
16
|
description: device.description,
|
|
17
17
|
lastLoginAt: device.lastLoginAt?.toString(),
|
|
18
18
|
operatingSystem: device.operatingSystem,
|
|
19
|
-
publicKey: device.publicKey?.
|
|
19
|
+
publicKey: device.publicKey?.toBase64(false)
|
|
20
20
|
};
|
|
21
21
|
}
|
|
22
22
|
static toDeviceOnboardingInfoDTO(deviceSharedSecret) {
|
|
@@ -26,13 +26,13 @@ class DeviceMapper {
|
|
|
26
26
|
createdByDevice: deviceSharedSecret.createdByDevice.toString(),
|
|
27
27
|
name: deviceSharedSecret.name,
|
|
28
28
|
description: deviceSharedSecret.description,
|
|
29
|
-
secretBaseKey: deviceSharedSecret.secretBaseKey.toBase64(),
|
|
29
|
+
secretBaseKey: deviceSharedSecret.secretBaseKey.toBase64(false),
|
|
30
30
|
deviceIndex: deviceSharedSecret.deviceIndex,
|
|
31
|
-
synchronizationKey: deviceSharedSecret.synchronizationKey.toBase64(),
|
|
32
|
-
identityPrivateKey: deviceSharedSecret.identityPrivateKey ? deviceSharedSecret.identityPrivateKey.toBase64() : undefined,
|
|
31
|
+
synchronizationKey: deviceSharedSecret.synchronizationKey.toBase64(false),
|
|
32
|
+
identityPrivateKey: deviceSharedSecret.identityPrivateKey ? deviceSharedSecret.identityPrivateKey.toBase64(false) : undefined,
|
|
33
33
|
identity: {
|
|
34
34
|
address: deviceSharedSecret.identity.address.toString(),
|
|
35
|
-
publicKey: deviceSharedSecret.identity.publicKey.toBase64(),
|
|
35
|
+
publicKey: deviceSharedSecret.identity.publicKey.toBase64(false),
|
|
36
36
|
realm: deviceSharedSecret.identity.realm.toString()
|
|
37
37
|
},
|
|
38
38
|
password: deviceSharedSecret.password,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeviceMapper.js","sourceRoot":"","sources":["../../../../src/useCases/transport/devices/DeviceMapper.ts"],"names":[],"mappings":";;;AAAA,0CAAqG;AACrG,gDAAoG;AAGpG,MAAa,YAAY;IACd,MAAM,CAAC,WAAW,CAAC,MAAc;QACpC,OAAO;YACH,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE;YACxB,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE;YACtC,eAAe,EAAE,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE;YAClD,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE;YAC5B,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,QAAQ,EAAE;YAC3C,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"DeviceMapper.js","sourceRoot":"","sources":["../../../../src/useCases/transport/devices/DeviceMapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,7 @@ class FileMapper {
|
|
|
29
29
|
mimetype: file.cache.mimetype,
|
|
30
30
|
isOwn: file.isOwn,
|
|
31
31
|
title: file.cache.title ?? "",
|
|
32
|
-
secretKey: file.secretKey.toBase64(),
|
|
32
|
+
secretKey: file.secretKey.toBase64(false),
|
|
33
33
|
description: file.cache.description,
|
|
34
34
|
truncatedReference: file.truncate()
|
|
35
35
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileMapper.js","sourceRoot":"","sources":["../../../../src/useCases/transport/files/FileMapper.ts"],"names":[],"mappings":";;;AACA,gDAAwC;AAExC,yCAA6C;AAG7C,MAAa,UAAU;IACZ,MAAM,CAAC,sBAAsB,CAAC,MAAkB,EAAE,IAAU;QAC/D,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACb,MAAM,sBAAa,CAAC,OAAO,CAAC,UAAU,CAAC,gBAAI,EAAE,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;SACpE;QAED,OAAO;YACH,OAAO,EAAE,MAAM,CAAC,MAAM;YACtB,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE;YACxE,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;SAChC,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,SAAS,CAAC,IAAU;QAC9B,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACb,MAAM,sBAAa,CAAC,OAAO,CAAC,UAAU,CAAC,gBAAI,EAAE,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;SACpE;QACD,OAAO;YACH,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE;YACtB,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;YAC7B,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;YAC7B,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE;YAC1C,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE;YAC1C,eAAe,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,QAAQ,EAAE;YACtD,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE;YAC1C,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;YAC7B,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE;YAC7B,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"FileMapper.js","sourceRoot":"","sources":["../../../../src/useCases/transport/files/FileMapper.ts"],"names":[],"mappings":";;;AACA,gDAAwC;AAExC,yCAA6C;AAG7C,MAAa,UAAU;IACZ,MAAM,CAAC,sBAAsB,CAAC,MAAkB,EAAE,IAAU;QAC/D,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACb,MAAM,sBAAa,CAAC,OAAO,CAAC,UAAU,CAAC,gBAAI,EAAE,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;SACpE;QAED,OAAO;YACH,OAAO,EAAE,MAAM,CAAC,MAAM;YACtB,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE;YACxE,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;SAChC,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,SAAS,CAAC,IAAU;QAC9B,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACb,MAAM,sBAAa,CAAC,OAAO,CAAC,UAAU,CAAC,gBAAI,EAAE,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;SACpE;QACD,OAAO;YACH,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE;YACtB,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;YAC7B,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;YAC7B,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE;YAC1C,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE;YAC1C,eAAe,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,QAAQ,EAAE;YACtD,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE;YAC1C,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;YAC7B,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE;YAC7B,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC;YACzC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW;YACnC,kBAAkB,EAAE,IAAI,CAAC,QAAQ,EAAE;SACtC,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,aAAa,CAAC,KAAa;QACrC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IACrD,CAAC;CACJ;AArCD,gCAqCC"}
|
|
@@ -17,6 +17,7 @@ class RelationshipTemplateMapper {
|
|
|
17
17
|
content: template.cache.content.toJSON(),
|
|
18
18
|
expiresAt: template.cache.expiresAt?.toString(),
|
|
19
19
|
maxNumberOfAllocations: template.cache.maxNumberOfAllocations,
|
|
20
|
+
secretKey: template.secretKey.toBase64(false),
|
|
20
21
|
truncatedReference: template.truncate()
|
|
21
22
|
};
|
|
22
23
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RelationshipTemplateMapper.js","sourceRoot":"","sources":["../../../../src/useCases/transport/relationshipTemplates/RelationshipTemplateMapper.ts"],"names":[],"mappings":";;;AAAA,gDAAwD;AAExD,yCAA6C;AAE7C,MAAa,0BAA0B;IAC5B,MAAM,CAAC,yBAAyB,CAAC,QAA8B;QAClE,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE;YACjB,MAAM,sBAAa,CAAC,OAAO,CAAC,UAAU,CAAC,gCAAoB,EAAE,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;SACxF;QAED,OAAO;YACH,EAAE,EAAE,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE;YAC1B,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,SAAS,EAAE,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE;YAC9C,eAAe,EAAE,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,QAAQ,EAAE;YAC1D,SAAS,EAAE,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE;YAC9C,OAAO,EAAE,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE;YACxC,SAAS,EAAE,QAAQ,CAAC,KAAK,CAAC,SAAS,EAAE,QAAQ,EAAE;YAC/C,sBAAsB,EAAE,QAAQ,CAAC,KAAK,CAAC,sBAAsB;YAC7D,kBAAkB,EAAE,QAAQ,CAAC,QAAQ,EAAE;SAC1C,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,6BAA6B,CAAC,aAAqC;QAC7E,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,CAAC;IACvE,CAAC;CACJ;
|
|
1
|
+
{"version":3,"file":"RelationshipTemplateMapper.js","sourceRoot":"","sources":["../../../../src/useCases/transport/relationshipTemplates/RelationshipTemplateMapper.ts"],"names":[],"mappings":";;;AAAA,gDAAwD;AAExD,yCAA6C;AAE7C,MAAa,0BAA0B;IAC5B,MAAM,CAAC,yBAAyB,CAAC,QAA8B;QAClE,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE;YACjB,MAAM,sBAAa,CAAC,OAAO,CAAC,UAAU,CAAC,gCAAoB,EAAE,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;SACxF;QAED,OAAO;YACH,EAAE,EAAE,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE;YAC1B,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,SAAS,EAAE,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE;YAC9C,eAAe,EAAE,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,QAAQ,EAAE;YAC1D,SAAS,EAAE,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE;YAC9C,OAAO,EAAE,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE;YACxC,SAAS,EAAE,QAAQ,CAAC,KAAK,CAAC,SAAS,EAAE,QAAQ,EAAE;YAC/C,sBAAsB,EAAE,QAAQ,CAAC,KAAK,CAAC,sBAAsB;YAC7D,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC;YAC7C,kBAAkB,EAAE,QAAQ,CAAC,QAAQ,EAAE;SAC1C,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,6BAA6B,CAAC,aAAqC;QAC7E,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,CAAC;IACvE,CAAC;CACJ;AAvBD,gEAuBC"}
|
|
@@ -16,7 +16,7 @@ class RelationshipMapper {
|
|
|
16
16
|
peer: relationship.peer.address.toString(),
|
|
17
17
|
peerIdentity: {
|
|
18
18
|
address: relationship.peer.address.toString(),
|
|
19
|
-
publicKey: relationship.peer.publicKey.
|
|
19
|
+
publicKey: relationship.peer.publicKey.toBase64(false),
|
|
20
20
|
realm: relationship.peer.realm
|
|
21
21
|
},
|
|
22
22
|
changes: relationship.cache.changes.map((c) => this.toRelationshipChangeDTO(c))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RelationshipMapper.js","sourceRoot":"","sources":["../../../../src/useCases/transport/relationships/RelationshipMapper.ts"],"names":[],"mappings":";;;AAAA,gDAA2H;AAE3H,yCAA6C;AAC7C,oGAAiG;AAEjG,MAAa,kBAAkB;IACpB,MAAM,CAAC,iBAAiB,CAAC,YAA0B;QACtD,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE;YACrB,MAAM,sBAAa,CAAC,OAAO,CAAC,UAAU,CAAC,wBAAY,EAAE,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;SACpF;QAED,OAAO;YACH,EAAE,EAAE,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE;YAC9B,QAAQ,EAAE,uDAA0B,CAAC,yBAAyB,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC;YAC3F,MAAM,EAAE,YAAY,CAAC,MAAM;YAC3B,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;YAC1C,YAAY,EAAE;gBACV,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;gBAC7C,SAAS,EAAE,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"RelationshipMapper.js","sourceRoot":"","sources":["../../../../src/useCases/transport/relationships/RelationshipMapper.ts"],"names":[],"mappings":";;;AAAA,gDAA2H;AAE3H,yCAA6C;AAC7C,oGAAiG;AAEjG,MAAa,kBAAkB;IACpB,MAAM,CAAC,iBAAiB,CAAC,YAA0B;QACtD,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE;YACrB,MAAM,sBAAa,CAAC,OAAO,CAAC,UAAU,CAAC,wBAAY,EAAE,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;SACpF;QAED,OAAO;YACH,EAAE,EAAE,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE;YAC9B,QAAQ,EAAE,uDAA0B,CAAC,yBAAyB,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC;YAC3F,MAAM,EAAE,YAAY,CAAC,MAAM;YAC3B,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;YAC1C,YAAY,EAAE;gBACV,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;gBAC7C,SAAS,EAAE,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC;gBACtD,KAAK,EAAE,YAAY,CAAC,IAAI,CAAC,KAAK;aACjC;YACD,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC;SAClF,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,qBAAqB,CAAC,aAA6B;QAC7D,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/D,CAAC;IAEO,MAAM,CAAC,8BAA8B,CAAC,MAAiC;QAC3E,OAAO;YACH,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE;YACtC,eAAe,EAAE,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE;YAClD,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE;YACtC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE;SACpC,CAAC;IACN,CAAC;IAEO,MAAM,CAAC,+BAA+B,CAAC,MAAkC;QAC7E,OAAO;YACH,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE;YACtC,eAAe,EAAE,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE;YAClD,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE;YACtC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE;SACpC,CAAC;IACN,CAAC;IAEO,MAAM,CAAC,uBAAuB,CAAC,MAA0B;QAC7D,OAAO;YACH,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE;YACxB,OAAO,EAAE,IAAI,CAAC,8BAA8B,CAAC,MAAM,CAAC,OAAO,CAAC;YAC5D,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,+BAA+B,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;SAChG,CAAC;IACN,CAAC;CACJ;AAnDD,gDAmDC"}
|
|
@@ -16,7 +16,7 @@ class TokenMapper {
|
|
|
16
16
|
content: token.cache.content.toJSON(),
|
|
17
17
|
createdAt: token.cache.createdAt.toString(),
|
|
18
18
|
expiresAt: token.cache.expiresAt.toString(),
|
|
19
|
-
secretKey: token.secretKey.toBase64(),
|
|
19
|
+
secretKey: token.secretKey.toBase64(false),
|
|
20
20
|
truncatedReference: reference.truncate(),
|
|
21
21
|
isEphemeral: ephemeral
|
|
22
22
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TokenMapper.js","sourceRoot":"","sources":["../../../../src/useCases/transport/tokens/TokenMapper.ts"],"names":[],"mappings":";;;AAAA,gDAAyC;AAEzC,yCAA6C;AAE7C,MAAa,WAAW;IACb,MAAM,CAAC,UAAU,CAAC,KAAY,EAAE,SAAkB;QACrD,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE;YACd,MAAM,sBAAa,CAAC,OAAO,CAAC,UAAU,CAAC,iBAAK,EAAE,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;SACtE;QAED,MAAM,SAAS,GAAG,KAAK,CAAC,gBAAgB,EAAE,CAAC;QAC3C,OAAO;YACH,EAAE,EAAE,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE;YACvB,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE;YAC3C,eAAe,EAAE,KAAK,CAAC,KAAK,CAAC,eAAe,CAAC,QAAQ,EAAE;YACvD,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE;YACrC,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE;YAC3C,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE;YAC3C,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"TokenMapper.js","sourceRoot":"","sources":["../../../../src/useCases/transport/tokens/TokenMapper.ts"],"names":[],"mappings":";;;AAAA,gDAAyC;AAEzC,yCAA6C;AAE7C,MAAa,WAAW;IACb,MAAM,CAAC,UAAU,CAAC,KAAY,EAAE,SAAkB;QACrD,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE;YACd,MAAM,sBAAa,CAAC,OAAO,CAAC,UAAU,CAAC,iBAAK,EAAE,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;SACtE;QAED,MAAM,SAAS,GAAG,KAAK,CAAC,gBAAgB,EAAE,CAAC;QAC3C,OAAO;YACH,EAAE,EAAE,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE;YACvB,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE;YAC3C,eAAe,EAAE,KAAK,CAAC,KAAK,CAAC,eAAe,CAAC,QAAQ,EAAE;YACvD,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE;YACrC,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE;YAC3C,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE;YAC3C,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC;YAC1C,kBAAkB,EAAE,SAAS,CAAC,QAAQ,EAAE;YACxC,WAAW,EAAE,SAAS;SACzB,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,MAAe,EAAE,SAAkB;QAC5D,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;IACnE,CAAC;CACJ;AAvBD,kCAuBC"}
|
package/lib-web/nmshd.runtime.js
CHANGED
|
@@ -548,11 +548,11 @@ const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
|
|
|
548
548
|
const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
|
|
549
549
|
const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
|
|
550
550
|
exports.buildInformation = {
|
|
551
|
-
version: "2.4.
|
|
552
|
-
build: "
|
|
553
|
-
date: "2023-
|
|
554
|
-
commit: "
|
|
555
|
-
dependencies: {"@js-soft/docdb-querytranslator":"1.1.0","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"2.0.
|
|
551
|
+
version: "2.4.6",
|
|
552
|
+
build: "150",
|
|
553
|
+
date: "2023-03-15T08:03:17+00:00",
|
|
554
|
+
commit: "437886e882de0d6c2207d27273e8779b86d83a5a",
|
|
555
|
+
dependencies: {"@js-soft/docdb-querytranslator":"1.1.0","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"2.0.8","@js-soft/ts-utils":"^2.3.1","@nmshd/consumption":"3.1.3","@nmshd/content":"2.3.2","@nmshd/crypto":"2.0.4","@nmshd/transport":"2.0.4","ajv":"^8.12.0","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","json-stringify-safe":"^5.0.1","lodash":"^4.17.21","luxon":"^3.3.0","qrcode":"1.5.1","reflect-metadata":"0.1.13","ts-simple-nameof":"1.3.1","typescript-ioc":"3.2.2"},
|
|
556
556
|
libraries: {
|
|
557
557
|
serval: ts_serval_1.buildInformation,
|
|
558
558
|
consumption: consumption_1.buildInformation,
|
|
@@ -32525,7 +32525,7 @@ let GetIdentityInfoUseCase = class GetIdentityInfoUseCase extends common_1.UseCa
|
|
|
32525
32525
|
const identity = this.identityController.identity;
|
|
32526
32526
|
return ts_utils_1.Result.ok({
|
|
32527
32527
|
address: identity.address.toString(),
|
|
32528
|
-
publicKey: identity.publicKey.
|
|
32528
|
+
publicKey: identity.publicKey.toBase64(false)
|
|
32529
32529
|
});
|
|
32530
32530
|
}
|
|
32531
32531
|
};
|
|
@@ -32935,7 +32935,7 @@ class ChallengeMapper {
|
|
|
32935
32935
|
createdBy: challenge.createdBy,
|
|
32936
32936
|
createdByDevice: challenge.createdByDevice,
|
|
32937
32937
|
type: challenge.type,
|
|
32938
|
-
signature: signedChallenge.signature.toBase64(),
|
|
32938
|
+
signature: signedChallenge.signature.toBase64(false),
|
|
32939
32939
|
challengeString: signedChallenge.challenge
|
|
32940
32940
|
};
|
|
32941
32941
|
}
|
|
@@ -33404,7 +33404,7 @@ class DeviceMapper {
|
|
|
33404
33404
|
description: device.description,
|
|
33405
33405
|
lastLoginAt: device.lastLoginAt?.toString(),
|
|
33406
33406
|
operatingSystem: device.operatingSystem,
|
|
33407
|
-
publicKey: device.publicKey?.
|
|
33407
|
+
publicKey: device.publicKey?.toBase64(false)
|
|
33408
33408
|
};
|
|
33409
33409
|
}
|
|
33410
33410
|
static toDeviceOnboardingInfoDTO(deviceSharedSecret) {
|
|
@@ -33414,13 +33414,13 @@ class DeviceMapper {
|
|
|
33414
33414
|
createdByDevice: deviceSharedSecret.createdByDevice.toString(),
|
|
33415
33415
|
name: deviceSharedSecret.name,
|
|
33416
33416
|
description: deviceSharedSecret.description,
|
|
33417
|
-
secretBaseKey: deviceSharedSecret.secretBaseKey.toBase64(),
|
|
33417
|
+
secretBaseKey: deviceSharedSecret.secretBaseKey.toBase64(false),
|
|
33418
33418
|
deviceIndex: deviceSharedSecret.deviceIndex,
|
|
33419
|
-
synchronizationKey: deviceSharedSecret.synchronizationKey.toBase64(),
|
|
33420
|
-
identityPrivateKey: deviceSharedSecret.identityPrivateKey ? deviceSharedSecret.identityPrivateKey.toBase64() : undefined,
|
|
33419
|
+
synchronizationKey: deviceSharedSecret.synchronizationKey.toBase64(false),
|
|
33420
|
+
identityPrivateKey: deviceSharedSecret.identityPrivateKey ? deviceSharedSecret.identityPrivateKey.toBase64(false) : undefined,
|
|
33421
33421
|
identity: {
|
|
33422
33422
|
address: deviceSharedSecret.identity.address.toString(),
|
|
33423
|
-
publicKey: deviceSharedSecret.identity.publicKey.toBase64(),
|
|
33423
|
+
publicKey: deviceSharedSecret.identity.publicKey.toBase64(false),
|
|
33424
33424
|
realm: deviceSharedSecret.identity.realm.toString()
|
|
33425
33425
|
},
|
|
33426
33426
|
password: deviceSharedSecret.password,
|
|
@@ -34030,7 +34030,7 @@ class FileMapper {
|
|
|
34030
34030
|
mimetype: file.cache.mimetype,
|
|
34031
34031
|
isOwn: file.isOwn,
|
|
34032
34032
|
title: file.cache.title ?? "",
|
|
34033
|
-
secretKey: file.secretKey.toBase64(),
|
|
34033
|
+
secretKey: file.secretKey.toBase64(false),
|
|
34034
34034
|
description: file.cache.description,
|
|
34035
34035
|
truncatedReference: file.truncate()
|
|
34036
34036
|
};
|
|
@@ -35742,6 +35742,7 @@ class RelationshipTemplateMapper {
|
|
|
35742
35742
|
content: template.cache.content.toJSON(),
|
|
35743
35743
|
expiresAt: template.cache.expiresAt?.toString(),
|
|
35744
35744
|
maxNumberOfAllocations: template.cache.maxNumberOfAllocations,
|
|
35745
|
+
secretKey: template.secretKey.toBase64(false),
|
|
35745
35746
|
truncatedReference: template.truncate()
|
|
35746
35747
|
};
|
|
35747
35748
|
}
|
|
@@ -36293,7 +36294,7 @@ class RelationshipMapper {
|
|
|
36293
36294
|
peer: relationship.peer.address.toString(),
|
|
36294
36295
|
peerIdentity: {
|
|
36295
36296
|
address: relationship.peer.address.toString(),
|
|
36296
|
-
publicKey: relationship.peer.publicKey.
|
|
36297
|
+
publicKey: relationship.peer.publicKey.toBase64(false),
|
|
36297
36298
|
realm: relationship.peer.realm
|
|
36298
36299
|
},
|
|
36299
36300
|
changes: relationship.cache.changes.map((c) => this.toRelationshipChangeDTO(c))
|
|
@@ -36841,7 +36842,7 @@ class TokenMapper {
|
|
|
36841
36842
|
content: token.cache.content.toJSON(),
|
|
36842
36843
|
createdAt: token.cache.createdAt.toString(),
|
|
36843
36844
|
expiresAt: token.cache.expiresAt.toString(),
|
|
36844
|
-
secretKey: token.secretKey.toBase64(),
|
|
36845
|
+
secretKey: token.secretKey.toBase64(false),
|
|
36845
36846
|
truncatedReference: reference.truncate(),
|
|
36846
36847
|
isEphemeral: ephemeral
|
|
36847
36848
|
};
|
|
@@ -66112,8 +66113,12 @@ class PolyNumberFormatter {
|
|
|
66112
66113
|
class PolyDateFormatter {
|
|
66113
66114
|
constructor(dt, intl, opts) {
|
|
66114
66115
|
this.opts = opts;
|
|
66116
|
+
this.originalZone = undefined;
|
|
66115
66117
|
let z = undefined;
|
|
66116
|
-
if (
|
|
66118
|
+
if (this.opts.timeZone) {
|
|
66119
|
+
// Don't apply any workarounds if a timeZone is explicitly provided in opts
|
|
66120
|
+
this.dt = dt;
|
|
66121
|
+
} else if (dt.zone.type === "fixed") {
|
|
66117
66122
|
// UTC-8 or Etc/UTC-8 are not part of tzdata, only Etc/GMT+8 and the like.
|
|
66118
66123
|
// That is why fixed-offset TZ is set to that unless it is:
|
|
66119
66124
|
// 1. Representing offset 0 when UTC is used to maintain previous behavior and does not become GMT.
|
|
@@ -66126,25 +66131,27 @@ class PolyDateFormatter {
|
|
|
66126
66131
|
z = offsetZ;
|
|
66127
66132
|
this.dt = dt;
|
|
66128
66133
|
} else {
|
|
66129
|
-
// Not all fixed-offset zones like Etc/+4:30 are present in tzdata
|
|
66130
|
-
//
|
|
66131
|
-
// 1. The format options tell us to show the zone. We can't do that, so the best
|
|
66132
|
-
// we can do is format the date in UTC.
|
|
66133
|
-
// 2. The format options don't tell us to show the zone. Then we can adjust them
|
|
66134
|
-
// the time and tell the formatter to show it to us in UTC, so that the time is right
|
|
66135
|
-
// and the bad zone doesn't show up.
|
|
66134
|
+
// Not all fixed-offset zones like Etc/+4:30 are present in tzdata so
|
|
66135
|
+
// we manually apply the offset and substitute the zone as needed.
|
|
66136
66136
|
z = "UTC";
|
|
66137
|
-
|
|
66138
|
-
|
|
66139
|
-
}
|
|
66140
|
-
|
|
66141
|
-
}
|
|
66137
|
+
this.dt = dt.offset === 0 ? dt : dt.setZone("UTC").plus({
|
|
66138
|
+
minutes: dt.offset
|
|
66139
|
+
});
|
|
66140
|
+
this.originalZone = dt.zone;
|
|
66142
66141
|
}
|
|
66143
66142
|
} else if (dt.zone.type === "system") {
|
|
66144
66143
|
this.dt = dt;
|
|
66145
|
-
} else {
|
|
66144
|
+
} else if (dt.zone.type === "iana") {
|
|
66146
66145
|
this.dt = dt;
|
|
66147
66146
|
z = dt.zone.name;
|
|
66147
|
+
} else {
|
|
66148
|
+
// Custom zones can have any offset / offsetName so we just manually
|
|
66149
|
+
// apply the offset and substitute the zone as needed.
|
|
66150
|
+
z = "UTC";
|
|
66151
|
+
this.dt = dt.setZone("UTC").plus({
|
|
66152
|
+
minutes: dt.offset
|
|
66153
|
+
});
|
|
66154
|
+
this.originalZone = dt.zone;
|
|
66148
66155
|
}
|
|
66149
66156
|
const intlOpts = {
|
|
66150
66157
|
...this.opts
|
|
@@ -66153,10 +66160,34 @@ class PolyDateFormatter {
|
|
|
66153
66160
|
this.dtf = getCachedDTF(intl, intlOpts);
|
|
66154
66161
|
}
|
|
66155
66162
|
format() {
|
|
66163
|
+
if (this.originalZone) {
|
|
66164
|
+
// If we have to substitute in the actual zone name, we have to use
|
|
66165
|
+
// formatToParts so that the timezone can be replaced.
|
|
66166
|
+
return this.formatToParts().map(({
|
|
66167
|
+
value
|
|
66168
|
+
}) => value).join("");
|
|
66169
|
+
}
|
|
66156
66170
|
return this.dtf.format(this.dt.toJSDate());
|
|
66157
66171
|
}
|
|
66158
66172
|
formatToParts() {
|
|
66159
|
-
|
|
66173
|
+
const parts = this.dtf.formatToParts(this.dt.toJSDate());
|
|
66174
|
+
if (this.originalZone) {
|
|
66175
|
+
return parts.map(part => {
|
|
66176
|
+
if (part.type === "timeZoneName") {
|
|
66177
|
+
const offsetName = this.originalZone.offsetName(this.dt.ts, {
|
|
66178
|
+
locale: this.dt.locale,
|
|
66179
|
+
format: this.opts.timeZoneName
|
|
66180
|
+
});
|
|
66181
|
+
return {
|
|
66182
|
+
...part,
|
|
66183
|
+
value: offsetName
|
|
66184
|
+
};
|
|
66185
|
+
} else {
|
|
66186
|
+
return part;
|
|
66187
|
+
}
|
|
66188
|
+
});
|
|
66189
|
+
}
|
|
66190
|
+
return parts;
|
|
66160
66191
|
}
|
|
66161
66192
|
resolvedOptions() {
|
|
66162
66193
|
return this.dtf.resolvedOptions();
|
|
@@ -66815,7 +66846,10 @@ function objToLocalTS(obj) {
|
|
|
66815
66846
|
// for legacy reasons, years between 0 and 99 are interpreted as 19XX; revert that
|
|
66816
66847
|
if (obj.year < 100 && obj.year >= 0) {
|
|
66817
66848
|
d = new Date(d);
|
|
66818
|
-
|
|
66849
|
+
// set the month and day again, this is necessary because year 2000 is a leap year, but year 100 is not
|
|
66850
|
+
// so if obj.year is in 99, but obj.day makes it roll over into year 100,
|
|
66851
|
+
// the calculations done by Date.UTC are using year 2000 - which is incorrect
|
|
66852
|
+
d.setUTCFullYear(obj.year, obj.month - 1, obj.day);
|
|
66819
66853
|
}
|
|
66820
66854
|
return +d;
|
|
66821
66855
|
}
|
|
@@ -67047,6 +67081,9 @@ class Formatter {
|
|
|
67047
67081
|
return new Formatter(locale, opts);
|
|
67048
67082
|
}
|
|
67049
67083
|
static parseFormat(fmt) {
|
|
67084
|
+
// white-space is always considered a literal in user-provided formats
|
|
67085
|
+
// the " " token has a special meaning (see unitForToken)
|
|
67086
|
+
|
|
67050
67087
|
let current = null,
|
|
67051
67088
|
currentFull = "",
|
|
67052
67089
|
bracketed = false;
|
|
@@ -67056,7 +67093,7 @@ class Formatter {
|
|
|
67056
67093
|
if (c === "'") {
|
|
67057
67094
|
if (currentFull.length > 0) {
|
|
67058
67095
|
splits.push({
|
|
67059
|
-
literal: bracketed,
|
|
67096
|
+
literal: bracketed || /^\s+$/.test(currentFull),
|
|
67060
67097
|
val: currentFull
|
|
67061
67098
|
});
|
|
67062
67099
|
}
|
|
@@ -67070,7 +67107,7 @@ class Formatter {
|
|
|
67070
67107
|
} else {
|
|
67071
67108
|
if (currentFull.length > 0) {
|
|
67072
67109
|
splits.push({
|
|
67073
|
-
literal:
|
|
67110
|
+
literal: /^\s+$/.test(currentFull),
|
|
67074
67111
|
val: currentFull
|
|
67075
67112
|
});
|
|
67076
67113
|
}
|
|
@@ -67080,7 +67117,7 @@ class Formatter {
|
|
|
67080
67117
|
}
|
|
67081
67118
|
if (currentFull.length > 0) {
|
|
67082
67119
|
splits.push({
|
|
67083
|
-
literal: bracketed,
|
|
67120
|
+
literal: bracketed || /^\s+$/.test(currentFull),
|
|
67084
67121
|
val: currentFull
|
|
67085
67122
|
});
|
|
67086
67123
|
}
|
|
@@ -68808,7 +68845,7 @@ class Interval {
|
|
|
68808
68845
|
if (!this.isValid) return NaN;
|
|
68809
68846
|
const start = this.start.startOf(unit),
|
|
68810
68847
|
end = this.end.startOf(unit);
|
|
68811
|
-
return Math.floor(end.diff(start, unit).get(unit)) +
|
|
68848
|
+
return Math.floor(end.diff(start, unit).get(unit)) + (end.valueOf() !== this.end.valueOf());
|
|
68812
68849
|
}
|
|
68813
68850
|
|
|
68814
68851
|
/**
|
|
@@ -69674,6 +69711,10 @@ function unitForToken(token, loc) {
|
|
|
69674
69711
|
// because we don't have any way to figure out what they are
|
|
69675
69712
|
case "z":
|
|
69676
69713
|
return simple(/[a-z_+-/]{1,256}?/i);
|
|
69714
|
+
// this special-case "token" represents a place where a macro-token expanded into a white-space literal
|
|
69715
|
+
// in this case we accept any non-newline white-space
|
|
69716
|
+
case " ":
|
|
69717
|
+
return simple(/[^\S\n\r]/);
|
|
69677
69718
|
default:
|
|
69678
69719
|
return literal(t);
|
|
69679
69720
|
}
|
|
@@ -69728,9 +69769,10 @@ function tokenForPart(part, formatOpts) {
|
|
|
69728
69769
|
value
|
|
69729
69770
|
} = part;
|
|
69730
69771
|
if (type === "literal") {
|
|
69772
|
+
const isSpace = /^\s+$/.test(value);
|
|
69731
69773
|
return {
|
|
69732
|
-
literal:
|
|
69733
|
-
val: value
|
|
69774
|
+
literal: !isSpace,
|
|
69775
|
+
val: isSpace ? " " : value
|
|
69734
69776
|
};
|
|
69735
69777
|
}
|
|
69736
69778
|
const style = formatOpts[type];
|
|
@@ -70205,7 +70247,7 @@ function parseDataToDateTime(parsed, parsedZone, opts, format, text, specificOff
|
|
|
70205
70247
|
setZone,
|
|
70206
70248
|
zone
|
|
70207
70249
|
} = opts;
|
|
70208
|
-
if (parsed && Object.keys(parsed).length !== 0) {
|
|
70250
|
+
if (parsed && Object.keys(parsed).length !== 0 || parsedZone) {
|
|
70209
70251
|
const interpretationZone = parsedZone || zone,
|
|
70210
70252
|
inst = DateTime.fromObject(parsed, {
|
|
70211
70253
|
...opts,
|
|
@@ -72252,7 +72294,7 @@ function friendlyDateTime(dateTimeish) {
|
|
|
72252
72294
|
}
|
|
72253
72295
|
}
|
|
72254
72296
|
|
|
72255
|
-
const VERSION = "3.
|
|
72297
|
+
const VERSION = "3.3.0";
|
|
72256
72298
|
|
|
72257
72299
|
exports.DateTime = DateTime;
|
|
72258
72300
|
exports.Duration = Duration;
|