@vunk/form 1.1.77 → 1.1.80

package/components/color-picker/src/ctx.d.ts

@@ -8,7 +8,7 @@ export declare const props: {
     size: {
         readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
         readonly required: false;
-        readonly validator: (val: unknown) => boolean;
+        readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
     popperClass: import("element-plus/es/utils").EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
@@ -18,40 +18,17 @@ export declare const props: {
     predefine: {
         readonly type: import("vue").PropType<string[]>;
         readonly required: false;
-        readonly validator: (val: unknown) => boolean;
+        readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
     validateEvent: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    labelWidth: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, "", boolean>;
-    prop: {
-        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string | string[]) | (() => import("element-plus").FormItemProp) | ((new (...args: any[]) => string | string[]) | (() => import("element-plus").FormItemProp))[], unknown, unknown>>;
-        readonly required: false;
-        readonly validator: (val: unknown) => boolean;
-        __epPropKey: true;
-    };
     required: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, undefined, boolean>;
-    rules: {
-        readonly type: import("vue").PropType<unknown>;
-        readonly required: false;
-        readonly validator: (val: unknown) => boolean;
-        __epPropKey: true;
-    };
-    error: StringConstructor;
-    validateStatus: {
-        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "error" | "success" | "validating", unknown>>;
-        readonly required: false;
-        readonly validator: (val: unknown) => boolean;
-        __epPropKey: true;
-    };
-    for: StringConstructor;
-    inlineMessage: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, BooleanConstructor], unknown, unknown, "", boolean>;
-    showMessage: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     formItemSize: {
         type: import("vue").PropType<"default" | "small" | "large">;
         default: "default" | "small" | "large";
     };
     formItemSlots: {
-        type: import("vue").PropType<import("../../form-item/src/types").FormItemSlots>;
+        type: import("vue").PropType<import("@vunk/form/components/form-item/src/types").FormItemSlots>;
         default: any;
     };
     elRef: {
@@ -70,11 +47,34 @@ export declare const props: {
         type: import("vue").PropType<"right">;
         default: string;
     };
+    labelWidth: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, "", boolean>;
+    prop: {
+        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => import("element-plus").FormItemProp & {}) | (() => import("element-plus").FormItemProp) | ((new (...args: any[]) => import("element-plus").FormItemProp & {}) | (() => import("element-plus").FormItemProp))[], unknown, unknown>>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    };
+    rules: {
+        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => import("element-plus").FormItemRule | import("element-plus").FormItemRule[]) | (() => import("element-plus/es/utils").Arrayable<import("element-plus").FormItemRule>) | ((new (...args: any[]) => import("element-plus").FormItemRule | import("element-plus").FormItemRule[]) | (() => import("element-plus/es/utils").Arrayable<import("element-plus").FormItemRule>))[], unknown, unknown>>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    };
+    error: StringConstructor;
+    validateStatus: {
+        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "success" | "error" | "validating", unknown>>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    };
+    for: StringConstructor;
+    inlineMessage: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, BooleanConstructor], unknown, unknown, "", boolean>;
+    showMessage: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
 };
 export declare const emits: {
-    "update:modelValue": (val: string) => boolean;
-    change: (val: string) => boolean;
-    activeChange: (val: string) => boolean;
+    "update:modelValue": (val: string | null) => boolean;
+    change: (val: string | null) => boolean;
+    activeChange: (val: string | null) => boolean;
     focus: (event: FocusEvent) => boolean;
     blur: (event: FocusEvent) => boolean;
 };

package/components/color-picker/src/index.vue.d.ts

@@ -8,7 +8,7 @@ declare const _default: import("vue").DefineComponent<{
     size: {
         readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
         readonly required: false;
-        readonly validator: (val: unknown) => boolean;
+        readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
     popperClass: import("element-plus/es/utils").EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
@@ -18,40 +18,17 @@ declare const _default: import("vue").DefineComponent<{
     predefine: {
         readonly type: import("vue").PropType<string[]>;
         readonly required: false;
-        readonly validator: (val: unknown) => boolean;
+        readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
     validateEvent: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    labelWidth: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, "", boolean>;
-    prop: {
-        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string | string[]) | (() => import("element-plus").FormItemProp) | ((new (...args: any[]) => string | string[]) | (() => import("element-plus").FormItemProp))[], unknown, unknown>>;
-        readonly required: false;
-        readonly validator: (val: unknown) => boolean;
-        __epPropKey: true;
-    };
     required: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, undefined, boolean>;
-    rules: {
-        readonly type: import("vue").PropType<unknown>;
-        readonly required: false;
-        readonly validator: (val: unknown) => boolean;
-        __epPropKey: true;
-    };
-    error: StringConstructor;
-    validateStatus: {
-        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "error" | "success" | "validating", unknown>>;
-        readonly required: false;
-        readonly validator: (val: unknown) => boolean;
-        __epPropKey: true;
-    };
-    for: StringConstructor;
-    inlineMessage: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, BooleanConstructor], unknown, unknown, "", boolean>;
-    showMessage: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     formItemSize: {
         type: import("vue").PropType<"default" | "small" | "large">;
         default: "default" | "small" | "large";
     };
     formItemSlots: {
-        type: import("vue").PropType<import("../../form-item/src/types").FormItemSlots>;
+        type: import("vue").PropType<import("@vunk/form/components/form-item/src/types").FormItemSlots>;
         default: any;
     };
     elRef: {
@@ -70,27 +47,50 @@ declare const _default: import("vue").DefineComponent<{
         type: import("vue").PropType<"right">;
         default: string;
     };
+    labelWidth: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, "", boolean>;
+    prop: {
+        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => import("element-plus").FormItemProp & {}) | (() => import("element-plus").FormItemProp) | ((new (...args: any[]) => import("element-plus").FormItemProp & {}) | (() => import("element-plus").FormItemProp))[], unknown, unknown>>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    };
+    rules: {
+        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => import("element-plus").FormItemRule | import("element-plus").FormItemRule[]) | (() => import("element-plus/es/utils").Arrayable<import("element-plus").FormItemRule>) | ((new (...args: any[]) => import("element-plus").FormItemRule | import("element-plus").FormItemRule[]) | (() => import("element-plus/es/utils").Arrayable<import("element-plus").FormItemRule>))[], unknown, unknown>>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    };
+    error: StringConstructor;
+    validateStatus: {
+        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "success" | "error" | "validating", unknown>>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    };
+    for: StringConstructor;
+    inlineMessage: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, BooleanConstructor], unknown, unknown, "", boolean>;
+    showMessage: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
 }, {
     formItemBindProps: import("vue").ComputedRef<{}>;
     coreBindProps: import("vue").ComputedRef<{
         size: import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>;
         disabled: boolean;
-        ariaLabel: string;
         id: string;
-        modelValue: string;
-        tabindex: import("element-plus/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>;
-        validateEvent: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
         popperClass: string;
         teleported: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+        validateEvent: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+        modelValue: string;
+        tabindex: import("element-plus/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>;
+        ariaLabel: string;
         showAlpha: boolean;
         colorFormat: string;
         predefine: string[];
     }>;
     coreOnEmits: {};
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    "update:modelValue": (val: string) => boolean;
-    change: (val: string) => boolean;
-    activeChange: (val: string) => boolean;
+    "update:modelValue": (val: string | null) => boolean;
+    change: (val: string | null) => boolean;
+    activeChange: (val: string | null) => boolean;
     focus: (event: FocusEvent) => boolean;
     blur: (event: FocusEvent) => boolean;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
@@ -103,7 +103,7 @@ declare const _default: import("vue").DefineComponent<{
     size: {
         readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
         readonly required: false;
-        readonly validator: (val: unknown) => boolean;
+        readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
     popperClass: import("element-plus/es/utils").EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
@@ -113,40 +113,17 @@ declare const _default: import("vue").DefineComponent<{
     predefine: {
         readonly type: import("vue").PropType<string[]>;
         readonly required: false;
-        readonly validator: (val: unknown) => boolean;
+        readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
     validateEvent: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    labelWidth: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, "", boolean>;
-    prop: {
-        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string | string[]) | (() => import("element-plus").FormItemProp) | ((new (...args: any[]) => string | string[]) | (() => import("element-plus").FormItemProp))[], unknown, unknown>>;
-        readonly required: false;
-        readonly validator: (val: unknown) => boolean;
-        __epPropKey: true;
-    };
     required: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, undefined, boolean>;
-    rules: {
-        readonly type: import("vue").PropType<unknown>;
-        readonly required: false;
-        readonly validator: (val: unknown) => boolean;
-        __epPropKey: true;
-    };
-    error: StringConstructor;
-    validateStatus: {
-        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "error" | "success" | "validating", unknown>>;
-        readonly required: false;
-        readonly validator: (val: unknown) => boolean;
-        __epPropKey: true;
-    };
-    for: StringConstructor;
-    inlineMessage: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, BooleanConstructor], unknown, unknown, "", boolean>;
-    showMessage: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     formItemSize: {
         type: import("vue").PropType<"default" | "small" | "large">;
         default: "default" | "small" | "large";
     };
     formItemSlots: {
-        type: import("vue").PropType<import("../../form-item/src/types").FormItemSlots>;
+        type: import("vue").PropType<import("@vunk/form/components/form-item/src/types").FormItemSlots>;
         default: any;
     };
     elRef: {
@@ -165,6 +142,29 @@ declare const _default: import("vue").DefineComponent<{
         type: import("vue").PropType<"right">;
         default: string;
     };
+    labelWidth: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, "", boolean>;
+    prop: {
+        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => import("element-plus").FormItemProp & {}) | (() => import("element-plus").FormItemProp) | ((new (...args: any[]) => import("element-plus").FormItemProp & {}) | (() => import("element-plus").FormItemProp))[], unknown, unknown>>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    };
+    rules: {
+        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => import("element-plus").FormItemRule | import("element-plus").FormItemRule[]) | (() => import("element-plus/es/utils").Arrayable<import("element-plus").FormItemRule>) | ((new (...args: any[]) => import("element-plus").FormItemRule | import("element-plus").FormItemRule[]) | (() => import("element-plus/es/utils").Arrayable<import("element-plus").FormItemRule>))[], unknown, unknown>>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    };
+    error: StringConstructor;
+    validateStatus: {
+        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "success" | "error" | "validating", unknown>>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    };
+    for: StringConstructor;
+    inlineMessage: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, BooleanConstructor], unknown, unknown, "", boolean>;
+    showMessage: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
 }>> & {
     onChange?: (val: string) => any;
     "onUpdate:modelValue"?: (val: string) => any;
@@ -172,21 +172,21 @@ declare const _default: import("vue").DefineComponent<{
     onBlur?: (event: FocusEvent) => any;
     onActiveChange?: (val: string) => any;
 }, {
-    label: string;
-    labelWidth: import("element-plus/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>;
+    disabled: boolean;
     required: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
-    inlineMessage: import("element-plus/es/utils").EpPropMergeType<readonly [StringConstructor, BooleanConstructor], unknown, unknown>;
-    showMessage: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
     formItemSize: "default" | "small" | "large";
-    formItemSlots: import("../../form-item/src/types").FormItemSlots;
+    formItemSlots: import("@vunk/form/components/form-item/src/types").FormItemSlots;
     inline: boolean;
     readonly: boolean;
     labelPosition: "right";
-    disabled: boolean;
-    tabindex: import("element-plus/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>;
-    validateEvent: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+    label: string;
+    labelWidth: import("element-plus/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>;
+    inlineMessage: import("element-plus/es/utils").EpPropMergeType<readonly [StringConstructor, BooleanConstructor], unknown, unknown>;
+    showMessage: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
     popperClass: string;
     teleported: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+    validateEvent: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+    tabindex: import("element-plus/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>;
     showAlpha: boolean;
 }, {}>;
 export default _default;

package/components/date-picker/index.d.ts

@@ -1,4 +1,5 @@
 import VkfDatePicker from './src/index.vue';
 export * as __VkfDatePicker from './src/types';
+export * as _VkfDatePickerCtx from './src/ctx';
 export { VkfDatePicker, };
 export default VkfDatePicker;

package/components/date-picker/{index.js → index.mjs}

@@ -1,8 +1,10 @@
 import { _VkfFormItemCtx, VkfFormItem } from '@vunk/form/components/form-item';
 import { datePickerProps, datePickerEmits as datePickerEmits$1, createDatePickerBindProps, createDatePickerOnEmits } from '@vunk/form/shared/element-plus';
+import { bindPropsFactory, onEmitsFactory } from '@vunk/core/shared/utils-vue';
 import { defineComponent, resolveComponent, openBlock, createBlock, normalizeProps, guardReactiveProps, withCtx, createVNode, mergeProps, toHandlers, createSlots, renderList, resolveDynamicComponent } from 'vue';
 import { ElDatePicker } from 'element-plus';
 import { useComputedReadonly } from '@vunk/form/composables';
+import { _ as _export_sfc } from '../_plugin-vue_export-helper.mjs';
 
 const props = {
   ...datePickerProps,
@@ -12,23 +14,35 @@ const props = {
     default: void 0
   }
 };
+const createBindProps = bindPropsFactory(props);
 const emits = {
   ...datePickerEmits$1
 };
+const createOnEmits = onEmitsFactory(emits);
 
-var script = defineComponent({
+var ctx = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  createBindProps: createBindProps,
+  createOnEmits: createOnEmits,
+  emits: emits,
+  props: props
+});
+
+var _sfc_main = defineComponent({
   name: "VkfDatePicker",
   components: {
     VkfFormItem,
     ElDatePicker
   },
-  emits,
   props,
-  setup(props2, {
-    emit
-  }) {
+  emits,
+  setup(props2, { emit }) {
     const formItemBindProps = _VkfFormItemCtx.createBindProps(props2);
-    const datePickerBindProps = createDatePickerBindProps(props2, ["type", "readonly", "label"]);
+    const datePickerBindProps = createDatePickerBindProps(props2, [
+      "type",
+      "readonly",
+      "label"
+    ]);
     const datePickerOnEmits = createDatePickerOnEmits(emit);
     const readonly = useComputedReadonly(props2);
     return {
@@ -40,26 +54,31 @@ var script = defineComponent({
   }
 });
 
-function render(_ctx, _cache, $props, $setup, $data, $options) {
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_ElDatePicker = resolveComponent("ElDatePicker");
   const _component_VkfFormItem = resolveComponent("VkfFormItem");
   return openBlock(), createBlock(
     _component_VkfFormItem,
     normalizeProps(guardReactiveProps(_ctx.formItemBindProps)),
     {
-      default: withCtx(() => [createVNode(_component_ElDatePicker, mergeProps(_ctx.datePickerBindProps, {
-        type: _ctx.type
-      }, toHandlers(_ctx.datePickerOnEmits), {
-        readonly: _ctx.readonly
-      }), createSlots({
-        _: 2
-        /* DYNAMIC */
-      }, [renderList(_ctx.datePickerSlots, (item, key) => {
-        return {
-          name: key,
-          fn: withCtx((e) => [(openBlock(), createBlock(resolveDynamicComponent(item?.(e))))])
-        };
-      })]), 1040, ["type", "readonly"])]),
+      default: withCtx(() => [
+        createVNode(_component_ElDatePicker, mergeProps(_ctx.datePickerBindProps, {
+          type: _ctx.type,
+          readonly: _ctx.readonly
+        }, toHandlers(_ctx.datePickerOnEmits)), createSlots({
+          _: 2
+          /* DYNAMIC */
+        }, [
+          renderList(_ctx.datePickerSlots, (item, key) => {
+            return {
+              name: key,
+              fn: withCtx((e) => [
+                (openBlock(), createBlock(resolveDynamicComponent(item?.(e))))
+              ])
+            };
+          })
+        ]), 1040, ["type", "readonly"])
+      ]),
       _: 1
       /* STABLE */
     },
@@ -67,9 +86,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
     /* FULL_PROPS */
   );
 }
-
-script.render = render;
-script.__file = "date-picker/src/index.vue";
+var VkfDatePicker = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "/home/runner/work/private-vunk-form/private-vunk-form/packages/components/date-picker/src/index.vue"]]);
 
 const datePickerEmits = {
   "update:modelValue": null,
@@ -86,8 +103,11 @@ var types = /*#__PURE__*/Object.freeze({
   datePickerEmits: datePickerEmits
 });
 
-script.install = (app) => {
-  app.component(script.name, script);
+VkfDatePicker.install = (app) => {
+  app.component(
+    VkfDatePicker.name || "VkfDatePicker",
+    VkfDatePicker
+  );
 };
 
-export { script as VkfDatePicker, types as __VkfDatePicker, script as default };
+export { VkfDatePicker, ctx as _VkfDatePickerCtx, types as __VkfDatePicker, VkfDatePicker as default };