@xmachines/json-render-solid 0.20.0-xm.4 → 0.21.0-xm.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.mjs CHANGED
@@ -1,7 +1,7 @@
1
1
  import {
2
2
  elementTreeSchema,
3
3
  schema
4
- } from "./chunk-ZTWTJIEL.mjs";
4
+ } from "./chunk-4IHHL4OE.mjs";
5
5
 
6
6
  // src/contexts/state.tsx
7
7
  import { createComponent as _$createComponent } from "solid-js/web";
@@ -702,9 +702,21 @@ import { effect as _$effect2 } from "solid-js/web";
702
702
  import { insert as _$insert2 } from "solid-js/web";
703
703
  import { memo as _$memo2 } from "solid-js/web";
704
704
  import { createComponent as _$createComponent6 } from "solid-js/web";
705
- import { createContext as createContext6, useContext as useContext6, createMemo as createMemo3, createEffect as createEffect3, createSignal as createSignal4, onCleanup as onCleanup3, ErrorBoundary, Show, For } from "solid-js";
706
- import { resolveElementProps, resolveBindings, resolveActionParam, resolveRepeatItemStatePath, resolveRepeatStatePath, evaluateVisibility as evaluateVisibility2, getByPath as getByPath2, isDevtoolsActive, subscribeDevtoolsActive, createDirectiveRegistry, splitRepeatVisibility } from "@xmachines/json-render-core";
705
+ import { createContext as createContext6, useContext as useContext6, createMemo as createMemo3, createEffect as createEffect3, createRenderEffect, createSignal as createSignal4, untrack, onCleanup as onCleanup3, getOwner, runWithOwner, createRoot, ErrorBoundary, Show, For } from "solid-js";
706
+ import { resolveElementProps, resolveBindings, resolveActionParam, resolveRepeatItemStatePath, resolveRepeatStatePath, evaluateVisibility as evaluateVisibility2, getByPath as getByPath2, isDevtoolsActive, subscribeDevtoolsActive, createDirectiveRegistry, copySlotMetadata, setCatalogSlotMetadata, warnElementSlots, splitRepeatVisibility } from "@xmachines/json-render-core";
707
707
  var _tmpl$2 = /* @__PURE__ */ _$template2(`<span style=display:contents>`);
708
+ function withRenderErrorHandler(registry, onRenderError) {
709
+ const next = {
710
+ ...registry
711
+ };
712
+ Object.defineProperty(next, "onRenderError", {
713
+ value: onRenderError,
714
+ enumerable: false,
715
+ configurable: true
716
+ });
717
+ copySlotMetadata(registry, next);
718
+ return next;
719
+ }
708
720
  function reportRenderError(registry, elementType, error) {
709
721
  const onRenderError = registry?.onRenderError;
710
722
  if (typeof onRenderError === "function") {
@@ -913,34 +925,20 @@ function ElementRendererContent(props) {
913
925
  get when() {
914
926
  return Comp();
915
927
  },
928
+ keyed: true,
916
929
  get fallback() {
917
930
  console.warn(`No renderer for component type: ${props.resolvedElement.type}`);
918
931
  return null;
919
932
  },
920
- children: (ComponentFn) => {
921
- const Component = ComponentFn();
922
- const children = () => props.resolvedElement.repeat ? _$createComponent6(RepeatChildren, {
923
- get element() {
924
- return props.resolvedElement;
925
- },
926
- get spec() {
927
- return props.spec;
928
- },
929
- get registry() {
930
- return props.registry;
931
- },
932
- get loading() {
933
- return props.loading;
934
- },
935
- get fallback() {
936
- return props.fallback;
937
- },
938
- get itemFilter() {
939
- return props.itemFilter;
940
- }
941
- }) : _$createComponent6(For, {
933
+ children: (Component) => {
934
+ const elementSlots = createMemo3(() => props.resolvedElement.slots);
935
+ createRenderEffect(() => {
936
+ const slotEntries = elementSlots();
937
+ untrack(() => warnElementSlots(props.registry, props.resolvedElement.type, slotEntries));
938
+ });
939
+ const renderChildKeys = (childKeys, slotName) => _$createComponent6(For, {
942
940
  get each() {
943
- return props.resolvedElement.children ?? [];
941
+ return childKeys();
944
942
  },
945
943
  children: (childKey) => {
946
944
  const childElement = () => props.spec.elements[childKey];
@@ -950,7 +948,9 @@ function ElementRendererContent(props) {
950
948
  },
951
949
  get fallback() {
952
950
  if (!props.loading) {
953
- console.warn(`[json-render] Missing element "${childKey}" referenced as child of "${props.resolvedElement.type}". This element will not render.`);
951
+ const type = untrack(() => props.resolvedElement.type);
952
+ const location = slotName ? `in slot "${slotName}" of "${type}"` : `as child of "${type}"`;
953
+ console.warn(`[json-render] Missing element "${childKey}" referenced ${location}. This element will not render.`);
954
954
  }
955
955
  return null;
956
956
  },
@@ -975,6 +975,99 @@ function ElementRendererContent(props) {
975
975
  });
976
976
  }
977
977
  });
978
+ const owner = getOwner();
979
+ const once = (make) => {
980
+ const contents = /* @__PURE__ */ new Map();
981
+ return () => {
982
+ const reader = getOwner();
983
+ let content = contents.get(reader);
984
+ if (content === void 0) {
985
+ let dispose = () => {
986
+ };
987
+ const value = createRoot((disposeRoot) => {
988
+ dispose = disposeRoot;
989
+ return make();
990
+ }, reader ?? owner);
991
+ const made = {
992
+ value,
993
+ dispose,
994
+ leaving: false
995
+ };
996
+ contents.set(reader, made);
997
+ runWithOwner(owner, () => onCleanup3(() => {
998
+ contents.delete(reader);
999
+ made.dispose();
1000
+ }));
1001
+ content = made;
1002
+ }
1003
+ content.leaving = false;
1004
+ if (reader !== null && reader !== owner) {
1005
+ const read = content;
1006
+ onCleanup3(() => {
1007
+ read.leaving = true;
1008
+ queueMicrotask(() => {
1009
+ if (!read.leaving || contents.get(reader) !== read) return;
1010
+ contents.delete(reader);
1011
+ read.dispose();
1012
+ });
1013
+ });
1014
+ }
1015
+ return content.value;
1016
+ };
1017
+ };
1018
+ const children = once(() => _$createComponent6(Show, {
1019
+ get when() {
1020
+ return props.resolvedElement.repeat;
1021
+ },
1022
+ get fallback() {
1023
+ return renderChildKeys(() => props.resolvedElement.children ?? []);
1024
+ },
1025
+ get children() {
1026
+ return _$createComponent6(RepeatChildren, {
1027
+ get element() {
1028
+ return props.resolvedElement;
1029
+ },
1030
+ get spec() {
1031
+ return props.spec;
1032
+ },
1033
+ get registry() {
1034
+ return props.registry;
1035
+ },
1036
+ get loading() {
1037
+ return props.loading;
1038
+ },
1039
+ get fallback() {
1040
+ return props.fallback;
1041
+ },
1042
+ get itemFilter() {
1043
+ return props.itemFilter;
1044
+ }
1045
+ });
1046
+ }
1047
+ }));
1048
+ const slotContent = /* @__PURE__ */ new Map();
1049
+ const slotOf = (slotName) => {
1050
+ let content = slotContent.get(slotName);
1051
+ if (!content) {
1052
+ content = once(() => renderChildKeys(() => props.resolvedElement.slots?.[slotName] ?? [], slotName));
1053
+ slotContent.set(slotName, content);
1054
+ }
1055
+ return content();
1056
+ };
1057
+ const slots = () => {
1058
+ const slotEntries = props.resolvedElement.slots;
1059
+ if (!slotEntries) return void 0;
1060
+ const slotNames = Object.keys(slotEntries).filter((slotName) => slotName !== "default");
1061
+ if (slotNames.length === 0) return void 0;
1062
+ const result = {};
1063
+ for (const slotName of slotNames) {
1064
+ Object.defineProperty(result, slotName, {
1065
+ enumerable: true,
1066
+ get: () => slotOf(slotName)
1067
+ });
1068
+ }
1069
+ return result;
1070
+ };
978
1071
  const rendered = _$createComponent6(Component, {
979
1072
  get element() {
980
1073
  return props.resolvedElement;
@@ -991,6 +1084,9 @@ function ElementRendererContent(props) {
991
1084
  get loading() {
992
1085
  return props.loading;
993
1086
  },
1087
+ get slots() {
1088
+ return slots();
1089
+ },
994
1090
  get children() {
995
1091
  return children();
996
1092
  }
@@ -1099,18 +1195,7 @@ function Renderer(props) {
1099
1195
  if (!spec || !spec.root) return void 0;
1100
1196
  return spec.elements[spec.root];
1101
1197
  });
1102
- const rendererRegistry = createMemo3(() => {
1103
- if (!props.onRenderError) return props.registry;
1104
- const next = {
1105
- ...props.registry
1106
- };
1107
- Object.defineProperty(next, "onRenderError", {
1108
- value: props.onRenderError,
1109
- enumerable: false,
1110
- configurable: true
1111
- });
1112
- return next;
1113
- });
1198
+ const rendererRegistry = createMemo3(() => props.onRenderError ? withRenderErrorHandler(props.registry, props.onRenderError) : props.registry);
1114
1199
  return _$createComponent6(Show, {
1115
1200
  get when() {
1116
1201
  return rootElement();
@@ -1208,7 +1293,7 @@ function ConfirmationDialogManager() {
1208
1293
  })
1209
1294
  });
1210
1295
  }
1211
- function defineRegistry(_catalog, options) {
1296
+ function defineRegistry(catalog, options) {
1212
1297
  const registry = {};
1213
1298
  if (options.components) {
1214
1299
  for (const [name, componentFn] of Object.entries(options.components)) {
@@ -1220,6 +1305,9 @@ function defineRegistry(_catalog, options) {
1220
1305
  get children() {
1221
1306
  return renderProps.children;
1222
1307
  },
1308
+ get slots() {
1309
+ return renderProps.slots;
1310
+ },
1223
1311
  emit: renderProps.emit,
1224
1312
  on: renderProps.on,
1225
1313
  get bindings() {
@@ -1232,6 +1320,7 @@ function defineRegistry(_catalog, options) {
1232
1320
  };
1233
1321
  }
1234
1322
  }
1323
+ setCatalogSlotMetadata(registry, catalog);
1235
1324
  const actionMap = options.actions ? Object.entries(options.actions) : [];
1236
1325
  const handlers = (getSetState, getState) => {
1237
1326
  const result = {};
@@ -1269,20 +1358,10 @@ function defineRegistry(_catalog, options) {
1269
1358
  }
1270
1359
  function createRenderer(catalog, components) {
1271
1360
  const registry = components;
1361
+ setCatalogSlotMetadata(registry, catalog);
1272
1362
  return function CatalogRenderer(props) {
1273
1363
  const directiveRegistry = createMemo3(() => props.directives ? createDirectiveRegistry(props.directives) : void 0);
1274
- const rendererRegistry = createMemo3(() => {
1275
- if (!props.onRenderError) return registry;
1276
- const next = {
1277
- ...registry
1278
- };
1279
- Object.defineProperty(next, "onRenderError", {
1280
- value: props.onRenderError,
1281
- enumerable: false,
1282
- configurable: true
1283
- });
1284
- return next;
1285
- });
1364
+ const rendererRegistry = createMemo3(() => props.onRenderError ? withRenderErrorHandler(registry, props.onRenderError) : registry);
1286
1365
  const actionHandlers = () => props.onAction ? new Proxy({}, {
1287
1366
  get: (_target, prop) => {
1288
1367
  return (params) => props.onAction(prop, params);