react-f0rm 0.11.0 → 0.11.1

package/dist/index.umd.js

@@ -58,6 +58,7 @@
     pathCache.set(path, value);
     return value;
   }
+  const isIndex = (segment) => /^-?\d+$/.test(segment);
   function parsePath(path) {
     const result = [];
     let identifier = "";
@@ -90,7 +91,7 @@
             throw new TypeError(`Unterminated bracket in path: ${path}`);
           }
           const content = path.slice(i + 1, close);
-          result.push(/^-?\d+$/.test(content) ? Number(content) : content);
+          result.push(isIndex(content) ? Number(content) : content);
           i = close;
         }
       } else {
@@ -127,9 +128,10 @@
   function set(values, path, value) {
     if (!path.length) return value;
     const [prop, ...props] = path;
-    if (typeof prop === "number") {
+    const index = typeof prop === "number" ? prop : Array.isArray(values) && typeof prop === "string" && isIndex(prop) ? Number(prop) : void 0;
+    if (index !== void 0) {
       const arr = Array.isArray(values) ? values.slice() : [];
-      arr[prop] = set(arr[prop], props, value);
+      arr[index] = set(arr[index], props, value);
       return arr;
     }
     return { ...values, [prop]: set(values && values[prop], props, value) };
@@ -143,7 +145,7 @@
       const prop = path[i];
       if (!owned.has(container)) {
         let copy;
-        if (typeof prop === "number") {
+        if (typeof prop === "number" || Array.isArray(container) && typeof prop === "string" && isIndex(prop)) {
           copy = Array.isArray(container) ? container.slice() : [];
         } else {
           copy = { ...container };
@@ -253,9 +255,16 @@
     return getValueByPath(form, create$1(name));
   }
   function getValueByPath({ initialValues, parsedValues, values, deleted }, path) {
-    if (values.has(path.key)) return values.get(path.key);
-    if (deleted.has(path.key)) return void 0;
-    return get(parsedValues ?? initialValues, path.value);
+    const { key, value: segments } = path;
+    if (values.has(key)) return values.get(key);
+    if (deleted.has(key)) return void 0;
+    for (let i = segments.length - 1; i > 0; i--) {
+      const ancestorKey = JSON.stringify(segments.slice(0, i));
+      if (values.has(ancestorKey)) {
+        return get(values.get(ancestorKey), segments.slice(i));
+      }
+    }
+    return get(parsedValues ?? initialValues, segments);
   }
   function setValue(form, name, value, options) {
     setValueByPath(form, create$1(name), value, options);
@@ -263,6 +272,7 @@
   function setValueByPath(form, path, value, options) {
     const { emitter, values, deleted } = form;
     values.set(path.key, value);
+    pruneDescendantKeys(values, path);
     reviveBranch(deleted, path);
     pruneDirtyBaselines(form, path);
     if (options?.shouldDirty === false) setDirtyBaseline(form, path, value);
@@ -496,6 +506,13 @@
     }
     return false;
   }
+  function pruneDescendantKeys(values, { key }) {
+    if (!values.size) return;
+    const stem = `${key.slice(0, -1)},`;
+    for (const k of values.keys()) {
+      if (k.startsWith(stem)) values.delete(k);
+    }
+  }
   function reviveBranch(deleted, { key }) {
     if (!deleted.size) return;
     for (const tombstone of deleted) {