@json-render/solid 0.18.0 → 0.20.0

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import {
   elementTreeSchema,
   schema
-} from "./chunk-XTSB6FIM.mjs";
+} from "./chunk-ZTWTJIEL.mjs";
 
 // src/contexts/state.tsx
 import { createComponent as _$createComponent } from "solid-js/web";
@@ -547,11 +547,8 @@ function ActionProvider(props) {
               handler,
               setState: set,
               navigate: props.navigate,
-              executeAction: async (name) => {
-                const subBinding = {
-                  action: name
-                };
-                await execute(subBinding);
+              executeAction: async (binding2) => {
+                await execute(binding2);
               }
             });
           } finally {
@@ -570,11 +567,8 @@ function ActionProvider(props) {
           handler,
           setState: set,
           navigate: props.navigate,
-          executeAction: async (name) => {
-            const subBinding = {
-              action: name
-            };
-            await execute(subBinding);
+          executeAction: async (binding2) => {
+            await execute(binding2);
           }
         });
       } finally {
@@ -695,13 +689,17 @@ import { insert as _$insert2 } from "solid-js/web";
 import { memo as _$memo2 } from "solid-js/web";
 import { createComponent as _$createComponent6 } from "solid-js/web";
 import { createContext as createContext6, useContext as useContext6, createMemo as createMemo3, createEffect as createEffect3, createSignal as createSignal4, onCleanup as onCleanup2, ErrorBoundary, Show, For } from "solid-js";
-import { resolveElementProps, resolveBindings, resolveActionParam, evaluateVisibility as evaluateVisibility2, getByPath as getByPath2, isDevtoolsActive, subscribeDevtoolsActive } from "@json-render/core";
+import { resolveElementProps, resolveBindings, resolveActionParam, resolveRepeatItemStatePath, resolveRepeatStatePath, evaluateVisibility as evaluateVisibility2, getByPath as getByPath2, isDevtoolsActive, subscribeDevtoolsActive, createDirectiveRegistry } from "@json-render/core";
 var _tmpl$2 = /* @__PURE__ */ _$template2(`<span style=display:contents>`);
 var EMPTY_FUNCTIONS = {};
 var FunctionsContext = createContext6(EMPTY_FUNCTIONS);
 function useFunctions() {
   return useContext6(FunctionsContext) ?? EMPTY_FUNCTIONS;
 }
+var DirectivesContext = createContext6(void 0);
+function useDirectives() {
+  return useContext6(DirectivesContext);
+}
 function useDevtoolsActive() {
   const [active, setActive] = createSignal4(isDevtoolsActive());
   const unsub = subscribeDevtoolsActive(() => setActive(isDevtoolsActive()));
@@ -719,6 +717,7 @@ function ElementRenderer(props) {
   const stateStore = useStateStore();
   const getSnapshot = () => stateStore.getSnapshot();
   const functions = useFunctions();
+  const directives = useDirectives();
   const fullCtx = createMemo3(() => {
     const repeatItem = repeatScope?.item;
     const repeatIndex = repeatScope?.index;
@@ -736,7 +735,8 @@ function ElementRenderer(props) {
       ...repeatBasePath !== void 0 ? {
         repeatBasePath
       } : {},
-      functions
+      functions,
+      directives
     };
   });
   const isVisible = createMemo3(() => props.element.visible === void 0 ? true : evaluateVisibility2(props.element.visible, fullCtx()));
@@ -978,8 +978,15 @@ function ElementRendererContent(props) {
 function RepeatChildren(props) {
   const stateStore = useStateStore();
   const repeat = () => props.element.repeat;
-  const statePath = () => repeat().statePath;
-  const items = () => getByPath2(stateStore.state, statePath()) ?? [];
+  const parentScope = useRepeatScope();
+  const statePath = () => {
+    const resolved = resolveRepeatStatePath(repeat().statePath, parentScope?.basePath);
+    if (resolved === void 0) {
+      console.warn("[json-render/solid] $item in repeat.statePath used outside of a repeat scope");
+    }
+    return resolved;
+  };
+  const items = () => statePath() === void 0 ? [] : getByPath2(stateStore.state, statePath()) ?? [];
   return _$createComponent6(For, {
     get each() {
       return items();
@@ -995,7 +1002,7 @@ function RepeatChildren(props) {
           return index();
         },
         get basePath() {
-          return `${statePath()}/${index()}`;
+          return resolveRepeatItemStatePath(statePath(), index());
         },
         get children() {
           return _$createComponent6(For, {
@@ -1072,6 +1079,7 @@ function Renderer(props) {
   });
 }
 function JSONUIProvider(props) {
+  const directiveRegistry = createMemo3(() => props.directives ? createDirectiveRegistry(props.directives) : void 0);
   return _$createComponent6(StateProvider, {
     get store() {
       return props.store;
@@ -1103,7 +1111,14 @@ function JSONUIProvider(props) {
                       return props.functions ?? EMPTY_FUNCTIONS;
                     },
                     get children() {
-                      return [_$memo2(() => props.children), _$createComponent6(ConfirmationDialogManager, {})];
+                      return _$createComponent6(DirectivesContext.Provider, {
+                        get value() {
+                          return directiveRegistry();
+                        },
+                        get children() {
+                          return [_$memo2(() => props.children), _$createComponent6(ConfirmationDialogManager, {})];
+                        }
+                      });
                     }
                   });
                 }
@@ -1189,6 +1204,7 @@ function defineRegistry(_catalog, options) {
 function createRenderer(catalog, components) {
   const registry = components;
   return function CatalogRenderer(props) {
+    const directiveRegistry = createMemo3(() => props.directives ? createDirectiveRegistry(props.directives) : void 0);
     const actionHandlers = () => props.onAction ? new Proxy({}, {
       get: (_target, prop) => {
         return (params) => props.onAction(prop, params);
@@ -1220,18 +1236,25 @@ function createRenderer(catalog, components) {
                         return props.functions ?? EMPTY_FUNCTIONS;
                       },
                       get children() {
-                        return [_$createComponent6(Renderer, {
-                          get spec() {
-                            return props.spec;
-                          },
-                          registry,
-                          get loading() {
-                            return props.loading;
+                        return _$createComponent6(DirectivesContext.Provider, {
+                          get value() {
+                            return directiveRegistry();
                           },
-                          get fallback() {
-                            return props.fallback;
+                          get children() {
+                            return [_$createComponent6(Renderer, {
+                              get spec() {
+                                return props.spec;
+                              },
+                              registry,
+                              get loading() {
+                                return props.loading;
+                              },
+                              get fallback() {
+                                return props.fallback;
+                              }
+                            }), _$createComponent6(ConfirmationDialogManager, {})];
                           }
-                        }), _$createComponent6(ConfirmationDialogManager, {})];
+                        });
                       }
                     });
                   }