bank20baht-ui 0.12.0 → 0.12.1

package/dist/components/baht-form.d.ts

@@ -88,6 +88,8 @@ export declare class BahtForm extends BahtElement {
     private nextVisible;
     private revealClass;
     private stateFor;
+    /** The row sub-field states of one repeater: `fieldStates` keys starting `key[`. */
+    private rowStatesFor;
     private valueFor;
     /** Debounced keystrokes still in a control land in `edits` before anyone reads them. */
     private flushTyped;

package/dist/components/baht-form.js

@@ -1,16 +1,16 @@
 import { nothing as g, html as p } from "lit";
-import { property as d, state as m, customElement as x } from "lit/decorators.js";
-import { repeat as E } from "lit/directives/repeat.js";
+import { property as d, state as m, customElement as E } from "lit/decorators.js";
+import { repeat as P } from "lit/directives/repeat.js";
 import { html as $ } from "lit/static-html.js";
-import { BahtElement as P, hasDom as O } from "./base.js";
-import { TAG_FOR_TYPE as T, WIDTH_CLASS as B, staticTag as I } from "./primitives/tag-map.js";
+import { BahtElement as T, hasDom as O } from "./base.js";
+import { TAG_FOR_TYPE as B, WIDTH_CLASS as I, staticTag as j } from "./primitives/tag-map.js";
 import { defaultValue as C } from "../core/defaults.js";
 import { t as D } from "../core/i18n.js";
 import { validateField as _ } from "../core/validators.js";
 import { resolveViewFields as M } from "../core/views.js";
-import { applyFlags as j } from "../core/flags.js";
-import { hasScripts as w, runScripts as F, createScriptContext as L, MAX_SCRIPT_DEPTH as V } from "../core/engine/scripts.js";
-import { displayValue as A } from "../core/display.js";
+import { applyFlags as L } from "../core/flags.js";
+import { hasScripts as w, runScripts as F, createScriptContext as A, MAX_SCRIPT_DEPTH as x } from "../core/engine/scripts.js";
+import { displayValue as R } from "../core/display.js";
 import "./primitives/baht-input.js";
 import "./primitives/baht-textarea.js";
 import "./primitives/baht-number.js";
@@ -26,12 +26,12 @@ import "./primitives/baht-file.js";
 import "./primitives/baht-text.js";
 import "./primitives/baht-section.js";
 import "./primitives/baht-repeater.js";
-var R = Object.defineProperty, U = Object.getOwnPropertyDescriptor, h = (t, s, e, i) => {
-  for (var r = i > 1 ? void 0 : i ? U(s, e) : s, o = t.length - 1, a; o >= 0; o--)
+var U = Object.defineProperty, W = Object.getOwnPropertyDescriptor, h = (t, s, e, i) => {
+  for (var r = i > 1 ? void 0 : i ? W(s, e) : s, o = t.length - 1, a; o >= 0; o--)
     (a = t[o]) && (r = (i ? a(s, e, r) : a(r)) || r);
-  return i && r && R(s, e, r), r;
+  return i && r && U(s, e, r), r;
 };
-let n = class extends P {
+let n = class extends T {
   constructor() {
     super(...arguments), this.value = {}, this.registry = {}, this.showOptional = !1, this.options = {}, this.fieldStates = {}, this.flags = {}, this.readonly = !1, this.edits = {}, this.errors = [], this.scriptStates = {}, this.fieldMessages = {}, this.formMessages = [], this.scriptContext = null, this.scriptContextForm = null, this.scriptDepth = 0, this.loadedForm = null, this.dynamicOptions = /* @__PURE__ */ new Map(), this.optionsSnapshots = /* @__PURE__ */ new Map(), this.optionsEpoch = /* @__PURE__ */ new Map(), this.warnedViews = /* @__PURE__ */ new Set(), this.flagCache = {}, this.lastVisible = {}, this.nextVisible = {};
   }
@@ -45,7 +45,7 @@ let n = class extends P {
   get effectiveForm() {
     const t = this.assignedForm;
     if (t)
-      return (this.flagCache.form !== t || this.flagCache.flags !== this.flags) && (this.flagCache = { form: t, flags: this.flags, out: j(t, this.flags) }), this.flagCache.out;
+      return (this.flagCache.form !== t || this.flagCache.flags !== this.flags) && (this.flagCache = { form: t, flags: this.flags, out: L(t, this.flags) }), this.flagCache.out;
   }
   willUpdate(t) {
     t.has("value") && (this.edits = {}), (t.has("form") || t.has("flags")) && (this.dynamicOptions.clear(), this.optionsSnapshots.clear(), this.optionsEpoch.clear()), t.has("form") && (this.scriptStates = {}, this.fieldMessages = {}, this.formMessages = [], this.scriptContext = null), (t.has("form") || t.has("flags") || t.has("value") || t.has("registry")) && this.syncDynamicOptions();
@@ -111,6 +111,13 @@ let n = class extends P {
     }, e = this.scriptStates[t.key];
     return e ? { ...s, ...e } : s;
   }
+  /** The row sub-field states of one repeater: `fieldStates` keys starting `key[`. */
+  rowStatesFor(t) {
+    const s = `${t}[`, e = {};
+    for (const [i, r] of Object.entries(this.fieldStates))
+      i.startsWith(s) && (e[i] = r);
+    return e;
+  }
   valueFor(t) {
     return Object.hasOwn(this.edits, t.key) ? this.edits[t.key] : Object.hasOwn(this.value, t.key) ? this.value[t.key] : C(t);
   }
@@ -149,7 +156,9 @@ let n = class extends P {
       const i = this.stateFor(e);
       if (!i.visible) continue;
       const r = i.required === !!e.required ? e : { ...e, required: i.required };
-      t.push(..._(r, this.valueFor(e), this.registry, s));
+      t.push(
+        ..._(r, this.valueFor(e), this.registry, s, this.fieldStates)
+      );
     }
     return t;
   }
@@ -183,7 +192,7 @@ let n = class extends P {
   // ---- client scripts (spec 01 §14) ----
   /** The `g` (g_form) for the current form — built lazily over this component's state. */
   g(t) {
-    return this.scriptContext && this.scriptContextForm === t ? this.scriptContext : (this.scriptContextForm = t, this.scriptContext = L(t, {
+    return this.scriptContext && this.scriptContextForm === t ? this.scriptContext : (this.scriptContextForm = t, this.scriptContext = A(t, {
       getData: () => this.getData(),
       setValue: (s, e) => {
         this.applyScriptValue(s, e);
@@ -228,9 +237,9 @@ let n = class extends P {
   runChangeScripts(t, s, e, i) {
     const r = this.effectiveForm;
     if (!(!r || !w(r, "change", t))) {
-      if (this.scriptDepth >= V) {
+      if (this.scriptDepth >= x) {
         console.warn(
-          `[bahtui] script cascade on "${r.form_name}.${t}" exceeded ${V} levels — stopped (setValue ping-pong between change scripts?)`
+          `[bahtui] script cascade on "${r.form_name}.${t}" exceeded ${x} levels — stopped (setValue ping-pong between change scripts?)`
         );
         return;
       }
@@ -295,7 +304,7 @@ let n = class extends P {
     const s = this.stateFor(t);
     if (!s.visible) return [];
     const e = this.getData(), i = s.required === !!t.required ? t : { ...t, required: s.required };
-    return _(i, this.valueFor(t), this.registry, e);
+    return _(i, this.valueFor(t), this.registry, e, this.fieldStates);
   }
   /** `validateOn: 'blur'` — validate just the field the user left, same as
    * how errors are shown elsewhere (merged into `this.errors`, painted by
@@ -307,18 +316,18 @@ let n = class extends P {
   }
   renderField(t) {
     var S;
-    const s = T[t.type];
+    const s = B[t.type];
     if (!s)
       return console.warn(`[bahtui] unknown field type "${t.type}" — skipped`), g;
-    const e = this.stateFor(t), i = B[t.width ?? "full"] ?? "baht-field--w-full", r = ((S = this.errors.find((u) => u.key === t.key)) == null ? void 0 : S.message) ?? null;
+    const e = this.stateFor(t), i = I[t.width ?? "full"] ?? "baht-field--w-full", r = ((S = this.errors.find((u) => u.key === t.key)) == null ? void 0 : S.message) ?? null;
     if (this.readonly && t.type !== "label" && t.type !== "section")
       return this.renderReadonlyField(t, i, e.visible);
     const o = t.options_from ? { ...t, options: this.dynamicOptions.get(t.key) ?? t.options ?? [] } : t, a = this.valueFor(t), l = !e.enabled, c = this.readonly || e.readonly, b = this.options.inputDebounce, v = (u) => {
       this.onControlInput(t.key, u);
-    }, f = I(s);
+    }, f = j(s);
     let y;
     if (t.type === "repeater") {
-      const u = this.errors.filter((q) => q.key.startsWith(`${t.key}[`));
+      const u = this.errors.filter((q) => q.key.startsWith(`${t.key}[`)), V = this.rowStatesFor(t.key);
       y = $`<${f}
         .field=${o}
         .value=${a}
@@ -329,6 +338,7 @@ let n = class extends P {
         .error=${r}
         .debounce=${b}
         .rowErrors=${u}
+        .rowStates=${V}
         @baht-input=${v}
       ></${f}>`;
     } else if (t.type === "file") {
@@ -395,7 +405,7 @@ let n = class extends P {
     e && this.onFieldInput(e, s);
   }
   renderReadonlyField(t, s, e) {
-    const i = t.options_from ? this.dynamicOptions.get(t.key) ?? t.options ?? [] : t.options, r = A(t, this.valueFor(t), i), o = r.kind === "empty" ? p`<span class="baht-readonly-value baht-readonly-value--empty">${D("emptyValue")}</span>` : r.kind === "text" ? p`<span class="baht-readonly-value">${r.text}</span>` : r.kind === "chips" ? p`<span class="baht-readonly-value baht-readonly-chips"
+    const i = t.options_from ? this.dynamicOptions.get(t.key) ?? t.options ?? [] : t.options, r = R(t, this.valueFor(t), i), o = r.kind === "empty" ? p`<span class="baht-readonly-value baht-readonly-value--empty">${D("emptyValue")}</span>` : r.kind === "text" ? p`<span class="baht-readonly-value">${r.text}</span>` : r.kind === "chips" ? p`<span class="baht-readonly-value baht-readonly-chips"
                 >${r.items.map((a) => p`<span class="baht-readonly-chip">${a}</span>`)}</span
               >` : p`<div class="baht-readonly-rows">
                 ${r.rows.map(
@@ -431,7 +441,7 @@ let n = class extends P {
                 </div>`
     )}
             </div>` : g}
-      ${E(
+      ${P(
       this.sortedFields,
       (t) => t.key,
       (t) => this.renderField(t)
@@ -482,7 +492,7 @@ h([
   m()
 ], n.prototype, "formMessages", 2);
 n = h([
-  x("baht-form")
+  E("baht-form")
 ], n);
 export {
   n as BahtForm

package/dist/components/primitives/baht-repeater.d.ts

@@ -1,6 +1,6 @@
 import { TemplateResult } from 'lit';
 import { BahtFieldBase } from '../field-base.js';
-import { ValidationError } from '../../core/types.js';
+import { DerivedFieldState, ValidationError } from '../../core/types.js';
 /**
  * <baht-repeater> — array-of-rows control (spec 01 §10). `value` is an array
  * of row objects; every row renders the same `field.fields` sub-descriptors
@@ -10,6 +10,11 @@ import { ValidationError } from '../../core/types.js';
 export declare class BahtRepeater extends BahtFieldBase {
     /** Row-scoped errors from the host form, keyed `key[i].subKey`. */
     rowErrors: ValidationError[];
+    /**
+     * Rule-derived states of the row sub-fields, keyed `key[i].sub` (spec 02
+     * §2a). Absent = every sub-field visible with its descriptor defaults.
+     */
+    rowStates: Record<string, DerivedFieldState>;
     private get rows();
     private subFieldsSource;
     private subFieldsCache;

package/dist/components/primitives/baht-repeater.js

@@ -1,86 +1,90 @@
 import { nothing as d, html as l } from "lit";
-import { property as m, customElement as y } from "lit/decorators.js";
-import { repeat as u } from "lit/directives/repeat.js";
-import { html as $ } from "lit/static-html.js";
-import { hasDom as w } from "../base.js";
-import { BahtFieldBase as v } from "../field-base.js";
-import { TAG_FOR_TYPE as _, staticTag as F, WIDTH_CLASS as g } from "./tag-map.js";
-import { defaultValue as c } from "../../core/defaults.js";
+import { property as b, customElement as w } from "lit/decorators.js";
+import { repeat as c } from "lit/directives/repeat.js";
+import { html as v } from "lit/static-html.js";
+import { hasDom as _ } from "../base.js";
+import { BahtFieldBase as F } from "../field-base.js";
+import { TAG_FOR_TYPE as g, staticTag as R, WIDTH_CLASS as S } from "./tag-map.js";
+import { defaultValue as f } from "../../core/defaults.js";
 import { t as h } from "../../core/i18n.js";
-var R = Object.defineProperty, T = Object.getOwnPropertyDescriptor, f = (t, e, r, o) => {
-  for (var s = o > 1 ? void 0 : o ? T(e, r) : e, i = t.length - 1, a; i >= 0; i--)
-    (a = t[i]) && (s = (o ? a(e, r, s) : a(s)) || s);
-  return o && s && R(e, r, s), s;
+var k = Object.defineProperty, T = Object.getOwnPropertyDescriptor, p = (r, e, t, o) => {
+  for (var s = o > 1 ? void 0 : o ? T(e, t) : e, a = r.length - 1, i; a >= 0; a--)
+    (i = r[a]) && (s = (o ? i(e, t, s) : i(s)) || s);
+  return o && s && k(e, t, s), s;
 };
-let n = class extends v {
+let n = class extends F {
   constructor() {
-    super(...arguments), this.rowErrors = [], this.subFieldsCache = [];
+    super(...arguments), this.rowErrors = [], this.rowStates = {}, this.subFieldsCache = [];
   }
   get rows() {
     return Array.isArray(this.value) ? this.value : [];
   }
   /** Ordered sub-descriptors, cached per  identity (read per row per render). */
   get subFields() {
-    const t = this.field.fields;
-    return t !== this.subFieldsSource && (this.subFieldsSource = t, this.subFieldsCache = [...t ?? []].sort((e, r) => e.order - r.order).filter((e) => e.type !== "repeater")), this.subFieldsCache;
+    const r = this.field.fields;
+    return r !== this.subFieldsSource && (this.subFieldsSource = r, this.subFieldsCache = [...r ?? []].sort((e, t) => e.order - t.order).filter((e) => e.type !== "repeater")), this.subFieldsCache;
   }
-  patchRow(t, e, r) {
+  patchRow(r, e, t) {
     const o = [...this.rows];
-    o[t] = { ...o[t], [e]: r }, this.emitInput(o);
+    o[r] = { ...o[r], [e]: t }, this.emitInput(o);
   }
   addRow() {
-    const t = {};
+    const r = {};
     for (const e of this.subFields)
-      e.type === "label" || e.type === "section" || (t[e.key] = c(e));
-    this.emitInput([...this.rows, t]);
+      e.type === "label" || e.type === "section" || (r[e.key] = f(e));
+    this.emitInput([...this.rows, r]);
   }
-  removeRow(t) {
-    this.emitInput(this.rows.filter((e, r) => r !== t));
+  removeRow(r) {
+    this.emitInput(this.rows.filter((e, t) => t !== r));
   }
   /** Pending keystrokes in any row land in the array before the host reads it. */
   flushTyped() {
-    var t;
-    if (!w()) {
+    var r;
+    if (!_()) {
       super.flushTyped();
       return;
     }
     for (const e of this.querySelectorAll(".baht-repeater-row > .baht-field > *"))
-      (t = e.flushTyped) == null || t.call(e);
+      (r = e.flushTyped) == null || r.call(e);
     super.flushTyped();
   }
-  errorFor(t, e) {
+  errorFor(r, e) {
     var o;
-    const r = `${this.field.key}[${t}].${e}`;
-    return ((o = this.rowErrors.find((s) => s.key === r)) == null ? void 0 : o.message) ?? null;
+    const t = `${this.field.key}[${r}].${e}`;
+    return ((o = this.rowErrors.find((s) => s.key === t)) == null ? void 0 : o.message) ?? null;
   }
   /**
    * Sub-controls render declaratively (one static-tag template per primitive, rows
    * keyed by index) so Lit reuses the same node across re-renders — typing keeps
    * focus, same as <baht-form> — and the whole thing renders on the server.
    */
-  renderSub(t, e, r) {
-    const o = _[r.type];
+  renderSub(r, e, t) {
+    const o = g[t.type];
     if (!o) return d;
-    const s = F(o), i = g[r.width ?? "full"] ?? "baht-field--w-full", a = (p) => {
-      p.stopPropagation();
-      const { value: b } = p.detail;
-      this.patchRow(e, r.key, b);
-    };
-    return l`<div class="baht-field ${i}" data-key=${r.key} data-type=${r.type}>
-      ${$`<${s}
-        .field=${r}
-        .value=${Object.hasOwn(t, r.key) ? t[r.key] : c(r)}
-        .disabled=${this.disabled}
-        .readonly=${this.readonly}
-        .required=${!!r.required}
-        .error=${this.errorFor(e, r.key)}
+    const s = R(o), a = S[t.width ?? "full"] ?? "baht-field--w-full", i = this.rowStates[`${this.field.key}[${e}].${t.key}`], y = (u) => {
+      u.stopPropagation();
+      const { value: m } = u.detail;
+      this.patchRow(e, t.key, m);
+    }, $ = i !== void 0 && !i.visible;
+    return l`<div
+      class="baht-field ${a}${$ ? " baht-field--hidden" : ""}"
+      data-key=${t.key}
+      data-type=${t.type}
+    >
+      ${v`<${s}
+        .field=${t}
+        .value=${Object.hasOwn(r, t.key) ? r[t.key] : f(t)}
+        .disabled=${this.disabled || i !== void 0 && !i.enabled}
+        .readonly=${this.readonly || ((i == null ? void 0 : i.readonly) ?? !1)}
+        .required=${i ? i.required : !!t.required}
+        .error=${this.errorFor(e, t.key)}
         .debounce=${this.debounce}
-        @baht-input=${a}
+        @baht-input=${y}
       ></${s}>`}
     </div>`;
   }
   renderControl() {
-    const t = this.rows, e = !this.disabled && !this.readonly, r = this.field.max_rows !== void 0 && t.length >= this.field.max_rows;
+    const r = this.rows, e = !this.disabled && !this.readonly, t = this.field.max_rows !== void 0 && r.length >= this.field.max_rows;
     return l`<div
       class="baht-repeater"
       id=${this.controlId}
@@ -88,8 +92,8 @@ let n = class extends v {
       aria-labelledby=${this.field.label ? this.labelId : d}
       aria-describedby=${this.describedBy}
     >
-      ${u(
-      t,
+      ${c(
+      r,
       (o, s) => s,
       (o, s) => l`<div
           class="baht-repeater-row"
@@ -97,10 +101,10 @@ let n = class extends v {
           role="group"
           aria-label=${h("row", { n: s + 1 })}
         >
-          ${u(
+          ${c(
         this.subFields,
-        (i) => i.key,
-        (i) => this.renderSub(o, s, i)
+        (a) => a.key,
+        (a) => this.renderSub(o, s, a)
       )}
           ${e ? l`<button
                 type="button"
@@ -118,7 +122,7 @@ let n = class extends v {
       ${this.readonly ? d : l`<button
             type="button"
             class="baht-repeater-add"
-            ?disabled=${this.disabled || r}
+            ?disabled=${this.disabled || t}
             @click=${() => {
       this.addRow();
     }}
@@ -128,11 +132,14 @@ let n = class extends v {
     </div>`;
   }
 };
-f([
-  m({ attribute: !1 })
+p([
+  b({ attribute: !1 })
 ], n.prototype, "rowErrors", 2);
-n = f([
-  y("baht-repeater")
+p([
+  b({ attribute: !1 })
+], n.prototype, "rowStates", 2);
+n = p([
+  w("baht-repeater")
 ], n);
 export {
   n as BahtRepeater

package/dist/core/engine/conditions.d.ts

@@ -1,9 +1,27 @@
 import { Condition, NestedData } from '../types.js';
-/** Read a "formName.fieldKey" reference out of nested data. */
-export declare function readRef(data: NestedData, ref: string): unknown;
+/** The repeater row a rule is being evaluated for (spec 02 §2a). */
+export interface RowScope {
+    form: string;
+    repeater: string;
+    index: number;
+}
+export interface RowRef {
+    form: string;
+    repeater: string;
+    sub: string;
+}
+/** Split a row-scoped ref, or `null` when it is a plain `Form.key` reference. */
+export declare function parseRowRef(ref: string): RowRef | null;
+/**
+ * Read a "formName.fieldKey" reference out of nested data. With a `scope`, a
+ * row-scoped ref (`Form.repeater[].sub`) reads that sub-field of the scoped row.
+ */
+export declare function readRef(data: NestedData, ref: string, scope?: RowScope): unknown;
 /**
  * Ordering used by rule conditions AND the `compare` validator: numeric when
  * both sides coerce, date-aware, else lexicographic. Null = not comparable.
  */
 export declare function compareValues(a: unknown, b: unknown): number | null;
-export declare function evalCondition(cond: Condition | undefined, data: NestedData): boolean;
+export declare function evalCondition(cond: Condition | undefined, data: NestedData, scope?: RowScope): boolean;
+/** Every row-scoped ref a condition mentions (`field` and `value_field`). */
+export declare function conditionRowRefs(cond: Condition | undefined): RowRef[];

package/dist/core/engine/conditions.js

@@ -1,69 +1,87 @@
-function a(e, n) {
-  var t;
-  const r = n.indexOf(".");
-  if (r !== -1)
-    return (t = e[n.slice(0, r)]) == null ? void 0 : t[n.slice(r + 1)];
+const g = /^([^.[\]]+)\.([^.[\]]+)\[\]\.([^.[\]]+)$/;
+function l(r) {
+  const t = g.exec(r);
+  return t ? { form: t[1], repeater: t[2], sub: t[3] } : null;
 }
-function f(e) {
-  return e == null ? !0 : typeof e == "string" ? e === "" : Array.isArray(e) ? e.length === 0 : !1;
+function y(r, t, n) {
+  var u, c;
+  const e = l(t);
+  if (e) {
+    if ((n == null ? void 0 : n.form) !== e.form || n.repeater !== e.repeater) return;
+    const m = (u = r[e.form]) == null ? void 0 : u[e.repeater], s = Array.isArray(m) ? m[n.index] : void 0;
+    return s !== null && typeof s == "object" && Object.hasOwn(s, e.sub) ? s[e.sub] : void 0;
+  }
+  const i = t.indexOf(".");
+  if (i !== -1)
+    return (c = r[t.slice(0, i)]) == null ? void 0 : c[t.slice(i + 1)];
+}
+function N(r) {
+  return r == null ? !0 : typeof r == "string" ? r === "" : Array.isArray(r) ? r.length === 0 : !1;
 }
-function o(e, n) {
-  const r = new Date(e).getTime(), t = new Date(n).getTime();
-  return Number.isNaN(r) || Number.isNaN(t) ? null : r - t;
+function p(r, t) {
+  const n = new Date(r).getTime(), e = new Date(t).getTime();
+  return Number.isNaN(n) || Number.isNaN(e) ? null : n - e;
 }
-function c(e, n) {
-  const r = Number(e), t = Number(n);
-  return e !== "" && n !== "" && !Number.isNaN(r) && !Number.isNaN(t) ? r - t : e < n ? -1 : e > n ? 1 : 0;
+function A(r, t) {
+  const n = Number(r), e = Number(t);
+  return r !== "" && t !== "" && !Number.isNaN(n) && !Number.isNaN(e) ? n - e : r < t ? -1 : r > t ? 1 : 0;
 }
-function l(e, n) {
-  if (typeof e == "number" && typeof n == "number") return e - n;
-  if (e instanceof Date || n instanceof Date) return o(e, n);
-  if (typeof e == "string" && typeof n == "string") return c(e, n);
-  const r = Number(e), t = Number(n);
-  return Number.isNaN(r) || Number.isNaN(t) ? null : r - t;
+function b(r, t) {
+  if (typeof r == "number" && typeof t == "number") return r - t;
+  if (r instanceof Date || t instanceof Date) return p(r, t);
+  if (typeof r == "string" && typeof t == "string") return A(r, t);
+  const n = Number(r), e = Number(t);
+  return Number.isNaN(n) || Number.isNaN(e) ? null : n - e;
 }
-function u(e, n, r) {
-  const t = l(e, n);
-  return t !== null && r(t);
+function f(r, t, n) {
+  const e = b(r, t);
+  return e !== null && n(e);
 }
-function y(e, n) {
-  const r = a(n, e.field), t = e.value_field !== void 0 ? a(n, e.value_field) : e.value;
-  switch (e.op) {
+function v(r, t, n) {
+  const e = y(t, r.field, n), i = r.value_field !== void 0 ? y(t, r.value_field, n) : r.value;
+  switch (r.op) {
     case "eq":
-      return r === t;
+      return e === i;
     case "ne":
-      return r !== t;
+      return e !== i;
     case "gt":
-      return u(r, t, (i) => i > 0);
+      return f(e, i, (u) => u > 0);
     case "gte":
-      return u(r, t, (i) => i >= 0);
+      return f(e, i, (u) => u >= 0);
     case "lt":
-      return u(r, t, (i) => i < 0);
+      return f(e, i, (u) => u < 0);
     case "lte":
-      return u(r, t, (i) => i <= 0);
+      return f(e, i, (u) => u <= 0);
     case "in":
-      return Array.isArray(t) && t.includes(r);
+      return Array.isArray(i) && i.includes(e);
     case "notIn":
-      return Array.isArray(t) && !t.includes(r);
+      return Array.isArray(i) && !i.includes(e);
     case "contains":
-      return Array.isArray(r) ? r.includes(t) : typeof r == "string" && r.includes(String(t));
+      return Array.isArray(e) ? e.includes(i) : typeof e == "string" && e.includes(String(i));
     case "notContains":
-      return Array.isArray(r) ? !r.includes(t) : typeof r == "string" && !r.includes(String(t));
+      return Array.isArray(e) ? !e.includes(i) : typeof e == "string" && !e.includes(String(i));
     case "startsWith":
-      return typeof r == "string" && r.startsWith(String(t));
+      return typeof e == "string" && e.startsWith(String(i));
     case "endsWith":
-      return typeof r == "string" && r.endsWith(String(t));
+      return typeof e == "string" && e.endsWith(String(i));
     case "isEmpty":
-      return f(r);
+      return N(e);
     case "isNotEmpty":
-      return !f(r);
+      return !N(e);
   }
 }
-function s(e, n) {
-  return e === void 0 ? !0 : "and" in e ? e.and.every((r) => s(r, n)) : "or" in e ? e.or.some((r) => s(r, n)) : "not" in e ? !s(e.not, n) : y(e, n);
+function a(r, t, n) {
+  return r === void 0 ? !0 : "and" in r ? r.and.every((e) => a(e, t, n)) : "or" in r ? r.or.some((e) => a(e, t, n)) : "not" in r ? !a(r.not, t, n) : v(r, t, n);
+}
+function o(r) {
+  return r === void 0 ? [] : "and" in r ? r.and.flatMap(o) : "or" in r ? r.or.flatMap(o) : "not" in r ? o(r.not) : [l(r.field), r.value_field ? l(r.value_field) : null].filter(
+    (t) => t !== null
+  );
 }
 export {
-  l as compareValues,
-  s as evalCondition,
-  a as readRef
+  b as compareValues,
+  o as conditionRowRefs,
+  a as evalCondition,
+  l as parseRowRef,
+  y as readRef
 };