@legendapp/state 3.0.0-alpha.3 → 3.0.0-alpha.30

package/react.js

@@ -111,15 +111,6 @@ function useSelector(selector, options) {
     const { subscribe, getVersion, run } = selectorFn;
     value = run(selector);
     index_js.useSyncExternalStore(subscribe, getVersion, getVersion);
-    if (options == null ? void 0 : options.suspense) {
-      if (state.isPromise(value) || !value && state.isObservable(selector) && state.syncState(selector).isLoaded.get() === false) {
-        if (React__default.default.use) {
-          React__default.default.use(value);
-        } else {
-          throw value;
-        }
-      }
-    }
   } catch (err) {
     if ((process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test") && ((_a = err == null ? void 0 : err.message) == null ? void 0 : _a.includes("Rendered more"))) {
       console.warn(
@@ -128,6 +119,17 @@ function useSelector(selector, options) {
     }
     throw err;
   }
+  if (options == null ? void 0 : options.suspense) {
+    const isProm = state.isPromise(value);
+    if (state.isPromise(value) || !value && state.isObservable(selector)) {
+      const vProm = isProm ? value : state.when(selector);
+      if (React__default.default.use) {
+        React__default.default.use(vProm);
+      } else {
+        throw vProm;
+      }
+    }
+  }
   return value;
 }
 
@@ -149,10 +151,10 @@ function createReactiveComponent(component, observe3, reactive2, bindKeys) {
   if (component["__legend_proxied"])
     return component;
   let useForwardRef = false;
-  let useMemo5 = false;
+  let useMemo4 = false;
   let render = component;
   if (ReactMemoSymbol && render["$$typeof"] === ReactMemoSymbol && render["type"]) {
-    useMemo5 = true;
+    useMemo4 = true;
     render = render["type"];
   }
   if (ReactForwardRefSymbol && render["$$typeof"] === ReactForwardRefSymbol) {
@@ -233,7 +235,7 @@ function createReactiveComponent(component, observe3, reactive2, bindKeys) {
   } else {
     ret = proxy;
   }
-  return observe3 || useMemo5 ? React.memo(ret) : ret;
+  return observe3 || useMemo4 ? React.memo(ret) : ret;
 }
 function observer(component) {
   return createReactiveComponent(component, true);
@@ -370,11 +372,11 @@ function configureReactive({
     }
   }
 }
-function Show({ if: if_, ifReady, else: else_, wrap, children }) {
+function Show({ if: if_, ifReady, else: else_, $value, wrap, children }) {
   const value = useSelector(if_ != null ? if_ : ifReady);
   const show = ifReady !== void 0 ? state.isObservableValueReady(value) : value;
   const child = useSelector(
-    show ? state.isFunction(children) ? () => children(value) : children : else_ != null ? else_ : null,
+    show ? state.isFunction(children) ? () => children($value ? $value.get() : value) : children : else_ != null ? else_ : null,
     { skipCheck: true }
   );
   return wrap ? React.createElement(wrap, void 0, child) : child;
@@ -389,20 +391,36 @@ function Switch({
   const child = children[useSelector(value)];
   return (_b = child ? child() : (_a = children["default"]) == null ? void 0 : _a.call(children)) != null ? _b : null;
 }
-function useComputed(compute, set, deps) {
+function useObservable(initialValue, deps) {
+  var _a;
+  const ref = React.useRef({});
+  ref.current.value = initialValue;
+  const depsObs$ = deps ? useObservable(deps) : void 0;
+  if (!((_a = ref.current) == null ? void 0 : _a.obs$)) {
+    const value = depsObs$ ? state.isFunction(initialValue) && initialValue.length === 1 ? (p) => {
+      depsObs$.get();
+      return ref.current.value(p);
+    } : () => {
+      depsObs$.get();
+      return state.computeSelector(ref.current.value);
+    } : initialValue;
+    ref.current.obs$ = state.observable(value);
+  }
+  if (depsObs$) {
+    depsObs$.set(deps);
+  }
+  return ref.current.obs$;
+}
+
+// src/react/useComputed.ts
+function useComputed(get, set, deps) {
   if (!deps && state.isArray(set)) {
     deps = set;
     set = void 0;
   }
-  const ref = React.useRef({});
-  ref.current.compute = compute;
-  ref.current.set = set;
-  return React.useMemo(
-    () => state.computed(
-      () => state.isFunction(ref.current.compute) ? ref.current.compute() : ref.current.compute,
-      set ? (value) => ref.current.set(value) : void 0
-    ),
-    deps || []
+  return useObservable(
+    set ? state.linked({ get, set: ({ value }) => set(value) }) : get,
+    deps
   );
 }
 var useEffectOnce = (effect, deps) => {
@@ -442,13 +460,6 @@ function useMount(fn) {
   }, []);
 }
 var useMountOnce = useMount;
-function useObservable(initialValue) {
-  const ref = React.useRef();
-  if (!ref.current) {
-    ref.current = state.observable(initialValue);
-  }
-  return ref.current;
-}
 
 // src/react/useIsMounted.ts
 function useIsMounted() {
@@ -484,8 +495,16 @@ function useObserve(selector, reactionOrOptions, options) {
   } else {
     options = reactionOrOptions;
   }
+  const deps = options == null ? void 0 : options.deps;
+  const depsObs$ = deps ? useObservable(deps) : void 0;
+  if (depsObs$) {
+    depsObs$.set(deps);
+  }
   const ref = React.useRef({});
-  ref.current.selector = selector;
+  ref.current.selector = deps ? () => {
+    depsObs$ == null ? void 0 : depsObs$.get();
+    return state.computeSelector(selector);
+  } : selector;
   ref.current.reaction = reaction;
   if (!ref.current.dispose) {
     ref.current.dispose = state.observe(
@@ -510,12 +529,18 @@ function useObserveEffect(selector, reactionOrOptions, options) {
   } else {
     options = reactionOrOptions;
   }
+  const deps = options == null ? void 0 : options.deps;
+  const depsObs$ = deps ? useObservable(deps) : void 0;
+  if (depsObs$) {
+    depsObs$.set(deps);
+  }
   const ref = React.useRef({ selector });
   ref.current = { selector, reaction };
   useMountOnce(
     () => state.observe(
       (e) => {
         const { selector: selector2 } = ref.current;
+        depsObs$ == null ? void 0 : depsObs$.get();
         return state.isFunction(selector2) ? selector2(e) : selector2;
       },
       (e) => {

package/react.mjs

@@ -1,4 +1,4 @@
-import { isFunction, isEmpty, observable, isPromise, isObservable, syncState, computeSelector, isArray, isMap, isObservableValueReady, computed, observe, when, whenReady, internal, trackSelector, isPrimitive } from '@legendapp/state';
+import { isFunction, isEmpty, observable, isPromise, isObservable, when, computeSelector, isArray, isMap, isObservableValueReady, linked, observe, whenReady, internal, trackSelector, isPrimitive } from '@legendapp/state';
 import React, { memo, forwardRef, createElement, useState, useContext, useMemo, useRef, useEffect, createContext, useCallback } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim/index.js';
 
@@ -105,15 +105,6 @@ function useSelector(selector, options) {
     const { subscribe, getVersion, run } = selectorFn;
     value = run(selector);
     useSyncExternalStore(subscribe, getVersion, getVersion);
-    if (options == null ? void 0 : options.suspense) {
-      if (isPromise(value) || !value && isObservable(selector) && syncState(selector).isLoaded.get() === false) {
-        if (React.use) {
-          React.use(value);
-        } else {
-          throw value;
-        }
-      }
-    }
   } catch (err) {
     if ((process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test") && ((_a = err == null ? void 0 : err.message) == null ? void 0 : _a.includes("Rendered more"))) {
       console.warn(
@@ -122,6 +113,17 @@ function useSelector(selector, options) {
     }
     throw err;
   }
+  if (options == null ? void 0 : options.suspense) {
+    const isProm = isPromise(value);
+    if (isPromise(value) || !value && isObservable(selector)) {
+      const vProm = isProm ? value : when(selector);
+      if (React.use) {
+        React.use(vProm);
+      } else {
+        throw vProm;
+      }
+    }
+  }
   return value;
 }
 
@@ -143,10 +145,10 @@ function createReactiveComponent(component, observe3, reactive2, bindKeys) {
   if (component["__legend_proxied"])
     return component;
   let useForwardRef = false;
-  let useMemo5 = false;
+  let useMemo4 = false;
   let render = component;
   if (ReactMemoSymbol && render["$$typeof"] === ReactMemoSymbol && render["type"]) {
-    useMemo5 = true;
+    useMemo4 = true;
     render = render["type"];
   }
   if (ReactForwardRefSymbol && render["$$typeof"] === ReactForwardRefSymbol) {
@@ -227,7 +229,7 @@ function createReactiveComponent(component, observe3, reactive2, bindKeys) {
   } else {
     ret = proxy;
   }
-  return observe3 || useMemo5 ? memo(ret) : ret;
+  return observe3 || useMemo4 ? memo(ret) : ret;
 }
 function observer(component) {
   return createReactiveComponent(component, true);
@@ -364,11 +366,11 @@ function configureReactive({
     }
   }
 }
-function Show({ if: if_, ifReady, else: else_, wrap, children }) {
+function Show({ if: if_, ifReady, else: else_, $value, wrap, children }) {
   const value = useSelector(if_ != null ? if_ : ifReady);
   const show = ifReady !== void 0 ? isObservableValueReady(value) : value;
   const child = useSelector(
-    show ? isFunction(children) ? () => children(value) : children : else_ != null ? else_ : null,
+    show ? isFunction(children) ? () => children($value ? $value.get() : value) : children : else_ != null ? else_ : null,
     { skipCheck: true }
   );
   return wrap ? createElement(wrap, void 0, child) : child;
@@ -383,20 +385,36 @@ function Switch({
   const child = children[useSelector(value)];
   return (_b = child ? child() : (_a = children["default"]) == null ? void 0 : _a.call(children)) != null ? _b : null;
 }
-function useComputed(compute, set, deps) {
+function useObservable(initialValue, deps) {
+  var _a;
+  const ref = useRef({});
+  ref.current.value = initialValue;
+  const depsObs$ = deps ? useObservable(deps) : void 0;
+  if (!((_a = ref.current) == null ? void 0 : _a.obs$)) {
+    const value = depsObs$ ? isFunction(initialValue) && initialValue.length === 1 ? (p) => {
+      depsObs$.get();
+      return ref.current.value(p);
+    } : () => {
+      depsObs$.get();
+      return computeSelector(ref.current.value);
+    } : initialValue;
+    ref.current.obs$ = observable(value);
+  }
+  if (depsObs$) {
+    depsObs$.set(deps);
+  }
+  return ref.current.obs$;
+}
+
+// src/react/useComputed.ts
+function useComputed(get, set, deps) {
   if (!deps && isArray(set)) {
     deps = set;
     set = void 0;
   }
-  const ref = useRef({});
-  ref.current.compute = compute;
-  ref.current.set = set;
-  return useMemo(
-    () => computed(
-      () => isFunction(ref.current.compute) ? ref.current.compute() : ref.current.compute,
-      set ? (value) => ref.current.set(value) : void 0
-    ),
-    deps || []
+  return useObservable(
+    set ? linked({ get, set: ({ value }) => set(value) }) : get,
+    deps
   );
 }
 var useEffectOnce = (effect, deps) => {
@@ -436,13 +454,6 @@ function useMount(fn) {
   }, []);
 }
 var useMountOnce = useMount;
-function useObservable(initialValue) {
-  const ref = useRef();
-  if (!ref.current) {
-    ref.current = observable(initialValue);
-  }
-  return ref.current;
-}
 
 // src/react/useIsMounted.ts
 function useIsMounted() {
@@ -478,8 +489,16 @@ function useObserve(selector, reactionOrOptions, options) {
   } else {
     options = reactionOrOptions;
   }
+  const deps = options == null ? void 0 : options.deps;
+  const depsObs$ = deps ? useObservable(deps) : void 0;
+  if (depsObs$) {
+    depsObs$.set(deps);
+  }
   const ref = useRef({});
-  ref.current.selector = selector;
+  ref.current.selector = deps ? () => {
+    depsObs$ == null ? void 0 : depsObs$.get();
+    return computeSelector(selector);
+  } : selector;
   ref.current.reaction = reaction;
   if (!ref.current.dispose) {
     ref.current.dispose = observe(
@@ -504,12 +523,18 @@ function useObserveEffect(selector, reactionOrOptions, options) {
   } else {
     options = reactionOrOptions;
   }
+  const deps = options == null ? void 0 : options.deps;
+  const depsObs$ = deps ? useObservable(deps) : void 0;
+  if (depsObs$) {
+    depsObs$.set(deps);
+  }
   const ref = useRef({ selector });
   ref.current = { selector, reaction };
   useMountOnce(
     () => observe(
       (e) => {
         const { selector: selector2 } = ref.current;
+        depsObs$ == null ? void 0 : depsObs$.get();
         return isFunction(selector2) ? selector2(e) : selector2;
       },
       (e) => {

package/sync-plugins/_transformObjectFields.d.mts

@@ -0,0 +1,31 @@
+import { RecordValue, ArrayValue } from '@legendapp/state';
+import { SyncTransform } from '@legendapp/state/sync';
+
+declare function transformObjectFields(dataIn: Record<string, any>, map: Record<string, any>): any;
+declare function invertFieldMap(obj: Record<string, any>): any;
+declare const fieldTransformToTransform: <T extends object>(fieldTransform: FieldTransforms<T>) => SyncTransform<T>;
+declare type FieldTransforms<T> = (T extends Record<string, Record<string, any>> ? {
+    _dict: FieldTransformsInner<RecordValue<T>>;
+} : never) | FieldTransformsInner<T>;
+declare type FieldTransformsInner<T> = {
+    [K in keyof T]: string;
+} & ({
+    [K in keyof ObjectKeys<T> as `${K}_obj`]?: FieldTransforms<T[K]>;
+} | {
+    [K in keyof DictKeys<T> as `${K}_dict`]?: FieldTransforms<RecordValue<T[K]>>;
+}) & {
+    [K in keyof ArrayKeys<T> as `${K}_arr`]?: FieldTransforms<ArrayValue<T[K]>>;
+} & {
+    [K in keyof ArrayKeys<T> as `${K}_val`]?: FieldTransforms<ArrayValue<T[K]>>;
+};
+declare type ObjectKeys<T> = Pick<T, {
+    [K in keyof T]-?: K extends string ? T[K] extends Record<string, any> ? T[K] extends any[] ? never : K : never : never;
+}[keyof T]>;
+declare type DictKeys<T> = Pick<T, {
+    [K in keyof T]-?: K extends string ? (T[K] extends Record<string, Record<string, any>> ? K : never) : never;
+}[keyof T]>;
+declare type ArrayKeys<T> = Pick<T, {
+    [K in keyof T]-?: K extends string | number ? (T[K] extends any[] ? K : never) : never;
+}[keyof T]>;
+
+export { type FieldTransforms, type FieldTransformsInner, fieldTransformToTransform, invertFieldMap, transformObjectFields };

package/sync-plugins/_transformObjectFields.d.ts

@@ -0,0 +1,31 @@
+import { RecordValue, ArrayValue } from '@legendapp/state';
+import { SyncTransform } from '@legendapp/state/sync';
+
+declare function transformObjectFields(dataIn: Record<string, any>, map: Record<string, any>): any;
+declare function invertFieldMap(obj: Record<string, any>): any;
+declare const fieldTransformToTransform: <T extends object>(fieldTransform: FieldTransforms<T>) => SyncTransform<T>;
+declare type FieldTransforms<T> = (T extends Record<string, Record<string, any>> ? {
+    _dict: FieldTransformsInner<RecordValue<T>>;
+} : never) | FieldTransformsInner<T>;
+declare type FieldTransformsInner<T> = {
+    [K in keyof T]: string;
+} & ({
+    [K in keyof ObjectKeys<T> as `${K}_obj`]?: FieldTransforms<T[K]>;
+} | {
+    [K in keyof DictKeys<T> as `${K}_dict`]?: FieldTransforms<RecordValue<T[K]>>;
+}) & {
+    [K in keyof ArrayKeys<T> as `${K}_arr`]?: FieldTransforms<ArrayValue<T[K]>>;
+} & {
+    [K in keyof ArrayKeys<T> as `${K}_val`]?: FieldTransforms<ArrayValue<T[K]>>;
+};
+declare type ObjectKeys<T> = Pick<T, {
+    [K in keyof T]-?: K extends string ? T[K] extends Record<string, any> ? T[K] extends any[] ? never : K : never : never;
+}[keyof T]>;
+declare type DictKeys<T> = Pick<T, {
+    [K in keyof T]-?: K extends string ? (T[K] extends Record<string, Record<string, any>> ? K : never) : never;
+}[keyof T]>;
+declare type ArrayKeys<T> = Pick<T, {
+    [K in keyof T]-?: K extends string | number ? (T[K] extends any[] ? K : never) : never;
+}[keyof T]>;
+
+export { type FieldTransforms, type FieldTransformsInner, fieldTransformToTransform, invertFieldMap, transformObjectFields };

package/sync-plugins/_transformObjectFields.js

@@ -0,0 +1,114 @@
+'use strict';
+
+var state = require('@legendapp/state');
+
+// src/sync-plugins/_transformObjectFields.ts
+var validateMap;
+function transformObjectFields(dataIn, map) {
+  if (process.env.NODE_ENV === "development") {
+    validateMap(map);
+  }
+  let ret = dataIn;
+  if (dataIn) {
+    if (dataIn === state.symbolDelete)
+      return dataIn;
+    if (state.isString(dataIn)) {
+      return map[dataIn];
+    }
+    ret = {};
+    const dict = Object.keys(map).length === 1 && map["_dict"];
+    for (const key in dataIn) {
+      let v = dataIn[key];
+      if (dict) {
+        ret[key] = transformObjectFields(v, dict);
+      } else {
+        const mapped = map[key];
+        if (mapped === void 0) {
+          if (key !== "@") {
+            ret[key] = v;
+            if (process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test") {
+              console.error("A fatal field transformation error has occurred", key, dataIn, map);
+            }
+          }
+        } else if (mapped !== null) {
+          if (v !== void 0 && v !== null) {
+            if (map[key + "_val"]) {
+              const mapChild = map[key + "_val"];
+              if (state.isArray(v)) {
+                v = v.map((vChild) => mapChild[vChild]);
+              } else {
+                v = mapChild[v];
+              }
+            } else if (map[key + "_arr"] && state.isArray(v)) {
+              const mapChild = map[key + "_arr"];
+              v = v.map((vChild) => transformObjectFields(vChild, mapChild));
+            } else if (state.isObject(v)) {
+              if (map[key + "_obj"]) {
+                v = transformObjectFields(v, map[key + "_obj"]);
+              } else if (map[key + "_dict"]) {
+                const mapChild = map[key + "_dict"];
+                const out = {};
+                for (const keyChild in v) {
+                  out[keyChild] = transformObjectFields(v[keyChild], mapChild);
+                }
+                v = out;
+              }
+            }
+          }
+          ret[mapped] = v;
+        }
+      }
+    }
+  }
+  return ret;
+}
+var invertedMaps = /* @__PURE__ */ new WeakMap();
+function invertFieldMap(obj) {
+  const existing = invertedMaps.get(obj);
+  if (existing)
+    return existing;
+  const target = {};
+  for (const key in obj) {
+    const val = obj[key];
+    if (key === "_dict") {
+      target[key] = invertFieldMap(val);
+    } else if (key.endsWith("_obj") || key.endsWith("_dict") || key.endsWith("_arr") || key.endsWith("_val")) {
+      const keyMapped = obj[key.replace(/_obj|_dict|_arr|_val$/, "")];
+      const suffix = key.match(/_obj|_dict|_arr|_val$/)[0];
+      target[keyMapped + suffix] = invertFieldMap(val);
+    } else if (typeof val === "string") {
+      target[val] = key;
+    }
+  }
+  invertedMaps.set(obj, target);
+  return target;
+}
+var fieldTransformToTransform = (fieldTransform) => ({
+  load(value) {
+    const inverted = invertFieldMap(fieldTransform);
+    return transformObjectFields(value, inverted);
+  },
+  save(value) {
+    return transformObjectFields(value, fieldTransform);
+  }
+});
+if (process.env.NODE_ENV === "development") {
+  validateMap = function(record) {
+    const values = Object.values(record).filter((value) => {
+      if (state.isObject(value)) {
+        validateMap(value);
+      } else {
+        return state.isString(value);
+      }
+    });
+    const uniques = Array.from(new Set(values));
+    if (values.length !== uniques.length) {
+      console.error("Field transform map has duplicate values", record, values.length, uniques.length);
+    }
+    return record;
+  };
+}
+
+exports.fieldTransformToTransform = fieldTransformToTransform;
+exports.invertFieldMap = invertFieldMap;
+exports.transformObjectFields = transformObjectFields;

package/sync-plugins/_transformObjectFields.mjs

@@ -0,0 +1,110 @@
+import { symbolDelete, isString, isArray, isObject } from '@legendapp/state';
+
+// src/sync-plugins/_transformObjectFields.ts
+var validateMap;
+function transformObjectFields(dataIn, map) {
+  if (process.env.NODE_ENV === "development") {
+    validateMap(map);
+  }
+  let ret = dataIn;
+  if (dataIn) {
+    if (dataIn === symbolDelete)
+      return dataIn;
+    if (isString(dataIn)) {
+      return map[dataIn];
+    }
+    ret = {};
+    const dict = Object.keys(map).length === 1 && map["_dict"];
+    for (const key in dataIn) {
+      let v = dataIn[key];
+      if (dict) {
+        ret[key] = transformObjectFields(v, dict);
+      } else {
+        const mapped = map[key];
+        if (mapped === void 0) {
+          if (key !== "@") {
+            ret[key] = v;
+            if (process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test") {
+              console.error("A fatal field transformation error has occurred", key, dataIn, map);
+            }
+          }
+        } else if (mapped !== null) {
+          if (v !== void 0 && v !== null) {
+            if (map[key + "_val"]) {
+              const mapChild = map[key + "_val"];
+              if (isArray(v)) {
+                v = v.map((vChild) => mapChild[vChild]);
+              } else {
+                v = mapChild[v];
+              }
+            } else if (map[key + "_arr"] && isArray(v)) {
+              const mapChild = map[key + "_arr"];
+              v = v.map((vChild) => transformObjectFields(vChild, mapChild));
+            } else if (isObject(v)) {
+              if (map[key + "_obj"]) {
+                v = transformObjectFields(v, map[key + "_obj"]);
+              } else if (map[key + "_dict"]) {
+                const mapChild = map[key + "_dict"];
+                const out = {};
+                for (const keyChild in v) {
+                  out[keyChild] = transformObjectFields(v[keyChild], mapChild);
+                }
+                v = out;
+              }
+            }
+          }
+          ret[mapped] = v;
+        }
+      }
+    }
+  }
+  return ret;
+}
+var invertedMaps = /* @__PURE__ */ new WeakMap();
+function invertFieldMap(obj) {
+  const existing = invertedMaps.get(obj);
+  if (existing)
+    return existing;
+  const target = {};
+  for (const key in obj) {
+    const val = obj[key];
+    if (key === "_dict") {
+      target[key] = invertFieldMap(val);
+    } else if (key.endsWith("_obj") || key.endsWith("_dict") || key.endsWith("_arr") || key.endsWith("_val")) {
+      const keyMapped = obj[key.replace(/_obj|_dict|_arr|_val$/, "")];
+      const suffix = key.match(/_obj|_dict|_arr|_val$/)[0];
+      target[keyMapped + suffix] = invertFieldMap(val);
+    } else if (typeof val === "string") {
+      target[val] = key;
+    }
+  }
+  invertedMaps.set(obj, target);
+  return target;
+}
+var fieldTransformToTransform = (fieldTransform) => ({
+  load(value) {
+    const inverted = invertFieldMap(fieldTransform);
+    return transformObjectFields(value, inverted);
+  },
+  save(value) {
+    return transformObjectFields(value, fieldTransform);
+  }
+});
+if (process.env.NODE_ENV === "development") {
+  validateMap = function(record) {
+    const values = Object.values(record).filter((value) => {
+      if (isObject(value)) {
+        validateMap(value);
+      } else {
+        return isString(value);
+      }
+    });
+    const uniques = Array.from(new Set(values));
+    if (values.length !== uniques.length) {
+      console.error("Field transform map has duplicate values", record, values.length, uniques.length);
+    }
+    return record;
+  };
+}
+
+export { fieldTransformToTransform, invertFieldMap, transformObjectFields };