@aplus-frontend/ui 0.1.4 → 0.1.6

package/es/src/ap-field/select/index.vue.d.ts

@@ -1,5 +1,13 @@
+import { DefaultOptionType, SelectValue, LabeledValue } from 'ant-design-vue/es/select';
 import { ApFieldSelectProps, FieldMode } from '../interface';
-import { DefineComponent, ComponentOptionsMixin, PublicProps, ExtractPropTypes, PropType } from 'vue';
+import { DefineComponent, ComponentOptionsMixin, PublicProps, ExtractPropTypes, PropType, CSSProperties, ComponentProvideOptions } from 'vue';
+import { VueTypeValidableDef } from '../../../node_modules/vue-types';
+import { ButtonSize } from 'ant-design-vue/es/button';
+import { VueNode } from 'ant-design-vue/es/_util/type';
+import { SelectHandler, FieldNames, FilterFunc } from 'ant-design-vue/es/vc-select/Select';
+import { RenderDOMFunc, DropdownRender, CustomTagProps } from 'ant-design-vue/es/vc-select/BaseSelect';
+import { AlignType } from 'ant-design-vue/es/vc-trigger/interface';
+import { SelectProps } from 'ant-design-vue';
 type ApFieldSelectSlots = {
     notFoundContent: any;
     suffixIcon: any;
@@ -18,51 +26,193 @@ declare function requestIfNeeded(clear?: boolean): Promise<void>;
 declare function focus(): void;
 declare function blur(): void;
 declare function __VLS_template(): Readonly<ApFieldSelectSlots> & ApFieldSelectSlots;
-declare const __VLS_component: DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToOption<ApFieldSelectProps>, {
-    mode: string;
-    emptyText: string;
-    bordered: undefined;
-    open: undefined;
-    disabled: undefined;
-    autofocus: undefined;
-    virtual: undefined;
-    loading: undefined;
-    allowClear: boolean;
-    showSearch: undefined;
-    defaultOpen: undefined;
-    showArrow: undefined;
-    autoClearSearchValue: undefined;
-    defaultActiveFirstOption: undefined;
-    labelInValue: undefined;
-    multiple: undefined;
-    searchMode: string;
-}>, {
+declare const __VLS_component: DefineComponent<ApFieldSelectProps, {
     focus: typeof focus;
     blur: typeof blur;
     request: typeof requestIfNeeded;
-}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
+}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
     "update:value": (...args: any[]) => void;
-}, string, PublicProps, Readonly< ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<ApFieldSelectProps>, {
-    mode: string;
-    emptyText: string;
-    bordered: undefined;
-    open: undefined;
-    disabled: undefined;
-    autofocus: undefined;
-    virtual: undefined;
-    loading: undefined;
-    allowClear: boolean;
-    showSearch: undefined;
-    defaultOpen: undefined;
-    showArrow: undefined;
-    autoClearSearchValue: undefined;
-    defaultActiveFirstOption: undefined;
-    labelInValue: undefined;
-    multiple: undefined;
-    searchMode: string;
-}>>> & {
+}, string, PublicProps, Readonly<{
+    mode?: FieldMode;
+    class?: unknown;
+    style?: unknown;
+} & Omit<Partial< ExtractPropTypes<{
+    value: {
+        type: PropType<SelectValue>;
+        default: SelectValue;
+    };
+    defaultValue: {
+        type: PropType<SelectValue>;
+        default: SelectValue;
+    };
+    notFoundContent: VueTypeValidableDef<any>;
+    suffixIcon: VueTypeValidableDef<any>;
+    itemIcon: VueTypeValidableDef<any>;
+    size: {
+        type: PropType<ButtonSize>;
+        default: ButtonSize;
+    };
+    mode: {
+        type: PropType<"multiple" | "tags" | "SECRET_COMBOBOX_MODE_DO_NOT_USE">;
+        default: "multiple" | "tags" | "SECRET_COMBOBOX_MODE_DO_NOT_USE";
+    };
+    bordered: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    transitionName: StringConstructor;
+    choiceTransitionName: {
+        type: PropType<"">;
+        default: "";
+    };
+    popupClassName: StringConstructor;
+    dropdownClassName: StringConstructor;
+    placement: {
+        type: PropType<"bottomLeft" | "bottomRight" | "topLeft" | "topRight">;
+        default: "bottomLeft" | "bottomRight" | "topLeft" | "topRight";
+    };
+    status: {
+        type: PropType<"" | "error" | "warning">;
+        default: "" | "error" | "warning";
+    };
+    'onUpdate:value': {
+        type: PropType<(val: SelectValue) => void>;
+        default: (val: SelectValue) => void;
+    };
+    children: PropType< VueNode[]>;
+    listHeight: NumberConstructor;
+    onMouseenter: PropType<(e: MouseEvent) => void>;
+    onMouseleave: PropType<(e: MouseEvent) => void>;
+    tabindex: NumberConstructor;
+    onClick: PropType<(e: MouseEvent) => void>;
+    onFocus: {
+        type: PropType<(e: FocusEvent) => void>;
+    };
+    onBlur: {
+        type: PropType<(e: FocusEvent) => void>;
+    };
+    onChange: PropType<(value: SelectValue, option: DefaultOptionType | DefaultOptionType[]) => void>;
+    onKeydown: PropType<(e: KeyboardEvent) => void>;
+    onKeyup: PropType<(e: KeyboardEvent) => void>;
+    onMousedown: PropType<(e: MouseEvent) => void>;
+    onSelect: PropType<SelectHandler<(string | number) | LabeledValue, DefaultOptionType>>;
+    open: {
+        type: BooleanConstructor;
+        default: any;
+    };
+    animation: StringConstructor;
+    direction: {
+        type: PropType<"rtl" | "ltr">;
+    };
+    disabled: {
+        type: BooleanConstructor;
+        default: any;
+    };
+    prefixCls: StringConstructor;
+    id: StringConstructor;
+    autofocus: BooleanConstructor;
+    getPopupContainer: {
+        type: PropType<RenderDOMFunc>;
+    };
+    virtual: {
+        type: BooleanConstructor;
+        default: any;
+    };
+    dropdownMatchSelectWidth: {
+        type: PropType<number | boolean>;
+        default: any;
+    };
+    options: PropType<DefaultOptionType[]>;
+    showAction: {
+        type: PropType<("click" | "focus")[]>;
+    };
+    placeholder: VueTypeValidableDef<any>;
+    onDeselect: PropType<SelectHandler<(string | number) | LabeledValue, DefaultOptionType>>;
+    loading: {
+        type: BooleanConstructor;
+        default: any;
+    };
+    clearIcon: VueTypeValidableDef<any>;
+    allowClear: {
+        type: BooleanConstructor;
+        default: any;
+    };
+    onSearch: PropType<(value: string) => void>;
+    fieldNames: PropType<FieldNames>;
+    dropdownStyle: {
+        type: PropType<CSSProperties>;
+    };
+    dropdownRender: {
+        type: PropType<DropdownRender>;
+    };
+    dropdownAlign: PropType<AlignType>;
+    showSearch: {
+        type: BooleanConstructor;
+        default: any;
+    };
+    searchValue: StringConstructor;
+    onInputKeyDown: PropType<(e: KeyboardEvent) => void>;
+    removeIcon: VueTypeValidableDef<any>;
+    maxTagCount: {
+        type: PropType<number | "responsive">;
+    };
+    maxTagTextLength: NumberConstructor;
+    maxTagPlaceholder: VueTypeValidableDef<any>;
+    tokenSeparators: {
+        type: PropType<string[]>;
+    };
+    tagRender: {
+        type: PropType<(props: CustomTagProps) => any>;
+    };
+    optionLabelRender: {
+        type: PropType<(option: Record<string, any>) => any>;
+    };
+    onClear: PropType<() => void>;
+    defaultOpen: {
+        type: BooleanConstructor;
+        default: any;
+    };
+    onDropdownVisibleChange: {
+        type: PropType<(open: boolean) => void>;
+    };
+    showArrow: {
+        type: BooleanConstructor;
+        default: any;
+    };
+    onPopupScroll: PropType<(e: UIEvent) => void>;
+    menuItemSelectedIcon: VueTypeValidableDef<any>;
+    listItemHeight: NumberConstructor;
+    inputValue: StringConstructor;
+    autoClearSearchValue: {
+        type: BooleanConstructor;
+        default: any;
+    };
+    filterOption: {
+        type: PropType<boolean | FilterFunc<DefaultOptionType>>;
+        default: any;
+    };
+    filterSort: PropType<(optionA: DefaultOptionType, optionB: DefaultOptionType) => number>;
+    optionFilterProp: StringConstructor;
+    optionLabelProp: StringConstructor;
+    defaultActiveFirstOption: {
+        type: BooleanConstructor;
+        default: any;
+    };
+    labelInValue: {
+        type: BooleanConstructor;
+        default: any;
+    };
+}>>, "mode" | "value" | "onUpdate:value" | "onSearch"> & {
+    emptyText?: string;
+    request?: (value?: string) => Promise< SelectProps["options"]>;
+    multiple?: boolean;
+    value?: SelectProps["value"];
+    'onUpdate:value'?: SelectProps["onUpdate:value"];
+    searchMode?: "filter" | "request";
+    refetchOnFocus?: boolean;
+} & {
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
-}, {
+}>, {
     mode: FieldMode;
     virtual: boolean;
     open: boolean;
@@ -80,28 +230,11 @@ declare const __VLS_component: DefineComponent<__VLS_WithDefaults<__VLS_TypeProp
     multiple: boolean;
     emptyText: string;
     searchMode: "filter" | "request";
-}, {}>;
+}, {}, {}, {}, string, ComponentProvideOptions, false, {}>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;
-type __VLS_WithDefaults<P, D> = {
-    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_Prettify<P[K] & {
-        default: D[K];
-    }> : P[K];
-};
-type __VLS_Prettify<T> = {
-    [K in keyof T]: T[K];
-} & {};
 type __VLS_WithTemplateSlots<T, S> = T & {
     new (): {
         $slots: S;
     };
 };
-type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
-type __VLS_TypePropsToOption<T> = {
-    [K in keyof T]-?: {} extends Pick<T, K> ? {
-        type: PropType<__VLS_NonUndefinedable<T[K]>>;
-    } : {
-        type: PropType<T[K]>;
-        required: true;
-    };
-};

package/es/src/ap-field/select/index.vue.mjs

@@ -1,11 +1,11 @@
-import { defineComponent as k, ref as c, onMounted as q, computed as m, unref as a, openBlock as v, createElementBlock as A, toDisplayString as M, createBlock as O, mergeProps as T, createSlots as _, renderList as R, withCtx as h, renderSlot as D, normalizeProps as U, guardReactiveProps as L, createVNode as z } from "vue";
-import { debounce as K, isFunction as y, isArray as H, isNil as $, omit as j } from "lodash-unified";
-import { Select as E, Spin as W } from "ant-design-vue";
+import { defineComponent as k, ref as f, onMounted as q, computed as m, unref as r, openBlock as v, createElementBlock as A, toDisplayString as M, createBlock as T, mergeProps as _, createSlots as R, renderList as D, withCtx as h, renderSlot as U, normalizeProps as L, guardReactiveProps as z, createVNode as K } from "vue";
+import { debounce as H, isFunction as y, isArray as $, isNil as j, omit as E } from "lodash-unified";
+import { Select as W, Spin as G } from "ant-design-vue";
 import "../../hooks/index.mjs";
-import { omitUndefined as G } from "../../utils/index.mjs";
-import { useDefaultPlaceholder as J } from "../hooks/use-default-placeholder.mjs";
-import { useControllableValue as Q } from "../../hooks/useControllableValue.mjs";
-const X = { key: 0 }, ae = /* @__PURE__ */ k({
+import { omitUndefined as J } from "../../utils/index.mjs";
+import { useDefaultPlaceholder as Q } from "../hooks/use-default-placeholder.mjs";
+import { useControllableValue as X } from "../../hooks/useControllableValue.mjs";
+const Y = { key: 0 }, re = /* @__PURE__ */ k({
   name: "ApFieldSelect",
   __name: "index",
   props: {
@@ -88,56 +88,61 @@ const X = { key: 0 }, ae = /* @__PURE__ */ k({
     multiple: { type: Boolean, default: void 0 },
     value: {},
     "onUpdate:value": {},
-    searchMode: { default: "filter" }
+    searchMode: { default: "filter" },
+    refetchOnFocus: { type: Boolean }
   },
   emits: ["update:value"],
   setup(w, { expose: S, emit: g }) {
-    let i = 0;
-    const B = K((o) => {
+    let u = 0;
+    const B = H((o) => {
       if (!y(e.request))
         return;
-      i += 1;
-      const t = i;
-      r.value = [], u.value = !0, e.request(o).then((l) => {
-        i === t && (r.value = l);
+      u += 1;
+      const t = u;
+      i.value = [], n.value = !0, e.request(o).then((l) => {
+        u === t && (i.value = l);
       }).finally(() => {
-        u.value = !1;
+        n.value = !1;
       });
-    }, 300), e = w, b = (o, t) => {
-      var n;
-      const l = ((n = e.fieldNames) == null ? void 0 : n.label) || "label";
+    }, 300), e = w, F = (o, t) => {
+      var a;
+      const l = ((a = e.fieldNames) == null ? void 0 : a.label) || "label";
       return typeof (t == null ? void 0 : t.label) == "string" && t[l].indexOf(o) > -1;
-    }, r = c((e == null ? void 0 : e.options) || []), d = c(), u = c((e == null ? void 0 : e.loading) || !1), C = g;
-    async function f(o = !0) {
+    }, i = f((e == null ? void 0 : e.options) || []), d = f(), n = f((e == null ? void 0 : e.loading) || !1), b = g;
+    async function s(o = !0) {
       if (!y(e.request))
         return;
-      u.value = !0, i += 1;
-      const t = i;
+      n.value = !0, u += 1;
+      const t = u;
       try {
-        o && (r.value = []);
+        o && (i.value = []);
         const l = await e.request();
-        if (t !== i)
+        if (t !== u)
           return;
-        r.value = l;
+        i.value = l;
       } finally {
-        u.value = !1;
+        n.value = !1;
       }
     }
+    function C(o) {
+      var t;
+      (t = e.onFocus) == null || t.call(e, o), e.refetchOnFocus && u > 0 && !n.value && s(!0);
+    }
     q(() => {
-      f();
+      s();
     });
-    const { value: p, updateValue: x } = Q(e, C), F = J("Select", e), I = m(() => {
-      const o = a(p);
+    const { value: p, updateValue: x } = X(e, b), I = Q("Select", e), O = m(() => {
+      const o = r(p);
       if (!o)
         return e.emptyText;
-      if (H(o))
+      if ($(o))
         return o.map(
           (l) => {
-            var n;
-            return (n = a(r).find((s) => s.value === l)) == null ? void 0 : n.label;
+            var a;
+            return (a = r(i).find((c) => c.value === l)) == null ? void 0 : a.label;
           }
         ).filter(Boolean).join("、") || e.emptyText;
-      const t = a(r).find((l) => l.value === o);
+      const t = r(i).find((l) => l.value === o);
       return (t == null ? void 0 : t.label) || e.emptyText;
     }), P = m(() => {
       const o = !!(e != null && e.showSearch), t = e.searchMode;
@@ -146,22 +151,23 @@ const X = { key: 0 }, ae = /* @__PURE__ */ k({
         showArrow: !1,
         defaultActiveFirstOption: !1,
         onSearch: B,
-        notFoundContent: u.value ? void 0 : null
+        notFoundContent: n.value ? void 0 : null
       } : {
         showArrow: !0,
-        filterOption: $(e == null ? void 0 : e.filterOption) ? b : e == null ? void 0 : e.filterOption
+        filterOption: j(e == null ? void 0 : e.filterOption) ? F : e == null ? void 0 : e.filterOption
       }), {
-        ...G(
-          j(e, [
+        ...J(
+          E(e, [
             "mode",
             "value",
             "onUpdate:value",
             "onSearch",
             "request",
-            "searchMode"
+            "searchMode",
+            "onFocus"
           ])
         ),
-        placeholder: a(F),
+        placeholder: r(I),
         ...l
       };
     });
@@ -176,29 +182,30 @@ const X = { key: 0 }, ae = /* @__PURE__ */ k({
     return S({
       focus: V,
       blur: N,
-      request: f
-    }), (o, t) => o.mode === "read" ? (v(), A("span", X, M(I.value), 1)) : (v(), O(a(E), T({
+      request: s
+    }), (o, t) => o.mode === "read" ? (v(), A("span", Y, M(O.value), 1)) : (v(), T(r(W), _({
       key: 1,
       "allow-clear": "",
       ref_key: "selectRef",
       ref: d
     }, P.value, {
       mode: o.multiple ? "multiple" : void 0,
-      value: a(p),
-      "onUpdate:value": a(x),
-      options: r.value,
-      loading: u.value
-    }), _({ _: 2 }, [
-      R(o.$slots, (l, n) => ({
-        name: n,
-        fn: h((s) => [
-          D(o.$slots, n, U(L(s || {})))
+      value: r(p),
+      "onUpdate:value": r(x),
+      options: i.value,
+      loading: n.value,
+      onFocus: C
+    }), R({ _: 2 }, [
+      D(o.$slots, (l, a) => ({
+        name: a,
+        fn: h((c) => [
+          U(o.$slots, a, L(z(c || {})))
         ])
       })),
-      u.value ? {
+      n.value ? {
         name: "notFoundContent",
         fn: h(() => [
-          z(a(W), { size: "small" })
+          K(r(G), { size: "small" })
         ]),
         key: "0"
       } : void 0
@@ -206,5 +213,5 @@ const X = { key: 0 }, ae = /* @__PURE__ */ k({
   }
 });
 export {
-  ae as default
+  re as default
 };

package/es/src/ap-field/slider/index.vue.d.ts

@@ -1,5 +1,8 @@
-import { ApFieldSliderProps } from '../interface';
-import { DefineComponent, ComponentOptionsMixin, PublicProps, ExtractPropTypes, PropType } from 'vue';
+import { ApFieldSliderProps, FieldMode } from '../interface';
+import { DefineComponent, ComponentOptionsMixin, PublicProps, ExtractPropTypes, PropType, CSSProperties, ComponentProvideOptions } from 'vue';
+import { SliderRange, SliderMarks } from 'ant-design-vue/es/slider';
+import { TooltipPlacement } from 'ant-design-vue/es/tooltip';
+import { FocusEventHandler } from 'ant-design-vue/es/_util/EventInterface';
 type ApFieldSliderSlots = {
     default?: any;
     mark?: (option: {
@@ -10,30 +13,119 @@ type ApFieldSliderSlots = {
 declare function focus(): void;
 declare function blur(): void;
 declare function __VLS_template(): Readonly<ApFieldSliderSlots> & ApFieldSliderSlots;
-declare const __VLS_component: DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToOption<ApFieldSliderProps>, {
-    included: boolean;
-    min: number;
-    max: number;
-    step: number;
-    tooltipOpen: undefined;
-    tooltipVisible: undefined;
-    emptyText: string;
-}>, {
+declare const __VLS_component: DefineComponent<ApFieldSliderProps, {
     focus: typeof focus;
     blur: typeof blur;
-}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
+}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
     "update:value": (...args: any[]) => void;
-}, string, PublicProps, Readonly< ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<ApFieldSliderProps>, {
-    included: boolean;
-    min: number;
-    max: number;
-    step: number;
-    tooltipOpen: undefined;
-    tooltipVisible: undefined;
-    emptyText: string;
-}>>> & {
+}, string, PublicProps, Readonly<{
+    mode?: FieldMode;
+    class?: unknown;
+    style?: unknown;
+} & Partial< ExtractPropTypes<{
+    id: StringConstructor;
+    prefixCls: StringConstructor;
+    tooltipPrefixCls: StringConstructor;
+    range: {
+        type: PropType<boolean | SliderRange>;
+        default: boolean | SliderRange;
+    };
+    reverse: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    min: NumberConstructor;
+    max: NumberConstructor;
+    step: {
+        type: PropType<number>;
+        default: number;
+    };
+    marks: {
+        type: PropType<SliderMarks>;
+        default: SliderMarks;
+    };
+    dots: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    value: {
+        type: PropType<number | [number, number]>;
+        default: number | [number, number];
+    };
+    defaultValue: {
+        type: PropType<number | [number, number]>;
+        default: number | [number, number];
+    };
+    included: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    disabled: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    vertical: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    tipFormatter: {
+        type: PropType<(value?: number) => any>;
+        default: (value?: number) => any;
+    };
+    tooltipOpen: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    tooltipVisible: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    tooltipPlacement: {
+        type: PropType<TooltipPlacement>;
+        default: TooltipPlacement;
+    };
+    getTooltipPopupContainer: {
+        type: PropType<(triggerNode: HTMLElement) => HTMLElement>;
+        default: (triggerNode: HTMLElement) => HTMLElement;
+    };
+    autofocus: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    handleStyle: {
+        type: PropType< CSSProperties | CSSProperties[]>;
+        default: CSSProperties | CSSProperties[];
+    };
+    trackStyle: {
+        type: PropType< CSSProperties | CSSProperties[]>;
+        default: CSSProperties | CSSProperties[];
+    };
+    onChange: {
+        type: PropType<(value: number | [number, number]) => void>;
+        default: (value: number | [number, number]) => void;
+    };
+    onAfterChange: {
+        type: PropType<(value: number | [number, number]) => void>;
+        default: (value: number | [number, number]) => void;
+    };
+    onFocus: {
+        type: PropType<FocusEventHandler>;
+        default: FocusEventHandler;
+    };
+    onBlur: {
+        type: PropType<FocusEventHandler>;
+        default: FocusEventHandler;
+    };
+    'onUpdate:value': {
+        type: PropType<(value: number | [number, number]) => void>;
+        default: (value: number | [number, number]) => void;
+    };
+}>> & {
+    emptyText?: string;
+    defaultValue?: number | [number, number];
+} & {
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
-}, {
+}>, {
     min: number;
     max: number;
     step: number;
@@ -41,28 +133,11 @@ declare const __VLS_component: DefineComponent<__VLS_WithDefaults<__VLS_TypeProp
     tooltipOpen: boolean;
     tooltipVisible: boolean;
     emptyText: string;
-}, {}>;
+}, {}, {}, {}, string, ComponentProvideOptions, false, {}>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;
-type __VLS_WithDefaults<P, D> = {
-    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_Prettify<P[K] & {
-        default: D[K];
-    }> : P[K];
-};
-type __VLS_Prettify<T> = {
-    [K in keyof T]: T[K];
-} & {};
 type __VLS_WithTemplateSlots<T, S> = T & {
     new (): {
         $slots: S;
     };
 };
-type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
-type __VLS_TypePropsToOption<T> = {
-    [K in keyof T]-?: {} extends Pick<T, K> ? {
-        type: PropType<__VLS_NonUndefinedable<T[K]>>;
-    } : {
-        type: PropType<T[K]>;
-        required: true;
-    };
-};