annil 1.12.0-alpha.7 → 1.12.7

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 (189) hide show
  1. package/CHANGELOG.md +315 -0
  2. package/README.md +38 -10
  3. package/dist/api/ChunkComponent/ChunkStore/ChunkStoreConstraint.d.ts +2 -1
  4. package/dist/api/ChunkComponent/ChunkStore/ChunkStoreOption.d.ts +4 -3
  5. package/dist/api/ChunkComponent/index.d.ts +3 -3
  6. package/dist/api/ChunkComponent/index.js.map +1 -1
  7. package/dist/api/CustomComponent/CustomEvents/CustomEventsConstraint.d.ts +3 -3
  8. package/dist/api/CustomComponent/CustomInherit/CustomInheritConstraint.d.ts +2 -2
  9. package/dist/api/CustomComponent/CustomStore/CustomStoreConstraint.d.ts +3 -2
  10. package/dist/api/CustomComponent/CustomStore/CustomStoreOption.d.ts +6 -1
  11. package/dist/api/CustomComponent/index.d.ts +8 -30
  12. package/dist/api/CustomComponent/index.js.map +1 -1
  13. package/dist/api/CustomComponent/returnType.d.ts +27 -0
  14. package/dist/api/CustomComponent/returnType.js +2 -0
  15. package/dist/api/CustomComponent/returnType.js.map +1 -0
  16. package/dist/api/DefineComponent/RootComponent/RootComponentOption.d.ts +3 -3
  17. package/dist/api/DefineComponent/SubComponents/SubComponentsOption.d.ts +3 -3
  18. package/dist/api/DefineComponent/index.d.ts +10 -12
  19. package/dist/api/DefineComponent/index.js.map +1 -1
  20. package/dist/api/DefineComponent/normalizeOptions/__throttleDebounce__FieldCheck.d.ts +3 -3
  21. package/dist/api/DefineComponent/normalizeOptions/__throttleDebounce__FieldCheck.js.map +1 -1
  22. package/dist/api/DefineComponent/normalizeOptions/handleRootComponent.d.ts +2 -2
  23. package/dist/api/DefineComponent/normalizeOptions/handleRootComponent.js.map +1 -1
  24. package/dist/api/DefineComponent/normalizeOptions/handleStore/reactionRegister.d.ts +2 -1
  25. package/dist/api/DefineComponent/normalizeOptions/handleStore/reactionRegister.js +22 -2
  26. package/dist/api/DefineComponent/normalizeOptions/handleStore/reactionRegister.js.map +1 -1
  27. package/dist/api/DefineComponent/normalizeOptions/handleSubComponents.d.ts +2 -2
  28. package/dist/api/DefineComponent/normalizeOptions/handleSubComponents.js.map +1 -1
  29. package/dist/api/DefineComponent/normalizeOptions/hijackHandle/addDetachedData.js +0 -2
  30. package/dist/api/DefineComponent/normalizeOptions/hijackHandle/addDetachedData.js.map +1 -1
  31. package/dist/api/DefineComponent/normalizeOptions/hijackHandle/index.js +9 -0
  32. package/dist/api/DefineComponent/normalizeOptions/hijackHandle/index.js.map +1 -1
  33. package/dist/api/DefineComponent/normalizeOptions/index.d.ts +3 -3
  34. package/dist/api/DefineComponent/normalizeOptions/index.js.map +1 -1
  35. package/dist/api/DefineComponent/normalizeOptions/initComputed/computedUpdater.js +17 -4
  36. package/dist/api/DefineComponent/normalizeOptions/initComputed/computedUpdater.js.map +1 -1
  37. package/dist/api/DefineComponent/normalizeOptions/initComputed/initComputedAndGetCache.js +11 -1
  38. package/dist/api/DefineComponent/normalizeOptions/initComputed/initComputedAndGetCache.js.map +1 -1
  39. package/dist/api/DefineComponent/normalizeOptions/otherFieldsHandle.d.ts +2 -2
  40. package/dist/api/DefineComponent/normalizeOptions/otherFieldsHandle.js +0 -1
  41. package/dist/api/DefineComponent/normalizeOptions/otherFieldsHandle.js.map +1 -1
  42. package/dist/api/DefineComponent/normalizeOptions/sameFuncFieldsCollect.d.ts +3 -3
  43. package/dist/api/DefineComponent/normalizeOptions/sameFuncFieldsCollect.js.map +1 -1
  44. package/dist/api/DefineComponent/normalizeOptions/watchHandler/index.js +16 -9
  45. package/dist/api/DefineComponent/normalizeOptions/watchHandler/index.js.map +1 -1
  46. package/dist/api/DefineComponent/returnType/ComponentDoc.d.ts +9 -0
  47. package/dist/api/DefineComponent/returnType/ComponentDoc.js +2 -0
  48. package/dist/api/DefineComponent/returnType/ComponentDoc.js.map +1 -0
  49. package/dist/api/DefineComponent/returnType/GenerateComponentDoc.d.ts +18 -0
  50. package/dist/api/DefineComponent/returnType/GenerateComponentDoc.js +2 -0
  51. package/dist/api/DefineComponent/returnType/GenerateComponentDoc.js.map +1 -0
  52. package/dist/api/DefineComponent/{ReturnType/CreatePageDoc.d.ts → returnType/GeneratePageDoc.d.ts} +2 -2
  53. package/dist/api/DefineComponent/returnType/GeneratePageDoc.js +2 -0
  54. package/dist/api/DefineComponent/returnType/GeneratePageDoc.js.map +1 -0
  55. package/dist/api/DefineComponent/returnType/GetCustomEventDocOfSubDoc.d.ts +8 -0
  56. package/dist/api/DefineComponent/returnType/GetCustomEventDocOfSubDoc.js.map +1 -0
  57. package/dist/api/DefineComponent/returnType/PageDoc.js.map +1 -0
  58. package/dist/api/RootComponent/Events/EventsConstraint.d.ts +4 -4
  59. package/dist/api/RootComponent/Instance/RootComponentInstance.d.ts +2 -1
  60. package/dist/api/RootComponent/Observers/ObserversOption.d.ts +2 -2
  61. package/dist/api/RootComponent/Store/GeTStoreDoc.d.ts +6 -3
  62. package/dist/api/RootComponent/Store/StoreConstraint.d.ts +6 -1
  63. package/dist/api/RootComponent/Store/StoreOption.d.ts +22 -1
  64. package/dist/api/RootComponent/Watch/WatchOption.d.ts +2 -2
  65. package/dist/api/RootComponent/index.d.ts +3 -20
  66. package/dist/api/RootComponent/returnType.d.ts +46 -0
  67. package/dist/api/RootComponent/returnType.js +2 -0
  68. package/dist/api/RootComponent/returnType.js.map +1 -0
  69. package/dist/api/wxSugar.d.ts +1 -1
  70. package/dist/thirdLib/wm/map.d.ts +1 -1
  71. package/dist/thirdLib/wm/scrollView.d.ts +2 -2
  72. package/dist/thirdLib/wm/view.d.ts +1 -1
  73. package/dist/types/CreateComponentType.d.ts +4 -4
  74. package/dist/types/ExtendComponentType.d.ts +3 -3
  75. package/dist/types/GetComponentPrefix.d.ts +2 -2
  76. package/dist/types/ReplacePrefix.d.ts +4 -4
  77. package/dist/utils/debounce.d.ts +1 -3
  78. package/dist/utils/debounce.js.map +1 -1
  79. package/dist/utils/throttle.d.ts +1 -3
  80. package/dist/utils/throttle.js.map +1 -1
  81. package/package.json +11 -5
  82. package/src/api/ChunkComponent/ChunkComputed/test/mock.ts +14 -14
  83. package/src/api/ChunkComponent/ChunkData/test/mock.ts +18 -18
  84. package/src/api/ChunkComponent/ChunkStore/ChunkStoreConstraint.ts +3 -1
  85. package/src/api/ChunkComponent/ChunkStore/ChunkStoreOption.ts +3 -2
  86. package/src/api/ChunkComponent/ChunkStore/test/error.test.ts +36 -0
  87. package/src/api/ChunkComponent/ChunkStore/test/mock.ts +12 -12
  88. package/src/api/ChunkComponent/ChunkStore/test/normal.test.ts +43 -0
  89. package/src/api/ChunkComponent/index.ts +51 -21
  90. package/src/api/CustomComponent/CustomComputed/test/error.test.ts +4 -4
  91. package/src/api/CustomComponent/CustomComputed/test/normal.test.ts +7 -7
  92. package/src/api/CustomComponent/CustomData/test/error.test.ts +4 -4
  93. package/src/api/CustomComponent/CustomData/test/normal.test.ts +6 -6
  94. package/src/api/CustomComponent/CustomEvents/CustomEventsConstraint.ts +6 -6
  95. package/src/api/CustomComponent/CustomEvents/test/error.test.ts +4 -4
  96. package/src/api/CustomComponent/CustomEvents/test/normal.test.ts +3 -3
  97. package/src/api/CustomComponent/CustomInherit/CustomInheritConstraint.ts +2 -2
  98. package/src/api/CustomComponent/CustomInherit/test/error.test.ts +6 -6
  99. package/src/api/CustomComponent/CustomInherit/test/normal.test.ts +4 -4
  100. package/src/api/CustomComponent/CustomInstance/test/error.test.ts +2 -2
  101. package/src/api/CustomComponent/CustomInstance/test/normal.test.ts +6 -6
  102. package/src/api/CustomComponent/CustomMethods/test/error.test.ts +5 -5
  103. package/src/api/CustomComponent/CustomMethods/test/normarl.test.ts +5 -5
  104. package/src/api/CustomComponent/CustomReturnType/test/error.test.ts +2 -2
  105. package/src/api/CustomComponent/CustomReturnType/test/normal.test.ts +3 -3
  106. package/src/api/CustomComponent/CustomStore/CustomStoreConstraint.ts +4 -1
  107. package/src/api/CustomComponent/CustomStore/CustomStoreOption.ts +13 -7
  108. package/src/api/CustomComponent/CustomStore/test/error.test.ts +55 -4
  109. package/src/api/CustomComponent/CustomStore/test/normal.test.ts +47 -2
  110. package/src/api/CustomComponent/CustomWatch/test/WatchComputed.test.ts +4 -4
  111. package/src/api/CustomComponent/CustomWatch/test/WatchRootData.test.ts +2 -2
  112. package/src/api/CustomComponent/CustomWatch/test/WatchSubData.test.ts +2 -2
  113. package/src/api/CustomComponent/index.ts +24 -45
  114. package/src/api/CustomComponent/returnType.ts +53 -0
  115. package/src/api/DefineComponent/NameOrPage/NameOrPathOption.ts +4 -2
  116. package/src/api/DefineComponent/NameOrPage/test/error.test.ts +6 -6
  117. package/src/api/DefineComponent/RootComponent/RootComponentOption.ts +3 -3
  118. package/src/api/DefineComponent/SubComponents/SubComponentsOption.ts +4 -3
  119. package/src/api/DefineComponent/SubComponents/test/normal.test.ts +4 -4
  120. package/src/api/DefineComponent/index.ts +31 -30
  121. package/src/api/DefineComponent/normalizeOptions/__throttleDebounce__FieldCheck.ts +3 -3
  122. package/src/api/DefineComponent/normalizeOptions/handleRootComponent.ts +3 -2
  123. package/src/api/DefineComponent/normalizeOptions/handleStore/reactionRegister.ts +24 -3
  124. package/src/api/DefineComponent/normalizeOptions/handleSubComponents.ts +2 -2
  125. package/src/api/DefineComponent/normalizeOptions/hijackHandle/addDetachedData.ts +0 -2
  126. package/src/api/DefineComponent/normalizeOptions/hijackHandle/index.ts +11 -0
  127. package/src/api/DefineComponent/normalizeOptions/index.ts +4 -4
  128. package/src/api/DefineComponent/normalizeOptions/initComputed/computedUpdater.ts +18 -8
  129. package/src/api/DefineComponent/normalizeOptions/initComputed/initComputedAndGetCache.ts +12 -1
  130. package/src/api/DefineComponent/normalizeOptions/otherFieldsHandle.ts +3 -4
  131. package/src/api/DefineComponent/normalizeOptions/sameFuncFieldsCollect.ts +4 -3
  132. package/src/api/DefineComponent/normalizeOptions/watchHandler/index.ts +21 -8
  133. package/src/api/DefineComponent/returnType/ComponentDoc.ts +25 -0
  134. package/src/api/DefineComponent/{ReturnType/CreateComponentDoc.ts → returnType/GenerateComponentDoc.ts} +13 -10
  135. package/src/api/DefineComponent/{ReturnType/CreatePageDoc.ts → returnType/GeneratePageDoc.ts} +7 -3
  136. package/src/api/DefineComponent/{ReturnType → returnType}/GetCustomEventDocOfSubDoc.ts +4 -4
  137. package/src/api/DefineComponent/{ReturnType → returnType}/test/normalComponentDoc.test.ts +24 -13
  138. package/src/api/RootComponent/Events/EventsConstraint.ts +6 -6
  139. package/src/api/RootComponent/Events/test/normal.test.ts +5 -5
  140. package/src/api/RootComponent/Instance/RootComponentInstance.ts +2 -1
  141. package/src/api/RootComponent/Observers/ObserversOption.ts +2 -2
  142. package/src/api/RootComponent/Store/GeTStoreDoc.ts +37 -2
  143. package/src/api/RootComponent/Store/StoreConstraint.ts +8 -1
  144. package/src/api/RootComponent/Store/StoreOption.ts +70 -3
  145. package/src/api/RootComponent/Store/test/error.test.ts +42 -0
  146. package/src/api/RootComponent/Store/test/normal.test.ts +46 -0
  147. package/src/api/RootComponent/Watch/WatchOption.ts +2 -2
  148. package/src/api/RootComponent/index.ts +10 -28
  149. package/src/api/RootComponent/returnType.ts +57 -0
  150. package/src/api/wxSugar.ts +1 -1
  151. package/src/thirdLib/wm/map.ts +1 -1
  152. package/src/thirdLib/wm/scrollView.ts +2 -2
  153. package/src/thirdLib/wm/view.ts +1 -1
  154. package/src/types/CreateComponentType.ts +3 -3
  155. package/src/types/ExtendComponentType.ts +6 -6
  156. package/src/types/GetComponentPrefix.ts +4 -4
  157. package/src/types/ReplacePrefix.ts +6 -6
  158. package/src/utils/debounce.ts +6 -6
  159. package/src/utils/throttle.ts +5 -5
  160. package/tsconfig.json +3 -2
  161. package/dist/api/CustomComponent/CustomComponentType.d.ts +0 -10
  162. package/dist/api/CustomComponent/CustomComponentType.js +0 -2
  163. package/dist/api/CustomComponent/CustomComponentType.js.map +0 -1
  164. package/dist/api/DefineComponent/ReturnType/ComponentType.d.ts +0 -9
  165. package/dist/api/DefineComponent/ReturnType/ComponentType.js +0 -2
  166. package/dist/api/DefineComponent/ReturnType/ComponentType.js.map +0 -1
  167. package/dist/api/DefineComponent/ReturnType/CreateComponentDoc.d.ts +0 -18
  168. package/dist/api/DefineComponent/ReturnType/CreateComponentDoc.js +0 -2
  169. package/dist/api/DefineComponent/ReturnType/CreateComponentDoc.js.map +0 -1
  170. package/dist/api/DefineComponent/ReturnType/CreatePageDoc.js +0 -2
  171. package/dist/api/DefineComponent/ReturnType/CreatePageDoc.js.map +0 -1
  172. package/dist/api/DefineComponent/ReturnType/GetCustomEventDocOfSubDoc.d.ts +0 -8
  173. package/dist/api/DefineComponent/ReturnType/GetCustomEventDocOfSubDoc.js.map +0 -1
  174. package/dist/api/DefineComponent/ReturnType/PageDoc.js.map +0 -1
  175. package/dist/api/RootComponent/RootComponentType.d.ts +0 -22
  176. package/dist/api/RootComponent/RootComponentType.js +0 -2
  177. package/dist/api/RootComponent/RootComponentType.js.map +0 -1
  178. package/dist/types/Replace.d.ts +0 -8
  179. package/dist/types/Replace.js +0 -2
  180. package/dist/types/Replace.js.map +0 -1
  181. package/src/api/CustomComponent/CustomComponentType.ts +0 -37
  182. package/src/api/DefineComponent/ReturnType/ComponentType.ts +0 -25
  183. package/src/api/RootComponent/RootComponentType.ts +0 -44
  184. /package/dist/api/DefineComponent/{ReturnType → returnType}/GetCustomEventDocOfSubDoc.js +0 -0
  185. /package/dist/api/DefineComponent/{ReturnType → returnType}/PageDoc.d.ts +0 -0
  186. /package/dist/api/DefineComponent/{ReturnType → returnType}/PageDoc.js +0 -0
  187. /package/src/api/DefineComponent/{ReturnType → returnType}/GetPropertiesDocOfSubDoc.ts +0 -0
  188. /package/src/api/DefineComponent/{ReturnType → returnType}/PageDoc.ts +0 -0
  189. /package/src/api/DefineComponent/{ReturnType → returnType}/test/normalPageDoc.test.ts +0 -0
@@ -1,24 +1,16 @@
1
1
  import type { IfExtends } from "hry-types/src/Any/IfExtends";
2
2
  import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
3
- import type { Func } from "hry-types/src/Misc/Func";
4
3
  import type { RequiredKeys } from "hry-types/src/Object/RequiredKeys";
5
4
  import type { Extra } from "../../types/Extra";
6
5
  import type { GetComponentPrefix } from "../../types/GetComponentPrefix";
7
6
  import type { InnerFields } from "../../types/InnerData";
8
7
  import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
9
- import type { Replace } from "../../types/Replace";
10
8
  import type { ReplacePrefix } from "../../types/ReplacePrefix";
11
9
  import type { UnionToComma } from "../../types/UnionToComma.test";
12
- import type { ComponentType } from "../DefineComponent/ReturnType/ComponentType";
10
+ import type { ComponentDoc } from "../DefineComponent/returnType/ComponentDoc";
13
11
  import type { IInjectStore } from "../InstanceInject/instanceConfig";
14
- import type { ComputedConstraint } from "../RootComponent/Computed/ComputedConstraint";
15
- import type { DataConstraint } from "../RootComponent/Data/DataConstraint";
16
- import type { EventsConstraint } from "../RootComponent/Events/EventsConstraint";
17
- import type { LifetimesConstraint } from "../RootComponent/Lifetimes/LifetimesConstraint";
18
- import type { MethodsConstraint } from "../RootComponent/Methods/MethodsConstraint";
19
- import type { PageLifetimesOption } from "../RootComponent/PageLifetimes/PageLifetimesOption";
20
- import type { RootComponentType } from "../RootComponent/RootComponentType";
21
- import type { StoreConstraint } from "../RootComponent/Store/StoreConstraint";
12
+ import type { RootComponentDefinition } from "../RootComponent/returnType";
13
+ import type { GetStoreDoc } from "../RootComponent/Store/GeTStoreDoc";
22
14
  import type { CustomComputedConstraint } from "./CustomComputed/CustomComputedConstraint";
23
15
  import type { CustomComputedOption } from "./CustomComputed/CustomComputedOption";
24
16
  import type { GetCustomComputedDoc } from "./CustomComputed/GetCustomComputedDoc";
@@ -38,7 +30,7 @@ import type { CreatCustomComponentDoc } from "./CustomReturnType/CreateCustomCom
38
30
  import type { CustomStoreConstraint } from "./CustomStore/CustomStoreConstraint";
39
31
  import type { CustomStoreOption } from "./CustomStore/CustomStoreOption";
40
32
  import type { CustomWatchOption } from "./CustomWatch/CustomWatchOption";
41
- type Options<RootDoc extends RootComponentType, IsPage extends boolean, CurrentCompDoc extends ComponentType, Prefix extends string, AllRootDataDoc extends object, TInherit extends object, TSubData extends object, TSubStore extends object, TSubComputed extends object, TEvents extends object, TSubMethods extends CustomMethodsConstraint, InheritDoc extends object, SubDataDoc extends object, SubStoreDoc extends object, SubComputedDoc extends object, SubEventsDoc extends object, SubMethodsDoc extends object, CompDocKeys extends PropertyKey = keyof CurrentCompDoc["properties"]> = CustomInheritOption<TInherit, {
33
+ type Options<RootDoc extends RootComponentDefinition, 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 CustomMethodsConstraint, InheritDoc extends object, SubDataDoc extends object, SubStoreDoc extends object, SubComputedDoc extends object, SubEventsDoc extends object, SubMethodsDoc extends object, CompDocKeys extends PropertyKey = keyof CurrentCompDoc["properties"]> = CustomInheritOption<TInherit, {
42
34
  [k in keyof NoInfer<TInherit>]: k extends keyof (AllRootDataDoc) ? never : k extends CompDocKeys ? k : never;
43
35
  }[keyof NoInfer<TInherit>]> & CustomDataOption<TSubData, {
44
36
  [k in keyof NoInfer<TSubData>]: k extends keyof (AllRootDataDoc) ? never : k extends Exclude<CompDocKeys, (keyof (InheritDoc))> ? k : k extends InnerFields<Prefix> ? k : never;
@@ -46,25 +38,11 @@ type Options<RootDoc extends RootComponentType, IsPage extends boolean, CurrentC
46
38
  [k in keyof NoInfer<TSubStore>]: k extends keyof (AllRootDataDoc & SubDataDoc) ? never : k extends Exclude<CompDocKeys, (keyof (InheritDoc & SubDataDoc))> ? k : k extends InnerFields<Prefix> ? k : never;
47
39
  }[keyof NoInfer<TSubStore>]> & CustomComputedOption<TSubComputed, {
48
40
  [k in keyof NoInfer<TSubComputed>]: k extends keyof (AllRootDataDoc & SubDataDoc & SubStoreDoc) ? never : k extends Exclude<CompDocKeys, (keyof (InheritDoc & SubDataDoc & SubStoreDoc))> ? k : k extends InnerFields<Prefix> ? k : never;
49
- }[keyof NoInfer<TSubComputed>]> & CustomEventsOption<TEvents, SubEventsDoc, keyof CustomEventsConstraint<CurrentCompDoc>> & CustomMethodsOption<TSubMethods, Prefix, keyof (CurrentCompDoc["customEvents"] & SubEventsDoc)> & CustomPageLifetimesOption<IsPage, NonNullable<RootDoc["properties"]>> & CustomLifetimesOption & CustomWatchOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc & IInjectStore> & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "export" | "observers" | "relations">> & CustomObserversOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc & IInjectStore> & ThisType<CustomInstance<SubMethodsDoc & RootDoc["methods"], Replace<SubDataDoc, Required<CurrentCompDoc["properties"]>>, AllRootDataDoc & Replace<SubDataDoc & SubComputedDoc & SubStoreDoc, Required<CurrentCompDoc["properties"]>>, NonNullable<RootDoc["customEvents"]>, SubStoreDoc>>;
50
- type CusotmComponentConstructor<TRootDoc extends RootComponentType, TOriginalCompDoc extends ComponentType, TSupplementalPrefix extends string = "", IsPage extends boolean = TRootDoc["isPage"] extends true ? true : false, CurrentPrefix extends string = `${GetComponentPrefix<TOriginalCompDoc>}${Capitalize<TSupplementalPrefix>}`, CurrentCompDoc extends ComponentType = IfExtends<TSupplementalPrefix, "", TOriginalCompDoc & {
41
+ }[keyof NoInfer<TSubComputed>]> & CustomEventsOption<TEvents, SubEventsDoc, keyof CustomEventsConstraint<CurrentCompDoc>> & CustomMethodsOption<TSubMethods, Prefix, keyof (CurrentCompDoc["events"] & SubEventsDoc)> & CustomPageLifetimesOption<IsPage, NonNullable<RootDoc["properties"]>> & CustomLifetimesOption & CustomWatchOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc & IInjectStore> & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "export" | "observers" | "relations">> & CustomObserversOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc & IInjectStore> & ThisType<CustomInstance<SubMethodsDoc & RootDoc["methods"], SubDataDoc, AllRootDataDoc & SubDataDoc & SubComputedDoc & SubStoreDoc, NonNullable<RootDoc["customEvents"]>, SubStoreDoc>>;
42
+ type CustomComponentConstructor<TRootDoc extends RootComponentDefinition, 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 & {
51
43
  properties: Extra<CurrentPrefix>;
52
44
  }, ReplacePrefix<TOriginalCompDoc & {
53
45
  properties: Extra<CurrentPrefix>;
54
- }, CurrentPrefix>>, AllRootDataDoc extends object = Required<TRootDoc["properties"]> & TRootDoc["data"] & TRootDoc["computed"] & TRootDoc["store"]> = <TInherit extends CustomInheritConstraint<AllRootDataDoc, CurrentCompDoc>, TData extends CustomDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc> & Record<InnerFields<CurrentPrefix>, unknown>>, TStore extends CustomStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & DataDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TEvents extends CustomEventsConstraint<CurrentCompDoc>, TComputed extends CustomComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & DataDoc & StoreDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TMethods extends CustomMethodsConstraint = {}, InheritDoc extends object = IfExtends<CustomInheritConstraint<AllRootDataDoc, CurrentCompDoc>, TInherit, {}, TInherit>, DataDoc extends object = IfExtends<CustomDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc> & Record<InnerFields<CurrentPrefix>, unknown>>, TData, {}, TData>, StoreDoc extends object = IfExtends<CustomStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & DataDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TStore, {}, {
55
- [k in keyof TStore]: ReturnType<NonNullable<TStore[k]>>;
56
- }>, ComputedDoc extends object = IfExtends<CustomComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & DataDoc & StoreDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TComputed, {}, GetCustomComputedDoc<TComputed>>, EventsDoc extends object = IfExtends<CustomEventsConstraint<CurrentCompDoc>, TEvents, {}, TEvents>, MethodsDoc extends object = TMethods, MissingRequiredField extends PropertyKey = Exclude<RequiredKeys<NonNullable<CurrentCompDoc["properties"]>>, keyof (InheritDoc & DataDoc & StoreDoc & IfExtends<CustomComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & DataDoc & StoreDoc)>>, TComputed, {}, GetCustomComputedDoc<TComputed>>)>>(options: Options<TRootDoc, IsPage, CurrentCompDoc, CurrentPrefix, AllRootDataDoc, TInherit, TData, TStore, TComputed, TEvents, TMethods, InheritDoc, DataDoc, StoreDoc, ComputedDoc, EventsDoc, MethodsDoc>) => IfExtends<MissingRequiredField, never, CreatCustomComponentDoc<NonNullable<CurrentCompDoc["customEvents"]>, EventsDoc>, `缺少必传的字段${UnionToComma<MissingRequiredField & string>}`>;
57
- export declare function CustomComponent<RootDoc extends RootComponentType, CompDoc extends ComponentType, Prefix extends string = "">(): IfExtends<EmptyObject, CompDoc, (opt: EmptyObject) => never, CusotmComponentConstructor<RootDoc, CompDoc, Prefix>>;
58
- export type CustomComponentTrueOptions = {
59
- inhrit?: string;
60
- data?: DataConstraint;
61
- computed?: ComputedConstraint;
62
- store?: StoreConstraint;
63
- events?: EventsConstraint;
64
- methods?: MethodsConstraint;
65
- observers?: Record<string, Func>;
66
- watch?: Record<string, Func>;
67
- lifetimes?: LifetimesConstraint;
68
- pageLifetimes?: PageLifetimesOption<false, object>["pageLifetimes"] | PageLifetimesOption<true, object>["pageLifetimes"];
69
- };
46
+ }, CurrentPrefix>>, AllRootDataDoc extends object = Required<TRootDoc["properties"]> & TRootDoc["data"] & TRootDoc["computed"] & TRootDoc["store"]> = <TInherit extends CustomInheritConstraint<AllRootDataDoc, CurrentCompDoc>, TData extends CustomDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc> & Record<InnerFields<CurrentPrefix>, unknown>>, TStore extends CustomStoreConstraint<Required<TRootDoc["properties"]>, Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & DataDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TEvents extends CustomEventsConstraint<CurrentCompDoc>, TComputed extends CustomComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & DataDoc & StoreDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TMethods extends CustomMethodsConstraint = {}, InheritDoc extends object = IfExtends<CustomInheritConstraint<AllRootDataDoc, CurrentCompDoc>, TInherit, {}, TInherit>, DataDoc extends object = IfExtends<CustomDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc> & Record<InnerFields<CurrentPrefix>, unknown>>, TData, {}, TData>, StoreDoc extends object = IfExtends<CustomStoreConstraint<Required<TRootDoc["properties"]>, Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & DataDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TStore, {}, GetStoreDoc<TStore>>, ComputedDoc extends object = IfExtends<CustomComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & DataDoc & StoreDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TComputed, {}, GetCustomComputedDoc<TComputed>>, EventsDoc extends object = IfExtends<CustomEventsConstraint<CurrentCompDoc>, TEvents, {}, TEvents>, MethodsDoc extends object = TMethods, MissingRequiredField extends PropertyKey = Exclude<RequiredKeys<NonNullable<CurrentCompDoc["properties"]>>, keyof (InheritDoc & DataDoc & StoreDoc & IfExtends<CustomComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & DataDoc & StoreDoc)>>, TComputed, {}, GetCustomComputedDoc<TComputed>>)>>(options: Options<TRootDoc, IsPage, CurrentCompDoc, CurrentPrefix, AllRootDataDoc, TInherit, TData, TStore, TComputed, TEvents, TMethods, InheritDoc, DataDoc, StoreDoc, ComputedDoc, EventsDoc, MethodsDoc>) => IfExtends<MissingRequiredField, never, CreatCustomComponentDoc<NonNullable<CurrentCompDoc["events"]>, EventsDoc>, `缺少必传的字段${UnionToComma<MissingRequiredField & string>}`>;
47
+ export declare function CustomComponent<TRootComponentDefinition extends RootComponentDefinition, TCompDoc extends ComponentDoc, Prefix extends string = "">(): IfExtends<EmptyObject, TCompDoc, (opt: EmptyObject) => never, CustomComponentConstructor<TRootComponentDefinition, TCompDoc, Prefix>>;
70
48
  export {};
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/CustomComponent/index.ts"],"names":[],"mappings":"AA+SA,MAAM,UAAU,eAAe;IAW7B,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAqC,CAAQ,CAAC;AAC1E,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/CustomComponent/index.ts"],"names":[],"mappings":"AA2SA,MAAM,UAAU,eAAe;IAW7B,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAQ,CAAC;AAC5C,CAAC"}
@@ -0,0 +1,27 @@
1
+ import type { Func } from "hry-types/src/Misc/Func";
2
+ import type { ComputedConstraint } from "../RootComponent/Computed/ComputedConstraint";
3
+ import type { CustomEventsTags } from "../RootComponent/CustomEvents/CustomEventsTag";
4
+ import type { DataConstraint } from "../RootComponent/Data/DataConstraint";
5
+ import type { EventsConstraint } from "../RootComponent/Events/EventsConstraint";
6
+ import type { LifetimesConstraint } from "../RootComponent/Lifetimes/LifetimesConstraint";
7
+ import type { MethodsConstraint } from "../RootComponent/Methods/MethodsConstraint";
8
+ import type { PageLifetimesOption } from "../RootComponent/PageLifetimes/PageLifetimesOption";
9
+ import type { StoreConstraint } from "../RootComponent/Store/StoreConstraint";
10
+ type _CustomComponentDefinition = {
11
+ composedEvents?: Record<string, string | number | bigint | boolean | symbol | null | undefined | Record<string, unknown> | unknown[] | CustomEventsTags>;
12
+ };
13
+ type _Validator<O, Doc, ErrKeys = Exclude<keyof O, keyof Doc>> = [ErrKeys] extends [never] ? Doc : `错误的字段${ErrKeys & string}`;
14
+ export type CustomComponentDefinition<O extends _Validator<O, _CustomComponentDefinition> = _CustomComponentDefinition> = O;
15
+ export type CustomComponentDefinitionRuntime = {
16
+ inhrit?: string;
17
+ data?: DataConstraint;
18
+ computed?: ComputedConstraint;
19
+ store?: StoreConstraint;
20
+ events?: EventsConstraint;
21
+ methods?: MethodsConstraint;
22
+ observers?: Record<string, Func>;
23
+ watch?: Record<string, Func>;
24
+ lifetimes?: LifetimesConstraint;
25
+ pageLifetimes?: PageLifetimesOption<false, object>["pageLifetimes"] | PageLifetimesOption<true, object>["pageLifetimes"];
26
+ };
27
+ export {};
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=returnType.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"returnType.js","sourceRoot":"","sources":["../../../src/api/CustomComponent/returnType.ts"],"names":[],"mappings":""}
@@ -1,4 +1,4 @@
1
- import type { RootComponentType } from "../../RootComponent/RootComponentType";
2
- export type RootComponentOption<TRootComponent extends RootComponentType> = {
3
- rootComponent?: TRootComponent;
1
+ import type { RootComponentDefinition } from "../../RootComponent/returnType";
2
+ export type RootComponentOption<TRootComponentReturnType extends RootComponentDefinition> = {
3
+ rootComponent?: TRootComponentReturnType;
4
4
  };
@@ -1,4 +1,4 @@
1
- import type { CustomComponentType } from "../../CustomComponent/CustomComponentType";
2
- export type SubComponentsOption<TSubComponentTuple extends CustomComponentType[]> = {
3
- subComponents?: [...TSubComponentTuple];
1
+ import type { CustomComponentDefinition } from "../../CustomComponent/returnType";
2
+ export type SubComponentsOption<TCustomComponentReturnTypeList extends CustomComponentDefinition[]> = {
3
+ subComponents?: [...TCustomComponentReturnTypeList];
4
4
  };
@@ -1,21 +1,19 @@
1
1
  import type { IfExtends } from "hry-types/src/Any/IfExtends";
2
- import type { CustomComponentTrueOptions } from "../CustomComponent";
3
- import type { CustomComponentType } from "../CustomComponent/CustomComponentType";
4
- import type { RootComponentTrueOptions } from "../RootComponent";
5
- import type { RootComponentType } from "../RootComponent/RootComponentType";
2
+ import type { CustomComponentDefinition, CustomComponentDefinitionRuntime } from "../CustomComponent/returnType";
3
+ import type { RootComponentDefinition, RootComponentDefinitionRuntime } from "../RootComponent/returnType";
6
4
  import type { NameOrPathOption } from "./NameOrPage/NameOrPathOption";
7
- import type { CreateComponentDoc } from "./ReturnType/CreateComponentDoc";
8
- import type { CreatePageDoc } from "./ReturnType/CreatePageDoc";
5
+ import type { GenerateComponentDoc } from "./returnType/GenerateComponentDoc";
6
+ import type { GeneratePageDoc } from "./returnType/GeneratePageDoc";
9
7
  import type { RootComponentOption } from "./RootComponent/RootComponentOption";
10
8
  import type { SubComponentsOption } from "./SubComponents/SubComponentsOption";
11
9
  export type Path = `/${string}`;
12
- type RootOptions<TRootComponentDoc extends RootComponentType, TSubComponentTuple extends CustomComponentType[], TName extends string, TPath extends Path> = NameOrPathOption<TName, TPath, TRootComponentDoc["isPage"] & {}> & RootComponentOption<TRootComponentDoc> & SubComponentsOption<TSubComponentTuple>;
13
- type DefineComponentConstructor = <TRootComponentDoc extends RootComponentType = {}, TSubComponentTuple extends CustomComponentType[] = [], TName extends string = "", TPath extends Path = "/">(options: RootOptions<TRootComponentDoc, TSubComponentTuple, TName, TPath>) => IfExtends<"", TName, CreatePageDoc<TRootComponentDoc, TPath>, CreateComponentDoc<TRootComponentDoc, TName, TSubComponentTuple>>;
14
- export type DefineComponentOption = {
10
+ type Options<TRootComponentDefinition extends RootComponentDefinition, TCustomComponentDefinitionList extends CustomComponentDefinition[], TName extends string, TPath extends Path> = NameOrPathOption<TName, TPath, NonNullable<TRootComponentDefinition["isPage"]>> & RootComponentOption<TRootComponentDefinition> & SubComponentsOption<TCustomComponentDefinitionList>;
11
+ type Constructor = <TRootComponentDefinition extends RootComponentDefinition = {}, TCustomComponentDefinitionList extends CustomComponentDefinition[] = [], TName extends string = "", TPath extends Path = "/">(options: Options<TRootComponentDefinition, TCustomComponentDefinitionList, TName, TPath>) => IfExtends<"", TName, GeneratePageDoc<TRootComponentDefinition, TPath>, GenerateComponentDoc<TRootComponentDefinition, TName, TCustomComponentDefinitionList>>;
12
+ export type DefineComponentOptionRuntime = {
15
13
  name?: string;
16
14
  path?: string;
17
- rootComponent?: RootComponentTrueOptions;
18
- subComponents?: CustomComponentTrueOptions[];
15
+ rootComponent?: RootComponentDefinitionRuntime;
16
+ subComponents?: CustomComponentDefinitionRuntime[];
19
17
  };
20
- export declare const DefineComponent: DefineComponentConstructor;
18
+ export declare const DefineComponent: Constructor;
21
19
  export {};
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/DefineComponent/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AA6CtD,MAAM,CAAC,MAAM,eAAe,GAA+B,UAAS,OAAO;IACzE,SAAS,CAEP,gBAAgB,CAAC,OAAgC,CAAQ,CAC1D,CAAC;AACJ,CAAC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/DefineComponent/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AA+CtD,MAAM,CAAC,MAAM,eAAe,GAAgB,UAAS,OAAO;IAC1D,SAAS,CAEP,gBAAgB,CAAC,OAAuC,CAAQ,CACjE,CAAC;AACJ,CAAC,CAAC"}
@@ -1,4 +1,4 @@
1
1
  import type { SlotComponentReturnType } from "../../ChunkComponent/SlotComponentReturnType";
2
- import type { CustomComponentTrueOptions } from "../../CustomComponent";
3
- import type { RootComponentTrueOptions } from "../../RootComponent";
4
- export declare function __throttleDebounce__FieldCheck(config: RootComponentTrueOptions | CustomComponentTrueOptions[] | SlotComponentReturnType[]): void;
2
+ import type { CustomComponentDefinitionRuntime } from "../../CustomComponent/returnType";
3
+ import type { RootComponentDefinitionRuntime } from "../../RootComponent/returnType";
4
+ export declare function __throttleDebounce__FieldCheck(config: RootComponentDefinitionRuntime | CustomComponentDefinitionRuntime[] | SlotComponentReturnType[]): void;
@@ -1 +1 @@
1
- {"version":3,"file":"__throttleDebounce__FieldCheck.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/__throttleDebounce__FieldCheck.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,8BAA8B,CAC5C,MAA2F;IAE3F,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"}
1
+ {"version":3,"file":"__throttleDebounce__FieldCheck.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/__throttleDebounce__FieldCheck.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,8BAA8B,CAC5C,MAAuG;IAEvG,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"}
@@ -1,3 +1,3 @@
1
- import type { RootComponentTrueOptions } from "../../RootComponent";
1
+ import type { RootComponentDefinitionRuntime } from "../../RootComponent/returnType";
2
2
  import type { FinalOptionsOfComponent, SameFuncOptions } from ".";
3
- export declare function handleRootComponent(finalOptions: FinalOptionsOfComponent, rootComponent: RootComponentTrueOptions | undefined, funcOptions: SameFuncOptions): void;
3
+ export declare function handleRootComponent(finalOptions: FinalOptionsOfComponent, rootComponent: RootComponentDefinitionRuntime | undefined, funcOptions: SameFuncOptions): void;
@@ -1 +1 @@
1
- {"version":3,"file":"handleRootComponent.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/handleRootComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAG7D,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAQhE,MAAM,UAAU,mBAAmB,CACjC,YAAqC,EACrC,aAAmD,EACnD,WAA4B;IAE5B,IAAI,aAAa,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,EAAE,CAAC;QAEnD,8BAA8B,CAAC,aAAa,CAAC,CAAC;QAE9C,IAAI,aAAa,CAAC,YAAY;YAAE,kBAAkB,CAAC,YAAY,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;QAC7F,OAAO,aAAa,CAAC,YAAY,CAAC;QAClC,IAAI,aAAa,CAAC,MAAM;YAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;QACpF,OAAO,aAAa,CAAC,MAAM,CAAC;QAC5B,qBAAqB,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;QAElD,iBAAiB,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;IACjD,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"handleRootComponent.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/handleRootComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAI7D,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAQhE,MAAM,UAAU,mBAAmB,CACjC,YAAqC,EACrC,aAAyD,EACzD,WAA4B;IAE5B,IAAI,aAAa,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,EAAE,CAAC;QAEnD,8BAA8B,CAAC,aAAa,CAAC,CAAC;QAE9C,IAAI,aAAa,CAAC,YAAY;YAAE,kBAAkB,CAAC,YAAY,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;QAC7F,OAAO,aAAa,CAAC,YAAY,CAAC;QAClC,IAAI,aAAa,CAAC,MAAM;YAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;QACpF,OAAO,aAAa,CAAC,MAAM,CAAC;QAC5B,qBAAqB,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;QAElD,iBAAiB,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;IACjD,CAAC;AACH,CAAC"}
@@ -1,2 +1,3 @@
1
1
  import type { Instance } from "../../../RootComponent/Instance/RootComponentInstance";
2
- export declare function reactionRegister(this: Instance, storeConfig: Record<string, () => unknown>): void;
2
+ import type { StoreConstraint } from "../../../RootComponent/Store/StoreConstraint";
3
+ export declare function reactionRegister(this: Instance, storeConfig: StoreConstraint): void;
@@ -1,10 +1,30 @@
1
+ function isGetter(value) {
2
+ return typeof value === "function";
3
+ }
1
4
  export function reactionRegister(storeConfig) {
2
5
  const { comparer, reaction, toJS } = require("mobx");
3
6
  this.disposer = {};
4
7
  const peddingSetData = {};
5
8
  for (const key in storeConfig) {
6
- peddingSetData[key] = toJS(storeConfig[key]());
7
- this.disposer[key] = reaction(storeConfig[key], (value) => {
9
+ let value;
10
+ let getter;
11
+ const itemConfig = storeConfig[key];
12
+ if (isGetter(itemConfig)) {
13
+ value = itemConfig(this.data);
14
+ if (value === undefined) {
15
+ throw new Error(`store配置中 ${key} 字段的 函数值不可为undefined`);
16
+ }
17
+ getter = itemConfig;
18
+ }
19
+ else {
20
+ if (itemConfig.getter(this.data) !== undefined) {
21
+ throw new Error(`store配置中 ${key}字段的配置对象中getter函数值不为undefined`);
22
+ }
23
+ getter = itemConfig.getter;
24
+ value = itemConfig.default;
25
+ }
26
+ peddingSetData[key] = toJS(value);
27
+ this.disposer[key] = reaction(() => getter(this.data), (value) => {
8
28
  this.setData({
9
29
  [key]: toJS(value),
10
30
  });
@@ -1 +1 @@
1
- {"version":3,"file":"reactionRegister.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/handleStore/reactionRegister.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,gBAAgB,CAAiB,WAA0C;IAEzF,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAgB,CAAC;IAEpE,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;IACnB,MAAM,cAAc,GAA4B,EAAE,CAAC;IACnD,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;QAE9B,cAAc,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC/C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAC3B,WAAW,CAAC,GAAG,CAAC,EAChB,CAAC,KAAc,EAAE,EAAE;YACjB,IAAI,CAAC,OAAO,CAAC;gBACX,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC;aACnB,CAAC,CAAC;QACL,CAAC,EACD;YACE,MAAM,EAAE,QAAQ,CAAC,UAAU;SAC5B,CACF,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;AAC/B,CAAC"}
1
+ {"version":3,"file":"reactionRegister.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/handleStore/reactionRegister.ts"],"names":[],"mappings":"AAGA,SAAS,QAAQ,CAAC,KAA2B;IAC3C,OAAO,OAAO,KAAK,KAAK,UAAU,CAAC;AACrC,CAAC;AACD,MAAM,UAAU,gBAAgB,CAAiB,WAA4B;IAE3E,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAgB,CAAC;IAEpE,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;IACnB,MAAM,cAAc,GAA4B,EAAE,CAAC;IACnD,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;QAC9B,IAAI,KAAK,CAAC;QACV,IAAI,MAAM,CAAC;QACX,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YACzB,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACxB,MAAM,IAAI,KAAK,CAAC,YAAY,GAAG,sBAAsB,CAAC,CAAC;YACzD,CAAC;YACD,MAAM,GAAG,UAAU,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,IAAI,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;gBAC/C,MAAM,IAAI,KAAK,CAAC,aAAa,GAAG,8BAA8B,CAAC,CAAC;YAClE,CAAC;YACD,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;YAC3B,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC;QAC7B,CAAC;QAGD,cAAc,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;QAClC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAC3B,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EACvB,CAAC,KAAc,EAAE,EAAE;YACjB,IAAI,CAAC,OAAO,CAAC;gBACX,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC;aACnB,CAAC,CAAC;QACL,CAAC,EACD;YACE,MAAM,EAAE,QAAQ,CAAC,UAAU;SAC5B,CACF,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;AAC/B,CAAC"}
@@ -1,3 +1,3 @@
1
- import type { CustomComponentTrueOptions } from "../../CustomComponent";
1
+ import type { CustomComponentDefinitionRuntime } from "../../CustomComponent/returnType";
2
2
  import type { FinalOptionsOfComponent, SameFuncOptions } from ".";
3
- export declare function handleSubComponents(componentOptions: FinalOptionsOfComponent, subComponents: CustomComponentTrueOptions[] | undefined, funcOptions: SameFuncOptions): void;
3
+ export declare function handleSubComponents(componentOptions: FinalOptionsOfComponent, subComponents: CustomComponentDefinitionRuntime[] | undefined, funcOptions: SameFuncOptions): void;
@@ -1 +1 @@
1
- {"version":3,"file":"handleSubComponents.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/handleSubComponents.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,MAAM,UAAU,mBAAmB,CACjC,gBAAyC,EACzC,aAAuD,EACvD,WAA4B;IAE5B,IAAI,aAAa,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAEhD,8BAA8B,CAAC,aAAa,CAAC,CAAC;QAC9C,aAAa,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAClC,IAAI,SAAS,CAAC,MAAM;gBAAE,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;YAEhF,qBAAqB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;YAE9C,iBAAiB,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"handleSubComponents.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/handleSubComponents.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,MAAM,UAAU,mBAAmB,CACjC,gBAAyC,EACzC,aAA6D,EAC7D,WAA4B;IAE5B,IAAI,aAAa,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAEhD,8BAA8B,CAAC,aAAa,CAAC,CAAC;QAC9C,aAAa,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAClC,IAAI,SAAS,CAAC,MAAM;gBAAE,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;YAEhF,qBAAqB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;YAE9C,iBAAiB,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
@@ -1,10 +1,8 @@
1
1
  export function addDetachedData() {
2
2
  if (this.data.attached !== undefined)
3
3
  return;
4
- this.data.__notUpdateComputed__ = true;
5
4
  this.setData({
6
5
  attached: true,
7
6
  });
8
- this.data.__notUpdateComputed__ = false;
9
7
  }
10
8
  //# sourceMappingURL=addDetachedData.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"addDetachedData.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/hijackHandle/addDetachedData.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,eAAe;IAE7B,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,KAAK,SAAS;QAAE,OAAO;IAC7C,IAAI,CAAC,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;IACvC,IAAI,CAAC,OAAO,CAAC;QAEX,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;IACH,IAAI,CAAC,IAAI,CAAC,qBAAqB,GAAG,KAAK,CAAC;AAC1C,CAAC"}
1
+ {"version":3,"file":"addDetachedData.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/hijackHandle/addDetachedData.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,eAAe;IAE7B,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,KAAK,SAAS;QAAE,OAAO;IAC7C,IAAI,CAAC,OAAO,CAAC;QAEX,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;AACL,CAAC"}
@@ -21,6 +21,15 @@ export function hijackHandle(finalOptionsForComponent, isPage, path) {
21
21
  pagePathCheck(path),
22
22
  initStore(finalOptionsForComponent.store),
23
23
  initComputed(finalOptionsForComponent.computed, finalOptionsForComponent.watch),
24
+ function () {
25
+ const observerhandlers = this.data.__oberverHandler__;
26
+ if (observerhandlers) {
27
+ for (const observerhandler of observerhandlers) {
28
+ observerhandler.call(this);
29
+ }
30
+ Reflect.deleteProperty(this.data, "__oberverHandler__");
31
+ }
32
+ },
24
33
  ], [addDetachedData]);
25
34
  hijack(finalOptionsForComponent.lifetimes, "detached", [disposeStore]);
26
35
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/hijackHandle/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,UAAU,YAAY,CAC1B,wBAAiD,EACjD,MAA2B,EAC3B,IAAwB;IAGxB,IAAI,wBAAwB,CAAC,MAAM,EAAE,CAAC;QACpC,MAAM,CAAC,wBAAwB,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC,sBAAsB,CAAC,CAAC,CAAC;IACnF,CAAC;IAED,MAAM,CAAC,wBAAwB,CAAC,OAAO,EAAE,QAAQ,EAAE,CAAC,wBAAwB,CAAC,CAAC,CAAC;IAC/E,MAAM,CAAC,wBAAwB,CAAC,SAAS,EAAE,IAAI,EAAE;QAC/C,eAAe;KAChB,CAAC,CAAC;IAEH,MAAM,CACJ,wBAAwB,CAAC,SAAS,EAClC,UAAU,EACV;QAEE,WAAW,CAAC,MAAM,CAAC;QAEnB,aAAa,CAAC,IAAI,CAAC;QACnB,SAAS,CAAC,wBAAwB,CAAC,KAAK,CAAC;QACzC,YAAY,CAAC,wBAAwB,CAAC,QAAQ,EAAE,wBAAwB,CAAC,KAAK,CAAC;KAChF,EACD,CAAC,eAAe,CAAC,CAClB,CAAC;IACF,MAAM,CACJ,wBAAwB,CAAC,SAAS,EAClC,UAAU,EACV,CAAC,YAAY,CAAC,CACf,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/hijackHandle/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,UAAU,YAAY,CAC1B,wBAAiD,EACjD,MAA2B,EAC3B,IAAwB;IAGxB,IAAI,wBAAwB,CAAC,MAAM,EAAE,CAAC;QACpC,MAAM,CAAC,wBAAwB,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC,sBAAsB,CAAC,CAAC,CAAC;IACnF,CAAC;IAED,MAAM,CAAC,wBAAwB,CAAC,OAAO,EAAE,QAAQ,EAAE,CAAC,wBAAwB,CAAC,CAAC,CAAC;IAC/E,MAAM,CAAC,wBAAwB,CAAC,SAAS,EAAE,IAAI,EAAE;QAC/C,eAAe;KAChB,CAAC,CAAC;IAEH,MAAM,CACJ,wBAAwB,CAAC,SAAS,EAClC,UAAU,EACV;QAEE,WAAW,CAAC,MAAM,CAAC;QAEnB,aAAa,CAAC,IAAI,CAAC;QACnB,SAAS,CAAC,wBAAwB,CAAC,KAAK,CAAC;QAEzC,YAAY,CAAC,wBAAwB,CAAC,QAAQ,EAAE,wBAAwB,CAAC,KAAK,CAAC;QAC/E;YACE,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC;YACtD,IAAI,gBAAgB,EAAE,CAAC;gBACrB,KAAK,MAAM,eAAe,IAAI,gBAAgB,EAAE,CAAC;oBAC/C,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC7B,CAAC;gBACD,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC;KACF,EACD,CAAC,eAAe,CAAC,CAClB,CAAC;IACF,MAAM,CACJ,wBAAwB,CAAC,SAAS,EAClC,UAAU,EACV,CAAC,YAAY,CAAC,CACf,CAAC;AACJ,CAAC"}
@@ -6,7 +6,7 @@ import type { MethodsConstraint } from "../../RootComponent/Methods/MethodsConst
6
6
  import type { PageLifetimesOption } from "../../RootComponent/PageLifetimes/PageLifetimesOption";
7
7
  import type { PropertiesConstraint } from "../../RootComponent/Properties/PropertiesConstraint";
8
8
  import type { StoreConstraint } from "../../RootComponent/Store/StoreConstraint";
9
- import type { DefineComponentOption } from "..";
9
+ import type { DefineComponentOptionRuntime } from "..";
10
10
  import type { ComputedCache } from "./initComputed/initComputedAndGetCache";
11
11
  export type WatchOldValue = Record<string, unknown[]>;
12
12
  export type ThrottleDebounce = Partial<Record<"throttle" | "debounce", Record<string, number>>>;
@@ -14,8 +14,8 @@ export type OptionsInnerFields = {
14
14
  data: {
15
15
  __storeInited__?: boolean;
16
16
  attached?: boolean;
17
- __notUpdateComputed__?: boolean;
18
17
  __computedInited__?: boolean;
18
+ __oberverHandler__?: Func[];
19
19
  __computedCache__?: ComputedCache;
20
20
  __watchOldValue__?: WatchOldValue;
21
21
  __throttleDebounce__?: ThrottleDebounce;
@@ -37,4 +37,4 @@ export type FinalOptionsOfComponent = {
37
37
  watch: Record<string, Func>;
38
38
  lifetimes: LifetimesConstraint;
39
39
  };
40
- export declare function normalizeOptions(defineComponentOption: DefineComponentOption): FinalOptionsOfComponent;
40
+ export declare function normalizeOptions(defineComponentOption: DefineComponentOptionRuntime): FinalOptionsOfComponent;
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAC;AACnF,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AASrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAgD9C,MAAM,UAAU,gBAAgB,CAC9B,qBAA4C;;IAE5C,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,IAAI,EAAE,GAAG,qBAAqB,CAAC;IACrE,MAAM,MAAM,GAAG,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,mCAAI,KAAK,CAAC;IAC9C,MAAM,wBAAwB,GAA4B;QACxD,SAAS,EAAE,EAAE;QACb,IAAI,EAAE,EAAE;QACR,OAAO,EAAE,EAAE;QACX,SAAS,EAAE,CAAC,iBAAiB,CAAC;QAC9B,eAAe,EAAE,EAAE;QACnB,aAAa,EAAE,EAAE;QACjB,MAAM;QACN,UAAU,EAAE,EAAE;QACd,QAAQ,EAAE,EAAE;QACZ,KAAK,EAAE,EAAE;QACT,SAAS,EAAE,EAAE;QACb,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,iBAAiB,CAAC,wBAAwB,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;IAKvE,MAAM,eAAe,GAAoB;QACvC,aAAa,EAAE,EAAE;QACjB,SAAS,EAAE,EAAE;QACb,KAAK,EAAE,EAAE;QACT,SAAS,EAAE,EAAE;KACd,CAAC;IAEF,mBAAmB,CAAC,wBAAwB,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC;IAE9E,mBAAmB,CAAC,wBAAwB,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC;IAE9E,qBAAqB,CAAC,wBAAwB,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;IAGzE,uBAAuB,CAAC,wBAAwB,CAAC,CAAC;IAGlD,IAAI,MAAM,IAAI,wBAAwB,CAAC,OAAO,EAAE,CAAC;QAC/C,OAAO,CAAC,cAAc,CAAC,wBAAwB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC1E,CAAC;IAGD,wBAAwB,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;IAG3D,YAAY,CAAC,wBAAwB,CAAC,CAAC;IAGvC,wBAAwB,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAGvD,YAAY,CAAC,wBAAwB,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IAErD,OAAO,wBAAwB,CAAC;AAClC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAC;AACnF,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AASrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAgD9C,MAAM,UAAU,gBAAgB,CAC9B,qBAAmD;;IAEnD,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,IAAI,EAAE,GAAG,qBAAqB,CAAC;IACrE,MAAM,MAAM,GAAG,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,mCAAI,KAAK,CAAC;IAC9C,MAAM,wBAAwB,GAA4B;QACxD,SAAS,EAAE,EAAE;QACb,IAAI,EAAE,EAAE;QACR,OAAO,EAAE,EAAE;QACX,SAAS,EAAE,CAAC,iBAAiB,CAAC;QAC9B,eAAe,EAAE,EAAE;QACnB,aAAa,EAAE,EAAE;QACjB,MAAM;QACN,UAAU,EAAE,EAAE;QACd,QAAQ,EAAE,EAAE;QACZ,KAAK,EAAE,EAAE;QACT,SAAS,EAAE,EAAE;QACb,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,iBAAiB,CAAC,wBAAwB,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;IAKvE,MAAM,eAAe,GAAoB;QACvC,aAAa,EAAE,EAAE;QACjB,SAAS,EAAE,EAAE;QACb,KAAK,EAAE,EAAE;QACT,SAAS,EAAE,EAAE;KACd,CAAC;IAEF,mBAAmB,CAAC,wBAAwB,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC;IAE9E,mBAAmB,CAAC,wBAAwB,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC;IAE9E,qBAAqB,CAAC,wBAAwB,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;IAGzE,uBAAuB,CAAC,wBAAwB,CAAC,CAAC;IAGlD,IAAI,MAAM,IAAI,wBAAwB,CAAC,OAAO,EAAE,CAAC;QAC/C,OAAO,CAAC,cAAc,CAAC,wBAAwB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC1E,CAAC;IAGD,wBAAwB,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;IAG3D,YAAY,CAAC,wBAAwB,CAAC,CAAC;IAGvC,wBAAwB,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAGvD,YAAY,CAAC,wBAAwB,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IAErD,OAAO,wBAAwB,CAAC;AAClC,CAAC"}
@@ -2,14 +2,16 @@ import { deepEqual } from "../../../../utils/deepEqual";
2
2
  import { deepProxy, getOriginalValue } from "./data-tracer";
3
3
  import { removeSubDependences } from "./dependencesOptimize";
4
4
  export function computedUpdater() {
5
- if (this.data.__notUpdateComputed__)
6
- return;
7
5
  for (const key in this.data.__computedCache__) {
8
6
  const itemCache = this.data.__computedCache__[key];
9
7
  let changed = false;
10
- for (const dep of itemCache.dependences) {
8
+ outLook: for (const dep of itemCache.dependences) {
11
9
  let curdepVal = this.data;
12
10
  for (const path of dep.paths) {
11
+ if (curdepVal === null) {
12
+ changed = true;
13
+ break outLook;
14
+ }
13
15
  curdepVal = curdepVal[path];
14
16
  }
15
17
  if (!deepEqual(curdepVal, dep.val)) {
@@ -19,7 +21,18 @@ export function computedUpdater() {
19
21
  }
20
22
  if (changed) {
21
23
  const newDependences = [];
22
- const newValue = itemCache.method.call({ data: deepProxy(this.data, newDependences) });
24
+ const proxyThis = new Proxy(this, {
25
+ get(target, prop, receiver) {
26
+ if (prop === "data") {
27
+ return deepProxy(target.data, newDependences);
28
+ }
29
+ return Reflect.get(target, prop, receiver);
30
+ },
31
+ set() {
32
+ throw "不可以在计算属性中修改实例的属性";
33
+ },
34
+ });
35
+ const newValue = itemCache.method.call(proxyThis);
23
36
  this.setData({
24
37
  [key]: getOriginalValue(newValue),
25
38
  });
@@ -1 +1 @@
1
- {"version":3,"file":"computedUpdater.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/initComputed/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;AAG7D,MAAM,UAAU,eAAe;IAC7B,IAAI,IAAI,CAAC,IAAI,CAAC,qBAAqB;QAAE,OAAO;IAC5C,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,IAAI,SAAS,GAAY,IAAI,CAAC,IAAI,CAAC;YACnC,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;gBAM7B,SAAS,GAAI,SAAqC,CAAC,IAAI,CAAC,CAAC;YAC3D,CAAC;YAED,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBACnC,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;YAEvF,IAAI,CAAC,OAAO,CAAC;gBACX,CAAC,GAAG,CAAC,EAAE,gBAAgB,CAAC,QAAQ,CAAC;aAClC,CAAC,CAAC;YAEH,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,WAAW,GAAG,oBAAoB,CAAC,cAAc,CAAC,CAAC;YAEpF,OAAO,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"computedUpdater.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/initComputed/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;AAG7D,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,OAAO,EAAE,KAAK,MAAM,GAAG,IAAI,SAAS,CAAC,WAAW,EAAE,CAAC;YACjD,IAAI,SAAS,GAAY,IAAI,CAAC,IAAI,CAAC;YACnC,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;gBAE7B,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;oBACvB,OAAO,GAAG,IAAI,CAAC;oBACf,MAAM,OAAO,CAAC;gBAChB,CAAC;gBACD,SAAS,GAAI,SAAqC,CAAC,IAAI,CAAC,CAAC;YAC3D,CAAC;YAED,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBACnC,OAAO,GAAG,IAAI,CAAC;gBACf,MAAM;YACR,CAAC;QACH,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,cAAc,GAAyB,EAAE,CAAC;YAChD,MAAM,SAAS,GAAG,IAAI,KAAK,CAAC,IAAI,EAAE;gBAChC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ;oBACxB,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;wBACpB,OAAO,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;oBAChD,CAAC;oBACD,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;gBAC7C,CAAC;gBACD,GAAG;oBACD,MAAM,kBAAkB,CAAC;gBAC3B,CAAC;aACF,CAAC,CAAC;YACH,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAElD,IAAI,CAAC,OAAO,CAAC;gBACX,CAAC,GAAG,CAAC,EAAE,gBAAgB,CAAC,QAAQ,CAAC;aAClC,CAAC,CAAC;YAEH,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,WAAW,GAAG,oBAAoB,CAAC,cAAc,CAAC,CAAC;YAEpF,OAAO,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;AACH,CAAC"}
@@ -23,9 +23,19 @@ export function _initComputedAndGetCache(computedConfig, uninitedkeys, computedC
23
23
  throw "不可以在计算属性中修改实例的属性";
24
24
  },
25
25
  });
26
- let initValue = computedFunc.call(proxyThis);
26
+ let initValue;
27
+ let errMsg;
28
+ try {
29
+ initValue = computedFunc.call(proxyThis);
30
+ }
31
+ catch (e) {
32
+ errMsg = e;
33
+ }
27
34
  uninitedkeys = uninitedkeys.filter(ele => ele !== key);
28
35
  if (isValidDependences(dependences, uninitedkeys)) {
36
+ if (errMsg) {
37
+ throw errMsg;
38
+ }
29
39
  initValue = getOriginalValue(initValue);
30
40
  this.setData({
31
41
  [key]: initValue,
@@ -1 +1 @@
1
- {"version":3,"file":"initComputedAndGetCache.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/initComputed/initComputedAndGetCache.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAgB7D,SAAS,kBAAkB,CAAC,WAAiC,EAAE,YAAsB;IACnF,KAAK,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,WAAW,EAAE,CAAC;QAC/C,IAAI,CAAC,GAAG,KAAK,SAAS,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1D,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAGD,OAAO,IAAI,CAAC;AACd,CAAC;AACD,MAAM,UAAU,wBAAwB,CAEtC,cAAoC,EACpC,YAAsB,EACtB,aAA4B;IAE5B,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;QAC/B,MAAM,YAAY,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;QACzC,MAAM,WAAW,GAAyB,EAAE,CAAC;QAC7C,MAAM,SAAS,GAAG,IAAI,KAAK,CAAC,IAAI,EAAE;YAChC,GAAG,CAAC,MAAM,EAAE,IAAY,EAAE,QAAQ;gBAChC,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;oBACpB,OAAO,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;gBAC7C,CAAC;gBACD,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC7C,CAAC;YACD,GAAG;gBACD,MAAM,kBAAkB,CAAC;YAC3B,CAAC;SACF,CAAC,CAAC;QAEH,IAAI,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAG7C,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;QAGvD,IAAI,kBAAkB,CAAC,WAAW,EAAE,YAAY,CAAC,EAAE,CAAC;YAClD,SAAS,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;YAExC,IAAI,CAAC,OAAO,CAAC;gBACX,CAAC,GAAG,CAAC,EAAE,SAAS;aACjB,CAAC,CAAC;YACH,aAAa,CAAC,GAAG,CAAC,GAAG;gBACnB,WAAW,EAAE,oBAAoB,CAAC,WAAW,CAAC;gBAC9C,MAAM,EAAE,YAAY;gBACpB,KAAK,EAAE,SAAS;aACjB,CAAC;QACJ,CAAC;aAAM,CAAC;YAEN,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;IAED,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,aAAa,CAAC;IACvB,CAAC;IAGD,OAAO,wBAAwB,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;AAC1F,CAAC;AAOD,MAAM,UAAU,uBAAuB,CAErC,cAAoC;IAEpC,OAAO,wBAAwB,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,CAAC;AAC9F,CAAC"}
1
+ {"version":3,"file":"initComputedAndGetCache.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/initComputed/initComputedAndGetCache.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAgB7D,SAAS,kBAAkB,CAAC,WAAiC,EAAE,YAAsB;IACnF,KAAK,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,WAAW,EAAE,CAAC;QAC/C,IAAI,CAAC,GAAG,KAAK,SAAS,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1D,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAGD,OAAO,IAAI,CAAC;AACd,CAAC;AACD,MAAM,UAAU,wBAAwB,CAEtC,cAAoC,EACpC,YAAsB,EACtB,aAA4B;IAE5B,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;QAC/B,MAAM,YAAY,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;QACzC,MAAM,WAAW,GAAyB,EAAE,CAAC;QAC7C,MAAM,SAAS,GAAG,IAAI,KAAK,CAAC,IAAI,EAAE;YAChC,GAAG,CAAC,MAAM,EAAE,IAAY,EAAE,QAAQ;gBAChC,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;oBACpB,OAAO,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;gBAC7C,CAAC;gBACD,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC7C,CAAC;YACD,GAAG;gBACD,MAAM,kBAAkB,CAAC;YAC3B,CAAC;SACF,CAAC,CAAC;QAGH,IAAI,SAAS,CAAC;QACd,IAAI,MAAM,CAAC;QACX,IAAI,CAAC;YACH,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,GAAG,CAAC,CAAC;QACb,CAAC;QAGD,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;QAGvD,IAAI,kBAAkB,CAAC,WAAW,EAAE,YAAY,CAAC,EAAE,CAAC;YAElD,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,MAAM,CAAC;YACf,CAAC;YACD,SAAS,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;YAExC,IAAI,CAAC,OAAO,CAAC;gBACX,CAAC,GAAG,CAAC,EAAE,SAAS;aACjB,CAAC,CAAC;YACH,aAAa,CAAC,GAAG,CAAC,GAAG;gBACnB,WAAW,EAAE,oBAAoB,CAAC,WAAW,CAAC;gBAC9C,MAAM,EAAE,YAAY;gBACpB,KAAK,EAAE,SAAS;aACjB,CAAC;QACJ,CAAC;aAAM,CAAC;YAEN,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;IAED,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,aAAa,CAAC;IACvB,CAAC;IAGD,OAAO,wBAAwB,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;AAC1F,CAAC;AAOD,MAAM,UAAU,uBAAuB,CAErC,cAAoC;IAEpC,OAAO,wBAAwB,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,CAAC;AAC9F,CAAC"}
@@ -1,3 +1,3 @@
1
- import type { RootComponentTrueOptions } from "../../RootComponent";
1
+ import type { RootComponentDefinitionRuntime } from "../../RootComponent/returnType";
2
2
  import type { FinalOptionsOfComponent } from ".";
3
- export declare function otherFieldsHandle(finalOptions: FinalOptionsOfComponent, rootComponentOptions: Omit<RootComponentTrueOptions, "customEvents" | "events">): void;
3
+ export declare function otherFieldsHandle(finalOptions: FinalOptionsOfComponent, rootComponentOptions: Omit<RootComponentDefinitionRuntime, "customEvents" | "events">): void;
@@ -2,7 +2,6 @@ export function otherFieldsHandle(finalOptions, rootComponentOptions) {
2
2
  let key;
3
3
  for (key in rootComponentOptions) {
4
4
  const config = rootComponentOptions[key];
5
- console.log("hry 1", key, config);
6
5
  if (config === undefined)
7
6
  continue;
8
7
  if (key === "behaviors") {
@@ -1 +1 @@
1
- {"version":3,"file":"otherFieldsHandle.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/otherFieldsHandle.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,iBAAiB,CAC/B,YAAqC,EACrC,oBAA+E;IAE/E,IAAI,GAAoE,CAAC;IACzE,KAAK,GAAG,IAAI,oBAAoB,EAAE,CAAC;QACjC,MAAM,MAAM,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;QACzC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QAClC,IAAI,MAAM,KAAK,SAAS;YAAE,SAAS;QACnC,IAAI,GAAG,KAAK,WAAW,EAAE,CAAC;YACxB,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,MAAkB,CAAC,CAAC;QAChD,CAAC;aAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAEtC,YAAY,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YAE5C,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;QAC3C,CAAC;aAAM,IAAI,OAAO,MAAM,KAAK,SAAS,EAAE,CAAC;YACvC,YAAY,CAAC,GAAe,CAAC,GAAG,MAAM,CAAC;QACzC,CAAC;aAAM,CAAC;YAEN,YAAY,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;QAC7B,CAAC;IACH,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"otherFieldsHandle.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/otherFieldsHandle.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,iBAAiB,CAC/B,YAAqC,EACrC,oBAAqF;IAErF,IAAI,GAA0E,CAAC;IAC/E,KAAK,GAAG,IAAI,oBAAoB,EAAE,CAAC;QACjC,MAAM,MAAM,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,MAAM,KAAK,SAAS;YAAE,SAAS;QACnC,IAAI,GAAG,KAAK,WAAW,EAAE,CAAC;YACxB,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,MAAkB,CAAC,CAAC;QAChD,CAAC;aAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAEtC,YAAY,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YAE5C,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;QAC3C,CAAC;aAAM,IAAI,OAAO,MAAM,KAAK,SAAS,EAAE,CAAC;YACvC,YAAY,CAAC,GAAe,CAAC,GAAG,MAAM,CAAC;QACzC,CAAC;aAAM,CAAC;YAEN,YAAY,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;QAC7B,CAAC;IACH,CAAC;AACH,CAAC"}
@@ -1,4 +1,4 @@
1
- import type { CustomComponentTrueOptions } from "../../CustomComponent";
2
- import type { RootComponentTrueOptions } from "../../RootComponent";
1
+ import type { CustomComponentDefinitionRuntime } from "../../CustomComponent/returnType";
2
+ import type { RootComponentDefinitionRuntime } from "../../RootComponent/returnType";
3
3
  import type { SameFuncOptions } from ".";
4
- export declare function sameFuncFieldsCollect(options: CustomComponentTrueOptions | RootComponentTrueOptions, funcOptions: SameFuncOptions): void;
4
+ export declare function sameFuncFieldsCollect(options: CustomComponentDefinitionRuntime | RootComponentDefinitionRuntime, funcOptions: SameFuncOptions): void;
@@ -1 +1 @@
1
- {"version":3,"file":"sameFuncFieldsCollect.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/sameFuncFieldsCollect.ts"],"names":[],"mappings":"AAQA,MAAM,UAAU,qBAAqB,CACnC,OAA8D,EAC9D,WAA4B;;IAE5B,IAAI,GAA0B,CAAC;IAC/B,KAAK,GAAG,IAAI,WAAW,EAAE,CAAC;QACxB,MAAM,gBAAgB,GAAqC,OAAO,CAAC,GAAG,CAAC,CAAC;QACxE,IAAI,gBAAgB,EAAE,CAAC;YACrB,KAAK,MAAM,IAAI,IAAI,gBAAgB,EAAE,CAAC;gBACpC,OAAC,WAAW,CAAC,GAAG,CAAC,EAAC,IAAI,SAAJ,IAAI,IAAM,EAAE,EAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;YAC/D,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"sameFuncFieldsCollect.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/sameFuncFieldsCollect.ts"],"names":[],"mappings":"AASA,MAAM,UAAU,qBAAqB,CACnC,OAA0E,EAC1E,WAA4B;;IAE5B,IAAI,GAA0B,CAAC;IAC/B,KAAK,GAAG,IAAI,WAAW,EAAE,CAAC;QACxB,MAAM,gBAAgB,GAAqC,OAAO,CAAC,GAAG,CAAC,CAAC;QACxE,IAAI,gBAAgB,EAAE,CAAC;YACrB,KAAK,MAAM,IAAI,IAAI,gBAAgB,EAAE,CAAC;gBACpC,OAAC,WAAW,CAAC,GAAG,CAAC,EAAC,IAAI,SAAJ,IAAI,IAAM,EAAE,EAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;YAC/D,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}
@@ -11,6 +11,15 @@ function initWatchOldValue(data, watchConfig, computedKeys) {
11
11
  }
12
12
  return watchOldValue;
13
13
  }
14
+ function observerHandler(key, originObserversHandle, watchHadle, ...newValue) {
15
+ originObserversHandle === null || originObserversHandle === void 0 ? void 0 : originObserversHandle.call(this, ...newValue);
16
+ const watchOldValue = nonNullable(this.data.__watchOldValue__);
17
+ const oldValue = watchOldValue[key];
18
+ if (deepEqual(newValue, oldValue))
19
+ return;
20
+ watchOldValue[key] = deepClone(newValue);
21
+ watchHadle.call(this, ...newValue, ...oldValue);
22
+ }
14
23
  export function watchHandler(finalOptionsForComponent) {
15
24
  const { observers: observersConfig, watch: watchConfig, data, properties, computed: computedConfig } = finalOptionsForComponent;
16
25
  if (!isEmptyObject(watchConfig)) {
@@ -21,15 +30,13 @@ export function watchHandler(finalOptionsForComponent) {
21
30
  const watchHadle = watchConfig[key];
22
31
  const originObserversHandle = observersConfig[key];
23
32
  observersConfig[key] = function (...newValue) {
24
- originObserversHandle === null || originObserversHandle === void 0 ? void 0 : originObserversHandle.call(this, ...newValue);
25
- if (hasComputedPath(key, computedKeys) && !this.data.__computedInited__)
26
- return;
27
- const watchOldValue = nonNullable(this.data.__watchOldValue__);
28
- const oldValue = watchOldValue[key];
29
- if (deepEqual(newValue, oldValue))
30
- return;
31
- watchOldValue[key] = deepClone(newValue);
32
- watchHadle.call(this, ...newValue, ...oldValue);
33
+ var _a;
34
+ if (this.data.__computedInited__) {
35
+ observerHandler.call(this, key, originObserversHandle, watchHadle, ...newValue);
36
+ }
37
+ else {
38
+ ((_a = this.data).__oberverHandler__ || (_a.__oberverHandler__ = [])).push(observerHandler.bind(this, key, originObserversHandle, watchHadle, ...newValue));
39
+ }
33
40
  };
34
41
  }
35
42
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/watchHandler/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAG5F,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,SAAS,iBAAiB,CACxB,IAAqC,EACrC,WAAmB,EACnB,YAAsB;IAEtB,MAAM,aAAa,GAAkB,EAAE,CAAC;IACxC,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;QAE/B,IAAI,eAAe,CAAC,IAAI,EAAE,YAAY,CAAC;YAAE,SAAS;QAClD,aAAa,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AACD,MAAM,UAAU,YAAY,CAC1B,wBAAiD;IAEjD,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,cAAc,EAAE,GAClG,wBAAwB,CAAC;IAC3B,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC;QAChC,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;QAC1D,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACjD,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,iCAAM,IAAI,GAAK,kBAAkB,GAAI,WAAW,EAAE,YAAY,CAAC,CAAC;QAC1G,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;YAC9B,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;YACpC,MAAM,qBAAqB,GAAG,eAAe,CAAC,GAAG,CAAqB,CAAC;YAEvE,eAAe,CAAC,GAAG,CAAC,GAAG,UAAyB,GAAG,QAAmB;gBACpE,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAE,IAAI,CAAC,IAAI,EAAE,GAAG,QAAQ,CAAC,CAAC;gBAE/C,IAAI,eAAe,CAAC,GAAG,EAAE,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB;oBAAE,OAAO;gBAChF,MAAM,aAAa,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;gBAC/D,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;gBACpC,IAAI,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC;oBAAE,OAAO;gBAC1C,aAAa,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;gBACzC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,QAAQ,EAAE,GAAG,QAAQ,CAAC,CAAC;YAClD,CAAC,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/watchHandler/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAG5F,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,SAAS,iBAAiB,CACxB,IAAqC,EACrC,WAAmB,EACnB,YAAsB;IAEtB,MAAM,aAAa,GAAkB,EAAE,CAAC;IACxC,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;QAE/B,IAAI,eAAe,CAAC,IAAI,EAAE,YAAY,CAAC;YAAE,SAAS;QAClD,aAAa,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AACD,SAAS,eAAe,CAEtB,GAAW,EACX,qBAAuC,EACvC,UAAgB,EAChB,GAAG,QAAmB;IAEtB,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAE,IAAI,CAAC,IAAI,EAAE,GAAG,QAAQ,CAAC,CAAC;IAC/C,MAAM,aAAa,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC/D,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;IACpC,IAAI,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC;QAAE,OAAO;IAC1C,aAAa,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;IACzC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,QAAQ,EAAE,GAAG,QAAQ,CAAC,CAAC;AAClD,CAAC;AACD,MAAM,UAAU,YAAY,CAC1B,wBAAiD;IAEjD,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,cAAc,EAAE,GAClG,wBAAwB,CAAC;IAC3B,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC;QAChC,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;QAC1D,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACjD,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,iCAAM,IAAI,GAAK,kBAAkB,GAAI,WAAW,EAAE,YAAY,CAAC,CAAC;QAC1G,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;YAC9B,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;YACpC,MAAM,qBAAqB,GAAG,eAAe,CAAC,GAAG,CAAqB,CAAC;YAEvE,eAAe,CAAC,GAAG,CAAC,GAAG,UAAyB,GAAG,QAAmB;;gBACpE,IAAI,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;oBACjC,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,qBAAqB,EAAE,UAAU,EAAE,GAAG,QAAQ,CAAC,CAAC;gBAClF,CAAC;qBAAM,CAAC;oBACN,OAAC,IAAI,CAAC,IAAI,EAAC,kBAAkB,QAAlB,kBAAkB,GAAK,EAAE,EAAC,CAAC,IAAI,CACxC,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,qBAAqB,EAAE,UAAU,EAAE,GAAG,QAAQ,CAAC,CAChF,CAAC;gBACJ,CAAC;YACH,CAAC,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC"}
@@ -0,0 +1,9 @@
1
+ type PrefixKey = `${string}_${string}`;
2
+ type _ComponentDoc = {
3
+ properties?: Record<PrefixKey, unknown>;
4
+ events?: Record<PrefixKey, unknown>;
5
+ };
6
+ type Error = "{ properties?: Record<PrefixKey, any>; events?: Record<PrefixKey, any>;}";
7
+ type _Validator<O> = keyof O extends keyof _ComponentDoc ? keyof (O["properties"] & O["events"]) extends PrefixKey ? _ComponentDoc : Error : Error;
8
+ export type ComponentDoc<O extends _Validator<O> = _ComponentDoc> = O;
9
+ export {};
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=ComponentDoc.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ComponentDoc.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/returnType/ComponentDoc.ts"],"names":[],"mappings":""}
@@ -0,0 +1,18 @@
1
+ import type { IfExtends } from "hry-types/src/Any/IfExtends";
2
+ import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
3
+ import type { CustomComponentDefinition } from "../../CustomComponent/returnType";
4
+ import type { RootComponentDefinition } from "../../RootComponent/returnType";
5
+ import type { GetCustomEventDocOfSubDoc } from "./GetCustomEventDocOfSubDoc";
6
+ type GetStopKeys<O> = {
7
+ [k in keyof O]: k extends `${string}_${infer Key}_${string}_catch` ? Key : never;
8
+ }[keyof O];
9
+ export type GenerateComponentDoc<TRootDoc extends RootComponentDefinition, TName extends string, TSubComponentTuple extends CustomComponentDefinition[], AllPropertiesDoc extends unknown | object = TRootDoc["properties"], AllEventsDoc extends unknown | object = TRootDoc["customEvents"] & GetCustomEventDocOfSubDoc<TSubComponentTuple[number]>, StopKeys extends string = GetStopKeys<TRootDoc["events"]>, FinalEventsDoc extends object = Omit<AllEventsDoc, StopKeys>> = ComputeIntersection<IfExtends<unknown, AllPropertiesDoc, {}, {
10
+ properties: {
11
+ [k in keyof AllPropertiesDoc as `${TName}_${k & string}`]: AllPropertiesDoc[k];
12
+ };
13
+ }> & IfExtends<{}, FinalEventsDoc, {}, {
14
+ events: {
15
+ [k in keyof FinalEventsDoc as `${TName}_${k & string}`]: FinalEventsDoc[k];
16
+ };
17
+ }>>;
18
+ export {};