@icure/form 2.1.2 → 2.1.3

package/icure/form-values-container.js

@@ -15,10 +15,30 @@ const no_lodash_1 = require("../utils/no-lodash");
 const icure_utils_1 = require("./icure-utils");
 const primitive_1 = require("../utils/primitive");
 const dates_1 = require("../utils/dates");
-const uuid_1 = require("uuid");
 const code_utils_1 = require("../utils/code-utils");
-function notify(l, fvc) {
-    l(fvc);
+let _ordinal = 0;
+function notify(l, fvc, changedKeys, force = false) {
+    l(fvc, changedKeys, force);
+}
+function primitiveTypeToString(pt) {
+    switch (pt.type) {
+        case 'string':
+            return pt.value;
+        case 'number':
+            return pt.value.toString();
+        case 'boolean':
+            return pt.value.toString();
+        case 'measure':
+            return pt.value !== undefined ? `${pt.value}${pt.unit ? ' ' + pt.unit : ''}` : '';
+        case 'timestamp':
+            return new Date(pt.value).toISOString();
+        case 'datetime':
+            return pt.value.toString();
+        case 'compound':
+            return Object.entries(pt.value)
+                .map(([k, v]) => `${k}: ${primitiveTypeToString(v)}`)
+                .join(', ');
+    }
 }
 /** 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:
@@ -55,8 +75,9 @@ class BridgedFormValuesContainer {
      * @param language The language in which the values are displayed
      * @param changeListeners The listeners that will be notified when the values change
      * @param interpreterContext A map with keys that are the names of the variables and values that are the functions that return the values of the variables
+     * @param dependenciesCache
      */
-    constructor(responsible, contactFormValuesContainer, interpreter, contact, initialValuesProvider = () => [], dependentValuesProvider = () => [], validatorsProvider = () => [], language = 'en', changeListeners = [], interpreterContext = {}) {
+    constructor(responsible, contactFormValuesContainer, interpreter, contact, initialValuesProvider = () => [], dependentValuesProvider = () => [], validatorsProvider = () => [], language = 'en', changeListeners = [], interpreterContext = {}, dependenciesCache = {}) {
         this.responsible = responsible;
         this.interpreter = interpreter;
         this.initialValuesProvider = initialValuesProvider;
@@ -65,25 +86,54 @@ class BridgedFormValuesContainer {
         this.language = language;
         this.changeListeners = changeListeners;
         this.interpreterContext = interpreterContext;
-        this._id = (0, uuid_1.v4)();
-        console.log(`Creating bridge FVC (${contactFormValuesContainer.rootForm.formTemplateId}) with ${contactFormValuesContainer.children.length} children [${this._id}]`);
+        this.dependenciesCache = dependenciesCache;
+        this._id = '';
+        this.dependentValuesComputationIteration = undefined;
         //Before start to broadcast changes, we need to fill in the contactFormValuesContainer with the dependent values
         this.contactFormValuesContainer = contactFormValuesContainer;
-        this.mutateAndNotify = (newContactFormValuesContainer) => __awaiter(this, void 0, void 0, function* () {
+        this._id = `[${contactFormValuesContainer._id}]`;
+        console.log(`+ BFVC ${this._id} created`);
+        this.mutateAndNotify = (newContactFormValuesContainer, changedKeys, force = false) => {
+            if (this.changeListeners.length === 0) {
+                return;
+            }
+            if (!force && this.contactFormValuesContainer === newContactFormValuesContainer) {
+                return;
+            }
+            this.contactFormValuesContainer.unregisterChangeListener(this.mutateAndNotify);
             newContactFormValuesContainer.unregisterChangeListener(this.mutateAndNotify);
-            const newBridgedFormValueContainer = yield new BridgedFormValuesContainer(this.responsible, newContactFormValuesContainer, this.interpreter, this.contact === this.contactFormValuesContainer.currentContact ? newContactFormValuesContainer.currentContact : this.contact, this.initialValuesProvider, this.dependentValuesProvider, this.validatorsProvider, this.language, this.changeListeners, this.interpreterContext).init();
-            this.changeListeners.forEach((l) => notify(l, newBridgedFormValueContainer));
-            return newBridgedFormValueContainer;
-        });
+            const newBridgedFormValueContainer = new BridgedFormValuesContainer(this.responsible, newContactFormValuesContainer, this.interpreter, this.contact === this.contactFormValuesContainer.currentContact ? newContactFormValuesContainer.currentContact : this.contact, this.initialValuesProvider, this.dependentValuesProvider, this.validatorsProvider, this.language, this.changeListeners, this.interpreterContext, this.dependenciesCache);
+            const initPromise = newBridgedFormValueContainer.init(changedKeys, this.dependentValuesComputationIteration);
+            this.changeListeners.forEach((l) => notify(l, newBridgedFormValueContainer, changedKeys));
+            initPromise.catch((e) => {
+                console.log('Error while initializing new BridgedFormValuesContainer', e);
+            });
+        };
         this.contactFormValuesContainer.registerChangeListener(this.mutateAndNotify);
         this.contact = contact !== null && contact !== void 0 ? contact : contactFormValuesContainer.currentContact;
     }
+    /* init can be called several times on the same instance but the initialisation will only be done once */
     init() {
-        return __awaiter(this, void 0, void 0, function* () {
+        return __awaiter(this, arguments, void 0, function* (changedKeys = null, pendingComputationIteration) {
             if (this.contactFormValuesContainer.mustBeInitialised()) {
                 yield this.computeInitialValues();
             }
-            yield this.computeDependentValues();
+            let changedKeysByInit = [];
+            if (pendingComputationIteration) {
+                const changes = yield pendingComputationIteration;
+                if (changes.length > 0) {
+                    this.quietlyApplyChangesOnContactFormValueContainer(changes);
+                    changedKeysByInit = yield this.computeDependentValues([...(changedKeys !== null && changedKeys !== void 0 ? changedKeys : []), ...changes.map(([, metadata]) => metadata.label)]);
+                }
+                else {
+                    changedKeysByInit = yield this.computeDependentValues(changedKeys);
+                }
+            }
+            else {
+                changedKeysByInit = yield this.computeDependentValues(changedKeys);
+            }
+            //After all the silent updates, we need a last one that causes a new BridgedFormValuesContainer to be created and broadcasted to the listeners, so that they get the final values with all the dependencies computed
+            this.contactFormValuesContainer.changeListeners.forEach((l) => notify(l, this.contactFormValuesContainer, changedKeysByInit, changedKeysByInit.length > 0));
             return this;
         });
     }
@@ -102,12 +152,10 @@ class BridgedFormValuesContainer {
     unregisterChangeListener(listener) {
         this.changeListeners = this.changeListeners.filter((l) => l !== listener);
     }
-    getDefaultValue(label) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const formula = (_a = this.initialValuesProvider(this.contactFormValuesContainer.rootForm.descr, this.contactFormValuesContainer.rootForm.formTemplateId).find(({ metadata }) => metadata.label === label)) === null || _a === void 0 ? void 0 : _a.formula;
-            return formula ? this.convertRawValue(yield this.compute(formula)) : undefined;
-        });
+    getDefaultValueProvider(label) {
+        var _a;
+        const formula = (_a = this.initialValuesProvider(this.contactFormValuesContainer.rootForm.descr, this.contactFormValuesContainer.rootForm.formTemplateId).find(({ metadata }) => metadata.label === label)) === null || _a === void 0 ? void 0 : _a.formula;
+        return formula ? () => __awaiter(this, void 0, void 0, function* () { return this.convertRawValue(yield this.compute(formula)); }) : undefined;
     }
     getValues(revisionsFilter) {
         return Object.entries(this.contactFormValuesContainer.getValues((id, history) => revisionsFilter(id, history
@@ -201,7 +249,8 @@ class BridgedFormValuesContainer {
                     try {
                         const currentValue = this.getValues(revisionsFilter);
                         if (!currentValue || !Object.keys(currentValue).length) {
-                            const newValue = this.convertRawValue((yield this.compute(formula)));
+                            const computedValue = (yield this.compute(formula)).value;
+                            const newValue = computedValue ? this.convertRawValue(computedValue) : undefined;
                             if (newValue !== undefined) {
                                 const lng = (_b = this.language) !== null && _b !== void 0 ? _b : 'en';
                                 if (newValue && !newValue.content[lng] && newValue.content['*']) {
@@ -228,38 +277,80 @@ class BridgedFormValuesContainer {
         });
     }
     //This method mutates the BridgedFormValuesContainer but can only be called from the constructor
-    computeDependentValues() {
+    computeDependentValues(changedKeys) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.contactFormValuesContainer.rootForm.formTemplateId) {
-                yield Promise.all(this.dependentValuesProvider(this.contactFormValuesContainer.rootForm.descr, this.contactFormValuesContainer.rootForm.formTemplateId).map((_a) => __awaiter(this, [_a], void 0, function* ({ metadata, revisionsFilter, formula }) {
-                    var _b;
-                    try {
-                        const currentValue = this.getValues(revisionsFilter);
-                        const newValue = this.convertRawValue((yield this.compute(formula)));
-                        if (newValue !== undefined || currentValue != undefined) {
-                            const lng = (_b = this.language) !== null && _b !== void 0 ? _b : 'en';
-                            if (newValue && !newValue.content[lng] && newValue.content['*']) {
-                                newValue.content[lng] = newValue.content['*'];
-                            }
-                            if (newValue) {
-                                delete newValue.content['*'];
-                            }
-                            const interceptor = (fvc) => {
-                                const currentContact = this.contactFormValuesContainer.currentContact;
-                                this.contactFormValuesContainer = fvc;
-                                if (this.contact === currentContact) {
-                                    this.contact = fvc.currentContact;
+            const iterate = (changedKeys, iterationCount) => __awaiter(this, void 0, void 0, function* () {
+                if (this.contactFormValuesContainer.rootForm.formTemplateId) {
+                    console.log(`% ${iterationCount}, keys: ${changedKeys ? changedKeys.join(', ') : 'all'}`);
+                    return yield Promise.all(this.dependentValuesProvider(this.contactFormValuesContainer.rootForm.descr, this.contactFormValuesContainer.rootForm.formTemplateId).map((_a) => __awaiter(this, [_a], void 0, function* ({ metadata, revisionsFilter, formula }) {
+                        var _b, _c;
+                        try {
+                            if (!changedKeys || !this.dependenciesCache[formula] || this.dependenciesCache[formula].some((d) => changedKeys.includes(d))) {
+                                const currentValue = this.getValues(revisionsFilter);
+                                try {
+                                    const computationResult = yield this.compute(formula);
+                                    this.dependenciesCache[formula] = [...((_b = this.dependenciesCache[formula]) !== null && _b !== void 0 ? _b : []), ...computationResult.dependencies].filter((d, idx, array) => array.indexOf(d) === idx);
+                                    const newValue = computationResult.value ? this.convertRawValue(computationResult.value) : undefined;
+                                    if (newValue !== undefined || (currentValue != undefined && Object.keys(currentValue).length > 0 && currentValue[Object.keys(currentValue)[0]][0].value)) {
+                                        const lng = (_c = this.language) !== null && _c !== void 0 ? _c : 'en';
+                                        if (newValue && !newValue.content[lng] && newValue.content['*']) {
+                                            newValue.content[lng] = newValue.content['*'];
+                                        }
+                                        if (newValue) {
+                                            delete newValue.content['*'];
+                                        }
+                                        return [Object.keys(currentValue !== null && currentValue !== void 0 ? currentValue : {})[0], metadata, lng, newValue];
+                                    }
+                                }
+                                catch (e) {
+                                    console.log(`Error while computing formula : ${formula}`, e);
                                 }
-                            };
-                            setValueOnContactFormValuesContainer(this.contactFormValuesContainer, metadata.label, lng, newValue, Object.keys(currentValue !== null && currentValue !== void 0 ? currentValue : {})[0], metadata, interceptor);
+                            }
                         }
-                    }
-                    catch (e) {
-                        console.log(`Error while computing formula : ${formula}`, e);
-                    }
-                })));
+                        catch (e) {
+                            console.log(`Error while computing formula : ${formula}`, e);
+                        }
+                        return null;
+                    }))).then((results) => results.filter((r) => !!r));
+                }
+                else {
+                    return [];
+                }
+            });
+            let latestKeys = changedKeys;
+            let iterationCount = 0;
+            const allChangedKeys = [];
+            while (true) {
+                if (latestKeys != null && latestKeys.length === 0) {
+                    this.dependentValuesComputationIteration = undefined;
+                    break;
+                }
+                const changes = yield (this.dependentValuesComputationIteration = iterate(latestKeys, iterationCount++));
+                latestKeys = this.quietlyApplyChangesOnContactFormValueContainer(changes);
+                allChangedKeys.push(...latestKeys);
+            }
+            return allChangedKeys;
+        });
+    }
+    quietlyApplyChangesOnContactFormValueContainer(changes) {
+        const allChangedKeys = [];
+        const interceptor = (fvc, changedKeys) => {
+            const currentContact = this.contactFormValuesContainer.currentContact;
+            this.contactFormValuesContainer = fvc;
+            if (this.contact === currentContact) {
+                this.contact = fvc.currentContact;
+            }
+            allChangedKeys.push(...(changedKeys !== null && changedKeys !== void 0 ? changedKeys : []));
+        };
+        changes.forEach(([id, metadata, language, newValue]) => {
+            try {
+                setValueOnContactFormValuesContainer(this.contactFormValuesContainer, metadata.label, language, newValue !== null && newValue !== void 0 ? newValue : undefined, id, metadata, interceptor);
+            }
+            catch (e) {
+                console.log(`Error while applying dependent value change for ${metadata.label} (${id})`, e);
             }
         });
+        return allChangedKeys;
     }
     setValue(label, language, fv, id, metadata) {
         setValueOnContactFormValuesContainer(this.contactFormValuesContainer, label, language, fv, id, metadata);
@@ -278,9 +369,10 @@ class BridgedFormValuesContainer {
     getVersionedValuesForKey(key) {
         return this.getValues((id, history) => { var _a, _b, _c; return (((_b = (_a = history === null || history === void 0 ? void 0 : history[0]) === null || _a === void 0 ? void 0 : _a.value) === null || _b === void 0 ? void 0 : _b.label) && key === history[0].value.label ? [(_c = history === null || history === void 0 ? void 0 : history[0]) === null || _c === void 0 ? void 0 : _c.revision] : []); });
     }
-    compute(formula, sandbox) {
+    compute(formula) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
+            const dependencies = new Set();
             // noinspection JSUnusedGlobalSymbols
             const parseContent = (content, toString = false) => {
                 var _a, _b;
@@ -301,6 +393,7 @@ class BridgedFormValuesContainer {
                     .join(', ');
             };
             const log = console.log;
+            // noinspection JSUnusedGlobalSymbols
             const native = {
                 parseInt: parseInt,
                 parseFloat: parseFloat,
@@ -348,42 +441,40 @@ class BridgedFormValuesContainer {
                     if (!!nativeValue) {
                         return nativeValue;
                     }
-                    return key === 'self' ? proxy : this.interpreterContext[key] ? this.interpreterContext[key]() : Object.values(this.getVersionedValuesForKey(key)).map((v) => { var _a; return (_a = v[0]) === null || _a === void 0 ? void 0 : _a.value; });
+                    if (key === 'self') {
+                        return proxy;
+                    }
+                    else {
+                        dependencies.add(key.toString());
+                        return this.interpreterContext[key] ? this.interpreterContext[key]() : Object.values(this.getVersionedValuesForKey(key)).map((v) => { var _a; return (_a = v[0]) === null || _a === void 0 ? void 0 : _a.value; });
+                    }
                 },
             });
-            return (_a = this.interpreter) === null || _a === void 0 ? void 0 : _a.call(this, formula, sandbox !== null && sandbox !== void 0 ? sandbox : proxy);
+            return { value: yield ((_a = this.interpreter) === null || _a === void 0 ? void 0 : _a.call(this, formula, proxy)), dependencies: Array.from(dependencies) };
         });
     }
     getChildren() {
         return __awaiter(this, void 0, void 0, function* () {
-            const children = yield Promise.all((yield this.contactFormValuesContainer.getChildren()).map((fvc) => new BridgedFormValuesContainer(this.responsible, fvc, this.interpreter, this.contact, this.initialValuesProvider, this.dependentValuesProvider, this.validatorsProvider, this.language, [], this.interpreterContext).init()));
-            console.log(`${children.length} children found in ${this.contactFormValuesContainer.rootForm.formTemplateId} initialised with `, this.initialValuesProvider);
-            return children;
+            return yield Promise.all((yield this.contactFormValuesContainer.getChildren()).map((fvc) => new BridgedFormValuesContainer(this.responsible, fvc, this.interpreter, this.contact, this.initialValuesProvider, this.dependentValuesProvider, this.validatorsProvider, this.language, [], this.interpreterContext).init()));
         });
     }
     getValidationErrors() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.contactFormValuesContainer.rootForm.formTemplateId) {
-                // noinspection ES6MissingAwait
-                return yield this.validatorsProvider(this.contactFormValuesContainer.rootForm.descr, this.contactFormValuesContainer.rootForm.formTemplateId).reduce((resPromise_1, _a) => __awaiter(this, [resPromise_1, _a], void 0, function* (resPromise, { metadata, validators }) {
-                    return yield validators.reduce((resPromise_2, _a) => __awaiter(this, [resPromise_2, _a], void 0, function* (resPromise, { validation, message }) {
-                        const res = yield resPromise;
-                        try {
-                            if (!(yield this.compute(validation))) {
-                                res.push([metadata, message]);
-                            }
-                        }
-                        catch (e) {
-                            console.log(`Error while computing validation : ${validation}`, e);
-                        }
-                        return res;
-                    }), resPromise);
-                }), Promise.resolve([]));
-            }
-            else {
-                return [];
-            }
-        });
+        if (this.contactFormValuesContainer.rootForm.formTemplateId) {
+            return this.validatorsProvider(this.contactFormValuesContainer.rootForm.descr, this.contactFormValuesContainer.rootForm.formTemplateId).flatMap(({ metadata, validators }) => validators.map((_a) => __awaiter(this, [_a], void 0, function* ({ validation, message }) {
+                try {
+                    if (!(yield this.compute(validation))) {
+                        return [metadata, message];
+                    }
+                }
+                catch (e) {
+                    console.log(`Error while computing validation : ${validation}`, e);
+                }
+                return null;
+            })));
+        }
+        else {
+            return [];
+        }
     }
     addChild(anchorId, templateId, label) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -433,17 +524,20 @@ class ContactFormValuesContainer {
     allForms() {
         return [this.rootForm].concat(this.children.flatMap((c) => c.allForms()));
     }
-    constructor(rootForm, currentContact, contactsHistory, serviceFactory, children, formFactory, formRecycler, changeListeners = [], initialised = true) {
-        this._id = (0, uuid_1.v4)();
+    constructor(rootForm, currentContact, contactsHistory, serviceFactory, children, formFactory, formRecycler, changeListeners = [], anchorId, initialised = true) {
+        var _a;
+        this._id = '';
         this._initialised = false;
-        console.log(`Creating contact FVC (${rootForm.formTemplateId}) with ${children.length} children [${this._id}]`);
+        this.rootForm = rootForm;
+        this._id = `${((_a = rootForm.formTemplateId) !== null && _a !== void 0 ? _a : '').substring(0, 4)}.${++_ordinal}`;
+        console.log(`+ CFVC: ${this._id} with children { ${children.map((c) => c._id).join(', ')} }`);
         if (contactsHistory.includes(currentContact)) {
             throw new Error('Illegal argument, the history must not contain the currentContact');
         }
-        this.rootForm = rootForm;
         this.currentContact = currentContact;
         this.contactsHistory = (0, no_lodash_1.sortedBy)(contactsHistory, 'created', 'desc');
         this.children = children;
+        this.anchorId = anchorId;
         this.serviceFactory = serviceFactory;
         this.formFactory = formFactory;
         this.formRecycler = formRecycler;
@@ -451,7 +545,7 @@ class ContactFormValuesContainer {
         this._initialised = initialised;
         this.indexedServices = [this.currentContact].concat(this.contactsHistory).reduce((acc, ctc) => {
             var _a, _b, _c;
-            const services = (_c = (_b = (_a = ctc.services) === null || _a === void 0 ? void 0 : _a.filter((s) => { var _a; return (_a = ctc.subContacts) === null || _a === void 0 ? void 0 : _a.some((sc) => { var _a; return sc.formId === this.rootForm.id && ((_a = sc.services) === null || _a === void 0 ? void 0 : _a.some((sss) => sss.serviceId === s.id)); }); })) === null || _b === void 0 ? void 0 : _b.reduce((acc, s) => {
+            return ((_c = (_b = (_a = ctc.services) === null || _a === void 0 ? void 0 : _a.filter((s) => { var _a; return (_a = ctc.subContacts) === null || _a === void 0 ? void 0 : _a.some((sc) => { var _a; return sc.formId === this.rootForm.id && ((_a = sc.services) === null || _a === void 0 ? void 0 : _a.some((sss) => sss.serviceId === s.id)); }); })) === null || _b === void 0 ? void 0 : _b.reduce((acc, s) => {
                 var _a, _b;
                 return s.id
                     ? Object.assign(Object.assign({}, acc), { [s.id]: ((_a = acc[s.id]) !== null && _a !== void 0 ? _a : (acc[s.id] = [])).concat({
@@ -459,26 +553,29 @@ class ContactFormValuesContainer {
                             modified: ctc.created,
                             value: s,
                         }) }) : acc;
-            }, acc)) !== null && _c !== void 0 ? _c : acc;
-            return services;
+            }, acc)) !== null && _c !== void 0 ? _c : acc);
         }, {});
         this.synchronise();
     }
     synchronise() {
         this.children.forEach((childFVC) => {
-            this.registerChildFormValuesContainer(childFVC.synchronise());
+            var _a;
+            this.registerChildFormValuesContainer(childFVC.synchronise(), (_a = childFVC.anchorId) !== null && _a !== void 0 ? _a : '');
         });
         return this;
     }
     //Make sure that when a child is changed, a new version of this is created with the updated child
-    registerChildFormValuesContainer(childFormValueContainer) {
+    registerChildFormValuesContainer(childFormValueContainer, anchorId) {
         childFormValueContainer.changeListeners = [
-            (newValue) => {
+            (newValue, changedKeys, force) => {
+                if ((changedKeys === null || changedKeys === void 0 ? void 0 : changedKeys.length) === 0 && !force) {
+                    return;
+                }
                 console.log(`Child ${newValue._id} ${childFormValueContainer.rootForm.formTemplateId} changed, updating parent ${this._id} ${this.rootForm.formTemplateId}`);
                 const newContactFormValuesContainer = new ContactFormValuesContainer(this.rootForm, this.currentContact, this.contactsHistory, this.serviceFactory, this.children.map((c) => {
                     return c.rootForm.id === childFormValueContainer.rootForm.id ? newValue : c;
-                }), this.formFactory, this.formRecycler);
-                this.changeListeners.forEach((l) => notify(l, newContactFormValuesContainer));
+                }), this.formFactory, this.formRecycler, [], this.anchorId, true);
+                this.changeListeners.forEach((l) => notify(l, newContactFormValuesContainer, null));
             },
         ];
     }
@@ -488,8 +585,8 @@ class ContactFormValuesContainer {
                 ? yield Promise.all((yield formChildrenProvider(rootForm.id)).map((f) => __awaiter(this, void 0, void 0, function* () { 
                 // eslint-disable-next-line max-len
                 return yield ContactFormValuesContainer.fromFormsHierarchy(f, currentContact, contactsHistory, serviceFactory, formChildrenProvider, formFactory, formRecycler); })))
-                : [], formFactory, formRecycler, changeListeners, false);
-            contactFormValuesContainer.children.forEach((childFVC) => contactFormValuesContainer.registerChildFormValuesContainer(childFVC));
+                : [], formFactory, formRecycler, changeListeners, rootForm.descr, false);
+            contactFormValuesContainer.children.forEach((childFVC) => { var _a; return contactFormValuesContainer.registerChildFormValuesContainer(childFVC, (_a = childFVC.anchorId) !== null && _a !== void 0 ? _a : 'all'); });
             return contactFormValuesContainer;
         });
     }
@@ -513,12 +610,10 @@ class ContactFormValuesContainer {
         });
     }
     getValidationErrors() {
-        return __awaiter(this, void 0, void 0, function* () {
-            throw new Error('Validation not supported at contact level');
-        });
+        throw new Error('Validation not supported at contact level');
     }
-    getDefaultValue() {
-        return Promise.resolve(undefined);
+    getDefaultValueProvider() {
+        return undefined;
     }
     getValues(revisionsFilter) {
         return Object.entries(this.getServicesInHistory(revisionsFilter)).reduce((acc, [id, history]) => history.length
@@ -563,20 +658,20 @@ class ContactFormValuesContainer {
             meta.valueDate && (newService.valueDate = meta.valueDate);
             meta.codes && (newService.codes = (0, code_utils_1.normalizeCodes)(meta.codes));
             meta.tags && (newService.tags = (0, code_utils_1.normalizeCodes)(meta.tags));
-            const newFormValuesContainer = new ContactFormValuesContainer(this.rootForm, Object.assign(Object.assign({}, this.currentContact), { services: (_a = this.currentContact.services) === null || _a === void 0 ? void 0 : _a.map((s) => (s.id === service.id ? newService : s)) }), this.contactsHistory, this.serviceFactory, this.children, this.formFactory, this.formRecycler, this.changeListeners);
-            this.changeListeners.forEach((l) => notify(l, newFormValuesContainer));
+            const newFormValuesContainer = new ContactFormValuesContainer(this.rootForm, Object.assign(Object.assign({}, this.currentContact), { services: (_a = this.currentContact.services) === null || _a === void 0 ? void 0 : _a.map((s) => (s.id === service.id ? newService : s)) }), this.contactsHistory, this.serviceFactory, this.children, this.formFactory, this.formRecycler, this.changeListeners, this.anchorId, true);
+            this.changeListeners.forEach((l) => notify(l, newFormValuesContainer, [meta.label]));
         }
     }
     setValue(label, language, value, id, metadata, changeListenersOverrider) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
         const service = (id && ((_b = (_a = this.getServicesInHistory((sid, history) => (sid === id ? history.map((x) => x.revision) : []))[id]) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.value)) || this.serviceFactory(label, id);
         if (!service.id) {
             throw new Error('Service id must be defined');
         }
-        console.log('Setting value of service', service.id, 'with', value, 'and metadata', metadata);
-        const newContent = (_c = value === null || value === void 0 ? void 0 : value.content) === null || _c === void 0 ? void 0 : _c[language];
+        console.log(`Setting value of service ${service.label} [${service.id}] to ${Object.entries((_c = value === null || value === void 0 ? void 0 : value.content) !== null && _c !== void 0 ? _c : {}).map(([k, c]) => `${k}: ${JSON.stringify((0, icure_utils_1.contentToPrimitiveType)(k, c))}`)} and md`, metadata);
+        const newContent = (_d = value === null || value === void 0 ? void 0 : value.content) === null || _d === void 0 ? void 0 : _d[language];
         const newCodes = (value === null || value === void 0 ? void 0 : value.codes) ? (0, code_utils_1.normalizeCodes)(value.codes) : [];
-        if (!(0, icure_utils_1.isContentEqual)((_d = service.content) === null || _d === void 0 ? void 0 : _d[language], newContent) || (newCodes && !(0, icure_utils_1.areCodesEqual)(newCodes, (_e = service.codes) !== null && _e !== void 0 ? _e : []))) {
+        if (!(0, icure_utils_1.isContentEqual)((_e = service.content) === null || _e === void 0 ? void 0 : _e[language], newContent) || (newCodes && !(0, icure_utils_1.areCodesEqual)(newCodes, (_f = service.codes) !== null && _f !== void 0 ? _f : []))) {
             const newService = new api_1.Service(Object.assign(Object.assign({}, service), { modified: Date.now() }));
             const newContents = newContent
                 ? Object.assign(Object.assign({}, (service.content || {})), { [language]: newContent }) : Object.assign({}, (service.content || {}));
@@ -585,8 +680,8 @@ class ContactFormValuesContainer {
             }
             let newCurrentContact;
             if (!Object.entries(newContents).filter(([, cnt]) => cnt !== undefined).length) {
-                newCurrentContact = Object.assign(Object.assign({}, this.currentContact), { subContacts: ((_f = this.currentContact.subContacts) !== null && _f !== void 0 ? _f : []).some((sc) => sc.formId === this.rootForm.id)
-                        ? ((_g = this.currentContact.subContacts) !== null && _g !== void 0 ? _g : []).map((sc) => {
+                newCurrentContact = Object.assign(Object.assign({}, this.currentContact), { subContacts: ((_g = this.currentContact.subContacts) !== null && _g !== void 0 ? _g : []).some((sc) => sc.formId === this.rootForm.id)
+                        ? ((_h = this.currentContact.subContacts) !== null && _h !== void 0 ? _h : []).map((sc) => {
                             var _a;
                             if (sc.formId === this.rootForm.id) {
                                 return Object.assign(Object.assign({}, sc), { services: ((_a = sc.services) !== null && _a !== void 0 ? _a : []).filter((s) => s.serviceId !== service.id).concat([{ serviceId: service.id }]) });
@@ -595,21 +690,21 @@ class ContactFormValuesContainer {
                                 return sc;
                             }
                         })
-                        : ((_h = this.currentContact.subContacts) !== null && _h !== void 0 ? _h : []).concat({ formId: this.rootForm.id, services: [{ serviceId: service.id }] }), services: ((_j = this.currentContact.services) !== null && _j !== void 0 ? _j : []).some((s) => s.id === service.id)
-                        ? ((_k = this.currentContact.services) !== null && _k !== void 0 ? _k : []).filter((s) => s.id !== service.id)
-                        : [...((_l = this.currentContact.services) !== null && _l !== void 0 ? _l : [])] });
+                        : ((_j = this.currentContact.subContacts) !== null && _j !== void 0 ? _j : []).concat({ formId: this.rootForm.id, services: [{ serviceId: service.id }] }), services: ((_k = this.currentContact.services) !== null && _k !== void 0 ? _k : []).some((s) => s.id === service.id)
+                        ? ((_l = this.currentContact.services) !== null && _l !== void 0 ? _l : []).filter((s) => s.id !== service.id)
+                        : [...((_m = this.currentContact.services) !== null && _m !== void 0 ? _m : [])] });
             }
             else {
                 newService.content = newContents;
                 newService.codes = newCodes;
                 if (metadata) {
-                    newService.responsible = (_m = metadata.responsible) !== null && _m !== void 0 ? _m : newService.responsible;
-                    newService.valueDate = (_o = metadata.valueDate) !== null && _o !== void 0 ? _o : newService.valueDate;
+                    newService.responsible = (_o = metadata.responsible) !== null && _o !== void 0 ? _o : newService.responsible;
+                    newService.valueDate = (_p = metadata.valueDate) !== null && _p !== void 0 ? _p : newService.valueDate;
                     newService.tags = metadata.tags ? (0, code_utils_1.normalizeCodes)(metadata.tags) : newService.tags;
-                    newService.label = (_p = metadata.label) !== null && _p !== void 0 ? _p : newService.label;
+                    newService.label = (_q = metadata.label) !== null && _q !== void 0 ? _q : newService.label;
                 }
-                newCurrentContact = Object.assign(Object.assign({}, this.currentContact), { subContacts: ((_q = this.currentContact.subContacts) !== null && _q !== void 0 ? _q : []).some((sc) => sc.formId === this.rootForm.id)
-                        ? ((_r = this.currentContact.subContacts) !== null && _r !== void 0 ? _r : []).map((sc) => {
+                newCurrentContact = Object.assign(Object.assign({}, this.currentContact), { subContacts: ((_r = this.currentContact.subContacts) !== null && _r !== void 0 ? _r : []).some((sc) => sc.formId === this.rootForm.id)
+                        ? ((_s = this.currentContact.subContacts) !== null && _s !== void 0 ? _s : []).map((sc) => {
                             var _a;
                             if (sc.formId === this.rootForm.id) {
                                 return Object.assign(Object.assign({}, sc), { services: ((_a = sc.services) !== null && _a !== void 0 ? _a : []).filter((s) => s.serviceId !== service.id).concat([{ serviceId: service.id }]) });
@@ -618,12 +713,12 @@ class ContactFormValuesContainer {
                                 return sc;
                             }
                         })
-                        : ((_s = this.currentContact.subContacts) !== null && _s !== void 0 ? _s : []).concat({ formId: this.rootForm.id, services: [{ serviceId: service.id }] }), services: ((_t = this.currentContact.services) !== null && _t !== void 0 ? _t : []).some((s) => s.id === service.id)
-                        ? ((_u = this.currentContact.services) !== null && _u !== void 0 ? _u : []).map((s) => (s.id === service.id ? newService : s))
-                        : [...((_v = this.currentContact.services) !== null && _v !== void 0 ? _v : []), newService] });
+                        : ((_t = this.currentContact.subContacts) !== null && _t !== void 0 ? _t : []).concat({ formId: this.rootForm.id, services: [{ serviceId: service.id }] }), services: ((_u = this.currentContact.services) !== null && _u !== void 0 ? _u : []).some((s) => s.id === service.id)
+                        ? ((_v = this.currentContact.services) !== null && _v !== void 0 ? _v : []).map((s) => (s.id === service.id ? newService : s))
+                        : [...((_w = this.currentContact.services) !== null && _w !== void 0 ? _w : []), newService] });
             }
-            const newFormValuesContainer = new ContactFormValuesContainer(this.rootForm, newCurrentContact, this.contactsHistory.map((c) => (c === this.currentContact ? newCurrentContact : c)), this.serviceFactory, this.children, this.formFactory, this.formRecycler, this.changeListeners);
-            changeListenersOverrider ? changeListenersOverrider(newFormValuesContainer) : this.changeListeners.forEach((l) => notify(l, newFormValuesContainer));
+            const newFormValuesContainer = new ContactFormValuesContainer(this.rootForm, newCurrentContact, this.contactsHistory.map((c) => (c === this.currentContact ? newCurrentContact : c)), this.serviceFactory, this.children, this.formFactory, this.formRecycler, this.changeListeners, this.anchorId, true);
+            changeListenersOverrider ? changeListenersOverrider(newFormValuesContainer, [label]) : this.changeListeners.forEach((l) => notify(l, newFormValuesContainer, [label]));
         }
     }
     delete(serviceId) {
@@ -632,10 +727,35 @@ class ContactFormValuesContainer {
         if (service) {
             const newFormValuesContainer = new ContactFormValuesContainer(this.rootForm, Object.assign(Object.assign({}, this.currentContact), { services: (_a = this.currentContact.services) === null || _a === void 0 ? void 0 : _a.map((s) => s.id === serviceId
                     ? new api_1.Service(Object.assign(Object.assign({}, service), { endOfLife: Date.now() }))
-                    : s) }), this.contactsHistory, this.serviceFactory, this.children, this.formFactory, this.formRecycler, this.changeListeners);
-            this.changeListeners.forEach((l) => notify(l, newFormValuesContainer));
+                    : s) }), this.contactsHistory, this.serviceFactory, this.children, this.formFactory, this.formRecycler, this.changeListeners, this.anchorId, true);
+            this.changeListeners.forEach((l) => { var _a, _b; return notify(l, newFormValuesContainer, [(_b = (_a = service.label) !== null && _a !== void 0 ? _a : service.id) !== null && _b !== void 0 ? _b : ''] /* only the label is going to propagate the changes for the formulas */); });
         }
     }
+    toMarkdownTable() {
+        var _a, _b, _c;
+        const tableRows = [];
+        for (const [, versions] of Object.entries(this.indexedServices)) {
+            if (!versions.length)
+                continue;
+            const service = versions[0].value;
+            const label = (_b = (_a = service.label) !== null && _a !== void 0 ? _a : service.id) !== null && _b !== void 0 ? _b : '';
+            const modifiedStr = service.modified ? new Date(service.modified).toISOString() : '';
+            const contentParts = [];
+            for (const [lng, cnt] of Object.entries((_c = service.content) !== null && _c !== void 0 ? _c : {})) {
+                const primitive = (0, icure_utils_1.contentToPrimitiveType)(lng, cnt);
+                if (primitive) {
+                    contentParts.push(primitiveTypeToString(primitive));
+                }
+            }
+            tableRows.push([label, modifiedStr, contentParts.join(', ')]);
+        }
+        const headers = ['Label', 'Modified', 'Content'];
+        const colWidths = headers.map((h, i) => Math.max(h.length, ...tableRows.map((r) => r[i].length)));
+        const pad = (s, w) => s + ' '.repeat(w - s.length);
+        const formatRow = (cells) => '| ' + cells.map((c, i) => pad(c, colWidths[i])).join(' | ') + ' |';
+        const separator = '|' + colWidths.map((w) => '-'.repeat(w + 2)).join('|') + '|';
+        return [formatRow(headers), separator, ...tableRows.map(formatRow)].join('\n');
+    }
     compute() {
         return __awaiter(this, void 0, void 0, function* () {
             throw new Error('Compute not supported at contact level');
@@ -674,10 +794,12 @@ class ContactFormValuesContainer {
             if (!parentId)
                 return;
             const newForm = yield this.formFactory(parentId, anchorId, templateId, label);
-            const childFVC = new ContactFormValuesContainer(newForm, this.currentContact, this.contactsHistory, this.serviceFactory, [], this.formFactory, this.formRecycler, [], false);
-            const newContactFormValuesContainer = new ContactFormValuesContainer(this.rootForm, this.currentContact, this.contactsHistory, this.serviceFactory, [...this.children, childFVC], this.formFactory, this.formRecycler, this.changeListeners);
-            newContactFormValuesContainer.registerChildFormValuesContainer(childFVC);
-            this.changeListeners.forEach((l) => notify(l, newContactFormValuesContainer));
+            const childFVC = new ContactFormValuesContainer(newForm, this.currentContact, this.contactsHistory, this.serviceFactory, [], this.formFactory, this.formRecycler, [], anchorId, false);
+            const newContactFormValuesContainer = new ContactFormValuesContainer(this.rootForm, this.currentContact, this.contactsHistory, this.serviceFactory, [...this.children, childFVC], this.formFactory, this.formRecycler, this.changeListeners, this.anchorId, true);
+            newContactFormValuesContainer.registerChildFormValuesContainer(childFVC, anchorId);
+            this.changeListeners.forEach((l) => {
+                notify(l, newContactFormValuesContainer, null);
+            });
         });
     }
     getServiceInCurrentContact(id) {
@@ -687,14 +809,85 @@ class ContactFormValuesContainer {
     }
     removeChild(container) {
         return __awaiter(this, void 0, void 0, function* () {
-            const newContactFormValuesContainer = new ContactFormValuesContainer(this.rootForm, this.currentContact, this.contactsHistory, this.serviceFactory, this.children.filter((c) => c.rootForm.id !== container.rootForm.id), this.formFactory, this.formRecycler, this.changeListeners);
-            this.changeListeners.forEach((l) => notify(l, newContactFormValuesContainer));
+            const newContactFormValuesContainer = new ContactFormValuesContainer(this.rootForm, this.currentContact, this.contactsHistory, this.serviceFactory, this.children.filter((c) => c.rootForm.id !== container.rootForm.id), this.formFactory, this.formRecycler, this.changeListeners, this.anchorId, true);
+            this.changeListeners.forEach((l) => { var _a; return notify(l, newContactFormValuesContainer, [`subForms_${(_a = container.anchorId) !== null && _a !== void 0 ? _a : 'all'}`]); });
         });
     }
 }
 exports.ContactFormValuesContainer = ContactFormValuesContainer;
+// Runtime validation for FieldValue — guards against mistyped data coming from
+// external callers (formulas, SDK bridges, etc.) where the TypeScript types may
+// not match the actual runtime values.
+const validatePrimitiveType = (pt, path) => {
+    const v = pt.value;
+    switch (pt.type) {
+        case 'string':
+            if (typeof v !== 'string') {
+                throw new Error(`${path}: expected string value, got ${typeof v}`);
+            }
+            break;
+        case 'number':
+            if (typeof v !== 'number') {
+                throw new Error(`${path}: expected number value, got ${typeof v}`);
+            }
+            break;
+        case 'boolean':
+            if (typeof v !== 'boolean') {
+                throw new Error(`${path}: expected boolean value, got ${typeof v}`);
+            }
+            break;
+        case 'timestamp':
+            if (typeof v !== 'number') {
+                throw new Error(`${path}: expected number value for timestamp, got ${typeof v}`);
+            }
+            break;
+        case 'datetime':
+            if (typeof v !== 'number') {
+                throw new Error(`${path}: expected number value for datetime, got ${typeof v}`);
+            }
+            break;
+        case 'measure': {
+            const m = pt;
+            if (m.value !== undefined && typeof m.value !== 'number') {
+                throw new Error(`${path}: expected number or undefined value for measure, got ${typeof m.value}`);
+            }
+            if (m.unit !== undefined && typeof m.unit !== 'string') {
+                throw new Error(`${path}: expected string or undefined unit for measure, got ${typeof m.unit}`);
+            }
+            break;
+        }
+        case 'compound':
+            if (typeof v !== 'object' || v === null || Array.isArray(v)) {
+                throw new Error(`${path}: expected object value for compound, got ${Array.isArray(v) ? 'array' : typeof v}`);
+            }
+            for (const [key, subValue] of Object.entries(v)) {
+                validatePrimitiveType(subValue, `${path}.compound[${key}]`);
+            }
+            break;
+        default:
+            throw new Error(`${path}: unknown PrimitiveType type: ${pt.type}`);
+    }
+};
+const validateCode = (code, path) => {
+    const id = code.id;
+    if (!id || typeof id !== 'string') {
+        throw new Error(`${path}: code must have a non-empty string id, got ${JSON.stringify(id)}`);
+    }
+};
+const validateFieldValue = (fv, language, label) => {
+    const pt = fv.content[language];
+    if (pt) {
+        validatePrimitiveType(pt, `FieldValue[${label}].content[${language}]`);
+    }
+    if (fv.codes) {
+        fv.codes.forEach((code, i) => validateCode(code, `FieldValue[${label}].codes[${i}]`));
+    }
+};
 const setValueOnContactFormValuesContainer = (cfvc, label, language, fv, id, metadata, changeListenersOverrider) => {
     var _a, _b;
+    if (fv) {
+        validateFieldValue(fv, language, label);
+    }
     const value = fv === null || fv === void 0 ? void 0 : fv.content[language];
     cfvc.setValue(label, language, {
         id: id,