@optiaxiom/proteus 0.1.6 → 0.1.7

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

@@ -2,7 +2,7 @@
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { Disclosure, DisclosureTrigger, Box, Group, Text, DisclosureContent, Heading, Tooltip } from '@optiaxiom/react';
 import { useControllableState } from '@radix-ui/react-use-controllable-state';
-import { get, set } from 'jsonpointer';
+import { set } from 'jsonpointer';
 import { useState, useRef, useEffect } from 'react';
 import { useEffectEvent } from '../hooks/useEffectEvent.js';
 import { downloadFile } from '../proteus-image/downloadFile.js';
@@ -49,15 +49,6 @@ function ProteusDocumentShell({
           await onToolCall?.(event.tool);
         } else if ("message" in event) {
           await onMessage?.(event.message);
-        } else if (event.action === "message-from") {
-          const items = get(data, event.path);
-          if (!Array.isArray(items)) {
-            throw new Error(
-              `Expected array at "${event.path}" for message-from action`
-            );
-          }
-          const message = items.map((item) => `${item.name}: ${item.value || "[Not specified]"}`).join("\n");
-          await onMessage?.(message);
         } else if (event.action === "download") {
           if (typeof event.url === "string") {
             await downloadFile(event.url);

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

@@ -2,6 +2,7 @@
 import { jsx } from 'react/jsx-runtime';
 import { ProteusElement } from '../proteus-element/ProteusElement.js';
 import { getProteusValue } from './getProteusValue.js';
+import { evaluateCondition } from './resolveProteusValue.js';
 
 function resolveProteusProp(value, data, parentPath) {
   if (typeof value !== "object" || value === null) {
@@ -33,6 +34,16 @@ function resolveProteusProp(value, data, parentPath) {
       return row;
     });
   }
+  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)
+    );
+    if (!shouldShow) {
+      return void 0;
+    }
+    return resolveProteusProp(value.children, data, parentPath);
+  }
   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,32 +1,106 @@
 "use client";
 import { getProteusValue } from './getProteusValue.js';
 
-function resolveProteusValue(value, data, parentPath) {
-  if (typeof value !== "object" || value === null) {
-    return value;
+function evaluateCondition(condition, data, parentPath) {
+  if (!condition) {
+    return true;
   }
-  if ("$type" in value && value.$type === "Value" && "path" in value && typeof value.path === "string") {
-    return getProteusValue(
-      data,
-      value,
-      parentPath
+  if ("and" in condition) {
+    return condition.and.every(
+      (cond) => evaluateCondition(cond, data, parentPath)
     );
   }
-  if ("$type" in value && value.$type === "Map" && "path" in value && typeof value.path === "string" && "children" in value) {
-    const array = getProteusValue(
-      data,
-      { path: value.path },
-      parentPath
+  if ("or" in condition) {
+    return condition.or.some(
+      (cond) => evaluateCondition(cond, data, parentPath)
     );
-    if (!Array.isArray(array)) {
-      return value;
+  }
+  if ("!!" in condition) {
+    const value = resolveProteusValue(condition["!!"], data, parentPath);
+    return !!value;
+  }
+  if ("!" in condition) {
+    const value = resolveProteusValue(condition["!"], data, parentPath);
+    return !value;
+  }
+  if ("==" in condition) {
+    const [left, right] = condition["=="];
+    return resolveProteusValue(left, data, parentPath) === resolveProteusValue(right, data, parentPath);
+  } else if ("!=" in condition) {
+    const [left, right] = condition["!="];
+    return resolveProteusValue(left, data, parentPath) !== resolveProteusValue(right, data, parentPath);
+  } else if ("<" in condition) {
+    const [left, right] = condition["<"];
+    const leftVal = resolveProteusValue(left, data, parentPath);
+    const rightVal = resolveProteusValue(right, data, parentPath);
+    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);
+    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);
+    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);
+    return typeof leftVal === "number" && typeof rightVal === "number" && leftVal >= rightVal;
+  }
+  return false;
+}
+function resolveProteusValue(value, data, parentPath) {
+  if (typeof value !== "object" || value === null) {
+    return value;
+  }
+  if ("$type" in value) {
+    if (value.$type === "Value" && "path" in value && typeof value.path === "string") {
+      return getProteusValue(
+        data,
+        value,
+        parentPath
+      );
+    }
+    if (value.$type === "Map" && "path" in value && typeof value.path === "string" && "children" in value) {
+      const array = getProteusValue(
+        data,
+        { path: value.path },
+        parentPath
+      );
+      if (!Array.isArray(array)) {
+        return value;
+      }
+      const resolvedPath = value.path.startsWith("/") ? value.path : `${parentPath}/${value.path}`;
+      const items = array.map(
+        (_, index) => resolveProteusValue(value.children, data, `${resolvedPath}/${index}`)
+      );
+      if ("separator" in value) {
+        const sep = resolveProteusValue(value.separator, data, parentPath);
+        return items.join(typeof sep === "string" ? sep : "");
+      }
+      return items;
+    }
+    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)
+      );
+      if (!shouldShow) {
+        return void 0;
+      }
+      return resolveProteusValue(value.children, data, parentPath);
+    }
+    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("");
     }
-    const resolvedPath = value.path.startsWith("/") ? value.path : `${parentPath}/${value.path}`;
-    return array.map(
-      (_, index) => resolveProteusValue(value.children, data, `${resolvedPath}/${index}`)
-    );
   }
   return value;
 }
 
-export { resolveProteusValue };
+export { evaluateCondition, resolveProteusValue };

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

@@ -4,10 +4,10 @@ import { resolveProteusValue } from './resolveProteusValue.js';
 
 function useResolveProteusValues(props) {
   const { data } = useProteusDocumentContext(
-    "@optiaxiom/react/useResolvedProteusProps"
+    "@optiaxiom/react/useResolveProteusValues"
   );
   const { path: parentPath } = useProteusDocumentPathContext(
-    "@optiaxiom/react/useResolvedProteusProps"
+    "@optiaxiom/react/useResolveProteusValues"
   );
   const resolved = {};
   for (const [key, value] of Object.entries(props)) {

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

@@ -2,7 +2,7 @@
 import { jsx, Fragment } from 'react/jsx-runtime';
 import { useProteusDocumentContext } from '../proteus-document/ProteusDocumentContext.js';
 import { useProteusDocumentPathContext } from '../proteus-document/ProteusDocumentPathContext.js';
-import { resolveProteusValue } from '../proteus-document/resolveProteusValue.js';
+import { evaluateCondition } from '../proteus-document/resolveProteusValue.js';
 
 function ProteusShow({ children, when }) {
   const { data } = useProteusDocumentContext("@optiaxiom/proteus/ProteusShow");
@@ -18,53 +18,6 @@ function ProteusShow({ children, when }) {
   }
   return /* @__PURE__ */ jsx(Fragment, { children });
 }
-function evaluateCondition(condition, data, parentPath) {
-  if (!condition) {
-    return true;
-  }
-  if ("and" in condition) {
-    return condition.and.every(
-      (cond) => evaluateCondition(cond, data, parentPath)
-    );
-  }
-  if ("or" in condition) {
-    return condition.or.some(
-      (cond) => evaluateCondition(cond, data, parentPath)
-    );
-  }
-  if ("!!" in condition) {
-    const value = resolveProteusValue(condition["!!"], data, parentPath);
-    return !!value;
-  }
-  if ("==" in condition) {
-    const [left, right] = condition["=="];
-    return resolveProteusValue(left, data, parentPath) === resolveProteusValue(right, data, parentPath);
-  } else if ("!=" in condition) {
-    const [left, right] = condition["!="];
-    return resolveProteusValue(left, data, parentPath) !== resolveProteusValue(right, data, parentPath);
-  } else if ("<" in condition) {
-    const [left, right] = condition["<"];
-    const leftVal = resolveProteusValue(left, data, parentPath);
-    const rightVal = resolveProteusValue(right, data, parentPath);
-    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);
-    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);
-    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);
-    return typeof leftVal === "number" && typeof rightVal === "number" && leftVal >= rightVal;
-  }
-  return false;
-}
 ProteusShow.displayName = "@optiaxiom/proteus/ProteusShow";
 
 export { ProteusShow };

package/dist/esm/schema/public-schema.json.js

@@ -2400,6 +2400,35 @@ var definitions = {
 				],
 				type: "object"
 			},
+			{
+				additionalProperties: false,
+				properties: {
+					"!": {
+						anyOf: [
+							{
+								type: "string"
+							},
+							{
+								type: "number"
+							},
+							{
+								type: "boolean"
+							},
+							{
+								type: "null"
+							},
+							{
+								$ref: "#/definitions/ProteusValue"
+							}
+						],
+						description: "Falsy check - returns true if value is falsy (null, undefined, false, 0, or empty string)"
+					}
+				},
+				required: [
+					"!"
+				],
+				type: "object"
+			},
 			{
 				additionalProperties: false,
 				properties: {
@@ -2665,6 +2694,9 @@ var definitions = {
 			{
 				$ref: "#/definitions/ProteusChart"
 			},
+			{
+				$ref: "#/definitions/ProteusConcat"
+			},
 			{
 				$ref: "#/definitions/ProteusDataTable"
 			},
@@ -2752,8 +2784,18 @@ var definitions = {
 				description: "Client-side message action",
 				properties: {
 					message: {
-						description: "Message to send to LLM via sendNewMessage()",
-						type: "string"
+						anyOf: [
+							{
+								$ref: "#/definitions/ProteusMap"
+							},
+							{
+								$ref: "#/definitions/ProteusValue"
+							},
+							{
+								type: "string"
+							}
+						],
+						description: "Message to send to LLM via sendNewMessage(). Can be a string, a Value reference, or a Map expression."
 					}
 				},
 				required: [
@@ -2790,26 +2832,6 @@ var definitions = {
 					"url"
 				],
 				type: "object"
-			},
-			{
-				additionalProperties: false,
-				description: "Client-side component action - collects name/value pairs from a data array and sends as a message",
-				properties: {
-					action: {
-						"const": "message-from",
-						description: "The action type",
-						type: "string"
-					},
-					path: {
-						description: "JSON pointer to an array of objects with name and value fields",
-						type: "string"
-					}
-				},
-				required: [
-					"action",
-					"path"
-				],
-				type: "object"
 			}
 		],
 		description: "Handler for user interactions - a server-side tool call, client-side message, or client-side component action"
@@ -4524,6 +4546,32 @@ var definitions = {
 		],
 		type: "object"
 	},
+	ProteusConcat: {
+		additionalProperties: false,
+		properties: {
+			$type: {
+				"const": "Concat"
+			},
+			children: {
+				description: "Array of values to concatenate into a single string. Each item is resolved and joined together.",
+				items: {
+					anyOf: [
+						{
+							$ref: "#/definitions/ProteusNode"
+						},
+						{
+							type: "string"
+						}
+					]
+				},
+				type: "array"
+			}
+		},
+		required: [
+			"$type"
+		],
+		type: "object"
+	},
 	ProteusDataTable: {
 		additionalProperties: false,
 		examples: [

package/dist/esm/schema/runtime-schema.json.js

@@ -2392,6 +2392,34 @@ var definitions = {
 				],
 				type: "object"
 			},
+			{
+				properties: {
+					"!": {
+						anyOf: [
+							{
+								type: "string"
+							},
+							{
+								type: "number"
+							},
+							{
+								type: "boolean"
+							},
+							{
+								type: "null"
+							},
+							{
+								$ref: "#/definitions/ProteusValue"
+							}
+						],
+						description: "Falsy check - returns true if value is falsy (null, undefined, false, 0, or empty string)"
+					}
+				},
+				required: [
+					"!"
+				],
+				type: "object"
+			},
 			{
 				properties: {
 					and: {
@@ -2654,6 +2682,9 @@ var definitions = {
 			{
 				$ref: "#/definitions/ProteusChart"
 			},
+			{
+				$ref: "#/definitions/ProteusConcat"
+			},
 			{
 				$ref: "#/definitions/ProteusDataTable"
 			},
@@ -2739,8 +2770,18 @@ var definitions = {
 				description: "Client-side message action",
 				properties: {
 					message: {
-						description: "Message to send to LLM via sendNewMessage()",
-						type: "string"
+						anyOf: [
+							{
+								$ref: "#/definitions/ProteusMap"
+							},
+							{
+								$ref: "#/definitions/ProteusValue"
+							},
+							{
+								type: "string"
+							}
+						],
+						description: "Message to send to LLM via sendNewMessage(). Can be a string, a Value reference, or a Map expression."
 					}
 				},
 				required: [
@@ -2776,25 +2817,6 @@ var definitions = {
 					"url"
 				],
 				type: "object"
-			},
-			{
-				description: "Client-side component action - collects name/value pairs from a data array and sends as a message",
-				properties: {
-					action: {
-						"const": "message-from",
-						description: "The action type",
-						type: "string"
-					},
-					path: {
-						description: "JSON pointer to an array of objects with name and value fields",
-						type: "string"
-					}
-				},
-				required: [
-					"action",
-					"path"
-				],
-				type: "object"
 			}
 		],
 		description: "Handler for user interactions - a server-side tool call, client-side message, or client-side component action"
@@ -4498,6 +4520,31 @@ var definitions = {
 		],
 		type: "object"
 	},
+	ProteusConcat: {
+		properties: {
+			$type: {
+				"const": "Concat"
+			},
+			children: {
+				description: "Array of values to concatenate into a single string. Each item is resolved and joined together.",
+				items: {
+					anyOf: [
+						{
+							$ref: "#/definitions/ProteusNode"
+						},
+						{
+							type: "string"
+						}
+					]
+				},
+				type: "array"
+			}
+		},
+		required: [
+			"$type"
+		],
+		type: "object"
+	},
 	ProteusDataTable: {
 		examples: [
 			{

package/dist/index.d.ts

@@ -109,20 +109,10 @@ declare namespace ProteusSelect {
     var displayName: string;
 }
 
-type ProteusShowProps = {
-    children?: ReactNode;
-    /**
-     * Single condition or array of conditions (AND logic). Each condition is an
-     * object with one operator key.
-     */
-    when: ProteusCondition;
-};
-type ComparisonValue = boolean | null | number | string | {
-    $type: "Value";
-    path: string;
-};
 type ProteusCondition = {
     "!!": ComparisonValue;
+} | {
+    "!": ComparisonValue;
 } | {
     "!=": ComparisonValue[];
 } | {
@@ -140,6 +130,19 @@ type ProteusCondition = {
 } | {
     or: ProteusCondition[];
 };
+type ComparisonValue = boolean | null | number | string | {
+    $type: "Value";
+    path: string;
+};
+
+type ProteusShowProps = {
+    children?: ReactNode;
+    /**
+     * Single condition or array of conditions (AND logic). Each condition is an
+     * object with one operator key.
+     */
+    when: ProteusCondition;
+};
 declare function ProteusShow({ children, when }: ProteusShowProps): react_jsx_runtime.JSX.Element | null;
 declare namespace ProteusShow {
     var displayName: string;
@@ -223,9 +226,6 @@ type ProteusEventHandler = {
     url: (ProteusValueProps & {
         $type: "Value";
     }) | string | string[];
-} | {
-    action: "message-from";
-    path: string;
 } | {
     message: string;
 } | {