@minvws/mgo-hcim-ui 0.1.1-1 → 0.1.2

package/dist/finalize/normalizeSchema/normalizeSchema.js

@@ -0,0 +1,81 @@
+import { isGroupNode } from '../../helpers/isGroupNode/isGroupNode.js';
+/**
+ * Hoists root-level nodes (e.g. a DICOM_VIEWER) out of groups up to the schema
+ * root, turning a loosely drafted `DraftSchema` into a strict `HealthUiSchema`.
+ *
+ * A group's root elements are emitted directly after that group, preserving the
+ * drafted order. Empty groups (including groups that only contained root
+ * elements) are dropped. Nested draft groups become `HealthUiSubGroup` (one
+ * level); deeper nesting is flattened into that subgroup's children.
+ */
+export function normalizeSchema(schema) {
+    const children = [];
+    for (const child of schema.children) {
+        if (!isGroupNode(child)) {
+            children.push(child);
+            continue;
+        }
+        const { group, rootElements } = normalizeTopLevelGroup(child);
+        if (group) {
+            children.push(group);
+        }
+        children.push(...rootElements);
+    }
+    return { ...schema, children };
+}
+function normalizeTopLevelGroup(group) {
+    const elements = [];
+    const rootElements = [];
+    for (const node of group.children) {
+        if (node.type === 'DICOM_VIEWER') {
+            rootElements.push(node);
+            continue;
+        }
+        if (isGroupNode(node)) {
+            const nested = normalizeNestedGroup(node);
+            if (nested.subGroup) {
+                elements.push(nested.subGroup);
+            }
+            rootElements.push(...nested.rootElements);
+            continue;
+        }
+        elements.push(node);
+    }
+    if (elements.length === 0) {
+        return { group: undefined, rootElements };
+    }
+    return {
+        group: { ...group, children: elements },
+        rootElements,
+    };
+}
+function normalizeNestedGroup(group) {
+    const elements = [];
+    const rootElements = [];
+    for (const node of group.children) {
+        if (node.type === 'DICOM_VIEWER') {
+            rootElements.push(node);
+            continue;
+        }
+        if (isGroupNode(node)) {
+            // Deeper than one nested level: flatten into this subgroup.
+            const nested = normalizeNestedGroup(node);
+            elements.push(...(nested.subGroup?.children ?? []));
+            rootElements.push(...nested.rootElements);
+            continue;
+        }
+        elements.push(node);
+    }
+    if (elements.length === 0) {
+        return { subGroup: undefined, rootElements };
+    }
+    return {
+        subGroup: {
+            type: 'HEALTH_UI_SUB_GROUP',
+            id: group.id,
+            label: group.label,
+            children: elements,
+        },
+        rootElements,
+    };
+}

package/dist/finalize/setEmptyEntries/setEmptyEntries.d.ts

@@ -0,0 +1,4 @@
+import { type UiContext } from '../../context/index.js';
+import { type HealthUiSchema } from '../../types/index.js';
+export declare function setEmptyEntries(context: UiContext): (schema: HealthUiSchema) => HealthUiSchema;
+//# sourceMappingURL=setEmptyEntries.d.ts.map

package/dist/finalize/setEmptyEntries/setEmptyEntries.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"setEmptyEntries.d.ts","sourceRoot":"","sources":["../../../src/finalize/setEmptyEntries/setEmptyEntries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAGxD,OAAO,EAEH,KAAK,cAAc,EAEtB,MAAM,sBAAsB,CAAC;AAyB9B,wBAAgB,eAAe,CAAC,OAAO,EAAE,SAAS,IACtC,QAAQ,cAAc,KAAG,cAAc,CAMlD"}

package/dist/finalize/setEmptyEntries/setEmptyEntries.js

@@ -0,0 +1,27 @@
+import { isEmptyNode } from '../../helpers/isEmptyNode/isEmptyNode.js';
+import { isGroupNode } from '../../helpers/isGroupNode/isGroupNode.js';
+function processGroup(group, context) {
+    return {
+        ...group,
+        children: group.children.map((entry) => {
+            if (isGroupNode(entry)) {
+                return processGroup(entry, context);
+            }
+            return isEmptyNode(entry) &&
+                !['DOWNLOAD_LINK', 'DOWNLOAD_BINARY', 'DICOM_VIEWER'].includes(entry.type)
+                ? {
+                    id: entry.id,
+                    label: entry.label,
+                    type: 'EMPTY_VALUE',
+                    display: context.formatMessage('fhir.empty_value'),
+                }
+                : entry;
+        }),
+    };
+}
+export function setEmptyEntries(context) {
+    return (schema) => ({
+        ...schema,
+        children: schema.children.map((child) => isGroupNode(child) ? processGroup(child, context) : child),
+    });
+}

package/dist/finalize/translateGroupLabels/translateGroupLabels.d.ts

@@ -0,0 +1,8 @@
+import { type UiContext } from '../../context/index.js';
+import { type HealthUiSchema } from '../../types/index.js';
+/**
+ * Translates group and subgroup labels after the schema structure is finalized.
+ * Only labels that look like message keys (`r3.*`, `r4.*`, `fhir.*`) are translated.
+ */
+export declare function translateGroupLabels(context: UiContext): (schema: HealthUiSchema) => HealthUiSchema;
+//# sourceMappingURL=translateGroupLabels.d.ts.map

package/dist/finalize/translateGroupLabels/translateGroupLabels.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"translateGroupLabels.d.ts","sourceRoot":"","sources":["../../../src/finalize/translateGroupLabels/translateGroupLabels.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAEH,KAAK,cAAc,EAEtB,MAAM,sBAAsB,CAAC;AAI9B;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,SAAS,IAC3C,QAAQ,cAAc,KAAG,cAAc,CAMlD"}

package/dist/finalize/translateGroupLabels/translateGroupLabels.js

@@ -0,0 +1,29 @@
+import { isNullish } from '@minvws/mgo-utils';
+import { isGroupNode } from '../../helpers/isGroupNode/isGroupNode.js';
+const untranslatedLabelRegexp = /^(r3|r4|fhir)\./;
+/**
+ * Translates group and subgroup labels after the schema structure is finalized.
+ * Only labels that look like message keys (`r3.*`, `r4.*`, `fhir.*`) are translated.
+ */
+export function translateGroupLabels(context) {
+    return (schema) => ({
+        ...schema,
+        children: schema.children.map((child) => isGroupNode(child) ? translateGroup(context, child) : child),
+    });
+}
+function translateLabel(context, label) {
+    if (label && untranslatedLabelRegexp.test(label)) {
+        return context.formatLabel(label, null);
+    }
+    return label;
+}
+function translateGroup(context, group) {
+    const { type, id, label, children, ...rest } = group;
+    return {
+        type,
+        ...(!isNullish(id) ? { id } : {}),
+        ...(!isNullish(label) ? { label: translateLabel(context, label) } : {}),
+        ...rest,
+        children: children.map((child) => isGroupNode(child) ? translateGroup(context, child) : child),
+    };
+}

package/dist/format/cardTitle/cardTitle.d.ts

@@ -0,0 +1,6 @@
+import { ValueType } from '@minvws/mgo-hcim-parse';
+import { FhirMessagesIds } from '@minvws/mgo-intl';
+import { type UiContext } from '../../context/index.js';
+import { type SingleTypeUiFunctionMapKeys } from '../../typeMaps/index.js';
+export declare function createCardTitleFormatter(uiContext: UiContext): (value: ValueType<SingleTypeUiFunctionMapKeys> | ValueType<SingleTypeUiFunctionMapKeys>[] | undefined, fallback: FhirMessagesIds) => string;
+//# sourceMappingURL=cardTitle.d.ts.map

package/dist/format/cardTitle/cardTitle.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cardTitle.d.ts","sourceRoot":"","sources":["../../../src/format/cardTitle/cardTitle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAyB,KAAK,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAIlG,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,SAAS,IASrD,OACM,SAAS,CAAC,2BAA2B,CAAC,GACtC,SAAS,CAAC,2BAA2B,CAAC,EAAE,GACxC,SAAS,EACf,UAAU,eAAe,KAC1B,MAAM,CAUZ"}

package/dist/format/cardTitle/cardTitle.js

@@ -0,0 +1,21 @@
+import { createSingleUiTypeMap } from '../../typeMaps/index.js';
+import { createUiHelpers } from '../../ui.js';
+import { extractDisplayFromUiElement } from './extractDisplayFromUiElement/extractDisplayFromUiElement.js';
+export function createCardTitleFormatter(uiContext) {
+    const { formatMessage } = uiContext;
+    const ui = createUiHelpers(uiContext);
+    const singleUiTypeMap = createSingleUiTypeMap(ui);
+    /**
+     * Attempts to generate the title for a card solely based on the value
+     */
+    return function cardTitle(value, fallback) {
+        const usedValue = Array.isArray(value) ? value[0] : value;
+        if (!usedValue) {
+            return formatMessage(fallback);
+        }
+        const helper = singleUiTypeMap[usedValue._type];
+        const result = helper(fallback, value); // eslint-disable-line @typescript-eslint/no-explicit-any -- indexed map loses type correlation
+        const element = Array.isArray(result) ? result[0] : result;
+        return extractDisplayFromUiElement(element) ?? formatMessage(fallback);
+    };
+}

package/dist/format/cardTitle/extractDisplayFromUiElement/extractDisplayFromUiElement.d.ts

@@ -0,0 +1,3 @@
+import { type DicomViewer, type UiElement } from '../../../types/schema.js';
+export declare function extractDisplayFromUiElement(element: UiElement | DicomViewer): string | undefined;
+//# sourceMappingURL=extractDisplayFromUiElement.d.ts.map

package/dist/format/cardTitle/extractDisplayFromUiElement/extractDisplayFromUiElement.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"extractDisplayFromUiElement.d.ts","sourceRoot":"","sources":["../../../../src/format/cardTitle/extractDisplayFromUiElement/extractDisplayFromUiElement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAE5E,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,SAAS,GAAG,WAAW,GAAG,MAAM,GAAG,SAAS,CAgBhG"}

package/dist/format/cardTitle/extractDisplayFromUiElement/extractDisplayFromUiElement.js

@@ -0,0 +1,17 @@
+export function extractDisplayFromUiElement(element) {
+    switch (element.type) {
+        case 'SINGLE_VALUE':
+            return element.value?.display;
+        case 'MULTIPLE_VALUES':
+            return element?.value?.[0]?.display;
+        case 'REFERENCE_VALUE':
+        case 'EMPTY_VALUE':
+            return element.display;
+        case 'DOWNLOAD_LINK':
+        case 'DOWNLOAD_BINARY':
+        case 'DICOM_VIEWER':
+            return element.label;
+        default:
+            return;
+    }
+}

package/dist/format/index.d.ts

@@ -1,6 +1,15 @@
+import { type UiContext } from '../context/index.js';
 export declare const format: {
-    date: import("../index.js").WithUiContext<import("../index.js").FormatFunction<import("@minvws/mgo-fhir").DateString | import("@minvws/mgo-fhir").DateTimeString | import("@minvws/mgo-fhir").InstantDateTimeString>>;
+    date: import("../types/context.js").WithUiContext<import("../types/context.js").FormatFunction<import("@minvws/mgo-fhir").DateString | import("@minvws/mgo-fhir").DateTimeString | import("@minvws/mgo-fhir").InstantDateTimeString>>;
     valueWithUnit(value: import("@minvws/mgo-utils").Nullable<import("lossless-json").LosslessNumber | number>, unit: import("@minvws/mgo-utils").Nullable<string>): string | undefined;
     valueWithMaxValue(value: import("@minvws/mgo-utils").Nullable<import("lossless-json").LosslessNumber | number>, maxValue: import("@minvws/mgo-utils").Nullable<import("lossless-json").LosslessNumber | number>): string | undefined;
 };
+export declare function createFormatHelpers(context: UiContext): {
+    valueWithUnit(value: import("@minvws/mgo-utils").Nullable<import("lossless-json").LosslessNumber | number>, unit: import("@minvws/mgo-utils").Nullable<string>): string | undefined;
+    valueWithMaxValue(value: import("@minvws/mgo-utils").Nullable<import("lossless-json").LosslessNumber | number>, maxValue: import("@minvws/mgo-utils").Nullable<import("lossless-json").LosslessNumber | number>): string | undefined;
+    date: import("../types/context.js").FormatFunction<`${number}` | `${number}-${number}` | `${number}-${number}-${number}` | `${number}-${number}-${number}T${number}:${number}:${number}${string}`>;
+    systemValue: import("../types/context.js").FormatFunction<import("@minvws/mgo-hcim-parse").MgoSimpleQuantityProps>;
+};
+export type FormatHelpers = ReturnType<typeof createFormatHelpers>;
+export { createCardTitleFormatter } from './cardTitle/cardTitle.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/format/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/format/index.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,MAAM;;;;CAGlB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/format/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAKrD,eAAO,MAAM,MAAM;;;;CAGlB,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,SAAS;;;;;EAMrD;AAED,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC"}

package/dist/format/index.js

@@ -1,6 +1,15 @@
 import * as date from './date/date.js';
+import { systemValue } from './systemValue/systemValue.js';
 import * as value from './value/value.js';
 export const format = {
     ...value,
     ...date,
 };
+export function createFormatHelpers(context) {
+    return {
+        date: date.date(context),
+        systemValue: systemValue(context),
+        ...value,
+    };
+}
+export { createCardTitleFormatter } from './cardTitle/cardTitle.js';

package/dist/generator/createGeneratorContext/createGeneratorContext.d.ts

@@ -1,12 +1,15 @@
 import { type FhirVersion } from '@minvws/mgo-fhir';
+import { type Logger } from '@minvws/mgo-logging';
 import { UiContext } from '../../context/index.js';
 import { createUiElementHelper } from '../createUiElementHelper/createUiElementHelper.js';
 export type GeneratorContext = {
     formatMessage: UiContext['formatMessage'];
     formatLabel: UiContext['formatLabel'];
     createUiElement: ReturnType<typeof createUiElementHelper>;
-    fhirVersion: `${FhirVersion}`;
+    fhirVersion: FhirVersion;
     rootPath: string;
+    baseProps: UiContext['baseProps'];
+    log: Logger;
 };
-export declare function createGeneratorContext(uiContext: UiContext, rootPath: string, fhirVersion: `${FhirVersion}`): GeneratorContext;
+export declare function createGeneratorContext(uiContext: UiContext, rootPath: string, fhirVersion: FhirVersion, log?: Logger): GeneratorContext;
 //# sourceMappingURL=createGeneratorContext.d.ts.map

package/dist/generator/createGeneratorContext/createGeneratorContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createGeneratorContext.d.ts","sourceRoot":"","sources":["../../../src/generator/createGeneratorContext/createGeneratorContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAE1F,MAAM,MAAM,gBAAgB,GAAG;IAC3B,aAAa,EAAE,SAAS,CAAC,eAAe,CAAC,CAAC;IAC1C,WAAW,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC;IACtC,eAAe,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC;IAC1D,WAAW,EAAE,GAAG,WAAW,EAAE,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,wBAAgB,sBAAsB,CAClC,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,GAAG,WAAW,EAAE,GAC9B,gBAAgB,CAWlB"}
+{"version":3,"file":"createGeneratorContext.d.ts","sourceRoot":"","sources":["../../../src/generator/createGeneratorContext/createGeneratorContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAiB,KAAK,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAE1F,MAAM,MAAM,gBAAgB,GAAG;IAC3B,aAAa,EAAE,SAAS,CAAC,eAAe,CAAC,CAAC;IAC1C,WAAW,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC;IACtC,eAAe,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC;IAC1D,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;IAClC,GAAG,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,wBAAgB,sBAAsB,CAClC,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,WAAW,EACxB,GAAG,GAAE,MAAsB,GAC5B,gBAAgB,CAalB"}

package/dist/generator/createGeneratorContext/createGeneratorContext.js

@@ -1,6 +1,7 @@
+import { consoleLogger } from '@minvws/mgo-logging';
 import { createUiElementHelper } from '../createUiElementHelper/createUiElementHelper.js';
-export function createGeneratorContext(uiContext, rootPath, fhirVersion) {
-    const { formatMessage, formatLabel } = uiContext;
+export function createGeneratorContext(uiContext, rootPath, fhirVersion, log = consoleLogger) {
+    const { formatMessage, formatLabel, baseProps } = uiContext;
     const createUiElement = createUiElementHelper(uiContext);
     return {
         formatMessage,
@@ -8,5 +9,7 @@ export function createGeneratorContext(uiContext, rootPath, fhirVersion) {
         createUiElement,
         fhirVersion,
         rootPath,
+        baseProps,
+        log,
     };
 }

package/dist/generator/createUiElementHelper/createUiElementHelper.d.ts

@@ -1,6 +1,6 @@
 import { type MgoType, type MgoTypeId } from '@minvws/mgo-hcim-parse';
 import { type FhirMessagesIds } from '@minvws/mgo-intl';
 import { UiContext } from '../../context/index.js';
-import { type HealthUiGroup, type UiElement } from '../../types/index.js';
-export declare function createUiElementHelper(uiContext: UiContext): <T extends MgoTypeId>(label: FhirMessagesIds, value: MgoType<T> | MgoType<T>[]) => UiElement | UiElement[] | HealthUiGroup;
+import { DicomViewer, DraftGroup, type UiElement } from '../../types/index.js';
+export declare function createUiElementHelper(uiContext: UiContext): <T extends MgoTypeId>(label: FhirMessagesIds, value: MgoType<T> | MgoType<T>[]) => (UiElement | DicomViewer) | (UiElement | DicomViewer)[] | DraftGroup;
 //# sourceMappingURL=createUiElementHelper.d.ts.map

package/dist/generator/createUiElementHelper/createUiElementHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createUiElementHelper.d.ts","sourceRoot":"","sources":["../../../src/generator/createUiElementHelper/createUiElementHelper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,SAAS,EAAmB,MAAM,sBAAsB,CAAC;AAU3F,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,SAAS,IA6CtB,CAAC,SAAS,SAAS,EAC/C,OAAO,eAAe,EACtB,OAAO,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,KACjC,SAAS,GAAG,SAAS,EAAE,GAAG,aAAa,CAe7C"}
+{"version":3,"file":"createUiElementHelper.d.ts","sourceRoot":"","sources":["../../../src/generator/createUiElementHelper/createUiElementHelper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AASnD,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAG/E,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,SAAS,IAMtB,CAAC,SAAS,SAAS,EAC/C,OAAO,eAAe,EACtB,OAAO,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,KACjC,CAAC,SAAS,GAAG,WAAW,CAAC,GAAG,CAAC,SAAS,GAAG,WAAW,CAAC,EAAE,GAAG,UAAU,CAqB1E"}

package/dist/generator/createUiElementHelper/createUiElementHelper.js

@@ -1,48 +1,12 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { map } from '@minvws/mgo-utils';
+import { createComplexUiTypeMap, createMultipleUiTypeMap, createSingleUiTypeMap, } from '../../typeMaps/index.js';
 import { createUiHelpers } from '../../ui.js';
 export function createUiElementHelper(uiContext) {
     const ui = createUiHelpers(uiContext);
-    const singleUiTypeMap = {
-        annotation: ui.annotation,
-        attachment: (_label, value) => ui.attachment(value),
-        boolean: ui.boolean,
-        code: ui.code,
-        codeableConcept: ui.codeableConcept,
-        coding: ui.coding,
-        date: ui.date,
-        dateTime: ui.dateTime,
-        decimal: ui.decimal,
-        duration: ui.duration,
-        identifier: ui.identifier,
-        instant: ui.instant,
-        integer: ui.integer,
-        integer64: ui.integer64,
-        period: ui.period,
-        positiveInt: ui.positiveInt,
-        quantity: ui.quantity,
-        range: ui.range,
-        ratio: ui.ratio,
-        reference: ui.reference,
-        simpleQuantity: ui.simpleQuantity,
-        string: ui.string,
-        time: ui.time,
-        unsignedInt: ui.unsignedInt,
-        // complex types
-        timing: ui.timing,
-        sampledData: ui.sampledData,
-    };
-    const multipleUiTypeMap = {
-        annotation: ui.annotation,
-        code: ui.code,
-        codeableConcept: ui.codeableConcept,
-        coding: ui.coding,
-        dateTime: ui.dateTime,
-        identifier: ui.identifier,
-        instant: ui.instant,
-        reference: ui.reference,
-        string: ui.string,
-    };
+    const singleUiTypeMap = createSingleUiTypeMap(ui);
+    const complexUiTypeMap = createComplexUiTypeMap(ui);
+    const multipleUiTypeMap = createMultipleUiTypeMap(ui);
     return function createUiElement(label, value) {
         if (Array.isArray(value)) {
             const uiHelper = multipleUiTypeMap[value[0]._type];
@@ -51,10 +15,14 @@ export function createUiElementHelper(uiContext) {
             }
             return map(value, (x) => createUiElement(label, x), true);
         }
+        const complexHelper = complexUiTypeMap[value._type];
+        if (complexHelper) {
+            return complexHelper(label, value);
+        }
         const uiHelper = singleUiTypeMap[value._type];
-        if (!uiHelper) {
-            throw new Error(`No ui helper found for type "${value._type}"`);
+        if (uiHelper) {
+            return uiHelper(label, value);
         }
-        return uiHelper(label, value);
+        throw new Error(`No ui helper found for type "${value._type}"`);
     };
 }

package/dist/generator/generateUiSchema/generateUiSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateUiSchema.d.ts","sourceRoot":"","sources":["../../../src/generator/generateUiSchema/generateUiSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,OAAO,EAAE,sBAAsB,EAAsB,MAAM,sBAAsB,CAAC;AAOlF,eAAO,MAAM,gBAAgB,EAAE,sBAAsB,CAAC,eAAe,EAAE,SAAS,CAgD/E,CAAC"}
+{"version":3,"file":"generateUiSchema.d.ts","sourceRoot":"","sources":["../../../src/generator/generateUiSchema/generateUiSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,OAAO,EAAc,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAK1E,eAAO,MAAM,gBAAgB,EAAE,sBAAsB,CAAC,eAAe,EAAE,SAAS,CAwC/E,CAAC"}

package/dist/generator/generateUiSchema/generateUiSchema.js

@@ -1,37 +1,28 @@
-import { isUiSchemaGroup } from '../../helpers/isUiSchemaGroup/isUiSchemaGroup.js';
+import { isGroupNode } from '../../helpers/isGroupNode/isGroupNode.js';
 import { createGeneratorContext } from '../createGeneratorContext/createGeneratorContext.js';
 import { getProfileKey } from '../getProfileKey/getProfileKey.js';
 import { processValue } from '../processValue/processValue.js';
-const untranslatedLabelRegexp = /^(r3|r4|fhir)\./;
 export const generateUiSchema = (resource, context) => {
     const { formatMessage } = context;
     const { id: _id, referenceId: _referenceId, resourceType: _resourceType, profile, fhirVersion, ...rest } = resource;
     const rootPath = getProfileKey(fhirVersion, profile);
     const generatorContext = createGeneratorContext(context, rootPath, fhirVersion);
     const defaultGroup = {
+        type: 'HEALTH_UI_GROUP',
         children: [],
     };
     const groups = [defaultGroup];
     const elements = processValue(generatorContext, rootPath, rest);
     for (const element of elements) {
-        if (isUiSchemaGroup(element)) {
-            groups.push({
-                ...element,
-                // We only translate the group labels at the last moment.
-                // Otherwise groups within other groups might be missing translations for their label
-                // even though that label is never actually used as their contents will be merged
-                // into their parent group.
-                label: untranslatedLabelRegexp.test(element.label)
-                    ? context.formatLabel(element.label, null)
-                    : element.label,
-            });
+        if (isGroupNode(element)) {
+            groups.push(element);
         }
         else {
             defaultGroup.children.push(element);
         }
     }
     for (const group of groups) {
-        group.children.sort((a, b) => a.label.localeCompare(b.label));
+        group.children.sort((a, b) => (a.label ?? '').localeCompare(b.label ?? ''));
     }
     return {
         label: formatMessage(rootPath),

package/dist/generator/getProfileKey/getProfileKey.d.ts

@@ -1,3 +1,3 @@
 import { type FhirVersion, type NictizNlProfile } from '@minvws/mgo-fhir';
-export declare function getProfileKey(fhirVersion: `${FhirVersion}`, profile: NictizNlProfile): string;
+export declare function getProfileKey(fhirVersion: FhirVersion, profile: NictizNlProfile): string;
 //# sourceMappingURL=getProfileKey.d.ts.map

package/dist/generator/getProfileKey/getProfileKey.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getProfileKey.d.ts","sourceRoot":"","sources":["../../../src/generator/getProfileKey/getProfileKey.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAG1E,wBAAgB,aAAa,CAAC,WAAW,EAAE,GAAG,WAAW,EAAE,EAAE,OAAO,EAAE,eAAe,GAAG,MAAM,CAG7F"}
+{"version":3,"file":"getProfileKey.d.ts","sourceRoot":"","sources":["../../../src/generator/getProfileKey/getProfileKey.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAG1E,wBAAgB,aAAa,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,eAAe,GAAG,MAAM,CAGxF"}

package/dist/generator/getUiElements/getUiElements.d.ts

@@ -1,3 +1,3 @@
-import { type HealthUiGroup, type UiElement } from '../../types/index.js';
-export declare function getUiElements(elements: (UiElement | HealthUiGroup)[]): UiElement[];
+import { DraftGroup, DraftNode } from '../../types/index.js';
+export declare function getUiElements(elements: DraftNode[]): DraftGroup['children'];
 //# sourceMappingURL=getUiElements.d.ts.map

package/dist/generator/getUiElements/getUiElements.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getUiElements.d.ts","sourceRoot":"","sources":["../../../src/generator/getUiElements/getUiElements.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAE1E,wBAAgB,aAAa,CAAC,QAAQ,EAAE,CAAC,SAAS,GAAG,aAAa,CAAC,EAAE,GAAG,SAAS,EAAE,CAElF"}
+{"version":3,"file":"getUiElements.d.ts","sourceRoot":"","sources":["../../../src/generator/getUiElements/getUiElements.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAE7D,wBAAgB,aAAa,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,UAAU,CAAC,UAAU,CAAC,CAE3E"}

package/dist/generator/getUiElements/getUiElements.js

@@ -1,4 +1,4 @@
-import { isUiSchemaGroup } from '../../helpers/isUiSchemaGroup/isUiSchemaGroup.js';
+import { isGroupNode } from '../../helpers/isGroupNode/isGroupNode.js';
 export function getUiElements(elements) {
-    return elements.map((x) => (isUiSchemaGroup(x) ? x.children : x)).flat();
+    return elements.map((x) => (isGroupNode(x) ? x.children : x)).flat();
 }

package/dist/generator/processArray/processArray.d.ts

@@ -1,4 +1,4 @@
-import { type HealthUiGroup, type UiElement } from '../../types/index.js';
+import { DraftNode } from '../../types/index.js';
 import { type GeneratorContext } from '../createGeneratorContext/createGeneratorContext.js';
-export declare function processArray(context: GeneratorContext, path: string, value: unknown[]): (UiElement | HealthUiGroup)[];
+export declare function processArray(context: GeneratorContext, path: string, value: unknown[]): DraftNode[];
 //# sourceMappingURL=processArray.d.ts.map

package/dist/generator/processArray/processArray.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"processArray.d.ts","sourceRoot":"","sources":["../../../src/generator/processArray/processArray.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,qDAAqD,CAAC;AAsB5F,wBAAgB,YAAY,CACxB,OAAO,EAAE,gBAAgB,EACzB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,EAAE,GACjB,CAAC,SAAS,GAAG,aAAa,CAAC,EAAE,CAoB/B"}
+{"version":3,"file":"processArray.d.ts","sourceRoot":"","sources":["../../../src/generator/processArray/processArray.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,qDAAqD,CAAC;AAsB5F,wBAAgB,YAAY,CACxB,OAAO,EAAE,gBAAgB,EACzB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,EAAE,GACjB,SAAS,EAAE,CAoBb"}

package/dist/generator/processArray/processArray.js

@@ -31,9 +31,9 @@ export function processArray(context, path, value) {
     }
     return [
         {
-            label: context.formatLabel(path, null),
+            ...context.baseProps(path, null),
             type: 'SINGLE_VALUE',
-            display: undefined,
+            value: undefined,
         },
     ];
 }

package/dist/generator/processMgoType/processMgoType.d.ts

@@ -1,5 +1,5 @@
 import { type PrimitiveValueType, type ValueType } from '@minvws/mgo-hcim-parse';
-import { type HealthUiGroup, type UiElement } from '../../types/index.js';
+import { DraftNode } from '../../types/index.js';
 import { type GeneratorContext } from '../createGeneratorContext/createGeneratorContext.js';
-export declare function processMgoType(context: GeneratorContext, path: string, value: ValueType | PrimitiveValueType): (UiElement | HealthUiGroup)[];
+export declare function processMgoType(context: GeneratorContext, path: string, value: ValueType | PrimitiveValueType): DraftNode[];
 //# sourceMappingURL=processMgoType.d.ts.map

package/dist/generator/processMgoType/processMgoType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"processMgoType.d.ts","sourceRoot":"","sources":["../../../src/generator/processMgoType/processMgoType.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,KAAK,kBAAkB,EACvB,KAAK,SAAS,EACjB,MAAM,wBAAwB,CAAC;AAIhC,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,qDAAqD,CAAC;AAyC5F,wBAAgB,cAAc,CAC1B,OAAO,EAAE,gBAAgB,EACzB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,SAAS,GAAG,kBAAkB,iCA0BxC"}
+{"version":3,"file":"processMgoType.d.ts","sourceRoot":"","sources":["../../../src/generator/processMgoType/processMgoType.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,KAAK,kBAAkB,EACvB,KAAK,SAAS,EACjB,MAAM,wBAAwB,CAAC;AAIhC,OAAO,EAAc,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,qDAAqD,CAAC;AAgC5F,wBAAgB,cAAc,CAC1B,OAAO,EAAE,gBAAgB,EACzB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,SAAS,GAAG,kBAAkB,eA4BxC"}

package/dist/generator/processMgoType/processMgoType.js

@@ -1,7 +1,6 @@
 import { isExtensionValue, isValueType, } from '@minvws/mgo-hcim-parse';
 import { isNullish } from '@minvws/mgo-utils';
 import { snakeCase } from 'lodash-es';
-import { getUiElements } from '../getUiElements/getUiElements.js';
 function processNestedArray(context, path, value) {
     return value.map((item) => processNestedValue(context, path, item).flat()).flat();
 }
@@ -43,8 +42,10 @@ export function processMgoType(context, path, value) {
     if (extraUiElements.length) {
         return [
             {
+                type: 'HEALTH_UI_GROUP',
+                id: path,
                 label: path,
-                children: getUiElements(elements),
+                children: elements,
             },
         ];
     }

package/dist/generator/processObject/processObject.d.ts

@@ -1,4 +1,4 @@
-import { type HealthUiGroup, type UiElement } from '../../types/index.js';
+import { DraftNode } from '../../types/index.js';
 import { type GeneratorContext } from '../createGeneratorContext/createGeneratorContext.js';
-export declare function processObject(context: GeneratorContext, path: string, value: object): (UiElement | HealthUiGroup)[];
+export declare function processObject(context: GeneratorContext, path: string, value: object): DraftNode[];
 //# sourceMappingURL=processObject.d.ts.map

package/dist/generator/processObject/processObject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"processObject.d.ts","sourceRoot":"","sources":["../../../src/generator/processObject/processObject.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,qDAAqD,CAAC;AAI5F,wBAAgB,aAAa,CAAC,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,iCAgCnF"}
+{"version":3,"file":"processObject.d.ts","sourceRoot":"","sources":["../../../src/generator/processObject/processObject.ts"],"names":[],"mappings":"AAGA,OAAO,EAAc,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,qDAAqD,CAAC;AAG5F,wBAAgB,aAAa,CAAC,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,eAkCnF"}

package/dist/generator/processObject/processObject.js

@@ -1,6 +1,5 @@
 import { isNullish } from '@minvws/mgo-utils';
 import { snakeCase } from 'lodash-es';
-import { getUiElements } from '../getUiElements/getUiElements.js';
 import { processValue } from '../processValue/processValue.js';
 export function processObject(context, path, value) {
     const elements = [];
@@ -13,9 +12,9 @@ export function processObject(context, path, value) {
         const valuePath = `${path}.${snakeCase(key)}`;
         if (isNullish(value)) {
             elements.push({
-                label: context.formatLabel(valuePath, null),
+                ...context.baseProps(valuePath, null),
                 type: 'SINGLE_VALUE',
-                display: undefined,
+                value: undefined,
             });
         }
         else {
@@ -25,8 +24,10 @@ export function processObject(context, path, value) {
     if (path !== context.rootPath && elements.length > 1) {
         return [
             {
+                type: 'HEALTH_UI_GROUP',
+                id: path,
                 label: path,
-                children: getUiElements(elements),
+                children: elements,
             },
         ];
     }

package/dist/generator/processValue/processValue.d.ts

@@ -1,5 +1,5 @@
 import { type Nullable } from '@minvws/mgo-utils';
-import { type HealthUiGroup, type UiElement } from '../../types/index.js';
+import { DraftNode } from '../../types/index.js';
 import { type GeneratorContext } from '../createGeneratorContext/createGeneratorContext.js';
-export declare function processValue(context: GeneratorContext, path: string, value: Nullable<unknown[] | object>): (UiElement | HealthUiGroup)[];
+export declare function processValue(context: GeneratorContext, path: string, value: Nullable<unknown[] | object>): DraftNode[];
 //# sourceMappingURL=processValue.d.ts.map

package/dist/generator/processValue/processValue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"processValue.d.ts","sourceRoot":"","sources":["../../../src/generator/processValue/processValue.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,qDAAqD,CAAC;AAO5F,wBAAgB,YAAY,CACxB,OAAO,EAAE,gBAAgB,EACzB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,QAAQ,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,GACpC,CAAC,SAAS,GAAG,aAAa,CAAC,EAAE,CA8B/B"}
+{"version":3,"file":"processValue.d.ts","sourceRoot":"","sources":["../../../src/generator/processValue/processValue.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAc,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,qDAAqD,CAAC;AAM5F,wBAAgB,YAAY,CACxB,OAAO,EAAE,gBAAgB,EACzB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,QAAQ,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,GACpC,SAAS,EAAE,CAgCb"}