@buoy-gg/zustand 7.0.33 → 7.0.34

package/lib/commonjs/zustand/components/ZustandStateChangeItem.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ZustandStateChangeItem = void 0;
 var _react = require("react");
-var _reactNative = require("react-native");
 var _sharedUi = require("@buoy-gg/shared-ui");
 var _zustandStateStore = require("../utils/zustandStateStore");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -103,68 +102,16 @@ const ZustandStateChangeItem = exports.ZustandStateChangeItem = /*#__PURE__*/(0,
   const sublabel = getSublabel(change);
   const primaryText = getPrimaryText(change);
   const badgeText = getBadgeText(change);
-
-  // Always a custom badge, even when there is no icon to hang off it. The
-  // alternative — letting CompactRow draw `badgeText` itself — leaves the one
-  // row whose badge matters most (a set that changed NOTHING) as the only row
-  // in the list with no handle on its badge.
-  const customBadge = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
-    style: styles.badgeContainer,
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
-      style: [styles.badgeText, {
-        color: statusColor
-      }],
-      testID: testID ? `${testID}-badge` : undefined,
-      children: badgeText
-    }), change.isSlowUpdate ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
-      style: styles.slowBadge,
-      testID: testID ? `${testID}-slow` : undefined,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_sharedUi.Clock, {
-        size: 12,
-        color: _sharedUi.buoyColors.error
-      })
-    }) : change.hasStateChange ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
-      style: styles.changeBadge,
-      testID: testID ? `${testID}-change` : undefined,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_sharedUi.Zap, {
-        size: 12,
-        color: _sharedUi.buoyColors.warning
-      })
-    }) : null]
-  });
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_sharedUi.CompactRow, {
-    statusDotColor: statusColor,
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_sharedUi.ChangeRow, {
+    statusColor: statusColor,
     statusLabel: statusLabel,
-    statusSublabel: sublabel,
+    sublabel: sublabel,
     primaryText: primaryText,
-    bottomRightText: /*#__PURE__*/(0, _jsxRuntime.jsx)(_sharedUi.RelativeTime, {
-      timestamp: change.timestamp
-    }),
-    customBadge: customBadge,
-    badgeColor: statusColor,
-    showChevron: true,
+    timestamp: change.timestamp,
+    badgeText: badgeText,
+    changed: change.hasStateChange,
+    slow: change.isSlowUpdate,
     onPress: () => onPress(change),
-    testID: testID,
-    statusTestID: testID ? `${testID}-status` : undefined,
-    statusSublabelTestID: testID ? `${testID}-sublabel` : undefined,
-    primaryTestID: testID ? `${testID}-keys` : undefined
+    testID: testID
   });
-});
-const styles = _reactNative.StyleSheet.create({
-  badgeContainer: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: 4
-  },
-  badgeText: {
-    fontSize: 11,
-    fontWeight: "600",
-    fontFamily: "monospace"
-  },
-  changeBadge: {
-    paddingHorizontal: 4
-  },
-  slowBadge: {
-    paddingHorizontal: 4
-  }
 });

package/lib/commonjs/zustand/components/ZustandStateInfoView.js

@@ -79,29 +79,6 @@ function SectionHeader({
     }), badge]
   });
 }
-function InfoRow({
-  label,
-  value,
-  valueColor,
-  mono = false,
-  testID
-}) {
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
-    style: styles.infoRow,
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
-      style: styles.infoLabel,
-      children: label
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
-      testID: testID,
-      style: [styles.infoValue, mono && styles.infoValueMono, valueColor ? {
-        color: valueColor
-      } : undefined],
-      numberOfLines: 1,
-      ellipsizeMode: "middle",
-      children: value
-    })]
-  });
-}
 function formatTime(timestamp) {
   const date = new Date(timestamp);
   const hours = date.getHours().toString().padStart(2, "0");
@@ -157,13 +134,13 @@ const ZustandStateInfoView = exports.ZustandStateInfoView = /*#__PURE__*/(0, _re
         title: "CHANGE INFO"
       }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
         style: styles.cardContent,
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(InfoRow, {
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_sharedUi.InfoRow, {
           label: "Store",
           value: change.storeName,
           mono: true,
           valueColor: storeColor,
           testID: `${_testIDs.ZUSTAND_TEST_ID}-info-store`
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(InfoRow, {
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_sharedUi.InfoRow, {
           label: "Time",
           value: formatTime(change.timestamp),
           mono: true,
@@ -366,27 +343,6 @@ const styles = _reactNative.StyleSheet.create({
     padding: 14,
     gap: 10
   },
-  infoRow: {
-    flexDirection: "row",
-    alignItems: "center",
-    justifyContent: "space-between"
-  },
-  infoLabel: {
-    fontSize: 11,
-    color: _sharedUi.night.color.textTertiary,
-    fontWeight: "500"
-  },
-  infoValue: {
-    fontSize: 11,
-    color: _sharedUi.night.color.text,
-    fontWeight: "500",
-    flex: 1,
-    textAlign: "right",
-    marginLeft: 12
-  },
-  infoValueMono: {
-    fontFamily: "monospace"
-  },
   badgeRow: {
     flexDirection: "row",
     flexWrap: "wrap",

package/lib/commonjs/zustand/hooks/useZustandStateChanges.js

@@ -5,53 +5,41 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useZustandStateChanges = useZustandStateChanges;
 var _react = require("react");
+var _sharedUi = require("@buoy-gg/shared-ui");
 var _zustandStateStore = require("../utils/zustandStateStore");
 /**
  * Hook for consuming Zustand state changes from the store
  *
- * Mirrors useReduxActions.ts from @buoy-gg/redux
+ * The subscribe / filter / pause / clear plumbing is shared `useChangeLog`;
+ * this file owns the zustand-specific filter, stats and store registry.
  */
 
+function filterChanges(changes, filter) {
+  let filtered = changes;
+  if (filter.searchText) {
+    const search = filter.searchText.toLowerCase();
+    filtered = filtered.filter(c => c.storeName.toLowerCase().includes(search) || c.partialPreview.toLowerCase().includes(search) || c.changedKeys.some(k => k.toLowerCase().includes(search)));
+  }
+  if (filter.storeNames && filter.storeNames.length > 0) {
+    filtered = filtered.filter(c => filter.storeNames.includes(c.storeName));
+  }
+  if (filter.onlyWithChanges) {
+    filtered = filtered.filter(c => c.hasStateChange);
+  }
+  return filtered;
+}
+const readStores = () => _zustandStateStore.zustandStateStore.getStores();
+const subscribeToStores = listener => _zustandStateStore.zustandStateStore.subscribeToStores(listener);
 function useZustandStateChanges() {
-  const [stateChanges, setStateChanges] = (0, _react.useState)(() => _zustandStateStore.zustandStateStore.getStateChanges());
-  const [stores, setStores] = (0, _react.useState)(() => _zustandStateStore.zustandStateStore.getStores());
-  const [filter, setFilter] = (0, _react.useState)({});
-  const [isEnabled, setIsEnabled] = (0, _react.useState)(() => _zustandStateStore.zustandStateStore.getEnabled());
-
-  // Subscribe to state changes
-  (0, _react.useEffect)(() => {
-    const unsubChanges = _zustandStateStore.zustandStateStore.subscribe(newChanges => {
-      setStateChanges(newChanges);
-    });
-    const unsubStores = _zustandStateStore.zustandStateStore.subscribeToStores(newStores => {
-      setStores(newStores);
-    });
-    return () => {
-      unsubChanges();
-      unsubStores();
-    };
-  }, []);
-
-  // Filter state changes — derive directly from state to avoid stale reads
-  const filteredChanges = (0, _react.useMemo)(() => {
-    let filtered = stateChanges;
-    if (filter.searchText) {
-      const search = filter.searchText.toLowerCase();
-      filtered = filtered.filter(c => c.storeName.toLowerCase().includes(search) || c.partialPreview.toLowerCase().includes(search) || c.changedKeys.some(k => k.toLowerCase().includes(search)));
-    }
-    if (filter.storeNames && filter.storeNames.length > 0) {
-      filtered = filtered.filter(c => filter.storeNames.includes(c.storeName));
-    }
-    if (filter.onlyWithChanges) {
-      filtered = filtered.filter(c => c.hasStateChange);
-    }
-    return filtered;
-  }, [stateChanges, filter]);
+  const log = (0, _sharedUi.useChangeLog)(_zustandStateStore.zustandStateStore, {
+    filterItems: filterChanges
+  });
+  const stores = (0, _sharedUi.useSubscribedValue)(readStores, subscribeToStores);
 
   // Get stats — derive directly from state
   const stats = (0, _react.useMemo)(() => {
-    const total = stateChanges.length;
-    const withChanges = stateChanges.filter(c => c.hasStateChange).length;
+    const total = log.items.length;
+    const withChanges = log.items.filter(c => c.hasStateChange).length;
     return {
       totalChanges: total,
       changesWithStateChange: withChanges,
@@ -59,33 +47,25 @@ function useZustandStateChanges() {
       storeCount: stores.length,
       averageDuration: 0
     };
-  }, [stateChanges, stores]);
+  }, [log.items, stores]);
 
   // Get unique store names
   const storeNames = (0, _react.useMemo)(() => {
     return _zustandStateStore.zustandStateStore.getUniqueStoreNames();
   }, [stores]);
-  const clearChanges = (0, _react.useCallback)(() => {
-    _zustandStateStore.zustandStateStore.clearStateChanges();
-  }, []);
-  const toggleCapture = (0, _react.useCallback)(() => {
-    const newEnabled = !isEnabled;
-    _zustandStateStore.zustandStateStore.setEnabled(newEnabled);
-    setIsEnabled(newEnabled);
-  }, [isEnabled]);
   const getChangeById = (0, _react.useCallback)(id => {
     return _zustandStateStore.zustandStateStore.getStateChangeById(id);
   }, []);
   return {
-    stateChanges,
-    filteredChanges,
-    filter,
-    setFilter,
+    stateChanges: log.items,
+    filteredChanges: log.filteredItems,
+    filter: log.filter,
+    setFilter: log.setFilter,
     stats,
     stores,
-    clearChanges,
-    isEnabled,
-    toggleCapture,
+    clearChanges: log.clear,
+    isEnabled: log.isEnabled,
+    toggleCapture: log.toggleCapture,
     storeNames,
     getChangeById
   };

package/lib/commonjs/zustand/sync/zustandSyncAdapter.js

@@ -11,18 +11,10 @@ var _sharedUi = require("@buoy-gg/shared-ui");
  * Same hazard as redux: up to 200 changes × 2 full trees on every snapshot
  * freeze/OOM-killed large apps. Dashboards fetch trees via `getChangeDetail`.
  */
-const STATE_ON_DEVICE = exports.STATE_ON_DEVICE = Object.freeze({
-  __buoyStateOnDevice: true,
-  note: "State trees stay on the device — fetched on demand via getChangeDetail / getStoreState."
-});
+const STATE_ON_DEVICE = exports.STATE_ON_DEVICE = (0, _sharedUi.onDeviceMarker)("State", "State trees stay on the device — fetched on demand via getChangeDetail / getStoreState.");
 
 /** Wire-form sentinel for an oversized `partial` (replace can carry a whole tree). */
-const PAYLOAD_ON_DEVICE = exports.PAYLOAD_ON_DEVICE = Object.freeze({
-  __buoyPayloadOnDevice: true,
-  note: "Partial stays on the device — fetched on demand via getChangeDetail."
-});
-const MAX_CHANGE_DETAIL_BYTES = 8 * 1024 * 1024;
-const MAX_WIRE_PAYLOAD_BYTES = 16 * 1024;
+const PAYLOAD_ON_DEVICE = exports.PAYLOAD_ON_DEVICE = (0, _sharedUi.onDeviceMarker)("Payload", "Partial stays on the device — fetched on demand via getChangeDetail.");
 /** Top-level keys of an object state, for the compact (no-values) view. */
 function topLevelKeys(state) {
   return state && typeof state === "object" && !Array.isArray(state) ? Object.keys(state) : undefined;
@@ -33,31 +25,17 @@ function topLevelKeys(state) {
  * change, so keying on identity is correct and self-invalidating — without it
  * every `partial` in the list is re-measured on all ~5 snapshots per second.
  */
-const changeCache = new WeakMap();
-function toWireChange(change) {
-  const cached = changeCache.get(change);
-  if (cached) return cached;
-  const wire = {
-    ...change,
-    prevState: STATE_ON_DEVICE,
-    nextState: STATE_ON_DEVICE,
-    partial: toWirePartial(change.partial)
-  };
-  changeCache.set(change, wire);
-  return wire;
-}
-function toWirePartial(value) {
-  if (value === undefined) return value;
-  return (0, _sharedUi.isOverWireBudget)(value, MAX_WIRE_PAYLOAD_BYTES) ? PAYLOAD_ON_DEVICE : value;
-}
-function toWireState(value) {
-  return (0, _sharedUi.isOverWireBudget)(value, MAX_WIRE_PAYLOAD_BYTES) ? STATE_ON_DEVICE : value;
-}
+const toWireChange = (0, _sharedUi.memoByIdentity)(change => ({
+  ...change,
+  prevState: STATE_ON_DEVICE,
+  nextState: STATE_ON_DEVICE,
+  partial: (0, _sharedUi.toWire)(change.partial, PAYLOAD_ON_DEVICE)
+}));
+const toWireState = value => (0, _sharedUi.toWire)(value, STATE_ON_DEVICE);
 
 /**
  * Sync adapter for the zustand tool, consumed by @buoy-gg/external-sync's
- * `useExternalSync` (structurally matches its ToolSyncAdapter interface so
- * this package doesn't need a dependency on it).
+ * `useExternalSync`.
  *
  * State changes are captured by the middleware (watchStores/buoyDevTools),
  * independent of whether a dashboard is watching — subscribing here only
@@ -72,7 +50,7 @@ function toWireState(value) {
  *
  * The `setState` action powers remote time-travel/reset from the dashboard.
  */
-const zustandSyncAdapter = exports.zustandSyncAdapter = {
+const zustandSyncAdapter = exports.zustandSyncAdapter = (0, _sharedUi.createSyncAdapter)({
   version: 2,
   getSnapshot: () => ({
     changes: _zustandStateStore.zustandStateStore.getStateChanges().map(toWireChange),
@@ -81,14 +59,7 @@ const zustandSyncAdapter = exports.zustandSyncAdapter = {
       currentState: toWireState(store.currentState)
     }))
   }),
-  subscribe: onChange => {
-    const unsubscribeChanges = _zustandStateStore.zustandStateStore.subscribe(onChange);
-    const unsubscribeStores = _zustandStateStore.zustandStateStore.subscribeToStores(onChange);
-    return () => {
-      unsubscribeChanges();
-      unsubscribeStores();
-    };
-  },
+  subscribe: [onChange => _zustandStateStore.zustandStateStore.subscribe(onChange), onChange => _zustandStateStore.zustandStateStore.subscribeToStores(onChange)],
   actions: {
     clearEvents: () => {
       _zustandStateStore.zustandStateStore.clearStateChanges();
@@ -98,32 +69,11 @@ const zustandSyncAdapter = exports.zustandSyncAdapter = {
      * The per-snapshot stream stays tree-free; this is the explicit,
      * size-guarded channel for the detail pane.
      */
-    getChangeDetail: params => {
-      const {
-        id
-      } = params ?? {};
-      if (!id) return {
-        found: false,
-        reason: "missing id"
-      };
-      const change = _zustandStateStore.zustandStateStore.getStateChangeById(id);
-      if (!change) return {
-        found: false,
-        reason: "unknown id"
-      };
-      const cappedNote = {
-        __buoyTruncated: true,
-        note: `Exceeds the ${MAX_CHANGE_DETAIL_BYTES / (1024 * 1024)}MB detail limit — inspect it on-device.`
-      };
-      const cap = value => (0, _sharedUi.isOverWireBudget)(value, MAX_CHANGE_DETAIL_BYTES) ? cappedNote : value;
-      return {
-        found: true,
-        id,
-        prevState: cap(change.prevState),
-        nextState: cap(change.nextState),
-        partial: cap(change.partial)
-      };
-    },
+    getChangeDetail: (0, _sharedUi.detailByIdAction)(id => _zustandStateStore.zustandStateStore.getStateChangeById(id), (change, cap) => ({
+      prevState: cap(change.prevState),
+      nextState: cap(change.nextState),
+      partial: cap(change.partial)
+    })),
     /**
      * On-demand current state for one store. Wire-form snapshots replace
      * oversized / unserializable `currentState` with STATE_ON_DEVICE.
@@ -131,7 +81,7 @@ const zustandSyncAdapter = exports.zustandSyncAdapter = {
     getStoreState: params => {
       const {
         storeName
-      } = params ?? {};
+      } = (0, _sharedUi.readParams)(params);
       if (!storeName) return {
         found: false,
         reason: "missing storeName"
@@ -147,11 +97,7 @@ const zustandSyncAdapter = exports.zustandSyncAdapter = {
       } catch {
         currentState = undefined;
       }
-      const cappedNote = {
-        __buoyTruncated: true,
-        note: `Exceeds the ${MAX_CHANGE_DETAIL_BYTES / (1024 * 1024)}MB detail limit — inspect it on-device.`
-      };
-      if (!(0, _sharedUi.isOverWireBudget)(currentState, MAX_CHANGE_DETAIL_BYTES)) {
+      if (!(0, _sharedUi.isOverWireBudget)(currentState, _sharedUi.WIRE_DETAIL_LIMIT_BYTES)) {
         return {
           found: true,
           storeName,
@@ -161,7 +107,7 @@ const zustandSyncAdapter = exports.zustandSyncAdapter = {
       return {
         found: true,
         storeName,
-        currentState: (0, _sharedUi.isJsonSerializable)(currentState) ? cappedNote : STATE_ON_DEVICE
+        currentState: (0, _sharedUi.isJsonSerializable)(currentState) ? (0, _sharedUi.truncatedNote)(_sharedUi.WIRE_DETAIL_LIMIT_BYTES) : STATE_ON_DEVICE
       };
     },
     /**
@@ -174,7 +120,7 @@ const zustandSyncAdapter = exports.zustandSyncAdapter = {
       const {
         includeValues = false,
         limit
-      } = params ?? {};
+      } = (0, _sharedUi.readParams)(params);
       const all = _zustandStateStore.zustandStateStore.getStoreSnapshots();
       const capped = typeof limit === "number" && limit > 0 ? all.slice(0, limit) : all;
       const stores = capped.map(s => ({
@@ -201,7 +147,7 @@ const zustandSyncAdapter = exports.zustandSyncAdapter = {
         storeName,
         state,
         replace
-      } = params ?? {};
+      } = (0, _sharedUi.readParams)(params);
       if (!storeName) return {
         ok: false,
         error: "Missing storeName."
@@ -240,7 +186,7 @@ const zustandSyncAdapter = exports.zustandSyncAdapter = {
     rehydrate: async params => {
       const {
         storeName
-      } = params ?? {};
+      } = (0, _sharedUi.readParams)(params);
       if (!storeName) return {
         ok: false,
         error: "Missing storeName."
@@ -270,4 +216,4 @@ const zustandSyncAdapter = exports.zustandSyncAdapter = {
       };
     }
   }
-};
+});

package/lib/commonjs/zustand/utils/snapshotProvider.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _sharedUi = require("@buoy-gg/shared-ui");
-var _dataViewer = require("@buoy-gg/shared-ui/dataViewer");
 var _zustandStateStore = require("./zustandStateStore");
 var _editableState = require("./editableState");
 /**
@@ -93,29 +92,13 @@ async function capture() {
 }
 async function restore(data, options) {
   const snapshot = data;
-  const excludedSet = new Set(options?.excludeKeys ?? []);
-  const includedSet = options?.includeKeys ? new Set(options.includeKeys) : null;
-  const touch = key => !excludedSet.has(key) && (!includedSet || includedSet.has(key));
-  let excludedHits = 0;
-  const result = {
-    ok: true,
-    applied: 0,
-    skipped: [],
-    warnings: []
-  };
+  const scope = (0, _sharedUi.createRestoreScope)(options);
+  const result = (0, _sharedUi.emptyRestoreResult)();
   if (!snapshot?.stores) {
-    return {
-      ok: false,
-      applied: 0,
-      skipped: [],
-      warnings: ["empty zustand snapshot"]
-    };
+    return (0, _sharedUi.failedRestore)("empty zustand snapshot");
   }
   for (const [name, envelope] of Object.entries(snapshot.stores)) {
-    if (!touch(name)) {
-      excludedHits += 1;
-      continue;
-    }
+    if (!scope.allows(name)) continue;
     const info = _zustandStateStore.zustandStateStore.getStore(name);
     if (!info) {
       result.skipped.push({
@@ -142,12 +125,10 @@ async function restore(data, options) {
       result.ok = false;
     }
   }
-  if (excludedHits > 0) {
-    result.warnings.push(`${excludedHits} store(s) excluded by you`);
-  }
+  const excludedWarning = scope.excludedWarning("store(s)");
+  if (excludedWarning) result.warnings.push(excludedWarning);
   return result;
 }
-const ITEM_RENDER_BYTE_LIMIT = 256 * 1024;
 
 /**
  * Per-store restore preview. Both sides are function-stripped through the
@@ -176,8 +157,7 @@ async function previewItems(target, base) {
   const items = [];
   const notes = [];
   let preservedFns = 0;
-  const names = new Set([...Object.keys(baseStores), ...Object.keys(targetStores)]);
-  for (const name of names) {
+  for (const name of (0, _sharedUi.unionKeys)(baseStores, targetStores)) {
     const inTarget = name in targetStores;
     const inBase = name in baseStores;
     if (!inTarget) {
@@ -200,39 +180,16 @@ async function previewItems(target, base) {
       });
       continue;
     }
-    if (!inBase) {
-      items.push({
-        key: name,
-        label: name,
-        verdict: "added",
-        newValue: targetStores[name].state
-      });
-      continue;
-    }
-    const oldState = baseStores[name].state;
-    const newState = targetStores[name].state;
-    if ((0, _dataViewer.boundedDeepEqual)(oldState, newState)) {
-      items.push({
-        key: name,
-        label: name,
-        verdict: "unchanged"
-      });
-    } else if ((0, _dataViewer.jsonLikelyLargerThan)(oldState, ITEM_RENDER_BYTE_LIMIT) || (0, _dataViewer.jsonLikelyLargerThan)(newState, ITEM_RENDER_BYTE_LIMIT)) {
-      items.push({
-        key: name,
-        label: name,
-        verdict: "too-large",
-        reason: "store too large to render a diff — restore still applies it"
-      });
-    } else {
-      items.push({
-        key: name,
-        label: name,
-        verdict: "changed",
-        oldValue: oldState,
-        newValue: newState
-      });
-    }
+    items.push((0, _sharedUi.classifyPreviewItem)({
+      key: name,
+      label: name,
+      oldValue: baseStores[name]?.state,
+      newValue: targetStores[name].state,
+      inOld: inBase,
+      inNew: true
+    }, {
+      tooLargeReason: "store too large to render a diff — restore still applies it"
+    }));
   }
   if (preservedFns > 0) {
     notes.push(`${preservedFns} store action function${preservedFns === 1 ? "" : "s"} preserved on restore (not diffed)`);