@nmshd/runtime 2.2.0 → 2.2.2

package/lib-web/nmshd.runtime.js

@@ -466,11 +466,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.2.0",
-    build: "133",
-    date: "2022-12-05T13:59:01+00:00",
-    commit: "027cf5cd12fd1dc4afe025cf05ffdf1c7e606f46",
-    dependencies: {"@js-soft/docdb-querytranslator":"1.1.0","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"2.0.5","@js-soft/ts-utils":"^2.3.0","@nmshd/consumption":"2.3.0","@nmshd/content":"2.1.2","@nmshd/crypto":"2.0.3","@nmshd/transport":"2.0.0","ajv":"^8.11.2","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","json-stringify-safe":"^5.0.1","luxon":"^3.1.0","qrcode":"1.5.1","reflect-metadata":"0.1.13","ts-simple-nameof":"1.3.1","typescript-ioc":"3.2.2"},
+    version: "2.2.2",
+    build: "135",
+    date: "2022-12-08T13:35:57+00:00",
+    commit: "9720f8b9f9a4315610eb5389975687fdca3efd62",
+    dependencies: {"@js-soft/docdb-querytranslator":"1.1.0","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"2.0.5","@js-soft/ts-utils":"^2.3.0","@nmshd/consumption":"3.0.1","@nmshd/content":"2.1.2","@nmshd/crypto":"2.0.3","@nmshd/transport":"2.0.0","ajv":"^8.11.2","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","json-stringify-safe":"^5.0.1","luxon":"^3.1.1","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,
@@ -2480,8 +2480,12 @@ class EventProxy {
         this.subscribeToSourceEvent(consumption.OutgoingRequestCreatedEvent, (event) => {
             this.targetEventBus.publish(new consumption_1.OutgoingRequestCreatedEvent(event.eventTargetAddress, useCases_1.RequestMapper.toLocalRequestDTO(event.data)));
         });
-        this.subscribeToSourceEvent(consumption.OutgoingRequestFromRelationshipCreationChangeCreatedAndCompletedEvent, (event) => {
-            this.targetEventBus.publish(new consumption_1.OutgoingRequestFromRelationshipCreationChangeCreatedAndCompletedEvent(event.eventTargetAddress, useCases_1.RequestMapper.toLocalRequestDTO(event.data)));
+        this.subscribeToSourceEvent(consumption.OutgoingRequestCreatedAndCompletedEvent, (event) => {
+            const mappedRequest = useCases_1.RequestMapper.toLocalRequestDTO(event.data);
+            this.targetEventBus.publish(new consumption_1.OutgoingRequestCreatedAndCompletedEvent(event.eventTargetAddress, mappedRequest));
+            if (event.data.response?.source?.type === "RelationshipChange") {
+                this.targetEventBus.publish(new consumption_1.OutgoingRequestFromRelationshipCreationChangeCreatedAndCompletedEvent(event.eventTargetAddress, mappedRequest));
+            }
         });
         this.subscribeToSourceEvent(consumption.OutgoingRequestStatusChangedEvent, (event) => {
             this.targetEventBus.publish(new consumption_1.OutgoingRequestStatusChangedEvent(event.eventTargetAddress, {
@@ -2741,6 +2745,30 @@ var MessageProcessedResult;
 
 /***/ }),
 
+/***/ "./dist/events/consumption/OutgoingRequestCreatedAndCompletedEvent.js":
+/*!****************************************************************************!*\
+  !*** ./dist/events/consumption/OutgoingRequestCreatedAndCompletedEvent.js ***!
+  \****************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.OutgoingRequestCreatedAndCompletedEvent = void 0;
+const DataEvent_1 = __webpack_require__(/*! ../DataEvent */ "./dist/events/DataEvent.js");
+class OutgoingRequestCreatedAndCompletedEvent extends DataEvent_1.DataEvent {
+    constructor(eventTargetAddress, data) {
+        super(OutgoingRequestCreatedAndCompletedEvent.namespace, eventTargetAddress, data);
+        if (!data.isOwn)
+            throw new Error("Cannot create this event for an incoming Request");
+    }
+}
+exports.OutgoingRequestCreatedAndCompletedEvent = OutgoingRequestCreatedAndCompletedEvent;
+OutgoingRequestCreatedAndCompletedEvent.namespace = "consumption.outgoingRequestCreatedAndCompleted";
+//# sourceMappingURL=OutgoingRequestCreatedAndCompletedEvent.js.map
+
+/***/ }),
+
 /***/ "./dist/events/consumption/OutgoingRequestCreatedEvent.js":
 /*!****************************************************************!*\
   !*** ./dist/events/consumption/OutgoingRequestCreatedEvent.js ***!
@@ -2923,6 +2951,7 @@ __exportStar(__webpack_require__(/*! ./IncomingRequestReceivedEvent */ "./dist/e
 __exportStar(__webpack_require__(/*! ./IncomingRequestStatusChangedEvent */ "./dist/events/consumption/IncomingRequestStatusChangedEvent.js"), exports);
 __exportStar(__webpack_require__(/*! ./MailReceivedEvent */ "./dist/events/consumption/MailReceivedEvent.js"), exports);
 __exportStar(__webpack_require__(/*! ./MessageProcessedEvent */ "./dist/events/consumption/MessageProcessedEvent.js"), exports);
+__exportStar(__webpack_require__(/*! ./OutgoingRequestCreatedAndCompletedEvent */ "./dist/events/consumption/OutgoingRequestCreatedAndCompletedEvent.js"), exports);
 __exportStar(__webpack_require__(/*! ./OutgoingRequestCreatedEvent */ "./dist/events/consumption/OutgoingRequestCreatedEvent.js"), exports);
 __exportStar(__webpack_require__(/*! ./OutgoingRequestFromRelationshipCreationChangeCreatedAndCompletedEvent */ "./dist/events/consumption/OutgoingRequestFromRelationshipCreationChangeCreatedAndCompletedEvent.js"), exports);
 __exportStar(__webpack_require__(/*! ./OutgoingRequestStatusChangedEvent */ "./dist/events/consumption/OutgoingRequestStatusChangedEvent.js"), exports);
@@ -3819,11 +3848,11 @@ exports.OutgoingRequestsFacade = void 0;
 const typescript_ioc_1 = __webpack_require__(/*! typescript-ioc */ "./node_modules/typescript-ioc/dist/typescript-ioc.js");
 const useCases_1 = __webpack_require__(/*! ../../../useCases */ "./dist/useCases/index.js");
 let OutgoingRequestsFacade = class OutgoingRequestsFacade {
-    constructor(canCreateUseCase, createUseCase, sentUseCase, createAndCompleteFromRelationshipCreationChangeUseCase, completeUseCase, getRequestUseCase, getRequestsUseCase, discardRequestUseCase) {
+    constructor(canCreateUseCase, createUseCase, sentUseCase, createAndCompleteFromRelationshipTemplateResponseUseCase, completeUseCase, getRequestUseCase, getRequestsUseCase, discardRequestUseCase) {
         this.canCreateUseCase = canCreateUseCase;
         this.createUseCase = createUseCase;
         this.sentUseCase = sentUseCase;
-        this.createAndCompleteFromRelationshipCreationChangeUseCase = createAndCompleteFromRelationshipCreationChangeUseCase;
+        this.createAndCompleteFromRelationshipTemplateResponseUseCase = createAndCompleteFromRelationshipTemplateResponseUseCase;
         this.completeUseCase = completeUseCase;
         this.getRequestUseCase = getRequestUseCase;
         this.getRequestsUseCase = getRequestsUseCase;
@@ -3835,8 +3864,8 @@ let OutgoingRequestsFacade = class OutgoingRequestsFacade {
     async create(request) {
         return await this.createUseCase.execute(request);
     }
-    async createAndCompleteFromRelationshipCreationChange(request) {
-        return await this.createAndCompleteFromRelationshipCreationChangeUseCase.execute(request);
+    async createAndCompleteFromRelationshipTemplateResponse(request) {
+        return await this.createAndCompleteFromRelationshipTemplateResponseUseCase.execute(request);
     }
     async sent(request) {
         return await this.sentUseCase.execute(request);
@@ -3866,7 +3895,7 @@ OutgoingRequestsFacade = __decorate([
     __metadata("design:paramtypes", [useCases_1.CanCreateOutgoingRequestUseCase,
         useCases_1.CreateOutgoingRequestUseCase,
         useCases_1.SentOutgoingRequestUseCase,
-        useCases_1.CreateAndCompleteOutgoingRequestFromRelationshipCreationChangeUseCase,
+        useCases_1.CreateAndCompleteOutgoingRequestFromRelationshipTemplateResponseUseCase,
         useCases_1.CompleteOutgoingRequestUseCase,
         useCases_1.GetOutgoingRequestUseCase,
         useCases_1.GetOutgoingRequestsUseCase,
@@ -5088,6 +5117,7 @@ class RequestModule extends RuntimeModule_1.RuntimeModule {
                 break;
             case "Response":
                 const receivedResponse = message.content;
+                // TODO: create the Response with createAndCompleteFromRelationshipTemplateResponse in case of a Request from Template
                 const result = await services.consumptionServices.outgoingRequests.complete({ receivedResponse, messageId: message.id });
                 if (result.isError) {
                     this.logger.error(`Could not complete outgoing request for message id ${message.id} due to ${result.error}. Root error:`, result.error);
@@ -5116,9 +5146,9 @@ class RequestModule extends RuntimeModule_1.RuntimeModule {
             this.logger.error(`Could not receive request ${request.id}. Root error:`, receivedRequestResult.error);
             return false;
         }
-        const checkPrerequitesResult = await services.consumptionServices.incomingRequests.checkPrerequisites({ requestId: receivedRequestResult.value.id });
-        if (checkPrerequitesResult.isError) {
-            this.logger.error(`Could not check prerequisites for request ${request.id}. Root error:`, checkPrerequitesResult.error);
+        const checkPrerequisitesResult = await services.consumptionServices.incomingRequests.checkPrerequisites({ requestId: receivedRequestResult.value.id });
+        if (checkPrerequisitesResult.isError) {
+            this.logger.error(`Could not check prerequisites for request ${request.id}. Root error:`, checkPrerequisitesResult.error);
             return false;
         }
         return true;
@@ -5129,7 +5159,7 @@ class RequestModule extends RuntimeModule_1.RuntimeModule {
         const request = event.data.request;
         switch (request.source.type) {
             case "RelationshipTemplate":
-                await this.handleIncomingRequestDecidedForRelationship(event);
+                await this.handleIncomingRequestDecidedForRelationshipTemplate(event);
                 break;
             case "Message":
                 await this.handleIncomingRequestDecidedForMessage(event);
@@ -5138,10 +5168,20 @@ class RequestModule extends RuntimeModule_1.RuntimeModule {
                 throw new Error(`Cannot handle source.type '${request.source.type}'.`);
         }
     }
-    async handleIncomingRequestDecidedForRelationship(event) {
+    async handleIncomingRequestDecidedForRelationshipTemplate(event) {
         const request = event.data.request;
-        const templateId = request.source.reference;
         const services = await this.runtime.getServices(event.eventTargetAddress);
+        const activeRelationshipsToPeer = (await services.transportServices.relationships.getRelationships({ query: { peer: event.data.request.peer, status: types_1.RelationshipStatus.Active } })).value;
+        if (activeRelationshipsToPeer.length === 0) {
+            await this.respondToRequestViaRelationship(request, event.eventTargetAddress);
+        }
+        else {
+            await this.respondToRequestViaMessage(request, event.eventTargetAddress);
+        }
+    }
+    async respondToRequestViaRelationship(request, currentIdentity) {
+        const services = await this.runtime.getServices(currentIdentity);
+        const templateId = request.source.reference;
         if (request.response.content.result === content_1.ResponseResult.Rejected) {
             await services.consumptionServices.incomingRequests.complete({ requestId: request.id });
             return;
@@ -5162,10 +5202,9 @@ class RequestModule extends RuntimeModule_1.RuntimeModule {
             return;
         }
     }
-    async handleIncomingRequestDecidedForMessage(event) {
-        const request = event.data.request;
+    async respondToRequestViaMessage(request, currentIdentity) {
         const requestId = request.id;
-        const services = await this.runtime.getServices(event.eventTargetAddress);
+        const services = await this.runtime.getServices(currentIdentity);
         const sendMessageResult = await services.transportServices.messages.sendMessage({
             recipients: [request.peer],
             content: request.response.content
@@ -5183,6 +5222,9 @@ class RequestModule extends RuntimeModule_1.RuntimeModule {
             return;
         }
     }
+    async handleIncomingRequestDecidedForMessage(event) {
+        await this.respondToRequestViaMessage(event.data.request, event.eventTargetAddress);
+    }
     async handleRelationshipChangedEvent(event) {
         // only trigger for new relationships that were created from an own template
         const createdRelationship = event.data;
@@ -5199,7 +5241,10 @@ class RequestModule extends RuntimeModule_1.RuntimeModule {
         // do not trigger for creation changes without the correct content type
         if (relationshipCreationChange.request.content["@type"] !== "RelationshipCreationChangeRequestContent")
             return;
-        const result = await services.consumptionServices.outgoingRequests.createAndCompleteFromRelationshipCreationChange({ templateId, relationshipChangeId });
+        const result = await services.consumptionServices.outgoingRequests.createAndCompleteFromRelationshipTemplateResponse({
+            templateId,
+            responseSourceId: relationshipChangeId
+        });
         if (result.isError) {
             this.logger.error(`Could not create and complete request for templateId '${templateId}' and changeId '${relationshipChangeId}'. Root error:`, result.error);
             return;
@@ -6120,7 +6165,7 @@ exports.JsonSchema = JsonSchema;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.CreateIdentityChallengeRequest = exports.CreateRelationshipChallengeRequest = exports.SyncEverythingRequest = exports.DownloadAttachmentRequest = exports.SyncDatawalletRequest = exports.RegisterPushNotificationTokenRequest = exports.LoadItemFromTruncatedReferenceRequest = exports.DownloadFileRequest = exports.UpdateSettingRequest = exports.GetSettingsRequest = exports.GetSettingRequest = exports.DeleteSettingRequest = exports.CreateSettingRequest = exports.UpdateDraftRequest = exports.GetDraftsRequest = exports.GetDraftRequest = exports.DeleteDraftRequest = exports.CreateDraftRequest = exports.UpdateAttributeRequest = exports.SucceedAttributeRequest = exports.ShareAttributeRequest = exports.SentOutgoingRequestRequest = exports.RequireManualDecisionOfIncomingRequestRequest = exports.ReceivedIncomingRequestRequest = exports.GetOutgoingRequestsRequest = exports.GetOutgoingRequestRequest = exports.GetIncomingRequestsRequest = exports.GetIncomingRequestRequest = exports.DiscardOutgoingRequestRequest = exports.CreateOutgoingRequestRequest = exports.CreateAndCompleteOutgoingRequestFromRelationshipCreationChangeRequest = exports.CompleteOutgoingRequestRequest = exports.CompleteIncomingRequestRequest = exports.CheckPrerequisitesOfIncomingRequestRequest = exports.RejectIncomingRequestRequest = exports.CanCreateOutgoingRequestRequest = exports.AcceptIncomingRequestRequest = exports.GetSharedToPeerAttributesRequest = exports.GetPeerAttributesRequest = exports.GetAttributesRequest = exports.GetAttributeRequest = exports.ExecuteThirdPartyRelationshipAttributeQueryRequest = exports.ExecuteRelationshipAttributeQueryRequest = exports.ExecuteIdentityAttributeQueryRequest = exports.DeleteAttributeRequest = exports.CreateSharedAttributeCopyRequest = exports.CreateAttributeRequest = exports.GetAttributeListenerRequest = exports.LoadPeerTokenAnonymousByTruncatedReferenceRequest = exports.LoadPeerTokenAnonymousByIdAndKeyRequest = void 0;
+exports.CreateIdentityChallengeRequest = exports.CreateRelationshipChallengeRequest = exports.SyncEverythingRequest = exports.DownloadAttachmentRequest = exports.SyncDatawalletRequest = exports.RegisterPushNotificationTokenRequest = exports.LoadItemFromTruncatedReferenceRequest = exports.DownloadFileRequest = exports.UpdateSettingRequest = exports.GetSettingsRequest = exports.GetSettingRequest = exports.DeleteSettingRequest = exports.CreateSettingRequest = exports.UpdateDraftRequest = exports.GetDraftsRequest = exports.GetDraftRequest = exports.DeleteDraftRequest = exports.CreateDraftRequest = exports.UpdateAttributeRequest = exports.SucceedAttributeRequest = exports.ShareAttributeRequest = exports.SentOutgoingRequestRequest = exports.RequireManualDecisionOfIncomingRequestRequest = exports.ReceivedIncomingRequestRequest = exports.GetOutgoingRequestsRequest = exports.GetOutgoingRequestRequest = exports.GetIncomingRequestsRequest = exports.GetIncomingRequestRequest = exports.DiscardOutgoingRequestRequest = exports.CreateOutgoingRequestRequest = exports.CreateAndCompleteOutgoingRequestFromRelationshipTemplateResponseRequest = exports.CompleteOutgoingRequestRequest = exports.CompleteIncomingRequestRequest = exports.CheckPrerequisitesOfIncomingRequestRequest = exports.RejectIncomingRequestRequest = exports.CanCreateOutgoingRequestRequest = exports.AcceptIncomingRequestRequest = exports.GetSharedToPeerAttributesRequest = exports.GetPeerAttributesRequest = exports.GetAttributesRequest = exports.GetAttributeRequest = exports.ExecuteThirdPartyRelationshipAttributeQueryRequest = exports.ExecuteRelationshipAttributeQueryRequest = exports.ExecuteIdentityAttributeQueryRequest = exports.DeleteAttributeRequest = exports.CreateSharedAttributeCopyRequest = exports.CreateAttributeRequest = exports.GetAttributeListenerRequest = exports.LoadPeerTokenAnonymousByTruncatedReferenceRequest = exports.LoadPeerTokenAnonymousByIdAndKeyRequest = void 0;
 exports.LoadPeerTokenRequest = exports.LoadPeerTokenViaSecretRequest = exports.LoadPeerTokenViaReferenceRequest = exports.GetTokensRequest = exports.GetTokenRequest = exports.GetQRCodeForTokenRequest = exports.CreateOwnTokenRequest = exports.LoadPeerRelationshipTemplateRequest = exports.LoadPeerRelationshipTemplateViaReferenceRequest = exports.LoadPeerRelationshipTemplateViaSecretRequest = exports.GetRelationshipTemplatesRequest = exports.GetRelationshipTemplateRequest = exports.CreateTokenQrCodeForOwnTemplateRequest = exports.CreateTokenForOwnTemplateRequest = exports.CreateQrCodeForOwnTemplateRequest = exports.CreateOwnRelationshipTemplateRequest = exports.RevokeRelationshipChangeRequest = exports.RejectRelationshipChangeRequest = exports.GetRelationshipsRequest = exports.GetRelationshipByAddressRequest = exports.GetRelationshipRequest = exports.GetAttributesForRelationshipRequest = exports.CreateRelationshipRequest = exports.AcceptRelationshipChangeRequest = exports.SendMessageRequest = exports.GetMessagesRequest = exports.GetMessageRequest = exports.GetAttachmentMetadataRequest = exports.CheckIdentityRequest = exports.UploadOwnFileValidatableRequest = exports.UploadOwnFileRequest = exports.GetOrLoadFileRequest = exports.GetOrLoadFileViaReferenceRequest = exports.GetOrLoadFileViaSecretRequest = exports.GetFilesRequest = exports.GetFileRequest = exports.CreateTokenQrCodeForFileRequest = exports.CreateTokenForFileRequest = exports.CreateQrCodeForFileRequest = exports.UpdateDeviceRequest = exports.GetDeviceOnboardingInfoRequest = exports.GetDeviceRequest = exports.DeleteDeviceRequest = exports.CreateDeviceOnboardingTokenRequest = exports.CreateDeviceRequest = exports.ValidateChallengeRequest = exports.CreateChallengeRequest = exports.CreateDeviceChallengeRequest = void 0;
 exports.LoadPeerTokenAnonymousByIdAndKeyRequest = {
     "$schema": "http://json-schema.org/draft-07/schema#",
@@ -14370,23 +14415,30 @@ exports.CompleteOutgoingRequestRequest = {
         }
     }
 };
-exports.CreateAndCompleteOutgoingRequestFromRelationshipCreationChangeRequest = {
+exports.CreateAndCompleteOutgoingRequestFromRelationshipTemplateResponseRequest = {
     "$schema": "http://json-schema.org/draft-07/schema#",
-    "$ref": "#/definitions/CreateAndCompleteOutgoingRequestFromRelationshipCreationChangeRequest",
+    "$ref": "#/definitions/CreateAndCompleteOutgoingRequestFromRelationshipTemplateResponseRequest",
     "definitions": {
-        "CreateAndCompleteOutgoingRequestFromRelationshipCreationChangeRequest": {
+        "CreateAndCompleteOutgoingRequestFromRelationshipTemplateResponseRequest": {
             "type": "object",
             "properties": {
                 "templateId": {
                     "$ref": "#/definitions/RelationshipTemplateIdString"
                 },
-                "relationshipChangeId": {
-                    "$ref": "#/definitions/RelationshipChangeIdString"
+                "responseSourceId": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/RelationshipChangeIdString"
+                        },
+                        {
+                            "$ref": "#/definitions/MessageIdString"
+                        }
+                    ]
                 }
             },
             "required": [
                 "templateId",
-                "relationshipChangeId"
+                "responseSourceId"
             ],
             "additionalProperties": false
         },
@@ -14397,6 +14449,10 @@ exports.CreateAndCompleteOutgoingRequestFromRelationshipCreationChangeRequest =
         "RelationshipChangeIdString": {
             "type": "string",
             "pattern": "RCH[A-Za-z0-9]{17}"
+        },
+        "MessageIdString": {
+            "type": "string",
+            "pattern": "MSG[A-Za-z0-9]{17}"
         }
     }
 };
@@ -28380,47 +28436,55 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.CreateAndCompleteOutgoingRequestFromRelationshipCreationChangeUseCase = void 0;
+exports.CreateAndCompleteOutgoingRequestFromRelationshipTemplateResponseUseCase = void 0;
 const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
 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 common_1 = __webpack_require__(/*! ../../common */ "./dist/useCases/common/index.js");
 const RequestMapper_1 = __webpack_require__(/*! ./RequestMapper */ "./dist/useCases/consumption/requests/RequestMapper.js");
-let CreateAndCompleteOutgoingRequestFromRelationshipCreationChangeUseCase = class CreateAndCompleteOutgoingRequestFromRelationshipCreationChangeUseCase extends common_1.UseCase {
-    constructor(outgoingRequestsController, relationshipController, relationshipTemplateController) {
+let CreateAndCompleteOutgoingRequestFromRelationshipTemplateResponseUseCase = class CreateAndCompleteOutgoingRequestFromRelationshipTemplateResponseUseCase extends common_1.UseCase {
+    constructor(outgoingRequestsController, relationshipController, relationshipTemplateController, messageController) {
         super();
         this.outgoingRequestsController = outgoingRequestsController;
         this.relationshipController = relationshipController;
         this.relationshipTemplateController = relationshipTemplateController;
+        this.messageController = messageController;
     }
     async executeInternal(request) {
         const template = await this.relationshipTemplateController.getRelationshipTemplate(transport_1.CoreId.from(request.templateId));
         if (!template) {
             return ts_utils_1.Result.fail(common_1.RuntimeErrors.general.recordNotFound(transport_1.RelationshipTemplate));
         }
-        const relationships = await this.relationshipController.getRelationships({ "cache.changes.id": request.relationshipChangeId });
-        if (relationships.length === 0) {
+        const responseSource = await this.getResponseSource(request.responseSourceId);
+        if (!responseSource) {
             return ts_utils_1.Result.fail(common_1.RuntimeErrors.general.recordNotFound(transport_1.RelationshipChange));
         }
-        const relationship = relationships[0];
-        const params = {
-            template: template,
-            creationChange: relationship.cache.creationChange
-        };
-        const localRequest = await this.outgoingRequestsController.createFromRelationshipCreationChange(params);
+        const localRequest = await this.outgoingRequestsController.createFromRelationshipTemplateResponse({ template, responseSource });
         return ts_utils_1.Result.ok(RequestMapper_1.RequestMapper.toLocalRequestDTO(localRequest));
     }
+    async getResponseSource(responseSourceId) {
+        if (responseSourceId.startsWith("MSG"))
+            return await this.messageController.getMessage(transport_1.CoreId.from(responseSourceId));
+        const relationships = await this.relationshipController.getRelationships({ "cache.changes.id": responseSourceId });
+        if (relationships.length !== 0) {
+            const relationship = relationships[0];
+            return relationship.cache.creationChange;
+        }
+        return;
+    }
 };
-CreateAndCompleteOutgoingRequestFromRelationshipCreationChangeUseCase = __decorate([
+CreateAndCompleteOutgoingRequestFromRelationshipTemplateResponseUseCase = __decorate([
     __param(0, typescript_ioc_1.Inject),
     __param(1, typescript_ioc_1.Inject),
     __param(2, typescript_ioc_1.Inject),
+    __param(3, typescript_ioc_1.Inject),
     __metadata("design:paramtypes", [consumption_1.OutgoingRequestsController,
         transport_1.RelationshipsController,
-        transport_1.RelationshipTemplateController])
-], CreateAndCompleteOutgoingRequestFromRelationshipCreationChangeUseCase);
-exports.CreateAndCompleteOutgoingRequestFromRelationshipCreationChangeUseCase = CreateAndCompleteOutgoingRequestFromRelationshipCreationChangeUseCase;
+        transport_1.RelationshipTemplateController,
+        transport_1.MessageController])
+], CreateAndCompleteOutgoingRequestFromRelationshipTemplateResponseUseCase);
+exports.CreateAndCompleteOutgoingRequestFromRelationshipTemplateResponseUseCase = CreateAndCompleteOutgoingRequestFromRelationshipTemplateResponseUseCase;
 //# sourceMappingURL=CreateAndCompleteOutgoingRequestFromRelationshipCreationChange.js.map
 
 /***/ }),
@@ -32464,7 +32528,10 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.CreateOwnRelationshipTemplateUseCase = void 0;
+const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
 const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
+const consumption_1 = __webpack_require__(/*! @nmshd/consumption */ "@nmshd/consumption");
+const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 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");
@@ -32490,12 +32557,16 @@ Validator = __decorate([
     __metadata("design:paramtypes", [common_1.SchemaRepository])
 ], Validator);
 let CreateOwnRelationshipTemplateUseCase = class CreateOwnRelationshipTemplateUseCase extends common_1.UseCase {
-    constructor(templateController, accountController, validator) {
+    constructor(templateController, accountController, outgoingRequestsController, validator) {
         super(validator);
         this.templateController = templateController;
         this.accountController = accountController;
+        this.outgoingRequestsController = outgoingRequestsController;
     }
     async executeInternal(request) {
+        const validationError = await this.validateRelationshipTemplateContent(request.content);
+        if (validationError)
+            return ts_utils_1.Result.fail(validationError);
         const relationshipTemplate = await this.templateController.sendRelationshipTemplate({
             content: request.content,
             expiresAt: transport_1.CoreDate.from(request.expiresAt),
@@ -32504,13 +32575,29 @@ let CreateOwnRelationshipTemplateUseCase = class CreateOwnRelationshipTemplateUs
         await this.accountController.syncDatawallet();
         return ts_utils_1.Result.ok(RelationshipTemplateMapper_1.RelationshipTemplateMapper.toRelationshipTemplateDTO(relationshipTemplate));
     }
+    async validateRelationshipTemplateContent(content) {
+        const transformedContent = ts_serval_1.Serializable.fromUnknown(content);
+        if (!(transformedContent instanceof content_1.RelationshipTemplateContent))
+            return;
+        const validationResult = await this.outgoingRequestsController.canCreate({ content: transformedContent.onNewRelationship });
+        if (validationResult.isError())
+            return validationResult.error;
+        if (transformedContent.onExistingRelationship) {
+            const validationResult = await this.outgoingRequestsController.canCreate({ content: transformedContent.onExistingRelationship });
+            if (validationResult.isError())
+                return validationResult.error;
+        }
+        return;
+    }
 };
 CreateOwnRelationshipTemplateUseCase = __decorate([
     __param(0, typescript_ioc_1.Inject),
     __param(1, typescript_ioc_1.Inject),
     __param(2, typescript_ioc_1.Inject),
+    __param(3, typescript_ioc_1.Inject),
     __metadata("design:paramtypes", [transport_1.RelationshipTemplateController,
         transport_1.AccountController,
+        consumption_1.OutgoingRequestsController,
         Validator])
 ], CreateOwnRelationshipTemplateUseCase);
 exports.CreateOwnRelationshipTemplateUseCase = CreateOwnRelationshipTemplateUseCase;
@@ -45671,1252 +45758,876 @@ const DATETIME_HUGE_WITH_SECONDS = {
   timeZoneName: l
 };
 
-/*
-  This is just a junk drawer, containing anything used across multiple classes.
-  Because Luxon is small(ish), this should stay small and we won't worry about splitting
-  it up into, say, parsingUtil.js and basicUtil.js and so on. But they are divided up by feature area.
-*/
 /**
- * @private
+ * @interface
  */
-// TYPES
-
-function isUndefined(o) {
-  return typeof o === "undefined";
-}
-function isNumber(o) {
-  return typeof o === "number";
-}
-function isInteger(o) {
-  return typeof o === "number" && o % 1 === 0;
-}
-function isString(o) {
-  return typeof o === "string";
-}
-function isDate(o) {
-  return Object.prototype.toString.call(o) === "[object Date]";
-} // CAPABILITIES
-
-function hasRelative() {
-  try {
-    return typeof Intl !== "undefined" && !!Intl.RelativeTimeFormat;
-  } catch (e) {
-    return false;
-  }
-} // OBJECTS AND ARRAYS
 
-function maybeArray(thing) {
-  return Array.isArray(thing) ? thing : [thing];
-}
-function bestBy(arr, by, compare) {
-  if (arr.length === 0) {
-    return undefined;
+class Zone {
+  /**
+   * The type of zone
+   * @abstract
+   * @type {string}
+   */
+  get type() {
+    throw new ZoneIsAbstractError();
   }
+  /**
+   * The name of this zone.
+   * @abstract
+   * @type {string}
+   */
 
-  return arr.reduce((best, next) => {
-    const pair = [by(next), next];
 
-    if (!best) {
-      return pair;
-    } else if (compare(best[0], pair[0]) === best[0]) {
-      return best;
-    } else {
-      return pair;
-    }
-  }, null)[1];
-}
-function pick(obj, keys) {
-  return keys.reduce((a, k) => {
-    a[k] = obj[k];
-    return a;
-  }, {});
-}
-function hasOwnProperty(obj, prop) {
-  return Object.prototype.hasOwnProperty.call(obj, prop);
-} // NUMBERS AND STRINGS
+  get name() {
+    throw new ZoneIsAbstractError();
+  }
 
-function integerBetween(thing, bottom, top) {
-  return isInteger(thing) && thing >= bottom && thing <= top;
-} // x % n but takes the sign of n instead of x
+  get ianaName() {
+    return this.name;
+  }
+  /**
+   * Returns whether the offset is known to be fixed for the whole year.
+   * @abstract
+   * @type {boolean}
+   */
 
-function floorMod(x, n) {
-  return x - n * Math.floor(x / n);
-}
-function padStart(input, n = 2) {
-  const isNeg = input < 0;
-  let padded;
 
-  if (isNeg) {
-    padded = "-" + ("" + -input).padStart(n, "0");
-  } else {
-    padded = ("" + input).padStart(n, "0");
+  get isUniversal() {
+    throw new ZoneIsAbstractError();
   }
+  /**
+   * Returns the offset's common name (such as EST) at the specified timestamp
+   * @abstract
+   * @param {number} ts - Epoch milliseconds for which to get the name
+   * @param {Object} opts - Options to affect the format
+   * @param {string} opts.format - What style of offset to return. Accepts 'long' or 'short'.
+   * @param {string} opts.locale - What locale to return the offset name in.
+   * @return {string}
+   */
 
-  return padded;
-}
-function parseInteger(string) {
-  if (isUndefined(string) || string === null || string === "") {
-    return undefined;
-  } else {
-    return parseInt(string, 10);
-  }
-}
-function parseFloating(string) {
-  if (isUndefined(string) || string === null || string === "") {
-    return undefined;
-  } else {
-    return parseFloat(string);
-  }
-}
-function parseMillis(fraction) {
-  // Return undefined (instead of 0) in these cases, where fraction is not set
-  if (isUndefined(fraction) || fraction === null || fraction === "") {
-    return undefined;
-  } else {
-    const f = parseFloat("0." + fraction) * 1000;
-    return Math.floor(f);
+
+  offsetName(ts, opts) {
+    throw new ZoneIsAbstractError();
   }
-}
-function roundTo(number, digits, towardZero = false) {
-  const factor = 10 ** digits,
-        rounder = towardZero ? Math.trunc : Math.round;
-  return rounder(number * factor) / factor;
-} // DATE BASICS
+  /**
+   * Returns the offset's value as a string
+   * @abstract
+   * @param {number} ts - Epoch milliseconds for which to get the offset
+   * @param {string} format - What style of offset to return.
+   *                          Accepts 'narrow', 'short', or 'techie'. Returning '+6', '+06:00', or '+0600' respectively
+   * @return {string}
+   */
 
-function isLeapYear(year) {
-  return year % 4 === 0 && (year % 100 !== 0 || year % 400 === 0);
-}
-function daysInYear(year) {
-  return isLeapYear(year) ? 366 : 365;
-}
-function daysInMonth(year, month) {
-  const modMonth = floorMod(month - 1, 12) + 1,
-        modYear = year + (month - modMonth) / 12;
 
-  if (modMonth === 2) {
-    return isLeapYear(modYear) ? 29 : 28;
-  } else {
-    return [31, null, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][modMonth - 1];
+  formatOffset(ts, format) {
+    throw new ZoneIsAbstractError();
   }
-} // covert a calendar object to a local timestamp (epoch, but with the offset baked in)
+  /**
+   * Return the offset in minutes for this zone at the specified timestamp.
+   * @abstract
+   * @param {number} ts - Epoch milliseconds for which to compute the offset
+   * @return {number}
+   */
 
-function objToLocalTS(obj) {
-  let d = Date.UTC(obj.year, obj.month - 1, obj.day, obj.hour, obj.minute, obj.second, obj.millisecond); // for legacy reasons, years between 0 and 99 are interpreted as 19XX; revert that
 
-  if (obj.year < 100 && obj.year >= 0) {
-    d = new Date(d);
-    d.setUTCFullYear(d.getUTCFullYear() - 1900);
+  offset(ts) {
+    throw new ZoneIsAbstractError();
   }
+  /**
+   * Return whether this Zone is equal to another zone
+   * @abstract
+   * @param {Zone} otherZone - the zone to compare
+   * @return {boolean}
+   */
 
-  return +d;
-}
-function weeksInWeekYear(weekYear) {
-  const p1 = (weekYear + Math.floor(weekYear / 4) - Math.floor(weekYear / 100) + Math.floor(weekYear / 400)) % 7,
-        last = weekYear - 1,
-        p2 = (last + Math.floor(last / 4) - Math.floor(last / 100) + Math.floor(last / 400)) % 7;
-  return p1 === 4 || p2 === 3 ? 53 : 52;
-}
-function untruncateYear(year) {
-  if (year > 99) {
-    return year;
-  } else return year > 60 ? 1900 + year : 2000 + year;
-} // PARSING
-
-function parseZoneInfo(ts, offsetFormat, locale, timeZone = null) {
-  const date = new Date(ts),
-        intlOpts = {
-    hourCycle: "h23",
-    year: "numeric",
-    month: "2-digit",
-    day: "2-digit",
-    hour: "2-digit",
-    minute: "2-digit"
-  };
 
-  if (timeZone) {
-    intlOpts.timeZone = timeZone;
+  equals(otherZone) {
+    throw new ZoneIsAbstractError();
   }
+  /**
+   * Return whether this Zone is valid.
+   * @abstract
+   * @type {boolean}
+   */
 
-  const modified = {
-    timeZoneName: offsetFormat,
-    ...intlOpts
-  };
-  const parsed = new Intl.DateTimeFormat(locale, modified).formatToParts(date).find(m => m.type.toLowerCase() === "timezonename");
-  return parsed ? parsed.value : null;
-} // signedOffset('-5', '30') -> -330
-
-function signedOffset(offHourStr, offMinuteStr) {
-  let offHour = parseInt(offHourStr, 10); // don't || this because we want to preserve -0
 
-  if (Number.isNaN(offHour)) {
-    offHour = 0;
+  get isValid() {
+    throw new ZoneIsAbstractError();
   }
 
-  const offMin = parseInt(offMinuteStr, 10) || 0,
-        offMinSigned = offHour < 0 || Object.is(offHour, -0) ? -offMin : offMin;
-  return offHour * 60 + offMinSigned;
-} // COERCION
-
-function asNumber(value) {
-  const numericValue = Number(value);
-  if (typeof value === "boolean" || value === "" || Number.isNaN(numericValue)) throw new InvalidArgumentError(`Invalid unit value ${value}`);
-  return numericValue;
 }
-function normalizeObject(obj, normalizer) {
-  const normalized = {};
 
-  for (const u in obj) {
-    if (hasOwnProperty(obj, u)) {
-      const v = obj[u];
-      if (v === undefined || v === null) continue;
-      normalized[normalizer(u)] = asNumber(v);
+let singleton$1 = null;
+/**
+ * Represents the local zone for this JavaScript environment.
+ * @implements {Zone}
+ */
+
+class SystemZone extends Zone {
+  /**
+   * Get a singleton instance of the local zone
+   * @return {SystemZone}
+   */
+  static get instance() {
+    if (singleton$1 === null) {
+      singleton$1 = new SystemZone();
     }
-  }
 
-  return normalized;
-}
-function formatOffset(offset, format) {
-  const hours = Math.trunc(Math.abs(offset / 60)),
-        minutes = Math.trunc(Math.abs(offset % 60)),
-        sign = offset >= 0 ? "+" : "-";
+    return singleton$1;
+  }
+  /** @override **/
 
-  switch (format) {
-    case "short":
-      return `${sign}${padStart(hours, 2)}:${padStart(minutes, 2)}`;
 
-    case "narrow":
-      return `${sign}${hours}${minutes > 0 ? `:${minutes}` : ""}`;
+  get type() {
+    return "system";
+  }
+  /** @override **/
 
-    case "techie":
-      return `${sign}${padStart(hours, 2)}${padStart(minutes, 2)}`;
 
-    default:
-      throw new RangeError(`Value format ${format} is out of range for property format`);
+  get name() {
+    return new Intl.DateTimeFormat().resolvedOptions().timeZone;
   }
-}
-function timeObject(obj) {
-  return pick(obj, ["hour", "minute", "second", "millisecond"]);
-}
-const ianaRegex = /[A-Za-z_+-]{1,256}(?::?\/[A-Za-z0-9_+-]{1,256}(?:\/[A-Za-z0-9_+-]{1,256})?)?/;
+  /** @override **/
 
-/**
- * @private
- */
 
+  get isUniversal() {
+    return false;
+  }
+  /** @override **/
 
-const monthsLong = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
-const monthsShort = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
-const monthsNarrow = ["J", "F", "M", "A", "M", "J", "J", "A", "S", "O", "N", "D"];
-function months(length) {
-  switch (length) {
-    case "narrow":
-      return [...monthsNarrow];
 
-    case "short":
-      return [...monthsShort];
+  offsetName(ts, {
+    format,
+    locale
+  }) {
+    return parseZoneInfo(ts, format, locale);
+  }
+  /** @override **/
 
-    case "long":
-      return [...monthsLong];
 
-    case "numeric":
-      return ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"];
+  formatOffset(ts, format) {
+    return formatOffset(this.offset(ts), format);
+  }
+  /** @override **/
 
-    case "2-digit":
-      return ["01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"];
 
-    default:
-      return null;
+  offset(ts) {
+    return -new Date(ts).getTimezoneOffset();
   }
-}
-const weekdaysLong = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"];
-const weekdaysShort = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
-const weekdaysNarrow = ["M", "T", "W", "T", "F", "S", "S"];
-function weekdays(length) {
-  switch (length) {
-    case "narrow":
-      return [...weekdaysNarrow];
+  /** @override **/
 
-    case "short":
-      return [...weekdaysShort];
 
-    case "long":
-      return [...weekdaysLong];
+  equals(otherZone) {
+    return otherZone.type === "system";
+  }
+  /** @override **/
 
-    case "numeric":
-      return ["1", "2", "3", "4", "5", "6", "7"];
 
-    default:
-      return null;
+  get isValid() {
+    return true;
   }
-}
-const meridiems = ["AM", "PM"];
-const erasLong = ["Before Christ", "Anno Domini"];
-const erasShort = ["BC", "AD"];
-const erasNarrow = ["B", "A"];
-function eras(length) {
-  switch (length) {
-    case "narrow":
-      return [...erasNarrow];
 
-    case "short":
-      return [...erasShort];
+}
 
-    case "long":
-      return [...erasLong];
+let dtfCache = {};
 
-    default:
-      return null;
+function makeDTF(zone) {
+  if (!dtfCache[zone]) {
+    dtfCache[zone] = new Intl.DateTimeFormat("en-US", {
+      hour12: false,
+      timeZone: zone,
+      year: "numeric",
+      month: "2-digit",
+      day: "2-digit",
+      hour: "2-digit",
+      minute: "2-digit",
+      second: "2-digit",
+      era: "short"
+    });
   }
+
+  return dtfCache[zone];
 }
-function meridiemForDateTime(dt) {
-  return meridiems[dt.hour < 12 ? 0 : 1];
-}
-function weekdayForDateTime(dt, length) {
-  return weekdays(length)[dt.weekday - 1];
-}
-function monthForDateTime(dt, length) {
-  return months(length)[dt.month - 1];
-}
-function eraForDateTime(dt, length) {
-  return eras(length)[dt.year < 0 ? 0 : 1];
-}
-function formatRelativeTime(unit, count, numeric = "always", narrow = false) {
-  const units = {
-    years: ["year", "yr."],
-    quarters: ["quarter", "qtr."],
-    months: ["month", "mo."],
-    weeks: ["week", "wk."],
-    days: ["day", "day", "days"],
-    hours: ["hour", "hr."],
-    minutes: ["minute", "min."],
-    seconds: ["second", "sec."]
-  };
-  const lastable = ["hours", "minutes", "seconds"].indexOf(unit) === -1;
 
-  if (numeric === "auto" && lastable) {
-    const isDay = unit === "days";
+const typeToPos = {
+  year: 0,
+  month: 1,
+  day: 2,
+  era: 3,
+  hour: 4,
+  minute: 5,
+  second: 6
+};
 
-    switch (count) {
-      case 1:
-        return isDay ? "tomorrow" : `next ${units[unit][0]}`;
+function hackyOffset(dtf, date) {
+  const formatted = dtf.format(date).replace(/\u200E/g, ""),
+        parsed = /(\d+)\/(\d+)\/(\d+) (AD|BC),? (\d+):(\d+):(\d+)/.exec(formatted),
+        [, fMonth, fDay, fYear, fadOrBc, fHour, fMinute, fSecond] = parsed;
+  return [fYear, fMonth, fDay, fadOrBc, fHour, fMinute, fSecond];
+}
 
-      case -1:
-        return isDay ? "yesterday" : `last ${units[unit][0]}`;
+function partsOffset(dtf, date) {
+  const formatted = dtf.formatToParts(date);
+  const filled = [];
 
-      case 0:
-        return isDay ? "today" : `this ${units[unit][0]}`;
+  for (let i = 0; i < formatted.length; i++) {
+    const {
+      type,
+      value
+    } = formatted[i];
+    const pos = typeToPos[type];
 
+    if (type === "era") {
+      filled[pos] = value;
+    } else if (!isUndefined(pos)) {
+      filled[pos] = parseInt(value, 10);
     }
   }
 
-  const isInPast = Object.is(count, -0) || count < 0,
-        fmtValue = Math.abs(count),
-        singular = fmtValue === 1,
-        lilUnits = units[unit],
-        fmtUnit = narrow ? singular ? lilUnits[1] : lilUnits[2] || lilUnits[1] : singular ? units[unit][0] : unit;
-  return isInPast ? `${fmtValue} ${fmtUnit} ago` : `in ${fmtValue} ${fmtUnit}`;
+  return filled;
 }
 
-function stringifyTokens(splits, tokenToString) {
-  let s = "";
+let ianaZoneCache = {};
+/**
+ * A zone identified by an IANA identifier, like America/New_York
+ * @implements {Zone}
+ */
 
-  for (const token of splits) {
-    if (token.literal) {
-      s += token.val;
-    } else {
-      s += tokenToString(token.val);
+class IANAZone extends Zone {
+  /**
+   * @param {string} name - Zone name
+   * @return {IANAZone}
+   */
+  static create(name) {
+    if (!ianaZoneCache[name]) {
+      ianaZoneCache[name] = new IANAZone(name);
     }
-  }
 
-  return s;
-}
+    return ianaZoneCache[name];
+  }
+  /**
+   * Reset local caches. Should only be necessary in testing scenarios.
+   * @return {void}
+   */
 
-const macroTokenToFormatOpts = {
-  D: DATE_SHORT,
-  DD: DATE_MED,
-  DDD: DATE_FULL,
-  DDDD: DATE_HUGE,
-  t: TIME_SIMPLE,
-  tt: TIME_WITH_SECONDS,
-  ttt: TIME_WITH_SHORT_OFFSET,
-  tttt: TIME_WITH_LONG_OFFSET,
-  T: TIME_24_SIMPLE,
-  TT: TIME_24_WITH_SECONDS,
-  TTT: TIME_24_WITH_SHORT_OFFSET,
-  TTTT: TIME_24_WITH_LONG_OFFSET,
-  f: DATETIME_SHORT,
-  ff: DATETIME_MED,
-  fff: DATETIME_FULL,
-  ffff: DATETIME_HUGE,
-  F: DATETIME_SHORT_WITH_SECONDS,
-  FF: DATETIME_MED_WITH_SECONDS,
-  FFF: DATETIME_FULL_WITH_SECONDS,
-  FFFF: DATETIME_HUGE_WITH_SECONDS
-};
-/**
- * @private
- */
 
-class Formatter {
-  static create(locale, opts = {}) {
-    return new Formatter(locale, opts);
+  static resetCache() {
+    ianaZoneCache = {};
+    dtfCache = {};
   }
+  /**
+   * Returns whether the provided string is a valid specifier. This only checks the string's format, not that the specifier identifies a known zone; see isValidZone for that.
+   * @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 for some valid IANA names. Use isValidZone instead.
+   * @return {boolean}
+   */
 
-  static parseFormat(fmt) {
-    let current = null,
-        currentFull = "",
-        bracketed = false;
-    const splits = [];
-
-    for (let i = 0; i < fmt.length; i++) {
-      const c = fmt.charAt(i);
 
-      if (c === "'") {
-        if (currentFull.length > 0) {
-          splits.push({
-            literal: bracketed,
-            val: currentFull
-          });
-        }
+  static isValidSpecifier(s) {
+    return this.isValidZone(s);
+  }
+  /**
+   * Returns whether the provided string identifies a real zone
+   * @param {string} zone - The string to check
+   * @example IANAZone.isValidZone("America/New_York") //=> true
+   * @example IANAZone.isValidZone("Fantasia/Castle") //=> false
+   * @example IANAZone.isValidZone("Sport~~blorp") //=> false
+   * @return {boolean}
+   */
 
-        current = null;
-        currentFull = "";
-        bracketed = !bracketed;
-      } else if (bracketed) {
-        currentFull += c;
-      } else if (c === current) {
-        currentFull += c;
-      } else {
-        if (currentFull.length > 0) {
-          splits.push({
-            literal: false,
-            val: currentFull
-          });
-        }
 
-        currentFull = c;
-        current = c;
-      }
+  static isValidZone(zone) {
+    if (!zone) {
+      return false;
     }
 
-    if (currentFull.length > 0) {
-      splits.push({
-        literal: bracketed,
-        val: currentFull
-      });
+    try {
+      new Intl.DateTimeFormat("en-US", {
+        timeZone: zone
+      }).format();
+      return true;
+    } catch (e) {
+      return false;
     }
-
-    return splits;
   }
 
-  static macroTokenToFormatOpts(token) {
-    return macroTokenToFormatOpts[token];
-  }
+  constructor(name) {
+    super();
+    /** @private **/
 
-  constructor(locale, formatOpts) {
-    this.opts = formatOpts;
-    this.loc = locale;
-    this.systemLoc = null;
+    this.zoneName = name;
+    /** @private **/
+
+    this.valid = IANAZone.isValidZone(name);
   }
+  /** @override **/
 
-  formatWithSystemDefault(dt, opts) {
-    if (this.systemLoc === null) {
-      this.systemLoc = this.loc.redefaultToSystem();
-    }
 
-    const df = this.systemLoc.dtFormatter(dt, { ...this.opts,
-      ...opts
-    });
-    return df.format();
+  get type() {
+    return "iana";
   }
+  /** @override **/
 
-  formatDateTime(dt, opts = {}) {
-    const df = this.loc.dtFormatter(dt, { ...this.opts,
-      ...opts
-    });
-    return df.format();
-  }
 
-  formatDateTimeParts(dt, opts = {}) {
-    const df = this.loc.dtFormatter(dt, { ...this.opts,
-      ...opts
-    });
-    return df.formatToParts();
+  get name() {
+    return this.zoneName;
   }
+  /** @override **/
 
-  resolvedOptions(dt, opts = {}) {
-    const df = this.loc.dtFormatter(dt, { ...this.opts,
-      ...opts
-    });
-    return df.resolvedOptions();
+
+  get isUniversal() {
+    return false;
   }
+  /** @override **/
 
-  num(n, p = 0) {
-    // we get some perf out of doing this here, annoyingly
-    if (this.opts.forceSimple) {
-      return padStart(n, p);
-    }
 
-    const opts = { ...this.opts
-    };
+  offsetName(ts, {
+    format,
+    locale
+  }) {
+    return parseZoneInfo(ts, format, locale, this.name);
+  }
+  /** @override **/
 
-    if (p > 0) {
-      opts.padTo = p;
-    }
 
-    return this.loc.numberFormatter(opts).format(n);
+  formatOffset(ts, format) {
+    return formatOffset(this.offset(ts), format);
   }
+  /** @override **/
 
-  formatDateTimeFromString(dt, fmt) {
-    const knownEnglish = this.loc.listingMode() === "en",
-          useDateTimeFormatter = this.loc.outputCalendar && this.loc.outputCalendar !== "gregory",
-          string = (opts, extract) => this.loc.extract(dt, opts, extract),
-          formatOffset = opts => {
-      if (dt.isOffsetFixed && dt.offset === 0 && opts.allowZ) {
-        return "Z";
-      }
-
-      return dt.isValid ? dt.zone.formatOffset(dt.ts, opts.format) : "";
-    },
-          meridiem = () => knownEnglish ? meridiemForDateTime(dt) : string({
-      hour: "numeric",
-      hourCycle: "h12"
-    }, "dayperiod"),
-          month = (length, standalone) => knownEnglish ? monthForDateTime(dt, length) : string(standalone ? {
-      month: length
-    } : {
-      month: length,
-      day: "numeric"
-    }, "month"),
-          weekday = (length, standalone) => knownEnglish ? weekdayForDateTime(dt, length) : string(standalone ? {
-      weekday: length
-    } : {
-      weekday: length,
-      month: "long",
-      day: "numeric"
-    }, "weekday"),
-          maybeMacro = token => {
-      const formatOpts = Formatter.macroTokenToFormatOpts(token);
 
-      if (formatOpts) {
-        return this.formatWithSystemDefault(dt, formatOpts);
-      } else {
-        return token;
-      }
-    },
-          era = length => knownEnglish ? eraForDateTime(dt, length) : string({
-      era: length
-    }, "era"),
-          tokenToString = token => {
-      // Where possible: http://cldr.unicode.org/translation/date-time-1/date-time#TOC-Standalone-vs.-Format-Styles
-      switch (token) {
-        // ms
-        case "S":
-          return this.num(dt.millisecond);
+  offset(ts) {
+    const date = new Date(ts);
+    if (isNaN(date)) return NaN;
+    const dtf = makeDTF(this.name);
+    let [year, month, day, adOrBc, hour, minute, second] = dtf.formatToParts ? partsOffset(dtf, date) : hackyOffset(dtf, date);
 
-        case "u": // falls through
+    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
 
-        case "SSS":
-          return this.num(dt.millisecond, 3);
-        // seconds
 
-        case "s":
-          return this.num(dt.second);
+    const adjustedHour = hour === 24 ? 0 : hour;
+    const asUTC = objToLocalTS({
+      year,
+      month,
+      day,
+      hour: adjustedHour,
+      minute,
+      second,
+      millisecond: 0
+    });
+    let asTS = +date;
+    const over = asTS % 1000;
+    asTS -= over >= 0 ? over : 1000 + over;
+    return (asUTC - asTS) / (60 * 1000);
+  }
+  /** @override **/
 
-        case "ss":
-          return this.num(dt.second, 2);
-        // fractional seconds
 
-        case "uu":
-          return this.num(Math.floor(dt.millisecond / 10), 2);
+  equals(otherZone) {
+    return otherZone.type === "iana" && otherZone.name === this.name;
+  }
+  /** @override **/
 
-        case "uuu":
-          return this.num(Math.floor(dt.millisecond / 100));
-        // minutes
 
-        case "m":
-          return this.num(dt.minute);
+  get isValid() {
+    return this.valid;
+  }
 
-        case "mm":
-          return this.num(dt.minute, 2);
-        // hours
+}
 
-        case "h":
-          return this.num(dt.hour % 12 === 0 ? 12 : dt.hour % 12);
+let intlLFCache = {};
 
-        case "hh":
-          return this.num(dt.hour % 12 === 0 ? 12 : dt.hour % 12, 2);
+function getCachedLF(locString, opts = {}) {
+  const key = JSON.stringify([locString, opts]);
+  let dtf = intlLFCache[key];
 
-        case "H":
-          return this.num(dt.hour);
+  if (!dtf) {
+    dtf = new Intl.ListFormat(locString, opts);
+    intlLFCache[key] = dtf;
+  }
 
-        case "HH":
-          return this.num(dt.hour, 2);
-        // offset
+  return dtf;
+}
 
-        case "Z":
-          // like +6
-          return formatOffset({
-            format: "narrow",
-            allowZ: this.opts.allowZ
-          });
+let intlDTCache = {};
 
-        case "ZZ":
-          // like +06:00
-          return formatOffset({
-            format: "short",
-            allowZ: this.opts.allowZ
-          });
+function getCachedDTF(locString, opts = {}) {
+  const key = JSON.stringify([locString, opts]);
+  let dtf = intlDTCache[key];
 
-        case "ZZZ":
-          // like +0600
-          return formatOffset({
-            format: "techie",
-            allowZ: this.opts.allowZ
-          });
+  if (!dtf) {
+    dtf = new Intl.DateTimeFormat(locString, opts);
+    intlDTCache[key] = dtf;
+  }
 
-        case "ZZZZ":
-          // like EST
-          return dt.zone.offsetName(dt.ts, {
-            format: "short",
-            locale: this.loc.locale
-          });
+  return dtf;
+}
 
-        case "ZZZZZ":
-          // like Eastern Standard Time
-          return dt.zone.offsetName(dt.ts, {
-            format: "long",
-            locale: this.loc.locale
-          });
-        // zone
+let intlNumCache = {};
 
-        case "z":
-          // like America/New_York
-          return dt.zoneName;
-        // meridiems
+function getCachedINF(locString, opts = {}) {
+  const key = JSON.stringify([locString, opts]);
+  let inf = intlNumCache[key];
 
-        case "a":
-          return meridiem();
-        // dates
+  if (!inf) {
+    inf = new Intl.NumberFormat(locString, opts);
+    intlNumCache[key] = inf;
+  }
 
-        case "d":
-          return useDateTimeFormatter ? string({
-            day: "numeric"
-          }, "day") : this.num(dt.day);
+  return inf;
+}
 
-        case "dd":
-          return useDateTimeFormatter ? string({
-            day: "2-digit"
-          }, "day") : this.num(dt.day, 2);
-        // weekdays - standalone
+let intlRelCache = {};
 
-        case "c":
-          // like 1
-          return this.num(dt.weekday);
+function getCachedRTF(locString, opts = {}) {
+  const {
+    base,
+    ...cacheKeyOpts
+  } = opts; // exclude `base` from the options
 
-        case "ccc":
-          // like 'Tues'
-          return weekday("short", true);
+  const key = JSON.stringify([locString, cacheKeyOpts]);
+  let inf = intlRelCache[key];
 
-        case "cccc":
-          // like 'Tuesday'
-          return weekday("long", true);
+  if (!inf) {
+    inf = new Intl.RelativeTimeFormat(locString, opts);
+    intlRelCache[key] = inf;
+  }
 
-        case "ccccc":
-          // like 'T'
-          return weekday("narrow", true);
-        // weekdays - format
+  return inf;
+}
 
-        case "E":
-          // like 1
-          return this.num(dt.weekday);
+let sysLocaleCache = null;
 
-        case "EEE":
-          // like 'Tues'
-          return weekday("short", false);
+function systemLocale() {
+  if (sysLocaleCache) {
+    return sysLocaleCache;
+  } else {
+    sysLocaleCache = new Intl.DateTimeFormat().resolvedOptions().locale;
+    return sysLocaleCache;
+  }
+}
 
-        case "EEEE":
-          // like 'Tuesday'
-          return weekday("long", false);
+function parseLocaleString(localeStr) {
+  // I really want to avoid writing a BCP 47 parser
+  // see, e.g. https://github.com/wooorm/bcp-47
+  // Instead, we'll do this:
+  // a) if the string has no -u extensions, just leave it alone
+  // b) if it does, use Intl to resolve everything
+  // c) if Intl fails, try again without the -u
+  const uIndex = localeStr.indexOf("-u-");
 
-        case "EEEEE":
-          // like 'T'
-          return weekday("narrow", false);
-        // months - standalone
+  if (uIndex === -1) {
+    return [localeStr];
+  } else {
+    let options;
+    const smaller = localeStr.substring(0, uIndex);
 
-        case "L":
-          // like 1
-          return useDateTimeFormatter ? string({
-            month: "numeric",
-            day: "numeric"
-          }, "month") : this.num(dt.month);
+    try {
+      options = getCachedDTF(localeStr).resolvedOptions();
+    } catch (e) {
+      options = getCachedDTF(smaller).resolvedOptions();
+    }
 
-        case "LL":
-          // like 01, doesn't seem to work
-          return useDateTimeFormatter ? string({
-            month: "2-digit",
-            day: "numeric"
-          }, "month") : this.num(dt.month, 2);
+    const {
+      numberingSystem,
+      calendar
+    } = options; // return the smaller one so that we can append the calendar and numbering overrides to it
 
-        case "LLL":
-          // like Jan
-          return month("short", true);
+    return [smaller, numberingSystem, calendar];
+  }
+}
 
-        case "LLLL":
-          // like January
-          return month("long", true);
+function intlConfigString(localeStr, numberingSystem, outputCalendar) {
+  if (outputCalendar || numberingSystem) {
+    localeStr += "-u";
 
-        case "LLLLL":
-          // like J
-          return month("narrow", true);
-        // months - format
+    if (outputCalendar) {
+      localeStr += `-ca-${outputCalendar}`;
+    }
 
-        case "M":
-          // like 1
-          return useDateTimeFormatter ? string({
-            month: "numeric"
-          }, "month") : this.num(dt.month);
+    if (numberingSystem) {
+      localeStr += `-nu-${numberingSystem}`;
+    }
 
-        case "MM":
-          // like 01
-          return useDateTimeFormatter ? string({
-            month: "2-digit"
-          }, "month") : this.num(dt.month, 2);
+    return localeStr;
+  } else {
+    return localeStr;
+  }
+}
 
-        case "MMM":
-          // like Jan
-          return month("short", false);
+function mapMonths(f) {
+  const ms = [];
 
-        case "MMMM":
-          // like January
-          return month("long", false);
+  for (let i = 1; i <= 12; i++) {
+    const dt = DateTime.utc(2016, i, 1);
+    ms.push(f(dt));
+  }
 
-        case "MMMMM":
-          // like J
-          return month("narrow", false);
-        // years
-
-        case "y":
-          // like 2014
-          return useDateTimeFormatter ? string({
-            year: "numeric"
-          }, "year") : this.num(dt.year);
-
-        case "yy":
-          // like 14
-          return useDateTimeFormatter ? string({
-            year: "2-digit"
-          }, "year") : this.num(dt.year.toString().slice(-2), 2);
+  return ms;
+}
 
-        case "yyyy":
-          // like 0012
-          return useDateTimeFormatter ? string({
-            year: "numeric"
-          }, "year") : this.num(dt.year, 4);
+function mapWeekdays(f) {
+  const ms = [];
 
-        case "yyyyyy":
-          // like 000012
-          return useDateTimeFormatter ? string({
-            year: "numeric"
-          }, "year") : this.num(dt.year, 6);
-        // eras
+  for (let i = 1; i <= 7; i++) {
+    const dt = DateTime.utc(2016, 11, 13 + i);
+    ms.push(f(dt));
+  }
 
-        case "G":
-          // like AD
-          return era("short");
+  return ms;
+}
 
-        case "GG":
-          // like Anno Domini
-          return era("long");
+function listStuff(loc, length, defaultOK, englishFn, intlFn) {
+  const mode = loc.listingMode(defaultOK);
 
-        case "GGGGG":
-          return era("narrow");
+  if (mode === "error") {
+    return null;
+  } else if (mode === "en") {
+    return englishFn(length);
+  } else {
+    return intlFn(length);
+  }
+}
 
-        case "kk":
-          return this.num(dt.weekYear.toString().slice(-2), 2);
+function supportsFastNumbers(loc) {
+  if (loc.numberingSystem && loc.numberingSystem !== "latn") {
+    return false;
+  } else {
+    return loc.numberingSystem === "latn" || !loc.locale || loc.locale.startsWith("en") || new Intl.DateTimeFormat(loc.intl).resolvedOptions().numberingSystem === "latn";
+  }
+}
+/**
+ * @private
+ */
 
-        case "kkkk":
-          return this.num(dt.weekYear, 4);
 
-        case "W":
-          return this.num(dt.weekNumber);
+class PolyNumberFormatter {
+  constructor(intl, forceSimple, opts) {
+    this.padTo = opts.padTo || 0;
+    this.floor = opts.floor || false;
+    const {
+      padTo,
+      floor,
+      ...otherOpts
+    } = opts;
 
-        case "WW":
-          return this.num(dt.weekNumber, 2);
+    if (!forceSimple || Object.keys(otherOpts).length > 0) {
+      const intlOpts = {
+        useGrouping: false,
+        ...opts
+      };
+      if (opts.padTo > 0) intlOpts.minimumIntegerDigits = opts.padTo;
+      this.inf = getCachedINF(intl, intlOpts);
+    }
+  }
 
-        case "o":
-          return this.num(dt.ordinal);
+  format(i) {
+    if (this.inf) {
+      const fixed = this.floor ? Math.floor(i) : i;
+      return this.inf.format(fixed);
+    } else {
+      // to match the browser's numberformatter defaults
+      const fixed = this.floor ? Math.floor(i) : roundTo(i, 3);
+      return padStart(fixed, this.padTo);
+    }
+  }
 
-        case "ooo":
-          return this.num(dt.ordinal, 3);
+}
+/**
+ * @private
+ */
 
-        case "q":
-          // like 1
-          return this.num(dt.quarter);
 
-        case "qq":
-          // like 01
-          return this.num(dt.quarter, 2);
+class PolyDateFormatter {
+  constructor(dt, intl, opts) {
+    this.opts = opts;
+    let z;
 
-        case "X":
-          return this.num(Math.floor(dt.ts / 1000));
+    if (dt.zone.isUniversal) {
+      // UTC-8 or Etc/UTC-8 are not part of tzdata, only Etc/GMT+8 and the like.
+      // That is why fixed-offset TZ is set to that unless it is:
+      // 1. Representing offset 0 when UTC is used to maintain previous behavior and does not become GMT.
+      // 2. Unsupported by the browser:
+      //    - some do not support Etc/
+      //    - < Etc/GMT-14, > Etc/GMT+12, and 30-minute or 45-minute offsets are not part of tzdata
+      const gmtOffset = -1 * (dt.offset / 60);
+      const offsetZ = gmtOffset >= 0 ? `Etc/GMT+${gmtOffset}` : `Etc/GMT${gmtOffset}`;
 
-        case "x":
-          return this.num(dt.ts);
+      if (dt.offset !== 0 && IANAZone.create(offsetZ).valid) {
+        z = offsetZ;
+        this.dt = dt;
+      } else {
+        // Not all fixed-offset zones like Etc/+4:30 are present in tzdata.
+        // So we have to make do. Two cases:
+        // 1. The format options tell us to show the zone. We can't do that, so the best
+        // we can do is format the date in UTC.
+        // 2. The format options don't tell us to show the zone. Then we can adjust them
+        // the time and tell the formatter to show it to us in UTC, so that the time is right
+        // and the bad zone doesn't show up.
+        z = "UTC";
 
-        default:
-          return maybeMacro(token);
+        if (opts.timeZoneName) {
+          this.dt = dt;
+        } else {
+          this.dt = dt.offset === 0 ? dt : DateTime.fromMillis(dt.ts + dt.offset * 60 * 1000);
+        }
       }
-    };
-
-    return stringifyTokens(Formatter.parseFormat(fmt), tokenToString);
-  }
-
-  formatDurationFromString(dur, fmt) {
-    const tokenToField = token => {
-      switch (token[0]) {
-        case "S":
-          return "millisecond";
+    } else if (dt.zone.type === "system") {
+      this.dt = dt;
+    } else {
+      this.dt = dt;
+      z = dt.zone.name;
+    }
 
-        case "s":
-          return "second";
+    const intlOpts = { ...this.opts
+    };
 
-        case "m":
-          return "minute";
+    if (z) {
+      intlOpts.timeZone = z;
+    }
 
-        case "h":
-          return "hour";
+    this.dtf = getCachedDTF(intl, intlOpts);
+  }
 
-        case "d":
-          return "day";
+  format() {
+    return this.dtf.format(this.dt.toJSDate());
+  }
 
-        case "w":
-          return "week";
+  formatToParts() {
+    return this.dtf.formatToParts(this.dt.toJSDate());
+  }
 
-        case "M":
-          return "month";
+  resolvedOptions() {
+    return this.dtf.resolvedOptions();
+  }
 
-        case "y":
-          return "year";
+}
+/**
+ * @private
+ */
 
-        default:
-          return null;
-      }
-    },
-          tokenToString = lildur => token => {
-      const mapped = tokenToField(token);
 
-      if (mapped) {
-        return this.num(lildur.get(mapped), token.length);
-      } else {
-        return token;
-      }
-    },
-          tokens = Formatter.parseFormat(fmt),
-          realTokens = tokens.reduce((found, {
-      literal,
-      val
-    }) => literal ? found : found.concat(val), []),
-          collapsed = dur.shiftTo(...realTokens.map(tokenToField).filter(t => t));
+class PolyRelFormatter {
+  constructor(intl, isEnglish, opts) {
+    this.opts = {
+      style: "long",
+      ...opts
+    };
 
-    return stringifyTokens(tokens, tokenToString(collapsed));
+    if (!isEnglish && hasRelative()) {
+      this.rtf = getCachedRTF(intl, opts);
+    }
   }
 
-}
-
-class Invalid {
-  constructor(reason, explanation) {
-    this.reason = reason;
-    this.explanation = explanation;
+  format(count, unit) {
+    if (this.rtf) {
+      return this.rtf.format(count, unit);
+    } else {
+      return formatRelativeTime(unit, count, this.opts.numeric, this.opts.style !== "long");
+    }
   }
 
-  toMessage() {
-    if (this.explanation) {
-      return `${this.reason}: ${this.explanation}`;
+  formatToParts(count, unit) {
+    if (this.rtf) {
+      return this.rtf.formatToParts(count, unit);
     } else {
-      return this.reason;
+      return [];
     }
   }
 
 }
-
 /**
- * @interface
+ * @private
  */
 
-class Zone {
-  /**
-   * The type of zone
-   * @abstract
-   * @type {string}
-   */
-  get type() {
-    throw new ZoneIsAbstractError();
+
+class Locale {
+  static fromOpts(opts) {
+    return Locale.create(opts.locale, opts.numberingSystem, opts.outputCalendar, opts.defaultToEN);
   }
-  /**
-   * The name of this zone.
-   * @abstract
-   * @type {string}
-   */
 
+  static create(locale, numberingSystem, outputCalendar, defaultToEN = false) {
+    const specifiedLocale = locale || Settings.defaultLocale; // the system locale is useful for human readable strings but annoying for parsing/formatting known formats
 
-  get name() {
-    throw new ZoneIsAbstractError();
+    const localeR = specifiedLocale || (defaultToEN ? "en-US" : systemLocale());
+    const numberingSystemR = numberingSystem || Settings.defaultNumberingSystem;
+    const outputCalendarR = outputCalendar || Settings.defaultOutputCalendar;
+    return new Locale(localeR, numberingSystemR, outputCalendarR, specifiedLocale);
   }
 
-  get ianaName() {
-    return this.name;
+  static resetCache() {
+    sysLocaleCache = null;
+    intlDTCache = {};
+    intlNumCache = {};
+    intlRelCache = {};
   }
-  /**
-   * Returns whether the offset is known to be fixed for the whole year.
-   * @abstract
-   * @type {boolean}
-   */
-
 
-  get isUniversal() {
-    throw new ZoneIsAbstractError();
+  static fromObject({
+    locale,
+    numberingSystem,
+    outputCalendar
+  } = {}) {
+    return Locale.create(locale, numberingSystem, outputCalendar);
   }
-  /**
-   * Returns the offset's common name (such as EST) at the specified timestamp
-   * @abstract
-   * @param {number} ts - Epoch milliseconds for which to get the name
-   * @param {Object} opts - Options to affect the format
-   * @param {string} opts.format - What style of offset to return. Accepts 'long' or 'short'.
-   * @param {string} opts.locale - What locale to return the offset name in.
-   * @return {string}
-   */
-
 
-  offsetName(ts, opts) {
-    throw new ZoneIsAbstractError();
+  constructor(locale, numbering, outputCalendar, specifiedLocale) {
+    const [parsedLocale, parsedNumberingSystem, parsedOutputCalendar] = parseLocaleString(locale);
+    this.locale = parsedLocale;
+    this.numberingSystem = numbering || parsedNumberingSystem || null;
+    this.outputCalendar = outputCalendar || parsedOutputCalendar || null;
+    this.intl = intlConfigString(this.locale, this.numberingSystem, this.outputCalendar);
+    this.weekdaysCache = {
+      format: {},
+      standalone: {}
+    };
+    this.monthsCache = {
+      format: {},
+      standalone: {}
+    };
+    this.meridiemCache = null;
+    this.eraCache = {};
+    this.specifiedLocale = specifiedLocale;
+    this.fastNumbersCached = null;
   }
-  /**
-   * Returns the offset's value as a string
-   * @abstract
-   * @param {number} ts - Epoch milliseconds for which to get the offset
-   * @param {string} format - What style of offset to return.
-   *                          Accepts 'narrow', 'short', or 'techie'. Returning '+6', '+06:00', or '+0600' respectively
-   * @return {string}
-   */
 
+  get fastNumbers() {
+    if (this.fastNumbersCached == null) {
+      this.fastNumbersCached = supportsFastNumbers(this);
+    }
 
-  formatOffset(ts, format) {
-    throw new ZoneIsAbstractError();
+    return this.fastNumbersCached;
   }
-  /**
-   * Return the offset in minutes for this zone at the specified timestamp.
-   * @abstract
-   * @param {number} ts - Epoch milliseconds for which to compute the offset
-   * @return {number}
-   */
-
 
-  offset(ts) {
-    throw new ZoneIsAbstractError();
+  listingMode() {
+    const isActuallyEn = this.isEnglish();
+    const hasNoWeirdness = (this.numberingSystem === null || this.numberingSystem === "latn") && (this.outputCalendar === null || this.outputCalendar === "gregory");
+    return isActuallyEn && hasNoWeirdness ? "en" : "intl";
   }
-  /**
-   * Return whether this Zone is equal to another zone
-   * @abstract
-   * @param {Zone} otherZone - the zone to compare
-   * @return {boolean}
-   */
 
-
-  equals(otherZone) {
-    throw new ZoneIsAbstractError();
+  clone(alts) {
+    if (!alts || Object.getOwnPropertyNames(alts).length === 0) {
+      return this;
+    } else {
+      return Locale.create(alts.locale || this.specifiedLocale, alts.numberingSystem || this.numberingSystem, alts.outputCalendar || this.outputCalendar, alts.defaultToEN || false);
+    }
   }
-  /**
-   * Return whether this Zone is valid.
-   * @abstract
-   * @type {boolean}
-   */
 
-
-  get isValid() {
-    throw new ZoneIsAbstractError();
+  redefaultToEN(alts = {}) {
+    return this.clone({ ...alts,
+      defaultToEN: true
+    });
   }
 
-}
+  redefaultToSystem(alts = {}) {
+    return this.clone({ ...alts,
+      defaultToEN: false
+    });
+  }
 
-let singleton$1 = null;
-/**
- * Represents the local zone for this JavaScript environment.
- * @implements {Zone}
- */
+  months(length, format = false, defaultOK = true) {
+    return listStuff(this, length, defaultOK, months, () => {
+      const intl = format ? {
+        month: length,
+        day: "numeric"
+      } : {
+        month: length
+      },
+            formatStr = format ? "format" : "standalone";
 
-class SystemZone extends Zone {
-  /**
-   * Get a singleton instance of the local zone
-   * @return {SystemZone}
-   */
-  static get instance() {
-    if (singleton$1 === null) {
-      singleton$1 = new SystemZone();
-    }
+      if (!this.monthsCache[formatStr][length]) {
+        this.monthsCache[formatStr][length] = mapMonths(dt => this.extract(dt, intl, "month"));
+      }
 
-    return singleton$1;
+      return this.monthsCache[formatStr][length];
+    });
   }
-  /** @override **/
-
 
-  get type() {
-    return "system";
-  }
-  /** @override **/
+  weekdays(length, format = false, defaultOK = true) {
+    return listStuff(this, length, defaultOK, weekdays, () => {
+      const intl = format ? {
+        weekday: length,
+        year: "numeric",
+        month: "long",
+        day: "numeric"
+      } : {
+        weekday: length
+      },
+            formatStr = format ? "format" : "standalone";
 
+      if (!this.weekdaysCache[formatStr][length]) {
+        this.weekdaysCache[formatStr][length] = mapWeekdays(dt => this.extract(dt, intl, "weekday"));
+      }
 
-  get name() {
-    return new Intl.DateTimeFormat().resolvedOptions().timeZone;
+      return this.weekdaysCache[formatStr][length];
+    });
   }
-  /** @override **/
 
+  meridiems(defaultOK = true) {
+    return listStuff(this, undefined, defaultOK, () => meridiems, () => {
+      // In theory there could be aribitrary day periods. We're gonna assume there are exactly two
+      // for AM and PM. This is probably wrong, but it's makes parsing way easier.
+      if (!this.meridiemCache) {
+        const intl = {
+          hour: "numeric",
+          hourCycle: "h12"
+        };
+        this.meridiemCache = [DateTime.utc(2016, 11, 13, 9), DateTime.utc(2016, 11, 13, 19)].map(dt => this.extract(dt, intl, "dayperiod"));
+      }
 
-  get isUniversal() {
-    return false;
+      return this.meridiemCache;
+    });
   }
-  /** @override **/
 
+  eras(length, defaultOK = true) {
+    return listStuff(this, length, defaultOK, eras, () => {
+      const intl = {
+        era: length
+      }; // This is problematic. Different calendars are going to define eras totally differently. What I need is the minimum set of dates
+      // to definitely enumerate them.
+
+      if (!this.eraCache[length]) {
+        this.eraCache[length] = [DateTime.utc(-40, 1, 1), DateTime.utc(2017, 1, 1)].map(dt => this.extract(dt, intl, "era"));
+      }
 
-  offsetName(ts, {
-    format,
-    locale
-  }) {
-    return parseZoneInfo(ts, format, locale);
+      return this.eraCache[length];
+    });
   }
-  /** @override **/
-
 
-  formatOffset(ts, format) {
-    return formatOffset(this.offset(ts), format);
+  extract(dt, intlOpts, field) {
+    const df = this.dtFormatter(dt, intlOpts),
+          results = df.formatToParts(),
+          matching = results.find(m => m.type.toLowerCase() === field);
+    return matching ? matching.value : null;
   }
-  /** @override **/
 
+  numberFormatter(opts = {}) {
+    // this forcesimple option is never used (the only caller short-circuits on it, but it seems safer to leave)
+    // (in contrast, the rest of the condition is used heavily)
+    return new PolyNumberFormatter(this.intl, opts.forceSimple || this.fastNumbers, opts);
+  }
 
-  offset(ts) {
-    return -new Date(ts).getTimezoneOffset();
+  dtFormatter(dt, intlOpts = {}) {
+    return new PolyDateFormatter(dt, this.intl, intlOpts);
   }
-  /** @override **/
 
+  relFormatter(opts = {}) {
+    return new PolyRelFormatter(this.intl, this.isEnglish(), opts);
+  }
 
-  equals(otherZone) {
-    return otherZone.type === "system";
+  listFormatter(opts = {}) {
+    return getCachedLF(this.intl, opts);
   }
-  /** @override **/
 
+  isEnglish() {
+    return this.locale === "en" || this.locale.toLowerCase() === "en-us" || new Intl.DateTimeFormat(this.intl).resolvedOptions().locale.startsWith("en-us");
+  }
 
-  get isValid() {
-    return true;
-  }
-
-}
-
-let dtfCache = {};
-
-function makeDTF(zone) {
-  if (!dtfCache[zone]) {
-    dtfCache[zone] = new Intl.DateTimeFormat("en-US", {
-      hour12: false,
-      timeZone: zone,
-      year: "numeric",
-      month: "2-digit",
-      day: "2-digit",
-      hour: "2-digit",
-      minute: "2-digit",
-      second: "2-digit",
-      era: "short"
-    });
-  }
-
-  return dtfCache[zone];
-}
-
-const typeToPos = {
-  year: 0,
-  month: 1,
-  day: 2,
-  era: 3,
-  hour: 4,
-  minute: 5,
-  second: 6
-};
-
-function hackyOffset(dtf, date) {
-  const formatted = dtf.format(date).replace(/\u200E/g, ""),
-        parsed = /(\d+)\/(\d+)\/(\d+) (AD|BC),? (\d+):(\d+):(\d+)/.exec(formatted),
-        [, fMonth, fDay, fYear, fadOrBc, fHour, fMinute, fSecond] = parsed;
-  return [fYear, fMonth, fDay, fadOrBc, fHour, fMinute, fSecond];
-}
-
-function partsOffset(dtf, date) {
-  const formatted = dtf.formatToParts(date);
-  const filled = [];
-
-  for (let i = 0; i < formatted.length; i++) {
-    const {
-      type,
-      value
-    } = formatted[i];
-    const pos = typeToPos[type];
-
-    if (type === "era") {
-      filled[pos] = value;
-    } else if (!isUndefined(pos)) {
-      filled[pos] = parseInt(value, 10);
-    }
-  }
-
-  return filled;
-}
-
-let ianaZoneCache = {};
-/**
- * A zone identified by an IANA identifier, like America/New_York
- * @implements {Zone}
- */
-
-class IANAZone extends Zone {
-  /**
-   * @param {string} name - Zone name
-   * @return {IANAZone}
-   */
-  static create(name) {
-    if (!ianaZoneCache[name]) {
-      ianaZoneCache[name] = new IANAZone(name);
-    }
-
-    return ianaZoneCache[name];
-  }
-  /**
-   * Reset local caches. Should only be necessary in testing scenarios.
-   * @return {void}
-   */
-
-
-  static resetCache() {
-    ianaZoneCache = {};
-    dtfCache = {};
-  }
-  /**
-   * Returns whether the provided string is a valid specifier. This only checks the string's format, not that the specifier identifies a known zone; see isValidZone for that.
-   * @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 for some valid IANA names. Use isValidZone instead.
-   * @return {boolean}
-   */
-
-
-  static isValidSpecifier(s) {
-    return this.isValidZone(s);
-  }
-  /**
-   * Returns whether the provided string identifies a real zone
-   * @param {string} zone - The string to check
-   * @example IANAZone.isValidZone("America/New_York") //=> true
-   * @example IANAZone.isValidZone("Fantasia/Castle") //=> false
-   * @example IANAZone.isValidZone("Sport~~blorp") //=> false
-   * @return {boolean}
-   */
-
-
-  static isValidZone(zone) {
-    if (!zone) {
-      return false;
-    }
-
-    try {
-      new Intl.DateTimeFormat("en-US", {
-        timeZone: zone
-      }).format();
-      return true;
-    } catch (e) {
-      return false;
-    }
-  }
-
-  constructor(name) {
-    super();
-    /** @private **/
-
-    this.zoneName = name;
-    /** @private **/
-
-    this.valid = IANAZone.isValidZone(name);
-  }
-  /** @override **/
-
-
-  get type() {
-    return "iana";
-  }
-  /** @override **/
-
-
-  get name() {
-    return this.zoneName;
-  }
-  /** @override **/
-
-
-  get isUniversal() {
-    return false;
-  }
-  /** @override **/
-
-
-  offsetName(ts, {
-    format,
-    locale
-  }) {
-    return parseZoneInfo(ts, format, locale, this.name);
-  }
-  /** @override **/
-
-
-  formatOffset(ts, format) {
-    return formatOffset(this.offset(ts), format);
-  }
-  /** @override **/
-
-
-  offset(ts) {
-    const date = new Date(ts);
-    if (isNaN(date)) return NaN;
-    const dtf = makeDTF(this.name);
-    let [year, month, day, adOrBc, hour, minute, second] = dtf.formatToParts ? partsOffset(dtf, date) : hackyOffset(dtf, date);
-
-    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
-
-
-    const adjustedHour = hour === 24 ? 0 : hour;
-    const asUTC = objToLocalTS({
-      year,
-      month,
-      day,
-      hour: adjustedHour,
-      minute,
-      second,
-      millisecond: 0
-    });
-    let asTS = +date;
-    const over = asTS % 1000;
-    asTS -= over >= 0 ? over : 1000 + over;
-    return (asUTC - asTS) / (60 * 1000);
-  }
-  /** @override **/
-
-
-  equals(otherZone) {
-    return otherZone.type === "iana" && otherZone.name === this.name;
-  }
-  /** @override **/
-
-
-  get isValid() {
-    return this.valid;
+  equals(other) {
+    return this.locale === other.locale && this.numberingSystem === other.numberingSystem && this.outputCalendar === other.outputCalendar;
   }
 
 }
@@ -47127,6 +46838,7 @@ let now = () => Date.now(),
     defaultLocale = null,
     defaultNumberingSystem = null,
     defaultOutputCalendar = null,
+    twoDigitCutoffYear = 60,
     throwOnInvalid;
 /**
  * Settings contains static getters and setters that control Luxon's overall behavior. Luxon is a simple library with few options, but the ones it does have live here.
@@ -47227,6 +46939,28 @@ class Settings {
   static set defaultOutputCalendar(outputCalendar) {
     defaultOutputCalendar = outputCalendar;
   }
+  /**
+   * Get the cutoff year after which a string encoding a year as two digits is interpreted to occur in the current century.
+   * @type {number}
+   */
+
+
+  static get twoDigitCutoffYear() {
+    return twoDigitCutoffYear;
+  }
+  /**
+   * Set the cutoff year after which a string encoding a year as two digits is interpreted to occur in the current century.
+   * @type {number}
+   * @example Settings.twoDigitCutoffYear = 0 // cut-off year is 0, so all 'yy' are interpretted as current century
+   * @example Settings.twoDigitCutoffYear = 50 // '49' -> 1949; '50' -> 2050
+   * @example Settings.twoDigitCutoffYear = 1950 // interpretted as 50
+   * @example Settings.twoDigitCutoffYear = 2050 // ALSO interpretted as 50
+   */
+
+
+  static set twoDigitCutoffYear(cutoffYear) {
+    twoDigitCutoffYear = cutoffYear % 100;
+  }
   /**
    * Get whether Luxon will throw when it encounters invalid DateTimes, Durations, or Intervals
    * @type {boolean}
@@ -47258,495 +46992,870 @@ class Settings {
 
 }
 
-let intlLFCache = {};
+/*
+  This is just a junk drawer, containing anything used across multiple classes.
+  Because Luxon is small(ish), this should stay small and we won't worry about splitting
+  it up into, say, parsingUtil.js and basicUtil.js and so on. But they are divided up by feature area.
+*/
+/**
+ * @private
+ */
+// TYPES
 
-function getCachedLF(locString, opts = {}) {
-  const key = JSON.stringify([locString, opts]);
-  let dtf = intlLFCache[key];
+function isUndefined(o) {
+  return typeof o === "undefined";
+}
+function isNumber(o) {
+  return typeof o === "number";
+}
+function isInteger(o) {
+  return typeof o === "number" && o % 1 === 0;
+}
+function isString(o) {
+  return typeof o === "string";
+}
+function isDate(o) {
+  return Object.prototype.toString.call(o) === "[object Date]";
+} // CAPABILITIES
 
-  if (!dtf) {
-    dtf = new Intl.ListFormat(locString, opts);
-    intlLFCache[key] = dtf;
+function hasRelative() {
+  try {
+    return typeof Intl !== "undefined" && !!Intl.RelativeTimeFormat;
+  } catch (e) {
+    return false;
   }
+} // OBJECTS AND ARRAYS
 
-  return dtf;
+function maybeArray(thing) {
+  return Array.isArray(thing) ? thing : [thing];
+}
+function bestBy(arr, by, compare) {
+  if (arr.length === 0) {
+    return undefined;
+  }
+
+  return arr.reduce((best, next) => {
+    const pair = [by(next), next];
+
+    if (!best) {
+      return pair;
+    } else if (compare(best[0], pair[0]) === best[0]) {
+      return best;
+    } else {
+      return pair;
+    }
+  }, null)[1];
 }
+function pick(obj, keys) {
+  return keys.reduce((a, k) => {
+    a[k] = obj[k];
+    return a;
+  }, {});
+}
+function hasOwnProperty(obj, prop) {
+  return Object.prototype.hasOwnProperty.call(obj, prop);
+} // NUMBERS AND STRINGS
 
-let intlDTCache = {};
+function integerBetween(thing, bottom, top) {
+  return isInteger(thing) && thing >= bottom && thing <= top;
+} // x % n but takes the sign of n instead of x
 
-function getCachedDTF(locString, opts = {}) {
-  const key = JSON.stringify([locString, opts]);
-  let dtf = intlDTCache[key];
+function floorMod(x, n) {
+  return x - n * Math.floor(x / n);
+}
+function padStart(input, n = 2) {
+  const isNeg = input < 0;
+  let padded;
 
-  if (!dtf) {
-    dtf = new Intl.DateTimeFormat(locString, opts);
-    intlDTCache[key] = dtf;
+  if (isNeg) {
+    padded = "-" + ("" + -input).padStart(n, "0");
+  } else {
+    padded = ("" + input).padStart(n, "0");
   }
 
-  return dtf;
+  return padded;
 }
+function parseInteger(string) {
+  if (isUndefined(string) || string === null || string === "") {
+    return undefined;
+  } else {
+    return parseInt(string, 10);
+  }
+}
+function parseFloating(string) {
+  if (isUndefined(string) || string === null || string === "") {
+    return undefined;
+  } else {
+    return parseFloat(string);
+  }
+}
+function parseMillis(fraction) {
+  // Return undefined (instead of 0) in these cases, where fraction is not set
+  if (isUndefined(fraction) || fraction === null || fraction === "") {
+    return undefined;
+  } else {
+    const f = parseFloat("0." + fraction) * 1000;
+    return Math.floor(f);
+  }
+}
+function roundTo(number, digits, towardZero = false) {
+  const factor = 10 ** digits,
+        rounder = towardZero ? Math.trunc : Math.round;
+  return rounder(number * factor) / factor;
+} // DATE BASICS
 
-let intlNumCache = {};
+function isLeapYear(year) {
+  return year % 4 === 0 && (year % 100 !== 0 || year % 400 === 0);
+}
+function daysInYear(year) {
+  return isLeapYear(year) ? 366 : 365;
+}
+function daysInMonth(year, month) {
+  const modMonth = floorMod(month - 1, 12) + 1,
+        modYear = year + (month - modMonth) / 12;
 
-function getCachedINF(locString, opts = {}) {
-  const key = JSON.stringify([locString, opts]);
-  let inf = intlNumCache[key];
+  if (modMonth === 2) {
+    return isLeapYear(modYear) ? 29 : 28;
+  } else {
+    return [31, null, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][modMonth - 1];
+  }
+} // covert a calendar object to a local timestamp (epoch, but with the offset baked in)
 
-  if (!inf) {
-    inf = new Intl.NumberFormat(locString, opts);
-    intlNumCache[key] = inf;
+function objToLocalTS(obj) {
+  let d = Date.UTC(obj.year, obj.month - 1, obj.day, obj.hour, obj.minute, obj.second, obj.millisecond); // for legacy reasons, years between 0 and 99 are interpreted as 19XX; revert that
+
+  if (obj.year < 100 && obj.year >= 0) {
+    d = new Date(d);
+    d.setUTCFullYear(d.getUTCFullYear() - 1900);
   }
 
-  return inf;
+  return +d;
 }
+function weeksInWeekYear(weekYear) {
+  const p1 = (weekYear + Math.floor(weekYear / 4) - Math.floor(weekYear / 100) + Math.floor(weekYear / 400)) % 7,
+        last = weekYear - 1,
+        p2 = (last + Math.floor(last / 4) - Math.floor(last / 100) + Math.floor(last / 400)) % 7;
+  return p1 === 4 || p2 === 3 ? 53 : 52;
+}
+function untruncateYear(year) {
+  if (year > 99) {
+    return year;
+  } else return year > Settings.twoDigitCutoffYear ? 1900 + year : 2000 + year;
+} // PARSING
 
-let intlRelCache = {};
+function parseZoneInfo(ts, offsetFormat, locale, timeZone = null) {
+  const date = new Date(ts),
+        intlOpts = {
+    hourCycle: "h23",
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit"
+  };
 
-function getCachedRTF(locString, opts = {}) {
-  const {
-    base,
-    ...cacheKeyOpts
-  } = opts; // exclude `base` from the options
+  if (timeZone) {
+    intlOpts.timeZone = timeZone;
+  }
 
-  const key = JSON.stringify([locString, cacheKeyOpts]);
-  let inf = intlRelCache[key];
+  const modified = {
+    timeZoneName: offsetFormat,
+    ...intlOpts
+  };
+  const parsed = new Intl.DateTimeFormat(locale, modified).formatToParts(date).find(m => m.type.toLowerCase() === "timezonename");
+  return parsed ? parsed.value : null;
+} // signedOffset('-5', '30') -> -330
 
-  if (!inf) {
-    inf = new Intl.RelativeTimeFormat(locString, opts);
-    intlRelCache[key] = inf;
+function signedOffset(offHourStr, offMinuteStr) {
+  let offHour = parseInt(offHourStr, 10); // don't || this because we want to preserve -0
+
+  if (Number.isNaN(offHour)) {
+    offHour = 0;
   }
 
-  return inf;
+  const offMin = parseInt(offMinuteStr, 10) || 0,
+        offMinSigned = offHour < 0 || Object.is(offHour, -0) ? -offMin : offMin;
+  return offHour * 60 + offMinSigned;
+} // COERCION
+
+function asNumber(value) {
+  const numericValue = Number(value);
+  if (typeof value === "boolean" || value === "" || Number.isNaN(numericValue)) throw new InvalidArgumentError(`Invalid unit value ${value}`);
+  return numericValue;
 }
+function normalizeObject(obj, normalizer) {
+  const normalized = {};
 
-let sysLocaleCache = null;
+  for (const u in obj) {
+    if (hasOwnProperty(obj, u)) {
+      const v = obj[u];
+      if (v === undefined || v === null) continue;
+      normalized[normalizer(u)] = asNumber(v);
+    }
+  }
 
-function systemLocale() {
-  if (sysLocaleCache) {
-    return sysLocaleCache;
-  } else {
-    sysLocaleCache = new Intl.DateTimeFormat().resolvedOptions().locale;
-    return sysLocaleCache;
+  return normalized;
+}
+function formatOffset(offset, format) {
+  const hours = Math.trunc(Math.abs(offset / 60)),
+        minutes = Math.trunc(Math.abs(offset % 60)),
+        sign = offset >= 0 ? "+" : "-";
+
+  switch (format) {
+    case "short":
+      return `${sign}${padStart(hours, 2)}:${padStart(minutes, 2)}`;
+
+    case "narrow":
+      return `${sign}${hours}${minutes > 0 ? `:${minutes}` : ""}`;
+
+    case "techie":
+      return `${sign}${padStart(hours, 2)}${padStart(minutes, 2)}`;
+
+    default:
+      throw new RangeError(`Value format ${format} is out of range for property format`);
   }
 }
+function timeObject(obj) {
+  return pick(obj, ["hour", "minute", "second", "millisecond"]);
+}
 
-function parseLocaleString(localeStr) {
-  // I really want to avoid writing a BCP 47 parser
-  // see, e.g. https://github.com/wooorm/bcp-47
-  // Instead, we'll do this:
-  // a) if the string has no -u extensions, just leave it alone
-  // b) if it does, use Intl to resolve everything
-  // c) if Intl fails, try again without the -u
-  const uIndex = localeStr.indexOf("-u-");
+/**
+ * @private
+ */
 
-  if (uIndex === -1) {
-    return [localeStr];
-  } else {
-    let options;
-    const smaller = localeStr.substring(0, uIndex);
 
-    try {
-      options = getCachedDTF(localeStr).resolvedOptions();
-    } catch (e) {
-      options = getCachedDTF(smaller).resolvedOptions();
+const monthsLong = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
+const monthsShort = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+const monthsNarrow = ["J", "F", "M", "A", "M", "J", "J", "A", "S", "O", "N", "D"];
+function months(length) {
+  switch (length) {
+    case "narrow":
+      return [...monthsNarrow];
+
+    case "short":
+      return [...monthsShort];
+
+    case "long":
+      return [...monthsLong];
+
+    case "numeric":
+      return ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"];
+
+    case "2-digit":
+      return ["01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"];
+
+    default:
+      return null;
+  }
+}
+const weekdaysLong = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"];
+const weekdaysShort = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
+const weekdaysNarrow = ["M", "T", "W", "T", "F", "S", "S"];
+function weekdays(length) {
+  switch (length) {
+    case "narrow":
+      return [...weekdaysNarrow];
+
+    case "short":
+      return [...weekdaysShort];
+
+    case "long":
+      return [...weekdaysLong];
+
+    case "numeric":
+      return ["1", "2", "3", "4", "5", "6", "7"];
+
+    default:
+      return null;
+  }
+}
+const meridiems = ["AM", "PM"];
+const erasLong = ["Before Christ", "Anno Domini"];
+const erasShort = ["BC", "AD"];
+const erasNarrow = ["B", "A"];
+function eras(length) {
+  switch (length) {
+    case "narrow":
+      return [...erasNarrow];
+
+    case "short":
+      return [...erasShort];
+
+    case "long":
+      return [...erasLong];
+
+    default:
+      return null;
+  }
+}
+function meridiemForDateTime(dt) {
+  return meridiems[dt.hour < 12 ? 0 : 1];
+}
+function weekdayForDateTime(dt, length) {
+  return weekdays(length)[dt.weekday - 1];
+}
+function monthForDateTime(dt, length) {
+  return months(length)[dt.month - 1];
+}
+function eraForDateTime(dt, length) {
+  return eras(length)[dt.year < 0 ? 0 : 1];
+}
+function formatRelativeTime(unit, count, numeric = "always", narrow = false) {
+  const units = {
+    years: ["year", "yr."],
+    quarters: ["quarter", "qtr."],
+    months: ["month", "mo."],
+    weeks: ["week", "wk."],
+    days: ["day", "day", "days"],
+    hours: ["hour", "hr."],
+    minutes: ["minute", "min."],
+    seconds: ["second", "sec."]
+  };
+  const lastable = ["hours", "minutes", "seconds"].indexOf(unit) === -1;
+
+  if (numeric === "auto" && lastable) {
+    const isDay = unit === "days";
+
+    switch (count) {
+      case 1:
+        return isDay ? "tomorrow" : `next ${units[unit][0]}`;
+
+      case -1:
+        return isDay ? "yesterday" : `last ${units[unit][0]}`;
+
+      case 0:
+        return isDay ? "today" : `this ${units[unit][0]}`;
+
     }
+  }
 
-    const {
-      numberingSystem,
-      calendar
-    } = options; // return the smaller one so that we can append the calendar and numbering overrides to it
+  const isInPast = Object.is(count, -0) || count < 0,
+        fmtValue = Math.abs(count),
+        singular = fmtValue === 1,
+        lilUnits = units[unit],
+        fmtUnit = narrow ? singular ? lilUnits[1] : lilUnits[2] || lilUnits[1] : singular ? units[unit][0] : unit;
+  return isInPast ? `${fmtValue} ${fmtUnit} ago` : `in ${fmtValue} ${fmtUnit}`;
+}
 
-    return [smaller, numberingSystem, calendar];
+function stringifyTokens(splits, tokenToString) {
+  let s = "";
+
+  for (const token of splits) {
+    if (token.literal) {
+      s += token.val;
+    } else {
+      s += tokenToString(token.val);
+    }
   }
+
+  return s;
 }
 
-function intlConfigString(localeStr, numberingSystem, outputCalendar) {
-  if (outputCalendar || numberingSystem) {
-    localeStr += "-u";
+const macroTokenToFormatOpts = {
+  D: DATE_SHORT,
+  DD: DATE_MED,
+  DDD: DATE_FULL,
+  DDDD: DATE_HUGE,
+  t: TIME_SIMPLE,
+  tt: TIME_WITH_SECONDS,
+  ttt: TIME_WITH_SHORT_OFFSET,
+  tttt: TIME_WITH_LONG_OFFSET,
+  T: TIME_24_SIMPLE,
+  TT: TIME_24_WITH_SECONDS,
+  TTT: TIME_24_WITH_SHORT_OFFSET,
+  TTTT: TIME_24_WITH_LONG_OFFSET,
+  f: DATETIME_SHORT,
+  ff: DATETIME_MED,
+  fff: DATETIME_FULL,
+  ffff: DATETIME_HUGE,
+  F: DATETIME_SHORT_WITH_SECONDS,
+  FF: DATETIME_MED_WITH_SECONDS,
+  FFF: DATETIME_FULL_WITH_SECONDS,
+  FFFF: DATETIME_HUGE_WITH_SECONDS
+};
+/**
+ * @private
+ */
 
-    if (outputCalendar) {
-      localeStr += `-ca-${outputCalendar}`;
+class Formatter {
+  static create(locale, opts = {}) {
+    return new Formatter(locale, opts);
+  }
+
+  static parseFormat(fmt) {
+    let current = null,
+        currentFull = "",
+        bracketed = false;
+    const splits = [];
+
+    for (let i = 0; i < fmt.length; i++) {
+      const c = fmt.charAt(i);
+
+      if (c === "'") {
+        if (currentFull.length > 0) {
+          splits.push({
+            literal: bracketed,
+            val: currentFull
+          });
+        }
+
+        current = null;
+        currentFull = "";
+        bracketed = !bracketed;
+      } else if (bracketed) {
+        currentFull += c;
+      } else if (c === current) {
+        currentFull += c;
+      } else {
+        if (currentFull.length > 0) {
+          splits.push({
+            literal: false,
+            val: currentFull
+          });
+        }
+
+        currentFull = c;
+        current = c;
+      }
     }
 
-    if (numberingSystem) {
-      localeStr += `-nu-${numberingSystem}`;
+    if (currentFull.length > 0) {
+      splits.push({
+        literal: bracketed,
+        val: currentFull
+      });
     }
 
-    return localeStr;
-  } else {
-    return localeStr;
+    return splits;
   }
-}
 
-function mapMonths(f) {
-  const ms = [];
+  static macroTokenToFormatOpts(token) {
+    return macroTokenToFormatOpts[token];
+  }
 
-  for (let i = 1; i <= 12; i++) {
-    const dt = DateTime.utc(2016, i, 1);
-    ms.push(f(dt));
+  constructor(locale, formatOpts) {
+    this.opts = formatOpts;
+    this.loc = locale;
+    this.systemLoc = null;
   }
 
-  return ms;
-}
+  formatWithSystemDefault(dt, opts) {
+    if (this.systemLoc === null) {
+      this.systemLoc = this.loc.redefaultToSystem();
+    }
+
+    const df = this.systemLoc.dtFormatter(dt, { ...this.opts,
+      ...opts
+    });
+    return df.format();
+  }
+
+  formatDateTime(dt, opts = {}) {
+    const df = this.loc.dtFormatter(dt, { ...this.opts,
+      ...opts
+    });
+    return df.format();
+  }
+
+  formatDateTimeParts(dt, opts = {}) {
+    const df = this.loc.dtFormatter(dt, { ...this.opts,
+      ...opts
+    });
+    return df.formatToParts();
+  }
+
+  resolvedOptions(dt, opts = {}) {
+    const df = this.loc.dtFormatter(dt, { ...this.opts,
+      ...opts
+    });
+    return df.resolvedOptions();
+  }
+
+  num(n, p = 0) {
+    // we get some perf out of doing this here, annoyingly
+    if (this.opts.forceSimple) {
+      return padStart(n, p);
+    }
+
+    const opts = { ...this.opts
+    };
+
+    if (p > 0) {
+      opts.padTo = p;
+    }
+
+    return this.loc.numberFormatter(opts).format(n);
+  }
+
+  formatDateTimeFromString(dt, fmt) {
+    const knownEnglish = this.loc.listingMode() === "en",
+          useDateTimeFormatter = this.loc.outputCalendar && this.loc.outputCalendar !== "gregory",
+          string = (opts, extract) => this.loc.extract(dt, opts, extract),
+          formatOffset = opts => {
+      if (dt.isOffsetFixed && dt.offset === 0 && opts.allowZ) {
+        return "Z";
+      }
+
+      return dt.isValid ? dt.zone.formatOffset(dt.ts, opts.format) : "";
+    },
+          meridiem = () => knownEnglish ? meridiemForDateTime(dt) : string({
+      hour: "numeric",
+      hourCycle: "h12"
+    }, "dayperiod"),
+          month = (length, standalone) => knownEnglish ? monthForDateTime(dt, length) : string(standalone ? {
+      month: length
+    } : {
+      month: length,
+      day: "numeric"
+    }, "month"),
+          weekday = (length, standalone) => knownEnglish ? weekdayForDateTime(dt, length) : string(standalone ? {
+      weekday: length
+    } : {
+      weekday: length,
+      month: "long",
+      day: "numeric"
+    }, "weekday"),
+          maybeMacro = token => {
+      const formatOpts = Formatter.macroTokenToFormatOpts(token);
+
+      if (formatOpts) {
+        return this.formatWithSystemDefault(dt, formatOpts);
+      } else {
+        return token;
+      }
+    },
+          era = length => knownEnglish ? eraForDateTime(dt, length) : string({
+      era: length
+    }, "era"),
+          tokenToString = token => {
+      // Where possible: http://cldr.unicode.org/translation/date-time-1/date-time#TOC-Standalone-vs.-Format-Styles
+      switch (token) {
+        // ms
+        case "S":
+          return this.num(dt.millisecond);
+
+        case "u": // falls through
+
+        case "SSS":
+          return this.num(dt.millisecond, 3);
+        // seconds
+
+        case "s":
+          return this.num(dt.second);
+
+        case "ss":
+          return this.num(dt.second, 2);
+        // fractional seconds
+
+        case "uu":
+          return this.num(Math.floor(dt.millisecond / 10), 2);
+
+        case "uuu":
+          return this.num(Math.floor(dt.millisecond / 100));
+        // minutes
+
+        case "m":
+          return this.num(dt.minute);
+
+        case "mm":
+          return this.num(dt.minute, 2);
+        // hours
+
+        case "h":
+          return this.num(dt.hour % 12 === 0 ? 12 : dt.hour % 12);
+
+        case "hh":
+          return this.num(dt.hour % 12 === 0 ? 12 : dt.hour % 12, 2);
+
+        case "H":
+          return this.num(dt.hour);
+
+        case "HH":
+          return this.num(dt.hour, 2);
+        // offset
+
+        case "Z":
+          // like +6
+          return formatOffset({
+            format: "narrow",
+            allowZ: this.opts.allowZ
+          });
 
-function mapWeekdays(f) {
-  const ms = [];
+        case "ZZ":
+          // like +06:00
+          return formatOffset({
+            format: "short",
+            allowZ: this.opts.allowZ
+          });
 
-  for (let i = 1; i <= 7; i++) {
-    const dt = DateTime.utc(2016, 11, 13 + i);
-    ms.push(f(dt));
-  }
+        case "ZZZ":
+          // like +0600
+          return formatOffset({
+            format: "techie",
+            allowZ: this.opts.allowZ
+          });
 
-  return ms;
-}
+        case "ZZZZ":
+          // like EST
+          return dt.zone.offsetName(dt.ts, {
+            format: "short",
+            locale: this.loc.locale
+          });
 
-function listStuff(loc, length, defaultOK, englishFn, intlFn) {
-  const mode = loc.listingMode(defaultOK);
+        case "ZZZZZ":
+          // like Eastern Standard Time
+          return dt.zone.offsetName(dt.ts, {
+            format: "long",
+            locale: this.loc.locale
+          });
+        // zone
 
-  if (mode === "error") {
-    return null;
-  } else if (mode === "en") {
-    return englishFn(length);
-  } else {
-    return intlFn(length);
-  }
-}
+        case "z":
+          // like America/New_York
+          return dt.zoneName;
+        // meridiems
 
-function supportsFastNumbers(loc) {
-  if (loc.numberingSystem && loc.numberingSystem !== "latn") {
-    return false;
-  } else {
-    return loc.numberingSystem === "latn" || !loc.locale || loc.locale.startsWith("en") || new Intl.DateTimeFormat(loc.intl).resolvedOptions().numberingSystem === "latn";
-  }
-}
-/**
- * @private
- */
+        case "a":
+          return meridiem();
+        // dates
 
+        case "d":
+          return useDateTimeFormatter ? string({
+            day: "numeric"
+          }, "day") : this.num(dt.day);
 
-class PolyNumberFormatter {
-  constructor(intl, forceSimple, opts) {
-    this.padTo = opts.padTo || 0;
-    this.floor = opts.floor || false;
-    const {
-      padTo,
-      floor,
-      ...otherOpts
-    } = opts;
+        case "dd":
+          return useDateTimeFormatter ? string({
+            day: "2-digit"
+          }, "day") : this.num(dt.day, 2);
+        // weekdays - standalone
 
-    if (!forceSimple || Object.keys(otherOpts).length > 0) {
-      const intlOpts = {
-        useGrouping: false,
-        ...opts
-      };
-      if (opts.padTo > 0) intlOpts.minimumIntegerDigits = opts.padTo;
-      this.inf = getCachedINF(intl, intlOpts);
-    }
-  }
+        case "c":
+          // like 1
+          return this.num(dt.weekday);
 
-  format(i) {
-    if (this.inf) {
-      const fixed = this.floor ? Math.floor(i) : i;
-      return this.inf.format(fixed);
-    } else {
-      // to match the browser's numberformatter defaults
-      const fixed = this.floor ? Math.floor(i) : roundTo(i, 3);
-      return padStart(fixed, this.padTo);
-    }
-  }
+        case "ccc":
+          // like 'Tues'
+          return weekday("short", true);
 
-}
-/**
- * @private
- */
+        case "cccc":
+          // like 'Tuesday'
+          return weekday("long", true);
 
+        case "ccccc":
+          // like 'T'
+          return weekday("narrow", true);
+        // weekdays - format
 
-class PolyDateFormatter {
-  constructor(dt, intl, opts) {
-    this.opts = opts;
-    let z;
+        case "E":
+          // like 1
+          return this.num(dt.weekday);
 
-    if (dt.zone.isUniversal) {
-      // UTC-8 or Etc/UTC-8 are not part of tzdata, only Etc/GMT+8 and the like.
-      // That is why fixed-offset TZ is set to that unless it is:
-      // 1. Representing offset 0 when UTC is used to maintain previous behavior and does not become GMT.
-      // 2. Unsupported by the browser:
-      //    - some do not support Etc/
-      //    - < Etc/GMT-14, > Etc/GMT+12, and 30-minute or 45-minute offsets are not part of tzdata
-      const gmtOffset = -1 * (dt.offset / 60);
-      const offsetZ = gmtOffset >= 0 ? `Etc/GMT+${gmtOffset}` : `Etc/GMT${gmtOffset}`;
+        case "EEE":
+          // like 'Tues'
+          return weekday("short", false);
 
-      if (dt.offset !== 0 && IANAZone.create(offsetZ).valid) {
-        z = offsetZ;
-        this.dt = dt;
-      } else {
-        // Not all fixed-offset zones like Etc/+4:30 are present in tzdata.
-        // So we have to make do. Two cases:
-        // 1. The format options tell us to show the zone. We can't do that, so the best
-        // we can do is format the date in UTC.
-        // 2. The format options don't tell us to show the zone. Then we can adjust them
-        // the time and tell the formatter to show it to us in UTC, so that the time is right
-        // and the bad zone doesn't show up.
-        z = "UTC";
+        case "EEEE":
+          // like 'Tuesday'
+          return weekday("long", false);
 
-        if (opts.timeZoneName) {
-          this.dt = dt;
-        } else {
-          this.dt = dt.offset === 0 ? dt : DateTime.fromMillis(dt.ts + dt.offset * 60 * 1000);
-        }
-      }
-    } else if (dt.zone.type === "system") {
-      this.dt = dt;
-    } else {
-      this.dt = dt;
-      z = dt.zone.name;
-    }
+        case "EEEEE":
+          // like 'T'
+          return weekday("narrow", false);
+        // months - standalone
 
-    const intlOpts = { ...this.opts
-    };
+        case "L":
+          // like 1
+          return useDateTimeFormatter ? string({
+            month: "numeric",
+            day: "numeric"
+          }, "month") : this.num(dt.month);
 
-    if (z) {
-      intlOpts.timeZone = z;
-    }
+        case "LL":
+          // like 01, doesn't seem to work
+          return useDateTimeFormatter ? string({
+            month: "2-digit",
+            day: "numeric"
+          }, "month") : this.num(dt.month, 2);
 
-    this.dtf = getCachedDTF(intl, intlOpts);
-  }
+        case "LLL":
+          // like Jan
+          return month("short", true);
 
-  format() {
-    return this.dtf.format(this.dt.toJSDate());
-  }
+        case "LLLL":
+          // like January
+          return month("long", true);
 
-  formatToParts() {
-    return this.dtf.formatToParts(this.dt.toJSDate());
-  }
+        case "LLLLL":
+          // like J
+          return month("narrow", true);
+        // months - format
 
-  resolvedOptions() {
-    return this.dtf.resolvedOptions();
-  }
+        case "M":
+          // like 1
+          return useDateTimeFormatter ? string({
+            month: "numeric"
+          }, "month") : this.num(dt.month);
 
-}
-/**
- * @private
- */
+        case "MM":
+          // like 01
+          return useDateTimeFormatter ? string({
+            month: "2-digit"
+          }, "month") : this.num(dt.month, 2);
 
+        case "MMM":
+          // like Jan
+          return month("short", false);
 
-class PolyRelFormatter {
-  constructor(intl, isEnglish, opts) {
-    this.opts = {
-      style: "long",
-      ...opts
-    };
+        case "MMMM":
+          // like January
+          return month("long", false);
 
-    if (!isEnglish && hasRelative()) {
-      this.rtf = getCachedRTF(intl, opts);
-    }
-  }
+        case "MMMMM":
+          // like J
+          return month("narrow", false);
+        // years
 
-  format(count, unit) {
-    if (this.rtf) {
-      return this.rtf.format(count, unit);
-    } else {
-      return formatRelativeTime(unit, count, this.opts.numeric, this.opts.style !== "long");
-    }
-  }
+        case "y":
+          // like 2014
+          return useDateTimeFormatter ? string({
+            year: "numeric"
+          }, "year") : this.num(dt.year);
 
-  formatToParts(count, unit) {
-    if (this.rtf) {
-      return this.rtf.formatToParts(count, unit);
-    } else {
-      return [];
-    }
-  }
+        case "yy":
+          // like 14
+          return useDateTimeFormatter ? string({
+            year: "2-digit"
+          }, "year") : this.num(dt.year.toString().slice(-2), 2);
 
-}
-/**
- * @private
- */
+        case "yyyy":
+          // like 0012
+          return useDateTimeFormatter ? string({
+            year: "numeric"
+          }, "year") : this.num(dt.year, 4);
 
+        case "yyyyyy":
+          // like 000012
+          return useDateTimeFormatter ? string({
+            year: "numeric"
+          }, "year") : this.num(dt.year, 6);
+        // eras
 
-class Locale {
-  static fromOpts(opts) {
-    return Locale.create(opts.locale, opts.numberingSystem, opts.outputCalendar, opts.defaultToEN);
-  }
+        case "G":
+          // like AD
+          return era("short");
 
-  static create(locale, numberingSystem, outputCalendar, defaultToEN = false) {
-    const specifiedLocale = locale || Settings.defaultLocale; // the system locale is useful for human readable strings but annoying for parsing/formatting known formats
+        case "GG":
+          // like Anno Domini
+          return era("long");
 
-    const localeR = specifiedLocale || (defaultToEN ? "en-US" : systemLocale());
-    const numberingSystemR = numberingSystem || Settings.defaultNumberingSystem;
-    const outputCalendarR = outputCalendar || Settings.defaultOutputCalendar;
-    return new Locale(localeR, numberingSystemR, outputCalendarR, specifiedLocale);
-  }
+        case "GGGGG":
+          return era("narrow");
 
-  static resetCache() {
-    sysLocaleCache = null;
-    intlDTCache = {};
-    intlNumCache = {};
-    intlRelCache = {};
-  }
+        case "kk":
+          return this.num(dt.weekYear.toString().slice(-2), 2);
 
-  static fromObject({
-    locale,
-    numberingSystem,
-    outputCalendar
-  } = {}) {
-    return Locale.create(locale, numberingSystem, outputCalendar);
-  }
+        case "kkkk":
+          return this.num(dt.weekYear, 4);
 
-  constructor(locale, numbering, outputCalendar, specifiedLocale) {
-    const [parsedLocale, parsedNumberingSystem, parsedOutputCalendar] = parseLocaleString(locale);
-    this.locale = parsedLocale;
-    this.numberingSystem = numbering || parsedNumberingSystem || null;
-    this.outputCalendar = outputCalendar || parsedOutputCalendar || null;
-    this.intl = intlConfigString(this.locale, this.numberingSystem, this.outputCalendar);
-    this.weekdaysCache = {
-      format: {},
-      standalone: {}
-    };
-    this.monthsCache = {
-      format: {},
-      standalone: {}
-    };
-    this.meridiemCache = null;
-    this.eraCache = {};
-    this.specifiedLocale = specifiedLocale;
-    this.fastNumbersCached = null;
-  }
+        case "W":
+          return this.num(dt.weekNumber);
 
-  get fastNumbers() {
-    if (this.fastNumbersCached == null) {
-      this.fastNumbersCached = supportsFastNumbers(this);
-    }
+        case "WW":
+          return this.num(dt.weekNumber, 2);
 
-    return this.fastNumbersCached;
-  }
+        case "o":
+          return this.num(dt.ordinal);
 
-  listingMode() {
-    const isActuallyEn = this.isEnglish();
-    const hasNoWeirdness = (this.numberingSystem === null || this.numberingSystem === "latn") && (this.outputCalendar === null || this.outputCalendar === "gregory");
-    return isActuallyEn && hasNoWeirdness ? "en" : "intl";
-  }
+        case "ooo":
+          return this.num(dt.ordinal, 3);
 
-  clone(alts) {
-    if (!alts || Object.getOwnPropertyNames(alts).length === 0) {
-      return this;
-    } else {
-      return Locale.create(alts.locale || this.specifiedLocale, alts.numberingSystem || this.numberingSystem, alts.outputCalendar || this.outputCalendar, alts.defaultToEN || false);
-    }
-  }
+        case "q":
+          // like 1
+          return this.num(dt.quarter);
 
-  redefaultToEN(alts = {}) {
-    return this.clone({ ...alts,
-      defaultToEN: true
-    });
-  }
+        case "qq":
+          // like 01
+          return this.num(dt.quarter, 2);
 
-  redefaultToSystem(alts = {}) {
-    return this.clone({ ...alts,
-      defaultToEN: false
-    });
-  }
+        case "X":
+          return this.num(Math.floor(dt.ts / 1000));
 
-  months(length, format = false, defaultOK = true) {
-    return listStuff(this, length, defaultOK, months, () => {
-      const intl = format ? {
-        month: length,
-        day: "numeric"
-      } : {
-        month: length
-      },
-            formatStr = format ? "format" : "standalone";
+        case "x":
+          return this.num(dt.ts);
 
-      if (!this.monthsCache[formatStr][length]) {
-        this.monthsCache[formatStr][length] = mapMonths(dt => this.extract(dt, intl, "month"));
+        default:
+          return maybeMacro(token);
       }
+    };
 
-      return this.monthsCache[formatStr][length];
-    });
+    return stringifyTokens(Formatter.parseFormat(fmt), tokenToString);
   }
 
-  weekdays(length, format = false, defaultOK = true) {
-    return listStuff(this, length, defaultOK, weekdays, () => {
-      const intl = format ? {
-        weekday: length,
-        year: "numeric",
-        month: "long",
-        day: "numeric"
-      } : {
-        weekday: length
-      },
-            formatStr = format ? "format" : "standalone";
-
-      if (!this.weekdaysCache[formatStr][length]) {
-        this.weekdaysCache[formatStr][length] = mapWeekdays(dt => this.extract(dt, intl, "weekday"));
-      }
+  formatDurationFromString(dur, fmt) {
+    const tokenToField = token => {
+      switch (token[0]) {
+        case "S":
+          return "millisecond";
 
-      return this.weekdaysCache[formatStr][length];
-    });
-  }
+        case "s":
+          return "second";
 
-  meridiems(defaultOK = true) {
-    return listStuff(this, undefined, defaultOK, () => meridiems, () => {
-      // In theory there could be aribitrary day periods. We're gonna assume there are exactly two
-      // for AM and PM. This is probably wrong, but it's makes parsing way easier.
-      if (!this.meridiemCache) {
-        const intl = {
-          hour: "numeric",
-          hourCycle: "h12"
-        };
-        this.meridiemCache = [DateTime.utc(2016, 11, 13, 9), DateTime.utc(2016, 11, 13, 19)].map(dt => this.extract(dt, intl, "dayperiod"));
-      }
+        case "m":
+          return "minute";
 
-      return this.meridiemCache;
-    });
-  }
+        case "h":
+          return "hour";
 
-  eras(length, defaultOK = true) {
-    return listStuff(this, length, defaultOK, eras, () => {
-      const intl = {
-        era: length
-      }; // This is problematic. Different calendars are going to define eras totally differently. What I need is the minimum set of dates
-      // to definitely enumerate them.
+        case "d":
+          return "day";
 
-      if (!this.eraCache[length]) {
-        this.eraCache[length] = [DateTime.utc(-40, 1, 1), DateTime.utc(2017, 1, 1)].map(dt => this.extract(dt, intl, "era"));
-      }
+        case "w":
+          return "week";
 
-      return this.eraCache[length];
-    });
-  }
+        case "M":
+          return "month";
 
-  extract(dt, intlOpts, field) {
-    const df = this.dtFormatter(dt, intlOpts),
-          results = df.formatToParts(),
-          matching = results.find(m => m.type.toLowerCase() === field);
-    return matching ? matching.value : null;
-  }
+        case "y":
+          return "year";
 
-  numberFormatter(opts = {}) {
-    // this forcesimple option is never used (the only caller short-circuits on it, but it seems safer to leave)
-    // (in contrast, the rest of the condition is used heavily)
-    return new PolyNumberFormatter(this.intl, opts.forceSimple || this.fastNumbers, opts);
-  }
+        default:
+          return null;
+      }
+    },
+          tokenToString = lildur => token => {
+      const mapped = tokenToField(token);
 
-  dtFormatter(dt, intlOpts = {}) {
-    return new PolyDateFormatter(dt, this.intl, intlOpts);
-  }
+      if (mapped) {
+        return this.num(lildur.get(mapped), token.length);
+      } else {
+        return token;
+      }
+    },
+          tokens = Formatter.parseFormat(fmt),
+          realTokens = tokens.reduce((found, {
+      literal,
+      val
+    }) => literal ? found : found.concat(val), []),
+          collapsed = dur.shiftTo(...realTokens.map(tokenToField).filter(t => t));
 
-  relFormatter(opts = {}) {
-    return new PolyRelFormatter(this.intl, this.isEnglish(), opts);
+    return stringifyTokens(tokens, tokenToString(collapsed));
   }
 
-  listFormatter(opts = {}) {
-    return getCachedLF(this.intl, opts);
-  }
+}
 
-  isEnglish() {
-    return this.locale === "en" || this.locale.toLowerCase() === "en-us" || new Intl.DateTimeFormat(this.intl).resolvedOptions().locale.startsWith("en-us");
+class Invalid {
+  constructor(reason, explanation) {
+    this.reason = reason;
+    this.explanation = explanation;
   }
 
-  equals(other) {
-    return this.locale === other.locale && this.numberingSystem === other.numberingSystem && this.outputCalendar === other.outputCalendar;
+  toMessage() {
+    if (this.explanation) {
+      return `${this.reason}: ${this.explanation}`;
+    } else {
+      return this.reason;
+    }
   }
 
 }
@@ -47761,6 +47870,8 @@ class Locale {
  * Some extractions are super dumb and simpleParse and fromStrings help DRY them.
  */
 
+const ianaRegex = /[A-Za-z_+-]{1,256}(?::?\/[A-Za-z0-9_+-]{1,256}(?:\/[A-Za-z0-9_+-]{1,256})?)?/;
+
 function combineRegexes(...regexes) {
   const full = regexes.reduce((f, r) => f + r.source, "");
   return RegExp(`^${full}$`);
@@ -53026,7 +53137,7 @@ function friendlyDateTime(dateTimeish) {
   }
 }
 
-const VERSION = "3.1.0";
+const VERSION = "3.1.1";
 
 exports.DateTime = DateTime;
 exports.Duration = Duration;