@icure/form 3.1.0 → 3.1.1

package/icure/form-values-container.js

@@ -12,8 +12,8 @@ import { sortedBy } from '../utils/no-lodash';
 import { areCodesEqual, codeStubToCode, contentToPrimitiveType, isContentEqual, primitiveTypeToContent } from './icure-utils';
 import { parsePrimitive } from '../utils/primitive';
 import { anyDateToDate, dateToFuzzyDate } from '../utils/dates';
-import { v4 as uuidv4 } from 'uuid';
 import { normalizeCodes } from '../utils/code-utils';
+let _ordinal = 0;
 function notify(l, fvc, changedKeys, force = false) {
     l(fvc, changedKeys, force);
 }
@@ -84,11 +84,12 @@ export class BridgedFormValuesContainer {
         this.changeListeners = changeListeners;
         this.interpreterContext = interpreterContext;
         this.dependenciesCache = dependenciesCache;
-        this._id = uuidv4();
+        this._id = '';
         this.dependentValuesComputationIteration = undefined;
-        console.log(`Creating bridge FVC (${contactFormValuesContainer.rootForm.formTemplateId}) with ${contactFormValuesContainer.children.length} children [${this._id}]`);
         //Before start to broadcast changes, we need to fill in the contactFormValuesContainer with the dependent values
         this.contactFormValuesContainer = contactFormValuesContainer;
+        this._id = `[${contactFormValuesContainer._id}]`;
+        console.log(`+ BFVC ${this._id} created`);
         this.mutateAndNotify = (newContactFormValuesContainer, changedKeys, force = false) => {
             if (this.changeListeners.length === 0) {
                 return;
@@ -277,7 +278,7 @@ export class BridgedFormValuesContainer {
         return __awaiter(this, void 0, void 0, function* () {
             const iterate = (changedKeys, iterationCount) => __awaiter(this, void 0, void 0, function* () {
                 if (this.contactFormValuesContainer.rootForm.formTemplateId) {
-                    console.log(`Starting iteration ${iterationCount} with changed keys : ${changedKeys ? changedKeys.join(', ') : 'all'}`);
+                    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 {
@@ -339,7 +340,12 @@ export class BridgedFormValuesContainer {
             allChangedKeys.push(...(changedKeys !== null && changedKeys !== void 0 ? changedKeys : []));
         };
         changes.forEach(([id, metadata, language, newValue]) => {
-            setValueOnContactFormValuesContainer(this.contactFormValuesContainer, metadata.label, language, newValue !== null && newValue !== void 0 ? newValue : undefined, id, metadata, interceptor);
+            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;
     }
@@ -385,6 +391,7 @@ export class BridgedFormValuesContainer {
                     .join(', ');
             };
             const log = console.log;
+            // noinspection JSUnusedGlobalSymbols
             const native = {
                 parseInt: parseInt,
                 parseFloat: parseFloat,
@@ -446,9 +453,7 @@ export class BridgedFormValuesContainer {
     }
     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() {
@@ -518,17 +523,20 @@ export 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 = uuidv4();
+    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 = sortedBy(contactsHistory, 'created', 'desc');
         this.children = children;
+        this.anchorId = anchorId;
         this.serviceFactory = serviceFactory;
         this.formFactory = formFactory;
         this.formRecycler = formRecycler;
@@ -536,7 +544,7 @@ export 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({
@@ -544,26 +552,29 @@ export 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, [] /* no changed keys except the anchor*/));
+                }), this.formFactory, this.formRecycler, [], this.anchorId, true);
+                this.changeListeners.forEach((l) => notify(l, newContactFormValuesContainer, null));
             },
         ];
     }
@@ -573,8 +584,8 @@ export 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;
         });
     }
@@ -646,8 +657,8 @@ export class ContactFormValuesContainer {
             meta.valueDate && (newService.valueDate = meta.valueDate);
             meta.codes && (newService.codes = normalizeCodes(meta.codes));
             meta.tags && (newService.tags = normalizeCodes(meta.tags));
-            const newFormValuesContainer = new ContactFormValuesContainer(this.rootForm, new DecryptedContact(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, [meta.label] /* only the label is guaranteed to be changed, but it's the only info we have at this point */));
+            const newFormValuesContainer = new ContactFormValuesContainer(this.rootForm, new DecryptedContact(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) {
@@ -711,7 +722,7 @@ export class ContactFormValuesContainer {
                         ? ((_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);
+            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]));
         }
     }
@@ -721,8 +732,8 @@ export class ContactFormValuesContainer {
         if (service) {
             const newFormValuesContainer = new ContactFormValuesContainer(this.rootForm, new DecryptedContact(Object.assign(Object.assign({}, this.currentContact), { services: (_a = this.currentContact.services) === null || _a === void 0 ? void 0 : _a.map((s) => s.id === serviceId
                     ? new DecryptedService(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; return notify(l, newFormValuesContainer, [(_a = service.label) !== null && _a !== void 0 ? _a : service.id] /* only the label is going to propagate the changes for the formulas */); });
         }
     }
     toMarkdownTable() {
@@ -788,10 +799,12 @@ export 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) {
@@ -801,13 +814,84 @@ export 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'}`]); });
         });
     }
 }
+// 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, _c, _d;
+    if (fv) {
+        validateFieldValue(fv, language, label);
+    }
     const value = fv === null || fv === void 0 ? void 0 : fv.content[language];
     cfvc.setValue(label, language, new DecryptedService({
         id: id,