@optiaxiom/proteus 0.1.16 → 0.1.18

package/dist/esm/proteus-document/ProteusDocumentPathContext.js

@@ -2,6 +2,7 @@
 import { createContext } from '@radix-ui/react-context';
 
 const [ProteusDocumentPathProvider, useProteusDocumentPathContext] = createContext("@optiaxiom/proteus/ProteusDocumentPath", {
+  mapIndices: [],
   path: ""
 });
 

package/dist/esm/proteus-document/ProteusDocumentShell.js

@@ -14,6 +14,7 @@ function ProteusDocumentShell({
   defaultOpen = true,
   element,
   onDataChange,
+  onDownload,
   onInteraction,
   onMessage,
   onOpenChange,
@@ -28,24 +29,6 @@ function ProteusDocumentShell({
       setValid(formRef.current.checkValidity());
     }
   }, []);
-  useEffect(() => {
-    if (!element.blocking || !formRef.current)
-      return;
-    const walker = document.createTreeWalker(
-      formRef.current,
-      NodeFilter.SHOW_ELEMENT,
-      {
-        acceptNode: (node) => {
-          if (node instanceof HTMLInputElement && node.type === "hidden")
-            return NodeFilter.FILTER_SKIP;
-          if (node.hidden)
-            return NodeFilter.FILTER_SKIP;
-          return node.tabIndex >= 0 ? NodeFilter.FILTER_ACCEPT : NodeFilter.FILTER_SKIP;
-        }
-      }
-    );
-    walker.nextNode()?.focus();
-  }, [element.blocking]);
   const [open, setOpen] = useControllableState({
     defaultProp: defaultOpen,
     onChange: onOpenChange,
@@ -68,20 +51,24 @@ function ProteusDocumentShell({
         } else if ("message" in event) {
           await onMessage?.(event.message);
         } else if (event.action === "download") {
+          const urls = [];
           if (typeof event.url === "string") {
-            await downloadFile(event.url);
+            urls.push(event.url);
           } else if (Array.isArray(event.url)) {
-            await Promise.all(
-              event.url.map((u) => {
-                if (typeof u !== "string") {
-                  throw new Error("Invalid URL in download array");
-                }
-                return downloadFile(u);
-              })
-            );
+            for (const u of event.url) {
+              if (typeof u !== "string") {
+                throw new Error("Invalid URL in download array");
+              }
+              urls.push(u);
+            }
           } else {
             throw new Error("Invalid URL for download action");
           }
+          if (onDownload) {
+            await onDownload(urls);
+          } else {
+            await Promise.all(urls.map((u) => downloadFile(u)));
+          }
         }
       }),
       readOnly,

package/dist/esm/proteus-document/resolveProteusProp.js

@@ -4,10 +4,13 @@ import { ProteusElement } from '../proteus-element/ProteusElement.js';
 import { getProteusValue } from './getProteusValue.js';
 import { evaluateCondition } from './resolveProteusValue.js';
 
-function resolveProteusProp(value, data, parentPath) {
+function resolveProteusProp(value, data, parentPath, mapIndices = []) {
   if (typeof value !== "object" || value === null) {
     return value;
   }
+  if ("$type" in value && value.$type === "MapIndex") {
+    return mapIndices.at(-1);
+  }
   if ("$type" in value && value.$type === "Value" && "path" in value && typeof value.path === "string") {
     return getProteusValue(
       data,
@@ -20,7 +23,7 @@ function resolveProteusProp(value, data, parentPath) {
     const resolved = {};
     let length = 0;
     for (const [k, v] of Object.entries(sources)) {
-      const arr = resolveProteusProp(v, data, parentPath);
+      const arr = resolveProteusProp(v, data, parentPath, mapIndices);
       if (Array.isArray(arr)) {
         resolved[k] = arr;
         length = Math.max(length, arr.length);
@@ -37,12 +40,12 @@ function resolveProteusProp(value, data, parentPath) {
   if ("$type" in value && value.$type === "Show" && "when" in value && "children" in value) {
     const conditions = Array.isArray(value.when) ? value.when : [value.when];
     const shouldShow = conditions.every(
-      (condition) => evaluateCondition(condition, data, parentPath)
+      (condition) => evaluateCondition(condition, data, parentPath, mapIndices)
     );
     if (!shouldShow) {
       return void 0;
     }
-    return resolveProteusProp(value.children, data, parentPath);
+    return resolveProteusProp(value.children, data, parentPath, mapIndices);
   }
   return "$type" in value || Array.isArray(value) && value.some((v) => v && typeof v === "object" && "$type" in v) ? /* @__PURE__ */ jsx(ProteusElement, { element: value }) : value;
 }

package/dist/esm/proteus-document/resolveProteusValue.js

@@ -1,62 +1,75 @@
 "use client";
 import { getProteusValue } from './getProteusValue.js';
 
-function evaluateCondition(condition, data, parentPath) {
+function evaluateCondition(condition, data, parentPath, mapIndices = []) {
   if (!condition) {
     return true;
   }
   if ("and" in condition) {
     return condition.and.every(
-      (cond) => evaluateCondition(cond, data, parentPath)
+      (cond) => evaluateCondition(cond, data, parentPath, mapIndices)
     );
   }
   if ("or" in condition) {
     return condition.or.some(
-      (cond) => evaluateCondition(cond, data, parentPath)
+      (cond) => evaluateCondition(cond, data, parentPath, mapIndices)
     );
   }
   if ("!!" in condition) {
-    const value = resolveProteusValue(condition["!!"], data, parentPath);
+    const value = resolveProteusValue(
+      condition["!!"],
+      data,
+      parentPath,
+      mapIndices
+    );
     return !!value;
   }
   if ("!" in condition) {
-    const value = resolveProteusValue(condition["!"], data, parentPath);
+    const value = resolveProteusValue(
+      condition["!"],
+      data,
+      parentPath,
+      mapIndices
+    );
     return !value;
   }
   if ("==" in condition) {
     const [left, right] = condition["=="];
-    return resolveProteusValue(left, data, parentPath) === resolveProteusValue(right, data, parentPath);
+    return resolveProteusValue(left, data, parentPath, mapIndices) === resolveProteusValue(right, data, parentPath, mapIndices);
   } else if ("!=" in condition) {
     const [left, right] = condition["!="];
-    return resolveProteusValue(left, data, parentPath) !== resolveProteusValue(right, data, parentPath);
+    return resolveProteusValue(left, data, parentPath, mapIndices) !== resolveProteusValue(right, data, parentPath, mapIndices);
   } else if ("<" in condition) {
     const [left, right] = condition["<"];
-    const leftVal = resolveProteusValue(left, data, parentPath);
-    const rightVal = resolveProteusValue(right, data, parentPath);
+    const leftVal = resolveProteusValue(left, data, parentPath, mapIndices);
+    const rightVal = resolveProteusValue(right, data, parentPath, mapIndices);
     return typeof leftVal === "number" && typeof rightVal === "number" && leftVal < rightVal;
   } else if ("<=" in condition) {
     const [left, right] = condition["<="];
-    const leftVal = resolveProteusValue(left, data, parentPath);
-    const rightVal = resolveProteusValue(right, data, parentPath);
+    const leftVal = resolveProteusValue(left, data, parentPath, mapIndices);
+    const rightVal = resolveProteusValue(right, data, parentPath, mapIndices);
     return typeof leftVal === "number" && typeof rightVal === "number" && leftVal <= rightVal;
   } else if (">" in condition) {
     const [left, right] = condition[">"];
-    const leftVal = resolveProteusValue(left, data, parentPath);
-    const rightVal = resolveProteusValue(right, data, parentPath);
+    const leftVal = resolveProteusValue(left, data, parentPath, mapIndices);
+    const rightVal = resolveProteusValue(right, data, parentPath, mapIndices);
     return typeof leftVal === "number" && typeof rightVal === "number" && leftVal > rightVal;
   } else if (">=" in condition) {
     const [left, right] = condition[">="];
-    const leftVal = resolveProteusValue(left, data, parentPath);
-    const rightVal = resolveProteusValue(right, data, parentPath);
+    const leftVal = resolveProteusValue(left, data, parentPath, mapIndices);
+    const rightVal = resolveProteusValue(right, data, parentPath, mapIndices);
     return typeof leftVal === "number" && typeof rightVal === "number" && leftVal >= rightVal;
   }
   return false;
 }
-function resolveProteusValue(value, data, parentPath) {
+function resolveProteusValue(value, data, parentPath, mapIndices = []) {
   if (typeof value !== "object" || value === null) {
     return value;
   }
   if ("$type" in value) {
+    if (value.$type === "MapIndex") {
+      return mapIndices.at(-1);
+    }
     if (value.$type === "Value" && "path" in value && typeof value.path === "string") {
       return getProteusValue(
         data,
@@ -75,10 +88,18 @@ function resolveProteusValue(value, data, parentPath) {
       }
       const resolvedPath = value.path.startsWith("/") ? value.path : `${parentPath}/${value.path}`;
       const items = array.map(
-        (_, index) => resolveProteusValue(value.children, data, `${resolvedPath}/${index}`)
+        (_, index) => resolveProteusValue(value.children, data, `${resolvedPath}/${index}`, [
+          ...mapIndices,
+          index
+        ])
       );
       if ("separator" in value) {
-        const sep = resolveProteusValue(value.separator, data, parentPath);
+        const sep = resolveProteusValue(
+          value.separator,
+          data,
+          parentPath,
+          mapIndices
+        );
         return items.join(typeof sep === "string" ? sep : "");
       }
       return items;
@@ -86,18 +107,20 @@ function resolveProteusValue(value, data, parentPath) {
     if (value.$type === "Show" && "when" in value && "children" in value) {
       const conditions = Array.isArray(value.when) ? value.when : [value.when];
       const shouldShow = conditions.every(
-        (condition) => evaluateCondition(condition, data, parentPath)
+        (condition) => evaluateCondition(condition, data, parentPath, mapIndices)
       );
       if (!shouldShow) {
         return void 0;
       }
-      return resolveProteusValue(value.children, data, parentPath);
+      return resolveProteusValue(value.children, data, parentPath, mapIndices);
     }
     if (value.$type === "Concat" && "children" in value) {
       if (!Array.isArray(value.children)) {
         return value;
       }
-      return value.children.map((child) => resolveProteusValue(child, data, parentPath)).filter((v) => v !== void 0).join("");
+      return value.children.map(
+        (child) => resolveProteusValue(child, data, parentPath, mapIndices)
+      ).filter((v) => v !== void 0).join("");
     }
   }
   return value;

package/dist/esm/proteus-document/useResolveProteusValues.js

@@ -6,12 +6,12 @@ function useResolveProteusValues(props) {
   const { data } = useProteusDocumentContext(
     "@optiaxiom/react/useResolveProteusValues"
   );
-  const { path: parentPath } = useProteusDocumentPathContext(
+  const { mapIndices, path: parentPath } = useProteusDocumentPathContext(
     "@optiaxiom/react/useResolveProteusValues"
   );
   const resolved = {};
   for (const [key, value] of Object.entries(props)) {
-    resolved[key] = resolveProteusValue(value, data, parentPath);
+    resolved[key] = resolveProteusValue(value, data, parentPath, mapIndices);
   }
   return resolved;
 }

package/dist/esm/proteus-element/ProteusElement.js

@@ -33,7 +33,7 @@ const ProteusElement = ({
   const { data, strict } = useProteusDocumentContext(
     "@optiaxiom/proteus/ProteusElement"
   );
-  const { path: parentPath } = useProteusDocumentPathContext(
+  const { mapIndices, path: parentPath } = useProteusDocumentPathContext(
     "@optiaxiom/proteus/ProteusElement"
   );
   if (!elementProp) {
@@ -55,7 +55,7 @@ const ProteusElement = ({
     const { $type: _$type, ...rest } = obj;
     const resolved = {};
     for (const [key, value] of Object.entries(rest)) {
-      resolved[key] = resolveProteusProp(value, data, parentPath);
+      resolved[key] = resolveProteusProp(value, data, parentPath, mapIndices);
     }
     return resolved;
   };

package/dist/esm/proteus-map/ProteusMap.js

@@ -6,7 +6,7 @@ import { useProteusValue } from '../use-proteus-value/useProteusValue.js';
 
 function ProteusMap({ children, path, separator }) {
   const { strict } = useProteusDocumentContext("@optiaxiom/proteus/ProteusMap");
-  const { path: parentPath } = useProteusDocumentPathContext(
+  const { mapIndices, path: parentPath } = useProteusDocumentPathContext(
     "@optiaxiom/proteus/ProteusMap"
   );
   const array = useProteusValue({ path });
@@ -21,6 +21,7 @@ function ProteusMap({ children, path, separator }) {
   return /* @__PURE__ */ jsx(Fragment, { children: array.map((_, index) => /* @__PURE__ */ jsxs(
     ProteusDocumentPathProvider,
     {
+      mapIndices: [...mapIndices, index],
       path: `${path.startsWith("/") ? path : `${parentPath}/${path}`}/${index}`,
       children: [
         index > 0 && separator,

package/dist/esm/proteus-show/ProteusShow.js

@@ -6,12 +6,12 @@ import { evaluateCondition } from '../proteus-document/resolveProteusValue.js';
 
 function ProteusShow({ children, when }) {
   const { data } = useProteusDocumentContext("@optiaxiom/proteus/ProteusShow");
-  const { path: parentPath } = useProteusDocumentPathContext(
+  const { mapIndices, path: parentPath } = useProteusDocumentPathContext(
     "@optiaxiom/proteus/ProteusShow"
   );
   const conditions = Array.isArray(when) ? when : [when];
   const shouldShow = conditions.every(
-    (condition) => evaluateCondition(condition, data, parentPath)
+    (condition) => evaluateCondition(condition, data, parentPath, mapIndices)
   );
   if (!shouldShow) {
     return null;