@schemx/vue 1.0.0-next.2 → 1.0.0-next.3

package/dist/index.d.ts

@@ -11,8 +11,6 @@ export * from './hooks';
 /** 高阶组件 */
 export { WithRemoteOptions } from './hocs';
 /** 组件 */
-export { default as Button } from './components/Button';
-export type { SchemxButtonProps, SchemxButtonSize } from './components/Button';
 export { default as FormItem } from './components/FormItem';
 export { default as FormGroup } from './components/FormGroup';
 /** schemx/core 导出 */

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,oBAAoB,CAAA;AAE3B,WAAW;AACX,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,QAAQ,CAAA;AAC9C,YAAY,EAAE,oBAAoB,EAAE,MAAM,QAAQ,CAAA;AAElD,gBAAgB;AAChB,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAA;AAE3D,iBAAiB;AACjB,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AAE9D,YAAY;AACZ,cAAc,SAAS,CAAA;AAEvB,WAAW;AACX,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAA;AAE1C,SAAS;AACT,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,qBAAqB,CAAA;AACvD,YAAY,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAC9E,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAE7D,qBAAqB;AACrB,cAAc,cAAc,CAAA;AAE5B,YAAY;AACZ,cAAc,SAAS,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,oBAAoB,CAAA;AAE3B,WAAW;AACX,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,QAAQ,CAAA;AAC9C,YAAY,EAAE,oBAAoB,EAAE,MAAM,QAAQ,CAAA;AAElD,gBAAgB;AAChB,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAA;AAE3D,iBAAiB;AACjB,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AAE9D,YAAY;AACZ,cAAc,SAAS,CAAA;AAEvB,WAAW;AACX,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAA;AAE1C,SAAS;AACT,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAE7D,qBAAqB;AACrB,cAAc,cAAc,CAAA;AAE5B,YAAY;AACZ,cAAc,SAAS,CAAA"}

package/dist/index.mjs

@@ -1,102 +1,23 @@
 import "./style.css";
-import { getCurrentInstance, inject, shallowRef, onScopeDispose, provide, computed, onUnmounted, ref, onMounted, watchEffect, watch, readonly, defineComponent, createVNode, h, createTextVNode, mergeProps, useAttrs, openBlock, createElementBlock, unref, renderSlot, createCommentVNode, createStaticVNode, Fragment, toDisplayString, useSlots, reactive, normalizeClass, normalizeStyle, renderList, createBlock, createSlots, withCtx } from "vue";
+import { shallowRef, getCurrentInstance, inject, onScopeDispose, provide, computed, onUnmounted, ref, onMounted, watchEffect, watch, readonly, defineComponent, createVNode, h, createTextVNode, mergeProps, useAttrs, openBlock, createElementBlock, unref, renderSlot, createCommentVNode, createStaticVNode, Fragment, toDisplayString, useSlots, reactive, normalizeClass, normalizeStyle, renderList, createBlock, createSlots, withCtx } from "vue";
 import { createValidationRuleRegistry, mergeSchemxConfig, createForm, createField, createWatch, isViewGroupSchema, isSchemxViewFieldSchema, isSchemxSchemas, defaultSchemxConfigKeys } from "@schemx/core";
 export * from "@schemx/core";
 import classnames from "classnames";
-import { createFormExternalStore, createRendererRegistry } from "@schemx/core/adapter";
+import { createFormStateAdapter, createRendererRegistry } from "@schemx/core/adapter";
 import { pick } from "es-toolkit";
-const SCHEMX_APP_CONFIG_KEY = Symbol("schemx:app-config");
-const EMPTY_SCHEMX_CONFIG = Object.freeze({
-  schemaConfig: Object.freeze({}),
-  validatorAdapters: Object.freeze([])
-});
-function normalizeSchemxAppConfig(config) {
-  const schemaConfig = Object.freeze({ ...config.schemaConfig ?? {} });
-  const validatorAdapters = Object.freeze([...config.validatorAdapters ?? []]);
-  return Object.freeze({
-    schemaConfig,
-    rendererProps: normalizeRendererProps(config.rendererProps),
-    validatorAdapters,
-    defaultRendererType: config.defaultRendererType,
-    rendererRegistry: config.rendererRegistry,
-    validationRuleRegistry: config.validationRuleRegistry
-  });
-}
-function normalizeRendererProps(source) {
-  if (source === void 0) {
-    return void 0;
-  }
-  const entries = Object.entries(source).map(([type, props]) => {
-    return [type, props === void 0 ? void 0 : Object.freeze({ ...props })];
-  });
-  return Object.freeze(Object.fromEntries(entries));
-}
-function provideSchemxAppConfig(app, config = {}) {
-  const normalizedConfig = normalizeSchemxAppConfig(config);
-  app.provide(SCHEMX_APP_CONFIG_KEY, normalizedConfig);
-}
-function getSchemxAppConfig() {
-  if (getCurrentInstance() === null) {
-    return EMPTY_SCHEMX_CONFIG;
-  }
-  return inject(SCHEMX_APP_CONFIG_KEY, EMPTY_SCHEMX_CONFIG);
-}
-const formBridgeCache = /* @__PURE__ */ new WeakMap();
-const formFacadeCache = /* @__PURE__ */ new WeakMap();
-const facadeCoreFormCache = /* @__PURE__ */ new WeakMap();
 function createVueShallowRef(value) {
   return shallowRef(value);
 }
-function getCoreForm(form) {
-  const coreForm = facadeCoreFormCache.get(form);
-  return coreForm ?? form;
-}
-function getVueFormBridge(form) {
-  const coreForm = getCoreForm(form);
-  const cachedBridge = formBridgeCache.get(coreForm);
-  if (cachedBridge) {
-    return cachedBridge;
-  }
-  const bridge = createVueFormBridge(coreForm);
-  formBridgeCache.set(coreForm, bridge);
-  return bridge;
-}
-function getVueFormFacade(form) {
-  const coreForm = getCoreForm(form);
-  const cachedFacade = formFacadeCache.get(coreForm);
-  if (cachedFacade) {
-    return cachedFacade;
-  }
-  const facade = createVueFormFacade(coreForm);
-  formFacadeCache.set(coreForm, facade);
-  facadeCoreFormCache.set(facade, coreForm);
-  return facade;
-}
-function retainVueFormBridge(bridge) {
-  if (bridge.destroyed) {
-    return () => {
-    };
-  }
-  bridge.refCount++;
-  let released = false;
-  return () => {
-    if (released || bridge.destroyed) {
-      return;
-    }
-    released = true;
-    bridge.refCount--;
-    if (bridge.refCount === 0) {
-      disposeVueFormBridge(bridge);
-    }
-  };
+function areStringListsEqual(previous, next) {
+  return previous.length === next.length && previous.every((value, index) => value === next[index]);
 }
 function getVueFieldBridge(bridge, name) {
-  const store = bridge.externalStore.field(name);
-  const cachedBridge = bridge.fieldBridges.get(store);
+  const source = bridge.stateAdapter.field(name);
+  const cachedBridge = bridge.fieldBridges.get(source);
   if (cachedBridge) {
     return cachedBridge;
   }
-  const snapshot = store.getSnapshot();
+  const snapshot = source.getSnapshot();
   const value = createVueShallowRef(
     snapshot.value
   );
@@ -104,7 +25,7 @@ function getVueFieldBridge(bridge, name) {
   const touched = createVueShallowRef(snapshot.touched);
   const pending = createVueShallowRef(snapshot.pending);
   const updateFieldRefs = () => {
-    const nextSnapshot = store.getSnapshot();
+    const nextSnapshot = source.getSnapshot();
     if (!Object.is(value.value, nextSnapshot.value)) {
       value.value = nextSnapshot.value;
     }
@@ -118,122 +39,59 @@ function getVueFieldBridge(bridge, name) {
       pending.value = nextSnapshot.pending;
     }
   };
-  const unsubscribe = store.subscribe(updateFieldRefs);
+  const unsubscribe = source.subscribe(updateFieldRefs);
   const dispose = () => {
     unsubscribe();
   };
   const fieldBridge = {
-    store,
+    source,
     value,
     errors,
     touched,
     pending,
     dispose
   };
-  bridge.fieldBridges.set(store, fieldBridge);
+  bridge.fieldBridges.set(source, fieldBridge);
   return fieldBridge;
 }
-function disposeVueFormBridge(bridge) {
-  if (bridge.destroyed) {
-    return;
-  }
-  bridge.destroyed = true;
-  bridge.refCount = 0;
-  bridge.unsubscribe();
-  for (const fieldBridge of bridge.fieldBridges.values()) {
-    fieldBridge.dispose();
-  }
-  bridge.fieldBridges.clear();
-  bridge.externalStore.dispose();
-  formBridgeCache.delete(bridge.form);
-}
-function createVueFormBridge(form) {
-  const externalStore = createFormExternalStore(form);
-  const values = createVueShallowRef(externalStore.values.getSnapshot());
-  const touchedFields = createVueShallowRef(
-    externalStore.touchedFields.getSnapshot()
-  );
-  const pendingFields = createVueShallowRef(
-    externalStore.pendingFields.getSnapshot()
-  );
-  const loading = createVueShallowRef(externalStore.loading.getSnapshot());
-  const fieldBridges = /* @__PURE__ */ new Map();
-  const syncValues = () => {
-    values.value = externalStore.values.getSnapshot();
-  };
-  const syncTouchedFields = () => {
-    touchedFields.value = externalStore.touchedFields.getSnapshot();
-  };
-  const syncPendingFields = () => {
-    pendingFields.value = externalStore.pendingFields.getSnapshot();
-  };
-  const syncLoading = () => {
-    loading.value = externalStore.loading.getSnapshot();
-  };
-  const unsubscribeValues = externalStore.values.subscribe(syncValues);
-  const unsubscribeTouchedFields = externalStore.touchedFields.subscribe(syncTouchedFields);
-  const unsubscribePendingFields = externalStore.pendingFields.subscribe(syncPendingFields);
-  const unsubscribeLoading = externalStore.loading.subscribe(syncLoading);
-  const unsubscribe = () => {
-    unsubscribeValues();
-    unsubscribeTouchedFields();
-    unsubscribePendingFields();
-    unsubscribeLoading();
-  };
-  const facade = getVueFormFacade(form);
-  const bridge = {
-    form,
-    externalStore,
-    values,
-    touchedFields,
-    pendingFields,
-    loading,
-    fieldBridges,
-    refCount: 0,
-    destroyed: false,
-    unsubscribe,
-    facade
-  };
-  return bridge;
-}
-function createVueFormFacade(form) {
+function createVueFormFacade(form, dependencies) {
   let destroyed = false;
   const getFieldValue = (name) => {
     if (!destroyed) {
-      const bridge = getVueFormBridge(form);
-      void getVueFieldBridge(bridge, name).value.value;
+      const bridge = dependencies.getFormBridge(form);
+      void dependencies.getFieldBridge(bridge, name).value.value;
     }
     return form.getFieldValue(name);
   };
   const getFieldErrors = (name) => {
     if (!destroyed) {
-      const bridge = getVueFormBridge(form);
-      void getVueFieldBridge(bridge, name).errors.value;
+      const bridge = dependencies.getFormBridge(form);
+      void dependencies.getFieldBridge(bridge, name).errors.value;
     }
     return form.getFieldErrors(name);
   };
   const isFieldTouched = (name) => {
     if (!destroyed) {
-      const bridge = getVueFormBridge(form);
-      void getVueFieldBridge(bridge, name).touched.value;
+      const bridge = dependencies.getFormBridge(form);
+      void dependencies.getFieldBridge(bridge, name).touched.value;
     }
     return form.isFieldTouched(name);
   };
   const isFieldPending = (name) => {
     if (!destroyed) {
-      const bridge = getVueFormBridge(form);
-      void getVueFieldBridge(bridge, name).pending.value;
+      const bridge = dependencies.getFormBridge(form);
+      void dependencies.getFieldBridge(bridge, name).pending.value;
     }
     return form.isFieldPending(name);
   };
   const getFieldsValue = (names) => {
     if (!destroyed) {
-      const bridge = getVueFormBridge(form);
+      const bridge = dependencies.getFormBridge(form);
       if (names === void 0) {
         void bridge.values.value;
       } else {
         for (const name of names) {
-          void getVueFieldBridge(bridge, name).value.value;
+          void dependencies.getFieldBridge(bridge, name).value.value;
         }
       }
     }
@@ -241,21 +99,21 @@ function createVueFormFacade(form) {
   };
   const getTouchedFields = () => {
     if (!destroyed) {
-      const bridge = getVueFormBridge(form);
+      const bridge = dependencies.getFormBridge(form);
       void bridge.touchedFields.value;
     }
     return form.getTouchedFields();
   };
   const getPendingFields = () => {
     if (!destroyed) {
-      const bridge = getVueFormBridge(form);
+      const bridge = dependencies.getFormBridge(form);
       void bridge.pendingFields.value;
     }
     return form.getPendingFields();
   };
   const isLoading = () => {
     if (!destroyed) {
-      const bridge = getVueFormBridge(form);
+      const bridge = dependencies.getFormBridge(form);
       void bridge.loading.value;
     }
     return form.isLoading();
@@ -265,9 +123,9 @@ function createVueFormFacade(form) {
       return;
     }
     destroyed = true;
-    const bridge = formBridgeCache.get(form);
+    const bridge = dependencies.getCachedFormBridge(form);
     if (bridge) {
-      disposeVueFormBridge(bridge);
+      dependencies.disposeFormBridge(bridge);
     }
     form.destroy();
   };
@@ -284,8 +142,158 @@ function createVueFormFacade(form) {
     destroy
   };
 }
-function areStringListsEqual(previous, next) {
-  return previous.length === next.length && previous.every((value, index) => value === next[index]);
+const formBridgeCache = /* @__PURE__ */ new WeakMap();
+const formFacadeCache = /* @__PURE__ */ new WeakMap();
+const facadeCoreFormCache = /* @__PURE__ */ new WeakMap();
+function getCoreForm(form) {
+  const coreForm = facadeCoreFormCache.get(form);
+  return coreForm ?? form;
+}
+function getVueFormBridge(form) {
+  const coreForm = getCoreForm(form);
+  const cachedBridge = formBridgeCache.get(coreForm);
+  if (cachedBridge) {
+    return cachedBridge;
+  }
+  const bridge = createVueFormBridge(coreForm);
+  formBridgeCache.set(coreForm, bridge);
+  return bridge;
+}
+function getVueFormFacade(form) {
+  const coreForm = getCoreForm(form);
+  const cachedFacade = formFacadeCache.get(coreForm);
+  if (cachedFacade) {
+    return cachedFacade;
+  }
+  const facade = createVueFormFacade(coreForm, {
+    getFormBridge: (bridgeForm) => getVueFormBridge(bridgeForm),
+    getFieldBridge: (bridge, name) => getVueFieldBridge(bridge, name),
+    getCachedFormBridge: (bridgeForm) => {
+      const bridge = formBridgeCache.get(bridgeForm);
+      return bridge;
+    },
+    disposeFormBridge: (bridge) => disposeVueFormBridge(bridge)
+  });
+  formFacadeCache.set(coreForm, facade);
+  facadeCoreFormCache.set(facade, coreForm);
+  return facade;
+}
+function retainVueFormBridge(bridge) {
+  if (bridge.destroyed) {
+    return () => {
+    };
+  }
+  bridge.refCount++;
+  let released = false;
+  return () => {
+    if (released || bridge.destroyed) {
+      return;
+    }
+    released = true;
+    bridge.refCount--;
+    if (bridge.refCount === 0) {
+      disposeVueFormBridge(bridge);
+    }
+  };
+}
+function disposeVueFormBridge(bridge) {
+  if (bridge.destroyed) {
+    return;
+  }
+  bridge.destroyed = true;
+  bridge.refCount = 0;
+  bridge.unsubscribe();
+  for (const fieldBridge of bridge.fieldBridges.values()) {
+    fieldBridge.dispose();
+  }
+  bridge.fieldBridges.clear();
+  bridge.stateAdapter.dispose();
+  formBridgeCache.delete(bridge.form);
+}
+function createVueFormBridge(form) {
+  const stateAdapter = createFormStateAdapter(form);
+  const values = createVueShallowRef(stateAdapter.values.getSnapshot());
+  const touchedFields = createVueShallowRef(
+    stateAdapter.touchedFields.getSnapshot()
+  );
+  const pendingFields = createVueShallowRef(
+    stateAdapter.pendingFields.getSnapshot()
+  );
+  const loading = createVueShallowRef(stateAdapter.loading.getSnapshot());
+  const fieldBridges = /* @__PURE__ */ new Map();
+  const syncValues = () => {
+    values.value = stateAdapter.values.getSnapshot();
+  };
+  const syncTouchedFields = () => {
+    touchedFields.value = stateAdapter.touchedFields.getSnapshot();
+  };
+  const syncPendingFields = () => {
+    pendingFields.value = stateAdapter.pendingFields.getSnapshot();
+  };
+  const syncLoading = () => {
+    loading.value = stateAdapter.loading.getSnapshot();
+  };
+  const unsubscribeValues = stateAdapter.values.subscribe(syncValues);
+  const unsubscribeTouchedFields = stateAdapter.touchedFields.subscribe(syncTouchedFields);
+  const unsubscribePendingFields = stateAdapter.pendingFields.subscribe(syncPendingFields);
+  const unsubscribeLoading = stateAdapter.loading.subscribe(syncLoading);
+  const unsubscribe = () => {
+    unsubscribeValues();
+    unsubscribeTouchedFields();
+    unsubscribePendingFields();
+    unsubscribeLoading();
+  };
+  const facade = getVueFormFacade(form);
+  const bridge = {
+    form,
+    stateAdapter,
+    values,
+    touchedFields,
+    pendingFields,
+    loading,
+    fieldBridges,
+    refCount: 0,
+    destroyed: false,
+    unsubscribe,
+    facade
+  };
+  return bridge;
+}
+const SCHEMX_APP_CONFIG_KEY = Symbol("schemx:app-config");
+const EMPTY_SCHEMX_CONFIG = Object.freeze({
+  schemaConfig: Object.freeze({}),
+  validatorAdapters: Object.freeze([])
+});
+function normalizeSchemxAppConfig(config) {
+  const schemaConfig = Object.freeze({ ...config.schemaConfig ?? {} });
+  const validatorAdapters = Object.freeze([...config.validatorAdapters ?? []]);
+  return Object.freeze({
+    schemaConfig,
+    rendererProps: normalizeRendererProps(config.rendererProps),
+    validatorAdapters,
+    defaultRendererType: config.defaultRendererType,
+    rendererRegistry: config.rendererRegistry,
+    validationRuleRegistry: config.validationRuleRegistry
+  });
+}
+function normalizeRendererProps(source) {
+  if (source === void 0) {
+    return void 0;
+  }
+  const entries = Object.entries(source).map(([type, props]) => {
+    return [type, props === void 0 ? void 0 : Object.freeze({ ...props })];
+  });
+  return Object.freeze(Object.fromEntries(entries));
+}
+function provideSchemxAppConfig(app, config = {}) {
+  const normalizedConfig = normalizeSchemxAppConfig(config);
+  app.provide(SCHEMX_APP_CONFIG_KEY, normalizedConfig);
+}
+function getSchemxAppConfig() {
+  if (getCurrentInstance() === null) {
+    return EMPTY_SCHEMX_CONFIG;
+  }
+  return inject(SCHEMX_APP_CONFIG_KEY, EMPTY_SCHEMX_CONFIG);
 }
 const rendererRegistry = createRendererRegistry("input");
 const validationRuleRegistry = createValidationRuleRegistry();
@@ -1137,8 +1145,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     modelValue: { default: () => ({}) },
     form: { default: void 0 },
     loading: { type: Boolean, default: void 0 },
-    submitter: { type: [Boolean, Object], default: true },
-    resetter: { type: [Boolean, Object], default: true },
+    submitter: { type: [Boolean, Object], default: void 0 },
+    resetter: { type: [Boolean, Object], default: void 0 },
     class: { default: "" },
     style: { type: [Boolean, null, String, Object, Array], default: () => ({}) },
     rendererProps: { default: void 0 },
@@ -1333,11 +1341,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       },
       { deep: false, immediate: isExternalForm }
     );
-    __expose({
+    const exposed = {
       ...formInstance,
       submit: handleSubmit,
       reset: handleReset
-    });
+    };
+    __expose(exposed);
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {
         class: normalizeClass(["schemx", props.class]),
@@ -1444,7 +1453,6 @@ function WithRemoteOptions(WrappedComponent) {
   });
 }
 export {
-  _sfc_main$1 as Button,
   FormGroup$1 as FormGroup,
   FormItem$1 as FormItem,
   WithRemoteOptions,