refactor: convert all places to use the new helper

airjp73 · Sep 17, 2024 · 3656121 · 3656121
1 parent 5ce6502
commit 3656121
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 16 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/packages/core/src/form.ts b/packages/core/src/form.ts
@@ -24,8 +24,7 @@ import {
   StringToPathTuple,
   ValidStringPaths,
   ValueAtPath,
-  pathArrayToString,
-  stringToPathArray,
+  mergePathStrings,
 } from "@rvf/set-get";
 
 type SubmitTypes<FormOutputData> =
@@ -144,11 +143,7 @@ const instantiateFormScope = <FormInputData extends FieldValues>(
   __field_prefix__: prefix,
   __store__: store,
   scope(field) {
-    const newPrefix = pathArrayToString(
-      [...stringToPathArray(prefix), ...stringToPathArray(field)].filter(
-        (segment) => segment !== "",
-      ),
-    );
+    const newPrefix = mergePathStrings(prefix, field);
     if (store.subformCache.has(newPrefix))
       return store.subformCache.get(newPrefix);
 

diff --git a/packages/core/src/store.ts b/packages/core/src/store.ts
@@ -2,7 +2,7 @@ import {
   setPath,
   getPath,
   stringToPathArray,
-  pathArrayToString,
+  mergePathStrings,
 } from "@rvf/set-get";
 import { create } from "zustand/react";
 import { immer } from "./immer";
@@ -391,7 +391,7 @@ export const moveFieldArrayKeys = (
       if (Number.isNaN(index))
         throw new Error(`Attempted to update a non-array field, ${fieldName}`);
       const newIndex = updater(index);
-      return pathArrayToString([fieldName, newIndex, ...parts]);
+      return mergePathStrings(fieldName, newIndex, ...parts);
     });
   });
 };

diff --git a/packages/react/src/base.tsx b/packages/react/src/base.tsx
@@ -25,7 +25,7 @@ import {
   ValidStringPathsToArrays,
   ValueAtPath,
   getPath,
-  pathArrayToString,
+  mergePathStrings,
 } from "@rvf/set-get";
 import { FieldArrayApi, makeFieldArrayImpl } from "./array";
 import { makeImplFactory } from "./implFactory";
@@ -463,8 +463,7 @@ export const makeBaseFormApi = <FormInputData,>({
   form,
 }: BaseReactFormParams<FormInputData>): FormApi<FormInputData> => {
   const prefix = form.__field_prefix__;
-  const f = (fieldName?: string) =>
-    pathArrayToString([prefix, fieldName].filter(isNonNullish));
+  const f = (fieldName?: string) => mergePathStrings(prefix, fieldName);
   const transientState = () => form.__store__.store.getState();
 
   type WithOptionalField<T> = [string, T] | [T];

diff --git a/packages/react/src/implFactory.tsx b/packages/react/src/implFactory.tsx
@@ -1,4 +1,4 @@
-import { pathArrayToString } from "@rvf/set-get";
+import { mergePathStrings } from "@rvf/set-get";
 
 const isNonNullish = <T,>(value: T | null | undefined): value is T =>
   value != null;
@@ -10,9 +10,7 @@ export const makeImplFactory = <Item,>(
   const implCache = new Map<string, Item>();
 
   return (fieldName?: string) => {
-    const fullName = pathArrayToString(
-      [prefix, fieldName].filter(isNonNullish),
-    );
+    const fullName = mergePathStrings(prefix, fieldName);
 
     const existingImpl = implCache.get(fullName);
     if (existingImpl) return existingImpl;

diff --git a/packages/set-get/src/index.ts b/packages/set-get/src/index.ts
@@ -3,4 +3,5 @@ export { getPath } from "./getPath";
 export { stringToPathArray } from "./stringToPathArray";
 export { pathArrayToString } from "./pathArrayToString";
 export { toPathObject } from "./toPathObject";
+export { mergePathStrings } from "./mergePathStrings";
 export * from "./types";