@nmshd/consumption 2.0.0-beta.2 → 2.0.0-beta.5

package/lib-web/nmshd.consumption.js

@@ -17,10 +17,10 @@ const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 exports.buildInformation = {
-    version: "2.0.0-beta.2",
-    build: "52",
-    date: "2022-07-21T12:41:03+00:00",
-    commit: "5ae49a7cb3ded2b90958e44e4f3e03599ba6cc9c",
+    version: "2.0.0-beta.5",
+    build: "55",
+    date: "2022-08-02T14:10:27+00:00",
+    commit: "a910348a6c8c7ba541017cbc90d2fba2add16b68",
     dependencies: {"@js-soft/docdb-querytranslator":"^1.1.0","ts-simple-nameof":"^1.3.1"},
     libraries: {
         transport: transport_1.buildInformation,
@@ -168,6 +168,7 @@ var ConsumptionControllerName;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ConsumptionErrors = void 0;
+const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 class Attributes {
     attributeExists(id) {
@@ -178,16 +179,42 @@ class Attributes {
     }
 }
 class Requests {
+    constructor() {
+        this.decideValidation = new Requests._decideValidation();
+    }
     requestExists(id) {
         return new transport_1.CoreError("error.consumption.requests.requestExists", `Request with id ${id} already exists and can't be created.`);
     }
     unexpectedErrorDuringRequestItemProcessing(error) {
-        return new transport_1.CoreError("error.consumption.requests.unexpectedErrorDuringRequestItemProcessing", error instanceof Error ? error.message : "Unknown error: '${JSON.stringify(e)'");
+        return new transport_1.CoreError("error.consumption.requests.unexpectedErrorDuringRequestItemProcessing", error instanceof Error ? error.message : "Unknown error: '${JSON.stringify(e)'", undefined, undefined, error);
+    }
+    servalErrorDuringRequestItemProcessing(error) {
+        return new transport_1.CoreError("error.consumption.requests.servalErrorDuringRequestItemProcessing", error instanceof Error ? error.message : "Serval error: '${JSON.stringify(e)'", undefined, undefined, error);
     }
     invalidRequestItem(message) {
         return new transport_1.CoreError("error.consumption.requests.invalidRequestItem", message);
     }
 }
+Requests._decideValidation = class {
+    invalidRequestId() {
+        return new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidRequestId", "The id of the Request does not match the id of the Response");
+    }
+    invalidNumberOfItems(message) {
+        return new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidNumberOfItems", message);
+    }
+    itemAcceptedButParentNotAccepted(message) {
+        return new ts_utils_1.ApplicationError("error.requests.decide.validation.itemAcceptedButParentNotAccepted", message);
+    }
+    mustBeAcceptedItemNotAccepted(message) {
+        return new ts_utils_1.ApplicationError("error.requests.decide.validation.mustBeAcceptedItemNotAccepted", message);
+    }
+    requestItemAnsweredAsRequestItemGroup() {
+        return new ts_utils_1.ApplicationError("error.requests.decide.validation.requestItemAnsweredAsRequestItemGroup", "The RequestItem was answered as a RequestItemGroup.");
+    }
+    requestItemGroupAnsweredAsRequestItem() {
+        return new ts_utils_1.ApplicationError("error.requests.decide.validation.requestItemGroupAnsweredAsRequestItem", "The RequestItemGroup was answered as a RequestItem.");
+    }
+};
 class RelationshipInfo {
     relationshipInfoExists(relationshipId) {
         return new transport_1.CoreError("error.consumption.relationshipInfos.relationshipInfoExists", `RelationshipInfo for Relationship ${relationshipId} already exists.`);
@@ -1498,19 +1525,19 @@ __exportStar(__webpack_require__(/*! ./OutgoingRequestStatusChangedEvent */ "./d
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DecideRequestParametersValidator = void 0;
-const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
 const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
+const consumption_1 = __webpack_require__(/*! ../../../consumption */ "./dist/consumption/index.js");
 const ValidationResult_1 = __webpack_require__(/*! ../itemProcessors/ValidationResult */ "./dist/modules/requests/itemProcessors/ValidationResult.js");
 const DecideRequestItemGroupParameters_1 = __webpack_require__(/*! ./decide/DecideRequestItemGroupParameters */ "./dist/modules/requests/incoming/decide/DecideRequestItemGroupParameters.js");
 const DecideRequestItemParameters_1 = __webpack_require__(/*! ./decide/DecideRequestItemParameters */ "./dist/modules/requests/incoming/decide/DecideRequestItemParameters.js");
 class DecideRequestParametersValidator {
     validate(params, request) {
         if (!request.id.equals(transport_1.CoreId.from(params.requestId))) {
-            return ValidationResult_1.ValidationResult.error(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidRequestId", "The id of the Request does not match the id of the Response"));
+            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.invalidRequestId());
         }
         if (params.items.length !== request.content.items.length) {
-            return ValidationResult_1.ValidationResult.error(this.invalidNumberOfItemsError("Number of items in Request and Response do not match"));
+            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.invalidNumberOfItems("Number of items in Request and Response do not match"));
         }
         const validationResults = request.content.items.map((requestItem, index) => this.checkItemOrGroup(requestItem, params.items[index], params.accept));
         return ValidationResult_1.ValidationResult.fromItems(validationResults);
@@ -1523,36 +1550,33 @@ class DecideRequestParametersValidator {
     }
     checkItem(requestItem, response, isParentAccepted) {
         if ((0, DecideRequestItemGroupParameters_1.isDecideRequestItemGroupParametersJSON)(response)) {
-            return ValidationResult_1.ValidationResult.error(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", "The RequestItem was answered as a RequestItemGroup."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.requestItemAnsweredAsRequestItemGroup());
         }
         if (!isParentAccepted && response.accept) {
-            return ValidationResult_1.ValidationResult.error(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", "The RequestItem was accepted, but the parent was not accepted."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.itemAcceptedButParentNotAccepted("The RequestItem was accepted, but the parent was not accepted."));
         }
         if (isParentAccepted && requestItem.mustBeAccepted && !response.accept) {
-            return ValidationResult_1.ValidationResult.error(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", "The RequestItem is flagged as 'mustBeAccepted', but it was not accepted."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.mustBeAcceptedItemNotAccepted("The RequestItem is flagged as 'mustBeAccepted', but it was not accepted."));
         }
         return ValidationResult_1.ValidationResult.success();
     }
     checkItemGroup(requestItemGroup, responseItemGroup, isParentAccepted) {
         if ((0, DecideRequestItemParameters_1.isDecideRequestItemParametersJSON)(responseItemGroup)) {
-            return ValidationResult_1.ValidationResult.error(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", "The RequestItemGroup was answered as a RequestItem."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.requestItemGroupAnsweredAsRequestItem());
         }
         if (responseItemGroup.items.length !== requestItemGroup.items.length) {
-            return ValidationResult_1.ValidationResult.error(this.invalidNumberOfItemsError("Number of items in RequestItemGroup and ResponseItemGroup do not match"));
+            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.invalidNumberOfItems("Number of items in RequestItemGroup and ResponseItemGroup do not match"));
         }
         const isGroupAccepted = responseItemGroup.items.some((value) => value.accept);
         if (!isParentAccepted && isGroupAccepted) {
-            return ValidationResult_1.ValidationResult.error(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", "The RequestItemGroup was accepted, but the parent was not accepted."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.itemAcceptedButParentNotAccepted("The RequestItemGroup was accepted, but the parent was not accepted."));
         }
         if (isParentAccepted && requestItemGroup.mustBeAccepted && !isGroupAccepted) {
-            return ValidationResult_1.ValidationResult.error(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", "The RequestItemGroup is flagged as 'mustBeAccepted', but it was not accepted. Please accept all 'mustBeAccepted' items in this group."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.mustBeAcceptedItemNotAccepted("The RequestItemGroup is flagged as 'mustBeAccepted', but it was not accepted. Please accept all 'mustBeAccepted' items in this group."));
         }
         const validationResults = requestItemGroup.items.map((requestItem, index) => this.checkItem(requestItem, responseItemGroup.items[index], isGroupAccepted));
         return ValidationResult_1.ValidationResult.fromItems(validationResults);
     }
-    invalidNumberOfItemsError(message) {
-        return new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidNumberOfItems", message);
-    }
 }
 exports.DecideRequestParametersValidator = DecideRequestParametersValidator;
 //# sourceMappingURL=DecideRequestParametersValidator.js.map
@@ -1569,6 +1593,7 @@ exports.DecideRequestParametersValidator = DecideRequestParametersValidator;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.IncomingRequestsController = void 0;
+const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
 const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 const consumption_1 = __webpack_require__(/*! ../../../consumption */ "./dist/consumption/index.js");
@@ -1721,12 +1746,14 @@ class IncomingRequestsController extends consumption_1.ConsumptionBaseController
     async canDecideItem(params, requestItem, request) {
         const processor = this.processorRegistry.getProcessorForItem(requestItem);
         try {
-            if (params.accept) {
+            if (params.accept)
                 return await processor.canAccept(requestItem, params, request);
-            }
             return await processor.canReject(requestItem, params, request);
         }
         catch (e) {
+            if (e instanceof ts_serval_1.ServalError) {
+                return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.servalErrorDuringRequestItemProcessing(e));
+            }
             return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.unexpectedErrorDuringRequestItemProcessing(e));
         }
     }
@@ -1815,20 +1842,17 @@ class IncomingRequestsController extends consumption_1.ConsumptionBaseController
             throw new Error("Cannot decide own Request");
         }
         this.assertRequestStatus(request, LocalRequestStatus_1.LocalRequestStatus.Decided);
-        let responseSource;
-        if (parsedParams.responseSourceObject instanceof transport_1.Message) {
-            responseSource = "Message";
+        const requestIsRejected = request.response.content.result === content_1.ResponseResult.Rejected;
+        const requestIsFromTemplate = request.source.type === "RelationshipTemplate";
+        if (parsedParams.responseSourceObject) {
+            request.response.source = LocalResponse_1.LocalResponseSource.from({
+                type: parsedParams.responseSourceObject instanceof transport_1.Message ? "Message" : "RelationshipChange",
+                reference: parsedParams.responseSourceObject.id
+            });
         }
-        else if (parsedParams.responseSourceObject instanceof transport_1.RelationshipChange) {
-            responseSource = "RelationshipChange";
+        else if (!requestIsRejected || !requestIsFromTemplate) {
+            throw new Error("A Request can only be completed without a responseSource if the Request is rejected and the Request is from a Relationship Template");
         }
-        else {
-            throw new Error("Unknown response source");
-        }
-        request.response.source = LocalResponse_1.LocalResponseSource.from({
-            type: responseSource,
-            reference: parsedParams.responseSourceObject.id
-        });
         request.changeStatus(LocalRequestStatus_1.LocalRequestStatus.Completed);
         await this.update(request);
         this.eventBus.publish(new events_1.IncomingRequestStatusChangedEvent(this.identity.address.toString(), {
@@ -1947,7 +1971,7 @@ __decorate([
 ], CompleteIncomingRequestParameters.prototype, "requestId", void 0);
 __decorate([
     (0, ts_serval_1.serialize)({ unionTypes: [transport_1.Message, transport_1.RelationshipChange] }),
-    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.validate)({ nullable: true }),
     __metadata("design:type", Object)
 ], CompleteIncomingRequestParameters.prototype, "responseSourceObject", void 0);
 exports.CompleteIncomingRequestParameters = CompleteIncomingRequestParameters;
@@ -2399,30 +2423,19 @@ const consumption_1 = __webpack_require__(/*! ../../../../consumption */ "./dist
 const GenericRequestItemProcessor_1 = __webpack_require__(/*! ../GenericRequestItemProcessor */ "./dist/modules/requests/itemProcessors/GenericRequestItemProcessor.js");
 const ValidationResult_1 = __webpack_require__(/*! ../ValidationResult */ "./dist/modules/requests/itemProcessors/ValidationResult.js");
 class CreateAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.GenericRequestItemProcessor {
-    canCreateOutgoingRequestItem(requestItem, _request, recipient) {
-        const recipientIsOwnerOfTheAttribute = requestItem.attribute.owner.equals(recipient);
-        // When the owner of the Attribute is not the recipient of the Request, this means that
-        // we need to set the sourceAttributeId, because we have to set shareInfo as soon as the
-        // RequestItem was accepted.
-        if (!recipientIsOwnerOfTheAttribute && !requestItem.sourceAttributeId) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("'sourceAttributeId' cannot be undefined when sending an attribute that is not owned by the recipient."));
+    canCreateOutgoingRequestItem(requestItem, _request, _recipient) {
+        if (requestItem.attribute.owner.toString() !== "" &&
+            !requestItem.attribute.owner.equals(this.currentIdentityAddress)) {
+            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("The owner of the given `attribute` can only be an empty string. This is because you can only send Attributes where the recipient of the Request is the owner anyway. And in order to avoid mistakes, the owner will be automatically filled for you."));
         }
         if (requestItem.attribute instanceof content_1.IdentityAttribute) {
             return this.canCreateRequestItemWithIdentityAttribute(requestItem);
         }
-        return this.canCreateRequestItemWithRelationshipAttribute(requestItem);
-    }
-    canCreateRequestItemWithIdentityAttribute(requestItem) {
-        const iAmOwnerOfTheAttribute = this.accountController.identity.isMe(requestItem.attribute.owner);
-        if (!iAmOwnerOfTheAttribute) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem(`Cannot send Identity Attributes of which you are not the owner via ${content_1.CreateAttributeRequestItem.name}. Consider using a ${content_1.ProposeAttributeRequestItem.name} instead.`));
-        }
         return ValidationResult_1.ValidationResult.success();
     }
-    canCreateRequestItemWithRelationshipAttribute(requestItem) {
-        const iAmOwnerOfTheAttribute = this.accountController.identity.isMe(requestItem.attribute.owner);
-        if (!iAmOwnerOfTheAttribute) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("Cannot send Relationship Attributes of which you are not the owner."));
+    canCreateRequestItemWithIdentityAttribute(requestItem) {
+        if (!requestItem.sourceAttributeId) {
+            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("'sourceAttributeId' cannot be undefined when sending an Identity Attribute."));
         }
         return ValidationResult_1.ValidationResult.success();
     }
@@ -2557,7 +2570,7 @@ class ProposeAttributeRequestItemProcessor extends GenericRequestItemProcessor_1
     }
     validateAttribute(attribute) {
         if (attribute.owner.toString() !== "") {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("The owner of the given attribute can only be an empty string. This is because you can only propose Attributes where the recipient of the Request is the owner anyway. And in order to avoid mistakes, the owner will be automatically filled for you."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("The owner of the given `attribute` can only be an empty string. This is because you can only propose Attributes where the recipient of the Request is the owner anyway. And in order to avoid mistakes, the owner will be automatically filled for you."));
         }
         return ValidationResult_1.ValidationResult.success();
     }
@@ -2567,7 +2580,7 @@ class ProposeAttributeRequestItemProcessor extends GenericRequestItemProcessor_1
             return commonQueryValidationResult;
         }
         if (requestItem.query instanceof content_1.RelationshipAttributeQuery && requestItem.query.owner.toString() !== "") {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("The owner of the given query can only be an empty string. This is because you can only propose Attributes where the recipient of the Request is the owner anyway. And in order to avoid mistakes, the owner will be automatically filled for you."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("The owner of the given `query` can only be an empty string. This is because you can only propose Attributes where the recipient of the Request is the owner anyway. And in order to avoid mistakes, the owner will be automatically filled for you."));
         }
         return ValidationResult_1.ValidationResult.success();
     }
@@ -4184,12 +4197,19 @@ __webpack_require__(/*! reflect-metadata */ "./node_modules/reflect-metadata/Ref
 const EventBus_1 = __webpack_require__(/*! ../EventBus */ "./node_modules/@js-soft/ts-utils/dist/eventBus/EventBus.js");
 const SubscriptionTargetInfo_1 = __webpack_require__(/*! ../SubscriptionTargetInfo */ "./node_modules/@js-soft/ts-utils/dist/eventBus/SubscriptionTargetInfo.js");
 class EventEmitter2EventBus {
+    errorCallback;
     emitter;
     listeners = new Map();
     nextId = 0;
     invocationPromises = [];
-    constructor(options) {
-        this.emitter = new eventemitter2_1.EventEmitter2({ ...options, wildcard: true, maxListeners: 50, verboseMemoryLeak: true });
+    constructor(errorCallback, eventEmitter2Options) {
+        this.errorCallback = errorCallback;
+        this.emitter = new eventemitter2_1.EventEmitter2({
+            maxListeners: 50,
+            verboseMemoryLeak: true,
+            ...eventEmitter2Options,
+            wildcard: true
+        });
     }
     subscribe(subscriptionTarget, handler) {
         return this.registerHandler(subscriptionTarget, handler);
@@ -4209,7 +4229,7 @@ class EventEmitter2EventBus {
             }
             const invocationPromise = (async () => await handler(event))();
             this.invocationPromises.push(invocationPromise);
-            await invocationPromise;
+            await invocationPromise.catch((e) => this.errorCallback(e, subscriptionTargetInfo.namespace));
             this.invocationPromises = this.invocationPromises.filter((p) => p !== invocationPromise);
             if (isOneTimeHandler)
                 this.listeners.delete(listenerId);
@@ -4273,7 +4293,11 @@ exports.EventEmitter2EventBus = EventEmitter2EventBus;
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -4342,7 +4366,11 @@ exports.Event = Event;
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -4367,7 +4395,11 @@ __exportStar(__webpack_require__(/*! ./Event */ "./node_modules/@js-soft/ts-util
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -4492,6 +4524,9 @@ class ApplicationError extends Error {
     equals(error) {
         return this.code === error.code;
     }
+    toString() {
+        return JSON.stringify(this, undefined, 2);
+    }
 }
 exports.ApplicationError = ApplicationError;
 //# sourceMappingURL=ApplicationError.js.map
@@ -4537,7 +4572,7 @@ class Result {
     }
     get value() {
         if (!this.isSuccess) {
-            throw new Error("Can't get the value of an error result. Use 'error' instead.");
+            throw new Error(`Can't get the value of an error result. Use 'error' instead. Root error: \r\n${this.error}`);
         }
         return this._value;
     }
@@ -4563,7 +4598,11 @@ exports.Result = Result;
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -4705,7 +4744,7 @@ var __WEBPACK_AMD_DEFINE_RESULT__;/*!
     var obj = {};
     var key;
     var len = keys.length;
-    var valuesCount = values ? value.length : 0;
+    var valuesCount = values ? values.length : 0;
     for (var i = 0; i < len; i++) {
       key = keys[i];
       obj[key] = i < valuesCount ? values[i] : undefined;