make use of getValue/setValue where applicable

Author: forman

dashi/src/lib/actions/helpers/applyStateChangeRequests.ts

@@ -11,6 +11,7 @@ import type { ContribPoint } from "@/lib/types/model/extension";
 import type { ContributionState } from "@/lib";
 import { updateArray } from "@/lib/utils/updateArray";
 import { isContainerState } from "@/lib/actions/helpers/isContainerState";
+import { getValue, setValue } from "@/lib/utils/objPath";
 
 export function applyStateChangeRequests(
   stateChangeRequests: StateChangeRequest[],
@@ -106,12 +107,10 @@ export function applyComponentStateChange(
 ): ComponentState {
   if (component.id === stateChange.id) {
     const property = stateChange.property;
-    const valueOld = (component as unknown as Record<string, unknown>)[
-      property
-    ];
+    const valueOld = getValue(component, property);
     const valueNew = stateChange.value;
     if (valueOld !== valueNew) {
-      return { ...component, [property]: valueNew };
+      return setValue(component, property, valueNew);
     }
   } else if (isContainerState(component)) {
     const containerOld: ContainerState = component;
@@ -135,17 +134,13 @@ export function applyComponentStateChange(
 }
 
 // we export for testing only
-export function applyStateChanges<S extends object>(
-  state: S | undefined,
+export function applyStateChanges<S extends object | undefined>(
+  state: S,
   stateChanges: StateChange[],
-): S | undefined {
+): S {
   stateChanges.forEach((stateChange) => {
-    if (
-      !state ||
-      (state as unknown as Record<string, unknown>)[stateChange.property] !==
-        stateChange.value
-    ) {
-      state = { ...state, [stateChange.property]: stateChange.value } as S;
+    if (!state || getValue(state, stateChange.property) !== stateChange.value) {
+      state = setValue(state, stateChange.property, stateChange.value) as S;
     }
   });
   return state;

dashi/src/lib/actions/helpers/getInputValues.ts

@@ -48,9 +48,7 @@ export function getInputValueFromComponent(
   componentState: ComponentState,
 ): unknown {
   if (componentState.id === input.id && input.property) {
-    return (componentState as unknown as Record<string, unknown>)[
-      input.property
-    ];
+    return getValue(componentState, input.property);
   } else if (isContainerState(componentState)) {
     for (let i = 0; i < componentState.components.length; i++) {
       const item = componentState.components[i];
@@ -73,16 +71,7 @@ export function getInputValueFromState(
     inputValue = inputValue[input.id];
   }
   if (isSubscriptable(inputValue)) {
-    const property = input.property;
-    // TODO: The Input.property should be normalized to be a path
-    //   and have type string[].
-    //   See also interface Input in types/model/channel.ts
-    if (property.includes(".")) {
-      const path = property.split(".");
-      inputValue = getValue(inputValue, path);
-    } else {
-      inputValue = inputValue[property];
-    }
+    inputValue = getValue(inputValue, input.property);
   }
   return inputValue;
 }

dashi/src/lib/utils/mapObject.test.ts

@@ -1,6 +1,5 @@
 import { describe, it, expect } from "vitest";
 
-import { getValue, setValue, toObjPath } from "./objPath";
 import { mapObject } from "@/lib/utils/mapObject";
 
 describe("Test that mapObject()", () => {

dashi/src/lib/utils/objPath.ts

@@ -4,7 +4,11 @@ export type ObjPath = (string | number)[];
 
 type Obj = Record<string | number, unknown>;
 
-export function getValue(obj: object, path: ObjPath): unknown {
+export function getValue(
+  obj: object | undefined,
+  path: ObjPath | string,
+): unknown {
+  path = toObjPath(path);
   let value: unknown = obj;
   for (const key of path) {
     if (isObject(value)) {
@@ -16,19 +20,19 @@ export function getValue(obj: object, path: ObjPath): unknown {
   return value;
 }
 
-export function setValue<S extends object>(
+export function setValue<S extends object | undefined>(
   obj: S,
   path: ObjPath | string,
   value: unknown,
-): S | undefined {
+): S {
   return _setValue(obj, toObjPath(path), value);
 }
 
-export function _setValue<S extends object>(
-  obj: S | undefined,
+export function _setValue<S extends object | undefined>(
+  obj: S,
   path: ObjPath,
   value: unknown,
-): S | undefined {
+): S {
   if (path.length === 1) {
     const key = path[0];
     if (isObject(obj)) {
@@ -66,7 +70,7 @@ export function toObjPath(
 ): ObjPath {
   if (Array.isArray(property)) {
     return property as ObjPath;
-  } else if (property === "" || !property) {
+  } else if (!property || property === "") {
     return [];
   } else if (typeof property === "number") {
     return [property];