@nmshd/runtime 2.0.0-beta.20 → 2.0.0-beta.21

package/lib-web/nmshd.runtime.js

@@ -448,11 +448,11 @@ 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.20",
-    build: "106",
-    date: "2022-08-25T08:33:05+00:00",
-    commit: "9d3977f9788c489ac4a353b0fc4c183a35b8a365",
-    dependencies: {"@js-soft/docdb-querytranslator":"1.1.0","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"2.0.4","@js-soft/ts-utils":"^2.2.2","@nmshd/consumption":"2.0.0-beta.10","@nmshd/content":"2.0.0-beta.13","@nmshd/crypto":"2.0.1","@nmshd/transport":"2.0.0-beta.4","ajv":"^8.11.0","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","json-stringify-safe":"^5.0.1","luxon":"^3.0.1","qrcode":"1.5.1","reflect-metadata":"0.1.13","ts-simple-nameof":"1.3.1","typescript-ioc":"3.2.2"},
+    version: "2.0.0-beta.21",
+    build: "107",
+    date: "2022-09-05T12:27:48+00:00",
+    commit: "085c7c588c9938e918820540abd82c9fec4170b3",
+    dependencies: {"@js-soft/docdb-querytranslator":"1.1.0","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"2.0.4","@js-soft/ts-utils":"^2.2.2","@nmshd/consumption":"2.0.0-beta.11","@nmshd/content":"2.0.0-beta.13","@nmshd/crypto":"2.0.1","@nmshd/transport":"2.0.0-beta.4","ajv":"^8.11.0","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","json-stringify-safe":"^5.0.1","luxon":"^3.0.3","qrcode":"1.5.1","reflect-metadata":"0.1.13","ts-simple-nameof":"1.3.1","typescript-ioc":"3.2.2"},
     libraries: {
         serval: ts_serval_1.buildInformation,
         consumption: consumption_1.buildInformation,
@@ -710,7 +710,11 @@ let DataViewExpander = class DataViewExpander {
     async expandRelationshipTemplateDTO(template) {
         let onNewRelationship;
         let onExistingRelationship;
-        let name = "i18n://dvo.template.name";
+        const createdBy = await this.expandAddress(template.createdBy);
+        const type = template.isOwn ? "RelationshipTemplateDVO" : "PeerRelationshipTemplateDVO";
+        let name = template.isOwn ? "i18n://dvo.template.outgoing.name" : "i18n://dvo.template.incoming.name";
+        const description = template.isOwn ? "i18n://dvo.template.outgoing.description" : "i18n://dvo.template.incoming.description";
+        let expandedLocalRequest;
         if (template.content["@type"] === "RelationshipTemplateBody") {
             const templateBody = content_1.RelationshipTemplateBody.from(template.content).toJSON();
             if (templateBody.title) {
@@ -718,20 +722,28 @@ let DataViewExpander = class DataViewExpander {
             }
             let localRequest;
             if (!template.isOwn) {
-                const onNewRelationshipRequest = await this.consumption.incomingRequests.getRequests({
+                const incomingRequestResult = await this.consumption.incomingRequests.getRequests({
                     query: {
-                        "source.reference": template.id
+                        "source.reference": template.id,
+                        status: consumption_1.LocalRequestStatus.ManualDecisionRequired
                     }
                 });
-                localRequest = onNewRelationshipRequest.value[0];
-                return {
-                    name,
-                    type: "PeerRelationshipTemplateDVO",
-                    date: template.createdAt,
-                    ...template,
-                    createdBy: await this.expandAddress(template.createdBy),
-                    onNewRelationship: await this.expandLocalRequestDTO(localRequest)
-                };
+                if (incomingRequestResult.value.length > 0) {
+                    localRequest = incomingRequestResult.value[0];
+                    expandedLocalRequest = await this.expandLocalRequestDTO(localRequest);
+                }
+                else {
+                    const completedRequestResult = await this.consumption.incomingRequests.getRequests({
+                        query: {
+                            "source.reference": template.id,
+                            status: [consumption_1.LocalRequestStatus.Decided, consumption_1.LocalRequestStatus.Completed]
+                        }
+                    });
+                    if (completedRequestResult.value.length > 0) {
+                        localRequest = completedRequestResult.value[0];
+                        expandedLocalRequest = await this.expandLocalRequestDTO(localRequest);
+                    }
+                }
             }
             onNewRelationship = await this.expandRequest(templateBody.onNewRelationship);
             if (templateBody.onExistingRelationship) {
@@ -740,10 +752,12 @@ let DataViewExpander = class DataViewExpander {
         }
         return {
             name,
-            type: "RelationshipTemplateDVO",
+            description,
+            type,
             date: template.createdAt,
             ...template,
-            createdBy: await this.expandAddress(template.createdBy),
+            createdBy,
+            request: expandedLocalRequest,
             onNewRelationship,
             onExistingRelationship
         };
@@ -983,10 +997,12 @@ let DataViewExpander = class DataViewExpander {
         }
         const directionLabel = request.isOwn ? "outgoing" : "incoming";
         const statusText = `i18n://dvo.localRequest.status.${request.status}`;
+        const response = request.response ? await this.expandLocalResponseDTO(request.response, request) : undefined;
         // TODO: Wait for request.title from content and use it
+        const requestIdOutOfResponse = request.response ? request.response.content.requestId : "";
         return {
             ...request,
-            id: request.id,
+            id: request.id ? request.id : requestIdOutOfResponse,
             content: requestDVO,
             items: requestDVO.items,
             name: `i18n://dvo.localRequest.${directionLabel}.name`,
@@ -996,7 +1012,7 @@ let DataViewExpander = class DataViewExpander {
             createdBy: request.isOwn ? this.expandSelf() : peerDVO,
             decider: request.isOwn ? peerDVO : this.expandSelf(),
             peer: peerDVO,
-            response: request.response ? await this.expandLocalResponseDTO(request.response, request) : undefined,
+            response,
             statusText: statusText,
             isDecidable
         };
@@ -1403,7 +1419,8 @@ let DataViewExpander = class DataViewExpander {
             items: expandedAttributes,
             nameMap: stringByType,
             changes: changes,
-            changeCount: changes.length
+            changeCount: changes.length,
+            templateId: relationship.template.id
         };
     }
     async expandRelationshipDTO(relationship) {
@@ -5524,7 +5541,7 @@ const ajv_formats_1 = __importDefault(__webpack_require__(/*! ajv-formats */ "./
 class SchemaRepository {
     constructor() {
         this.jsonSchemas = new Map();
-        this.compiler = new ajv_1.default({ allErrors: true });
+        this.compiler = new ajv_1.default({ allErrors: true, allowUnionTypes: true });
         (0, ajv_formats_1.default)(this.compiler);
         (0, ajv_errors_1.default)(this.compiler);
     }
@@ -35765,7 +35782,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);
 }
@@ -35804,7 +35822,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}.
@@ -35820,10 +35838,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
@@ -35844,7 +35868,7 @@ class Duration {
      * @access private
      */
 
-    this.matrix = accurate ? accurateMatrix : casualMatrix;
+    this.matrix = matrix;
     /**
      * @access private
      */
@@ -35883,7 +35907,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}
    */
 
@@ -35896,7 +35921,8 @@ class Duration {
     return new Duration({
       values: normalizeObject(obj, Duration.normalizeUnit),
       loc: Locale.fromObject(opts),
-      conversionAccuracy: opts.conversionAccuracy
+      conversionAccuracy: opts.conversionAccuracy,
+      matrix: opts.matrix
     });
   }
   /**
@@ -35928,7 +35954,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 }
@@ -35952,7 +35979,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 }
@@ -36283,7 +36311,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}
    */
 
@@ -36341,20 +36369,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);
   }
   /**
@@ -36628,10 +36654,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}.
  */
@@ -38072,7 +38098,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)),
@@ -38668,7 +38693,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.
@@ -39207,6 +39232,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
 
   /**
@@ -39899,8 +39937,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'
@@ -39937,7 +39975,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'
@@ -40642,7 +40680,7 @@ function friendlyDateTime(dateTimeish) {
   }
 }
 
-const VERSION = "3.0.1";
+const VERSION = "3.0.3";
 
 exports.DateTime = DateTime;
 exports.Duration = Duration;