@aehrc/smart-forms-renderer 1.0.0-alpha.98 → 1.0.0

package/src/stores/{rendererStylingStore.ts → rendererConfigStore.ts}

@@ -22,7 +22,7 @@ import type { UseResponsiveProps } from '../hooks';
 import type { Breakpoints } from '@mui/material';
 
 /**
- * RendererStyling interface
+ * RendererConfig interface
  * Provides fine-grained control over the styling and behaviour of the renderer.
  *
  * @property requiredIndicatorPosition - Defines where the required asterisk (*) is placed relative to the label.
@@ -77,7 +77,7 @@ import type { Breakpoints } from '@mui/material';
  * @property readOnlyVisualStyle - If `true`, item.readOnly will result in form fields having MUI disabled property and styles (recommended from usability perspective). If `false`, item.readOnly will result in form fields having HTML readonly property (less stable, but recommended from accessibility perspective).
  *   - Default: `true`
  */
-export interface RendererStyling {
+export interface RendererConfig {
   readOnlyVisualStyle?: 'disabled' | 'readonly';
   requiredIndicatorPosition?: 'start' | 'end';
   itemResponsive?: {
@@ -105,11 +105,11 @@ export interface RendererStyling {
 }
 
 /**
- * RendererStylingStore properties and methods
+ * RendererConfigStore properties and methods
  *
  * @author Sean Fong
  */
-export interface RendererStylingStoreType {
+export interface RendererConfigStoreType {
   readOnlyVisualStyle: 'disabled' | 'readonly';
   requiredIndicatorPosition: 'start' | 'end';
   itemResponsive: {
@@ -134,13 +134,13 @@ export interface RendererStylingStoreType {
   disablePageCardView: boolean;
   disablePageButtons: boolean;
   disableTabButtons: boolean;
-  setRendererStyling: (params: RendererStyling) => void;
+  setRendererConfig: (params: RendererConfig) => void;
 }
 
 /**
  * @author Sean Fong
  */
-export const rendererStylingStore = createStore<RendererStylingStoreType>()((set) => ({
+export const rendererConfigStore = createStore<RendererConfigStoreType>()((set) => ({
   readOnlyVisualStyle: 'disabled',
   requiredIndicatorPosition: 'start',
   itemResponsive: {
@@ -163,7 +163,7 @@ export const rendererStylingStore = createStore<RendererStylingStoreType>()((set
   disablePageCardView: false,
   disablePageButtons: false,
   disableTabButtons: false,
-  setRendererStyling: (params: RendererStyling) => {
+  setRendererConfig: (params: RendererConfig) => {
     set((state) => ({
       readOnlyVisualStyle: params.readOnlyVisualStyle ?? state.readOnlyVisualStyle,
       requiredIndicatorPosition:
@@ -185,4 +185,4 @@ export const rendererStylingStore = createStore<RendererStylingStoreType>()((set
   }
 }));
 
-export const useRendererStylingStore = createSelectors(rendererStylingStore);
+export const useRendererConfigStore = createSelectors(rendererConfigStore);

package/src/stores/smartConfigStore.ts

@@ -58,7 +58,7 @@ export interface SmartConfigStoreType {
  * Will be deprecated in version 1.0.0.
  *
  * This is the vanilla version of the store which can be used in non-React environments.
- * @see SmartConfigStoreType for available properties and methods.
+ * @see {@link SmartConfigStoreType} for available properties and methods.
  *
  * @author Sean Fong
  */
@@ -81,8 +81,8 @@ export const smartConfigStore = createStore<SmartConfigStoreType>()((set) => ({
  * Will be deprecated in version 1.0.0.
  *
  * This is the React version of the store which can be used as React hooks in React functional components.
- * @see SmartConfigStoreType for available properties and methods.
- * @see smartConfigStore for the vanilla store.
+ * @see {@link SmartConfigStoreType} for available properties and methods.
+ * @see {@link smartConfigStore} for the vanilla store.
  *
  * @author Sean Fong
  */

package/src/stores/terminologyServerStore.ts

@@ -40,7 +40,7 @@ export interface TerminologyServerStoreType {
  * Terminology server state management store. This is used for resolving valueSets externally.
  * Defaults to use https://tx.ontoserver.csiro.au/fhir.
  * This is the vanilla version of the store which can be used in non-React environments.
- * @see TerminologyServerStoreType for available properties and methods.
+ * @see {@link TerminologyServerStoreType} for available properties and methods.
  *
  * @author Sean Fong
  */
@@ -54,7 +54,7 @@ export const terminologyServerStore = createStore<TerminologyServerStoreType>()(
  * Terminology server state management store. This is used for resolving valueSets externally.
  * Defaults to use https://tx.ontoserver.csiro.au/fhir.
  * This is the React version of the store which can be used as React hooks in React functional components.
- * @see TerminologyServerStoreType for available properties and methods.
+ * @see {@link TerminologyServerStoreType} for available properties and methods.
  *
  * @author Sean Fong
  */

package/src/theme/rendererThemeOptions.ts

@@ -34,7 +34,7 @@ export const rendererThemeOptions: ThemeOptions = {
     },
     background: {
       paper: '#fff',
-      default: '#fafafa'
+      default: '#fff'
     },
     action: {
       active: grey['600'],

package/src/utils/answerOptionsToggleExpressions.ts

@@ -16,7 +16,12 @@
  */
 
 import type { QuestionnaireResponse, QuestionnaireResponseItem } from 'fhir/r4';
-import { createFhirPathContext, handleFhirPathResult } from './fhirpath';
+import {
+  cacheTerminologyResult,
+  createFhirPathContext,
+  handleFhirPathResult,
+  isExpressionCached
+} from './fhirpath';
 import fhirpath from 'fhirpath';
 import fhirpath_r4_model from 'fhirpath/fhir-context/r4';
 import type { Variables } from '../interfaces';
@@ -71,8 +76,7 @@ export async function evaluateInitialAnswerOptionsToggleExpressions(
         continue;
       }
 
-      const cacheKey = JSON.stringify(expression); // Use expression as cache key
-      if (fhirPathTerminologyCache[cacheKey]) {
+      if (isExpressionCached(expression, fhirPathTerminologyCache)) {
         continue;
       }
 
@@ -107,7 +111,7 @@ export async function evaluateInitialAnswerOptionsToggleExpressions(
 
         // If fhirPathResult is an async terminology call, cache the result
         if (fhirPathResult instanceof Promise) {
-          fhirPathTerminologyCache[cacheKey] = result;
+          cacheTerminologyResult(expression, result, fhirPathTerminologyCache);
         }
       } catch (e) {
         console.warn(
@@ -131,7 +135,7 @@ export async function evaluateAnswerOptionsToggleExpressions(
   answerOptionsToggleExpressions: Record<string, AnswerOptionsToggleExpression[]>,
   terminologyServerUrl: string
 ): Promise<{
-  answerOptionsToggleExpressionsIsUpdated: boolean;
+  isUpdated: boolean;
   updatedAnswerOptionsToggleExpressions: Record<string, AnswerOptionsToggleExpression[]>;
   computedNewAnswers: ComputedNewAnswers;
 }> {
@@ -146,8 +150,7 @@ export async function evaluateAnswerOptionsToggleExpressions(
         continue;
       }
 
-      const cacheKey = JSON.stringify(expression); // Use expression as cache key
-      if (fhirPathTerminologyCache[cacheKey]) {
+      if (isExpressionCached(expression, fhirPathTerminologyCache)) {
         continue;
       }
 
@@ -188,7 +191,7 @@ export async function evaluateAnswerOptionsToggleExpressions(
 
         // If fhirPathResult is an async terminology call, cache the result
         if (fhirPathResult instanceof Promise) {
-          fhirPathTerminologyCache[cacheKey] = result;
+          cacheTerminologyResult(expression, result, fhirPathTerminologyCache);
         }
       } catch (e) {
         console.warn(
@@ -200,7 +203,7 @@ export async function evaluateAnswerOptionsToggleExpressions(
   }
 
   return {
-    answerOptionsToggleExpressionsIsUpdated: isUpdated,
+    isUpdated,
     updatedAnswerOptionsToggleExpressions: answerOptionsToggleExpressions,
     computedNewAnswers
   };