@icure/form 1.1.14 → 1.1.16

package/generic/model.d.ts

@@ -1,6 +1,13 @@
+import { FieldMetadata } from '../components/model';
+/**
+ * VersionedData is a structure that contains the values of a form, organized by id and version.
+ */
 export interface VersionedData<T> {
     [id: string]: Version<T>[];
 }
+/**
+ * Version is a structure that contains a value, a revision number and a modification timestamp used to sort the versions.
+ */
 export interface Version<T> {
     revision: string | null;
     modified?: number;
@@ -9,6 +16,36 @@ export interface Version<T> {
 export type ID = string;
 /**
  * FormValuesContainer is a readonly structure that provides and handle the values of a form.
+ * It is a tree structure where each node is a FormValuesContainer with the same Value and Metadata types.
+ *
+ * The following methods are provided and must be implemented by the concrete class:
+ * - `compute(formula: string, sandbox?: S): T?` : computes a formula based on the values of the form, inside a provided sandbox. If no sandbox is provided, the default sandbox is used.
+ * - `getLabel(): string` : returns the label of the form values container (used to display the title of the form in hierarchical contexts)
+ * - `getFormId(): string?` : returns the id of the form values container
+ * - `getValues(revisionsFilter: Lambda): VersionedData<Value>` : obtains the values to be displayed in the form, using a filter
+ * 			to select the desired versioned data that are to be displayed in a specific field.
+ * - `getMetadata(id: string, revisions: (string | null)[]): VersionedData<Metadata>` : obtains the metadata of a specific value, for the specified revisions.
+ * - `getValidationErrors(): [FieldMetadata, string][]`: returns the validation errors of the form values container for the values that are currently stored in it.
+ * - `getChildren(): FormValuesContainer<Value, Metadata>[]` : returns the children of the form values container
+ * - `setValue(label: string, language: string, data?: Value, id?: string, metadata?: Metadata): FormValuesContainerMutation<Value, Metadata, FormValuesContainer<Value, Metadata>, ID>` :
+ * 			modifies the value associated to a field in the form values container. As a form values container is immutable, this method returns a mutation wrapping
+ * 			a new form values container along with the modified value.
+ * - `setMetadata(label: string, metadata: Metadata, id?: string): FormValuesContainerMutation<Value, Metadata, FormValuesContainer<Value, Metadata>, ID>` :
+ * 			modifies the metadata associated to a value in the form values container. As a form values container is immutable, this method returns a mutation wrapping
+ * 			a new form values container along with the modified metadata.
+ * - `delete(valueId: string): FormValuesContainerMutation<Value, Metadata, FormValuesContainer<Value, Metadata>, void>` :
+ * 			deletes a value from the form values container. As a form values container is immutable, this method returns a mutation wrapping
+ * 			a new form values container without the deleted value.
+ * - `addChild(anchorId: string, templateId: string, label: string): Promise<FormValuesContainerMutation<...>, FormValuesContainer<...>>>`:
+ * 			adds a child to the form values container. As a form values container is immutable, this method returns a mutation wrapping
+ * 			a new form values container with the added child.
+ * - `removeChild(container: FormValuesContainer<Value, Metadata>): Promise<FormValuesContainerMutation<Value, Metadata, FormValuesContainer<Value, Metadata>, void>>` :
+ * 			removes a child from the form values container. As a form values container is immutable, this method returns a mutation wrapping
+ * 			a new form values container without the removed child.
+ * - `registerChangeListener(listener: (newValue: FormValuesContainer<Value, Metadata>) => void): void` :
+ * 			registers a listener that will be called whenever the form values container is modified.
+ * - `unregisterChangeListener(listener: (newValue: FormValuesContainer<Value, Metadata>) => void): void` : unregisters a listener that was previously registered.
+ *
  */
 export interface FormValuesContainer<Value, Metadata> {
     compute<T, S extends {
@@ -19,6 +56,7 @@ export interface FormValuesContainer<Value, Metadata> {
     getValues(revisionsFilter: (id: string, history: Version<Metadata>[]) => (string | null)[]): VersionedData<Value>;
     getMetadata(id: string, revisions: (string | null)[]): VersionedData<Metadata>;
     getChildren(): FormValuesContainer<Value, Metadata>[];
+    getValidationErrors(): [FieldMetadata, string][];
     setValue(label: string, language: string, data?: Value, id?: string, metadata?: Metadata): FormValuesContainerMutation<Value, Metadata, FormValuesContainer<Value, Metadata>, ID>;
     setMetadata(label: string, metadata: Metadata, id?: string): FormValuesContainerMutation<Value, Metadata, FormValuesContainer<Value, Metadata>, ID>;
     delete(serviceId: string): FormValuesContainerMutation<Value, Metadata, FormValuesContainer<Value, Metadata>, void>;
@@ -27,13 +65,19 @@ export interface FormValuesContainer<Value, Metadata> {
     registerChangeListener(listener: (newValue: FormValuesContainer<Value, Metadata>) => void): void;
     unregisterChangeListener(listener: (newValue: FormValuesContainer<Value, Metadata>) => void): void;
 }
+/**
+ * FormValuesContainerMutation is a structure that wraps a new form values container along with the modified value.
+ */
 export interface FormValuesContainerMutation<Value, Metadata, FVC extends FormValuesContainer<Value, Metadata>, Result> {
     result: Result;
     formValuesContainer: FVC;
 }
 export type Suggestion = {
     id: string;
-    code: string;
+    code?: string;
     text: string;
     terms: string[];
+    label: {
+        [lng: string]: string;
+    };
 };

package/generic/model.js.map

@@ -1 +1 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../../tmp/generic/model.ts"],"names":[],"mappings":"","sourcesContent":["export interface VersionedData<T> {\n\t[id: string]: Version<T>[]\n}\n\nexport interface Version<T> {\n\trevision: string | null //null means that the version is not saved yet\n\tmodified?: number\n\tvalue: T\n}\n\nexport type ID = string\n/**\n * FormValuesContainer is a readonly structure that provides and handle the values of a form.\n */\nexport interface FormValuesContainer<Value, Metadata> {\n\t//information retrieval\n\tcompute<T, S extends { [key: string | symbol]: unknown }>(formula: string, sandbox?: S): T | undefined\n\tgetLabel(): string\n\tgetFormId(): string | undefined\n\tgetValues(revisionsFilter: (id: string, history: Version<Metadata>[]) => (string | null)[]): VersionedData<Value>\n\tgetMetadata(id: string, revisions: (string | null)[]): VersionedData<Metadata>\n\tgetChildren(): FormValuesContainer<Value, Metadata>[]\n\t//modification\n\tsetValue(label: string, language: string, data?: Value, id?: string, metadata?: Metadata): FormValuesContainerMutation<Value, Metadata, FormValuesContainer<Value, Metadata>, ID>\n\tsetMetadata(label: string, metadata: Metadata, id?: string): FormValuesContainerMutation<Value, Metadata, FormValuesContainer<Value, Metadata>, ID>\n\tdelete(serviceId: string): FormValuesContainerMutation<Value, Metadata, FormValuesContainer<Value, Metadata>, void>\n\t//hierarchy\n\taddChild(\n\t\tanchorId: string,\n\t\ttemplateId: string,\n\t\tlabel: string,\n\t): Promise<FormValuesContainerMutation<Value, Metadata, FormValuesContainer<Value, Metadata>, FormValuesContainer<Value, Metadata>>>\n\tremoveChild(container: FormValuesContainer<Value, Metadata>): Promise<FormValuesContainerMutation<Value, Metadata, FormValuesContainer<Value, Metadata>, void>>\n\t//listeners\n\tregisterChangeListener(listener: (newValue: FormValuesContainer<Value, Metadata>) => void): void\n\tunregisterChangeListener(listener: (newValue: FormValuesContainer<Value, Metadata>) => void): void\n}\n\nexport interface FormValuesContainerMutation<Value, Metadata, FVC extends FormValuesContainer<Value, Metadata>, Result> {\n\tresult: Result\n\tformValuesContainer: FVC\n}\n\nexport type Suggestion = { id: string; code: string; text: string; terms: string[] }\n"]}
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../../tmp/generic/model.ts"],"names":[],"mappings":"","sourcesContent":["import { FieldMetadata } from '../components/model'\n\n/**\n * VersionedData is a structure that contains the values of a form, organized by id and version.\n */\nexport interface VersionedData<T> {\n\t[id: string]: Version<T>[]\n}\n\n/**\n * Version is a structure that contains a value, a revision number and a modification timestamp used to sort the versions.\n */\nexport interface Version<T> {\n\trevision: string | null //null means that the version is not saved yet\n\tmodified?: number\n\tvalue: T\n}\n\nexport type ID = string\n/**\n * FormValuesContainer is a readonly structure that provides and handle the values of a form.\n * It is a tree structure where each node is a FormValuesContainer with the same Value and Metadata types.\n *\n * The following methods are provided and must be implemented by the concrete class:\n * - `compute(formula: string, sandbox?: S): T?` : computes a formula based on the values of the form, inside a provided sandbox. If no sandbox is provided, the default sandbox is used.\n * - `getLabel(): string` : returns the label of the form values container (used to display the title of the form in hierarchical contexts)\n * - `getFormId(): string?` : returns the id of the form values container\n * - `getValues(revisionsFilter: Lambda): VersionedData<Value>` : obtains the values to be displayed in the form, using a filter\n * \t\t\tto select the desired versioned data that are to be displayed in a specific field.\n * - `getMetadata(id: string, revisions: (string | null)[]): VersionedData<Metadata>` : obtains the metadata of a specific value, for the specified revisions.\n * - `getValidationErrors(): [FieldMetadata, string][]`: returns the validation errors of the form values container for the values that are currently stored in it.\n * - `getChildren(): FormValuesContainer<Value, Metadata>[]` : returns the children of the form values container\n * - `setValue(label: string, language: string, data?: Value, id?: string, metadata?: Metadata): FormValuesContainerMutation<Value, Metadata, FormValuesContainer<Value, Metadata>, ID>` :\n * \t\t\tmodifies the value associated to a field in the form values container. As a form values container is immutable, this method returns a mutation wrapping\n * \t\t\ta new form values container along with the modified value.\n * - `setMetadata(label: string, metadata: Metadata, id?: string): FormValuesContainerMutation<Value, Metadata, FormValuesContainer<Value, Metadata>, ID>` :\n * \t\t\tmodifies the metadata associated to a value in the form values container. As a form values container is immutable, this method returns a mutation wrapping\n * \t\t\ta new form values container along with the modified metadata.\n * - `delete(valueId: string): FormValuesContainerMutation<Value, Metadata, FormValuesContainer<Value, Metadata>, void>` :\n * \t\t\tdeletes a value from the form values container. As a form values container is immutable, this method returns a mutation wrapping\n * \t\t\ta new form values container without the deleted value.\n * - `addChild(anchorId: string, templateId: string, label: string): Promise<FormValuesContainerMutation<...>, FormValuesContainer<...>>>`:\n * \t\t\tadds a child to the form values container. As a form values container is immutable, this method returns a mutation wrapping\n * \t\t\ta new form values container with the added child.\n * - `removeChild(container: FormValuesContainer<Value, Metadata>): Promise<FormValuesContainerMutation<Value, Metadata, FormValuesContainer<Value, Metadata>, void>>` :\n * \t\t\tremoves a child from the form values container. As a form values container is immutable, this method returns a mutation wrapping\n * \t\t\ta new form values container without the removed child.\n * - `registerChangeListener(listener: (newValue: FormValuesContainer<Value, Metadata>) => void): void` :\n * \t\t\tregisters a listener that will be called whenever the form values container is modified.\n * - `unregisterChangeListener(listener: (newValue: FormValuesContainer<Value, Metadata>) => void): void` : unregisters a listener that was previously registered.\n *\n */\nexport interface FormValuesContainer<Value, Metadata> {\n\t//information retrieval\n\tcompute<T, S extends { [key: string | symbol]: unknown }>(formula: string, sandbox?: S): T | undefined\n\tgetLabel(): string\n\tgetFormId(): string | undefined\n\tgetValues(revisionsFilter: (id: string, history: Version<Metadata>[]) => (string | null)[]): VersionedData<Value>\n\tgetMetadata(id: string, revisions: (string | null)[]): VersionedData<Metadata>\n\tgetChildren(): FormValuesContainer<Value, Metadata>[]\n\tgetValidationErrors(): [FieldMetadata, string][]\n\t//modification\n\tsetValue(label: string, language: string, data?: Value, id?: string, metadata?: Metadata): FormValuesContainerMutation<Value, Metadata, FormValuesContainer<Value, Metadata>, ID>\n\tsetMetadata(label: string, metadata: Metadata, id?: string): FormValuesContainerMutation<Value, Metadata, FormValuesContainer<Value, Metadata>, ID>\n\tdelete(serviceId: string): FormValuesContainerMutation<Value, Metadata, FormValuesContainer<Value, Metadata>, void>\n\t//hierarchy\n\taddChild(\n\t\tanchorId: string,\n\t\ttemplateId: string,\n\t\tlabel: string,\n\t): Promise<FormValuesContainerMutation<Value, Metadata, FormValuesContainer<Value, Metadata>, FormValuesContainer<Value, Metadata>>>\n\tremoveChild(container: FormValuesContainer<Value, Metadata>): Promise<FormValuesContainerMutation<Value, Metadata, FormValuesContainer<Value, Metadata>, void>>\n\t//listeners\n\tregisterChangeListener(listener: (newValue: FormValuesContainer<Value, Metadata>) => void): void\n\tunregisterChangeListener(listener: (newValue: FormValuesContainer<Value, Metadata>) => void): void\n}\n\n/**\n * FormValuesContainerMutation is a structure that wraps a new form values container along with the modified value.\n */\nexport interface FormValuesContainerMutation<Value, Metadata, FVC extends FormValuesContainer<Value, Metadata>, Result> {\n\tresult: Result\n\tformValuesContainer: FVC\n}\n\nexport type Suggestion = { id: string; code?: string; text: string; terms: string[]; label: { [lng: string]: string } }\n"]}

package/icure/form-values-container.d.ts

@@ -1,11 +1,31 @@
 import { Contact, Form as ICureForm, Service } from '@icure/api';
 import { FormValuesContainer, FormValuesContainerMutation, ID, Version, VersionedData } from '../generic';
-import { ServiceMetadata } from '../icure';
-import { FieldMetadata, FieldValue } from '../components/model';
+import { ServiceMetadata } from './model';
+import { FieldMetadata, FieldValue, Validator } from '../components/model';
+/** This class is a bridge between the ICure API and the generic FormValuesContainer interface.
+ * It wraps around a ContactFormValuesContainer and provides a series of services:
+ * - It computes dependent values when the form is created
+ * - It broadcasts changes from the wrapped ContactFormValuesContainer to its listeners
+ * - It provides a way to compute formulas in a sandboxed environment
+ * - It bridges the setValues and setMetadata methods with the wrapped ContactFormValuesContainer by
+ * 		- converting the FieldValue to a Service
+ * 		- converting the FieldMetadata to a ServiceMetadata
+ * - It bridges the getValues and getMetadata methods with the wrapped ContactFormValuesContainer by
+ * 		- converting the Service to a FieldValue
+ * 		- converting the ServiceMetadata to a FieldMetadata
+ * - It lazily creates bridges the children by
+ *    - lazily creating BridgedFormValuesContainer when the children of the wrapped ContactFormValuesContainer are accessed
+ *    - creating a new ContactFormValuesContainer and wrapping it in a BridgedFormValuesContainer when a child is added
+ *
+ * The icure-form typically accepts a BridgedFormValuesContainer as a prop and uses it to interact with the form.
+ *
+ * This class is fairly generic and can be used as an inspiration or subclassed for other bridges
+ */
 export declare class BridgedFormValuesContainer implements FormValuesContainer<FieldValue, FieldMetadata> {
     private responsible;
     private interpreter?;
     private dependentValuesProvider;
+    private validatorsProvider;
     private language;
     private changeListeners;
     private contact;
@@ -14,13 +34,14 @@ export declare class BridgedFormValuesContainer implements FormValuesContainer<F
     get children(): BridgedFormValuesContainer[];
     /**
      * Creates an instance of BridgedFormValuesContainer.
-     * @param responsible
+     * @param responsible The id of the data owner responsible for the creation of the values
      * @param contact The displayed contact (may be in the past). === to currentContact if the contact is the contact of the day
-     * @param contactFormValuesContainer
-     * @param interpreter
-     * @param dependentValuesProvider
-     * @param language
-     * @param changeListeners
+     * @param contactFormValuesContainer The wrapped ContactFormValuesContainer
+     * @param interpreter A function that can interpret formulas
+     * @param dependentValuesProvider A function that provides the dependent values (computed on the basis of other values) for a given anchorId and templateId
+     * @param validatorsProvider A function that provides the validators for a given anchorId and templateId
+     * @param language The language in which the values are displayed
+     * @param changeListeners The listeners that will be notified when the values change
      */
     constructor(responsible: string, contactFormValuesContainer: ContactFormValuesContainer, interpreter?: (<T, S extends {
         [key: string]: unknown;
@@ -28,6 +49,9 @@ export declare class BridgedFormValuesContainer implements FormValuesContainer<F
     }>(formula: string, sandbox: S) => T | undefined) | undefined, contact?: Contact, dependentValuesProvider?: (anchorId: string | undefined, templateId: string) => {
         metadata: FieldMetadata;
         formula: string;
+    }[], validatorsProvider?: (anchorId: string | undefined, templateId: string) => {
+        metadata: FieldMetadata;
+        validators: Validator[];
     }[], language?: string, changeListeners?: ((newValue: BridgedFormValuesContainer) => void)[]);
     getLabel(): string;
     getFormId(): string | undefined;
@@ -46,9 +70,18 @@ export declare class BridgedFormValuesContainer implements FormValuesContainer<F
         [key: string | symbol]: unknown;
     }>(formula: string, sandbox?: S): T | undefined;
     getChildren(): FormValuesContainer<FieldValue, FieldMetadata>[];
+    getValidationErrors(): [FieldMetadata, string][];
     addChild(anchorId: string, templateId: string, label: string): Promise<FormValuesContainerMutation<FieldValue, FieldMetadata, BridgedFormValuesContainer, BridgedFormValuesContainer>>;
     removeChild(container: BridgedFormValuesContainer): Promise<FormValuesContainerMutation<FieldValue, FieldMetadata, BridgedFormValuesContainer, void>>;
 }
+/**
+ * This class is a form values container that uses a hierarchy of forms as a data source. The actual values are extracted from the services of the contacts.
+ * The `currentContact` is the contact that has been selected by the user, any later contact should be ignored.
+ * The `contactsHistory` is used to provide the full history of the services.
+ * The hierarchy of ContactFormValuesContainer has to be maintained by the manager of the instances of this class (typically the BridgedFormValuesContainer).
+ * Each ContactFormValuesContainer has a reference to its `rootForm`.
+ * The `serviceFactory` and `formFactory` are used to create new services and add sub-forms.
+ */
 export declare class ContactFormValuesContainer implements FormValuesContainer<Service, ServiceMetadata> {
     rootForm: ICureForm;
     currentContact: Contact;
@@ -65,6 +98,7 @@ export declare class ContactFormValuesContainer implements FormValuesContainer<S
     registerChangeListener(listener: (newValue: ContactFormValuesContainer) => void): void;
     unregisterChangeListener(listener: (newValue: ContactFormValuesContainer) => void): void;
     getChildren(): ContactFormValuesContainer[];
+    getValidationErrors(): [FieldMetadata, string][];
     getValues(revisionsFilter: (id: string, history: Version<ServiceMetadata>[]) => (string | null)[]): VersionedData<Service>;
     getMetadata(id: string, revisions: (string | null)[]): VersionedData<ServiceMetadata>;
     setMetadata(label: string, meta: ServiceMetadata, id?: string): FormValuesContainerMutation<Service, ServiceMetadata, ContactFormValuesContainer, ID>;

package/icure/form-values-container.js

@@ -12,30 +12,50 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContactFormValuesContainer = exports.BridgedFormValuesContainer = void 0;
 const api_1 = require("@icure/api");
 const no_lodash_1 = require("../utils/no-lodash");
-const icure_utils_1 = require("../utils/icure-utils");
-const code_utils_1 = require("../utils/code-utils");
+const icure_utils_1 = require("./icure-utils");
 const primitive_1 = require("../utils/primitive");
+/** This class is a bridge between the ICure API and the generic FormValuesContainer interface.
+ * It wraps around a ContactFormValuesContainer and provides a series of services:
+ * - It computes dependent values when the form is created
+ * - It broadcasts changes from the wrapped ContactFormValuesContainer to its listeners
+ * - It provides a way to compute formulas in a sandboxed environment
+ * - It bridges the setValues and setMetadata methods with the wrapped ContactFormValuesContainer by
+ * 		- converting the FieldValue to a Service
+ * 		- converting the FieldMetadata to a ServiceMetadata
+ * - It bridges the getValues and getMetadata methods with the wrapped ContactFormValuesContainer by
+ * 		- converting the Service to a FieldValue
+ * 		- converting the ServiceMetadata to a FieldMetadata
+ * - It lazily creates bridges the children by
+ *    - lazily creating BridgedFormValuesContainer when the children of the wrapped ContactFormValuesContainer are accessed
+ *    - creating a new ContactFormValuesContainer and wrapping it in a BridgedFormValuesContainer when a child is added
+ *
+ * The icure-form typically accepts a BridgedFormValuesContainer as a prop and uses it to interact with the form.
+ *
+ * This class is fairly generic and can be used as an inspiration or subclassed for other bridges
+ */
 class BridgedFormValuesContainer {
     get children() {
         var _a;
         return ((_a = this._children) !== null && _a !== void 0 ? _a : (this._children = this.contactFormValuesContainer
             .getChildren()
-            .map((fvc) => new BridgedFormValuesContainer(this.responsible, fvc, this.interpreter, this.contact, this.dependentValuesProvider, this.language, this.changeListeners))));
+            .map((fvc) => new BridgedFormValuesContainer(this.responsible, fvc, this.interpreter, this.contact, this.dependentValuesProvider, this.validatorsProvider, this.language, this.changeListeners))));
     }
     /**
      * Creates an instance of BridgedFormValuesContainer.
-     * @param responsible
+     * @param responsible The id of the data owner responsible for the creation of the values
      * @param contact The displayed contact (may be in the past). === to currentContact if the contact is the contact of the day
-     * @param contactFormValuesContainer
-     * @param interpreter
-     * @param dependentValuesProvider
-     * @param language
-     * @param changeListeners
+     * @param contactFormValuesContainer The wrapped ContactFormValuesContainer
+     * @param interpreter A function that can interpret formulas
+     * @param dependentValuesProvider A function that provides the dependent values (computed on the basis of other values) for a given anchorId and templateId
+     * @param validatorsProvider A function that provides the validators for a given anchorId and templateId
+     * @param language The language in which the values are displayed
+     * @param changeListeners The listeners that will be notified when the values change
      */
-    constructor(responsible, contactFormValuesContainer, interpreter, contact, dependentValuesProvider = () => [], language = 'en', changeListeners = []) {
+    constructor(responsible, contactFormValuesContainer, interpreter, contact, dependentValuesProvider = () => [], validatorsProvider = () => [], language = 'en', changeListeners = []) {
         this.responsible = responsible;
         this.interpreter = interpreter;
         this.dependentValuesProvider = dependentValuesProvider;
+        this.validatorsProvider = validatorsProvider;
         this.language = language;
         this.changeListeners = changeListeners;
         //Before start to broadcast changes, we need to fill in the contactFormValuesContainer with the dependent values
@@ -59,23 +79,21 @@ class BridgedFormValuesContainer {
         this.changeListeners = this.changeListeners.filter((l) => l !== listener);
     }
     getValues(revisionsFilter) {
-        return Object.entries(this.contactFormValuesContainer.getValues((id, history) => {
-            return revisionsFilter(id, history
-                .filter(({ modified }) => !this.contact.created || !modified || modified <= this.contact.created)
-                .map(({ revision, modified, value: sm }) => {
-                var _a;
-                return ({
-                    revision,
-                    modified,
-                    value: {
-                        label: sm.label,
-                        owner: sm.owner,
-                        tags: (_a = sm.tags) === null || _a === void 0 ? void 0 : _a.map(code_utils_1.codeStubToCode),
-                        valueDate: sm.valueDate,
-                    },
-                });
-            }));
-        })).reduce((acc, [id, history]) => {
+        return Object.entries(this.contactFormValuesContainer.getValues((id, history) => revisionsFilter(id, history
+            .filter(({ modified }) => !this.contact.created || !modified || modified <= this.contact.created)
+            .map(({ revision, modified, value: sm }) => {
+            var _a;
+            return ({
+                revision,
+                modified,
+                value: {
+                    label: sm.label,
+                    owner: sm.responsible,
+                    tags: (_a = sm.tags) === null || _a === void 0 ? void 0 : _a.map(icure_utils_1.codeStubToCode),
+                    valueDate: sm.valueDate,
+                },
+            });
+        })))).reduce((acc, [id, history]) => {
             return Object.assign(Object.assign({}, acc), { [id]: history.map(({ revision, modified, value: s }) => {
                     var _a, _b;
                     return ({
@@ -83,10 +101,10 @@ class BridgedFormValuesContainer {
                         modified,
                         value: {
                             content: Object.entries((_a = s.content) !== null && _a !== void 0 ? _a : {}).reduce((acc, [lng, cnt]) => {
-                                const converted = (0, primitive_1.contentToPrimitiveType)(lng, cnt);
+                                const converted = (0, icure_utils_1.contentToPrimitiveType)(lng, cnt);
                                 return converted ? Object.assign(Object.assign({}, acc), { [lng]: converted }) : acc;
                             }, {}),
-                            codes: (_b = s.codes) === null || _b === void 0 ? void 0 : _b.map(code_utils_1.codeStubToCode),
+                            codes: (_b = s.codes) === null || _b === void 0 ? void 0 : _b.map(icure_utils_1.codeStubToCode),
                         },
                     });
                 }) });
@@ -98,14 +116,14 @@ class BridgedFormValuesContainer {
                 modified,
                 value: {
                     label: s.label,
-                    owner: s.owner,
+                    owner: s.responsible,
                     valueDate: s.valueDate,
                     tags: s.tags,
                 },
             })) })), {});
     }
     mutateAndNotify(newContactFormValuesContainer) {
-        const newBridgedFormValueContainer = new BridgedFormValuesContainer(this.responsible, newContactFormValuesContainer, this.interpreter, this.contact === this.contactFormValuesContainer.currentContact ? newContactFormValuesContainer.currentContact : this.contact, this.dependentValuesProvider, this.language, this.changeListeners);
+        const newBridgedFormValueContainer = new BridgedFormValuesContainer(this.responsible, newContactFormValuesContainer, this.interpreter, this.contact === this.contactFormValuesContainer.currentContact ? newContactFormValuesContainer.currentContact : this.contact, this.dependentValuesProvider, this.validatorsProvider, this.language, this.changeListeners);
         this.changeListeners.forEach((l) => l(newBridgedFormValueContainer));
         return newBridgedFormValueContainer;
     }
@@ -145,8 +163,7 @@ class BridgedFormValuesContainer {
     setMetadata(label, meta, id) {
         const mutation = this.contactFormValuesContainer.setMetadata(label, {
             label: meta.label,
-            responsible: this.responsible,
-            owner: meta.owner,
+            responsible: meta.owner,
             valueDate: meta.valueDate,
             tags: meta.tags,
         }, id);
@@ -180,6 +197,7 @@ class BridgedFormValuesContainer {
                 const primitive = (_b = (_a = content[this.language]) !== null && _a !== void 0 ? _a : content['*']) !== null && _b !== void 0 ? _b : content[Object.keys(content)[0]];
                 return primitive && (0, primitive_1.parsePrimitive)(primitive);
             },
+            log: console.log,
         };
         const proxy = new Proxy({}, {
             has: (target, key) => { var _a; return !!native[key] || key === 'self' || Object.keys((_a = this.getVersionedValuesForKey(key)) !== null && _a !== void 0 ? _a : {}).length > 0; },
@@ -199,6 +217,24 @@ class BridgedFormValuesContainer {
     getChildren() {
         return this.contactFormValuesContainer.getChildren().map((fvc) => new BridgedFormValuesContainer(this.responsible, fvc, this.interpreter, this.contact));
     }
+    getValidationErrors() {
+        if (this.contactFormValuesContainer.rootForm.formTemplateId) {
+            return this.validatorsProvider(this.contactFormValuesContainer.rootForm.descr, this.contactFormValuesContainer.rootForm.formTemplateId).flatMap(({ metadata, validators }) => validators
+                .map(({ validation, message }) => {
+                try {
+                    return this.compute(validation) ? undefined : [metadata, message];
+                }
+                catch (e) {
+                    console.log(`Error while computing validation : ${validation}`, e);
+                    return undefined;
+                }
+            })
+                .filter((x) => !!x));
+        }
+        else {
+            return [];
+        }
+    }
     addChild(anchorId, templateId, label) {
         return __awaiter(this, void 0, void 0, function* () {
             const mutation = yield this.contactFormValuesContainer.addChild(anchorId, templateId, label);
@@ -218,6 +254,14 @@ class BridgedFormValuesContainer {
     }
 }
 exports.BridgedFormValuesContainer = BridgedFormValuesContainer;
+/**
+ * This class is a form values container that uses a hierarchy of forms as a data source. The actual values are extracted from the services of the contacts.
+ * The `currentContact` is the contact that has been selected by the user, any later contact should be ignored.
+ * The `contactsHistory` is used to provide the full history of the services.
+ * The hierarchy of ContactFormValuesContainer has to be maintained by the manager of the instances of this class (typically the BridgedFormValuesContainer).
+ * Each ContactFormValuesContainer has a reference to its `rootForm`.
+ * The `serviceFactory` and `formFactory` are used to create new services and add sub-forms.
+ */
 class ContactFormValuesContainer {
     constructor(rootForm, currentContact, contactsHistory, serviceFactory, children, formFactory, changeListeners = []) {
         if (contactsHistory.includes(currentContact)) {
@@ -237,8 +281,8 @@ class ContactFormValuesContainer {
             this.changeListeners.forEach((l) => l(newContactFormValuesContainer));
         });
     }
-    static fromFormsHierarchy(rootForm, currentContact, contactsHistory, serviceFactory, formChildrenProvider, formFactory, changeListeners = []) {
-        return __awaiter(this, void 0, void 0, function* () {
+    static fromFormsHierarchy(rootForm_1, currentContact_1, contactsHistory_1, serviceFactory_1, formChildrenProvider_1, formFactory_1) {
+        return __awaiter(this, arguments, void 0, function* (rootForm, currentContact, contactsHistory, serviceFactory, formChildrenProvider, formFactory, changeListeners = []) {
             const contactFormValuesContainer = new ContactFormValuesContainer(rootForm, currentContact, contactsHistory, serviceFactory, rootForm.id
                 ? yield Promise.all((yield formChildrenProvider(rootForm.id)).map((f) => __awaiter(this, void 0, void 0, function* () { 
                 // eslint-disable-next-line max-len
@@ -265,6 +309,9 @@ class ContactFormValuesContainer {
     getChildren() {
         return this.children;
     }
+    getValidationErrors() {
+        throw new Error('Validation not supported at contact level');
+    }
     getValues(revisionsFilter) {
         return Object.entries(this.getServicesInHistory(revisionsFilter)).reduce((acc, [id, history]) => history.length
             ? Object.assign(Object.assign({}, acc), { [id]: [...history].sort((a, b) => ((b === null || b === void 0 ? void 0 : b.modified) || +new Date()) - ((a === null || a === void 0 ? void 0 : a.modified) || +new Date())) }) : acc, {});
@@ -285,7 +332,6 @@ class ContactFormValuesContainer {
                             modified: s.modified,
                             value: {
                                 label: (_c = s.label) !== null && _c !== void 0 ? _c : s.id,
-                                owner: s.author,
                                 responsible: s.responsible,
                                 valueDate: s.valueDate,
                                 tags: s.tags,
@@ -301,13 +347,11 @@ class ContactFormValuesContainer {
             throw new Error('Service id must be defined');
         }
         if ((meta.responsible && service.responsible !== meta.responsible) ||
-            (meta.owner && service.author !== meta.owner) ||
             (meta.valueDate && service.valueDate !== meta.valueDate) ||
             (meta.codes && service.codes !== meta.codes) ||
             (meta.tags && service.tags !== meta.tags)) {
             const newService = new api_1.Service(Object.assign(Object.assign({}, service), { modified: Date.now() }));
             meta.responsible && (newService.responsible = meta.responsible);
-            meta.owner && (newService.author = meta.owner);
             meta.valueDate && (newService.valueDate = meta.valueDate);
             meta.codes && (newService.codes = meta.codes);
             meta.tags && (newService.tags = meta.tags);
@@ -318,7 +362,7 @@ class ContactFormValuesContainer {
         return { result: service.id, formValuesContainer: this };
     }
     setValue(label, language, value, id, metadata) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
         const service = (id && this.getServiceInCurrentContact(id)) || this.serviceFactory(label, id);
         if (!service.id) {
             throw new Error('Service id must be defined');
@@ -333,7 +377,7 @@ class ContactFormValuesContainer {
                 delete newContents[language];
             }
             let newCurrentContact;
-            if (!Object.entries(newContents).filter(([_, cnt]) => cnt !== undefined).length) {
+            if (!Object.entries(newContents).filter(([, cnt]) => cnt !== undefined).length) {
                 newCurrentContact = Object.assign(Object.assign({}, this.currentContact), { services: ((_e = this.currentContact.services) !== null && _e !== void 0 ? _e : []).some((s) => s.id === service.id)
                         ? ((_f = this.currentContact.services) !== null && _f !== void 0 ? _f : []).filter((s) => s.id !== service.id)
                         : [...((_g = this.currentContact.services) !== null && _g !== void 0 ? _g : [])] });
@@ -343,14 +387,13 @@ class ContactFormValuesContainer {
                 newService.codes = newCodes;
                 if (metadata) {
                     newService.responsible = (_h = metadata.responsible) !== null && _h !== void 0 ? _h : newService.responsible;
-                    newService.author = (_j = metadata.owner) !== null && _j !== void 0 ? _j : newService.author;
-                    newService.valueDate = (_k = metadata.valueDate) !== null && _k !== void 0 ? _k : newService.valueDate;
-                    newService.tags = (_l = metadata.tags) !== null && _l !== void 0 ? _l : newService.tags;
-                    newService.label = (_m = metadata.label) !== null && _m !== void 0 ? _m : newService.label;
+                    newService.valueDate = (_j = metadata.valueDate) !== null && _j !== void 0 ? _j : newService.valueDate;
+                    newService.tags = (_k = metadata.tags) !== null && _k !== void 0 ? _k : newService.tags;
+                    newService.label = (_l = metadata.label) !== null && _l !== void 0 ? _l : newService.label;
                 }
-                newCurrentContact = Object.assign(Object.assign({}, this.currentContact), { services: ((_o = this.currentContact.services) !== null && _o !== void 0 ? _o : []).some((s) => s.id === service.id)
-                        ? ((_p = this.currentContact.services) !== null && _p !== void 0 ? _p : []).map((s) => (s.id === service.id ? newService : s))
-                        : [...((_q = this.currentContact.services) !== null && _q !== void 0 ? _q : []), newService] });
+                newCurrentContact = Object.assign(Object.assign({}, this.currentContact), { services: ((_m = this.currentContact.services) !== null && _m !== void 0 ? _m : []).some((s) => s.id === service.id)
+                        ? ((_o = this.currentContact.services) !== null && _o !== void 0 ? _o : []).map((s) => (s.id === service.id ? newService : s))
+                        : [...((_p = this.currentContact.services) !== null && _p !== void 0 ? _p : []), newService] });
             }
             const newFormValuesContainer = new ContactFormValuesContainer(this.rootForm, newCurrentContact, this.contactsHistory.map((c) => (c === this.currentContact ? newCurrentContact : c)), this.serviceFactory, this.children, this.formFactory, this.changeListeners);
             this.changeListeners.forEach((l) => l(newFormValuesContainer));
@@ -392,8 +435,7 @@ class ContactFormValuesContainer {
                     modified,
                     value: {
                         label: (_b = (_a = s.label) !== null && _a !== void 0 ? _a : s.id) !== null && _b !== void 0 ? _b : '',
-                        owner: s.author,
-                        responsible: s.responsible,
+                        owner: s.responsible,
                         valueDate: s.valueDate,
                         codes: s.codes,
                         tags: s.tags,
@@ -429,17 +471,22 @@ class ContactFormValuesContainer {
 }
 exports.ContactFormValuesContainer = ContactFormValuesContainer;
 const setValueOnContactFormValuesContainer = (cfvc, label, language, fv, id, metadata) => {
-    var _a;
+    var _a, _b;
     const value = fv === null || fv === void 0 ? void 0 : fv.content[language];
     const mutation = cfvc.setValue(label, language, {
         id: id,
         codes: (_a = fv === null || fv === void 0 ? void 0 : fv.codes) !== null && _a !== void 0 ? _a : [],
         content: value
             ? {
-                [language]: (0, primitive_1.primitiveTypeToContent)(language, value),
+                [language]: (0, icure_utils_1.primitiveTypeToContent)(language, value),
             }
             : undefined,
-    }, id, metadata);
+    }, id, {
+        label: (_b = metadata === null || metadata === void 0 ? void 0 : metadata.label) !== null && _b !== void 0 ? _b : '',
+        responsible: metadata === null || metadata === void 0 ? void 0 : metadata.owner,
+        valueDate: metadata === null || metadata === void 0 ? void 0 : metadata.valueDate,
+        tags: metadata === null || metadata === void 0 ? void 0 : metadata.tags,
+    });
     return mutation;
 };
 //# sourceMappingURL=form-values-container.js.map