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

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.js CHANGED
@@ -45,10 +45,12 @@ __export(index_exports, {
45
45
  buildEditUserPrompt: () => buildEditUserPrompt,
46
46
  buildUserPrompt: () => buildUserPrompt,
47
47
  builtInValidationFunctions: () => builtInValidationFunctions,
48
+ changedWatchPaths: () => changedWatchPaths,
48
49
  check: () => check,
49
50
  compileSpecStream: () => compileSpecStream,
50
51
  conditionUsesItemScope: () => conditionUsesItemScope,
51
52
  copySlotMetadata: () => copySlotMetadata,
53
+ createComponentRegistry: () => createComponentRegistry,
52
54
  createDirectiveRegistry: () => createDirectiveRegistry,
53
55
  createJsonRenderTransform: () => createJsonRenderTransform,
54
56
  createMixedStreamParser: () => createMixedStreamParser,
@@ -59,6 +61,7 @@ __export(index_exports, {
59
61
  defineDirective: () => defineDirective,
60
62
  defineSchema: () => defineSchema,
61
63
  diffToPatches: () => diffToPatches,
64
+ elementSubtreeJson: () => elementSubtreeJson,
62
65
  evaluateVisibility: () => evaluateVisibility,
63
66
  executeAction: () => executeAction,
64
67
  experimental_composeSpec: () => experimental_composeSpec,
@@ -68,20 +71,29 @@ __export(index_exports, {
68
71
  formatSpecIssues: () => formatSpecIssues,
69
72
  getByPath: () => getByPath,
70
73
  getComponentSlotMetadata: () => getComponentSlotMetadata,
74
+ getOwnEntry: () => getOwnEntry,
75
+ getRegistryComponent: () => getRegistryComponent,
76
+ getRenderErrorHandler: () => getRenderErrorHandler,
71
77
  interpolateString: () => interpolateString,
78
+ isBuiltInAction: () => isBuiltInAction,
72
79
  isDevtoolsActive: () => isDevtoolsActive,
73
80
  isNonEmptySpec: () => isNonEmptySpec,
74
81
  markDevtoolsActive: () => markDevtoolsActive,
82
+ mergeActionHandlers: () => mergeActionHandlers,
75
83
  nestedToFlat: () => nestedToFlat,
76
84
  nextActionDispatchId: () => nextActionDispatchId,
77
85
  notifyActionDispatch: () => notifyActionDispatch,
78
86
  notifyActionSettle: () => notifyActionSettle,
87
+ ownMemberDescriptors: () => ownMemberDescriptors,
79
88
  parseSpecStreamLine: () => parseSpecStreamLine,
80
89
  pipeJsonRender: () => pipeJsonRender,
90
+ readWatchedValues: () => readWatchedValues,
81
91
  registerActionObserver: () => registerActionObserver,
82
92
  removeByPath: () => removeByPath,
93
+ reportActionError: () => reportActionError,
83
94
  resolveAction: () => resolveAction,
84
95
  resolveActionParam: () => resolveActionParam,
96
+ resolveBindingParams: () => resolveBindingParams,
85
97
  resolveBindings: () => resolveBindings,
86
98
  resolveDynamicValue: () => resolveDynamicValue,
87
99
  resolveElementProps: () => resolveElementProps,
@@ -90,13 +102,17 @@ __export(index_exports, {
90
102
  resolveRepeatStatePath: () => resolveRepeatStatePath,
91
103
  runValidation: () => runValidation,
92
104
  runValidationCheck: () => runValidationCheck,
105
+ runWatchBindings: () => runWatchBindings,
93
106
  setByPath: () => setByPath,
94
107
  setCatalogSlotMetadata: () => setCatalogSlotMetadata,
108
+ setRenderErrorHandler: () => setRenderErrorHandler,
95
109
  splitRepeatVisibility: () => splitRepeatVisibility,
96
110
  subscribeDevtoolsActive: () => subscribeDevtoolsActive,
97
111
  validateSpec: () => validateSpec,
98
112
  visibility: () => visibility,
99
- warnElementSlots: () => warnElementSlots
113
+ warnElementSlots: () => warnElementSlots,
114
+ warnUnusedRenderErrorHandler: () => warnUnusedRenderErrorHandler,
115
+ withRenderErrorHandler: () => withRenderErrorHandler
100
116
  });
101
117
  module.exports = __toCommonJS(index_exports);
102
118
 
@@ -1176,6 +1192,14 @@ function resolveActionParam(value, ctx) {
1176
1192
  }
1177
1193
  return resolvePropValue(value, ctx);
1178
1194
  }
1195
+ function resolveBindingParams(binding, ctx) {
1196
+ if (!binding.params) return binding;
1197
+ const params = {};
1198
+ for (const [key, value] of Object.entries(binding.params)) {
1199
+ params[key] = resolveActionParam(value, ctx);
1200
+ }
1201
+ return { ...binding, params };
1202
+ }
1179
1203
 
1180
1204
  // src/action-observer.ts
1181
1205
  var observers = /* @__PURE__ */ new Set();
@@ -1288,6 +1312,43 @@ var ActionBindingSchema = import_zod3.z.object({
1288
1312
  preventDefault: import_zod3.z.boolean().optional()
1289
1313
  });
1290
1314
  var ActionSchema = ActionBindingSchema;
1315
+ function mergeActionHandlers(prop, registered) {
1316
+ const current = typeof prop === "function" ? prop : () => prop;
1317
+ if (typeof prop !== "function" && Object.keys(registered).length === 0) {
1318
+ return prop;
1319
+ }
1320
+ const own = (name) => typeof name === "string" && Object.hasOwn(registered, name);
1321
+ const inherited = (name) => name in Object.prototype && !Object.hasOwn(current(), name);
1322
+ const read = (name) => {
1323
+ if (typeof name !== "string") return void 0;
1324
+ if (own(name)) return registered[name];
1325
+ return inherited(name) ? void 0 : Reflect.get(current(), name);
1326
+ };
1327
+ const has = (name) => typeof name === "string" && (own(name) || !inherited(name) && Reflect.has(current(), name));
1328
+ const names = (map) => Reflect.ownKeys(map).filter((key) => typeof key === "string");
1329
+ return new Proxy({}, {
1330
+ get: (_target, name) => read(name),
1331
+ has: (_target, name) => has(name),
1332
+ ownKeys: () => [.../* @__PURE__ */ new Set([...names(current()), ...names(registered)])],
1333
+ getOwnPropertyDescriptor: (_target, name) => has(name) ? {
1334
+ value: read(name),
1335
+ enumerable: true,
1336
+ configurable: true,
1337
+ writable: false
1338
+ } : void 0
1339
+ });
1340
+ }
1341
+ var BUILT_IN_ACTIONS = /* @__PURE__ */ new Set([
1342
+ "setState",
1343
+ "pushState",
1344
+ "removeState",
1345
+ "push",
1346
+ "pop",
1347
+ "validateForm"
1348
+ ]);
1349
+ function isBuiltInAction(name) {
1350
+ return BUILT_IN_ACTIONS.has(name);
1351
+ }
1291
1352
  function resolveAction(binding, stateModel) {
1292
1353
  const resolvedParams = {};
1293
1354
  if (binding.params) {
@@ -1318,16 +1379,21 @@ function interpolateString(template, stateModel) {
1318
1379
  });
1319
1380
  }
1320
1381
  async function executeAction(ctx) {
1321
- const { action: action2, handler, setState, navigate, executeAction: executeAction2 } = ctx;
1382
+ const { action: action2, handler, setState, updateState, navigate, executeAction: executeAction2 } = ctx;
1383
+ const writeAll = (updates) => {
1384
+ if (updateState) {
1385
+ updateState(updates);
1386
+ return;
1387
+ }
1388
+ for (const [path, value] of Object.entries(updates)) setState(path, value);
1389
+ };
1322
1390
  try {
1323
1391
  await handler(action2.params);
1324
1392
  if (action2.onSuccess) {
1325
1393
  if ("navigate" in action2.onSuccess && navigate) {
1326
1394
  navigate(action2.onSuccess.navigate);
1327
1395
  } else if ("set" in action2.onSuccess) {
1328
- for (const [path, value] of Object.entries(action2.onSuccess.set)) {
1329
- setState(path, value);
1330
- }
1396
+ writeAll(action2.onSuccess.set);
1331
1397
  } else if ("action" in action2.onSuccess && executeAction2) {
1332
1398
  await executeAction2(action2.onSuccess);
1333
1399
  }
@@ -1335,10 +1401,11 @@ async function executeAction(ctx) {
1335
1401
  } catch (error) {
1336
1402
  if (action2.onError) {
1337
1403
  if ("set" in action2.onError) {
1404
+ const updates = {};
1338
1405
  for (const [path, value] of Object.entries(action2.onError.set)) {
1339
- const resolvedValue = typeof value === "string" && value === "$error.message" ? error.message : value;
1340
- setState(path, resolvedValue);
1406
+ updates[path] = typeof value === "string" && value === "$error.message" ? error.message : value;
1341
1407
  }
1408
+ writeAll(updates);
1342
1409
  } else if ("action" in action2.onError && executeAction2) {
1343
1410
  await executeAction2(action2.onError);
1344
1411
  }
@@ -3229,6 +3296,181 @@ function warnElementSlots(registry, type, slots) {
3229
3296
  }
3230
3297
  }
3231
3298
  }
3299
+ function withRenderErrorHandler(registry, onRenderError) {
3300
+ const members = ownMemberDescriptors(registry);
3301
+ if ("onRenderError" in members) {
3302
+ warnReplacedComponent(registry);
3303
+ delete members["onRenderError"];
3304
+ }
3305
+ const next = Object.create(registry, members);
3306
+ defineRenderErrorHandler(next, onRenderError);
3307
+ copySources.set(next, copySources.get(registry) ?? registry);
3308
+ copySlotMetadata(registry, next);
3309
+ return next;
3310
+ }
3311
+ function setRenderErrorHandler(registry, onRenderError) {
3312
+ if (findDescriptor(registry, "onRenderError")?.enumerable === true) {
3313
+ warnReplacedComponent(registry);
3314
+ }
3315
+ defineRenderErrorHandler(registry, onRenderError);
3316
+ }
3317
+ var copySources = /* @__PURE__ */ new WeakMap();
3318
+ function defineRenderErrorHandler(registry, onRenderError) {
3319
+ const defined = Reflect.defineProperty(registry, "onRenderError", {
3320
+ value: onRenderError,
3321
+ enumerable: false,
3322
+ configurable: true
3323
+ });
3324
+ if (!defined) {
3325
+ console.warn(
3326
+ "[json-render] The registry takes no onRenderError handler, for example because it is frozen. Use withRenderErrorHandler, which gives a copy."
3327
+ );
3328
+ }
3329
+ }
3330
+ var warnedReplaced = /* @__PURE__ */ new WeakSet();
3331
+ var warnedUnused = /* @__PURE__ */ new WeakSet();
3332
+ function warnReplacedComponent(registry) {
3333
+ if (warnedReplaced.has(registry)) return;
3334
+ warnedReplaced.add(registry);
3335
+ console.warn(
3336
+ '[json-render] The registry has a component named "onRenderError". The onRenderError handler takes its place, and an element of that type renders the fallback.'
3337
+ );
3338
+ }
3339
+ function findDescriptor(target, key) {
3340
+ let current = target;
3341
+ while (current !== null && current !== Object.prototype) {
3342
+ const descriptor = Object.getOwnPropertyDescriptor(current, key);
3343
+ if (descriptor !== void 0) return descriptor;
3344
+ current = Object.getPrototypeOf(current);
3345
+ }
3346
+ return void 0;
3347
+ }
3348
+ function warnUnusedRenderErrorHandler(registry) {
3349
+ if (registry === void 0 || warnedUnused.has(registry)) return;
3350
+ const descriptor = findDescriptor(registry, "onRenderError");
3351
+ if (descriptor?.enumerable !== true) return;
3352
+ warnedUnused.add(registry);
3353
+ console.warn(
3354
+ '[json-render] The registry has an enumerable "onRenderError". It counts as a component of that name, and not as the error handler. Give the handler with defineRegistry(catalog, { onRenderError }) or with the onRenderError prop of the renderer.'
3355
+ );
3356
+ }
3357
+ function getRenderErrorHandler(registry) {
3358
+ if (registry === void 0) return void 0;
3359
+ const descriptor = findDescriptor(registry, "onRenderError");
3360
+ if (descriptor === void 0 || descriptor.enumerable) return void 0;
3361
+ const handler = "value" in descriptor ? descriptor.value : registry.onRenderError;
3362
+ return typeof handler === "function" ? handler : void 0;
3363
+ }
3364
+ function getOwnEntry(map, key) {
3365
+ if (key in Object.prototype && !Object.prototype.hasOwnProperty.call(map, key)) {
3366
+ return void 0;
3367
+ }
3368
+ return map[key];
3369
+ }
3370
+ function ownMemberDescriptors(source) {
3371
+ const members = /* @__PURE__ */ Object.create(null);
3372
+ for (const key of Reflect.ownKeys(source)) {
3373
+ const descriptor = Reflect.getOwnPropertyDescriptor(source, key);
3374
+ if (descriptor?.enumerable !== true) continue;
3375
+ members[key] = "get" in descriptor || "set" in descriptor ? {
3376
+ get: () => Reflect.get(source, key),
3377
+ enumerable: true,
3378
+ configurable: true
3379
+ } : {
3380
+ value: Reflect.get(source, key),
3381
+ enumerable: true,
3382
+ writable: true,
3383
+ configurable: true
3384
+ };
3385
+ }
3386
+ return members;
3387
+ }
3388
+ function createComponentRegistry(components) {
3389
+ const registry = {};
3390
+ if (components !== void 0 && Object.prototype.hasOwnProperty.call(components, "__proto__")) {
3391
+ Object.defineProperty(registry, "__proto__", {
3392
+ value: void 0,
3393
+ enumerable: true,
3394
+ writable: true,
3395
+ configurable: true
3396
+ });
3397
+ }
3398
+ return registry;
3399
+ }
3400
+ function getRegistryComponent(registry, type) {
3401
+ if (type === "onRenderError" && findDescriptor(registry, type)?.enumerable === false) {
3402
+ return void 0;
3403
+ }
3404
+ const source = Object.prototype.hasOwnProperty.call(registry, type) ? registry : copySources.get(registry) ?? registry;
3405
+ const component = getOwnEntry(source, type);
3406
+ if (component === void 0 || component === null) return void 0;
3407
+ return component;
3408
+ }
3409
+ function reportActionError(onRenderError, error, action2, source) {
3410
+ if (onRenderError) {
3411
+ onRenderError(error, action2);
3412
+ return;
3413
+ }
3414
+ console.error(
3415
+ source === "watch" ? "[json-render] Unhandled action error in watch handler:" : "[json-render] Unhandled action error in handler:",
3416
+ action2,
3417
+ error
3418
+ );
3419
+ }
3420
+
3421
+ // src/subtree.ts
3422
+ function elementSubtreeJson(spec, key, element) {
3423
+ const seen = /* @__PURE__ */ new Set();
3424
+ const parts = [];
3425
+ const visit = (elementKey, current) => {
3426
+ if (elementKey !== void 0) {
3427
+ if (seen.has(elementKey)) return;
3428
+ seen.add(elementKey);
3429
+ }
3430
+ parts.push([elementKey ?? null, current ?? null]);
3431
+ if (!current) return;
3432
+ const lists = [current.children, ...Object.values(current.slots ?? {})];
3433
+ for (const list of lists) {
3434
+ if (!Array.isArray(list)) continue;
3435
+ for (const child of list) visit(child, spec?.elements[child]);
3436
+ }
3437
+ };
3438
+ visit(key, element);
3439
+ return JSON.stringify(parts);
3440
+ }
3441
+
3442
+ // src/watch.ts
3443
+ function readWatchedValues(watch, state, previous) {
3444
+ if (!watch) return void 0;
3445
+ const paths = Object.keys(watch);
3446
+ const values = {};
3447
+ for (const path of paths) {
3448
+ values[path] = getByPath(state, path);
3449
+ }
3450
+ const before = previous === void 0 ? [] : Object.keys(previous);
3451
+ if (previous !== void 0 && before.length === paths.length && paths.every(
3452
+ (path, index) => before[index] === path && Object.is(previous[path], values[path])
3453
+ )) {
3454
+ return previous;
3455
+ }
3456
+ return values;
3457
+ }
3458
+ function changedWatchPaths(current, previous) {
3459
+ if (current === void 0 || previous === void 0) return [];
3460
+ return Object.keys(current).filter(
3461
+ (path) => path in previous && !Object.is(current[path], previous[path])
3462
+ );
3463
+ }
3464
+ async function runWatchBindings(watch, paths, run, isCancelled) {
3465
+ for (const path of paths) {
3466
+ const raw = watch[path];
3467
+ if (!raw) continue;
3468
+ for (const binding of Array.isArray(raw) ? raw : [raw]) {
3469
+ if (isCancelled()) return;
3470
+ await run(binding);
3471
+ }
3472
+ }
3473
+ }
3232
3474
 
3233
3475
  // src/merge.ts
3234
3476
  function isPlainObject(value) {
@@ -4181,10 +4423,12 @@ function experimental_createEvaluator(options) {
4181
4423
  buildEditUserPrompt,
4182
4424
  buildUserPrompt,
4183
4425
  builtInValidationFunctions,
4426
+ changedWatchPaths,
4184
4427
  check,
4185
4428
  compileSpecStream,
4186
4429
  conditionUsesItemScope,
4187
4430
  copySlotMetadata,
4431
+ createComponentRegistry,
4188
4432
  createDirectiveRegistry,
4189
4433
  createJsonRenderTransform,
4190
4434
  createMixedStreamParser,
@@ -4195,6 +4439,7 @@ function experimental_createEvaluator(options) {
4195
4439
  defineDirective,
4196
4440
  defineSchema,
4197
4441
  diffToPatches,
4442
+ elementSubtreeJson,
4198
4443
  evaluateVisibility,
4199
4444
  executeAction,
4200
4445
  experimental_composeSpec,
@@ -4204,20 +4449,29 @@ function experimental_createEvaluator(options) {
4204
4449
  formatSpecIssues,
4205
4450
  getByPath,
4206
4451
  getComponentSlotMetadata,
4452
+ getOwnEntry,
4453
+ getRegistryComponent,
4454
+ getRenderErrorHandler,
4207
4455
  interpolateString,
4456
+ isBuiltInAction,
4208
4457
  isDevtoolsActive,
4209
4458
  isNonEmptySpec,
4210
4459
  markDevtoolsActive,
4460
+ mergeActionHandlers,
4211
4461
  nestedToFlat,
4212
4462
  nextActionDispatchId,
4213
4463
  notifyActionDispatch,
4214
4464
  notifyActionSettle,
4465
+ ownMemberDescriptors,
4215
4466
  parseSpecStreamLine,
4216
4467
  pipeJsonRender,
4468
+ readWatchedValues,
4217
4469
  registerActionObserver,
4218
4470
  removeByPath,
4471
+ reportActionError,
4219
4472
  resolveAction,
4220
4473
  resolveActionParam,
4474
+ resolveBindingParams,
4221
4475
  resolveBindings,
4222
4476
  resolveDynamicValue,
4223
4477
  resolveElementProps,
@@ -4226,12 +4480,16 @@ function experimental_createEvaluator(options) {
4226
4480
  resolveRepeatStatePath,
4227
4481
  runValidation,
4228
4482
  runValidationCheck,
4483
+ runWatchBindings,
4229
4484
  setByPath,
4230
4485
  setCatalogSlotMetadata,
4486
+ setRenderErrorHandler,
4231
4487
  splitRepeatVisibility,
4232
4488
  subscribeDevtoolsActive,
4233
4489
  validateSpec,
4234
4490
  visibility,
4235
- warnElementSlots
4491
+ warnElementSlots,
4492
+ warnUnusedRenderErrorHandler,
4493
+ withRenderErrorHandler
4236
4494
  });
4237
4495
  //# sourceMappingURL=index.js.map