@nmshd/runtime 1.3.5 → 1.4.2

package/lib-web/nmshd.runtime.js

@@ -2,6 +2,98 @@ var NMSHDRuntime;
 /******/ (() => { // webpackBootstrap
 /******/ 	var __webpack_modules__ = ({
 
+/***/ "./dist/DatabaseSchemaUpgrader.js":
+/*!****************************************!*\
+  !*** ./dist/DatabaseSchemaUpgrader.js ***!
+  \****************************************/
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var RuntimeDatabaseSchemaMetadata_1;
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.DatabaseSchemaUpgrader = void 0;
+const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
+let RuntimeDatabaseSchemaMetadata = RuntimeDatabaseSchemaMetadata_1 = class RuntimeDatabaseSchemaMetadata extends ts_serval_1.Serializable {
+    static from(value) {
+        if (!value.id)
+            value.id = RuntimeDatabaseSchemaMetadata_1.DATABASE_SCHEMA_ID;
+        return super.fromT(value, RuntimeDatabaseSchemaMetadata_1);
+    }
+};
+RuntimeDatabaseSchemaMetadata.DATABASE_SCHEMA_ID = "databaseSchema";
+__decorate([
+    (0, ts_serval_1.serialize)(),
+    (0, ts_serval_1.validate)({ customValidator: (value) => (value === RuntimeDatabaseSchemaMetadata_1.DATABASE_SCHEMA_ID ? undefined : "Invalid database schema id") }),
+    __metadata("design:type", String)
+], RuntimeDatabaseSchemaMetadata.prototype, "id", void 0);
+__decorate([
+    (0, ts_serval_1.serialize)(),
+    (0, ts_serval_1.validate)({ min: 0 }),
+    __metadata("design:type", Number)
+], RuntimeDatabaseSchemaMetadata.prototype, "version", void 0);
+RuntimeDatabaseSchemaMetadata = RuntimeDatabaseSchemaMetadata_1 = __decorate([
+    (0, ts_serval_1.type)("RuntimeDatabaseSchemaMetadata")
+], RuntimeDatabaseSchemaMetadata);
+class DatabaseSchemaUpgrader {
+    constructor(accountController, consumptionController) {
+        this.accountController = accountController;
+        this.consumptionController = consumptionController;
+        this.CURRENT_DATABASE_SCHEMA_VERSION = 1;
+        this.DATABASE_SCHEMA_QUERY = { id: RuntimeDatabaseSchemaMetadata.DATABASE_SCHEMA_ID };
+    }
+    async upgradeSchemaVersion() {
+        let version = await this.getVersionFromDB();
+        while (version < this.CURRENT_DATABASE_SCHEMA_VERSION) {
+            version++;
+            const upgradeLogic = UPGRADE_LOGIC[version];
+            if (!upgradeLogic)
+                throw new Error(`No upgrade logic found for version '${version}'`);
+            await upgradeLogic(this.accountController, this.consumptionController);
+            await this.writeVersionToDB(version);
+        }
+    }
+    async getVersionFromDB() {
+        const metaCollection = await this.accountController.db.getCollection("meta");
+        const doc = await metaCollection.findOne(this.DATABASE_SCHEMA_QUERY);
+        // If no version is found, assume version 0
+        if (!doc)
+            return 0;
+        const metadata = RuntimeDatabaseSchemaMetadata.from(doc);
+        return metadata.version;
+    }
+    async writeVersionToDB(version) {
+        const metaCollection = await this.accountController.db.getCollection("meta");
+        const metadata = RuntimeDatabaseSchemaMetadata.from({ version });
+        const oldDoc = await metaCollection.findOne(this.DATABASE_SCHEMA_QUERY);
+        if (oldDoc) {
+            await metaCollection.update(oldDoc, metadata);
+        }
+        else {
+            await metaCollection.create(metadata);
+        }
+    }
+}
+exports.DatabaseSchemaUpgrader = DatabaseSchemaUpgrader;
+const UPGRADE_LOGIC = {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    1: () => {
+        // noop
+    }
+};
+//# sourceMappingURL=DatabaseSchemaUpgrader.js.map
+
+/***/ }),
+
 /***/ "./dist/Runtime.js":
 /*!*************************!*\
   !*** ./dist/Runtime.js ***!
@@ -16,6 +108,7 @@ const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/
 const consumption_1 = __webpack_require__(/*! @nmshd/consumption */ "@nmshd/consumption");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 const typescript_ioc_1 = __webpack_require__(/*! typescript-ioc */ "./node_modules/typescript-ioc/dist/typescript-ioc.js");
+const DatabaseSchemaUpgrader_1 = __webpack_require__(/*! ./DatabaseSchemaUpgrader */ "./dist/DatabaseSchemaUpgrader.js");
 const dataViews_1 = __webpack_require__(/*! ./dataViews */ "./dist/dataViews/index.js");
 const events_1 = __webpack_require__(/*! ./events */ "./dist/events/index.js");
 const extensibility_1 = __webpack_require__(/*! ./extensibility */ "./dist/extensibility/index.js");
@@ -47,12 +140,13 @@ class Runtime {
             throw useCases_1.RuntimeErrors.startup.noActiveExpander();
         return this._expander;
     }
-    login(accountController, consumptionController) {
+    async login(accountController, consumptionController) {
         this._accountController = accountController;
         this._transportServices = typescript_ioc_1.Container.get(extensibility_1.TransportServices);
         this._consumptionController = consumptionController;
         this._consumptionServices = typescript_ioc_1.Container.get(extensibility_1.ConsumptionServices);
         this._expander = typescript_ioc_1.Container.get(dataViews_1.DataViewExpander);
+        await new DatabaseSchemaUpgrader_1.DatabaseSchemaUpgrader(accountController, consumptionController).upgradeSchemaVersion();
         return this;
     }
     get modules() {
@@ -184,7 +278,7 @@ class Runtime {
             const moduleConfiguration = this.runtimeConfig.modules[moduleName];
             moduleConfiguration.name = moduleName;
             if (!moduleConfiguration.enabled) {
-                this.logger.info(`Skip loading module '${this.getModuleName(moduleConfiguration)}' because it is not enabled.`);
+                this.logger.debug(`Skip loading module '${this.getModuleName(moduleConfiguration)}' because it is not enabled.`);
                 continue;
             }
             if (!moduleConfiguration.location) {
@@ -329,11 +423,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: "1.3.5",
-    build: "42",
-    date: "2022-03-07T13:33:00+00:00",
-    commit: "7a1d5dd76b14400cc424e8f35eeb4a0b956e9472",
-    dependencies: {"@js-soft/docdb-querytranslator":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"1.0.2","@js-soft/ts-utils":"^1.1.1","@nmshd/consumption":"1.0.14","@nmshd/content":"1.1.5","@nmshd/crypto":"1.0.8","@nmshd/transport":"1.1.10","ajv":"^8.10.0","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","fluent-ts-validator":"3.0.3","json-stringify-safe":"^5.0.1","luxon":"^2.3.1","qrcode":"1.5.0","reflect-metadata":"0.1.13","ts-simple-nameof":"1.3.1","typescript-ioc":"3.2.2"},
+    version: "1.4.2",
+    build: "47",
+    date: "2022-05-04T09:46:44+00:00",
+    commit: "539fb85b12ae38c95b2c0d144765637028c90b07",
+    dependencies: {"@js-soft/docdb-querytranslator":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"1.1.1","@js-soft/ts-utils":"^1.1.1","@nmshd/consumption":"1.0.15","@nmshd/content":"1.1.5","@nmshd/crypto":"1.0.8","@nmshd/transport":"1.2.1","ajv":"^8.11.0","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","fluent-ts-validator":"3.0.3","json-stringify-safe":"^5.0.1","luxon":"^2.3.2","qrcode":"1.5.0","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,
@@ -2480,11 +2574,11 @@ let AccountFacade = class AccountFacade {
     async registerPushNotificationToken(request) {
         return await this.registerPushNotificationTokenUseCase.execute(request);
     }
-    async syncDatawallet() {
-        return await this.syncDatawalletUseCase.execute();
+    async syncDatawallet(request = {}) {
+        return await this.syncDatawalletUseCase.execute(request);
     }
-    async syncEverything() {
-        return await this.syncEverythingUseCase.execute();
+    async syncEverything(request = {}) {
+        return await this.syncEverythingUseCase.execute(request);
     }
     async getSyncInfo() {
         return await this.getSyncInfoUseCase.execute();
@@ -4239,8 +4333,8 @@ exports.JsonSchema = JsonSchema;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.GetDeviceOnboardingInfoRequest = exports.GetDeviceRequest = exports.DeleteDeviceRequest = exports.CreateDeviceOnboardingTokenRequest = exports.CreateDeviceRequest = exports.ValidateChallengeRequest = exports.CreateChallengeRequest = exports.CreateDeviceChallengeRequest = exports.CreateIdentityChallengeRequest = exports.CreateRelationshipChallengeRequest = exports.DownloadAttachmentRequest = exports.DownloadFileRequest = exports.RegisterPushNotificationTokenRequest = exports.UpdateSharedItemRequest = exports.GetSharedItemsSharedWithAddressRequest = exports.GetSharedItemsSharedByAddressRequest = exports.GetSharedItemsByReferenceRequest = exports.GetSharedItemsByAddressRequest = exports.GetSharedItemsRequest = exports.GetSharedItemRequest = exports.DeleteSharedItemRequest = exports.CreateSharedItemRequest = exports.UpdateSettingRequest = exports.GetSettingsRequest = exports.GetSettingRequest = exports.DeleteSettingRequest = exports.CreateSettingRequest = exports.UpdateRelationshipInfoRequest = exports.GetRelationshipInfoByRelationshipRequest = exports.GetRelationshipInfoRequest = exports.DeleteRelationshipInfoByRelationshipRequest = exports.DeleteRelationshipInfoRequest = exports.CreateRelationshipInfoRequest = exports.UpdateDraftRequest = exports.GetDraftsRequest = exports.GetDraftRequest = exports.DeleteDraftRequest = exports.CreateDraftRequest = exports.UpdateAttributeRequest = exports.SucceedAttributeRequest = exports.GetHistoryByNameRequest = exports.GetAttributesRequest = exports.GetAttributeByNameRequest = exports.GetAttributeRequest = exports.DeleteAttributeByNameRequest = exports.DeleteAttributeRequest = exports.CreateAttributeRequest = exports.GetAttributesByNamesRequest = exports.LoadPeerTokenAnonymousByTruncatedReferenceRequest = exports.LoadPeerTokenAnonymousByIdAndKeyRequest = void 0;
-exports.LoadPeerTokenRequest = exports.GetTokensRequest = exports.GetTokenRequest = exports.GetQRCodeForTokenRequest = exports.CreateOwnTokenRequest = exports.LoadPeerRelationshipTemplateRequest = exports.GetRelationshipTemplatesRequest = exports.GetRelationshipTemplateRequest = exports.CreateTokenQrCodeForOwnTemplateRequest = exports.CreateTokenForOwnTemplateRequest = exports.CreateOwnRelationshipTemplateRequest = exports.RevokeRelationshipChangeRequest = exports.RejectRelationshipChangeRequest = exports.GetRelationshipsRequest = exports.GetRelationshipByAddressRequest = exports.GetRelationshipRequest = exports.CreateRelationshipChangeRequest = exports.CreateRelationshipRequest = exports.AcceptRelationshipChangeRequest = exports.SendMessageRequest = exports.GetMessagesRequest = exports.GetMessageRequest = exports.GetAttachmentMetadataRequest = exports.CheckIdentityRequest = exports.UploadOwnFileRequest = exports.LoadPeerFileRequest = exports.LoadPeerFileViaReferenceRequest = exports.LoadPeerFileViaSecretRequest = exports.GetFilesRequest = exports.GetFileRequest = exports.CreateTokenQrCodeForFileRequest = exports.CreateTokenForFileRequest = exports.UpdateDeviceRequest = void 0;
+exports.DeleteDeviceRequest = exports.CreateDeviceOnboardingTokenRequest = exports.CreateDeviceRequest = exports.ValidateChallengeRequest = exports.CreateChallengeRequest = exports.CreateDeviceChallengeRequest = exports.CreateIdentityChallengeRequest = exports.CreateRelationshipChallengeRequest = exports.SyncEverythingRequest = exports.DownloadAttachmentRequest = exports.DownloadFileRequest = exports.SyncDatawalletRequest = exports.RegisterPushNotificationTokenRequest = exports.UpdateSharedItemRequest = exports.GetSharedItemsSharedWithAddressRequest = exports.GetSharedItemsSharedByAddressRequest = exports.GetSharedItemsByReferenceRequest = exports.GetSharedItemsByAddressRequest = exports.GetSharedItemsRequest = exports.GetSharedItemRequest = exports.DeleteSharedItemRequest = exports.CreateSharedItemRequest = exports.UpdateSettingRequest = exports.GetSettingsRequest = exports.GetSettingRequest = exports.DeleteSettingRequest = exports.CreateSettingRequest = exports.UpdateRelationshipInfoRequest = exports.GetRelationshipInfoByRelationshipRequest = exports.GetRelationshipInfoRequest = exports.DeleteRelationshipInfoByRelationshipRequest = exports.DeleteRelationshipInfoRequest = exports.CreateRelationshipInfoRequest = exports.UpdateDraftRequest = exports.GetDraftsRequest = exports.GetDraftRequest = exports.DeleteDraftRequest = exports.CreateDraftRequest = exports.UpdateAttributeRequest = exports.SucceedAttributeRequest = exports.GetHistoryByNameRequest = exports.GetAttributesRequest = exports.GetAttributeByNameRequest = exports.GetAttributeRequest = exports.DeleteAttributeByNameRequest = exports.DeleteAttributeRequest = exports.CreateAttributeRequest = exports.GetAttributesByNamesRequest = exports.LoadPeerTokenAnonymousByTruncatedReferenceRequest = exports.LoadPeerTokenAnonymousByIdAndKeyRequest = void 0;
+exports.LoadPeerTokenRequest = exports.GetTokensRequest = exports.GetTokenRequest = exports.GetQRCodeForTokenRequest = exports.CreateOwnTokenRequest = exports.LoadPeerRelationshipTemplateRequest = exports.GetRelationshipTemplatesRequest = exports.GetRelationshipTemplateRequest = exports.CreateTokenQrCodeForOwnTemplateRequest = exports.CreateTokenForOwnTemplateRequest = exports.CreateOwnRelationshipTemplateRequest = exports.RevokeRelationshipChangeRequest = exports.RejectRelationshipChangeRequest = exports.GetRelationshipsRequest = exports.GetRelationshipByAddressRequest = exports.GetRelationshipRequest = exports.CreateRelationshipChangeRequest = exports.CreateRelationshipRequest = exports.AcceptRelationshipChangeRequest = exports.SendMessageRequest = exports.GetMessagesRequest = exports.GetMessageRequest = exports.GetAttachmentMetadataRequest = exports.CheckIdentityRequest = exports.UploadOwnFileRequest = exports.LoadPeerFileRequest = exports.LoadPeerFileViaReferenceRequest = exports.LoadPeerFileViaSecretRequest = exports.GetFilesRequest = exports.GetFileRequest = exports.CreateTokenQrCodeForFileRequest = exports.CreateTokenForFileRequest = exports.UpdateDeviceRequest = exports.GetDeviceOnboardingInfoRequest = exports.GetDeviceRequest = void 0;
 exports.LoadPeerTokenAnonymousByIdAndKeyRequest = {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$ref": "#/definitions/LoadPeerTokenAnonymousByIdAndKeyRequest",
@@ -5252,6 +5346,16 @@ exports.RegisterPushNotificationTokenRequest = {
         }
     }
 };
+exports.SyncDatawalletRequest = {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$ref": "#/definitions/SyncDatawalletRequest",
+    "definitions": {
+        "SyncDatawalletRequest": {
+            "type": "object",
+            "additionalProperties": false
+        }
+    }
+};
 exports.DownloadFileRequest = {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$ref": "#/definitions/DownloadFileRequest",
@@ -5293,6 +5397,16 @@ exports.DownloadAttachmentRequest = {
         }
     }
 };
+exports.SyncEverythingRequest = {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$ref": "#/definitions/SyncEverythingRequest",
+    "definitions": {
+        "SyncEverythingRequest": {
+            "type": "object",
+            "additionalProperties": false
+        }
+    }
+};
 exports.CreateRelationshipChallengeRequest = {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$ref": "#/definitions/CreateRelationshipChallengeRequest",
@@ -9638,8 +9752,8 @@ let SyncDatawalletUseCase = class SyncDatawalletUseCase extends common_1.UseCase
         super();
         this.accountController = accountController;
     }
-    async executeInternal() {
-        await this.accountController.syncDatawallet(true);
+    async executeInternal(request) {
+        await this.accountController.syncDatawallet(true, request.callback);
         return ts_utils_1.Result.ok(undefined);
     }
 };
@@ -9690,11 +9804,11 @@ let SyncEverythingUseCase = class SyncEverythingUseCase extends common_1.UseCase
         this.eventBus = eventBus;
         this.logger = loggerFactory.getLogger(SyncEverythingUseCase);
     }
-    async executeInternal() {
+    async executeInternal(request) {
         if (this.currentSync) {
             return await this.currentSync;
         }
-        this.currentSync = this._executeInternal();
+        this.currentSync = this._executeInternal(request);
         try {
             return await this.currentSync;
         }
@@ -9702,8 +9816,8 @@ let SyncEverythingUseCase = class SyncEverythingUseCase extends common_1.UseCase
             this.currentSync = undefined;
         }
     }
-    async _executeInternal() {
-        const changedItems = await this.accountController.syncEverything();
+    async _executeInternal(request) {
+        const changedItems = await this.accountController.syncEverything(request.callback);
         const messageDTOs = changedItems.messages.map((m) => MessageMapper_1.MessageMapper.toMessageDTO(m));
         const relationshipDTOs = changedItems.relationships.map((r) => RelationshipMapper_1.RelationshipMapper.toRelationshipDTO(r));
         const eventTargetAddress = this.identityController.identity.address.toString();
@@ -19962,7 +20076,7 @@ const def = {
             for (let i = 0; i < oneOf.length; i++) {
                 let sch = oneOf[i];
                 if ((sch === null || sch === void 0 ? void 0 : sch.$ref) && !(0, util_1.schemaHasRulesButRef)(sch, it.self.RULES)) {
-                    sch = compile_1.resolveRef.call(it.self, it.schemaEnv, it.baseId, sch === null || sch === void 0 ? void 0 : sch.$ref);
+                    sch = compile_1.resolveRef.call(it.self, it.schemaEnv.root, it.baseId, sch === null || sch === void 0 ? void 0 : sch.$ref);
                     if (sch instanceof compile_1.SchemaEnv)
                         sch = sch.schema;
                 }
@@ -20259,7 +20373,8 @@ const def = {
         if (!$data && schema.length === 0)
             throw new Error("enum must have non-empty array");
         const useLoop = schema.length >= it.opts.loopEnum;
-        const eql = (0, util_1.useFunc)(gen, equal_1.default);
+        let eql;
+        const getEql = () => (eql !== null && eql !== void 0 ? eql : (eql = (0, util_1.useFunc)(gen, equal_1.default)));
         let valid;
         if (useLoop || $data) {
             valid = gen.let("valid");
@@ -20275,12 +20390,12 @@ const def = {
         cxt.pass(valid);
         function loopEnum() {
             gen.assign(valid, false);
-            gen.forOf("v", schemaCode, (v) => gen.if((0, codegen_1._) `${eql}(${data}, ${v})`, () => gen.assign(valid, true).break()));
+            gen.forOf("v", schemaCode, (v) => gen.if((0, codegen_1._) `${getEql()}(${data}, ${v})`, () => gen.assign(valid, true).break()));
         }
         function equalCode(vSchema, i) {
             const sch = schema[i];
             return typeof sch === "object" && sch !== null
-                ? (0, codegen_1._) `${eql}(${data}, ${vSchema}[${i}])`
+                ? (0, codegen_1._) `${getEql()}(${data}, ${vSchema}[${i}])`
                 : (0, codegen_1._) `${data} === ${sch}`;
         }
     },
@@ -20454,7 +20569,7 @@ const codegen_1 = __webpack_require__(/*! ../../compile/codegen */ "./node_modul
 const error = {
     message({ keyword, schemaCode }) {
         const comp = keyword === "maxProperties" ? "more" : "fewer";
-        return (0, codegen_1.str) `must NOT have ${comp} than ${schemaCode} items`;
+        return (0, codegen_1.str) `must NOT have ${comp} than ${schemaCode} properties`;
     },
     params: ({ schemaCode }) => (0, codegen_1._) `{limit: ${schemaCode}}`,
 };
@@ -29023,6 +29138,9 @@ var Formatter = /*#__PURE__*/function () {
         case "d":
           return "day";
 
+        case "w":
+          return "week";
+
         case "M":
           return "month";
 
@@ -29272,7 +29390,6 @@ var SystemZone = /*#__PURE__*/function (_Zone) {
   return SystemZone;
 }(Zone);
 
-RegExp("^" + ianaRegex.source + "$");
 var dtfCache = {};
 
 function makeDTF(zone) {
@@ -29285,7 +29402,8 @@ function makeDTF(zone) {
       day: "2-digit",
       hour: "2-digit",
       minute: "2-digit",
-      second: "2-digit"
+      second: "2-digit",
+      era: "short"
     });
   }
 
@@ -29296,34 +29414,38 @@ var typeToPos = {
   year: 0,
   month: 1,
   day: 2,
-  hour: 3,
-  minute: 4,
-  second: 5
+  era: 3,
+  hour: 4,
+  minute: 5,
+  second: 6
 };
 
 function hackyOffset(dtf, date) {
   var formatted = dtf.format(date).replace(/\u200E/g, ""),
-      parsed = /(\d+)\/(\d+)\/(\d+),? (\d+):(\d+):(\d+)/.exec(formatted),
+      parsed = /(\d+)\/(\d+)\/(\d+) (AD|BC),? (\d+):(\d+):(\d+)/.exec(formatted),
       fMonth = parsed[1],
       fDay = parsed[2],
       fYear = parsed[3],
-      fHour = parsed[4],
-      fMinute = parsed[5],
-      fSecond = parsed[6];
-  return [fYear, fMonth, fDay, fHour, fMinute, fSecond];
+      fadOrBc = parsed[4],
+      fHour = parsed[5],
+      fMinute = parsed[6],
+      fSecond = parsed[7];
+  return [fYear, fMonth, fDay, fadOrBc, fHour, fMinute, fSecond];
 }
 
 function partsOffset(dtf, date) {
-  var formatted = dtf.formatToParts(date),
-      filled = [];
+  var formatted = dtf.formatToParts(date);
+  var filled = [];
 
   for (var i = 0; i < formatted.length; i++) {
     var _formatted$i = formatted[i],
         type = _formatted$i.type,
-        value = _formatted$i.value,
-        pos = typeToPos[type];
+        value = _formatted$i.value;
+    var pos = typeToPos[type];
 
-    if (!isUndefined(pos)) {
+    if (type === "era") {
+      filled[pos] = value;
+    } else if (!isUndefined(pos)) {
       filled[pos] = parseInt(value, 10);
     }
   }
@@ -29366,7 +29488,7 @@ var IANAZone = /*#__PURE__*/function (_Zone) {
    * @param {string} s - The string to check validity on
    * @example IANAZone.isValidSpecifier("America/New_York") //=> true
    * @example IANAZone.isValidSpecifier("Sport~~blorp") //=> false
-   * @deprecated This method returns false some valid IANA names. Use isValidZone instead
+   * @deprecated This method returns false for some valid IANA names. Use isValidZone instead.
    * @return {boolean}
    */
   ;
@@ -29434,15 +29556,20 @@ var IANAZone = /*#__PURE__*/function (_Zone) {
   _proto.offset = function offset(ts) {
     var date = new Date(ts);
     if (isNaN(date)) return NaN;
+    var dtf = makeDTF(this.name);
 
-    var dtf = makeDTF(this.name),
-        _ref2 = dtf.formatToParts ? partsOffset(dtf, date) : hackyOffset(dtf, date),
+    var _ref2 = dtf.formatToParts ? partsOffset(dtf, date) : hackyOffset(dtf, date),
         year = _ref2[0],
         month = _ref2[1],
         day = _ref2[2],
-        hour = _ref2[3],
-        minute = _ref2[4],
-        second = _ref2[5]; // because we're using hour12 and https://bugs.chromium.org/p/chromium/issues/detail?id=1025564&can=2&q=%2224%3A00%22%20datetimeformat
+        adOrBc = _ref2[3],
+        hour = _ref2[4],
+        minute = _ref2[5],
+        second = _ref2[6];
+
+    if (adOrBc === "BC") {
+      year = -Math.abs(year) + 1;
+    } // because we're using hour12 and https://bugs.chromium.org/p/chromium/issues/detail?id=1025564&can=2&q=%2224%3A00%22%20datetimeformat
 
 
     var adjustedHour = hour === 24 ? 0 : hour;
@@ -31159,6 +31286,7 @@ var Duration = /*#__PURE__*/function () {
    * * `m` for minutes
    * * `h` for hours
    * * `d` for days
+   * * `w` for weeks
    * * `M` for months
    * * `y` for years
    * Notes:
@@ -31185,8 +31313,9 @@ var Duration = /*#__PURE__*/function () {
     return this.isValid ? Formatter.create(this.loc, fmtOpts).formatDurationFromString(this, fmt) : INVALID$2;
   }
   /**
-   * Returns a string representation of a Duration with all units included
-   * To modify its behavior use the `listStyle` and any Intl.NumberFormat option, though `unitDisplay` is especially relevant. See {@link Intl.NumberFormat}.
+   * Returns a string representation of a Duration with all units included.
+   * To modify its behavior use the `listStyle` and any Intl.NumberFormat option, though `unitDisplay` is especially relevant.
+   * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat
    * @param opts - On option object to override the formatting. Accepts the same keys as the options parameter of the native `Int.NumberFormat` constructor, as well as `listStyle`.
    * @example
    * ```js
@@ -33459,7 +33588,13 @@ function unitOutOfRange(unit, value) {
 }
 
 function dayOfWeek(year, month, day) {
-  var js = new Date(Date.UTC(year, month - 1, day)).getUTCDay();
+  var d = new Date(Date.UTC(year, month - 1, day));
+
+  if (year < 100 && year >= 0) {
+    d.setUTCFullYear(d.getUTCFullYear() - 1900);
+  }
+
+  var js = d.getUTCDay();
   return js === 0 ? 7 : js;
 }
 
@@ -33887,9 +34022,6 @@ function normalizeUnit(unit) {
 } // this is a dumbed down version of fromObject() that runs about 60% faster
 // but doesn't do any validation, makes a bunch of assumptions about what units
 // are present, and so on.
-// this is a dumbed down version of fromObject() that runs about 60% faster
-// but doesn't do any validation, makes a bunch of assumptions about what units
-// are present, and so on.
 
 
 function quickDT(obj, opts) {
@@ -34591,7 +34723,7 @@ var DateTime = /*#__PURE__*/function () {
     }
   }
   /**
-   * Check if an object is a DateTime. Works across context boundaries
+   * Check if an object is an instance of DateTime. Works across context boundaries
    * @param {object} o
    * @return {boolean}
    */
@@ -36189,7 +36321,7 @@ function friendlyDateTime(dateTimeish) {
   }
 }
 
-var VERSION = "2.3.1";
+var VERSION = "2.3.2";
 
 exports.DateTime = DateTime;
 exports.Duration = Duration;