@nmshd/consumption 2.0.0-beta.12 → 2.0.0-beta.15

package/lib-web/nmshd.consumption.js

@@ -17,10 +17,10 @@ const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 exports.buildInformation = {
-    version: "2.0.0-beta.12",
-    build: "62",
-    date: "2022-09-07T07:10:44+00:00",
-    commit: "a12eecac407d98276e0f1989f78800d787e27845",
+    version: "2.0.0-beta.15",
+    build: "66",
+    date: "2022-09-09T06:59:05+00:00",
+    commit: "36168f3d7a06186c388a1563731cfa88541125b5",
     dependencies: {"@js-soft/docdb-querytranslator":"^1.1.0","ts-simple-nameof":"^1.3.1"},
     libraries: {
         transport: transport_1.buildInformation,
@@ -58,9 +58,8 @@ class ConsumptionBaseController {
     init() {
         return Promise.resolve(this);
     }
-    async parseArray(values, type) {
-        const parsePromises = values.map((v) => type.from(v));
-        return await Promise.all(parsePromises);
+    parseArray(values, type) {
+        return values.map((v) => type.fromAny(v));
     }
 }
 exports.ConsumptionBaseController = ConsumptionBaseController;
@@ -121,7 +120,7 @@ class ConsumptionController {
     getDefaultProcessors() {
         return new Map([
             [content_1.ShareAttributeRequestItem, modules_1.ShareAttributeRequestItemProcessor],
-            [content_1.CreateRelationshipAttributeRequestItem, modules_1.CreateRelationshipAttributeRequestItemProcessor],
+            [content_1.CreateAttributeRequestItem, modules_1.CreateAttributeRequestItemProcessor],
             [content_1.ReadAttributeRequestItem, modules_1.ReadAttributeRequestItemProcessor],
             [content_1.ProposeAttributeRequestItem, modules_1.ProposeAttributeRequestItemProcessor],
             [content_1.ConsentRequestItem, modules_1.GenericRequestItemProcessor],
@@ -413,11 +412,11 @@ class LocalAttributesController extends consumption_1.ConsumptionBaseController
     }
     async getLocalAttributes(query) {
         const attributes = await this.attributes.find(query);
-        return await this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
+        return this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
     }
     async getValidLocalAttributes(query) {
         const attributes = await this.attributes.find(query);
-        const items = await this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
+        const items = this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
         return this.filterCurrent(items);
     }
     async executeRelationshipAttributeQuery(query) {
@@ -425,7 +424,16 @@ class LocalAttributesController extends consumption_1.ConsumptionBaseController
         const dbQuery = QueryTranslator_1.RelationshipAttributeQueryTranslator.translate(parsedQuery);
         dbQuery["content.confidentiality"] = { $ne: "private" };
         const attributes = await this.attributes.find(dbQuery);
-        return await this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
+        const attribute = attributes.length > 0 ? attributes[0] : undefined;
+        return attribute === undefined ? undefined : LocalAttribute_1.LocalAttribute.from(attribute);
+    }
+    async executeThirdPartyRelationshipAttributeQuery(query) {
+        const parsedQuery = content_1.ThirdPartyRelationshipAttributeQuery.from(query);
+        const dbQuery = QueryTranslator_1.ThirdPartyRelationshipAttributeQueryTranslator.translate(parsedQuery);
+        dbQuery["content.confidentiality"] = { $ne: "private" };
+        const attributes = await this.attributes.find(dbQuery);
+        const attribute = attributes.length > 0 ? attributes[0] : undefined;
+        return attribute ?? LocalAttribute_1.LocalAttribute.from(attribute);
     }
     async executeIdentityAttributeQuery(query) {
         const parsedQuery = content_1.IdentityAttributeQuery.from(query);
@@ -433,7 +441,7 @@ class LocalAttributesController extends consumption_1.ConsumptionBaseController
         dbQuery["content.owner"] = this.identity.address.toString();
         dbQuery["shareInfo"] = { $exists: false };
         const attributes = await this.attributes.find(dbQuery);
-        return await this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
+        return this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
     }
     async createLocalAttribute(params) {
         const localAttribute = await LocalAttribute_1.LocalAttribute.fromAttribute(params.content);
@@ -489,6 +497,7 @@ class LocalAttributesController extends consumption_1.ConsumptionBaseController
             createdAt: transport_1.CoreDate.utc()
         });
         await this.attributes.create(peerLocalAttribute);
+        this.eventBus.publish(new events_1.AttributeCreatedEvent(this.identity.address.toString(), peerLocalAttribute));
         return peerLocalAttribute;
     }
     async updateLocalAttribute(params) {
@@ -981,7 +990,7 @@ exports.LocalAttributeShareInfo = LocalAttributeShareInfo;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.RelationshipAttributeQueryTranslator = exports.IdentityAttributeQueryTranslator = void 0;
+exports.ThirdPartyRelationshipAttributeQueryTranslator = exports.RelationshipAttributeQueryTranslator = exports.IdentityAttributeQueryTranslator = void 0;
 const docdb_querytranslator_1 = __webpack_require__(/*! @js-soft/docdb-querytranslator */ "./node_modules/@js-soft/docdb-querytranslator/dist/index.js");
 const luxon_1 = __webpack_require__(/*! luxon */ "./node_modules/luxon/build/node/luxon.js");
 const ts_simple_nameof_1 = __webpack_require__(/*! ts-simple-nameof */ "./node_modules/ts-simple-nameof/index.js");
@@ -1051,6 +1060,55 @@ class RelationshipAttributeQueryTranslator {
 }
 exports.RelationshipAttributeQueryTranslator = RelationshipAttributeQueryTranslator;
 RelationshipAttributeQueryTranslator.translator = new docdb_querytranslator_1.QueryTranslator({
+    whitelist: {
+        [(0, ts_simple_nameof_1.nameof)((x) => x.key)]: true,
+        [(0, ts_simple_nameof_1.nameof)((x) => x.validFrom)]: true,
+        [(0, ts_simple_nameof_1.nameof)((x) => x.validTo)]: true,
+        [(0, ts_simple_nameof_1.nameof)((x) => x.owner)]: true,
+        attributeType: true
+    },
+    alias: {
+        // key
+        [(0, ts_simple_nameof_1.nameof)((x) => x.key)]: [
+            `${(0, ts_simple_nameof_1.nameof)((x) => x.content)}.${(0, ts_simple_nameof_1.nameof)((x) => x.key)}`
+        ],
+        // @type of attribute
+        attributeType: [`${(0, ts_simple_nameof_1.nameof)((x) => x.content)}.@type`],
+        // owner
+        [(0, ts_simple_nameof_1.nameof)((x) => x.owner)]: [
+            `${(0, ts_simple_nameof_1.nameof)((x) => x.content)}.${(0, ts_simple_nameof_1.nameof)((x) => x.owner)}`
+        ]
+    },
+    custom: {
+        // validFrom
+        [(0, ts_simple_nameof_1.nameof)((x) => x.validFrom)]: (query, input) => {
+            if (!input) {
+                return;
+            }
+            const validFromUtcString = luxon_1.DateTime.fromISO(input).toUTC().toString();
+            query[`${(0, ts_simple_nameof_1.nameof)((x) => x.content)}.${(0, ts_simple_nameof_1.nameof)((x) => x.validFrom)}`] = {
+                $gte: validFromUtcString
+            };
+        },
+        // validTo
+        [(0, ts_simple_nameof_1.nameof)((x) => x.validTo)]: (query, input) => {
+            if (!input) {
+                return;
+            }
+            const validToUtcString = luxon_1.DateTime.fromISO(input).toUTC().toString();
+            query[`${(0, ts_simple_nameof_1.nameof)((x) => x.content)}.${(0, ts_simple_nameof_1.nameof)((x) => x.validTo)}`] = {
+                $lte: validToUtcString
+            };
+        }
+    }
+});
+class ThirdPartyRelationshipAttributeQueryTranslator {
+    static translate(query) {
+        return this.translator.parse({ ...query.toJSON(), attributeType: "RelationshipAttribute" });
+    }
+}
+exports.ThirdPartyRelationshipAttributeQueryTranslator = ThirdPartyRelationshipAttributeQueryTranslator;
+ThirdPartyRelationshipAttributeQueryTranslator.translator = new docdb_querytranslator_1.QueryTranslator({
     whitelist: {
         [(0, ts_simple_nameof_1.nameof)((x) => x.key)]: true,
         [(0, ts_simple_nameof_1.nameof)((x) => x.validFrom)]: true,
@@ -1214,7 +1272,7 @@ class DraftsController extends consumption_1.ConsumptionBaseController {
     }
     async getDrafts(query) {
         const items = await this.drafts.find(query);
-        return await this.parseArray(items, Draft_1.Draft);
+        return this.parseArray(items, Draft_1.Draft);
     }
     async createDraft(content, type = "") {
         const draft = Draft_1.Draft.from({
@@ -2240,8 +2298,8 @@ __exportStar(__webpack_require__(/*! ./incoming/IncomingRequestsController */ ".
 __exportStar(__webpack_require__(/*! ./incoming/received/ReceivedIncomingRequestParameters */ "./dist/modules/requests/incoming/received/ReceivedIncomingRequestParameters.js"), exports);
 __exportStar(__webpack_require__(/*! ./incoming/requireManualDecision/RequireManualDecisionOfIncomingRequestParameters */ "./dist/modules/requests/incoming/requireManualDecision/RequireManualDecisionOfIncomingRequestParameters.js"), exports);
 __exportStar(__webpack_require__(/*! ./itemProcessors/AbstractRequestItemProcessor */ "./dist/modules/requests/itemProcessors/AbstractRequestItemProcessor.js"), exports);
-__exportStar(__webpack_require__(/*! ./itemProcessors/createRelationshipAttribute/AcceptCreateRelationshipAttributeRequestItemParameters */ "./dist/modules/requests/itemProcessors/createRelationshipAttribute/AcceptCreateRelationshipAttributeRequestItemParameters.js"), exports);
-__exportStar(__webpack_require__(/*! ./itemProcessors/createRelationshipAttribute/CreateRelationshipAttributeRequestItemProcessor */ "./dist/modules/requests/itemProcessors/createRelationshipAttribute/CreateRelationshipAttributeRequestItemProcessor.js"), exports);
+__exportStar(__webpack_require__(/*! ./itemProcessors/createAttribute/AcceptCreateAttributeRequestItemParameters */ "./dist/modules/requests/itemProcessors/createAttribute/AcceptCreateAttributeRequestItemParameters.js"), exports);
+__exportStar(__webpack_require__(/*! ./itemProcessors/createAttribute/CreateAttributeRequestItemProcessor */ "./dist/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.js"), exports);
 __exportStar(__webpack_require__(/*! ./itemProcessors/GenericRequestItemProcessor */ "./dist/modules/requests/itemProcessors/GenericRequestItemProcessor.js"), exports);
 __exportStar(__webpack_require__(/*! ./itemProcessors/IRequestItemProcessor */ "./dist/modules/requests/itemProcessors/IRequestItemProcessor.js"), exports);
 __exportStar(__webpack_require__(/*! ./itemProcessors/ProcessorConstructor */ "./dist/modules/requests/itemProcessors/ProcessorConstructor.js"), exports);
@@ -2461,10 +2519,10 @@ exports.ErrorValidationResult = ErrorValidationResult;
 
 /***/ }),
 
-/***/ "./dist/modules/requests/itemProcessors/createRelationshipAttribute/AcceptCreateRelationshipAttributeRequestItemParameters.js":
-/*!************************************************************************************************************************************!*\
-  !*** ./dist/modules/requests/itemProcessors/createRelationshipAttribute/AcceptCreateRelationshipAttributeRequestItemParameters.js ***!
-  \************************************************************************************************************************************/
+/***/ "./dist/modules/requests/itemProcessors/createAttribute/AcceptCreateAttributeRequestItemParameters.js":
+/*!************************************************************************************************************!*\
+  !*** ./dist/modules/requests/itemProcessors/createAttribute/AcceptCreateAttributeRequestItemParameters.js ***!
+  \************************************************************************************************************/
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
@@ -2476,61 +2534,87 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.AcceptCreateRelationshipAttributeRequestItemParameters = void 0;
+exports.AcceptCreateAttributeRequestItemParameters = void 0;
 const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
-let AcceptCreateRelationshipAttributeRequestItemParameters = class AcceptCreateRelationshipAttributeRequestItemParameters extends ts_serval_1.Serializable {
+let AcceptCreateAttributeRequestItemParameters = class AcceptCreateAttributeRequestItemParameters extends ts_serval_1.Serializable {
     static from(value) {
         return this.fromAny(value);
     }
 };
-AcceptCreateRelationshipAttributeRequestItemParameters = __decorate([
-    (0, ts_serval_1.type)("AcceptCreateRelationshipAttributeRequestItemParameters")
-], AcceptCreateRelationshipAttributeRequestItemParameters);
-exports.AcceptCreateRelationshipAttributeRequestItemParameters = AcceptCreateRelationshipAttributeRequestItemParameters;
-//# sourceMappingURL=AcceptCreateRelationshipAttributeRequestItemParameters.js.map
+AcceptCreateAttributeRequestItemParameters = __decorate([
+    (0, ts_serval_1.type)("AcceptCreateAttributeRequestItemParameters")
+], AcceptCreateAttributeRequestItemParameters);
+exports.AcceptCreateAttributeRequestItemParameters = AcceptCreateAttributeRequestItemParameters;
+//# sourceMappingURL=AcceptCreateAttributeRequestItemParameters.js.map
 
 /***/ }),
 
-/***/ "./dist/modules/requests/itemProcessors/createRelationshipAttribute/CreateRelationshipAttributeRequestItemProcessor.js":
-/*!*****************************************************************************************************************************!*\
-  !*** ./dist/modules/requests/itemProcessors/createRelationshipAttribute/CreateRelationshipAttributeRequestItemProcessor.js ***!
-  \*****************************************************************************************************************************/
+/***/ "./dist/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.js":
+/*!*****************************************************************************************************!*\
+  !*** ./dist/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.js ***!
+  \*****************************************************************************************************/
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.CreateRelationshipAttributeRequestItemProcessor = void 0;
+exports.CreateAttributeRequestItemProcessor = void 0;
 const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const consumption_1 = __webpack_require__(/*! ../../../../consumption */ "./dist/consumption/index.js");
 const GenericRequestItemProcessor_1 = __webpack_require__(/*! ../GenericRequestItemProcessor */ "./dist/modules/requests/itemProcessors/GenericRequestItemProcessor.js");
 const ValidationResult_1 = __webpack_require__(/*! ../ValidationResult */ "./dist/modules/requests/itemProcessors/ValidationResult.js");
-class CreateRelationshipAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.GenericRequestItemProcessor {
-    canCreateOutgoingRequestItem(requestItem, _request, _recipient) {
-        if (requestItem.attribute.owner.toString() !== "" &&
-            !requestItem.attribute.owner.equals(this.currentIdentityAddress)) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("The owner of the given `attribute` can only be an empty string. This is because you can only send Attributes where the recipient of the Request is the owner anyway. And in order to avoid mistakes, the owner will be automatically filled for you."));
+class CreateAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.GenericRequestItemProcessor {
+    canCreateOutgoingRequestItem(requestItem, _request, recipient) {
+        const recipientIsAttributeOwner = requestItem.attribute.owner.equals(recipient);
+        const senderIsAttributeOwner = requestItem.attribute.owner.equals(this.currentIdentityAddress);
+        const ownerIsEmptyString = requestItem.attribute.owner.toString() === "";
+        if (requestItem.attribute instanceof content_1.IdentityAttribute) {
+            if (senderIsAttributeOwner) {
+                return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("Cannot create own Attributes with a CreateAttributeRequestItem. Use a ShareAttributeRequestItem instead."));
+            }
+            if (recipientIsAttributeOwner || ownerIsEmptyString || recipient === undefined) {
+                return ValidationResult_1.ValidationResult.success();
+            }
+            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("The owner of the given `attribute` can only be the recipient's address or an empty string. The latter will default to the recipient's address."));
         }
-        return ValidationResult_1.ValidationResult.success();
+        if (recipientIsAttributeOwner || senderIsAttributeOwner || ownerIsEmptyString || recipient === undefined) {
+            return ValidationResult_1.ValidationResult.success();
+        }
+        return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("The owner of the given 'attribute' can only be the sender's address, the recipient's address or an empty string. The latter will default to the recipient's address."));
     }
     async accept(requestItem, _params, requestInfo) {
-        requestItem.attribute.owner ??= requestInfo.peer;
-        const peerLocalAttribute = await this.consumptionController.attributes.createPeerLocalAttribute({
-            content: requestItem.attribute,
-            peer: requestInfo.peer,
-            requestReference: requestInfo.id
-        });
-        return content_1.CreateRelationshipAttributeAcceptResponseItem.from({
+        if (requestItem.attribute.owner.toString() === "") {
+            requestItem.attribute.owner = this.currentIdentityAddress;
+        }
+        let sharedAttribute;
+        if (requestItem.attribute instanceof content_1.IdentityAttribute) {
+            const repositoryAttribute = await this.consumptionController.attributes.createLocalAttribute({
+                content: requestItem.attribute
+            });
+            sharedAttribute = await this.consumptionController.attributes.createSharedLocalAttributeCopy({
+                peer: requestInfo.peer,
+                requestReference: requestInfo.id,
+                sourceAttributeId: repositoryAttribute.id
+            });
+        }
+        else {
+            sharedAttribute = await this.consumptionController.attributes.createPeerLocalAttribute({
+                content: requestItem.attribute,
+                peer: requestInfo.peer,
+                requestReference: requestInfo.id
+            });
+        }
+        return content_1.CreateAttributeAcceptResponseItem.from({
             result: content_1.ResponseItemResult.Accepted,
-            attributeId: peerLocalAttribute.id
+            attributeId: sharedAttribute.id
         });
     }
     async applyIncomingResponseItem(responseItem, requestItem, requestInfo) {
-        if (!(responseItem instanceof content_1.CreateRelationshipAttributeAcceptResponseItem)) {
+        if (!(responseItem instanceof content_1.CreateAttributeAcceptResponseItem)) {
             return;
         }
         if (requestItem.attribute.owner.toString() === "") {
-            requestItem.attribute.owner = this.currentIdentityAddress;
+            requestItem.attribute.owner = requestInfo.peer;
         }
         await this.consumptionController.attributes.createPeerLocalAttribute({
             id: responseItem.attributeId,
@@ -2540,8 +2624,8 @@ class CreateRelationshipAttributeRequestItemProcessor extends GenericRequestItem
         });
     }
 }
-exports.CreateRelationshipAttributeRequestItemProcessor = CreateRelationshipAttributeRequestItemProcessor;
-//# sourceMappingURL=CreateRelationshipAttributeRequestItemProcessor.js.map
+exports.CreateAttributeRequestItemProcessor = CreateAttributeRequestItemProcessor;
+//# sourceMappingURL=CreateAttributeRequestItemProcessor.js.map
 
 /***/ }),
 
@@ -2994,14 +3078,14 @@ const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const consumption_1 = __webpack_require__(/*! ../../../../consumption */ "./dist/consumption/index.js");
 const ValidationResult_1 = __webpack_require__(/*! ../ValidationResult */ "./dist/modules/requests/itemProcessors/ValidationResult.js");
 function validateQuery(query, sender, recipient) {
-    if (query instanceof content_1.RelationshipAttributeQuery) {
-        if (query.thirdParty?.equals(sender)) {
+    if (query instanceof content_1.ThirdPartyRelationshipAttributeQuery) {
+        if (query.thirdParty.equals(sender)) {
             return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("Cannot query an Attribute with the own address as third party."));
         }
-        if (query.thirdParty?.equals(recipient)) {
+        if (query.thirdParty.equals(recipient)) {
             return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("Cannot query an Attribute with the recipient's address as third party."));
         }
-        if (query.owner.equals(sender) && query.thirdParty !== undefined) {
+        if (query.owner.equals(sender)) {
             return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("Cannot query own Attributes from a third party."));
         }
     }
@@ -3799,7 +3883,7 @@ class SettingsController extends consumption_1.ConsumptionBaseController {
     }
     async getSettings(query) {
         const items = await this.settings.find(query);
-        return await this.parseArray(items, Setting_1.Setting);
+        return this.parseArray(items, Setting_1.Setting);
     }
     async createSetting(parameters) {
         const setting = Setting_1.Setting.from({
@@ -9027,7 +9111,8 @@ function clone$1(dur, alts, clear = false) {
       ...(alts.values || {})
     },
     loc: dur.loc.clone(alts.loc),
-    conversionAccuracy: alts.conversionAccuracy || dur.conversionAccuracy
+    conversionAccuracy: alts.conversionAccuracy || dur.conversionAccuracy,
+    matrix: alts.matrix || dur.matrix
   };
   return new Duration(conf);
 }
@@ -9066,7 +9151,7 @@ function normalizeValues(matrix, vals) {
  *
  * Here is a brief overview of commonly used methods and getters in Duration:
  *
- * * **Creation** To create a Duration, use {@link Duration#fromMillis}, {@link Duration#fromObject}, or {@link Duration#fromISO}.
+ * * **Creation** To create a Duration, use {@link Duration.fromMillis}, {@link Duration.fromObject}, or {@link Duration.fromISO}.
  * * **Unit values** See the {@link Duration#years}, {@link Duration#months}, {@link Duration#weeks}, {@link Duration#days}, {@link Duration#hours}, {@link Duration#minutes}, {@link Duration#seconds}, {@link Duration#milliseconds} accessors.
  * * **Configuration** See  {@link Duration#locale} and {@link Duration#numberingSystem} accessors.
  * * **Transformation** To create new Durations out of old ones use {@link Duration#plus}, {@link Duration#minus}, {@link Duration#normalize}, {@link Duration#set}, {@link Duration#reconfigure}, {@link Duration#shiftTo}, and {@link Duration#negate}.
@@ -9082,10 +9167,16 @@ class Duration {
    */
   constructor(config) {
     const accurate = config.conversionAccuracy === "longterm" || false;
+    let matrix = accurate ? accurateMatrix : casualMatrix;
+
+    if (config.matrix) {
+      matrix = config.matrix;
+    }
     /**
      * @access private
      */
 
+
     this.values = config.values;
     /**
      * @access private
@@ -9106,7 +9197,7 @@ class Duration {
      * @access private
      */
 
-    this.matrix = accurate ? accurateMatrix : casualMatrix;
+    this.matrix = matrix;
     /**
      * @access private
      */
@@ -9145,7 +9236,8 @@ class Duration {
    * @param {Object} [opts=[]] - options for creating this Duration
    * @param {string} [opts.locale='en-US'] - the locale to use
    * @param {string} opts.numberingSystem - the numbering system to use
-   * @param {string} [opts.conversionAccuracy='casual'] - the conversion system to use
+   * @param {string} [opts.conversionAccuracy='casual'] - the preset conversion system to use
+   * @param {string} [opts.matrix=Object] - the custom conversion system to use
    * @return {Duration}
    */
 
@@ -9158,7 +9250,8 @@ class Duration {
     return new Duration({
       values: normalizeObject(obj, Duration.normalizeUnit),
       loc: Locale.fromObject(opts),
-      conversionAccuracy: opts.conversionAccuracy
+      conversionAccuracy: opts.conversionAccuracy,
+      matrix: opts.matrix
     });
   }
   /**
@@ -9190,7 +9283,8 @@ class Duration {
    * @param {Object} opts - options for parsing
    * @param {string} [opts.locale='en-US'] - the locale to use
    * @param {string} opts.numberingSystem - the numbering system to use
-   * @param {string} [opts.conversionAccuracy='casual'] - the conversion system to use
+   * @param {string} [opts.conversionAccuracy='casual'] - the preset conversion system to use
+   * @param {string} [opts.matrix=Object] - the preset conversion system to use
    * @see https://en.wikipedia.org/wiki/ISO_8601#Durations
    * @example Duration.fromISO('P3Y6M1W4DT12H30M5S').toObject() //=> { years: 3, months: 6, weeks: 1, days: 4, hours: 12, minutes: 30, seconds: 5 }
    * @example Duration.fromISO('PT23H').toObject() //=> { hours: 23 }
@@ -9214,7 +9308,8 @@ class Duration {
    * @param {Object} opts - options for parsing
    * @param {string} [opts.locale='en-US'] - the locale to use
    * @param {string} opts.numberingSystem - the numbering system to use
-   * @param {string} [opts.conversionAccuracy='casual'] - the conversion system to use
+   * @param {string} [opts.conversionAccuracy='casual'] - the preset conversion system to use
+   * @param {string} [opts.matrix=Object] - the conversion system to use
    * @see https://en.wikipedia.org/wiki/ISO_8601#Times
    * @example Duration.fromISOTime('11:22:33.444').toObject() //=> { hours: 11, minutes: 22, seconds: 33, milliseconds: 444 }
    * @example Duration.fromISOTime('11:00').toObject() //=> { hours: 11, minutes: 0, seconds: 0 }
@@ -9545,7 +9640,7 @@ class Duration {
    * Scale this Duration by the specified amount. Return a newly-constructed Duration.
    * @param {function} fn - The function to apply to each unit. Arity is 1 or 2: the value of the unit and, optionally, the unit name. Must return a number.
    * @example Duration.fromObject({ hours: 1, minutes: 30 }).mapUnits(x => x * 2) //=> { hours: 2, minutes: 60 }
-   * @example Duration.fromObject({ hours: 1, minutes: 30 }).mapUnits((x, u) => u === "hour" ? x * 2 : x) //=> { hours: 2, minutes: 30 }
+   * @example Duration.fromObject({ hours: 1, minutes: 30 }).mapUnits((x, u) => u === "hours" ? x * 2 : x) //=> { hours: 2, minutes: 30 }
    * @return {Duration}
    */
 
@@ -9603,20 +9698,18 @@ class Duration {
   reconfigure({
     locale,
     numberingSystem,
-    conversionAccuracy
+    conversionAccuracy,
+    matrix
   } = {}) {
     const loc = this.loc.clone({
       locale,
       numberingSystem
-    }),
-          opts = {
-      loc
+    });
+    const opts = {
+      loc,
+      matrix,
+      conversionAccuracy
     };
-
-    if (conversionAccuracy) {
-      opts.conversionAccuracy = conversionAccuracy;
-    }
-
     return clone$1(this, opts);
   }
   /**
@@ -9890,10 +9983,10 @@ function validateStartEnd(start, end) {
  *
  * Here is a brief overview of the most commonly used methods and getters in Interval:
  *
- * * **Creation** To create an Interval, use {@link Interval#fromDateTimes}, {@link Interval#after}, {@link Interval#before}, or {@link Interval#fromISO}.
+ * * **Creation** To create an Interval, use {@link Interval.fromDateTimes}, {@link Interval.after}, {@link Interval.before}, or {@link Interval.fromISO}.
  * * **Accessors** Use {@link Interval#start} and {@link Interval#end} to get the start and end.
  * * **Interrogation** To analyze the Interval, use {@link Interval#count}, {@link Interval#length}, {@link Interval#hasSame}, {@link Interval#contains}, {@link Interval#isAfter}, or {@link Interval#isBefore}.
- * * **Transformation** To create other Intervals out of this one, use {@link Interval#set}, {@link Interval#splitAt}, {@link Interval#splitBy}, {@link Interval#divideEqually}, {@link Interval#merge}, {@link Interval#xor}, {@link Interval#union}, {@link Interval#intersection}, or {@link Interval#difference}.
+ * * **Transformation** To create other Intervals out of this one, use {@link Interval#set}, {@link Interval#splitAt}, {@link Interval#splitBy}, {@link Interval#divideEqually}, {@link Interval.merge}, {@link Interval.xor}, {@link Interval#union}, {@link Interval#intersection}, or {@link Interval#difference}.
  * * **Comparison** To compare this Interval to another one, use {@link Interval#equals}, {@link Interval#overlaps}, {@link Interval#abutsStart}, {@link Interval#abutsEnd}, {@link Interval#engulfs}
  * * **Output** To convert the Interval into other representations, see {@link Interval#toString}, {@link Interval#toISO}, {@link Interval#toISODate}, {@link Interval#toISOTime}, {@link Interval#toFormat}, and {@link Interval#toDuration}.
  */
@@ -11334,7 +11427,6 @@ function expandMacroTokens(tokens, locale) {
  * @private
  */
 
-
 function explainFromTokens(locale, input, format) {
   const tokens = expandMacroTokens(Formatter.parseFormat(format), locale),
         units = tokens.map(t => unitForToken(t, locale)),
@@ -11930,7 +12022,7 @@ function lastOpts(argList) {
  *
  * Here is a brief overview of the most commonly used functionality it provides:
  *
- * * **Creation**: To create a DateTime from its components, use one of its factory class methods: {@link DateTime#local}, {@link DateTime#utc}, and (most flexibly) {@link DateTime#fromObject}. To create one from a standard string format, use {@link DateTime#fromISO}, {@link DateTime#fromHTTP}, and {@link DateTime#fromRFC2822}. To create one from a custom string format, use {@link DateTime#fromFormat}. To create one from a native JS date, use {@link DateTime#fromJSDate}.
+ * * **Creation**: To create a DateTime from its components, use one of its factory class methods: {@link DateTime.local}, {@link DateTime.utc}, and (most flexibly) {@link DateTime.fromObject}. To create one from a standard string format, use {@link DateTime.fromISO}, {@link DateTime.fromHTTP}, and {@link DateTime.fromRFC2822}. To create one from a custom string format, use {@link DateTime.fromFormat}. To create one from a native JS date, use {@link DateTime.fromJSDate}.
  * * **Gregorian calendar and time**: To examine the Gregorian properties of a DateTime individually (i.e as opposed to collectively through {@link DateTime#toObject}), use the {@link DateTime#year}, {@link DateTime#month},
  * {@link DateTime#day}, {@link DateTime#hour}, {@link DateTime#minute}, {@link DateTime#second}, {@link DateTime#millisecond} accessors.
  * * **Week calendar**: For ISO week calendar attributes, see the {@link DateTime#weekYear}, {@link DateTime#weekNumber}, and {@link DateTime#weekday} accessors.
@@ -12469,6 +12561,19 @@ class DateTime {
   static parseFormatForOpts(formatOpts, localeOpts = {}) {
     const tokenList = formatOptsToTokens(formatOpts, Locale.fromObject(localeOpts));
     return !tokenList ? null : tokenList.map(t => t ? t.val : null).join("");
+  }
+  /**
+   * Produce the the fully expanded format token for the locale
+   * Does NOT quote characters, so quoted tokens will not round trip correctly
+   * @param fmt
+   * @param localeOpts
+   * @returns {string}
+   */
+
+
+  static expandFormat(fmt, localeOpts = {}) {
+    const expanded = expandMacroTokens(Formatter.parseFormat(fmt), Locale.fromObject(localeOpts));
+    return expanded.map(t => t.val).join("");
   } // INFO
 
   /**
@@ -13161,8 +13266,8 @@ class DateTime {
    * @param {Object} opts - opts to override the configuration options on this DateTime
    * @example DateTime.now().toLocaleString(); //=> 4/20/2017
    * @example DateTime.now().setLocale('en-gb').toLocaleString(); //=> '20/04/2017'
-   * @example DateTime.now().toLocaleString({ locale: 'en-gb' }); //=> '20/04/2017'
    * @example DateTime.now().toLocaleString(DateTime.DATE_FULL); //=> 'April 20, 2017'
+   * @example DateTime.now().toLocaleString(DateTime.DATE_FULL, { locale: 'fr' }); //=> '28 août 2022'
    * @example DateTime.now().toLocaleString(DateTime.TIME_SIMPLE); //=> '11:32 AM'
    * @example DateTime.now().toLocaleString(DateTime.DATETIME_SHORT); //=> '4/20/2017, 11:32 AM'
    * @example DateTime.now().toLocaleString({ weekday: 'long', month: 'long', day: '2-digit' }); //=> 'Thursday, April 20'
@@ -13199,7 +13304,7 @@ class DateTime {
    * @param {boolean} [opts.suppressMilliseconds=false] - exclude milliseconds from the format if they're 0
    * @param {boolean} [opts.suppressSeconds=false] - exclude seconds from the format if they're 0
    * @param {boolean} [opts.includeOffset=true] - include the offset, such as 'Z' or '-04:00'
-   * @param {boolean} [opts.extendedZone=true] - add the time zone format extension
+   * @param {boolean} [opts.extendedZone=false] - add the time zone format extension
    * @param {string} [opts.format='extended'] - choose between the basic and extended format
    * @example DateTime.utc(1983, 5, 25).toISO() //=> '1982-05-25T00:00:00.000Z'
    * @example DateTime.now().toISO() //=> '2017-04-22T20:47:05.335-04:00'
@@ -13904,7 +14009,7 @@ function friendlyDateTime(dateTimeish) {
   }
 }
 
-const VERSION = "3.0.1";
+const VERSION = "3.0.3";
 
 exports.DateTime = DateTime;
 exports.Duration = Duration;