annil 1.10.1 → 1.11.0-alpha.4

package/CHANGELOG.md

@@ -4,6 +4,52 @@
 
 * 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
 
+## [1.11.0-alpha.4](https://github.com/missannil/annil/compare/v1.11.0-alpha.3...v1.11.0-alpha.4) (2025-01-14)
+
+
+### Bug Fixes
+
+* 类型修改 ([278058c](https://github.com/missannil/annil/commit/278058ccc13cae016bfcc9678875ed8c79a35472))
+
+
+### Miscellaneous Chores
+
+* release alpha.4 ([433779f](https://github.com/missannil/annil/commit/433779f12e7a3549a77d87c2663d37405ea2692f))
+
+## [1.11.0-alpha.3](https://github.com/missannil/annil/compare/v1.11.0-alpha.3...v1.11.0-alpha.3) (2025-01-14)
+
+
+### Bug Fixes
+
+* 类型修改 ([278058c](https://github.com/missannil/annil/commit/278058ccc13cae016bfcc9678875ed8c79a35472))
+
+## [1.11.0-alpha.3](https://github.com/missannil/annil/compare/v1.11.0-alpha.2...v1.11.0-alpha.3) (2025-01-13)
+
+
+### Miscellaneous Chores
+
+* release ([87d63f6](https://github.com/missannil/annil/commit/87d63f690a5bafdecf77a8f5c53bd43e0c7b4d82))
+
+## [1.11.0-alpha.2](https://github.com/missannil/annil/compare/v1.11.0-alpha.1...v1.11.0-alpha.2) (2025-01-13)
+
+
+### Miscellaneous Chores
+
+* publish ([52c4258](https://github.com/missannil/annil/commit/52c42589cd0e6c4a513f628b1caa79885b1f376a))
+
+
+### Continuous Integration
+
+* 修改test时长为默认 ([4fde68d](https://github.com/missannil/annil/commit/4fde68d332ab78fc784cb32c82b8c4c8682b956c))
+
+## [1.11.0-alpha.1](https://github.com/missannil/annil/compare/v1.10.1...v1.11.0-alpha.1) (2025-01-13)
+
+
+### Features
+
+* computedUpdater函数去除默认参数,修正Wm.Textarea类型 ([e32f965](https://github.com/missannil/annil/commit/e32f965f7cd21c0545c9eb87a8f8bd9de8d39327))
+* slotComponents ([273d4c6](https://github.com/missannil/annil/commit/273d4c60a26f5105fd336510fca603d704db917c))
+
 ## [1.10.1](https://github.com/missannil/annil/compare/v1.10.0...v1.10.1) (2024-11-11)
 
 

package/dist/api/DefineComponent/ReturnType/CreateComponentDoc.d.ts

@@ -7,7 +7,7 @@ import type { GetCustomEventDocOfSubDoc } from "./GetCustomEventDocOfSubDoc";
 type GetStopKeys<O> = {
     [k in keyof O]: k extends `${string}_${infer Key}_${string}_catch` ? Key : never;
 }[keyof O];
-export type CreateComponentDoc<TRootDoc extends RootComponentType, TName extends string, TSubComponentTuple extends SubComponentType[], AllPropertiesDoc extends unknown | object = TRootDoc["properties"], AllCustomEventsDoc extends unknown | object = TRootDoc["customEvents"] & GetCustomEventDocOfSubDoc<TSubComponentTuple[number]>, StopKeys extends string = GetStopKeys<TRootDoc["events"]>, FinalCustomEventDoc extends object = Omit<AllCustomEventsDoc, StopKeys>> = ComputeIntersection<IfExtends<unknown, AllPropertiesDoc, {}, {
+export type CreateComponentDoc<TRootDoc extends RootComponentType, TName extends string, TSubComponentTuple extends SubComponentType[], AllPropertiesDoc extends unknown | object = TRootDoc["properties"], AllCustomEventsDoc extends unknown | object = TRootDoc["customEvents"] & GetCustomEventDocOfSubDoc<TSubComponentTuple[number]["composedEvents"] & {}>, StopKeys extends string = GetStopKeys<TRootDoc["events"]>, FinalCustomEventDoc extends object = Omit<AllCustomEventsDoc, StopKeys>> = ComputeIntersection<IfExtends<unknown, AllPropertiesDoc, {}, {
     properties: {
         [k in keyof AllPropertiesDoc as `${TName}_${k & string}`]: AddNullForObject<AllPropertiesDoc[k]>;
     };

package/dist/api/DefineComponent/index.d.ts

@@ -1,6 +1,8 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { RootComponentTrueOptions } from "../RootComponent";
 import type { RootComponentType } from "../RootComponent/RootComponentType";
+import type { SlotComponentReturnType } from "../SlotComponent/SlotComponentReturnType";
+import type { SubComponentTrueOptions } from "../SubComponent";
 import type { SubComponentType } from "../SubComponent/SubComponentType";
 import type { NameOrPathOption } from "./NameOrPage/NameOrPathOption";
 import type { CreateComponentDoc } from "./ReturnType/CreateComponentDoc";
@@ -8,13 +10,16 @@ import type { CreatePageDoc } from "./ReturnType/CreatePageDoc";
 import type { RootComponentOption } from "./RootComponent/RootComponentOption";
 import type { SubComponentsOption } from "./SubComponents/SubComponentsOption";
 export type Path = `/${string}`;
-type RootOptions<TRootComponentDoc extends RootComponentType, TSubComponentTuple extends SubComponentType[], TName extends string, TPath extends Path> = NameOrPathOption<TName, TPath, TRootComponentDoc["isPage"] & {}> & RootComponentOption<TRootComponentDoc> & SubComponentsOption<TSubComponentTuple>;
-type DefineComponentConstructor = <TRootComponentDoc extends RootComponentType = {}, TSubComponentTuple extends SubComponentType[] = [], TName extends string = "", TPath extends Path = "/">(options: RootOptions<TRootComponentDoc, TSubComponentTuple, TName, TPath>) => IfExtends<"", TName, CreatePageDoc<TRootComponentDoc, TPath>, CreateComponentDoc<TRootComponentDoc, TName, TSubComponentTuple>>;
+type RootOptions<TRootComponentDoc extends RootComponentType, TSubComponentTuple extends SubComponentType[], TSlotComponents extends unknown[], TName extends string, TPath extends Path> = NameOrPathOption<TName, TPath, TRootComponentDoc["isPage"] & {}> & {
+    slotComponents?: TSlotComponents;
+} & RootComponentOption<TRootComponentDoc> & SubComponentsOption<TSubComponentTuple>;
+type DefineComponentConstructor = <TRootComponentDoc extends RootComponentType = {}, TSubComponentTuple extends SubComponentType[] = [], TSlotComponents extends unknown[] = [], TName extends string = "", TPath extends Path = "/">(options: RootOptions<TRootComponentDoc, TSubComponentTuple, TSlotComponents, TName, TPath>) => IfExtends<"", TName, CreatePageDoc<TRootComponentDoc, TPath>, CreateComponentDoc<TRootComponentDoc, TName, TSubComponentTuple>>;
 export type DefineComponentOption = {
     name?: string;
     path?: string;
     rootComponent?: RootComponentTrueOptions;
-    subComponents?: SubComponentType[];
+    subComponents?: SubComponentTrueOptions[];
+    slotComponents?: SlotComponentReturnType[];
 };
 /**
  * 把根组件选项和子组件选项转化为原生Component API选项并执行

package/dist/api/DefineComponent/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/DefineComponent/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAyCtD;;GAEG;AACH,8DAA8D;AAC9D,MAAM,CAAC,MAAM,eAAe,GAA+B,UAAS,OAAO;IACzE,SAAS;IACP,8DAA8D;IAC9D,gBAAgB,CAAC,OAAgC,CAAQ,CAC1D,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/DefineComponent/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AA6CtD;;GAEG;AACH,8DAA8D;AAC9D,MAAM,CAAC,MAAM,eAAe,GAA+B,UAAS,OAAO;IACzE,SAAS;IACP,8DAA8D;IAC9D,gBAAgB,CAAC,OAAgC,CAAQ,CAC1D,CAAC;AACJ,CAAC,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/__throttleDebounce__FieldCheck.d.ts

@@ -1,3 +1,4 @@
 import type { RootComponentTrueOptions } from "../../RootComponent";
-import type { SubComponentType } from "../../SubComponent/SubComponentType";
-export declare function __throttleDebounce__FieldCheck(config: RootComponentTrueOptions | SubComponentType[]): void;
+import type { SlotComponentReturnType } from "../../SlotComponent/SlotComponentReturnType";
+import type { SubComponentTrueOptions } from "../../SubComponent";
+export declare function __throttleDebounce__FieldCheck(config: RootComponentTrueOptions | SubComponentTrueOptions[] | SlotComponentReturnType[]): void;

package/dist/api/DefineComponent/normalizeOptions/__throttleDebounce__FieldCheck.js.map

@@ -1 +1 @@
-{"version":3,"file":"__throttleDebounce__FieldCheck.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/__throttleDebounce__FieldCheck.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,8BAA8B,CAAC,MAAqD;IAClG,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,KAAK,MAAM,YAAY,IAAI,MAAM,EAAE,CAAC;YAClC,8BAA8B,CAAC,YAAY,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;YAChB,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7C,CAAC;QACD,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpB,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QACjD,CAAC;QACD,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACtB,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;QACnD,CAAC;QACD,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACjB,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,QAAQ,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,CAAC;YAC9C,MAAM,KAAK,CAAC,gCAAgC,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"__throttleDebounce__FieldCheck.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/__throttleDebounce__FieldCheck.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,8BAA8B,CAC5C,MAAwF;IAExF,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,KAAK,MAAM,YAAY,IAAI,MAAM,EAAE,CAAC;YAClC,8BAA8B,CAAC,YAAY,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;YAChB,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7C,CAAC;QACD,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpB,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QACjD,CAAC;QACD,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACtB,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;QACnD,CAAC;QACD,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACjB,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,QAAQ,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,CAAC;YAC9C,MAAM,KAAK,CAAC,gCAAgC,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/computedUpdater.d.ts

@@ -3,4 +3,4 @@ export type ComputedDependence = {
     paths: string[];
     val: unknown;
 };
-export declare function computedUpdater(this: Instance, isUpdated?: boolean): boolean;
+export declare function computedUpdater(this: Instance): void;

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/computedUpdater.js

@@ -2,14 +2,14 @@ import { deepEqual } from "../../../../utils/deepEqual";
 import { deepProxy, getOriginalValue } from "./data-tracer";
 import { removeSubDependences } from "./dependencesOptimize";
 import { getPathsValue } from "./getPathsValue";
-export function computedUpdater(isUpdated = false) {
+export function computedUpdater() {
     for (const key in this.data.__computedCache__) {
         const itemCache = this.data.__computedCache__[key];
         let changed = false;
         for (const dep of itemCache.dependences) {
             // getPathsValue返回的是数组
             const curVal = getPathsValue(this.data, dep.paths.join("."))[0];
-            // 检查依赖是否改变了
+            // 检查依赖是否改变
             if (!deepEqual(curVal, dep.val)) {
                 changed = true;
                 break;
@@ -22,13 +22,11 @@ export function computedUpdater(isUpdated = false) {
             this.setData({
                 [key]: getOriginalValue(newValue),
             });
-            isUpdated = true;
             // 更新依赖(优化)
             this.data.__computedCache__[key].dependences = removeSubDependences(newDependences);
             // 有一个计算属性更新就重新更新所有计算互相,避免后置依赖导致前置依赖错误
-            return computedUpdater.call(this, isUpdated);
+            return computedUpdater.call(this);
         }
     }
-    return isUpdated;
 }
 //# sourceMappingURL=computedUpdater.js.map

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/computedUpdater.js.map

@@ -1 +1 @@
-{"version":3,"file":"computedUpdater.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/computedWatchHandle/computedUpdater.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAExD,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAIhD,MAAM,UAAU,eAAe,CAAiB,SAAS,GAAG,KAAK;IAC/D,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC9C,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACnD,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,KAAK,MAAM,GAAG,IAAI,SAAS,CAAC,WAAW,EAAE,CAAC;YACxC,sBAAsB;YACtB,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAEhE,YAAY;YACZ,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBAChC,OAAO,GAAG,IAAI,CAAC;gBAEf,MAAM;YACR,CAAC;QACH,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,cAAc,GAAyB,EAAE,CAAC;YAChD,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC;YACvF,wCAAwC;YACxC,IAAI,CAAC,OAAO,CAAC;gBACX,CAAC,GAAG,CAAC,EAAE,gBAAgB,CAAC,QAAQ,CAAC;aAClC,CAAC,CAAC;YAEH,SAAS,GAAG,IAAI,CAAC;YAEjB,WAAW;YACX,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,WAAW,GAAG,oBAAoB,CAAC,cAAc,CAAC,CAAC;YAEpF,sCAAsC;YACtC,OAAO,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}
+{"version":3,"file":"computedUpdater.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/computedWatchHandle/computedUpdater.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAExD,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,UAAU,eAAe;IAC7B,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC9C,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACnD,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,KAAK,MAAM,GAAG,IAAI,SAAS,CAAC,WAAW,EAAE,CAAC;YACxC,sBAAsB;YACtB,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAChE,WAAW;YACX,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBAChC,OAAO,GAAG,IAAI,CAAC;gBACf,MAAM;YACR,CAAC;QACH,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,cAAc,GAAyB,EAAE,CAAC;YAChD,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC;YACvF,wCAAwC;YACxC,IAAI,CAAC,OAAO,CAAC;gBACX,CAAC,GAAG,CAAC,EAAE,gBAAgB,CAAC,QAAQ,CAAC;aAClC,CAAC,CAAC;YACH,WAAW;YACX,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,WAAW,GAAG,oBAAoB,CAAC,cAAc,CAAC,CAAC;YACpF,sCAAsC;YACtC,OAAO,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/index.js

@@ -16,6 +16,7 @@ import { injectInfoHandler } from "./injectInfoHandler";
 import { InternalFieldProtection } from "./internalFieldProtection";
 import { rootComponentOptionHandle } from "./rootComponentOptionHandle";
 import { sameFuncOptionsHandle } from "./sameFuncOptionsHandle";
+import { slotComponentOptionHandle } from "./slotComponentsOptionHandle";
 import { subComponentsOptionHandle } from "./subComponentsOptionHandle";
 /**
  * 把DefineComponentOption转化为原生Component API支持的配置
@@ -24,7 +25,8 @@ import { subComponentsOptionHandle } from "./subComponentsOptionHandle";
  */
 export function normalizeOptions(defineComponentOption) {
     const rootComponentOption = defineComponentOption.rootComponent;
-    const subComponentsOption = defineComponentOption.subComponents;
+    const subComponentsOptions = defineComponentOption.subComponents;
+    const slotComponentOptions = defineComponentOption.slotComponents;
     const finalOptionsForComponent = injectInfoHandler({
         observers: {},
         data: {},
@@ -53,12 +55,18 @@ export function normalizeOptions(defineComponentOption) {
     if (rootComponentOption && !isEmptyObject(rootComponentOption)) {
         // 验证配置中是否有内部字段__throttleDebounce__,有则报错,因为在rootComponentOptionHandle中会加入__throttleDebounce__字段到data中
         __throttleDebounce__FieldCheck(rootComponentOption);
-        rootComponentOptionHandle(finalOptionsForComponent, sameFuncOptions, rootComponentOption);
+        rootComponentOptionHandle(finalOptionsForComponent, rootComponentOption, sameFuncOptions);
     }
-    if (subComponentsOption && !isEmptyObject(subComponentsOption)) {
+    if (subComponentsOptions && subComponentsOptions.length !== 0) {
         // 验证配置中是否有内部字段__throttleDebounce__,有则报错,因为在rootComponentOptionHandle中会加入__throttleDebounce__字段到data中
-        __throttleDebounce__FieldCheck(subComponentsOption);
-        subComponentsOptionHandle(finalOptionsForComponent, subComponentsOption, sameFuncOptions);
+        __throttleDebounce__FieldCheck(subComponentsOptions);
+        subComponentsOptionHandle(finalOptionsForComponent, subComponentsOptions, sameFuncOptions);
+    }
+    if (slotComponentOptions && slotComponentOptions.length !== 0) {
+        __throttleDebounce__FieldCheck(slotComponentOptions);
+        slotComponentOptions.forEach((slotComponentOption) => {
+            slotComponentOptionHandle(finalOptionsForComponent, slotComponentOption, sameFuncOptions);
+        });
     }
     sameFuncOptionsHandle(finalOptionsForComponent, rootComponentOption === null || rootComponentOption === void 0 ? void 0 : rootComponentOption.isPage, sameFuncOptions);
     // 配置与内部字段冲突验证

package/dist/api/DefineComponent/normalizeOptions/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/index.ts"],"names":[],"mappings":"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"}

package/dist/api/DefineComponent/normalizeOptions/rootComponentOptionHandle.d.ts

@@ -2,8 +2,8 @@ import type { RootComponentTrueOptions } from "../../RootComponent";
 import type { FinalOptionsOfComponent, SameFuncOptions } from ".";
 /**
  * 收集 rootComponentOptions 配置到 finalOptions 和 funcOptions 中
- * @param finalOptions - 收集配置对象
- * @param funcOptions  - 收集特殊配置对象字段
+ * @param finalOptions - 收集配置对象`
  * @param rootComponentOptions - 被收集的源配置对象
+ * @param funcOptions  - 收集特殊配置对象字段
  */
-export declare function rootComponentOptionHandle(finalOptions: FinalOptionsOfComponent, funcOptions: SameFuncOptions, rootComponentOptions: RootComponentTrueOptions): void;
+export declare function rootComponentOptionHandle(finalOptions: FinalOptionsOfComponent, rootComponentOptions: RootComponentTrueOptions, funcOptions: SameFuncOptions): void;

package/dist/api/DefineComponent/normalizeOptions/rootComponentOptionHandle.js

@@ -3,11 +3,11 @@ import { otherFieldsHandle } from "./otherFieldsHandle";
 import { sameFuncFieldsCollect } from "./sameFuncFieldsCollect";
 /**
  * 收集 rootComponentOptions 配置到 finalOptions 和 funcOptions 中
- * @param finalOptions - 收集配置对象
- * @param funcOptions  - 收集特殊配置对象字段
+ * @param finalOptions - 收集配置对象`
  * @param rootComponentOptions - 被收集的源配置对象
+ * @param funcOptions  - 收集特殊配置对象字段
  */
-export function rootComponentOptionHandle(finalOptions, funcOptions, rootComponentOptions) {
+export function rootComponentOptionHandle(finalOptions, rootComponentOptions, funcOptions) {
     // 自定义事件处理时,如果配置了防抖节流,则需要在data.__throttleDebounce__保留配置信息,以便后续使用
     if (rootComponentOptions.customEvents)
         customEventsHandle(finalOptions, rootComponentOptions.customEvents);

package/dist/api/DefineComponent/normalizeOptions/rootComponentOptionHandle.js.map

@@ -1 +1 @@
-{"version":3,"file":"rootComponentOptionHandle.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/rootComponentOptionHandle.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE;;;;;GAKG;AACH,MAAM,UAAU,yBAAyB,CACvC,YAAqC,EACrC,WAA4B,EAC5B,oBAA8C;IAE9C,gEAAgE;IAChE,IAAI,oBAAoB,CAAC,YAAY;QAAE,kBAAkB,CAAC,YAAY,EAAE,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAE3G,IAAI,oBAAoB,CAAC,MAAM;QAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAElG,qBAAqB,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC;IAEzD,iBAAiB,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;AACxD,CAAC"}
+{"version":3,"file":"rootComponentOptionHandle.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/rootComponentOptionHandle.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE;;;;;GAKG;AACH,MAAM,UAAU,yBAAyB,CACvC,YAAqC,EACrC,oBAA8C,EAC9C,WAA4B;IAE5B,gEAAgE;IAChE,IAAI,oBAAoB,CAAC,YAAY;QAAE,kBAAkB,CAAC,YAAY,EAAE,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAE3G,IAAI,oBAAoB,CAAC,MAAM;QAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAElG,qBAAqB,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC;IAEzD,iBAAiB,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;AACxD,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/slotComponentsOptionHandle.d.ts

@@ -0,0 +1,9 @@
+import type { SlotComponentReturnType } from "../../SlotComponent/SlotComponentReturnType";
+import type { FinalOptionsOfComponent, SameFuncOptions } from ".";
+/**
+ * 收集 rootComponentOptions 配置到 finalOptions 和 funcOptions 中
+ * @param finalOptions - 收集配置对象
+ * @param funcOptions  - 收集特殊配置对象字段
+ * @param slotComponentOptions - 被收集的源配置对象
+ */
+export declare function slotComponentOptionHandle(finalOptions: FinalOptionsOfComponent, slotComponentOptions: SlotComponentReturnType, funcOptions: SameFuncOptions): void;

package/dist/api/DefineComponent/normalizeOptions/slotComponentsOptionHandle.js

@@ -0,0 +1,15 @@
+import { otherFieldsHandle } from "./otherFieldsHandle";
+import { sameFuncFieldsCollect } from "./sameFuncFieldsCollect";
+/**
+ * 收集 rootComponentOptions 配置到 finalOptions 和 funcOptions 中
+ * @param finalOptions - 收集配置对象
+ * @param funcOptions  - 收集特殊配置对象字段
+ * @param slotComponentOptions - 被收集的源配置对象
+ */
+export function slotComponentOptionHandle(finalOptions, slotComponentOptions, funcOptions) {
+    if (slotComponentOptions.events)
+        Object.assign(finalOptions.methods, slotComponentOptions.events);
+    sameFuncFieldsCollect(slotComponentOptions, funcOptions);
+    otherFieldsHandle(finalOptions, slotComponentOptions);
+}
+//# sourceMappingURL=slotComponentsOptionHandle.js.map

package/dist/api/DefineComponent/normalizeOptions/slotComponentsOptionHandle.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"slotComponentsOptionHandle.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/slotComponentsOptionHandle.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE;;;;;GAKG;AACH,MAAM,UAAU,yBAAyB,CACvC,YAAqC,EACrC,oBAA6C,EAC7C,WAA4B;IAE5B,IAAI,oBAAoB,CAAC,MAAM;QAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAElG,qBAAqB,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC;IAEzD,iBAAiB,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;AACxD,CAAC"}

package/dist/api/InstanceInject/instanceConfig.d.ts

@@ -18,7 +18,7 @@ export interface IInjectInfo extends BaseInjectInfo {
 export type IInjectAllData = IfEquals<{}, injectData & IInjectStore, {}, ComputeIntersection<injectData & IInjectStore>>;
 type injectData = DataConstraint extends IInjectInfo["data"] ? {} : IInjectInfo["data"];
 export type IInjectStore = StoreConstraint extends IInjectInfo["store"] ? {} : ReturnTypeInObject<IInjectInfo["store"]>;
-export type IInjectMethods = IInjectInfo["methods"];
+export type IInjectMethods = MethodsConstraint extends IInjectInfo["methods"] ? {} : IInjectInfo["methods"];
 /**
  * 实例配置接口
  */

package/dist/api/RootComponent/CustomEvents/CustomEventsDoc.d.ts

@@ -1,5 +1,3 @@
 import type { Primitive } from "hry-types/src/_internal/Primitive";
 import type { CustomEventsTags } from "./CustomEventsTag";
-export type CustomEventsDoc = {
-    [k in string]: Exclude<Primitive, undefined> | object | CustomEventsTags;
-};
+export type CustomEventsDoc = Record<string, Exclude<Primitive, undefined> | object | CustomEventsTags>;

package/dist/api/RootComponent/CustomEvents/CustomEventsOption.d.ts

@@ -1,6 +1,6 @@
 import type { G } from "hry-types";
 import type { CustomEventConstraint } from "./CustomEventConstraint";
-export type CustomEventsOption<TCustomEvents extends CustomEventConstraint, EventsKeys extends PropertyKey> = {
+export type CustomEventsOption<TCustomEvents extends CustomEventConstraint, DuplicateFields extends PropertyKey> = {
     /**
      * customEvents 定义组件的自定义事件 [类型约束](CustomEventConstraint.ts)
      * @remarks 通过this.A(123)调用。与events字段重复检测
@@ -30,5 +30,5 @@ export type CustomEventsOption<TCustomEvents extends CustomEventConstraint, Even
      * },
      * ```
      */
-    customEvents?: TCustomEvents & G.IllegalFieldValidator<TCustomEvents, "bubbles" | "composed" | "capturePhase", 1, "options"> & G.DuplicateFieldValidator<TCustomEvents, EventsKeys, "与events字段重复">;
+    customEvents?: TCustomEvents & G.IllegalFieldValidator<TCustomEvents, "bubbles" | "composed" | "capturePhase", 1, "options"> & G.DuplicateFieldValidator<TCustomEvents, DuplicateFields, "字段重复">;
 };

package/dist/api/RootComponent/Data/DataOption.d.ts

@@ -1,5 +1,5 @@
 import type { G } from "hry-types";
-export type DataOption<TData extends object, PropertiesKeys extends PropertyKey> = {
+export type DataOption<TData extends object, PropertiesKeys extends PropertyKey, errMsg extends string = "与properties字段重复"> = {
     /**
      * 定义实例基本数据,默认下划线(`_`)开头的为内部数据,不会被渲染
      * @remarks 与properties字段重复校验
@@ -14,5 +14,5 @@ export type DataOption<TData extends object, PropertiesKeys extends PropertyKey>
      * }
      * ```
      */
-    data?: TData & G.DuplicateFieldValidator<TData, PropertiesKeys, "与properties字段重复">;
+    data?: TData & G.DuplicateFieldValidator<TData, PropertiesKeys, errMsg>;
 };

package/dist/api/SlotComponent/SLotSuperDatas/SlotSuperDatasOption.d.ts

@@ -0,0 +1,6 @@
+export type SLotSuperDataOption<TInherit extends PropertyKey[]> = {
+    /**
+     * 来自父级的数据,关联父级的数据,用于vscod插件判断数据来源
+     */
+    superDatas?: TInherit;
+};

package/dist/api/SlotComponent/SLotSuperDatas/SlotSuperDatasOption.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=SlotSuperDatasOption.js.map

package/dist/api/SlotComponent/SLotSuperDatas/SlotSuperDatasOption.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SlotSuperDatasOption.js","sourceRoot":"","sources":["../../../../src/api/SlotComponent/SLotSuperDatas/SlotSuperDatasOption.ts"],"names":[],"mappings":""}

package/dist/api/SlotComponent/SlotComponentReturnType.d.ts

@@ -0,0 +1,20 @@
+import type { Func } from "hry-types/src/Misc/_api";
+import type { DataConstraint } from "../RootComponent/Data/DataConstraint";
+import type { EventsConstraint } from "../RootComponent/Events/EventsConstraint";
+import type { LifetimesConstraint } from "../RootComponent/Lifetimes/LifetimesConstraint";
+import type { MethodsConstraint } from "../RootComponent/Methods/MethodsConstraint";
+import type { PageLifetimesOption } from "../RootComponent/PageLifetimes/PageLifetimesOption";
+import type { SlotComputedConstraint } from "./SlotComputed/SlotComputedConstraint";
+import type { StoreConstraint } from "./SlotStore/SlotStoreConstraint";
+export type SlotComponentReturnType = {
+    data?: DataConstraint;
+    computed?: SlotComputedConstraint;
+    methods?: MethodsConstraint;
+    events?: EventsConstraint;
+    store?: StoreConstraint;
+    observers?: Record<string, Func>;
+    watch?: Record<string, Func>;
+    lifetimes?: LifetimesConstraint;
+    behaviors?: string[];
+    pageLifetimes?: PageLifetimesOption<false, object>["pageLifetimes"] | PageLifetimesOption<true, object>["pageLifetimes"];
+};

package/dist/api/SlotComponent/SlotComponentReturnType.js

@@ -0,0 +1,9 @@
+export {};
+// // 验证key是否合法
+// type _Validator<O, Doc, ErrKeys = Exclude<keyof O, keyof Doc>> = [ErrKeys] extends [never] ? Doc
+//   : `错误的字段${ErrKeys & string}`;
+// /**
+//  * SlotComponent Api 返回的类型
+//  */
+// export type SlotComponentReturnType<O extends _Validator<O, _SlotComponentReturnType> = _SlotComponentReturnType> = O;
+//# sourceMappingURL=SlotComponentReturnType.js.map

package/dist/api/SlotComponent/SlotComponentReturnType.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SlotComponentReturnType.js","sourceRoot":"","sources":["../../../src/api/SlotComponent/SlotComponentReturnType.ts"],"names":[],"mappings":";AAwBA,eAAe;AACf,mGAAmG;AACnG,kCAAkC;AAElC,MAAM;AACN,6BAA6B;AAC7B,MAAM;AACN,yHAAyH"}

package/dist/api/SlotComponent/SlotComputed/GetSlotComputedDoc.d.ts

@@ -0,0 +1,9 @@
+import type { SlotComputedConstraint } from "./SlotComputedConstraint";
+/**
+ * 获取computed字段文档类型
+ * @param T - ComputedConstraint
+ * @returns object
+ */
+export type GetSlotComputedDoc<TComputed extends SlotComputedConstraint> = {
+    [k in keyof TComputed]: ReturnType<TComputed[k]>;
+};

package/dist/api/SlotComponent/SlotComputed/GetSlotComputedDoc.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=GetSlotComputedDoc.js.map

package/dist/api/SlotComponent/SlotComputed/GetSlotComputedDoc.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GetSlotComputedDoc.js","sourceRoot":"","sources":["../../../../src/api/SlotComponent/SlotComputed/GetSlotComputedDoc.ts"],"names":[],"mappings":""}

package/dist/api/SlotComponent/SlotComputed/SlotComputedConstraint.d.ts

@@ -0,0 +1 @@
+export type SlotComputedConstraint = Record<string, () => void>;

package/dist/api/SlotComponent/SlotComputed/SlotComputedConstraint.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=SlotComputedConstraint.js.map

package/dist/api/SlotComponent/SlotComputed/SlotComputedConstraint.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SlotComputedConstraint.js","sourceRoot":"","sources":["../../../../src/api/SlotComponent/SlotComputed/SlotComputedConstraint.ts"],"names":[],"mappings":""}

package/dist/api/SlotComponent/SlotComputed/SlotComputedOption.d.ts

@@ -0,0 +1,29 @@
+import type { G } from "hry-types";
+import type { DuplicateFieldValidator } from "hry-types/src/Generic/DuplicateFieldValidator";
+import type { SlotComputedConstraint } from "./SlotComputedConstraint";
+export type SlotComputedOption<TComputed extends SlotComputedConstraint, CompareKeys extends PropertyKey, Instance extends object, TPrefix extends string> = {
+    /**
+     * computed字段, [类型约束ComputedConstraint](ComputedConstraint.ts)
+     * @remarks
+     *
+     * 函数体内,可通过this.data获取实例其他数据(依赖),setData发生时,若数据(依赖)发生变化则重新运行函数体并setData。
+     *
+     * 带重复字段检测(与properties、data、store字段比较)
+     *
+     * @example
+     *
+     * ```ts
+     * {
+     *  data:{
+     *     count:1
+     *  },
+     *  computed:{
+     *     return this.data.count + 1
+     *  }
+  
+     * }
+     *
+     * ```
+     */
+    computed?: TComputed & ThisType<Instance> & DuplicateFieldValidator<TComputed, CompareKeys> & G.KeyValidator<TComputed, `${TPrefix}_${string}` | `_${TPrefix}_${string}`>;
+};

package/dist/api/SlotComponent/SlotComputed/SlotComputedOption.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=SlotComputedOption.js.map

package/dist/api/SlotComponent/SlotComputed/SlotComputedOption.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SlotComputedOption.js","sourceRoot":"","sources":["../../../../src/api/SlotComponent/SlotComputed/SlotComputedOption.ts"],"names":[],"mappings":""}

package/dist/api/SlotComponent/SlotData/SlotDataOption.d.ts

@@ -0,0 +1,13 @@
+import type { G } from "hry-types";
+import type { IfExtends } from "hry-types/src/Any/IfExtends";
+import type { Validators } from "../../../types/Validators";
+import type { SlotEventsConstraint } from "../SlotEvents/SlotEventsConstraint";
+export type SlotDataOption<TData extends object, TDuplicateKeys extends PropertyKey, Prefix extends string> = {
+    /**
+     * slot块数据
+     */
+    data?: TData & Validators<[
+        G.DuplicateFieldValidator<TData, TDuplicateKeys, "字段重复">,
+        IfExtends<SlotEventsConstraint, TData, unknown, G.KeyValidator<TData, Prefix, "前缀错误">>
+    ]>;
+};

package/dist/api/SlotComponent/SlotData/SlotDataOption.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=SlotDataOption.js.map

package/dist/api/SlotComponent/SlotData/SlotDataOption.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SlotDataOption.js","sourceRoot":"","sources":["../../../../src/api/SlotComponent/SlotData/SlotDataOption.ts"],"names":[],"mappings":""}

package/dist/api/SlotComponent/SlotEvents/SlotEventsConstraint.d.ts

@@ -0,0 +1,2 @@
+import type { WMBaseEvent } from "../../../types/OfficialTypeAlias";
+export type SlotEventsConstraint = Record<string, (e: WMBaseEvent) => void>;

package/dist/api/SlotComponent/SlotEvents/SlotEventsConstraint.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=SlotEventsConstraint.js.map

package/dist/api/SlotComponent/SlotEvents/SlotEventsConstraint.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SlotEventsConstraint.js","sourceRoot":"","sources":["../../../../src/api/SlotComponent/SlotEvents/SlotEventsConstraint.ts"],"names":[],"mappings":""}

package/dist/api/SlotComponent/SlotEvents/SlotEventsOption.d.ts

@@ -0,0 +1,13 @@
+import type { G } from "hry-types";
+import type { IfExtends } from "hry-types/src/Any/IfExtends";
+import type { Validators } from "../../../types/Validators";
+import type { SlotEventsConstraint } from "./SlotEventsConstraint";
+export type SlotEventsOption<TEvents extends SlotEventsConstraint, TDuplicateKeys extends PropertyKey, Prefix extends string> = {
+    /**
+     * slot块数据
+     */
+    events?: TEvents & Validators<[
+        G.DuplicateFieldValidator<TEvents, TDuplicateKeys, "字段重复">,
+        IfExtends<SlotEventsConstraint, TEvents, unknown, G.KeyValidator<TEvents, Prefix, "前缀错误">>
+    ]>;
+};

package/dist/api/SlotComponent/SlotEvents/SlotEventsOption.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=SlotEventsOption.js.map

package/dist/api/SlotComponent/SlotEvents/SlotEventsOption.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SlotEventsOption.js","sourceRoot":"","sources":["../../../../src/api/SlotComponent/SlotEvents/SlotEventsOption.ts"],"names":[],"mappings":""}

package/dist/api/SlotComponent/SlotMethods/SlotMethodsOption.d.ts

@@ -0,0 +1,13 @@
+import type { G } from "hry-types";
+import type { IfExtends } from "hry-types/src/Any/_api";
+import type { Validators } from "../../../types/Validators";
+import type { MethodsConstraint } from "../../RootComponent/Methods/MethodsConstraint";
+export type SlotMethodsOption<TMethods extends MethodsConstraint, TDuplicateKeys extends PropertyKey, validityKeys extends string> = {
+    /**
+     * 与customEvents和events字段重复检测
+     */
+    methods?: TMethods & Validators<[
+        G.DuplicateFieldValidator<TMethods, TDuplicateKeys, "字段重复">,
+        IfExtends<MethodsConstraint, TMethods, unknown, G.KeyValidator<TMethods, validityKeys, "前缀错误">>
+    ]>;
+};

package/dist/api/SlotComponent/SlotMethods/SlotMethodsOption.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=SlotMethodsOption.js.map

package/dist/api/SlotComponent/SlotMethods/SlotMethodsOption.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SlotMethodsOption.js","sourceRoot":"","sources":["../../../../src/api/SlotComponent/SlotMethods/SlotMethodsOption.ts"],"names":[],"mappings":""}

package/dist/api/SlotComponent/SlotStore/SlotStoreConstraint.d.ts

@@ -0,0 +1 @@
+export type StoreConstraint = Record<string, () => unknown>;

package/dist/api/SlotComponent/SlotStore/SlotStoreConstraint.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=SlotStoreConstraint.js.map

package/dist/api/SlotComponent/SlotStore/SlotStoreConstraint.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SlotStoreConstraint.js","sourceRoot":"","sources":["../../../../src/api/SlotComponent/SlotStore/SlotStoreConstraint.ts"],"names":[],"mappings":""}

package/dist/api/SlotComponent/SlotStore/SlotStoreOption.d.ts

@@ -0,0 +1,17 @@
+import type { G } from "hry-types";
+import type { StoreConstraint } from "./SlotStoreConstraint";
+export type SoltStoreOption<TStore extends StoreConstraint, TDuplicateKeys extends PropertyKey, Prefix extends string> = {
+    /**
+     * 全局响应式数据字段,全局store对应数据变化实例对应数据自动setData。与properties和data字段有重复检测
+     * @example
+     * ```ts
+     * {
+     *   //...
+     *   store: {
+     *     responsiveData: () => sroreX.str,
+     *   },
+     * }
+     * ```
+     */
+    store?: TStore & G.DuplicateFieldValidator<TStore, TDuplicateKeys, "字段重复"> & G.KeyValidator<TStore, `${Prefix}_${string}` | `_${Prefix}_${string}`, "前缀错误">;
+};

package/dist/api/SlotComponent/SlotStore/SlotStoreOption.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=SlotStoreOption.js.map

package/dist/api/SlotComponent/SlotStore/SlotStoreOption.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SlotStoreOption.js","sourceRoot":"","sources":["../../../../src/api/SlotComponent/SlotStore/SlotStoreOption.ts"],"names":[],"mappings":""}