npm - annil - Versions diffs - 1.5.14 → 1.6.0 - Mend

annil 1.5.14 → 1.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (55) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -4,6 +4,20 @@
 * 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
+## [1.6.0](https://github.com/missannil/annil/compare/v1.5.15...v1.6.0) (2024-02-01)
+### Features
+* 组件实例增加cloneData字段 ([a2bc52d](https://github.com/missannil/annil/commit/a2bc52de20649a735ec860cdaae2bb411028b5fe))
+## [1.5.15](https://github.com/missannil/annil/compare/v1.5.14...v1.5.15) (2024-01-15)
+### Bug Fixes
+* subComputed约束 去除默认{} ([054cb48](https://github.com/missannil/annil/commit/054cb482cdc6c84e820d69d163b9cafe0c01de81))
 ## [1.5.14](https://github.com/missannil/annil/compare/v1.5.13...v1.5.14) (2024-01-15)

package/dist/api/DefineComponent/assignOptions/index.d.ts CHANGED Viewed

@@ -13,6 +13,7 @@ import type { ComputedCache } from "./computedWatchHandle/initComputed";
 type InstanceInnerFields = {
     data: OptionsInnerFields["data"];
     disposer: Record<string, Func>;
+    cloneData: OptionsInnerFields["data"];
 } & OptionsInnerFields["methods"];
 export type Instance = (ComponentInstance | PageInstance) & InstanceInnerFields;
 export type FuncOptions = Record<"pageLifetimes" | "lifetimes" | "watch" | "observers", Record<string, Func[]>>;

package/dist/api/DefineComponent/assignOptions/index.js CHANGED Viewed

@@ -17,6 +17,13 @@ export function isPageCheck(isPage) {
         }
     };
 }
+function addCloneDataToInstance() {
+    this.cloneData = new Proxy(this.data, {
+        get: (target, key) => {
+            return deepClone(target)[key];
+        },
+    });
+}
 function onLoadReceivedDataHandle(option) {
     const innerData = option[INNERMARKER.url];
     if (innerData === undefined)
@@ -193,6 +200,7 @@ export function assignOptions(defineComponentOption) {
         && hijack(finalOptionsForComponent.pageLifetimes, "load", [loadReceivedDataHandle]);
     hijack(finalOptionsForComponent.methods, "onLoad", [onLoadReceivedDataHandle]);
     hijack(finalOptionsForComponent.lifetimes, "attached", [isPageCheck(rootComponentOption === null || rootComponentOption === void 0 ? void 0 : rootComponentOption.isPage)]);
+    hijack(finalOptionsForComponent.lifetimes, "created", [addCloneDataToInstance]);
     finalOptionsForComponent.isPage
         && finalOptionsForComponent.options && Reflect.deleteProperty(finalOptionsForComponent.options, "virtualHost");
     initStore(finalOptionsForComponent);

package/dist/api/DefineComponent/assignOptions/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/assignOptions/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;~~AAIlE~~,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AAmBrE,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAG5D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;~~AAsDxC~~,MAAM,UAAU,WAAW,CAAC,MAA2B;IACrD,OAAO;QACL,MAAM,KAAK,GAAI,IAAqB,CAAC,KAA2B,CAAC;QACjE,IAAI,KAAK,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YAE7B,MAAM,KAAK,CACT,OAAO,KAAK,yCAAyC,CACtD,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,KAAK,IAAI,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YAEvD,MAAM,KAAK,CACT,MAAM,IAAI,CAAC,EAAE,6CAA6C,CAC3D,CAAC;QACJ,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;~~AAUD~~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"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/assignOptions/index.ts"],"names":[],"mappings":"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"}

package/dist/api/RootComponent/Computed/ComputedOption.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { DuplicateFieldValidator } from "hry-types/src/Generic/DuplicateFieldValidator";
 import type { ComputedConstraint } from "./ComputedConstraint";
-export type ComputedOption<TComputed extends ComputedConstraint, CompareKeys extends PropertyKey> = {
-    computed?: TComputed & DuplicateFieldValidator<TComputed, CompareKeys>;
+export type ComputedOption<TComputed extends ComputedConstraint, CompareKeys extends PropertyKey, Instance extends object> = {
+    computed?: TComputed & ThisType<Instance> & DuplicateFieldValidator<TComputed, CompareKeys>;
 };

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

@@ -1,5 +1,5 @@
-import type { V } from "hry-types";
+import type { G } from "hry-types";
 import type { CustomEventConstraint } from "./CustomEventConstraint";
 export type CustomEventsOption<TCustomEvents extends CustomEventConstraint, EventsKeys extends PropertyKey> = {
-    customEvents?: TCustomEvents & V.IllegalFieldValidator<TCustomEvents, "bubbles" | "composed" | "capturePhase", 1, "options"> & V.DuplicateFieldValidator<TCustomEvents, EventsKeys, "与events字段重复">;
+    customEvents?: TCustomEvents & G.IllegalFieldValidator<TCustomEvents, "bubbles" | "composed" | "capturePhase", 1, "options"> & G.DuplicateFieldValidator<TCustomEvents, EventsKeys, "与events字段重复">;
 };

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

@@ -1,4 +1,4 @@
-import type { V } from "hry-types";
+import type { G } from "hry-types";
 export type DataOption<TData extends object, PropertiesKeys extends PropertyKey> = {
-    data?: TData & V.DuplicateFieldValidator<TData, PropertiesKeys, "与properties字段重复">;
+    data?: TData & G.DuplicateFieldValidator<TData, PropertiesKeys, "与properties字段重复">;
 };

package/dist/api/RootComponent/Instance/RootComponentInstance.d.ts CHANGED Viewed

@@ -3,16 +3,19 @@ import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
 import type { IReactionDisposer } from "mobx";
 import type { Assign } from "../../../types/Assign";
+import type { ComputeObject } from "../../../types/ComputeObj";
 import type { WMComponentInstance, WMInstanceMethods, WMPageInstance } from "../../../types/OfficialTypeAlias";
 import type { IInjectData, IInjectMethods } from "../../InstanceInject/instanceConfig";
 import type { CustomEventMethods } from "./CustomEventMethods";
 import type { CustomSetData } from "./CustomSetData";
-export type RootComponentInstance<TIsPage extends boolean, TMethods extends object, TDataForSetData extends object, AllData extends object, CustomEventsDoc extends object, StoreDoc extends object> = IfExtends<false, TIsPage, WMComponentInstance, WMPageInstance> & Omit<WMInstanceMethods<{}>, "setData"> & CustomSetData<TDataForSetData> & IfExtends<{}, StoreDoc, unknown, {
+export type RootComponentInstance<TIsPage extends boolean, TMethods extends object, TDataForSetData extends object, AllData extends object, CustomEventsDoc extends object, StoreDoc extends object, instanceData = ComputeObject<Assign<IInjectData, ComputeIntersection<AllData>>>> = IfExtends<false, TIsPage, WMComponentInstance, WMPageInstance> & Omit<WMInstanceMethods<{}>, "setData"> & CustomSetData<TDataForSetData> & IfExtends<{}, StoreDoc, unknown, {
     disposer: {
         [k in keyof StoreDoc]: IReactionDisposer;
     };
 }> & Assign<IInjectMethods, TMethods & CustomEventMethods<CustomEventsDoc>> & {
-    data: ReadonlyDeep<Assign<IInjectData, ComputeIntersection<AllData>>>;
+    data: ReadonlyDeep<instanceData>;
+} & {
+    cloneData: ComputeObject<Assign<IInjectData, ComputeIntersection<AllData>>>;
 };
 export type ComponentInstance = RootComponentInstance<false, {}, {}, {}, {}, {}>;
 export type PageInstance = RootComponentInstance<true, {}, {}, {}, {}, {}>;

package/dist/api/RootComponent/Methods/MethodsOption.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
-import type { V } from "hry-types";
+import type { G } from "hry-types";
 import type { MethodsConstraint } from "./MethodsConstraint";
 export type MethodsOption<TMethods extends MethodsConstraint, DuplicateField extends PropertyKey> = {
-    methods?: TMethods & V.DuplicateFieldValidator<TMethods, DuplicateField>;
+    methods?: TMethods & G.DuplicateFieldValidator<TMethods, DuplicateField>;
 };

package/dist/api/RootComponent/Properties/PropertiesOption.d.ts CHANGED Viewed

@@ -1,10 +1,10 @@
-import type { V } from "hry-types";
+import type { G } from "hry-types";
 import type { Validators } from "../../../types/Validators";
 import type { PropertiesConstraint } from "./PropertiesConstraint";
 import type { PropertiesValueValidator } from "./PropertiesValueValidator";
 export type PropertiesOption<TProperties extends PropertiesConstraint> = {
     properties?: TProperties & Validators<[
         PropertiesValueValidator<TProperties>,
-        V.IllegalFieldValidator<TProperties, "value" | "type" | "optionalTypes", 1>
+        G.IllegalFieldValidator<TProperties, "value" | "type" | "optionalTypes", 1>
     ]>;
 };

package/dist/api/RootComponent/Store/StoreOption.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
-import type { V } from "hry-types";
+import type { G } from "hry-types";
 import type { StoreConstraint } from "./StoreConstraint";
 export type StoreOption<TStore extends StoreConstraint, TDuplicateKeys extends PropertyKey> = {
-    store?: TStore & V.DuplicateFieldValidator<TStore, TDuplicateKeys, "字段重复">;
+    store?: TStore & G.DuplicateFieldValidator<TStore, TDuplicateKeys, "字段重复">;
 };

package/dist/api/RootComponent/index.d.ts CHANGED Viewed

@@ -5,7 +5,7 @@ import type { ComputeIntersection } from "hry-types/src/Object/_api";
 import type { ComputeObject } from "../../types/ComputeObj";
 import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
 import type { ComponentDoc } from "../DefineComponent/ReturnType/ComponentDoc";
-import type { IInjectStore } from "../InstanceInject/instanceConfig";
+import type { IInjectData, IInjectStore } from "../InstanceInject/instanceConfig";
 import type { ComputedConstraint } from "./Computed/ComputedConstraint";
 import type { ComputedOption } from "./Computed/ComputedOption";
 import type { GetComputedDoc } from "./Computed/GetComputedDoc";
@@ -31,7 +31,9 @@ import type { GetStoreDoc } from "./Store/GeTStoreDoc";
 import type { StoreConstraint } from "./Store/StoreConstraint";
 import type { StoreOption } from "./Store/StoreOption";
 import type { WatchOption } from "./Watch/WatchOption";
-type RootComponentOptions<TEvents extends object, TIsPage extends boolean, TCustomEvents extends CustomEventConstraint, TMethods extends MethodsConstraint, TProperties extends PropertiesConstraint, TData extends object, TStore extends StoreConstraint, TComputed extends Record<string, Func>, EventsDoc extends object, CustomEventsDoc extends object, PropertiesDoc extends object, DataDoc extends object, StoreDoc extends object, ComputedDoc extends object> = MethodsOption<TMethods, keyof (EventsDoc & CustomEventsDoc)> & PropertiesOption<TProperties> & IsPageOption<TIsPage> & EventsOption<TEvents> & CustomEventsOption<TCustomEvents, keyof EventsDoc> & DataOption<TData, keyof PropertiesDoc> & StoreOption<TStore, keyof (PropertiesDoc & DataDoc)> & ComputedOption<TComputed, keyof (PropertiesDoc & DataDoc & StoreDoc)> & PageLifetimesOption<TIsPage, PropertiesDoc> & LifetimesOption & WatchOption<ComputedDoc & Required<PropertiesDoc> & DataDoc & StoreDoc & IInjectStore> & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "observers">> & ObserversOption<ComputedDoc & Required<PropertiesDoc> & DataDoc & StoreDoc & IInjectStore> & ThisType<RootComponentInstance<TIsPage, TMethods, DataDoc, DataDoc & Required<PropertiesDoc> & StoreDoc & ComputedDoc, CustomEventsDoc, StoreDoc>>;
+type RootComponentOptions<TEvents extends object, TIsPage extends boolean, TCustomEvents extends CustomEventConstraint, TMethods extends MethodsConstraint, TProperties extends PropertiesConstraint, TData extends object, TStore extends StoreConstraint, TComputed extends Record<string, Func>, EventsDoc extends object, CustomEventsDoc extends object, PropertiesDoc extends object, DataDoc extends object, StoreDoc extends object, ComputedDoc extends object> = MethodsOption<TMethods, keyof (EventsDoc & CustomEventsDoc)> & PropertiesOption<TProperties> & IsPageOption<TIsPage> & EventsOption<TEvents> & CustomEventsOption<TCustomEvents, keyof EventsDoc> & DataOption<TData, keyof PropertiesDoc> & StoreOption<TStore, keyof (PropertiesDoc & DataDoc)> & ComputedOption<TComputed, keyof (PropertiesDoc & DataDoc & StoreDoc), {
+    data: ComputeObject<DataDoc & Required<PropertiesDoc> & StoreDoc & ComputedDoc & IInjectData>;
+}> & PageLifetimesOption<TIsPage, PropertiesDoc> & LifetimesOption & WatchOption<ComputedDoc & Required<PropertiesDoc> & DataDoc & StoreDoc & IInjectStore> & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "observers">> & ObserversOption<ComputedDoc & Required<PropertiesDoc> & DataDoc & StoreDoc & IInjectStore> & ThisType<RootComponentInstance<TIsPage, TMethods, DataDoc, DataDoc & Required<PropertiesDoc> & StoreDoc & ComputedDoc, CustomEventsDoc, StoreDoc>>;
 type RootComponentConstructor<TComponentDocList extends ComponentDoc[]> = {
     <TEvents extends EventsConstraint<TComponentDocList>, TIsPage extends boolean = false, const TProperties extends PropertiesConstraint = {}, TData extends object = {}, TStore extends StoreConstraint = {}, TComputed extends ComputedConstraint = {}, TCustomEvents extends IfExtends<TIsPage, false, CustomEventConstraint, EmptyObject> = {}, TMethods extends MethodsConstraint = {}, EventsDoc extends object = IfExtends<EventsConstraint<TComponentDocList>, TEvents, {}, TEvents>, CustomEventsDoc extends object = GetCustomEventDoc<TCustomEvents>, PropertiesDoc extends object = GetPropertiesDoc<TProperties, TIsPage>, DataDoc extends object = TData, StoreDoc extends object = GetStoreDoc<TStore>, ComputedDoc extends object = GetComputedDoc<TComputed>>(options: RootComponentOptions<TEvents, TIsPage, TCustomEvents, TMethods, TProperties, TData, TStore, TComputed, EventsDoc, CustomEventsDoc, PropertiesDoc, DataDoc, StoreDoc, ComputedDoc>): ComputeIntersection<IfExtends<TIsPage, false, {}, {
         isPage: true;

package/dist/api/RootComponent/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/RootComponent/index.ts"],"names":[],"mappings":"~~AAuIA~~,MAAM,UAAU,aAAa;IAM3B,OAAO,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAC;AACnC,CAAC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/RootComponent/index.ts"],"names":[],"mappings":"AA2IA,MAAM,UAAU,aAAa;IAM3B,OAAO,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAC;AACnC,CAAC"}

package/dist/api/SubComponent/SubComputed/SubComputedOption.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import type { V } from "hry-types";
-export type SubComputedOption<TComputed extends object, legal extends Record<PropertyKey, unknown>> = {
-    computed?: TComputed & V.IllegalFieldValidator<TComputed, keyof legal, 0, "", "重复或无效的字段">;
+import type { G } from "hry-types";
+export type SubComputedOption<TComputed extends object, legal extends PropertyKey> = {
+    computed?: TComputed & G.IllegalFieldValidator<TComputed, legal, 0, "", "重复或无效的字段">;
 };

package/dist/api/SubComponent/SubData/SubDataOption.d.ts CHANGED Viewed

@@ -1,5 +1,4 @@
-import type { V } from "hry-types";
-import type { InnerFields } from "../../../types/InnerData";
-export type SubDataOption<TSubData extends object, legalKeys extends PropertyKey, TPrefix extends string> = {
-    data?: TSubData & V.IllegalFieldValidator<TSubData, legalKeys | InnerFields<TPrefix>, 0, "", "子组件无需此字段或与Inherit字段重复">;
+import type { G } from "hry-types";
+export type SubDataOption<TSubData extends object, legalKeys extends PropertyKey> = {
+    data?: TSubData & G.IllegalFieldValidator<TSubData, legalKeys, 0, "", "子组件无需此字段或与Inherit字段重复">;
 };

package/dist/api/SubComponent/SubEvents/SubEventsOptions.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import type { V } from "hry-types";
+import type { G } from "hry-types";
 export type SubEventsOption<TSubEvents, SubEventsDoc extends object, legalKeys extends PropertyKey> = {
-    events?: TSubEvents & V.IllegalFieldValidator<SubEventsDoc, legalKeys>;
+    events?: TSubEvents & G.IllegalFieldValidator<SubEventsDoc, legalKeys>;
 };

package/dist/api/SubComponent/SubInherit/SubInheritOption.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import type { V } from "hry-types";
+import type { G } from "hry-types";
 export type SubInheritOption<TInherit extends object, legalKeys extends PropertyKey> = {
-    inherit?: TInherit & V.IllegalFieldValidator<TInherit, legalKeys, 0, "">;
+    inherit?: TInherit & G.IllegalFieldValidator<TInherit, legalKeys, 0, "">;
 };

package/dist/api/SubComponent/SubMethods/SubMethodsOption.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
-import type { V } from "hry-types";
+import type { G } from "hry-types";
 import type { PrefixValidator } from "hry-types/src/Generic/PrefixValidator";
 import type { SubMethodsConstraint } from "./SubMethodsConstraint";
 export type SubMethodsOption<TSubMethods extends SubMethodsConstraint, TPrefix extends string, ExcludedKeys extends PropertyKey> = {
-    methods?: TSubMethods & PrefixValidator<TSubMethods, TPrefix> & V.DuplicateFieldValidator<TSubMethods, ExcludedKeys>;
+    methods?: TSubMethods & PrefixValidator<TSubMethods, TPrefix> & G.DuplicateFieldValidator<TSubMethods, ExcludedKeys>;
 };

package/dist/api/SubComponent/SubStore/SubStoreOption.d.ts CHANGED Viewed

@@ -1,5 +1,4 @@
-import type { V } from "hry-types";
-import type { InnerFields } from "../../../types/InnerData";
-export type SubStoreOption<TSubStore extends object, legalKeys extends PropertyKey, TPrefix extends string> = {
-    store?: TSubStore & V.IllegalFieldValidator<TSubStore, legalKeys | InnerFields<TPrefix>, 0, "", "与inherit和data字段重复或前缀错误">;
+import type { G } from "hry-types";
+export type SubStoreOption<TSubStore extends object, legalKeys extends PropertyKey> = {
+    store?: TSubStore & G.IllegalFieldValidator<TSubStore, legalKeys, 0, "", "与inherit和data字段重复或前缀错误">;
 };

package/dist/api/SubComponent/index.d.ts CHANGED Viewed

@@ -5,7 +5,6 @@ import type { GetComponentPrefix } from "../../types/GetComponentPrefix";
 import type { ReplacePrefix } from "../../types/ReplacePrefix";
 import type { ComponentDoc } from "../DefineComponent/ReturnType/ComponentDoc";
 import type { Func } from "hry-types/src/Misc/Func";
-import type { Extra } from "../../types/Extra";
 import type { InnerFields } from "../../types/InnerData";
 import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
 import type { Replace } from "../../types/Replace";
@@ -37,11 +36,11 @@ import type { CreateSubComponentDoc } from "./SubReturnType/CreateSubComponentDo
 import type { SubStoreConstraint } from "./SubStore/SubStoreConstraint";
 import type { SubStoreOption } from "./SubStore/SubStoreOption";
 import type { SubWatchOption } from "./SubWatch/SubWatchOption";
-type Options<RootDoc extends RootComponentDoc, IsPage extends boolean, CurrentCompDoc extends ComponentDoc, Prefix extends string, AllRootDataDoc extends object, TInherit extends object, TSubData extends object, TSubStore extends object, TSubComputed extends object, TEvents extends object, TSubMethods extends SubMethodsConstraint, InheritDoc extends object, SubDataDoc extends object, SubStoreDoc extends object, SubComputedDoc extends object, SubEventsDoc extends object, SubMethodsDoc extends object> = SubInheritOption<TInherit, keyof CurrentCompDoc["properties"]> & SubDataOption<TSubData, Exclude<keyof CurrentCompDoc["properties"] | keyof Extra<Prefix>, (keyof InheritDoc)>, Prefix> & SubStoreOption<TSubStore, Exclude<keyof CurrentCompDoc["properties"] | keyof Extra<Prefix>, (keyof (InheritDoc & SubDataDoc))>, Prefix> & SubComputedOption<TSubComputed, Omit<CurrentCompDoc["properties"], (keyof (InheritDoc & SubDataDoc & SubStoreDoc))>> & SubEventsOption<TEvents, SubEventsDoc, keyof SubEventsConstraint<CurrentCompDoc>> & SubMethodsOption<TSubMethods, Prefix, keyof (CurrentCompDoc["customEvents"] & SubEventsDoc)> & SubPageLifetimesOption<IsPage, RootDoc["properties"] & {}> & SubLifetimesOption & SubWatchOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc & IInjectStore> & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "export" | "observers" | "relations">> & SubObserversOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc & IInjectStore> & ThisType<SubInstance<SubMethodsDoc & RootDoc["methods"], Replace<SubDataDoc, Required<CurrentCompDoc["properties"]>>, AllRootDataDoc & Replace<SubDataDoc & SubComputedDoc & SubStoreDoc, Required<CurrentCompDoc["properties"]>>, RootDoc["customEvents"] & {}, SubStoreDoc>>;
+type Options<RootDoc extends RootComponentDoc, IsPage extends boolean, CurrentCompDoc extends ComponentDoc, Prefix extends string, AllRootDataDoc extends object, TInherit extends object, TSubData extends object, TSubStore extends object, TSubComputed extends object, TEvents extends object, TSubMethods extends SubMethodsConstraint, InheritDoc extends object, SubDataDoc extends object, SubStoreDoc extends object, SubComputedDoc extends object, SubEventsDoc extends object, SubMethodsDoc extends object, CompDocKeys extends PropertyKey = keyof CurrentCompDoc["properties"]> = SubInheritOption<TInherit, CompDocKeys> & SubDataOption<TSubData, Exclude<CompDocKeys, (keyof InheritDoc)> | InnerFields<Prefix>> & SubStoreOption<TSubStore, Exclude<CompDocKeys, (keyof (InheritDoc & SubDataDoc))> | InnerFields<Prefix>> & SubComputedOption<TSubComputed, Exclude<CompDocKeys, (keyof (InheritDoc & SubDataDoc & SubStoreDoc))> | InnerFields<Prefix>> & SubEventsOption<TEvents, SubEventsDoc, keyof SubEventsConstraint<CurrentCompDoc>> & SubMethodsOption<TSubMethods, Prefix, keyof (CurrentCompDoc["customEvents"] & SubEventsDoc)> & SubPageLifetimesOption<IsPage, NonNullable<RootDoc["properties"]>> & SubLifetimesOption & SubWatchOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc & IInjectStore> & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "export" | "observers" | "relations">> & SubObserversOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc & IInjectStore> & ThisType<SubInstance<SubMethodsDoc & RootDoc["methods"], Replace<SubDataDoc, Required<CurrentCompDoc["properties"]>>, AllRootDataDoc & Replace<SubDataDoc & SubComputedDoc & SubStoreDoc, Required<CurrentCompDoc["properties"]>>, NonNullable<RootDoc["customEvents"]>, SubStoreDoc>>;
 type SubComponentConstructor<TRootDoc extends RootComponentDoc, TOriginalCompDoc extends ComponentDoc, TSupplementalPrefix extends string = "", IsPage extends boolean = TRootDoc["isPage"] extends true ? true : false, CurrentPrefix extends string = `${GetComponentPrefix<TOriginalCompDoc>}${Capitalize<TSupplementalPrefix>}`, CurrentCompDoc extends ComponentDoc = IfExtends<TSupplementalPrefix, "", TOriginalCompDoc, ReplacePrefix<TOriginalCompDoc, CurrentPrefix>>, AllRootDataDoc extends object = Required<TRootDoc["properties"]> & TRootDoc["data"] & TRootDoc["computed"] & TRootDoc["store"]> = {
-    <TInherit extends InheritConstraint<AllRootDataDoc, CurrentCompDoc>, TSubData extends SubDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc> & Extra<CurrentPrefix> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubStore extends SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]> & Extra<CurrentPrefix>, keyof (InheritDoc & SubDataDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TEvents extends SubEventsConstraint<CurrentCompDoc>, TSubComputed extends SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)> & Extra<CurrentPrefix> & Record<InnerFields<CurrentPrefix>, unknown>> = {}, TSubMethods extends SubMethodsConstraint = {}, InheritDoc extends object = IfExtends<InheritConstraint<AllRootDataDoc, CurrentCompDoc>, TInherit, {}, TInherit>, SubDataDoc extends object = IfExtends<SubDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc>>, TSubData, {}, TSubData>, SubStoreDoc extends object = IfExtends<SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)>>, TSubStore, {}, {
-        [k in keyof TSubStore]: ReturnType<TSubStore[k] & {}>;
-    }>, SubComputedDoc extends object = IfExtends<SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)>>, TSubComputed, {}, GetSubComputedDoc<TSubComputed>>, SubEventsDoc extends object = IfExtends<SubEventsConstraint<CurrentCompDoc>, TEvents, {}, TEvents>, SubMethodsDoc extends object = TSubMethods, MissingRequiredField extends PropertyKey = Exclude<RequiredKeys<CurrentCompDoc["properties"] & {}>, keyof (InheritDoc & SubDataDoc & SubStoreDoc & IfExtends<SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)>>, TSubComputed, {}, GetSubComputedDoc<TSubComputed>>)>>(options: Options<TRootDoc, IsPage, CurrentCompDoc, CurrentPrefix, AllRootDataDoc, TInherit, TSubData, TSubStore, TSubComputed, TEvents, TSubMethods, InheritDoc, SubDataDoc, SubStoreDoc, SubComputedDoc, SubEventsDoc, SubMethodsDoc>): CreateSubComponentDoc<TOriginalCompDoc["customEvents"] & {}, SubEventsDoc, MissingRequiredField>;
+    <TInherit extends InheritConstraint<AllRootDataDoc, CurrentCompDoc>, TSubData extends SubDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubStore extends SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TEvents extends SubEventsConstraint<CurrentCompDoc>, TSubComputed extends SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubMethods extends SubMethodsConstraint = {}, InheritDoc extends object = IfExtends<InheritConstraint<AllRootDataDoc, CurrentCompDoc>, TInherit, {}, TInherit>, SubDataDoc extends object = IfExtends<SubDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubData, {}, TSubData>, SubStoreDoc extends object = IfExtends<SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubStore, {}, {
+        [k in keyof TSubStore]: ReturnType<NonNullable<TSubStore[k]>>;
+    }>, SubComputedDoc extends object = IfExtends<SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubComputed, {}, GetSubComputedDoc<TSubComputed>>, SubEventsDoc extends object = IfExtends<SubEventsConstraint<CurrentCompDoc>, TEvents, {}, TEvents>, SubMethodsDoc extends object = TSubMethods, MissingRequiredField extends PropertyKey = Exclude<RequiredKeys<NonNullable<CurrentCompDoc["properties"]>>, keyof (InheritDoc & SubDataDoc & SubStoreDoc & IfExtends<SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)>>, TSubComputed, {}, GetSubComputedDoc<TSubComputed>>)>>(options: Options<TRootDoc, IsPage, CurrentCompDoc, CurrentPrefix, AllRootDataDoc, TInherit, TSubData, TSubStore, TSubComputed, TEvents, TSubMethods, InheritDoc, SubDataDoc, SubStoreDoc, SubComputedDoc, SubEventsDoc, SubMethodsDoc>): CreateSubComponentDoc<NonNullable<TOriginalCompDoc["customEvents"]>, SubEventsDoc, MissingRequiredField>;
 };
 export declare function SubComponent<RootDoc extends RootComponentDoc, CompDoc extends ComponentDoc, Prefix extends string = "">(): IfExtends<EmptyObject, CompDoc, (opt: EmptyObject) => never, SubComponentConstructor<RootDoc, CompDoc, Prefix>>;
 export type SubComponentTrueOptions = {

package/dist/api/SubComponent/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/SubComponent/index.ts"],"names":[],"mappings":"~~AA8NA~~,MAAM,UAAU,YAAY;IAK1B,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAkC,CAAQ,CAAC;AACvE,CAAC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/SubComponent/index.ts"],"names":[],"mappings":"AAyOA,MAAM,UAAU,YAAY;IAK1B,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAkC,CAAQ,CAAC;AACvE,CAAC"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "annil",
-  "version": "1.5.14",
+  "version": "1.6.0",
   "description": "微信小程序(原生开发)插件",
   "main": "dist/index.js",
   "types": "src/index.ts",
@@ -14,10 +14,8 @@
     "prepare": "husky install",
     "lint": "eslint . --fix && npm run fmt",
     "fmt": "dprint fmt",
-    "test:jest": "jest --watch",
-    "test:type": "tsc --watch",
-    "type": "npm run test:type",
-    "jest": "npm run test:jest",
+    "type": "tsc --watch",
+    "jest": "jest --watch",
     "build": "tsc -p tsconfig.build.json"
   },
   "devDependencies": {
@@ -28,6 +26,7 @@
     "commitlint": "^17.6.5",
     "eslint": "^8.54.0",
     "eslint-plugin-tsdoc": "^0.2.17",
+    "hry-types": "^0.18.1",
     "husky": "^8.0.3",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
@@ -54,7 +53,6 @@
   "author": "missannil",
   "license": "MIT",
   "peerDependencies": {
-    "hry-types": "^0.17.0",
     "miniprogram-api-typings": "^3.12.2"
   }
 }

package/src/api/DefineComponent/assignOptions/index.ts CHANGED Viewed

@@ -1,6 +1,5 @@
 import type { Func } from "hry-types/src/Misc/_api";
 import { BBeforeCreate } from "../../../behaviors/BbeforeCreated";
 import type { Assign } from "../../../types/Assign";
 import type { WMComponent } from "../../../types/OfficialTypeAlias";
 import { deepClone } from "../../../utils/deepClone";
@@ -34,6 +33,7 @@ import { initStore } from "./initStore";
 type InstanceInnerFields = {
   data: OptionsInnerFields["data"];
   disposer: Record<string, Func>;
+  cloneData: OptionsInnerFields["data"];
 } & OptionsInnerFields["methods"];
 export type Instance =
@@ -101,6 +101,13 @@ export function isPageCheck(isPage: boolean | undefined) {
   };
 }
+function addCloneDataToInstance(this: Instance) {
+  this.cloneData = new Proxy(this.data, {
+    get: <T extends object>(target: T, key: keyof T) => {
+      return deepClone(target)[key];
+    },
+  });
+}
 /**
  * 原生Component会对传入的对象字段匹配的properties字段setData赋值。不符合字段或Page时不会赋值。
  * 此函数为给实例setData赋值,默认传递值与properties相符(ts类型安全)。
@@ -439,6 +446,12 @@ export function assignOptions(
     [isPageCheck(rootComponentOption?.isPage)],
   );
+  hijack(
+    finalOptionsForComponent.lifetimes!,
+    "created",
+    [addCloneDataToInstance],
+  );
   // 页面时删除预设的虚拟组件字段
   finalOptionsForComponent.isPage
     && finalOptionsForComponent.options && Reflect.deleteProperty(finalOptionsForComponent.options, "virtualHost");

package/src/api/RootComponent/Computed/ComputedOption.ts CHANGED Viewed

@@ -2,7 +2,11 @@ import type { DuplicateFieldValidator } from "hry-types/src/Generic/DuplicateFie
 import type { ComputedConstraint } from "./ComputedConstraint";
-export type ComputedOption<TComputed extends ComputedConstraint, CompareKeys extends PropertyKey> = {
+export type ComputedOption<
+  TComputed extends ComputedConstraint,
+  CompareKeys extends PropertyKey,
+  Instance extends object,
+> = {
   /**
    * computed字段, [类型约束ComputedConstraint](ComputedConstraint.ts)
    * @remarks
@@ -28,5 +32,6 @@ export type ComputedOption<TComputed extends ComputedConstraint, CompareKeys ext
    */
   computed?:
     & TComputed
+    & ThisType<Instance>
     & DuplicateFieldValidator<TComputed, CompareKeys>;
 };

package/src/api/RootComponent/Computed/GetComputedDoc.ts CHANGED Viewed

@@ -5,4 +5,6 @@ import type { ComputedConstraint } from "./ComputedConstraint";
  * @param T - ComputedConstraint
  * @returns object
  */
-export type GetComputedDoc<TComputed extends ComputedConstraint> = { [k in keyof TComputed]: ReturnType<TComputed[k]> };
+export type GetComputedDoc<TComputed extends ComputedConstraint> = {
+  [k in keyof TComputed]: ReturnType<TComputed[k]>;
+};

package/src/api/RootComponent/Computed/test/error.test.ts CHANGED Viewed

@@ -10,11 +10,11 @@ RootComponent()({
   },
   computed: {
     // @ts-expect-error '与properties字段重复'
-    str() {
+    str(): string {
       return "与properties字段重复";
     },
     // @ts-expect-error "与data字段重复"
-    num() {
+    num(): string {
       return "与data字段重复";
     },
   },

package/src/api/RootComponent/Computed/test/normal.test.ts CHANGED Viewed

@@ -10,6 +10,7 @@ const RootDoc = RootComponent()({
   },
   data: {
     lastName: "lastName",
+    mock_User: {} as Mock_User,
   },
   store: {
     prefix: () => "hry-", // 模拟而已
@@ -30,17 +31,18 @@ const RootDoc = RootComponent()({
       // 3 this.data 类型是深度只读的
       Checking<
         typeof this.data,
-        ReadonlyDeep<
-          {
-            firstName: string;
-            lastName: string;
-            fullName: string;
-            user: Mock_User;
-            prefix: string;
-            id_fullName: string;
-            readOnly: "str";
-          } & IInjectData
-        >,
+        {
+          firstName: string;
+          lastName: string;
+          mock_User: Mock_User;
+          fullName: string;
+          user: Mock_User;
+          prefix: string;
+          id_fullName: string;
+          readOnly: "str";
+          injectStr: string;
+          injectTheme: "light" | "dark" | undefined;
+        },
         Test.Pass
       >;

package/src/api/RootComponent/CustomEvents/CustomEventsOption.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import type { V } from "hry-types";
+import type { G } from "hry-types";
 import type { CustomEventConstraint } from "./CustomEventConstraint";
 export type CustomEventsOption<
@@ -36,6 +36,6 @@ export type CustomEventsOption<
    */
   customEvents?:
     & TCustomEvents
-    & V.IllegalFieldValidator<TCustomEvents, "bubbles" | "composed" | "capturePhase", 1, "options">
-    & V.DuplicateFieldValidator<TCustomEvents, EventsKeys, "与events字段重复">;
+    & G.IllegalFieldValidator<TCustomEvents, "bubbles" | "composed" | "capturePhase", 1, "options">
+    & G.DuplicateFieldValidator<TCustomEvents, EventsKeys, "与events字段重复">;
 };

package/src/api/RootComponent/Data/DataOption.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import type { V } from "hry-types";
+import type { G } from "hry-types";
 export type DataOption<TData extends object, PropertiesKeys extends PropertyKey> = {
   /**
@@ -17,5 +17,5 @@ export type DataOption<TData extends object, PropertiesKeys extends PropertyKey>
    */
   data?:
     & TData
-    & V.DuplicateFieldValidator<TData, PropertiesKeys, "与properties字段重复">;
+    & G.DuplicateFieldValidator<TData, PropertiesKeys, "与properties字段重复">;
 };

package/src/api/RootComponent/Data/test/normal.test.ts CHANGED Viewed

@@ -14,6 +14,8 @@ const RootDoc = RootComponent()({
   },
   methods: {
     foo() {
+      this.cloneData.num = 123;
       Checking<
         typeof this.data,
         ReadonlyDeep<{ gender: Gender; num: number; _innernalFields: number } & IInjectData>,

package/src/api/RootComponent/Instance/RootComponentInstance.ts CHANGED Viewed

@@ -4,6 +4,7 @@ import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersecti
 import type { IReactionDisposer } from "mobx";
 import type { Assign } from "../../../types/Assign";
+import type { ComputeObject } from "../../../types/ComputeObj";
 import type { WMComponentInstance, WMInstanceMethods, WMPageInstance } from "../../../types/OfficialTypeAlias";
 import type { IInjectData, IInjectMethods } from "../../InstanceInject/instanceConfig";
 import type { CustomEventMethods } from "./CustomEventMethods";
@@ -15,6 +16,7 @@ export type RootComponentInstance<
   AllData extends object,
   CustomEventsDoc extends object,
   StoreDoc extends object,
+  instanceData = ComputeObject<Assign<IInjectData, ComputeIntersection<AllData>>>,
 > =
   // 官方实例属性is  options  dataset等
   & IfExtends<false, TIsPage, WMComponentInstance, WMPageInstance>
@@ -26,7 +28,8 @@ export type RootComponentInstance<
     disposer: { [k in keyof StoreDoc]: IReactionDisposer };
   }>
   & Assign<IInjectMethods, TMethods & CustomEventMethods<CustomEventsDoc>>
-  & { data: ReadonlyDeep<Assign<IInjectData, ComputeIntersection<AllData>>> };
+  & { data: ReadonlyDeep<instanceData> }
+  & { cloneData: ComputeObject<Assign<IInjectData, ComputeIntersection<AllData>>> };
 export type ComponentInstance = RootComponentInstance<false, {}, {}, {}, {}, {}>;

package/src/api/RootComponent/Instance/test/cloneData/error.test.ts ADDED Viewed

@@ -0,0 +1,31 @@
+import type { DetailedType } from "../../../../..";
+import { RootComponent } from "../../..";
+interface User {
+  readonly id: number;
+  readonly name: string;
+  slected: boolean;
+}
+RootComponent()({
+  properties: {
+    num: Number,
+    user: Object as DetailedType<User>,
+  },
+  data: {
+    str: "123",
+    arr: [{}] as User[],
+  },
+  methods: {
+    M1() {
+      const cloneData = this.cloneData;
+      // @ts-expect-error 尽管cloneData去除了readonly，user.id属性依然是readonly
+      cloneData.user!.id = 1;
+      // @ts-expect-error arr[0].name属性依然是readonly
+      cloneData.arr[0].name = "zhao";
+    },
+  },
+});

package/src/api/RootComponent/Instance/test/cloneData/normal.test.ts ADDED Viewed

@@ -0,0 +1,53 @@
+import { Checking, type Test } from "hry-types";
+import type { _ReadonlyDeep } from "hry-types/src/Any/_api";
+import type { DetailedType } from "../../../../..";
+import { RootComponent } from "../../..";
+interface User {
+  readonly id: number;
+  readonly name: string;
+  slected: boolean;
+}
+RootComponent()({
+  properties: {
+    num: Number,
+    obj: Object as DetailedType<User>,
+  },
+  data: {
+    str: "123",
+    arr: [{}] as User[],
+  },
+  methods: {
+    M1() {
+      Checking<
+        typeof this.data,
+        _ReadonlyDeep<
+          {
+            injectTheme: "dark" | "light" | undefined;
+            injectStr: string;
+            str: string;
+            arr: User[];
+            num: number;
+            obj: User | null;
+          }
+        >,
+        Test.Pass
+      >;
+      Checking<
+        typeof this.cloneData,
+        {
+          injectTheme: "dark" | "light" | undefined;
+          injectStr: string;
+          str: string;
+          arr: User[];
+          num: number;
+          obj: User | null;
+        },
+        Test.Pass
+      >;
+    },
+  },
+});

package/src/api/RootComponent/Methods/MethodsOption.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import type { V } from "hry-types";
+import type { G } from "hry-types";
 import type { MethodsConstraint } from "./MethodsConstraint";
@@ -11,5 +11,5 @@ export type MethodsOption<
    */
   methods?:
     & TMethods
-    & V.DuplicateFieldValidator<TMethods, DuplicateField>;
+    & G.DuplicateFieldValidator<TMethods, DuplicateField>;
 };

package/src/api/RootComponent/Properties/PropertiesOption.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import type { V } from "hry-types";
+import type { G } from "hry-types";
 import type { Validators } from "../../../types/Validators";
 import type { PropertiesConstraint } from "./PropertiesConstraint";
 import type { PropertiesValueValidator } from "./PropertiesValueValidator";
@@ -21,6 +21,6 @@ export type PropertiesOption<
     & Validators<[
       PropertiesValueValidator<TProperties>,
       // 放在最后一个，正常返回不是unknown 而是Record<string,unknown>
-      V.IllegalFieldValidator<TProperties, "value" | "type" | "optionalTypes", 1>,
+      G.IllegalFieldValidator<TProperties, "value" | "type" | "optionalTypes", 1>,
     ]>;
 };

package/src/api/RootComponent/Properties/test/normalRequired.test.ts CHANGED Viewed

@@ -9,10 +9,10 @@ import type { RequiredSingle, RequiredType, RequiredUnion } from "../PropertiesC
 /**
  * 共用测试对象类型
  */
-export type Mock_User = {
-  id: string;
+export interface Mock_User {
+  readonly id: string;
   age?: number;
-};
+}
 /**
  * 共用测试对象类型

package/src/api/RootComponent/Store/StoreOption.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import type { V } from "hry-types";
+import type { G } from "hry-types";
 import type { StoreConstraint } from "./StoreConstraint";
 export type StoreOption<TStore extends StoreConstraint, TDuplicateKeys extends PropertyKey> = {
@@ -16,5 +16,5 @@ export type StoreOption<TStore extends StoreConstraint, TDuplicateKeys extends P
    */
   store?:
     & TStore
-    & V.DuplicateFieldValidator<TStore, TDuplicateKeys, "字段重复">;
+    & G.DuplicateFieldValidator<TStore, TDuplicateKeys, "字段重复">;
 };

package/src/api/RootComponent/index.ts CHANGED Viewed

@@ -5,7 +5,7 @@ import type { ComputeIntersection } from "hry-types/src/Object/_api";
 import type { ComputeObject } from "../../types/ComputeObj";
 import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
 import type { ComponentDoc } from "../DefineComponent/ReturnType/ComponentDoc";
-import type { IInjectStore } from "../InstanceInject/instanceConfig";
+import type { IInjectData, IInjectStore } from "../InstanceInject/instanceConfig";
 import type { ComputedConstraint } from "./Computed/ComputedConstraint";
 import type { ComputedOption } from "./Computed/ComputedOption";
 import type { GetComputedDoc } from "./Computed/GetComputedDoc";
@@ -55,7 +55,11 @@ type RootComponentOptions<
   & CustomEventsOption<TCustomEvents, keyof EventsDoc>
   & DataOption<TData, keyof PropertiesDoc>
   & StoreOption<TStore, keyof (PropertiesDoc & DataDoc)>
-  & ComputedOption<TComputed, keyof (PropertiesDoc & DataDoc & StoreDoc)>
+  & ComputedOption<
+    TComputed,
+    keyof (PropertiesDoc & DataDoc & StoreDoc),
+    { data: ComputeObject<DataDoc & Required<PropertiesDoc> & StoreDoc & ComputedDoc & IInjectData> }
+  >
   & PageLifetimesOption<TIsPage, PropertiesDoc>
   & LifetimesOption
   & WatchOption<

package/src/api/SubComponent/SubComputed/SubComputedOption.ts CHANGED Viewed

@@ -1,9 +1,9 @@
-import type { V } from "hry-types";
+import type { G } from "hry-types";
 export type SubComputedOption<
   TComputed extends object,
-  legal extends Record<PropertyKey, unknown>,
+  legal extends PropertyKey,
 > = {
   computed?:
     & TComputed
-    & V.IllegalFieldValidator<TComputed, keyof legal, 0, "", "重复或无效的字段">;
+    & G.IllegalFieldValidator<TComputed, legal, 0, "", "重复或无效的字段">;
 };

package/src/api/SubComponent/SubComputed/test/error.test.ts CHANGED Viewed

@@ -22,7 +22,7 @@ type OnlyPropsCompDoc = ComponentDoc<{
   };
 }>;
-// 2 去除inhrit和data字段后无组件字段约束时,写任何字段都报错
+// 2 去除inhrit和data字段后无组件字段约束时,只可写内部字段
 SubComponent<{}, OnlyPropsCompDoc>()({
   inherit: {
     aaa_str: "wxml",
@@ -31,8 +31,9 @@ SubComponent<{}, OnlyPropsCompDoc>()({
     aaa_num: 123,
   },
   computed: {
-    // @ts-expect-error ⚠️"重复或无效的字段"⚠️
     _aaa_xxx() {},
+    // @ts-expect-error 只可写内部字段
+    aaa_yyy() {},
   },
 });

package/src/api/SubComponent/SubData/SubDataOption.ts CHANGED Viewed

@@ -1,16 +1,15 @@
-import type { V } from "hry-types";
-import type { InnerFields } from "../../../types/InnerData";
+import type { G } from "hry-types";
-export type SubDataOption<TSubData extends object, legalKeys extends PropertyKey, TPrefix extends string> = {
+export type SubDataOption<TSubData extends object, legalKeys extends PropertyKey> = {
   /**
    * 可写子组件所需数据和内部公共数据
    * 非法字段检测和与Inherit字段的重复检测
    */
   data?:
     & TSubData
-    & V.IllegalFieldValidator<
+    & G.IllegalFieldValidator<
       TSubData,
-      legalKeys | InnerFields<TPrefix>,
+      legalKeys,
       0,
       "",
       "子组件无需此字段或与Inherit字段重复"

package/src/api/SubComponent/SubData/test/normal.test.ts CHANGED Viewed

@@ -39,17 +39,6 @@ SubComponent<{ data: { _num: number } }, CompDoc>()({
   },
 });
-//
-SubComponent<{ data: { _num: number } }, CompDoc>()({
-  inherit: {
-    aaa_str: "wxml",
-  },
-  data: {
-    // 4 可写isReady 特许字段 ExtraFields
-    aaa_isReady: false,
-  },
-});
 SubComponent<{}, CompDoc>()({
   data: {
     aaa_str: "a",

package/src/api/SubComponent/SubEvents/SubEventsOptions.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import type { V } from "hry-types";
+import type { G } from "hry-types";
 export type SubEventsOption<TSubEvents, SubEventsDoc extends object, legalKeys extends PropertyKey> = {
   /**
@@ -8,5 +8,5 @@ export type SubEventsOption<TSubEvents, SubEventsDoc extends object, legalKeys e
    */
   events?:
     & TSubEvents
-    & V.IllegalFieldValidator<SubEventsDoc, legalKeys>;
+    & G.IllegalFieldValidator<SubEventsDoc, legalKeys>;
 };

package/src/api/SubComponent/SubInherit/SubInheritOption.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import type { V } from "hry-types";
+import type { G } from "hry-types";
 export type SubInheritOption<TInherit extends object, legalKeys extends PropertyKey> = {
   /**
@@ -8,7 +8,7 @@ export type SubInheritOption<TInherit extends object, legalKeys extends Property
    */
   inherit?:
     & TInherit
-    & V.IllegalFieldValidator<
+    & G.IllegalFieldValidator<
       TInherit,
       legalKeys,
       0,

package/src/api/SubComponent/SubInstance/test/cloneData/error.test.ts ADDED Viewed

@@ -0,0 +1,22 @@
+import type { View } from "../../../../../thirdLib/wm";
+import type { RootComponentDoc } from "../../../../RootComponent/RootComponentDoc";
+import { SubComponent } from "../../..";
+type RootDoc = RootComponentDoc<{
+  events: {
+    RootE1: () => string;
+  };
+}>;
+// 实例中只存在RootDoc和自身的methods字段
+SubComponent<RootDoc, View>()({
+  lifetimes: {
+    created() {
+      // @ts-expect-error 不存在的方法  (Root事件方法不可调用)
+      this.RootE1;
+      // @ts-expect-error 不存在的方法
+      this.otherMethods();
+    },
+  },
+});

package/src/api/SubComponent/SubInstance/test/cloneData/normal.test.ts ADDED Viewed

@@ -0,0 +1,73 @@
+import { Checking, type Test } from "hry-types";
+import type { ComponentDoc } from "../../../../DefineComponent/ReturnType/ComponentDoc";
+import type { Mock_User } from "../../../../RootComponent/Properties/test/normalRequired.test";
+import type { RootComponentDoc } from "../../../../RootComponent/RootComponentDoc";
+import { SubComponent } from "../../..";
+type RootDoc = RootComponentDoc<{
+  properties: {
+    Pstr: string;
+    Pobj: Mock_User | null;
+    PoptionalObj?: Mock_User;
+  };
+  data: {
+    Dnum: number;
+  };
+  computed: {
+    Cnum: number;
+  };
+  methods: {
+    RootM: () => number;
+  };
+  customEvents: {
+    RootCus: string;
+  };
+  events: {
+    RootE1: () => string;
+  };
+}>;
+type CompDoc = ComponentDoc<{
+  properties: {
+    aaa_str: string;
+  };
+  customEvents: {
+    aaa_num: number;
+  };
+}>;
+SubComponent<RootDoc, CompDoc>()({
+  data: {
+    aaa_str: "str",
+    _aaa_num: 123,
+  },
+  computed: {
+    _aaa_isReady() {
+      return false;
+    },
+  },
+  lifetimes: {
+    created() {
+      Checking<
+        typeof this.cloneData,
+        {
+          // inheritData
+          injectTheme: "dark" | "light" | undefined;
+          injectStr: string;
+          // RootData
+          Pstr: string;
+          Pobj: Mock_User | null;
+          PoptionalObj: Mock_User;
+          Dnum: number;
+          Cnum: number;
+          // 自身Data类型与CompDoc类型相同
+          aaa_str: string;
+          _aaa_isReady: boolean;
+          _aaa_num: number;
+        },
+        Test.Pass
+      >;
+    },
+  },
+});

package/src/api/SubComponent/SubMethods/SubMethodsOption.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import type { V } from "hry-types";
+import type { G } from "hry-types";
 import type { PrefixValidator } from "hry-types/src/Generic/PrefixValidator";
 import type { SubMethodsConstraint } from "./SubMethodsConstraint";
@@ -13,5 +13,5 @@ export type SubMethodsOption<
   methods?:
     & TSubMethods
     & PrefixValidator<TSubMethods, TPrefix>
-    & V.DuplicateFieldValidator<TSubMethods, ExcludedKeys>;
+    & G.DuplicateFieldValidator<TSubMethods, ExcludedKeys>;
 };

package/src/api/SubComponent/SubStore/SubStoreOption.ts CHANGED Viewed

@@ -1,7 +1,6 @@
-import type { V } from "hry-types";
-import type { InnerFields } from "../../../types/InnerData";
+import type { G } from "hry-types";
-export type SubStoreOption<TSubStore extends object, legalKeys extends PropertyKey, TPrefix extends string> = {
+export type SubStoreOption<TSubStore extends object, legalKeys extends PropertyKey> = {
   /**
    * 全局响应式数据字段,全局store对应数据变化实例对应数据自动setData。
    * 约束为组件properties字段去除inherit和data的剩余字段和内部字段
@@ -18,10 +17,10 @@ export type SubStoreOption<TSubStore extends object, legalKeys extends PropertyK
    */
   store?:
     & TSubStore
-    & V.IllegalFieldValidator<
+    & G.IllegalFieldValidator<
       TSubStore,
       // legalKeys,
-      legalKeys | InnerFields<TPrefix>,
+      legalKeys,
       0,
       "",
       "与inherit和data字段重复或前缀错误"

package/src/api/SubComponent/SubStore/test/error.test.ts CHANGED Viewed

@@ -25,7 +25,6 @@ SubComponent<{
   },
   data: {
     aaa_num: 20,
-    aaa_isReady: false,
   },
   store: {
     // @ts-expect-error 1 与 inherit 字段重复
@@ -34,9 +33,5 @@ SubComponent<{
     aaa_num: () => user.age,
     // @ts-expect-error 3 超出约束字段
     num: () => user.age,
-    // @ts-expect-error 4 于data字段重复
-    aaa_isReady() {
-      return false;
-    },
   },
 });

package/src/api/SubComponent/SubStore/test/normal.test.ts CHANGED Viewed

@@ -25,13 +25,6 @@ SubComponent<{}, DocA>()({
 SubComponent<{}, DocA, "a">()({
   store: {
     // 2 可写内部字段
-    _aaaA_xxxxxx: () => user.age,
-  },
-});
-SubComponent<{}, DocA, "a">()({
-  store: {
-    // 3 可写特许字段
-    aaaA_isReady: () => false,
+    _aaaA_xxx: () => user.age,
   },
 });

package/src/api/SubComponent/index.ts CHANGED Viewed

@@ -6,7 +6,7 @@ import type { ReplacePrefix } from "../../types/ReplacePrefix";
 import type { ComponentDoc } from "../DefineComponent/ReturnType/ComponentDoc";
 import type { Func } from "hry-types/src/Misc/Func";
-import type { Extra } from "../../types/Extra";
 import type { InnerFields } from "../../types/InnerData";
 import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
 import type { Replace } from "../../types/Replace";
@@ -57,28 +57,28 @@ type Options<
   SubComputedDoc extends object,
   SubEventsDoc extends object,
   SubMethodsDoc extends object,
+  CompDocKeys extends PropertyKey = keyof CurrentCompDoc["properties"],
 > =
-  & SubInheritOption<TInherit, keyof CurrentCompDoc["properties"]>
+  & SubInheritOption<TInherit, CompDocKeys>
   & SubDataOption<
     TSubData,
-    Exclude<keyof CurrentCompDoc["properties"] | keyof Extra<Prefix>, (keyof InheritDoc)>,
-    Prefix
+    // 合法的配置
+    Exclude<CompDocKeys, (keyof InheritDoc)> | InnerFields<Prefix>
   >
   & SubStoreOption<
     TSubStore,
-    Exclude<keyof CurrentCompDoc["properties"] | keyof Extra<Prefix>, (keyof (InheritDoc & SubDataDoc))>,
-    Prefix
+    // 合法的配置
+    Exclude<CompDocKeys, (keyof (InheritDoc & SubDataDoc))> | InnerFields<Prefix>
   >
   & SubComputedOption<
     TSubComputed,
-    // AllRootDataDoc & SubDataDoc & SubDataDoc & SubComputedDoc,
     // 合法的配置
-    Omit<CurrentCompDoc["properties"], (keyof (InheritDoc & SubDataDoc & SubStoreDoc))>
+    Exclude<CompDocKeys, (keyof (InheritDoc & SubDataDoc & SubStoreDoc))> | InnerFields<Prefix>
   >
   // 无需与根组件的events字段重复检测,因为根组件多了bubbles字段,一定不会重复
   & SubEventsOption<TEvents, SubEventsDoc, keyof SubEventsConstraint<CurrentCompDoc>>
   & SubMethodsOption<TSubMethods, Prefix, keyof (CurrentCompDoc["customEvents"] & SubEventsDoc)>
-  & SubPageLifetimesOption<IsPage, RootDoc["properties"] & {}>
+  & SubPageLifetimesOption<IsPage, NonNullable<RootDoc["properties"]>>
   & SubLifetimesOption
   & SubWatchOption<
     & SubComputedDoc
@@ -100,7 +100,7 @@ type Options<
       SubMethodsDoc & RootDoc["methods"],
       Replace<SubDataDoc, Required<CurrentCompDoc["properties"]>>,
       AllRootDataDoc & Replace<SubDataDoc & SubComputedDoc & SubStoreDoc, Required<CurrentCompDoc["properties"]>>,
-      RootDoc["customEvents"] & {},
+      NonNullable<RootDoc["customEvents"]>,
       SubStoreDoc
     >
   >;
@@ -131,38 +131,49 @@ type SubComponentConstructor<
     TInherit extends InheritConstraint<AllRootDataDoc, CurrentCompDoc>,
     TSubData extends SubDataConstraint<
       & Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc>
-      & Extra<CurrentPrefix> // 加入特许字段 isReady
       & Record<InnerFields<CurrentPrefix>, unknown> // 内部字段
     >,
     TSubStore extends SubStoreConstraint<
-      & Omit<Required<CurrentCompDoc["properties"]> & Extra<CurrentPrefix>, keyof (InheritDoc & SubDataDoc)>
+      & Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)>
       & Record<InnerFields<CurrentPrefix>, unknown> // 内部字段
     >,
     TEvents extends SubEventsConstraint<CurrentCompDoc>,
     // 加默认值计算字段无提示且需要手写返回类型,不加watch无法对computed监控
     TSubComputed extends SubComputedConstraint<
-      & Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)>
-      & Extra<CurrentPrefix> // 加入特许字段 isReady
+      & Omit<
+        Required<CurrentCompDoc["properties"]>,
+        keyof (InheritDoc & SubDataDoc & SubStoreDoc)
+      >
       & Record<InnerFields<CurrentPrefix>, unknown> // 内部字段
-    > = {},
+    >,
     TSubMethods extends SubMethodsConstraint = {},
     InheritDoc extends object = IfExtends<InheritConstraint<AllRootDataDoc, CurrentCompDoc>, TInherit, {}, TInherit>,
     SubDataDoc extends object = IfExtends<
-      SubDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc>>,
+      SubDataConstraint<
+        & Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc>
+        & Record<InnerFields<CurrentPrefix>, unknown>
+      >,
       TSubData,
       {},
       TSubData
     >,
     SubStoreDoc extends object = IfExtends<
-      SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)>>,
+      SubStoreConstraint<
+        & Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)>
+        & Record<InnerFields<CurrentPrefix>, unknown>
+      >,
       TSubStore,
       {},
-      { [k in keyof TSubStore]: ReturnType<TSubStore[k] & {}> }
+      { [k in keyof TSubStore]: ReturnType<NonNullable<TSubStore[k]>> }
     >,
     // 无效的计算
     SubComputedDoc extends object = IfExtends<
       SubComputedConstraint<
-        Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)>
+        & Omit<
+          Required<CurrentCompDoc["properties"]>,
+          keyof (InheritDoc & SubDataDoc & SubStoreDoc)
+        >
+        & Record<InnerFields<CurrentPrefix>, unknown> // 内部字段
       >,
       TSubComputed,
       {},
@@ -177,7 +188,7 @@ type SubComponentConstructor<
     SubMethodsDoc extends object = TSubMethods,
     // 缺失的必传字段(配置中inhrit,data,computed的字段不包含的必传字段)
     MissingRequiredField extends PropertyKey = Exclude<
-      RequiredKeys<CurrentCompDoc["properties"] & {}>,
+      RequiredKeys<NonNullable<CurrentCompDoc["properties"]>>,
       keyof (
         & InheritDoc
         & SubDataDoc
@@ -213,7 +224,7 @@ type SubComponentConstructor<
       SubEventsDoc,
       SubMethodsDoc
     >,
-  ): CreateSubComponentDoc<TOriginalCompDoc["customEvents"] & {}, SubEventsDoc, MissingRequiredField>;
+  ): CreateSubComponentDoc<NonNullable<TOriginalCompDoc["customEvents"]>, SubEventsDoc, MissingRequiredField>;
 };
 /**

package/src/types/Extra.ts CHANGED Viewed

	@@ -1 +1 @@
1	- export type Extra<Prefix extends string> = Record<`${Prefix}_isReady`, boolean>;
1	+ // export type Extra<Prefix extends string> = Record<`${Prefix}_isReady`, boolean>;

package/dist/types/Extra.d.ts DELETED Viewed

	@@ -1 +0,0 @@
1	- export type Extra<Prefix extends string> = Record<`${Prefix}_isReady`, boolean>;

package/dist/types/Extra.js DELETED Viewed

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

package/dist/types/Extra.js.map DELETED Viewed

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