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

package/dist/buildInformation.js

@@ -6,10 +6,10 @@ const content_1 = require("@nmshd/content");
 const crypto_1 = require("@nmshd/crypto");
 const transport_1 = require("@nmshd/transport");
 exports.buildInformation = {
-    version: "2.0.0-beta.14",
-    build: "65",
-    date: "2022-09-08T16:46:17+00:00",
-    commit: "5e08a83edb35bff3255290783a568dc0123b7394",
+    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,

package/dist/consumption/ConsumptionBaseController.d.ts

@@ -9,5 +9,5 @@ export declare class ConsumptionBaseController {
     get parent(): ConsumptionController;
     constructor(controllerName: ConsumptionControllerName, _parent: ConsumptionController);
     init(): Promise<this>;
-    protected parseArray<T extends CoreSerializable | CoreSerializable>(values: Object[], type: new () => T): T[];
+    protected parseArray<T extends CoreSerializable>(values: Object[], type: new () => T): T[];
 }

package/dist/consumption/ConsumptionBaseController.js

@@ -17,7 +17,7 @@ class ConsumptionBaseController {
         return Promise.resolve(this);
     }
     parseArray(values, type) {
-        return values.map((v) => type.from(v));
+        return values.map((v) => type.fromAny(v));
     }
 }
 exports.ConsumptionBaseController = ConsumptionBaseController;

package/dist/consumption/ConsumptionBaseController.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConsumptionBaseController.js","sourceRoot":"","sources":["../../src/consumption/ConsumptionBaseController.ts"],"names":[],"mappings":";;;AACA,gDAA2E;AAI3E,MAAa,yBAAyB;IAUlC,YAAmB,cAAyC,EAAY,OAA8B;QAA9B,YAAO,GAAP,OAAO,CAAuB;QAClG,IAAI,CAAC,IAAI,GAAG,kCAAsB,CAAC,SAAS,CAAC,cAAc,CAAC,CAAA;IAChE,CAAC;IAVD,IAAW,GAAG;QACV,OAAO,IAAI,CAAC,IAAI,CAAA;IACpB,CAAC;IAED,IAAW,MAAM;QACb,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAMM,IAAI;QACP,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IAChC,CAAC;IAES,UAAU,CAAgD,MAAgB,EAAE,IAAiB;QACnG,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAE,IAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;IACnD,CAAC;CACJ;AArBD,8DAqBC"}
+{"version":3,"file":"ConsumptionBaseController.js","sourceRoot":"","sources":["../../src/consumption/ConsumptionBaseController.ts"],"names":[],"mappings":";;;AACA,gDAA2E;AAI3E,MAAa,yBAAyB;IAUlC,YAAmB,cAAyC,EAAY,OAA8B;QAA9B,YAAO,GAAP,OAAO,CAAuB;QAClG,IAAI,CAAC,IAAI,GAAG,kCAAsB,CAAC,SAAS,CAAC,cAAc,CAAC,CAAA;IAChE,CAAC;IAVD,IAAW,GAAG;QACV,OAAO,IAAI,CAAC,IAAI,CAAA;IACpB,CAAC;IAED,IAAW,MAAM;QACb,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAMM,IAAI;QACP,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IAChC,CAAC;IAES,UAAU,CAA6B,MAAgB,EAAE,IAAiB;QAChF,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAE,IAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;IACtD,CAAC;CACJ;AArBD,8DAqBC"}

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.14",
-    build: "65",
-    date: "2022-09-08T16:46:17+00:00",
-    commit: "5e08a83edb35bff3255290783a568dc0123b7394",
+    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,
@@ -59,7 +59,7 @@ class ConsumptionBaseController {
         return Promise.resolve(this);
     }
     parseArray(values, type) {
-        return values.map((v) => type.from(v));
+        return values.map((v) => type.fromAny(v));
     }
 }
 exports.ConsumptionBaseController = ConsumptionBaseController;
@@ -9111,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);
 }
@@ -9150,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}.
@@ -9166,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
@@ -9190,7 +9197,7 @@ class Duration {
      * @access private
      */
 
-    this.matrix = accurate ? accurateMatrix : casualMatrix;
+    this.matrix = matrix;
     /**
      * @access private
      */
@@ -9229,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}
    */
 
@@ -9242,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
     });
   }
   /**
@@ -9274,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 }
@@ -9298,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 }
@@ -9629,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}
    */
 
@@ -9687,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);
   }
   /**
@@ -9974,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}.
  */
@@ -11418,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)),
@@ -12014,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.
@@ -12553,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
 
   /**
@@ -13245,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'
@@ -13283,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'
@@ -13988,7 +14009,7 @@ function friendlyDateTime(dateTimeish) {
   }
 }
 
-const VERSION = "3.0.1";
+const VERSION = "3.0.3";
 
 exports.DateTime = DateTime;
 exports.Duration = Duration;