cnhis-design-vue 3.1.9-beta.9 → 3.1.11-beta.0

package/es/packages/form-render/src/FormRender.vue_vue_type_script_setup_true_lang.js

@@ -1,19 +1,19 @@
-import { defineComponent, provide, computed, openBlock, createBlock, unref, normalizeStyle, withCtx, createVNode, renderSlot, createElementVNode, toDisplayString, createCommentVNode } from 'vue';
-import { injectOrProvide } from './utils/index.js';
-import { cloneDeep } from 'lodash-es';
-import { InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectAsyncQueue, InjectionSchemaField } from './constants/index.js';
-import * as index from './components/index.js';
+import { defineComponent, computed, watch, openBlock, createBlock, unref, withCtx, createElementBlock, createVNode, Fragment, renderList, createCommentVNode, createElementVNode, normalizeStyle, renderSlot, toDisplayString } from 'vue';
 import { createForm, onFieldValueChange } from '@formily/core';
-import { FormProvider, FormConsumer, createSchemaField } from '@formily/vue';
-import { NForm } from 'naive-ui';
-import { useBusinessBinding } from './hooks/useBusinessBinding.js';
-import { useAsyncQueue } from './hooks/useAsyncQueue.js';
-import { useChangeContext } from './hooks/useChangeContext.js';
-import { useFormItemDeps } from './hooks/useFormItemDeps.js';
+import { FormProvider, FormConsumer } from '@formily/vue';
+import { cloneDeep } from 'lodash-es';
+import { NForm, NTabs, NTabPane } from 'naive-ui';
+import { useFormContext } from './hooks/useFormContext.js';
+import { useInitialData } from './hooks/useInitialData.js';
+import { useAnchor } from './hooks/useAnchor.js';
 import { useFieldVisitor } from './hooks/useFieldVisitor.js';
 import { useFieldList2Schema } from './hooks/useFieldList2Schema.js';
 
-const _hoisted_1 = { style: { "white-space": "pre" } };
+const _hoisted_1 = {
+  key: 0,
+  style: { "height": "50px" }
+};
+const _hoisted_2 = { style: { "white-space": "pre" } };
 var script = /* @__PURE__ */ defineComponent({
   __name: "FormRender",
   props: {
@@ -21,6 +21,8 @@ var script = /* @__PURE__ */ defineComponent({
     initialData: { type: Object, default: () => ({}) },
     fieldVisitor: { type: Object },
     column: { type: Number, default: 12 },
+    maxHeight: { type: [Number, String], default: "" },
+    anchor: { type: Boolean, default: false },
     parallelism: { type: Number, default: 3 },
     schema: { type: Object },
     components: {
@@ -35,15 +37,14 @@ var script = /* @__PURE__ */ defineComponent({
   ],
   setup(__props, { expose, emit }) {
     const props = __props;
-    injectOrProvide(InjectAsyncQueue, () => useAsyncQueue().create(props.parallelism));
-    const businessCollector = useBusinessBinding().create();
-    provide(InjectionBusinessCollector, businessCollector);
-    const changeContextCollector = useChangeContext().create();
-    provide(InjectionChangeContextCollector, changeContextCollector);
-    const formItemDepsCollector = useFormItemDeps().create();
-    provide(InjectionFormItemDepsCollector, formItemDepsCollector);
+    const {
+      SchemaField,
+      businessCollector,
+      formItemDepsCollector,
+      changeContextCollector
+    } = useFormContext(props);
     const formModel = createForm({
-      initialValues: props.initialData,
+      initialValues: useInitialData().assignInitialData(props.initialData, props.fieldList),
       effects() {
         onFieldValueChange("*", (field) => {
           const fieldKey = field.props.name.toString();
@@ -59,13 +60,9 @@ var script = /* @__PURE__ */ defineComponent({
         });
       }
     });
-    const SchemaField = injectOrProvide(InjectionSchemaField, () => createSchemaField({
-      components: { ...index, ...props.components },
-      scope: props.scope
-    }).SchemaField);
     const { traverse } = useFieldVisitor();
     const { transform } = useFieldList2Schema(businessCollector);
-    const renderSchema = computed(() => {
+    const parsedSchema = computed(() => {
       if (props.schema) {
         return props.schema;
       }
@@ -75,39 +72,81 @@ var script = /* @__PURE__ */ defineComponent({
       }
       return { type: "object", properties: {} };
     });
+    const {
+      currentAnchor,
+      scrollbarRef,
+      generateAnchorList,
+      anchorIdList,
+      formHeight,
+      scrollTo,
+      onScroll,
+      updateCurrentAnchor
+    } = useAnchor(props, formItemDepsCollector);
+    watch(parsedSchema, generateAnchorList, { immediate: true });
+    function bindTitle(info) {
+      info.title = formModel.query(info.path).get("title");
+      return info;
+    }
     function validate() {
-      return formModel.validate();
+      return formModel.validate().catch((err) => {
+        return Promise.reject(Array.isArray(err) ? err.map(bindTitle) : err);
+      });
     }
+    function getFormValues() {
+      return formModel.getFormState().values;
+    }
+    const setFieldState = formModel.setFieldState.bind(formModel);
     expose({
       validate,
-      getFormValues() {
-        return formModel.getFormState().values;
-      },
-      setFieldState: formModel.setFieldState.bind(formModel)
+      getFormValues,
+      setFieldState
     });
     return (_ctx, _cache) => {
-      return openBlock(), createBlock(unref(NForm), {
-        class: "form-render__wrapper",
-        style: normalizeStyle({ "--column": __props.column })
-      }, {
+      return openBlock(), createBlock(unref(NForm), null, {
         default: withCtx(() => [
-          createVNode(unref(FormProvider), { form: unref(formModel) }, {
-            default: withCtx(() => [
-              renderSlot(_ctx.$slots, "default", { schemaFiled: unref(SchemaField) }, () => [
-                createVNode(unref(SchemaField), { schema: unref(renderSchema) }, null, 8, ["schema"])
+          __props.anchor ? (openBlock(), createElementBlock("section", _hoisted_1, [
+            createVNode(unref(NTabs), {
+              value: unref(currentAnchor),
+              "onUpdate:value": unref(updateCurrentAnchor),
+              type: "line"
+            }, {
+              default: withCtx(() => [
+                (openBlock(true), createElementBlock(Fragment, null, renderList(unref(anchorIdList), (anchor) => {
+                  return openBlock(), createBlock(unref(NTabPane), {
+                    name: anchor.name,
+                    tab: anchor.title,
+                    key: anchor
+                  }, null, 8, ["name", "tab"]);
+                }), 128))
               ]),
-              __props.consumer ? (openBlock(), createBlock(unref(FormConsumer), { key: 0 }, {
-                default: withCtx(({ form }) => [
-                  createElementVNode("div", _hoisted_1, toDisplayString(JSON.stringify(form.values, null, 2)), 1)
+              _: 1
+            }, 8, ["value", "onUpdate:value"])
+          ])) : createCommentVNode("v-if", true),
+          createElementVNode("section", {
+            class: "form-render__wrapper",
+            style: normalizeStyle({ "--column": __props.column, "--form-height": unref(formHeight) }),
+            ref_key: "scrollbarRef",
+            ref: scrollbarRef,
+            onScroll: _cache[0] || (_cache[0] = (...args) => unref(onScroll) && unref(onScroll)(...args))
+          }, [
+            createVNode(unref(FormProvider), { form: unref(formModel) }, {
+              default: withCtx(() => [
+                renderSlot(_ctx.$slots, "default", { schemaFiled: unref(SchemaField) }, () => [
+                  createVNode(unref(SchemaField), { schema: unref(parsedSchema) }, null, 8, ["schema"])
                 ]),
-                _: 1
-              })) : createCommentVNode("v-if", true)
-            ]),
-            _: 3
-          }, 8, ["form"])
+                __props.consumer ? (openBlock(), createBlock(unref(FormConsumer), { key: 0 }, {
+                  default: withCtx(({ form }) => [
+                    createElementVNode("div", _hoisted_2, toDisplayString(JSON.stringify(form.values, null, 2)), 1)
+                  ]),
+                  _: 1
+                })) : createCommentVNode("v-if", true)
+              ]),
+              _: 3
+            }, 8, ["form"])
+          ], 36)
         ]),
         _: 3
-      }, 8, ["style"]);
+      });
     };
   }
 });

package/es/packages/form-render/src/components/index.d.ts

@@ -1,16 +0,0 @@
-export * from './input';
-export * from './select';
-export * from './formItem';
-export * from './textarea';
-export * from './inputNumber';
-export * from './collapse';
-export * from './inputGroup';
-export * from './date';
-export * from './cascader';
-export * from './combination';
-export * from './checkbox';
-export * from './switch';
-export * from './radio';
-export * from './labelSelect';
-export * from './slider';
-export * from './complex';

package/es/packages/form-render/src/components/index.js

@@ -1,16 +1 @@
-export { INPUT } from './input.js';
-export { SELECT } from './select.js';
-export { FORM_ITEM } from './formItem.js';
-export { TEXTAREA } from './textarea.js';
-export { INPUT_NUMBER } from './inputNumber.js';
-export { COLLAPSE } from './collapse.js';
-export { INPUT_GROUP } from './inputGroup.js';
-export { DATE } from './date.js';
-export { SEARCH_CASCADE } from './cascader.js';
-export { COMBINATION } from './combination.js';
-export { CHECKBOX } from './checkbox.js';
-export { SWITCH } from './switch.js';
-export { RADIO } from './radio.js';
-export { LABEL } from './labelSelect.js';
-export { SLIDER } from './slider.js';
-export { COMPLEX } from './complex.js';
+

package/es/packages/form-render/src/components/{cascader.d.ts → renderer/cascader.d.ts}

@@ -1,5 +1,5 @@
-import { AnyObject, ArrayAble } from '../../../../../es/src/types';
-import { FormRequestType } from '../types';
+import { AnyObject, ArrayAble } from '../../../../../../es/src/types';
+import { FormRequestType } from '../../types';
 import { PropType } from 'vue';
 declare type DependKeyObj = {
     paramName: string;

package/es/packages/form-render/src/components/{cascader.js → renderer/cascader.js}

@@ -1,10 +1,10 @@
 import { defineComponent, ref, inject, computed, watch, createVNode } from 'vue';
 import { isObject, isString } from 'lodash-es';
-import { InjectAsyncQueue } from '../constants/index.js';
-import { assignUpdateValue, formRenderLog, arrayed } from '../utils/index.js';
+import { InjectAsyncQueue } from '../../constants/index.js';
+import { assignUpdateValue, formRenderLog, arrayed } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NCascader } from 'naive-ui';
-import { useFormField } from '../hooks/useFormField.js';
+import { useFormField } from '../../hooks/useFormField.js';
 
 const script = defineComponent({
   name: "FormCascader",
@@ -26,7 +26,6 @@ const script = defineComponent({
   emits: ["update:value"],
   setup(props, {
     slots,
-    attrs,
     emit
   }) {
     const _options = ref(null);

package/es/packages/form-render/src/components/{checkbox.d.ts → renderer/checkbox.d.ts}

@@ -1,4 +1,4 @@
-import { AnyObject } from '../../../../../es/src/types';
+import { AnyObject } from '../../../../../../es/src/types';
 import { PropType } from "vue";
 export declare const CHECKBOX: import("vue").DefineComponent<{
     options: {

package/es/packages/form-render/src/components/{checkbox.js → renderer/checkbox.js}

@@ -1,5 +1,5 @@
 import { defineComponent, createVNode } from 'vue';
-import { assignUpdateValue } from '../utils/index.js';
+import { assignUpdateValue } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NCheckboxGroup, NSpace, NCheckbox } from 'naive-ui';
 

package/es/packages/form-render/src/components/{combination.d.ts → renderer/combination.d.ts}

@@ -1,4 +1,4 @@
-import { PropType } from "vue";
+import { PropType } from 'vue';
 export declare const COMBINATION: import("vue").DefineComponent<{
     title: {
         type: StringConstructor;

package/es/packages/form-render/src/components/{combination.js → renderer/combination.js}

@@ -1,10 +1,10 @@
 import { defineComponent, computed, ref, createVNode, createTextVNode, toRaw } from 'vue';
-import { assignUpdateValue, formRenderLog } from '../utils/index.js';
+import { assignUpdateValue, formRenderLog } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { useDebounceFn, isObject } from '@vueuse/core';
 import { NButton } from 'naive-ui';
-import '../FormRender.js';
-import script$1 from '../FormRender.vue_vue_type_script_setup_true_lang.js';
+import '../../FormRender.js';
+import script$1 from '../../FormRender.vue_vue_type_script_setup_true_lang.js';
 
 const script = defineComponent({
   name: "FormCombination",

package/es/packages/form-render/src/components/{complex.js → renderer/complex.js}

@@ -1,6 +1,6 @@
 import { defineComponent, createVNode } from 'vue';
 import { connect, mapProps } from '@formily/vue';
-import { assignUpdateValue } from '../../../../packages/form-render/src/utils';
+import { assignUpdateValue } from '../../utils/index.js';
 
 const script = defineComponent({
   props: {

package/es/packages/form-render/src/components/renderer/index.d.ts

@@ -0,0 +1,16 @@
+export * from './input';
+export * from './select';
+export * from './formItem';
+export * from './textarea';
+export * from './inputNumber';
+export * from './linebar';
+export * from './inputGroup';
+export * from './date';
+export * from './cascader';
+export * from './combination';
+export * from './checkbox';
+export * from './switch';
+export * from './radio';
+export * from './labelSelect';
+export * from './slider';
+export * from './complex';

package/es/packages/form-render/src/components/renderer/index.js

@@ -0,0 +1,16 @@
+export { INPUT } from './input.js';
+export { SELECT } from './select.js';
+export { FORM_ITEM } from './formItem.js';
+export { TEXTAREA } from './textarea.js';
+export { INPUT_NUMBER } from './inputNumber.js';
+export { LINEBAR } from './linebar.js';
+export { INPUT_GROUP } from './inputGroup.js';
+export { DATE } from './date.js';
+export { SEARCH_CASCADE } from './cascader.js';
+export { COMBINATION } from './combination.js';
+export { CHECKBOX } from './checkbox.js';
+export { SWITCH } from './switch.js';
+export { RADIO } from './radio.js';
+export { LABEL } from './labelSelect.js';
+export { SLIDER } from './slider.js';
+export { COMPLEX } from './complex.js';

package/es/packages/form-render/src/components/{input.js → renderer/input.js}

@@ -1,5 +1,5 @@
 import { defineComponent, computed, createVNode, Fragment } from 'vue';
-import { assignUpdateValue } from '../utils/index.js';
+import { assignUpdateValue } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NInput } from 'naive-ui';
 

package/es/packages/form-render/src/components/{inputNumber.js → renderer/inputNumber.js}

@@ -1,5 +1,5 @@
 import { defineComponent, createVNode } from 'vue';
-import { assignUpdateValue } from '../utils/index.js';
+import { assignUpdateValue } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NInputNumber } from 'naive-ui';
 

package/es/packages/form-render/src/components/{collapse.d.ts → renderer/linebar.d.ts}

@@ -1,4 +1,4 @@
-export declare const COLLAPSE: import("vue").DefineComponent<{
+export declare const LINEBAR: import("vue").DefineComponent<{
     show: {
         type: BooleanConstructor;
         default: boolean;

package/es/packages/form-render/src/components/{collapse.js → renderer/linebar.js}

@@ -1,6 +1,8 @@
-import { defineComponent, ref, onMounted, createVNode } from 'vue';
+import { defineComponent, ref, onMounted, inject, createVNode } from 'vue';
 import { connect, mapProps } from '@formily/vue';
 import { NCollapseTransition } from 'naive-ui';
+import { useFormField } from '../../../../../packages/form-render';
+import { InjectionFormItemDepsCollector, FormItemLineBarDepKeyPrepend } from '../../constants/index.js';
 
 const script = defineComponent({
   name: "FormCollapse",
@@ -30,25 +32,32 @@ const script = defineComponent({
         return;
       _show.value = !_show.value;
     }
+    const {
+      fieldKey
+    } = useFormField();
+    const formItemDepsCollector = inject(InjectionFormItemDepsCollector);
+    formItemDepsCollector.setDeps(fieldKey.value, FormItemLineBarDepKeyPrepend + fieldKey.value, (v = true) => {
+      _show.value = v;
+    });
     return () => {
       return createVNode("section", {
-        "class": "form-render__collapse"
+        "class": "form-render__linebar",
+        "anchor-target": true
       }, [createVNode("header", {
-        "class": "form-render__collapseHeader",
+        "class": "form-render__linebarHeader",
         "onClick": toggleShow
       }, [props.title]), createVNode(NCollapseTransition, {
-        "class": "form-render__collapseItem",
-        "show": _show.value,
-        "appear": false
+        "class": "form-render__linebarItem",
+        "show": _show.value
       }, slots)]);
     };
   }
 });
-const COLLAPSE = connect(script, mapProps((props, field) => {
+const LINEBAR = connect(script, mapProps((props, field) => {
   return {
     ...props,
     title: field.title
   };
 }));
 
-export { COLLAPSE };
+export { LINEBAR };

package/es/packages/form-render/src/components/{radio.d.ts → renderer/radio.d.ts}

@@ -1,4 +1,4 @@
-import { AnyObject } from '../../../../../es/src/types';
+import { AnyObject } from '../../../../../../es/src/types';
 import { PropType } from "vue";
 export declare const RADIO: import("vue").DefineComponent<{
     options: {

package/es/packages/form-render/src/components/{radio.js → renderer/radio.js}

@@ -1,7 +1,7 @@
 import { defineComponent, createVNode } from 'vue';
 import { connect, mapProps } from '@formily/vue';
 import { NRadioGroup, NSpace, NRadio } from 'naive-ui';
-import { assignUpdateValue } from '../utils/index.js';
+import { assignUpdateValue } from '../../utils/index.js';
 
 const script = defineComponent({
   props: {

package/es/packages/form-render/src/components/{select.d.ts → renderer/select.d.ts}

@@ -1,5 +1,5 @@
-import { AnyObject } from '../../../../../es/src/types';
-import { FormRequestType } from '../types';
+import { AnyObject } from '../../../../../../es/src/types';
+import { FormRequestType } from '../../types';
 import { PropType } from 'vue';
 declare type UrlConfig = {
     method: FormRequestType;

package/es/packages/form-render/src/components/{select.js → renderer/select.js}

@@ -1,11 +1,11 @@
 import { defineComponent, ref, inject, computed, watch, createVNode } from 'vue';
 import { cloneDeep } from 'lodash-es';
-import { InjectAsyncQueue, InjectionFormItemDepsCollector, InjectionChangeContextCollector } from '../constants/index.js';
-import { assignUpdateValue, formRenderLog, generateUrlParams } from '../utils/index.js';
+import { InjectAsyncQueue, InjectionFormItemDepsCollector, InjectionChangeContextCollector } from '../../constants/index.js';
+import { assignUpdateValue, formRenderLog, generateUrlParams } from '../../utils/index.js';
 import { isObject } from '@vueuse/core';
 import { connect, mapProps } from '@formily/vue';
 import { NSelect } from 'naive-ui';
-import { useFormField } from '../hooks/useFormField.js';
+import { useFormField } from '../../hooks/useFormField.js';
 
 const script = defineComponent({
   name: "FormSelect",

package/es/packages/form-render/src/components/{slider.js → renderer/slider.js}

@@ -1,6 +1,6 @@
 import { connect, mapProps } from '@formily/vue';
 import { NSlider } from 'naive-ui';
-import { assignUpdateValue } from '../../../../packages/form-render/src/utils';
+import { assignUpdateValue } from '../../utils/index.js';
 
 const SLIDER = connect(NSlider, mapProps((props, field) => {
   const _props = assignUpdateValue(props, field);

package/es/packages/form-render/src/components/{switch.js → renderer/switch.js}

@@ -1,6 +1,6 @@
 import { defineComponent, computed, createVNode, createTextVNode } from 'vue';
 import { NSwitch } from 'naive-ui';
-import { assignUpdateValue } from '../utils/index.js';
+import { assignUpdateValue } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 
 const script = defineComponent({

package/es/packages/form-render/src/components/{textarea.js → renderer/textarea.js}

@@ -1,4 +1,4 @@
-import { assignUpdateValue } from '../utils/index.js';
+import { assignUpdateValue } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NInput } from 'naive-ui';
 

package/es/packages/form-render/src/constants/index.d.ts

@@ -7,6 +7,7 @@ export declare const InjectionSchemaField: InjectionKey<Component>;
 export declare const InjectionBusinessCollector: InjectionKey<BusinessCollector>;
 export declare const InjectionChangeContextCollector: InjectionKey<ContextCollector>;
 export declare const InjectionFormItemDepsCollector: InjectionKey<FormItemDepsCollector>;
+export declare const FormItemLineBarDepKeyPrepend = "__dep_LINEBAR_";
 export declare enum FIELD_BUSINESS_TYPE {
     PASSWORD = "password",
     ID_CARD = "id_card",

package/es/packages/form-render/src/constants/index.js

@@ -3,6 +3,7 @@ const InjectionSchemaField = Symbol("InjectionSchemaField");
 const InjectionBusinessCollector = Symbol("InjectionBusinessCollector");
 const InjectionChangeContextCollector = Symbol("InjectionChangeContextCollector");
 const InjectionFormItemDepsCollector = Symbol("InjectionFormItemDepsCollector");
+const FormItemLineBarDepKeyPrepend = `__dep_LINEBAR_`;
 var FIELD_BUSINESS_TYPE = /* @__PURE__ */ ((FIELD_BUSINESS_TYPE2) => {
   FIELD_BUSINESS_TYPE2["PASSWORD"] = "password";
   FIELD_BUSINESS_TYPE2["ID_CARD"] = "id_card";
@@ -25,4 +26,4 @@ var FIELD_SEX_VALUE = /* @__PURE__ */ ((FIELD_SEX_VALUE2) => {
   return FIELD_SEX_VALUE2;
 })(FIELD_SEX_VALUE || {});
 
-export { FIELD_BUSINESS_TYPE, FIELD_SEX_VALUE, InjectAsyncQueue, InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectionSchemaField };
+export { FIELD_BUSINESS_TYPE, FIELD_SEX_VALUE, FormItemLineBarDepKeyPrepend, InjectAsyncQueue, InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectionSchemaField };

package/es/packages/form-render/src/hooks/index.d.ts

@@ -9,3 +9,6 @@ export * from './useFormValidator';
 export * from './useBusinessBinding';
 export * from './useChangeContext';
 export * from './useFormItemDeps';
+export * from './useInitialData';
+export * from './useAnchor';
+export * from './useFormContext';

package/es/packages/form-render/src/hooks/index.js

@@ -9,3 +9,6 @@ export { useFormValidator } from './useFormValidator.js';
 export { BusinessCollector, useBusinessBinding } from './useBusinessBinding.js';
 export { ContextCollector, useChangeContext } from './useChangeContext.js';
 export { FormItemDepsCollector, useFormItemDeps } from './useFormItemDeps.js';
+export { useInitialData } from './useInitialData.js';
+export { useAnchor } from './useAnchor.js';
+export { useFormContext } from './useFormContext.js';

package/es/packages/form-render/src/hooks/useAnchor.d.ts

@@ -0,0 +1,16 @@
+import { AnyObject } from '../../../../../es/src/types';
+import { ISchema } from '@formily/json-schema/esm/types';
+import { FormItemDepsCollector } from '../../../../../es/packages/form-render';
+export declare function useAnchor(props: Readonly<AnyObject>, collector: FormItemDepsCollector): {
+    currentAnchor: import("vue").Ref<string>;
+    updateCurrentAnchor: (id: string) => Promise<void>;
+    onScroll: () => Promise<void>;
+    formHeight: import("vue").ComputedRef<any>;
+    anchorIdList: import("vue").Ref<{
+        name: string;
+        title: string;
+    }[]>;
+    generateAnchorList: (schema: ISchema) => void;
+    scrollbarRef: import("vue").Ref<HTMLElement | undefined>;
+    scrollTo: (id: string) => Promise<void>;
+};