@aehrc/smart-forms-renderer 0.7.1 → 0.8.0

package/lib/utils/formChanges.js

@@ -0,0 +1,91 @@
+/*
+ * Copyright 2023 Commonwealth Scientific and Industrial Research
+ * Organisation (CSIRO) ABN 41 687 119 230.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export function readFormChanges(formChanges, itemTypes) {
+    if (!('item' in formChanges)) {
+        return {};
+    }
+    const changedItems = {};
+    const diffArrays = formChanges.item;
+    for (const diffArray of diffArrays) {
+        readItemChangesRecursive(diffArray, itemTypes, changedItems);
+    }
+    return changedItems;
+}
+export function readItemChangesRecursive(diffArray, itemTypes, changedItems) {
+    const operator = diffArray[0];
+    const diffItem = diffArray[1];
+    if (!operator || !diffItem) {
+        return changedItems;
+    }
+    changedItems[diffItem.linkId] = null;
+    const childDiffArrays = diffItem.item;
+    if (childDiffArrays && childDiffArrays.length > 0) {
+        for (const childDiffArray of childDiffArrays) {
+            readItemChangesRecursive(childDiffArray, itemTypes, changedItems);
+        }
+    }
+    // if (operator !== ' ') {
+    //   console.log(operator, diffItem);
+    // }
+    // explore answer diff arrays
+    // exmaple: [["+", {"valueString": "test"}], ["-", {"valueString": "test"}]]
+    // or it could be a regular answer array
+    // exmaple: [{"valueString": "test"}, {"valueString": "test"}]
+    const answerDiffArrays = diffItem.answer;
+    if (answerDiffArrays && isAnswerDiffArray(answerDiffArrays)) {
+        for (const answerDiffArray of answerDiffArrays) {
+            getItemChange(diffItem, answerDiffArray, itemTypes, changedItems);
+        }
+    }
+    return changedItems;
+}
+function getItemChange(diffItem, answerDiffArray, itemTypes, changedItems) {
+    const operator = answerDiffArray[0];
+    const answer = answerDiffArray[1];
+    if (operator === ' ') {
+        return;
+    }
+    const itemType = itemTypes[diffItem.linkId];
+    const operation = answerDiffOperationSwitcher(operator);
+    if (operation) {
+        changedItems[diffItem.linkId] = {
+            linkId: diffItem.linkId,
+            itemType: itemType,
+            operation: operation,
+            value: answer
+        };
+    }
+}
+function answerDiffOperationSwitcher(operator) {
+    switch (operator) {
+        case '+':
+            return 'add';
+        case '-':
+            return 'remove';
+        case '~':
+            return 'update';
+        default:
+            return null;
+    }
+}
+// type predicates
+function isAnswerDiffArray(answer) {
+    return answer.every((answerItem) => Array.isArray(answerItem) &&
+        typeof answerItem[0] === 'string' &&
+        typeof answerItem[1] === 'object');
+}
+//# sourceMappingURL=formChanges.js.map

package/lib/utils/formChanges.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"formChanges.js","sourceRoot":"","sources":["../../src/utils/formChanges.ts"],"names":[],"mappings":"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"}

package/lib/utils/formChangesOld.d.ts

@@ -0,0 +1,18 @@
+import type { QuestionnaireResponseItemAnswer } from 'fhir/r4';
+type JsonDiffOperator = '+' | '-' | '~' | ' ';
+type QuestionnaireResponseItemDiffArray = [JsonDiffOperator, QuestionnaireResponseDiffItem];
+type QuestionnaireResponseItemAnswerDiffArray = [JsonDiffOperator, QuestionnaireResponseItemAnswer];
+interface QuestionnaireResponseDiffItem {
+    linkId: string;
+    item: QuestionnaireResponseItemDiffArray[] | undefined;
+    answer: QuestionnaireResponseItemAnswer[] | QuestionnaireResponseItemAnswerDiffArray[] | undefined;
+}
+interface ItemChange {
+    linkId: string;
+    itemType: string;
+    operation: 'add' | 'remove' | 'update';
+    value: QuestionnaireResponseItemAnswer;
+}
+export declare function readFormChanges(formChanges: object, itemTypes: Record<string, string>): Record<string, ItemChange | null>;
+export declare function readItemChangesRecursive(diffArray: QuestionnaireResponseItemDiffArray, itemTypes: Record<string, string>, changedItems: Record<string, ItemChange | null>): Record<string, ItemChange | null>;
+export {};

package/lib/utils/formChangesOld.js

@@ -0,0 +1,91 @@
+/*
+ * Copyright 2023 Commonwealth Scientific and Industrial Research
+ * Organisation (CSIRO) ABN 41 687 119 230.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export function readFormChanges(formChanges, itemTypes) {
+    if (!('item' in formChanges)) {
+        return {};
+    }
+    const changedItems = {};
+    const diffArrays = formChanges.item;
+    for (const diffArray of diffArrays) {
+        readItemChangesRecursive(diffArray, itemTypes, changedItems);
+    }
+    return changedItems;
+}
+export function readItemChangesRecursive(diffArray, itemTypes, changedItems) {
+    const operator = diffArray[0];
+    const diffItem = diffArray[1];
+    if (!operator || !diffItem) {
+        return changedItems;
+    }
+    changedItems[diffItem.linkId] = null;
+    const childDiffArrays = diffItem.item;
+    if (childDiffArrays && childDiffArrays.length > 0) {
+        for (const childDiffArray of childDiffArrays) {
+            readItemChangesRecursive(childDiffArray, itemTypes, changedItems);
+        }
+    }
+    // if (operator !== ' ') {
+    //   console.log(operator, diffItem);
+    // }
+    // explore answer diff arrays
+    // exmaple: [["+", {"valueString": "test"}], ["-", {"valueString": "test"}]]
+    // or it could be a regular answer array
+    // exmaple: [{"valueString": "test"}, {"valueString": "test"}]
+    const answerDiffArrays = diffItem.answer;
+    if (answerDiffArrays && isAnswerDiffArray(answerDiffArrays)) {
+        for (const answerDiffArray of answerDiffArrays) {
+            getItemChange(diffItem, answerDiffArray, itemTypes, changedItems);
+        }
+    }
+    return changedItems;
+}
+function getItemChange(diffItem, answerDiffArray, itemTypes, changedItems) {
+    const operator = answerDiffArray[0];
+    const answer = answerDiffArray[1];
+    if (operator === ' ') {
+        return;
+    }
+    const itemType = itemTypes[diffItem.linkId];
+    const operation = answerDiffOperationSwitcher(operator);
+    if (operation) {
+        changedItems[diffItem.linkId] = {
+            linkId: diffItem.linkId,
+            itemType: itemType,
+            operation: operation,
+            value: answer
+        };
+    }
+}
+function answerDiffOperationSwitcher(operator) {
+    switch (operator) {
+        case '+':
+            return 'add';
+        case '-':
+            return 'remove';
+        case '~':
+            return 'update';
+        default:
+            return null;
+    }
+}
+// type predicates
+function isAnswerDiffArray(answer) {
+    return answer.every((answerItem) => Array.isArray(answerItem) &&
+        typeof answerItem[0] === 'string' &&
+        typeof answerItem[1] === 'object');
+}
+//# sourceMappingURL=formChangesOld.js.map

package/lib/utils/formChangesOld.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"formChangesOld.js","sourceRoot":"","sources":["../../src/utils/formChangesOld.ts"],"names":[],"mappings":"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"}

package/lib/utils/index.d.ts

@@ -0,0 +1 @@
+export { isSpecificItemControl } from './itemControl';

package/lib/utils/index.js

@@ -0,0 +1,18 @@
+/*
+ * Copyright 2023 Commonwealth Scientific and Industrial Research
+ * Organisation (CSIRO) ABN 41 687 119 230.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { isSpecificItemControl } from './itemControl';
+//# sourceMappingURL=index.js.map

package/lib/utils/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC"}

package/lib/utils/mapItem.d.ts

@@ -1,4 +1,4 @@
-import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
+import type { Questionnaire, QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
 /**
  * Generate an array of QuestionnaireResponseItems corresponding to its QuestionnaireItem indexes an array.
  * QuestionnaireItems without a corresponding QuestionnaireResponseItem is set as undefined.
@@ -15,4 +15,4 @@ export declare function getQrItemsIndex(qItems: QuestionnaireItem[], qrItems: Qu
  *
  * @author Sean Fong
  */
-export declare function mapQItemsIndex(qGroup: QuestionnaireItem): Record<string, number>;
+export declare function mapQItemsIndex(questionnaireOrQItem: QuestionnaireItem | Questionnaire): Record<string, number>;

package/lib/utils/mapItem.js

@@ -67,12 +67,12 @@ export function getQrItemsIndex(qItems, qrItems, qItemsIndexMap) {
  *
  * @author Sean Fong
  */
-export function mapQItemsIndex(qGroup) {
-    if (!qGroup.item) {
+export function mapQItemsIndex(questionnaireOrQItem) {
+    if (!questionnaireOrQItem.item) {
         return {};
     }
     // generate a <linkId, QItemIndex> dictionary
-    return qGroup.item.reduce((mapping, item, i) => {
+    return questionnaireOrQItem.item.reduce((mapping, item, i) => {
         mapping[item.linkId] = i;
         return mapping;
     }, {});

package/lib/utils/mapItem.js.map

@@ -1 +1 @@
-{"version":3,"file":"mapItem.js","sourceRoot":"","sources":["../../src/utils/mapItem.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,0BAA0B,EAAE,MAAM,SAAS,CAAC;AAErD;;;;;;;GAOG;AACH,MAAM,UAAU,eAAe,CAC7B,MAA2B,EAC3B,OAAoC,EACpC,cAAsC;IAEtC,oDAAoD;IACpD,MAAM,gBAAgB,GACpB,EAAE,CAAC;IACL,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAE7B,kFAAkF;QAClF,IAAI,gBAAgB,CAAC,MAAM,CAAC,EAAE;YAC5B,IAAI,WAAW,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;YAE3C,8EAA8E;YAC9E,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;gBAC/B,WAAW,GAAG,CAAC,WAAW,CAAC,CAAC;aAC7B;YAED,6BAA6B;YAC7B,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACzB,gBAAgB,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;SACxC;aAAM;YACL,MAAM,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;YAE1C,8FAA8F;YAC9F,MAAM,aAAa,GACjB,0BAA0B,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC;YAExF,gBAAgB,CAAC,MAAM,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;SAC9D;KACF;IAED,6GAA6G;IAC7G,0DAA0D;IAC1D,OAAO,MAAM,CAAC,MAAM,CAClB,CAAC,OAAoE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QACjF,MAAM,aAAa,GAAG,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACrD,iFAAiF;QACjF,IAAI,0BAA0B,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;YAC/D,OAAO,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SAClE;aAAM;YACL,OAAO,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;SAC7C;QACD,OAAO,OAAO,CAAC;IACjB,CAAC,EACD,EAAE,CACH,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAAC,MAAyB;IACtD,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;QAChB,OAAO,EAAE,CAAC;KACX;IAED,6CAA6C;IAC7C,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAA+B,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE;QACrE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACzB,OAAO,OAAO,CAAC;IACjB,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC"}
+{"version":3,"file":"mapItem.js","sourceRoot":"","sources":["../../src/utils/mapItem.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,0BAA0B,EAAE,MAAM,SAAS,CAAC;AAErD;;;;;;;GAOG;AACH,MAAM,UAAU,eAAe,CAC7B,MAA2B,EAC3B,OAAoC,EACpC,cAAsC;IAEtC,oDAAoD;IACpD,MAAM,gBAAgB,GACpB,EAAE,CAAC;IACL,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAE7B,kFAAkF;QAClF,IAAI,gBAAgB,CAAC,MAAM,CAAC,EAAE;YAC5B,IAAI,WAAW,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;YAE3C,8EAA8E;YAC9E,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;gBAC/B,WAAW,GAAG,CAAC,WAAW,CAAC,CAAC;aAC7B;YAED,6BAA6B;YAC7B,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACzB,gBAAgB,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;SACxC;aAAM;YACL,MAAM,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;YAE1C,8FAA8F;YAC9F,MAAM,aAAa,GACjB,0BAA0B,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC;YAExF,gBAAgB,CAAC,MAAM,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;SAC9D;KACF;IAED,6GAA6G;IAC7G,0DAA0D;IAC1D,OAAO,MAAM,CAAC,MAAM,CAClB,CAAC,OAAoE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QACjF,MAAM,aAAa,GAAG,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACrD,iFAAiF;QACjF,IAAI,0BAA0B,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;YAC/D,OAAO,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SAClE;aAAM;YACL,OAAO,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;SAC7C;QACD,OAAO,OAAO,CAAC;IACjB,CAAC,EACD,EAAE,CACH,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAC5B,oBAAuD;IAEvD,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE;QAC9B,OAAO,EAAE,CAAC;KACX;IAED,6CAA6C;IAC7C,OAAO,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAA+B,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE;QACnF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACzB,OAAO,OAAO,CAAC;IACjB,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC"}

package/lib/utils/qItem.d.ts

@@ -29,4 +29,6 @@ export declare function isHiddenByEnableWhens(params: isHiddenByEnableWhensParam
  */
 export declare function isRepeatItemAndNotCheckbox(qItem: QuestionnaireItem): boolean;
 export declare function getXHtmlStringFromQuestionnaire(questionnaire: Questionnaire): string | null;
+export declare function getLinkIdTypeTuples(questionnaire: Questionnaire): [string, string][];
+export declare function getLinkIdTypeTuplesFromItemRecursive(qItem: QuestionnaireItem): [string, string][];
 export {};

package/lib/utils/qItem.js

@@ -70,4 +70,26 @@ export function getXHtmlStringFromQuestionnaire(questionnaire) {
     }
     return null;
 }
+export function getLinkIdTypeTuples(questionnaire) {
+    if (!questionnaire.item || questionnaire.item.length === 0) {
+        return [];
+    }
+    const linkIds = [];
+    for (const topLevelItem of questionnaire.item) {
+        linkIds.push(...getLinkIdTypeTuplesFromItemRecursive(topLevelItem));
+    }
+    return linkIds;
+}
+export function getLinkIdTypeTuplesFromItemRecursive(qItem) {
+    const linkIds = [];
+    if (qItem.linkId) {
+        linkIds.push([qItem.linkId, qItem.type]);
+    }
+    if (qItem.item) {
+        for (const childItem of qItem.item) {
+            linkIds.push(...getLinkIdTypeTuplesFromItemRecursive(childItem));
+        }
+    }
+    return linkIds;
+}
 //# sourceMappingURL=qItem.js.map

package/lib/utils/qItem.js.map

@@ -1 +1 @@
-{"version":3,"file":"qItem.js","sourceRoot":"","sources":["../../src/utils/qItem.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACrF,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAUxD;;;;;;GAMG;AACH,MAAM,UAAU,QAAQ,CAAC,MAAsB;IAC7C,MAAM,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,eAAe,EAAE,qBAAqB,EAAE,GACxF,MAAM,CAAC;IACT,IAAI,kBAAkB,CAAC,iBAAiB,CAAC,EAAE;QACzC,OAAO,IAAI,CAAC;KACb;IAED,OAAO,qBAAqB,CAAC;QAC3B,MAAM,EAAE,iBAAiB,CAAC,MAAM;QAChC,qBAAqB;QACrB,eAAe;QACf,qBAAqB;KACtB,CAAC,CAAC;AACL,CAAC;AASD,MAAM,UAAU,qBAAqB,CAAC,MAAmC;IACvE,MAAM,EAAE,MAAM,EAAE,qBAAqB,EAAE,eAAe,EAAE,qBAAqB,EAAE,GAAG,MAAM,CAAC;IAEzF,IAAI,qBAAqB,EAAE;QACzB,IAAI,eAAe,CAAC,MAAM,CAAC,EAAE;YAC3B,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC;SAC3C;QAED,IAAI,qBAAqB,CAAC,MAAM,CAAC,EAAE;YACjC,OAAO,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC;SACjD;KACF;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,0BAA0B,CAAC,KAAwB;IACjE,MAAM,UAAU,GACd,oBAAoB,CAAC,KAAK,CAAC,KAAK,iBAAiB,CAAC,QAAQ;QAC1D,wBAAwB,CAAC,KAAK,CAAC,KAAK,qBAAqB,CAAC,QAAQ,CAAC;IAErE,OAAO,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,+BAA+B,CAAC,aAA4B;;IAC1E,MAAM,WAAW,GAAG,MAAA,MAAA,aAAa,CAAC,MAAM,0CAAE,SAAS,0CAAE,IAAI,CACvD,CAAC,SAAoB,EAAE,EAAE,CACvB,SAAS,CAAC,GAAG,KAAK,yDAAyD,CAC9E,CAAC;IAEF,IAAI,WAAW,EAAE;QACf,IAAI,WAAW,CAAC,WAAW,EAAE;YAC3B,OAAO,WAAW,CAAC,WAAW,CAAC;SAChC;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"qItem.js","sourceRoot":"","sources":["../../src/utils/qItem.ts"],"names":[],"mappings":"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"}

package/lib/utils/qrItem.d.ts

@@ -1,12 +1,11 @@
 import type { Questionnaire, QuestionnaireItem, QuestionnaireResponse, QuestionnaireResponseItem } from 'fhir/r4';
 import type { QrRepeatGroup } from '../interfaces/repeatGroup.interface';
 /**
- * Create a questionnaireResponse from a given questionnaire form item
- * A questionnaire form item is the first item of a questionnaire
+ * Create an empty questionnaireResponse from a given questionnaire
  *
  * @author Sean Fong
  */
-export declare function createQuestionnaireResponse(questionnaire: Questionnaire): QuestionnaireResponse;
+export declare function createEmptyQuestionnaireResponse(questionnaire: Questionnaire): QuestionnaireResponse;
 /**
  * Remove items with no answers from a given questionnaireResponse
  * Also remove any starting or trailing whitespace from valueStrings
@@ -39,4 +38,4 @@ export declare function createEmptyQrItemWithUnit(qItem: QuestionnaireItem, unit
  *
  * @author Sean Fong
  */
-export declare function updateQrGroup(newQrItem: QuestionnaireResponseItem | null, newQrRepeatGroup: QrRepeatGroup | null, qrGroup: QuestionnaireResponseItem, qItemsIndexMap: Record<string, number>): void;
+export declare function updateQrItemsInGroup(newQrItem: QuestionnaireResponseItem | null, newQrRepeatGroup: QrRepeatGroup | null, questionnaireResponseOrQrItem: QuestionnaireResponseItem | QuestionnaireResponse, qItemsIndexMap: Record<string, number>): void;

package/lib/utils/qrItem.js

@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 /**
- * Create a questionnaireResponse from a given questionnaire form item
- * A questionnaire form item is the first item of a questionnaire
+ * Create an empty questionnaireResponse from a given questionnaire
  *
  * @author Sean Fong
  */
-export function createQuestionnaireResponse(questionnaire) {
+export function createEmptyQuestionnaireResponse(questionnaire) {
     var _a;
     const questionnaireResponse = {
         resourceType: 'QuestionnaireResponse',
@@ -108,112 +107,111 @@ export function createEmptyQrItemWithUnit(qItem, unit) {
  *
  * @author Sean Fong
  */
-export function updateQrGroup(newQrItem, newQrRepeatGroup, qrGroup, qItemsIndexMap) {
+export function updateQrItemsInGroup(newQrItem, newQrRepeatGroup, questionnaireResponseOrQrItem, qItemsIndexMap) {
     var _a, _b;
-    if (qrGroup['item']) {
-        // Get actual sequence indexes of qrItems present within a qrGroup
-        // e.g. qrGroup has 4 fields but only the 2nd and 3rd field have values - resulting array is [1, 2]
-        const qrItemsRealIndexArr = qrGroup.item.map((qrItem) => qItemsIndexMap[qrItem.linkId]);
-        if (newQrItem && newQrItem.linkId in qItemsIndexMap) {
-            if (qrGroup.item.length === 0) {
-                qrGroup.item.push(newQrItem);
+    const qrItems = questionnaireResponseOrQrItem.item;
+    if (!qrItems) {
+        return;
+    }
+    // Get actual sequence indexes of qrItems present within a qrGroup
+    // e.g. qrGroup has 4 fields but only the 2nd and 3rd field have values - resulting array is [1, 2]
+    const qrItemsRealIndexArr = qrItems.map((qrItem) => qItemsIndexMap[qrItem.linkId]);
+    if (newQrItem && newQrItem.linkId in qItemsIndexMap) {
+        if (qrItems.length === 0) {
+            qrItems.push(newQrItem);
+            return;
+        }
+        // Get actual sequence index of qrItem within qrGroup
+        const newQrItemIndex = qItemsIndexMap[newQrItem.linkId];
+        for (let i = 0; i < qrItemsRealIndexArr.length; i++) {
+            // Add qrItem at the end of qrGroup if it is larger than the other indexes
+            if (newQrItemIndex > qrItemsRealIndexArr[i]) {
+                if (i === qrItemsRealIndexArr.length - 1) {
+                    qrItems.push(newQrItem);
+                }
+                continue;
             }
-            else {
-                // Get actual sequence index of qrItem within qrGroup
-                const newQrItemIndex = qItemsIndexMap[newQrItem.linkId];
-                for (let i = 0; i < qrItemsRealIndexArr.length; i++) {
-                    // Add qrItem at the end of qrGroup if it is larger than the other indexes
-                    if (newQrItemIndex > qrItemsRealIndexArr[i]) {
-                        if (i === qrItemsRealIndexArr.length - 1) {
-                            qrGroup.item.push(newQrItem);
-                        }
-                        continue;
-                    }
-                    // Replace or delete qrItem at its supposed position if its index is already present within qrGroup
-                    if (newQrItemIndex === qrItemsRealIndexArr[i]) {
-                        if (((_a = newQrItem.item) === null || _a === void 0 ? void 0 : _a.length) || ((_b = newQrItem.answer) === null || _b === void 0 ? void 0 : _b.length)) {
-                            // newQrItem has answer value
-                            qrGroup.item[i] = newQrItem;
-                        }
-                        else {
-                            // newQrItem has no answer value
-                            qrGroup.item.splice(i, 1);
-                        }
-                        break;
-                    }
-                    // Add qrItem at its supposed position if its index is not present within qrGroup
-                    if (newQrItemIndex < qrItemsRealIndexArr[i]) {
-                        qrGroup.item.splice(i, 0, newQrItem);
-                        break;
-                    }
+            // Replace or delete qrItem at its supposed position if its index is already present within qrGroup
+            if (newQrItemIndex === qrItemsRealIndexArr[i]) {
+                // newQrItem has answer value
+                if (((_a = newQrItem.item) === null || _a === void 0 ? void 0 : _a.length) || ((_b = newQrItem.answer) === null || _b === void 0 ? void 0 : _b.length)) {
+                    qrItems[i] = newQrItem;
+                    break;
                 }
+                // newQrItem has no answer value
+                qrItems.splice(i, 1);
+                break;
             }
+            // Add qrItem at its supposed position if its index is not present within qrGroup
+            if (newQrItemIndex < qrItemsRealIndexArr[i]) {
+                qrItems.splice(i, 0, newQrItem);
+                break;
+            }
+        }
+    }
+    if (newQrRepeatGroup && newQrRepeatGroup.linkId in qItemsIndexMap) {
+        const newQrItems = newQrRepeatGroup.qrItems;
+        if (qrItems.length === 0) {
+            qrItems.push(...newQrItems);
+            return;
         }
-        else if (newQrRepeatGroup && newQrRepeatGroup.linkId in qItemsIndexMap) {
-            const newQrItems = newQrRepeatGroup.qrItems;
-            if (qrGroup.item.length === 0) {
-                qrGroup.item.push(...newQrItems);
+        // Get actual sequence index of qrItems within qrGroup
+        const newQrItemIndex = qItemsIndexMap[newQrRepeatGroup.linkId];
+        for (let i = 0; i < qrItemsRealIndexArr.length; i++) {
+            // Add qrItem at the end of qrGroup if it is larger than the other indexes
+            if (newQrItemIndex > qrItemsRealIndexArr[i]) {
+                if (i === qrItemsRealIndexArr.length - 1) {
+                    qrItems.push(...newQrItems);
+                }
+                continue;
             }
-            else {
-                // Get actual sequence index of qrItems within qrGroup
-                const newQrItemIndex = qItemsIndexMap[newQrRepeatGroup.linkId];
-                for (let i = 0; i < qrItemsRealIndexArr.length; i++) {
-                    // Add qrItem at the end of qrGroup if it is larger than the other indexes
-                    if (newQrItemIndex > qrItemsRealIndexArr[i]) {
-                        if (i === qrItemsRealIndexArr.length - 1) {
-                            qrGroup.item.push(...newQrItems);
-                        }
-                        continue;
+            // Replace or delete qrItem at its supposed position if its index is already present within qrGroup
+            if (newQrItemIndex === qrItemsRealIndexArr[i]) {
+                // Get number of repeatGroupItems that has the same linkId present in qrGroup
+                let repeatGroupItemCount = 0;
+                while (newQrItemIndex === qrItemsRealIndexArr[i + repeatGroupItemCount]) {
+                    repeatGroupItemCount++;
+                }
+                // Replace each repeat group qrItem with their new counterparts
+                if (newQrItems.length === repeatGroupItemCount) {
+                    for (let j = 0; j < newQrItems.length; j++) {
+                        qrItems[i + j] = newQrItems[j];
                     }
-                    // Replace or delete qrItem at its supposed position if its index is already present within qrGroup
-                    if (newQrItemIndex === qrItemsRealIndexArr[i]) {
-                        // Get number of repeatGroupItems that has the same linkId present in qrGroup
-                        let repeatGroupItemCount = 0;
-                        while (newQrItemIndex === qrItemsRealIndexArr[i + repeatGroupItemCount]) {
-                            repeatGroupItemCount++;
-                        }
-                        // Replace each repeat group qrItem with their new counterparts
-                        if (newQrItems.length === repeatGroupItemCount) {
-                            for (let j = 0; j < newQrItems.length; j++) {
-                                qrGroup.item[i + j] = newQrItems[j];
-                            }
-                            break;
-                        }
-                        else if (newQrItems.length > repeatGroupItemCount) {
-                            // Replace each repeat group qrItem with their new counterparts,
-                            // followed by adding an extra newQrItem behind the newly replaced qrItems
-                            for (let j = 0, k = repeatGroupItemCount; j < newQrItems.length; j++, k--) {
-                                if (k > 0) {
-                                    qrGroup.item[i + j] = newQrItems[j];
-                                }
-                                else {
-                                    qrGroup.item.splice(i + j, 0, newQrItems[j]);
-                                }
-                            }
-                            break;
+                    break;
+                }
+                if (newQrItems.length > repeatGroupItemCount) {
+                    // Replace each repeat group qrItem with their new counterparts,
+                    // followed by adding an extra newQrItem behind the newly replaced qrItems
+                    for (let j = 0, k = repeatGroupItemCount; j < newQrItems.length; j++, k--) {
+                        if (k > 0) {
+                            qrItems[i + j] = newQrItems[j];
                         }
-                        else if (newQrItems.length < repeatGroupItemCount) {
-                            // Replace each repeat group qrItem with their new counterparts (except the last one),
-                            // followed by deleting the last newQrItem which wasn't replaced
-                            for (let j = 0; j < repeatGroupItemCount; j++) {
-                                if (j <= newQrItems.length - 1) {
-                                    qrGroup.item[i + j] = newQrItems[j];
-                                }
-                                else {
-                                    qrGroup.item.splice(i + j, 1);
-                                }
-                            }
-                            break;
+                        else {
+                            qrItems.splice(i + j, 0, newQrItems[j]);
                         }
                     }
-                    // Add qrItem at its supposed position if its index is not present within qrGroup
-                    if (newQrItemIndex < qrItemsRealIndexArr[i]) {
-                        for (let j = 0; j < newQrItems.length; j++) {
-                            qrGroup.item.splice(i + j, 0, newQrItems[j]);
+                    break;
+                }
+                if (newQrItems.length < repeatGroupItemCount) {
+                    // Replace each repeat group qrItem with their new counterparts (except the last one),
+                    // followed by deleting the last newQrItem which wasn't replaced
+                    for (let j = 0; j < repeatGroupItemCount; j++) {
+                        if (j <= newQrItems.length - 1) {
+                            qrItems[i + j] = newQrItems[j];
+                        }
+                        else {
+                            qrItems.splice(i + j, 1);
                         }
-                        break;
                     }
+                    break;
+                }
+            }
+            // Add qrItem at its supposed position if its index is not present within qrGroup
+            if (newQrItemIndex < qrItemsRealIndexArr[i]) {
+                for (let j = 0; j < newQrItems.length; j++) {
+                    qrItems.splice(i + j, 0, newQrItems[j]);
                 }
+                break;
             }
         }
     }

package/lib/utils/qrItem.js.map

@@ -1 +1 @@
-{"version":3,"file":"qrItem.js","sourceRoot":"","sources":["../../src/utils/qrItem.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"qrItem.js","sourceRoot":"","sources":["../../src/utils/qrItem.ts"],"names":[],"mappings":"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"}

package/lib/utils/questionnaireStoreUtils/createQuestionaireModel.js

@@ -30,11 +30,13 @@ import { extractContainedValueSets } from './extractContainedValueSets';
 import { extractOtherExtensions } from './extractOtherExtensions';
 import { resolveValueSets } from './resolveValueSets';
 import { addAdditionalVariables } from './addAdditionalVariables';
+import { getLinkIdTypeTuples } from '../qItem';
 export function createQuestionnaireModel(questionnaire, additionalVariables, terminologyServerUrl) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!questionnaire.item) {
             return createEmptyModel();
         }
+        const itemTypes = Object.fromEntries(getLinkIdTypeTuples(questionnaire));
         const tabs = extractTabs(questionnaire);
         const launchContexts = extractLaunchContexts(questionnaire);
         let variables = extractQuestionnaireLevelVariables(questionnaire);
@@ -51,6 +53,7 @@ export function createQuestionnaireModel(questionnaire, additionalVariables, ter
         variables = resolveValueSetsResult.variables;
         processedValueSetCodings = resolveValueSetsResult.processedValueSetCodings;
         return {
+            itemTypes,
             tabs,
             variables,
             launchContexts,
@@ -65,6 +68,7 @@ export function createQuestionnaireModel(questionnaire, additionalVariables, ter
 }
 function createEmptyModel() {
     return {
+        itemTypes: {},
         tabs: {},
         variables: { fhirPathVariables: {}, xFhirQueryVariables: {} },
         launchContexts: {},