@nmshd/runtime 1.2.12 → 1.2.16

package/dist/dataViews/transport/MessageDVO.js

@@ -3,9 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageStatus = void 0;
 var MessageStatus;
 (function (MessageStatus) {
-    MessageStatus["Received"] = "received";
-    MessageStatus["Delivering"] = "delivering";
-    MessageStatus["Delivered"] = "delivered";
-    MessageStatus["Errorneous"] = "errorneous";
+    /**
+     * Message was received
+     */
+    MessageStatus["Received"] = "Received";
+    /**
+     * Message was sent but is not yet received by every recipient
+     */
+    MessageStatus["Delivering"] = "Delivering";
+    /**
+     * Message was sent and was received by every recipient
+     */
+    MessageStatus["Delivered"] = "Delivered";
 })(MessageStatus = exports.MessageStatus || (exports.MessageStatus = {}));
 //# sourceMappingURL=MessageDVO.js.map

package/dist/dataViews/transport/MessageDVO.js.map

@@ -1 +1 @@
-{"version":3,"file":"MessageDVO.js","sourceRoot":"","sources":["../../../src/dataViews/transport/MessageDVO.ts"],"names":[],"mappings":";;;AAIA,IAAY,aAKX;AALD,WAAY,aAAa;IACrB,sCAAqB,CAAA;IACrB,0CAAyB,CAAA;IACzB,wCAAuB,CAAA;IACvB,0CAAyB,CAAA;AAC7B,CAAC,EALW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAKxB"}
+{"version":3,"file":"MessageDVO.js","sourceRoot":"","sources":["../../../src/dataViews/transport/MessageDVO.ts"],"names":[],"mappings":";;;AAIA,IAAY,aAaX;AAbD,WAAY,aAAa;IACrB;;OAEG;IACH,sCAAqB,CAAA;IACrB;;OAEG;IACH,0CAAyB,CAAA;IACzB;;OAEG;IACH,wCAAuB,CAAA;AAC3B,CAAC,EAbW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAaxB"}

package/dist/dataViews/transport/RelationshipDVO.d.ts

@@ -1,9 +1,18 @@
+import { RelationshipChangeStatus, RelationshipChangeType } from "@nmshd/transport";
 import { DataViewObject } from "../DataViewObject";
+export declare enum RelationshipDirection {
+    Outgoing = "Outgoing",
+    Incoming = "Incoming"
+}
 export interface RelationshipDVO extends DataViewObject {
     type: "RelationshipDVO";
     status: string;
+    direction: string;
+    statusText: string;
     isPinned: boolean;
     theme: RelationshipTheme;
+    changes: RelationshipChangeDVO[];
+    changeCount: number;
 }
 export interface RelationshipTheme {
     image?: string;
@@ -11,3 +20,27 @@ export interface RelationshipTheme {
     backgroundColor?: string;
     foregroundColor?: string;
 }
+export interface RelationshipChangeDVO extends DataViewObject {
+    type: "RelationshipChangeDVO";
+    request: RelationshipChangeRequestDVO;
+    response?: RelationshipChangeResponseDVO;
+    status: RelationshipChangeStatus;
+    statusText: string;
+    changeType: RelationshipChangeType;
+    changeTypeText: string;
+    isOwn: boolean;
+}
+export interface RelationshipChangeRequestDVO extends DataViewObject {
+    type: "RelationshipChangeRequestDVO";
+    createdBy: string;
+    createdByDevice: string;
+    createdAt: string;
+    content?: any;
+}
+export interface RelationshipChangeResponseDVO extends DataViewObject {
+    type: "RelationshipChangeResponseDVO";
+    createdBy: string;
+    createdByDevice: string;
+    createdAt: string;
+    content?: any;
+}

package/dist/dataViews/transport/RelationshipDVO.js

@@ -1,3 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.RelationshipDirection = void 0;
+var RelationshipDirection;
+(function (RelationshipDirection) {
+    RelationshipDirection["Outgoing"] = "Outgoing";
+    RelationshipDirection["Incoming"] = "Incoming";
+})(RelationshipDirection = exports.RelationshipDirection || (exports.RelationshipDirection = {}));
 //# sourceMappingURL=RelationshipDVO.js.map

package/dist/dataViews/transport/RelationshipDVO.js.map

@@ -1 +1 @@
-{"version":3,"file":"RelationshipDVO.js","sourceRoot":"","sources":["../../../src/dataViews/transport/RelationshipDVO.ts"],"names":[],"mappings":""}
+{"version":3,"file":"RelationshipDVO.js","sourceRoot":"","sources":["../../../src/dataViews/transport/RelationshipDVO.ts"],"names":[],"mappings":";;;AAGA,IAAY,qBAGX;AAHD,WAAY,qBAAqB;IAC7B,8CAAqB,CAAA;IACrB,8CAAqB,CAAA;AACzB,CAAC,EAHW,qBAAqB,GAArB,6BAAqB,KAArB,6BAAqB,QAGhC"}

package/dist/useCases/common/QRCode.js

@@ -29,7 +29,7 @@ class QRCode {
         return this.base64;
     }
     static async from(utf8Content) {
-        const dataUrl = await QRCodeLibrary.toDataURL(utf8Content);
+        const dataUrl = await QRCodeLibrary.toDataURL(`nmshd://qr#${utf8Content}`);
         const base64 = dataUrl.split(",")[1];
         return new QRCode(base64);
     }

package/dist/useCases/common/QRCode.js.map

@@ -1 +1 @@
-{"version":3,"file":"QRCode.js","sourceRoot":"","sources":["../../../src/useCases/common/QRCode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAwC;AAExC,MAAa,MAAM;IACf,YAAqC,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;IAAG,CAAC;IAEhD,QAAQ;QACX,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,WAAmB;QACxC,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAC3D,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAErC,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;CACJ;AAbD,wBAaC"}
+{"version":3,"file":"QRCode.js","sourceRoot":"","sources":["../../../src/useCases/common/QRCode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAwC;AAExC,MAAa,MAAM;IACf,YAAqC,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;IAAG,CAAC;IAEhD,QAAQ;QACX,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,WAAmB;QACxC,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,SAAS,CAAC,cAAc,WAAW,EAAE,CAAC,CAAC;QAC3E,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAErC,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;CACJ;AAbD,wBAaC"}

package/lib-web/nmshd.runtime.js

@@ -327,11 +327,11 @@ const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 exports.buildInformation = {
-    version: "1.2.12",
-    build: "27",
-    date: "2022-01-11T08:20:35+00:00",
-    commit: "1d2fdee12e0673b3e7dfbed11a83f6f500a5b313",
-    dependencies: {"@js-soft/docdb-querytranslator":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"1.0.2","@js-soft/ts-utils":"^1.1.1","@nmshd/consumption":"1.0.11","@nmshd/content":"1.1.2","@nmshd/crypto":"1.0.6","@nmshd/transport":"1.1.5","ajv":"^8.8.2","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","fluent-ts-validator":"3.0.2","json-stringify-safe":"^5.0.1","luxon":"^2.3.0","qrcode":"1.5.0","reflect-metadata":"0.1.13","ts-simple-nameof":"1.3.1","typescript-ioc":"3.2.2"},
+    version: "1.2.16",
+    build: "31",
+    date: "2022-01-21T10:36:06+00:00",
+    commit: "2a31bb2f8d8166ef9ed7e7c318d9ec99ddf95c18",
+    dependencies: {"@js-soft/docdb-querytranslator":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"1.0.2","@js-soft/ts-utils":"^1.1.1","@nmshd/consumption":"1.0.12","@nmshd/content":"1.1.3","@nmshd/crypto":"1.0.7","@nmshd/transport":"1.1.6","ajv":"^8.9.0","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","fluent-ts-validator":"3.0.2","json-stringify-safe":"^5.0.1","luxon":"^2.3.0","qrcode":"1.5.0","reflect-metadata":"0.1.13","ts-simple-nameof":"1.3.1","typescript-ioc":"3.2.2"},
     libraries: {
         serval: ts_serval_1.buildInformation,
         consumption: consumption_1.buildInformation,
@@ -373,6 +373,7 @@ const ConsumptionServices_1 = __webpack_require__(/*! ../extensibility/Consumpti
 const useCases_1 = __webpack_require__(/*! ../useCases */ "./dist/useCases/index.js");
 const DataViewTranslateable_1 = __webpack_require__(/*! ./DataViewTranslateable */ "./dist/dataViews/DataViewTranslateable.js");
 const MessageDVO_1 = __webpack_require__(/*! ./transport/MessageDVO */ "./dist/dataViews/transport/MessageDVO.js");
+const RelationshipDVO_1 = __webpack_require__(/*! ./transport/RelationshipDVO */ "./dist/dataViews/transport/RelationshipDVO.js");
 let DataViewExpander = class DataViewExpander {
     constructor(transport, consumption, identityController) {
         this.transport = transport;
@@ -461,6 +462,8 @@ let DataViewExpander = class DataViewExpander {
     }
     async expandMessageDTO(message) {
         const recipientRelationships = await this.expandRecipients(message.recipients);
+        const addressMap = {};
+        recipientRelationships.forEach((value) => (addressMap[value.id] = value));
         const createdByRelationship = await this.expandAddress(message.createdBy);
         const fileIds = [];
         const filePromises = [];
@@ -476,13 +479,19 @@ let DataViewExpander = class DataViewExpander {
         }
         const files = await Promise.all(filePromises);
         const isOwn = this.identityController.isMe(transport_1.CoreAddress.from(message.createdBy));
+        let peer;
         let status = MessageDVO_1.MessageStatus.Received;
         if (isOwn) {
             const receivedByEveryone = message.recipients.every((r) => !!r.receivedAt);
             status = receivedByEveryone ? MessageDVO_1.MessageStatus.Delivered : MessageDVO_1.MessageStatus.Delivering;
+            // Overwrite the RecipientDVO to be a IdentityDVO for this special case
+            peer = { ...recipientRelationships[0], type: "IdentityDVO" };
+        }
+        else {
+            peer = createdByRelationship;
         }
         const name = DataViewTranslateable_1.DataViewTranslateable.transport.messageName;
-        const value = {
+        const messageDVO = {
             id: message.id,
             name: name,
             date: message.createdAt,
@@ -496,38 +505,42 @@ let DataViewExpander = class DataViewExpander {
             recipientCount: message.recipients.length,
             attachmentCount: message.attachments.length,
             status,
-            image: ""
+            statusText: `i18n://dvo.message.${status}`,
+            image: "",
+            peer: peer
         };
         if (message.content["@type"] === "Mail" || message.content["@type"] === "RequestMail") {
-            value.name = DataViewTranslateable_1.DataViewTranslateable.consumption.mails.mailSubjectFallback;
-            value.type = "MailDVO";
             const mailContent = message.content;
-            if (mailContent.subject) {
-                value.name = mailContent.subject;
-            }
-            value.to = await this.expandAddresses(mailContent.to);
-            value.toCount = mailContent.to.length;
-            value.ccCount = 0;
+            const to = mailContent.to.map((value) => addressMap[value]);
+            let cc = [];
             if (mailContent.cc) {
-                value.cc = await this.expandAddresses(mailContent.cc);
-                value.ccCount = mailContent.cc.length;
+                cc = mailContent.cc.map((value) => addressMap[value]);
             }
-            value.subject = mailContent.subject;
-            value.body = mailContent.body;
+            const mailDVO = {
+                ...messageDVO,
+                type: "MailDVO",
+                name: mailContent.subject ? mailContent.subject : DataViewTranslateable_1.DataViewTranslateable.consumption.mails.mailSubjectFallback,
+                subject: mailContent.subject,
+                body: mailContent.body,
+                to: to,
+                toCount: mailContent.to.length,
+                cc: cc,
+                ccCount: cc.length
+            };
             if (mailContent["@type"] === "RequestMail") {
                 const requestMailContent = message.content;
-                value.name = DataViewTranslateable_1.DataViewTranslateable.consumption.mails.requestMailSubjectFallback;
-                if (requestMailContent.subject) {
-                    value.name = requestMailContent.subject;
-                }
-                value.type = "RequestMailDVO";
-                value.requests = await this.expandUnknownRequests(requestMailContent.requests);
-                value.requestCount = requestMailContent.requests.length;
-                return value;
+                const requestMailDVO = {
+                    ...mailDVO,
+                    type: "RequestMailDVO",
+                    name: requestMailContent.subject ? requestMailContent.subject : DataViewTranslateable_1.DataViewTranslateable.consumption.mails.requestMailSubjectFallback,
+                    requests: await this.expandUnknownRequests(requestMailContent.requests),
+                    requestCount: requestMailContent.requests.length
+                };
+                return requestMailDVO;
             }
-            return value;
+            return mailDVO;
         }
-        return value;
+        return messageDVO;
     }
     async expandMessageDTOs(messages) {
         const messagePromises = messages.map((message) => this.expandMessageDTO(message));
@@ -632,7 +645,8 @@ let DataViewExpander = class DataViewExpander {
             value: attribute.content.value,
             date: attribute.createdAt,
             isOwn: true,
-            sharedItems: []
+            sharedItems: [],
+            sharedItemCount: 0
         };
     }
     async expandConsumptionAttributes(attributes) {
@@ -654,6 +668,7 @@ let DataViewExpander = class DataViewExpander {
             id: name,
             name: name,
             matches: matchedAttributes,
+            matchCount: matchedAttributes.length,
             bestMatch: bestMatch
         };
     }
@@ -696,13 +711,24 @@ let DataViewExpander = class DataViewExpander {
         else {
             name = DataViewTranslateable_1.DataViewTranslateable.consumption.requests.attributesChangeRequestName;
         }
+        const changes = [];
+        attributesObjects.forEach((attribute, index) => {
+            changes.push({
+                oldAttribute: oldAttributesObjects[index],
+                newAttribute: attribute
+            });
+        });
         return {
             ...request,
             type: "AttributesChangeRequestDVO",
             name: name,
             newAttributes: attributesObjects,
+            newAttributeCount: attributesObjects.length,
             oldAttributes: oldAttributesObjects,
-            applyTo: applyToObject
+            oldAttributeCount: oldAttributesObjects.length,
+            applyTo: applyToObject,
+            changes: changes,
+            changeCount: changes.length
         };
     }
     async expandAttributesRequest(attributesRequest) {
@@ -719,8 +745,10 @@ let DataViewExpander = class DataViewExpander {
             ...request,
             type: "AttributesRequestDVO",
             names: attributesRequest.names,
+            nameCount: attributesRequest.names.length,
             name: name,
             attributes: attributesObjects,
+            attributeCount: attributesObjects.length,
             required: attributesRequest.required
         };
     }
@@ -775,18 +803,69 @@ let DataViewExpander = class DataViewExpander {
         const relationshipPromises = addresses.map((address) => this.expandAddress(address));
         return await Promise.all(relationshipPromises);
     }
+    async expandRecipient(recipient) {
+        const identity = await this.expandAddress(recipient.address);
+        return {
+            ...identity,
+            type: "RecipientDVO",
+            receivedAt: recipient.receivedAt,
+            receivedByDevice: recipient.receivedByDevice
+        };
+    }
     async expandRecipients(recipients) {
-        const relationshipPromises = recipients.map((recipient) => this.expandAddress(recipient.address));
+        const relationshipPromises = recipients.map((recipient) => this.expandRecipient(recipient));
         return await Promise.all(relationshipPromises);
     }
+    expandRelationshipChange(relationship, change) {
+        const date = change.response ? change.response.createdAt : change.request.createdAt;
+        let isOwn = false;
+        if (this.identityController.isMe(transport_1.CoreAddress.from(change.request.createdBy))) {
+            isOwn = true;
+        }
+        let response;
+        if (change.response) {
+            response = {
+                ...change.response,
+                id: `${change.id}_response`,
+                name: "i18n://dvo.relationshipChange.response.name",
+                type: "RelationshipChangeResponseDVO"
+            };
+        }
+        return Promise.resolve({
+            type: "RelationshipChangeDVO",
+            id: change.id,
+            name: "",
+            date: date,
+            status: change.status,
+            statusText: `i18n://dvo.relationshipChange.${change.status}`,
+            changeType: change.type,
+            changeTypeText: `i18n://dvo.relationshipChange.${change.type}`,
+            isOwn: isOwn,
+            request: {
+                ...change.request,
+                id: `${change.id}_request`,
+                name: "i18n://dvo.relationshipChange.request.name",
+                type: "RelationshipChangeRequestDVO"
+            },
+            response: response
+        });
+    }
+    async expandRelationshipChanges(relationship) {
+        const changePromises = relationship.changes.map((change) => this.expandRelationshipChange(relationship, change));
+        return await Promise.all(changePromises);
+    }
     async createRelationshipDVO(relationship, relationshipInfo) {
         var _a, _b, _c, _d;
         if (!relationshipInfo) {
             const relationshipInfoResult = await this.consumption.relationshipInfo.getRelationshipInfoByRelationship({ relationshipId: relationship.id });
             relationshipInfo = relationshipInfoResult.value;
         }
+        let direction = RelationshipDVO_1.RelationshipDirection.Incoming;
+        if (this.identityController.isMe(transport_1.CoreAddress.from(relationship.changes[0].request.createdBy))) {
+            direction = RelationshipDVO_1.RelationshipDirection.Outgoing;
+        }
         let statusText = "";
-        if (relationship.status === transport_1.RelationshipStatus.Pending && this.identityController.isMe(transport_1.CoreAddress.from(relationship.changes[0].request.createdBy))) {
+        if (relationship.status === transport_1.RelationshipStatus.Pending && direction === RelationshipDVO_1.RelationshipDirection.Outgoing) {
             statusText = DataViewTranslateable_1.DataViewTranslateable.transport.relationshipOutgoing;
         }
         else if (relationship.status === transport_1.RelationshipStatus.Pending) {
@@ -801,6 +880,7 @@ let DataViewExpander = class DataViewExpander {
         else if (relationship.status === transport_1.RelationshipStatus.Active) {
             statusText = DataViewTranslateable_1.DataViewTranslateable.transport.relationshipActive;
         }
+        const changes = await this.expandRelationshipChanges(relationship);
         return {
             id: relationship.id,
             name: relationshipInfo.userTitle ? relationshipInfo.userTitle : relationshipInfo.title,
@@ -808,14 +888,18 @@ let DataViewExpander = class DataViewExpander {
             date: relationship.changes[0].request.createdAt,
             image: "",
             type: "RelationshipDVO",
-            status: statusText,
+            status: relationship.status,
+            statusText: statusText,
+            direction: direction,
             isPinned: relationshipInfo.isPinned,
             theme: {
                 image: (_a = relationshipInfo.theme) === null || _a === void 0 ? void 0 : _a.image,
                 headerImage: (_b = relationshipInfo.theme) === null || _b === void 0 ? void 0 : _b.imageBar,
                 backgroundColor: (_c = relationshipInfo.theme) === null || _c === void 0 ? void 0 : _c.backgroundColor,
                 foregroundColor: (_d = relationshipInfo.theme) === null || _d === void 0 ? void 0 : _d.foregroundColor
-            }
+            },
+            changes: changes,
+            changeCount: changes.length
         };
     }
     async expandRelationshipDTO(relationship) {
@@ -827,7 +911,7 @@ let DataViewExpander = class DataViewExpander {
         const initials = ((_a = name.match(/\b\w/g)) !== null && _a !== void 0 ? _a : []).join("");
         const relationshipDVO = await this.createRelationshipDVO(relationship, relationshipInfo);
         if (!description) {
-            description = relationshipDVO.status;
+            description = relationshipDVO.statusText;
         }
         return {
             type: "IdentityDVO",
@@ -950,11 +1034,11 @@ exports.DataViewTranslateable = DataViewTranslateable;
 DataViewTranslateable.prefix = "i18n://dvo.";
 DataViewTranslateable.transport = {
     messageName: `${DataViewTranslateable.prefix}message.name`,
-    relationshipOutgoing: `${DataViewTranslateable.prefix}relationship.outgoing`,
-    relationshipIncoming: `${DataViewTranslateable.prefix}relationship.incoming`,
-    relationshipRejected: `${DataViewTranslateable.prefix}relationship.rejected`,
-    relationshipRevoked: `${DataViewTranslateable.prefix}relationship.revoked`,
-    relationshipActive: `${DataViewTranslateable.prefix}relationship.active`,
+    relationshipOutgoing: `${DataViewTranslateable.prefix}relationship.Outgoing`,
+    relationshipIncoming: `${DataViewTranslateable.prefix}relationship.Incoming`,
+    relationshipRejected: `${DataViewTranslateable.prefix}relationship.Rejected`,
+    relationshipRevoked: `${DataViewTranslateable.prefix}relationship.Revoked`,
+    relationshipActive: `${DataViewTranslateable.prefix}relationship.Active`,
     fileName: `${DataViewTranslateable.prefix}file.name`
 };
 DataViewTranslateable.consumption = {
@@ -1208,10 +1292,18 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.MessageStatus = void 0;
 var MessageStatus;
 (function (MessageStatus) {
-    MessageStatus["Received"] = "received";
-    MessageStatus["Delivering"] = "delivering";
-    MessageStatus["Delivered"] = "delivered";
-    MessageStatus["Errorneous"] = "errorneous";
+    /**
+     * Message was received
+     */
+    MessageStatus["Received"] = "Received";
+    /**
+     * Message was sent but is not yet received by every recipient
+     */
+    MessageStatus["Delivering"] = "Delivering";
+    /**
+     * Message was sent and was received by every recipient
+     */
+    MessageStatus["Delivered"] = "Delivered";
 })(MessageStatus = exports.MessageStatus || (exports.MessageStatus = {}));
 //# sourceMappingURL=MessageDVO.js.map
 
@@ -1226,6 +1318,12 @@ var MessageStatus;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.RelationshipDirection = void 0;
+var RelationshipDirection;
+(function (RelationshipDirection) {
+    RelationshipDirection["Outgoing"] = "Outgoing";
+    RelationshipDirection["Incoming"] = "Incoming";
+})(RelationshipDirection = exports.RelationshipDirection || (exports.RelationshipDirection = {}));
 //# sourceMappingURL=RelationshipDVO.js.map
 
 /***/ }),
@@ -3724,7 +3822,7 @@ class QRCode {
         return this.base64;
     }
     static async from(utf8Content) {
-        const dataUrl = await QRCodeLibrary.toDataURL(utf8Content);
+        const dataUrl = await QRCodeLibrary.toDataURL(`nmshd://qr#${utf8Content}`);
         const base64 = dataUrl.split(",")[1];
         return new QRCode(base64);
     }
@@ -14157,7 +14255,7 @@ Object.defineProperty(exports, "CodeGen", ({ enumerable: true, get: function ()
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.regexpCode = exports.getProperty = exports.safeStringify = exports.stringify = exports.strConcat = exports.addCodeArg = exports.str = exports._ = exports.nil = exports._Code = exports.Name = exports.IDENTIFIER = exports._CodeOrName = void 0;
+exports.regexpCode = exports.getEsmExportName = exports.getProperty = exports.safeStringify = exports.stringify = exports.strConcat = exports.addCodeArg = exports.str = exports._ = exports.nil = exports._Code = exports.Name = exports.IDENTIFIER = exports._CodeOrName = void 0;
 class _CodeOrName {
 }
 exports._CodeOrName = _CodeOrName;
@@ -14297,6 +14395,14 @@ function getProperty(key) {
     return typeof key == "string" && exports.IDENTIFIER.test(key) ? new _Code(`.${key}`) : _ `[${key}]`;
 }
 exports.getProperty = getProperty;
+//Does best effort to format the name properly
+function getEsmExportName(key) {
+    if (typeof key == "string" && exports.IDENTIFIER.test(key)) {
+        return new _Code(`${key}`);
+    }
+    throw new Error(`CodeGen: invalid export name: ${key}, use explicit $id name mapping`);
+}
+exports.getEsmExportName = getEsmExportName;
 function regexpCode(rx) {
     return new _Code(rx.toString());
 }
@@ -19125,6 +19231,8 @@ exports["default"] = def;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 const codegen_1 = __webpack_require__(/*! ../../compile/codegen */ "./node_modules/ajv/dist/compile/codegen/index.js");
 const types_1 = __webpack_require__(/*! ../discriminator/types */ "./node_modules/ajv/dist/vocabularies/discriminator/types.js");
+const compile_1 = __webpack_require__(/*! ../../compile */ "./node_modules/ajv/dist/compile/index.js");
+const util_1 = __webpack_require__(/*! ../../compile/util */ "./node_modules/ajv/dist/compile/util.js");
 const error = {
     message: ({ params: { discrError, tagName } }) => discrError === types_1.DiscrError.Tag
         ? `tag "${tagName}" must be string`
@@ -19176,10 +19284,15 @@ const def = {
             const topRequired = hasRequired(parentSchema);
             let tagRequired = true;
             for (let i = 0; i < oneOf.length; i++) {
-                const sch = oneOf[i];
-                const propSch = (_a = sch.properties) === null || _a === void 0 ? void 0 : _a[tagName];
+                let sch = oneOf[i];
+                if ((sch === null || sch === void 0 ? void 0 : sch.$ref) && !(0, util_1.schemaHasRulesButRef)(sch, it.self.RULES)) {
+                    sch = compile_1.resolveRef.call(it.self, it.schemaEnv, it.baseId, sch === null || sch === void 0 ? void 0 : sch.$ref);
+                    if (sch instanceof compile_1.SchemaEnv)
+                        sch = sch.schema;
+                }
+                const propSch = (_a = sch === null || sch === void 0 ? void 0 : sch.properties) === null || _a === void 0 ? void 0 : _a[tagName];
                 if (typeof propSch != "object") {
-                    throw new Error(`discriminator: oneOf schemas must have "properties/${tagName}"`);
+                    throw new Error(`discriminator: oneOf subschemas (or referenced schemas) must have "properties/${tagName}"`);
                 }
                 tagRequired = tagRequired && (topRequired || hasRequired(sch));
                 addMappings(propSch, i);