@golemui/gui-shared 1.1.1-rc.1 → 1.1.1-rc.2

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.1.1-rc.1 (2026-08-02)
+
+This was a version bump only for gui-shared to align it with other projects, there were no code changes.
+
 ## 1.1.1-rc.0 (2026-08-01)
 
 ### 🩹 Fixes

package/index.js

@@ -1,375 +1,31 @@
-import { _ as d, a as y, b as o, c, d as _, e as h, f as m, g as B, h as U, i as T, j as k, k as D, l as I, m as P, n as C, o as f, p as R, q as w, r as x, s as b, t as A, u as L, v as M, w as $, x as F, y as G, z as v, A as z, B as j, C as O, D as H, E as N, F as V, G as E, H as W, I as q, J as K, K as Q, L as S, M as X, N as Y, O as Z, P as J, Q as aa, R as sa, S as ta, T as ea, U as ia, V as ra, W as na, X as ua, Y as la, Z as pa, $ as ga, a0 as da, a1 as ya, a2 as oa, a3 as ca, a4 as _a, a5 as ha, a6 as ma, a7 as Ba, a8 as Ua, a9 as Ta, aa as ka, ab as Da, ac as Ia, ad as Pa, ae as Ca, af as fa, ag as Ra, ah as wa, ai as xa, aj as ba, ak as Aa, al as La, am as Ma, an as $a, ao as Fa, ap as Ga, aq as va, ar as za, as as ja, at as Oa, au as Ha, av as Na, aw as Va, ax as Ea, ay as Wa, az as qa, aA as Ka, aB as Qa, aC as Sa, aD as Xa, aE as Ya, aF as Za, aG as Ja, aH as as, aI as ss, aJ as ts, aK as es, aL as is, aM as rs, aN as ns, aO as us, aP as ls, aQ as ps, aR as gs, aS as ds, aT as ys, aU as os, aV as cs, aW as _s, aX as hs, aY as ms, aZ as Bs, a_ as Us, a$ as Ts, b0 as ks, b1 as Ds, b2 as Is, b3 as Ps, b4 as Cs, b5 as fs, b6 as Rs } from "./resolveFormInput-Dp0TB3LB.js";
+import { g as p } from "./resolveFormInput-CsFeoGjz.js";
 import "@golemui/dx";
 import "@golemui/core";
-class r {
-  constructor(a) {
-    this.conditions = a;
-  }
-  static root() {
-    return new r([]);
-  }
-  // ─── Scope methods (chain-extending, immutable) ───
-  tag(a) {
-    return new r([...this.conditions, { kind: "tagsAnd", tags: [a] }]);
-  }
-  state(a) {
-    return new r([...this.conditions, { kind: "state", name: a }]);
-  }
-  tagsAnd(a) {
-    return new r([...this.conditions, { kind: "tagsAnd", tags: a }]);
-  }
-  tagsOr(a) {
-    return new r([...this.conditions, { kind: "tagsOr", tags: a }]);
-  }
-  apply(a) {
-    if (this.conditions.length === 0) return a;
-    const s = this.conditions.find(
-      (i) => i.kind === "state"
-    ), e = this.conditions.filter(
-      (i) => i.kind !== "state"
-    ), n = a.matcher;
-    return {
-      ...a,
-      matcher: (i) => {
-        if (!n(i)) return !1;
-        for (const u of e) {
-          const g = i.tags ?? [];
-          if (u.kind === "tagsAnd") {
-            for (const l of u.tags)
-              if (!g.includes(l)) return !1;
-          } else {
-            if (u.tags.length === 0) continue;
-            if (!u.tags.some((l) => g.includes(l))) return !1;
-          }
-        }
-        return !0;
-      },
-      ...s ? { targetState: s.name } : {}
-    };
-  }
-  // ─── Type selectors — inputs ───
-  inputs(a) {
-    return this.apply(d(a));
-  }
-  inputByUid(a, s) {
-    return this.apply(y(a, s));
-  }
-  textInputs(a) {
-    return this.apply(o(a));
-  }
-  numberInputs(a) {
-    return this.apply(c(a));
-  }
-  booleanInputs(a) {
-    return this.apply(_(a));
-  }
-  selects(a) {
-    return this.apply(h(a));
-  }
-  selectByUid(a, s) {
-    return this.apply(m(a, s));
-  }
-  dropdowns(a) {
-    return this.apply(B(a));
-  }
-  dropdownByUid(a, s) {
-    return this.apply(U(a, s));
-  }
-  radiogroups(a) {
-    return this.apply(T(a));
-  }
-  radiogroupByUid(a, s) {
-    return this.apply(k(a, s));
-  }
-  checkboxes(a) {
-    return this.apply(D(a));
-  }
-  checkboxByUid(a, s) {
-    return this.apply(I(a, s));
-  }
-  textareas(a) {
-    return this.apply(P(a));
-  }
-  textareaByUid(a, s) {
-    return this.apply(C(a, s));
-  }
-  passwords(a) {
-    return this.apply(f(a));
-  }
-  passwordByUid(a, s) {
-    return this.apply(R(a, s));
-  }
-  currencies(a) {
-    return this.apply(w(a));
-  }
-  currencyByUid(a, s) {
-    return this.apply(x(a, s));
-  }
-  markdowns(a) {
-    return this.apply(b(a));
-  }
-  markdownByUid(a, s) {
-    return this.apply(A(a, s));
-  }
-  lists(a) {
-    return this.apply(L(a));
-  }
-  listByUid(a, s) {
-    return this.apply(M(a, s));
-  }
-  calendars(a) {
-    return this.apply($(a));
-  }
-  calendarByUid(a, s) {
-    return this.apply(F(a, s));
-  }
-  dateTimeCalendars(a) {
-    return this.apply(G(a));
-  }
-  dateTimeCalendarByUid(a, s) {
-    return this.apply(v(a, s));
-  }
-  dateInputs(a) {
-    return this.apply(z(a));
-  }
-  dateInputByUid(a, s) {
-    return this.apply(j(a, s));
-  }
-  timeInputs(a) {
-    return this.apply(O(a));
-  }
-  timeInputByUid(a, s) {
-    return this.apply(H(a, s));
-  }
-  timePickers(a) {
-    return this.apply(N(a));
-  }
-  timePickerByUid(a, s) {
-    return this.apply(V(a, s));
-  }
-  dateTimeInputs(a) {
-    return this.apply(E(a));
-  }
-  dateTimeInputByUid(a, s) {
-    return this.apply(W(a, s));
-  }
-  datePickers(a) {
-    return this.apply(q(a));
-  }
-  datePickerByUid(a, s) {
-    return this.apply(K(a, s));
-  }
-  dateTimePickers(a) {
-    return this.apply(Q(a));
-  }
-  dateTimePickerByUid(a, s) {
-    return this.apply(S(a, s));
-  }
-  rangeCalendars(a) {
-    return this.apply(X(a));
-  }
-  rangeCalendarByUid(a, s) {
-    return this.apply(Y(a, s));
-  }
-  rangeDateInputs(a) {
-    return this.apply(Z(a));
-  }
-  rangeDateInputByUid(a, s) {
-    return this.apply(J(a, s));
-  }
-  rangeTimeInputs(a) {
-    return this.apply(aa(a));
-  }
-  rangeTimeInputByUid(a, s) {
-    return this.apply(sa(a, s));
-  }
-  rangeDateTimeInputs(a) {
-    return this.apply(ta(a));
-  }
-  rangeDateTimeInputByUid(a, s) {
-    return this.apply(ea(a, s));
-  }
-  rangeDateTimeCalendars(a) {
-    return this.apply(ia(a));
-  }
-  rangeDateTimeCalendarByUid(a, s) {
-    return this.apply(ra(a, s));
-  }
-  rangeDateTimePickers(a) {
-    return this.apply(na(a));
-  }
-  rangeDateTimePickerByUid(a, s) {
-    return this.apply(ua(a, s));
-  }
-  rangeDatePickers(a) {
-    return this.apply(la(a));
-  }
-  rangeDatePickerByUid(a, s) {
-    return this.apply(pa(a, s));
-  }
-  rangeTimePickers(a) {
-    return this.apply(ga(a));
-  }
-  rangeTimePickerByUid(a, s) {
-    return this.apply(da(a, s));
-  }
-  repeaters(a) {
-    return this.apply(ya(a));
-  }
-  repeaterByUid(a, s) {
-    return this.apply(oa(a, s));
-  }
-  // ─── Type selectors — actions, displays, layouts ───
-  actions(a) {
-    return this.apply(ca(a));
-  }
-  actionByUid(a, s) {
-    return this.apply(_a(a, s));
-  }
-  layouts(a) {
-    return this.apply(ha(a));
-  }
-  layoutByUid(a, s) {
-    return this.apply(ma(a, s));
-  }
-  displays(a) {
-    return this.apply(Ba(a));
-  }
-  displayByUid(a, s) {
-    return this.apply(Ua(a, s));
-  }
-  alerts(a) {
-    return this.apply(Ta(a));
-  }
-  alertByUid(a, s) {
-    return this.apply(ka(a, s));
-  }
-  markdownTexts(a) {
-    return this.apply(Da(a));
-  }
-  markdownTextByUid(a, s) {
-    return this.apply(Ia(a, s));
-  }
-  tabs(a) {
-    return this.apply(Pa(a));
-  }
-  tabsByUid(a, s) {
-    return this.apply(Ca(a, s));
-  }
-  accordions(a) {
-    return this.apply(fa(a));
-  }
-  accordionByUid(a, s) {
-    return this.apply(Ra(a, s));
-  }
-  // ─── Type selectors — custom kinds ───
-  customInputs(a) {
-    return this.apply(wa(a));
-  }
-  customInputByUid(a, s) {
-    return this.apply(xa(a, s));
-  }
-  customActions(a) {
-    return this.apply(ba(a));
-  }
-  customActionByUid(a, s) {
-    return this.apply(Aa(a, s));
-  }
-  customDisplays(a) {
-    return this.apply(La(a));
-  }
-  customDisplayByUid(a, s) {
-    return this.apply(Ma(a, s));
-  }
-  customLayouts(a) {
-    return this.apply($a(a));
-  }
-  customLayoutByUid(a, s) {
-    return this.apply(Fa(a, s));
-  }
+function s(r) {
+  return typeof r == "object" && r !== null && "$ref" in r && typeof r.$ref == "string" && Object.keys(r).length === 1;
 }
-const Ms = {
-  inputs: {
-    textInput: Rs,
-    numberInput: fs,
-    booleanInput: Cs,
-    select: Ps,
-    dropdown: Is,
-    radiogroup: Ds,
-    checkbox: ks,
-    textarea: Ts,
-    password: Us,
-    currency: Bs,
-    markdown: ms,
-    list: hs,
-    calendar: _s,
-    dateTimeCalendar: cs,
-    dateInput: os,
-    datePicker: ys,
-    dateTimePicker: ds,
-    timeInput: gs,
-    timePicker: ps,
-    dateTimeInput: ls,
-    rangeCalendar: us,
-    rangeDateInput: ns,
-    rangeDateTimeInput: rs,
-    rangeDateTimeCalendar: is,
-    rangeDateTimePicker: es,
-    rangeTimeInput: ts,
-    rangeDatePicker: ss,
-    rangeTimePicker: as,
-    repeater: Ja,
-    tags: Za,
-    custom: Ya
-  },
-  actions: {
-    button: Xa,
-    custom: Sa
-  },
-  displays: {
-    display: Qa,
-    alert: Ka,
-    markdownText: qa,
-    custom: Wa
-  },
-  layouts: {
-    flex: Ea,
-    horizontalFlex: Va,
-    verticalFlex: Na,
-    grid: Ha,
-    horizontalGrid: Oa,
-    verticalGrid: ja,
-    tabs: za,
-    accordion: va,
-    custom: Ga
-  },
-  selectors: r.root()
-};
-function ws(t) {
-  return typeof t == "object" && t !== null && "$ref" in t && typeof t.$ref == "string" && Object.keys(t).length === 1;
+async function i(r, t) {
+  const n = new URL(r, t).href, e = await fetch(n);
+  if (!e.ok) throw new Error(`Failed to load form chunk ${n}: ${e.status}`);
+  const { $schema: a, ...c } = await e.json();
+  return o(c, n);
 }
-async function xs(t, a) {
-  const s = new URL(t, a).href, e = await fetch(s);
-  if (!e.ok) throw new Error(`Failed to load form chunk ${s}: ${e.status}`);
-  const { $schema: n, ...i } = await e.json();
-  return p(i, s);
-}
-async function p(t, a) {
-  if (ws(t)) return xs(t.$ref, a);
-  const s = t;
-  if (Array.isArray(s.children)) {
-    const e = await Promise.all(s.children.map((n) => p(n, a)));
-    return { ...s, children: e };
-  }
-  return t;
+async function o(r, t) {
+  if (s(r)) return i(r.$ref, t);
+  const n = r;
+  if (Array.isArray(n.children)) {
+    const e = await Promise.all(n.children.map((a) => o(a, t)));
+    return { ...n, children: e };
+  }
+  return r;
 }
-async function $s(t, a) {
-  const s = await Promise.all(
-    t.form.map((e) => p(e, a))
+async function l(r, t) {
+  const n = await Promise.all(
+    r.form.map((e) => o(e, t))
   );
-  return { ...t, form: s };
+  return { ...r, form: n };
 }
 export {
-  Ms as gui,
-  $s as resolveChunkRefs
+  p as gui,
+  l as resolveChunkRefs
 };

package/index.umd.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./resolveFormInput-DDKerzen.cjs");require("@golemui/dx");require("@golemui/core");class n{constructor(t){this.conditions=t}static root(){return new n([])}tag(t){return new n([...this.conditions,{kind:"tagsAnd",tags:[t]}])}state(t){return new n([...this.conditions,{kind:"state",name:t}])}tagsAnd(t){return new n([...this.conditions,{kind:"tagsAnd",tags:t}])}tagsOr(t){return new n([...this.conditions,{kind:"tagsOr",tags:t}])}apply(t){if(this.conditions.length===0)return t;const i=this.conditions.find(a=>a.kind==="state"),s=this.conditions.filter(a=>a.kind!=="state"),u=t.matcher;return{...t,matcher:a=>{if(!u(a))return!1;for(const l of s){const d=a.tags??[];if(l.kind==="tagsAnd"){for(const p of l.tags)if(!d.includes(p))return!1}else{if(l.tags.length===0)continue;if(!l.tags.some(p=>d.includes(p)))return!1}}return!0},...i?{targetState:i.name}:{}}}inputs(t){return this.apply(e._gslInputs(t))}inputByUid(t,i){return this.apply(e._gslInputByUid(t,i))}textInputs(t){return this.apply(e._gslTextInputs(t))}numberInputs(t){return this.apply(e._gslNumberInputs(t))}booleanInputs(t){return this.apply(e._gslBooleanInputs(t))}selects(t){return this.apply(e._gslSelects(t))}selectByUid(t,i){return this.apply(e._gslSelectByUid(t,i))}dropdowns(t){return this.apply(e._gslDropdowns(t))}dropdownByUid(t,i){return this.apply(e._gslDropdownByUid(t,i))}radiogroups(t){return this.apply(e._gslRadiogroups(t))}radiogroupByUid(t,i){return this.apply(e._gslRadiogroupByUid(t,i))}checkboxes(t){return this.apply(e._gslCheckboxes(t))}checkboxByUid(t,i){return this.apply(e._gslCheckboxByUid(t,i))}textareas(t){return this.apply(e._gslTextareas(t))}textareaByUid(t,i){return this.apply(e._gslTextareaByUid(t,i))}passwords(t){return this.apply(e._gslPasswords(t))}passwordByUid(t,i){return this.apply(e._gslPasswordByUid(t,i))}currencies(t){return this.apply(e._gslCurrencies(t))}currencyByUid(t,i){return this.apply(e._gslCurrencyByUid(t,i))}markdowns(t){return this.apply(e._gslMarkdowns(t))}markdownByUid(t,i){return this.apply(e._gslMarkdownByUid(t,i))}lists(t){return this.apply(e._gslLists(t))}listByUid(t,i){return this.apply(e._gslListByUid(t,i))}calendars(t){return this.apply(e._gslCalendars(t))}calendarByUid(t,i){return this.apply(e._gslCalendarByUid(t,i))}dateTimeCalendars(t){return this.apply(e._gslDateTimeCalendars(t))}dateTimeCalendarByUid(t,i){return this.apply(e._gslDateTimeCalendarByUid(t,i))}dateInputs(t){return this.apply(e._gslDateInputs(t))}dateInputByUid(t,i){return this.apply(e._gslDateInputByUid(t,i))}timeInputs(t){return this.apply(e._gslTimeInputs(t))}timeInputByUid(t,i){return this.apply(e._gslTimeInputByUid(t,i))}timePickers(t){return this.apply(e._gslTimePickers(t))}timePickerByUid(t,i){return this.apply(e._gslTimePickerByUid(t,i))}dateTimeInputs(t){return this.apply(e._gslDateTimeInputs(t))}dateTimeInputByUid(t,i){return this.apply(e._gslDateTimeInputByUid(t,i))}datePickers(t){return this.apply(e._gslDatePickers(t))}datePickerByUid(t,i){return this.apply(e._gslDatePickerByUid(t,i))}dateTimePickers(t){return this.apply(e._gslDateTimePickers(t))}dateTimePickerByUid(t,i){return this.apply(e._gslDateTimePickerByUid(t,i))}rangeCalendars(t){return this.apply(e._gslRangeCalendars(t))}rangeCalendarByUid(t,i){return this.apply(e._gslRangeCalendarByUid(t,i))}rangeDateInputs(t){return this.apply(e._gslRangeDateInputs(t))}rangeDateInputByUid(t,i){return this.apply(e._gslRangeDateInputByUid(t,i))}rangeTimeInputs(t){return this.apply(e._gslRangeTimeInputs(t))}rangeTimeInputByUid(t,i){return this.apply(e._gslRangeTimeInputByUid(t,i))}rangeDateTimeInputs(t){return this.apply(e._gslRangeDateTimeInputs(t))}rangeDateTimeInputByUid(t,i){return this.apply(e._gslRangeDateTimeInputByUid(t,i))}rangeDateTimeCalendars(t){return this.apply(e._gslRangeDateTimeCalendars(t))}rangeDateTimeCalendarByUid(t,i){return this.apply(e._gslRangeDateTimeCalendarByUid(t,i))}rangeDateTimePickers(t){return this.apply(e._gslRangeDateTimePickers(t))}rangeDateTimePickerByUid(t,i){return this.apply(e._gslRangeDateTimePickerByUid(t,i))}rangeDatePickers(t){return this.apply(e._gslRangeDatePickers(t))}rangeDatePickerByUid(t,i){return this.apply(e._gslRangeDatePickerByUid(t,i))}rangeTimePickers(t){return this.apply(e._gslRangeTimePickers(t))}rangeTimePickerByUid(t,i){return this.apply(e._gslRangeTimePickerByUid(t,i))}repeaters(t){return this.apply(e._gslRepeaters(t))}repeaterByUid(t,i){return this.apply(e._gslRepeaterByUid(t,i))}actions(t){return this.apply(e._gslActions(t))}actionByUid(t,i){return this.apply(e._gslActionByUid(t,i))}layouts(t){return this.apply(e._gslLayouts(t))}layoutByUid(t,i){return this.apply(e._gslLayoutByUid(t,i))}displays(t){return this.apply(e._gslDisplays(t))}displayByUid(t,i){return this.apply(e._gslDisplayByUid(t,i))}alerts(t){return this.apply(e._gslAlerts(t))}alertByUid(t,i){return this.apply(e._gslAlertByUid(t,i))}markdownTexts(t){return this.apply(e._gslMarkdownTexts(t))}markdownTextByUid(t,i){return this.apply(e._gslMarkdownTextByUid(t,i))}tabs(t){return this.apply(e._gslTabs(t))}tabsByUid(t,i){return this.apply(e._gslTabsByUid(t,i))}accordions(t){return this.apply(e._gslAccordions(t))}accordionByUid(t,i){return this.apply(e._gslAccordionByUid(t,i))}customInputs(t){return this.apply(e._gslCustomInputs(t))}customInputByUid(t,i){return this.apply(e._gslCustomInputByUid(t,i))}customActions(t){return this.apply(e._gslCustomActions(t))}customActionByUid(t,i){return this.apply(e._gslCustomActionByUid(t,i))}customDisplays(t){return this.apply(e._gslCustomDisplays(t))}customDisplayByUid(t,i){return this.apply(e._gslCustomDisplayByUid(t,i))}customLayouts(t){return this.apply(e._gslCustomLayouts(t))}customLayoutByUid(t,i){return this.apply(e._gslCustomLayoutByUid(t,i))}}const o={inputs:{textInput:e._guiTextInput,numberInput:e._guiNumberInput,booleanInput:e._guiBooleanInput,select:e._guiSelect,dropdown:e._guiDropdown,radiogroup:e._guiRadiogroup,checkbox:e._guiCheckbox,textarea:e._guiTextarea,password:e._guiPassword,currency:e._guiCurrency,markdown:e._guiMarkdown,list:e._guiList,calendar:e._guiCalendar,dateTimeCalendar:e._guiDateTimeCalendar,dateInput:e._guiDateInput,datePicker:e._guiDatePicker,dateTimePicker:e._guiDateTimePicker,timeInput:e._guiTimeInput,timePicker:e._guiTimePicker,dateTimeInput:e._guiDateTimeInput,rangeCalendar:e._guiRangeCalendar,rangeDateInput:e._guiRangeDateInput,rangeDateTimeInput:e._guiRangeDateTimeInput,rangeDateTimeCalendar:e._guiRangeDateTimeCalendar,rangeDateTimePicker:e._guiRangeDateTimePicker,rangeTimeInput:e._guiRangeTimeInput,rangeDatePicker:e._guiRangeDatePicker,rangeTimePicker:e._guiRangeTimePicker,repeater:e._guiRepeater,tags:e._guiTags,custom:e._guiCustomInput},actions:{button:e._guiButton,custom:e._guiCustomAction},displays:{display:e._guiDisplay,alert:e._guiAlert,markdownText:e._guiMarkdownText,custom:e._guiCustomDisplay},layouts:{flex:e._guiFlex,horizontalFlex:e._guiHorizontalFlex,verticalFlex:e._guiVerticalFlex,grid:e._guiGrid,horizontalGrid:e._guiHorizontalGrid,verticalGrid:e._guiVerticalGrid,tabs:e._guiTabs,accordion:e._guiAccordion,custom:e._guiCustomLayout},selectors:n.root()};function y(r){return typeof r=="object"&&r!==null&&"$ref"in r&&typeof r.$ref=="string"&&Object.keys(r).length===1}async function c(r,t){const i=new URL(r,t).href,s=await fetch(i);if(!s.ok)throw new Error(`Failed to load form chunk ${i}: ${s.status}`);const{$schema:u,...a}=await s.json();return g(a,i)}async function g(r,t){if(y(r))return c(r.$ref,t);const i=r;if(Array.isArray(i.children)){const s=await Promise.all(i.children.map(u=>g(u,t)));return{...i,children:s}}return r}async function _(r,t){const i=await Promise.all(r.form.map(s=>g(s,t)));return{...r,form:i}}exports.gui=o;exports.resolveChunkRefs=_;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("./resolveFormInput-UcmQ-kme.cjs");require("@golemui/dx");require("@golemui/core");function c(e){return typeof e=="object"&&e!==null&&"$ref"in e&&typeof e.$ref=="string"&&Object.keys(e).length===1}async function a(e,t){const r=new URL(e,t).href,n=await fetch(r);if(!n.ok)throw new Error(`Failed to load form chunk ${r}: ${n.status}`);const{$schema:s,...u}=await n.json();return o(u,r)}async function o(e,t){if(c(e))return a(e.$ref,t);const r=e;if(Array.isArray(r.children)){const n=await Promise.all(r.children.map(s=>o(s,t)));return{...r,children:n}}return e}async function f(e,t){const r=await Promise.all(e.form.map(n=>o(n,t)));return{...e,form:r}}exports.gui=i.gui;exports.resolveChunkRefs=f;

package/internals.js

@@ -1,4 +1,4 @@
-import { ag as c, af as p, a4 as y, a3 as m, aa as T, a9 as B, d as D, x as U, w as I, l as b, k as C, q as R, r as k, ak as P, aj as f, am as x, al as w, ai as A, ah as h, ao as L, an as S, B as F, A as M, J as O, I as j, z as G, y as v, H as z, G as H, L as N, K as V, a8 as K, a7 as W, h as q, g as E, a as J, _ as Q, a6 as X, a5 as Y, v as Z, u as $, t as aa, ac as sa, ab as ea, s as ia, c as ga, p as ta, o as la, j as _a, i as ua, N as ra, M as na, P as oa, O as da, Z as ca, Y as pa, V as ya, U as ma, T as Ta, S as Ba, X as Da, W as Ua, R as Ia, Q as ba, a0 as Ca, $ as Ra, a2 as ka, a1 as Pa, f as fa, e as xa, ad as wa, ae as Aa, b7 as ha, b8 as La, b as Sa, n as Fa, m as Ma, D as Oa, C as ja, F as Ga, E as va, aq as za, aA as Ha, b4 as Na, aD as Va, aW as Ka, b0 as Wa, aZ as qa, aC as Ea, ay as Ja, aE as Qa, ap as Xa, aU as Ya, aT as Za, aV as $a, aP as as, aS as ss, aB as es, b2 as is, ax as gs, au as ts, aw as ls, at as _s, aX as us, aY as rs, az as ns, b5 as os, a_ as ds, b1 as cs, aO as ps, aN as ys, aI as ms, aL as Ts, aM as Bs, aK as Ds, aJ as Us, aH as Is, aG as bs, b3 as Cs, ar as Rs, aF as ks, b6 as Ps, a$ as fs, aR as xs, aQ as ws, av as As, as as hs, b9 as Ls, ba as Ss, bb as Fs } from "./resolveFormInput-Dp0TB3LB.js";
+import { _ as c, a as p, b as y, c as m, d as T, e as B, f as D, h as U, i as b, j as I, k as C, l as R, m as k, n as P, o as f, p as x, q as w, r as A, s as h, t as L, u as S, v as F, w as M, x as O, y as j, z as G, A as v, B as z, C as H, D as N, E as V, F as K, G as W, H as q, I as E, J, K as Q, L as X, M as Y, N as Z, O as $, P as aa, Q as sa, R as ea, S as ia, T as ga, U as ta, V as la, W as _a, X as ua, Y as ra, Z as na, $ as oa, a0 as da, a1 as ca, a2 as pa, a3 as ya, a4 as ma, a5 as Ta, a6 as Ba, a7 as Da, a8 as Ua, a9 as ba, aa as Ia, ab as Ca, ac as Ra, ad as ka, ae as Pa, af as fa, ag as xa, ah as wa, ai as Aa, aj as ha, ak as La, al as Sa, am as Fa, an as Ma, ao as Oa, ap as ja, aq as Ga, ar as va, as as za, at as Ha, au as Na, av as Va, aw as Ka, ax as Wa, ay as qa, az as Ea, aA as Ja, aB as Qa, aC as Xa, aD as Ya, aE as Za, aF as $a, aG as as, aH as ss, aI as es, aJ as is, aK as gs, aL as ts, aM as ls, aN as _s, aO as us, aP as rs, aQ as ns, aR as os, aS as ds, aT as cs, aU as ps, aV as ys, aW as ms, aX as Ts, aY as Bs, aZ as Ds, a_ as Us, a$ as bs, b0 as Is, b1 as Cs, b2 as Rs, b3 as ks, b4 as Ps, b5 as fs, b6 as xs, b7 as ws, b8 as As, b9 as hs, ba as Ls, bb as Ss, bc as Fs } from "./resolveFormInput-CsFeoGjz.js";
 import { createGslSelector as Os, extractWidgetProps as js, isDxDefinitions as Gs, processAutoLabel as vs, processAutoPlaceholder as zs } from "@golemui/dx";
 import "@golemui/gui-validators";
 import "@golemui/core";
@@ -51,8 +51,8 @@ export {
   B as _gslAlerts,
   D as _gslBooleanInputs,
   U as _gslCalendarByUid,
-  I as _gslCalendars,
-  b as _gslCheckboxByUid,
+  b as _gslCalendars,
+  I as _gslCheckboxByUid,
   C as _gslCheckboxes,
   R as _gslCurrencies,
   k as _gslCurrencyByUid,
@@ -105,8 +105,8 @@ export {
   Ba as _gslRangeDateTimeInputs,
   Da as _gslRangeDateTimePickerByUid,
   Ua as _gslRangeDateTimePickers,
-  Ia as _gslRangeTimeInputByUid,
-  ba as _gslRangeTimeInputs,
+  ba as _gslRangeTimeInputByUid,
+  Ia as _gslRangeTimeInputs,
   Ca as _gslRangeTimePickerByUid,
   Ra as _gslRangeTimePickers,
   ka as _gslRepeaterByUid,
@@ -161,8 +161,8 @@ export {
   Bs as _guiRangeDateTimeInput,
   Ds as _guiRangeDateTimePicker,
   Us as _guiRangeTimeInput,
-  Is as _guiRangeTimePicker,
-  bs as _guiRepeater,
+  bs as _guiRangeTimePicker,
+  Is as _guiRepeater,
   Cs as _guiSelect,
   Rs as _guiTabs,
   ks as _guiTags,

package/internals.umd.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./resolveFormInput-DDKerzen.cjs"),t=require("@golemui/dx");require("@golemui/gui-validators");require("@golemui/core");function a(i,...s){return s.map(g=>({...g,targetState:i}))}function l(i,...s){return{kind:"aggregated",matcher:g=>g.tags?.includes(i)??!1,children:s}}class _{create(s){return{states:s.states,form:{uid:"gui-root-uid",type:"flex",kind:"layout",children:s.form}}}}function u(){return new _}const r=i=>i!==null&&typeof i=="object"&&Object.prototype.hasOwnProperty.call(i,"label")&&Object.prototype.hasOwnProperty.call(i,"value");function n(i,s){if(i!=null&&typeof i=="object"&&"__rid"in i)return i.__rid;const g=s();return Object.defineProperty(i,"__rid",{value:g,enumerable:!1,configurable:!1}),g}exports._gslAccordionByUid=e._gslAccordionByUid;exports._gslAccordions=e._gslAccordions;exports._gslActionByUid=e._gslActionByUid;exports._gslActions=e._gslActions;exports._gslAlertByUid=e._gslAlertByUid;exports._gslAlerts=e._gslAlerts;exports._gslBooleanInputs=e._gslBooleanInputs;exports._gslCalendarByUid=e._gslCalendarByUid;exports._gslCalendars=e._gslCalendars;exports._gslCheckboxByUid=e._gslCheckboxByUid;exports._gslCheckboxes=e._gslCheckboxes;exports._gslCurrencies=e._gslCurrencies;exports._gslCurrencyByUid=e._gslCurrencyByUid;exports._gslCustomActionByUid=e._gslCustomActionByUid;exports._gslCustomActions=e._gslCustomActions;exports._gslCustomDisplayByUid=e._gslCustomDisplayByUid;exports._gslCustomDisplays=e._gslCustomDisplays;exports._gslCustomInputByUid=e._gslCustomInputByUid;exports._gslCustomInputs=e._gslCustomInputs;exports._gslCustomLayoutByUid=e._gslCustomLayoutByUid;exports._gslCustomLayouts=e._gslCustomLayouts;exports._gslDateInputByUid=e._gslDateInputByUid;exports._gslDateInputs=e._gslDateInputs;exports._gslDatePickerByUid=e._gslDatePickerByUid;exports._gslDatePickers=e._gslDatePickers;exports._gslDateTimeCalendarByUid=e._gslDateTimeCalendarByUid;exports._gslDateTimeCalendars=e._gslDateTimeCalendars;exports._gslDateTimeInputByUid=e._gslDateTimeInputByUid;exports._gslDateTimeInputs=e._gslDateTimeInputs;exports._gslDateTimePickerByUid=e._gslDateTimePickerByUid;exports._gslDateTimePickers=e._gslDateTimePickers;exports._gslDisplayByUid=e._gslDisplayByUid;exports._gslDisplays=e._gslDisplays;exports._gslDropdownByUid=e._gslDropdownByUid;exports._gslDropdowns=e._gslDropdowns;exports._gslInputByUid=e._gslInputByUid;exports._gslInputs=e._gslInputs;exports._gslLayoutByUid=e._gslLayoutByUid;exports._gslLayouts=e._gslLayouts;exports._gslListByUid=e._gslListByUid;exports._gslLists=e._gslLists;exports._gslMarkdownByUid=e._gslMarkdownByUid;exports._gslMarkdownTextByUid=e._gslMarkdownTextByUid;exports._gslMarkdownTexts=e._gslMarkdownTexts;exports._gslMarkdowns=e._gslMarkdowns;exports._gslNumberInputs=e._gslNumberInputs;exports._gslPasswordByUid=e._gslPasswordByUid;exports._gslPasswords=e._gslPasswords;exports._gslRadiogroupByUid=e._gslRadiogroupByUid;exports._gslRadiogroups=e._gslRadiogroups;exports._gslRangeCalendarByUid=e._gslRangeCalendarByUid;exports._gslRangeCalendars=e._gslRangeCalendars;exports._gslRangeDateInputByUid=e._gslRangeDateInputByUid;exports._gslRangeDateInputs=e._gslRangeDateInputs;exports._gslRangeDatePickerByUid=e._gslRangeDatePickerByUid;exports._gslRangeDatePickers=e._gslRangeDatePickers;exports._gslRangeDateTimeCalendarByUid=e._gslRangeDateTimeCalendarByUid;exports._gslRangeDateTimeCalendars=e._gslRangeDateTimeCalendars;exports._gslRangeDateTimeInputByUid=e._gslRangeDateTimeInputByUid;exports._gslRangeDateTimeInputs=e._gslRangeDateTimeInputs;exports._gslRangeDateTimePickerByUid=e._gslRangeDateTimePickerByUid;exports._gslRangeDateTimePickers=e._gslRangeDateTimePickers;exports._gslRangeTimeInputByUid=e._gslRangeTimeInputByUid;exports._gslRangeTimeInputs=e._gslRangeTimeInputs;exports._gslRangeTimePickerByUid=e._gslRangeTimePickerByUid;exports._gslRangeTimePickers=e._gslRangeTimePickers;exports._gslRepeaterByUid=e._gslRepeaterByUid;exports._gslRepeaters=e._gslRepeaters;exports._gslSelectByUid=e._gslSelectByUid;exports._gslSelects=e._gslSelects;exports._gslTabs=e._gslTabs;exports._gslTabsByUid=e._gslTabsByUid;exports._gslTags=e._gslTags;exports._gslTagsByUid=e._gslTagsByUid;exports._gslTextInputs=e._gslTextInputs;exports._gslTextareaByUid=e._gslTextareaByUid;exports._gslTextareas=e._gslTextareas;exports._gslTimeInputByUid=e._gslTimeInputByUid;exports._gslTimeInputs=e._gslTimeInputs;exports._gslTimePickerByUid=e._gslTimePickerByUid;exports._gslTimePickers=e._gslTimePickers;exports._guiAccordion=e._guiAccordion;exports._guiAlert=e._guiAlert;exports._guiBooleanInput=e._guiBooleanInput;exports._guiButton=e._guiButton;exports._guiCalendar=e._guiCalendar;exports._guiCheckbox=e._guiCheckbox;exports._guiCurrency=e._guiCurrency;exports._guiCustomAction=e._guiCustomAction;exports._guiCustomDisplay=e._guiCustomDisplay;exports._guiCustomInput=e._guiCustomInput;exports._guiCustomLayout=e._guiCustomLayout;exports._guiDateInput=e._guiDateInput;exports._guiDatePicker=e._guiDatePicker;exports._guiDateTimeCalendar=e._guiDateTimeCalendar;exports._guiDateTimeInput=e._guiDateTimeInput;exports._guiDateTimePicker=e._guiDateTimePicker;exports._guiDisplay=e._guiDisplay;exports._guiDropdown=e._guiDropdown;exports._guiFlex=e._guiFlex;exports._guiGrid=e._guiGrid;exports._guiHorizontalFlex=e._guiHorizontalFlex;exports._guiHorizontalGrid=e._guiHorizontalGrid;exports._guiList=e._guiList;exports._guiMarkdown=e._guiMarkdown;exports._guiMarkdownText=e._guiMarkdownText;exports._guiNumberInput=e._guiNumberInput;exports._guiPassword=e._guiPassword;exports._guiRadiogroup=e._guiRadiogroup;exports._guiRangeCalendar=e._guiRangeCalendar;exports._guiRangeDateInput=e._guiRangeDateInput;exports._guiRangeDatePicker=e._guiRangeDatePicker;exports._guiRangeDateTimeCalendar=e._guiRangeDateTimeCalendar;exports._guiRangeDateTimeInput=e._guiRangeDateTimeInput;exports._guiRangeDateTimePicker=e._guiRangeDateTimePicker;exports._guiRangeTimeInput=e._guiRangeTimeInput;exports._guiRangeTimePicker=e._guiRangeTimePicker;exports._guiRepeater=e._guiRepeater;exports._guiSelect=e._guiSelect;exports._guiTabs=e._guiTabs;exports._guiTags=e._guiTags;exports._guiTextInput=e._guiTextInput;exports._guiTextarea=e._guiTextarea;exports._guiTimeInput=e._guiTimeInput;exports._guiTimePicker=e._guiTimePicker;exports._guiVerticalFlex=e._guiVerticalFlex;exports._guiVerticalGrid=e._guiVerticalGrid;exports.defineShortcutType=e.defineShortcutType;exports.formDefs=e.formDefs;exports.resolveFormInput=e.resolveFormInput;Object.defineProperty(exports,"createGslSelector",{enumerable:!0,get:()=>t.createGslSelector});Object.defineProperty(exports,"extractWidgetProps",{enumerable:!0,get:()=>t.extractWidgetProps});Object.defineProperty(exports,"isDxDefinitions",{enumerable:!0,get:()=>t.isDxDefinitions});Object.defineProperty(exports,"processAutoLabel",{enumerable:!0,get:()=>t.processAutoLabel});Object.defineProperty(exports,"processAutoPlaceholder",{enumerable:!0,get:()=>t.processAutoPlaceholder});exports._gslStates=a;exports._gslTag=l;exports.getItemKey=n;exports.golemForm=u;exports.isOption=r;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./resolveFormInput-UcmQ-kme.cjs"),t=require("@golemui/dx");require("@golemui/gui-validators");require("@golemui/core");function a(i,...s){return s.map(g=>({...g,targetState:i}))}function l(i,...s){return{kind:"aggregated",matcher:g=>g.tags?.includes(i)??!1,children:s}}class _{create(s){return{states:s.states,form:{uid:"gui-root-uid",type:"flex",kind:"layout",children:s.form}}}}function u(){return new _}const r=i=>i!==null&&typeof i=="object"&&Object.prototype.hasOwnProperty.call(i,"label")&&Object.prototype.hasOwnProperty.call(i,"value");function n(i,s){if(i!=null&&typeof i=="object"&&"__rid"in i)return i.__rid;const g=s();return Object.defineProperty(i,"__rid",{value:g,enumerable:!1,configurable:!1}),g}exports._gslAccordionByUid=e._gslAccordionByUid;exports._gslAccordions=e._gslAccordions;exports._gslActionByUid=e._gslActionByUid;exports._gslActions=e._gslActions;exports._gslAlertByUid=e._gslAlertByUid;exports._gslAlerts=e._gslAlerts;exports._gslBooleanInputs=e._gslBooleanInputs;exports._gslCalendarByUid=e._gslCalendarByUid;exports._gslCalendars=e._gslCalendars;exports._gslCheckboxByUid=e._gslCheckboxByUid;exports._gslCheckboxes=e._gslCheckboxes;exports._gslCurrencies=e._gslCurrencies;exports._gslCurrencyByUid=e._gslCurrencyByUid;exports._gslCustomActionByUid=e._gslCustomActionByUid;exports._gslCustomActions=e._gslCustomActions;exports._gslCustomDisplayByUid=e._gslCustomDisplayByUid;exports._gslCustomDisplays=e._gslCustomDisplays;exports._gslCustomInputByUid=e._gslCustomInputByUid;exports._gslCustomInputs=e._gslCustomInputs;exports._gslCustomLayoutByUid=e._gslCustomLayoutByUid;exports._gslCustomLayouts=e._gslCustomLayouts;exports._gslDateInputByUid=e._gslDateInputByUid;exports._gslDateInputs=e._gslDateInputs;exports._gslDatePickerByUid=e._gslDatePickerByUid;exports._gslDatePickers=e._gslDatePickers;exports._gslDateTimeCalendarByUid=e._gslDateTimeCalendarByUid;exports._gslDateTimeCalendars=e._gslDateTimeCalendars;exports._gslDateTimeInputByUid=e._gslDateTimeInputByUid;exports._gslDateTimeInputs=e._gslDateTimeInputs;exports._gslDateTimePickerByUid=e._gslDateTimePickerByUid;exports._gslDateTimePickers=e._gslDateTimePickers;exports._gslDisplayByUid=e._gslDisplayByUid;exports._gslDisplays=e._gslDisplays;exports._gslDropdownByUid=e._gslDropdownByUid;exports._gslDropdowns=e._gslDropdowns;exports._gslInputByUid=e._gslInputByUid;exports._gslInputs=e._gslInputs;exports._gslLayoutByUid=e._gslLayoutByUid;exports._gslLayouts=e._gslLayouts;exports._gslListByUid=e._gslListByUid;exports._gslLists=e._gslLists;exports._gslMarkdownByUid=e._gslMarkdownByUid;exports._gslMarkdownTextByUid=e._gslMarkdownTextByUid;exports._gslMarkdownTexts=e._gslMarkdownTexts;exports._gslMarkdowns=e._gslMarkdowns;exports._gslNumberInputs=e._gslNumberInputs;exports._gslPasswordByUid=e._gslPasswordByUid;exports._gslPasswords=e._gslPasswords;exports._gslRadiogroupByUid=e._gslRadiogroupByUid;exports._gslRadiogroups=e._gslRadiogroups;exports._gslRangeCalendarByUid=e._gslRangeCalendarByUid;exports._gslRangeCalendars=e._gslRangeCalendars;exports._gslRangeDateInputByUid=e._gslRangeDateInputByUid;exports._gslRangeDateInputs=e._gslRangeDateInputs;exports._gslRangeDatePickerByUid=e._gslRangeDatePickerByUid;exports._gslRangeDatePickers=e._gslRangeDatePickers;exports._gslRangeDateTimeCalendarByUid=e._gslRangeDateTimeCalendarByUid;exports._gslRangeDateTimeCalendars=e._gslRangeDateTimeCalendars;exports._gslRangeDateTimeInputByUid=e._gslRangeDateTimeInputByUid;exports._gslRangeDateTimeInputs=e._gslRangeDateTimeInputs;exports._gslRangeDateTimePickerByUid=e._gslRangeDateTimePickerByUid;exports._gslRangeDateTimePickers=e._gslRangeDateTimePickers;exports._gslRangeTimeInputByUid=e._gslRangeTimeInputByUid;exports._gslRangeTimeInputs=e._gslRangeTimeInputs;exports._gslRangeTimePickerByUid=e._gslRangeTimePickerByUid;exports._gslRangeTimePickers=e._gslRangeTimePickers;exports._gslRepeaterByUid=e._gslRepeaterByUid;exports._gslRepeaters=e._gslRepeaters;exports._gslSelectByUid=e._gslSelectByUid;exports._gslSelects=e._gslSelects;exports._gslTabs=e._gslTabs;exports._gslTabsByUid=e._gslTabsByUid;exports._gslTags=e._gslTags;exports._gslTagsByUid=e._gslTagsByUid;exports._gslTextInputs=e._gslTextInputs;exports._gslTextareaByUid=e._gslTextareaByUid;exports._gslTextareas=e._gslTextareas;exports._gslTimeInputByUid=e._gslTimeInputByUid;exports._gslTimeInputs=e._gslTimeInputs;exports._gslTimePickerByUid=e._gslTimePickerByUid;exports._gslTimePickers=e._gslTimePickers;exports._guiAccordion=e._guiAccordion;exports._guiAlert=e._guiAlert;exports._guiBooleanInput=e._guiBooleanInput;exports._guiButton=e._guiButton;exports._guiCalendar=e._guiCalendar;exports._guiCheckbox=e._guiCheckbox;exports._guiCurrency=e._guiCurrency;exports._guiCustomAction=e._guiCustomAction;exports._guiCustomDisplay=e._guiCustomDisplay;exports._guiCustomInput=e._guiCustomInput;exports._guiCustomLayout=e._guiCustomLayout;exports._guiDateInput=e._guiDateInput;exports._guiDatePicker=e._guiDatePicker;exports._guiDateTimeCalendar=e._guiDateTimeCalendar;exports._guiDateTimeInput=e._guiDateTimeInput;exports._guiDateTimePicker=e._guiDateTimePicker;exports._guiDisplay=e._guiDisplay;exports._guiDropdown=e._guiDropdown;exports._guiFlex=e._guiFlex;exports._guiGrid=e._guiGrid;exports._guiHorizontalFlex=e._guiHorizontalFlex;exports._guiHorizontalGrid=e._guiHorizontalGrid;exports._guiList=e._guiList;exports._guiMarkdown=e._guiMarkdown;exports._guiMarkdownText=e._guiMarkdownText;exports._guiNumberInput=e._guiNumberInput;exports._guiPassword=e._guiPassword;exports._guiRadiogroup=e._guiRadiogroup;exports._guiRangeCalendar=e._guiRangeCalendar;exports._guiRangeDateInput=e._guiRangeDateInput;exports._guiRangeDatePicker=e._guiRangeDatePicker;exports._guiRangeDateTimeCalendar=e._guiRangeDateTimeCalendar;exports._guiRangeDateTimeInput=e._guiRangeDateTimeInput;exports._guiRangeDateTimePicker=e._guiRangeDateTimePicker;exports._guiRangeTimeInput=e._guiRangeTimeInput;exports._guiRangeTimePicker=e._guiRangeTimePicker;exports._guiRepeater=e._guiRepeater;exports._guiSelect=e._guiSelect;exports._guiTabs=e._guiTabs;exports._guiTags=e._guiTags;exports._guiTextInput=e._guiTextInput;exports._guiTextarea=e._guiTextarea;exports._guiTimeInput=e._guiTimeInput;exports._guiTimePicker=e._guiTimePicker;exports._guiVerticalFlex=e._guiVerticalFlex;exports._guiVerticalGrid=e._guiVerticalGrid;exports.defineShortcutType=e.defineShortcutType;exports.formDefs=e.formDefs;exports.resolveFormInput=e.resolveFormInput;Object.defineProperty(exports,"createGslSelector",{enumerable:!0,get:()=>t.createGslSelector});Object.defineProperty(exports,"extractWidgetProps",{enumerable:!0,get:()=>t.extractWidgetProps});Object.defineProperty(exports,"isDxDefinitions",{enumerable:!0,get:()=>t.isDxDefinitions});Object.defineProperty(exports,"processAutoLabel",{enumerable:!0,get:()=>t.processAutoLabel});Object.defineProperty(exports,"processAutoPlaceholder",{enumerable:!0,get:()=>t.processAutoPlaceholder});exports._gslStates=a;exports._gslTag=l;exports.getItemKey=n;exports.golemForm=u;exports.isOption=r;

package/lib/dx/formDef.domain.d.ts

@@ -1,4 +1,5 @@
-export type { GslItemType, WidgetItemDecorator, DxDisplayRenderFn, DxDefinitionItem, DxDefinitions, FormEvents, DxResult, } from '@golemui/dx';
+export type { GslItemType, WidgetItemDecorator, DxDisplayRenderFn, DxDefinitionItem, DxDefinitions, FormEvents, } from '@golemui/dx';
+export type { DxResult } from './guiDependencyTypes';
 export type { DxEventHandler, DxInternalFields, DxCommonFields, DxInputBase, DxActionBase, DxLayoutBase, DxDisplayBase, } from '@golemui/dx';
 export type { DataInputDecorator, NumberDataInputValidator, NumberDataInputDecorator, TextDataInputValidator, TextDataInputDecorator, BooleanDataInputDecorator, InputDecorator, ValidShortcutType, DxRuntimeParams, InputTags, } from './shortcuts/inputs/inputs.domain';
 export type { ActionDecorator, ActionDefCallback, ActionDefOrCallback, } from './shortcuts/actions/actions.domain';

package/lib/dx/formDefs.d.ts

@@ -1,5 +1,7 @@
 /**
  * The gui widget set's DX form-definition service: transforms `gui.*` form
- * definitions into fully-fledged core forms.
+ * definitions into fully-fledged core forms. Built by the gui
+ * `createImplementation` call in `gui.ts`; re-exported here so the
+ * pre-refactor import path keeps working.
  */
-export declare const formDefs: import('@golemui/dx').DxService;
+export declare const formDefs: import('@golemui/dx').DxService<import('../shared').Dependencies>;