annil 1.1.2 → 1.2.0-beta.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 (28) hide show
  1. package/CHANGELOG.md +7 -0
  2. package/dist/api/DefineComponent/collectOptionsForComponent.js +18 -71
  3. package/dist/api/DefineComponent/collectOptionsForComponent.js.map +1 -1
  4. package/dist/api/DefineComponent/index.d.ts +11 -11
  5. package/dist/api/DefineComponent/index.js.map +1 -1
  6. package/dist/api/RootComponent/index.d.ts +5 -6
  7. package/dist/api/RootComponent/index.js.map +1 -1
  8. package/dist/api/SubComponent/SubPageLifetimes/SubPageLifetimesOption.d.ts +1 -1
  9. package/dist/api/SubComponent/index.d.ts +16 -9
  10. package/dist/api/SubComponent/index.js.map +1 -1
  11. package/dist/behaviors/BStore.js.map +1 -1
  12. package/dist/index.d.ts +2 -2
  13. package/dist/index.js +1 -1
  14. package/dist/index.js.map +1 -1
  15. package/dist/utils/InnerMarker.js +1 -1
  16. package/dist/utils/InnerMarker.js.map +1 -1
  17. package/dist/utils/deepClone.js.map +1 -1
  18. package/package.json +1 -1
  19. package/src/api/DefineComponent/collectOptionsForComponent.ts +146 -119
  20. package/src/api/DefineComponent/index.ts +12 -8
  21. package/src/api/RootComponent/PageLifetimes/PageLifetimesOption.ts +2 -2
  22. package/src/api/RootComponent/index.ts +7 -4
  23. package/src/api/SubComponent/SubPageLifetimes/SubPageLifetimesOption.ts +2 -2
  24. package/src/api/SubComponent/index.ts +19 -12
  25. package/src/behaviors/BStore.ts +2 -4
  26. package/src/index.ts +3 -7
  27. package/src/utils/InnerMarker.ts +1 -1
  28. package/src/utils/deepClone.ts +1 -0
package/CHANGELOG.md CHANGED
@@ -4,6 +4,13 @@
4
4
 
5
5
  * 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
6
6
 
7
+ ## [1.2.0-beta.0](https://github.com/missannil/annil/compare/v1.1.2...v1.2.0-beta.0) (2023-12-07)
8
+
9
+
10
+ ### Features
11
+
12
+ * 页面onLoad和组件pageLifetimes.load周期参数使用encodeURI加密和解析 ([8b5cc6e](https://github.com/missannil/annil/commit/8b5cc6ee65abb0def005126c9382a07b8affc0ca))
13
+
7
14
  ## [1.1.2](https://github.com/missannil/annil/compare/v1.1.1...v1.1.2) (2023-12-06)
8
15
 
9
16
 
package/dist/api/DefineComponent/collectOptionsForComponent.js CHANGED
@@ -2,47 +2,26 @@ import { BBeforeCreate } from "../../behaviors/BbeforeCreated";
2
2
  import { BComputedAndWatch } from "../../behaviors/BComputedAndWatch";
3
3
  import { initComputed } from "../../behaviors/BComputedAndWatch/initComputed";
4
4
  import { BStore } from "../../behaviors/BStore";
5
- import { deepClone } from "../../utils/deepClone";
6
5
  import { INNERMARKER } from "../../utils/InnerMarker";
7
6
  import { isEmptyObject } from "../../utils/isEmptyObject";
8
7
  function onLoadReceivedDataHandle(option) {
9
8
  const innerData = option[INNERMARKER.url];
10
9
  if (innerData === undefined)
11
10
  return;
12
- const optionData = JSON.parse(decodeURIComponent(innerData));
13
- for (const key in optionData) {
14
- option[key] = optionData[key];
11
+ const decodeOption = JSON.parse(decodeURIComponent(innerData));
12
+ for (const key in decodeOption) {
13
+ option[key] = decodeOption[key];
15
14
  }
16
- this.setData(option);
17
15
  delete option[INNERMARKER.url];
18
- Reflect.deleteProperty(this.data, INNERMARKER.url);
19
16
  }
20
- function onLoadHijack(options, before, after = []) {
21
- options.methods || (options.methods = {});
22
- const cloneOpt = deepClone(options);
23
- const originalOnLoad = options.methods.onLoad;
24
- options.methods.onLoad = function (props) {
25
- before.forEach((func) => {
26
- func.call(this, props, cloneOpt);
27
- });
28
- originalOnLoad === null || originalOnLoad === void 0 ? void 0 : originalOnLoad.call(this, props);
29
- after.forEach((func) => {
30
- func.call(this, props, cloneOpt);
31
- });
32
- };
33
- }
34
- function attachedHijack(options, before, after = []) {
35
- options.lifetimes || (options.lifetimes = {});
36
- const originalAttached = options.lifetimes.attached;
37
- options.lifetimes.attached = function () {
38
- before.forEach((func) => {
39
- func.call(this, options);
40
- });
41
- originalAttached === null || originalAttached === void 0 ? void 0 : originalAttached.call(this);
42
- after.forEach((func) => {
43
- func.call(this, options);
44
- });
17
+ function hijack(config, field, before = [], after = []) {
18
+ const originalFunc = config[field];
19
+ config[field] = function (...args) {
20
+ before.forEach(func => func.call(this, ...args));
21
+ originalFunc && originalFunc.apply(this, args);
22
+ after.forEach(func => func.call(this, ...args));
45
23
  };
24
+ return;
46
25
  }
47
26
  function InternalFieldProtection(config, keys) {
48
27
  if (!config)
@@ -124,40 +103,7 @@ function customEventsHandle(componentOptions, customEventsConfig) {
124
103
  }
125
104
  }
126
105
  }
127
- function triggerCompLoad(props) {
128
- if (!this.__compLoadList__)
129
- return;
130
- this.__compLoadList__.forEach((loadFunc) => {
131
- loadFunc(props);
132
- });
133
- }
134
- function getPageInstance(pageId) {
135
- const pagestack = getCurrentPages();
136
- let pageInstance;
137
- pagestack.some((instance) => {
138
- if (instance.getPageId() === pageId) {
139
- pageInstance = instance;
140
- return true;
141
- }
142
- return false;
143
- });
144
- return pageInstance;
145
- }
146
- function collectLoadLifetimesOfComponent(finalOptionsForComponent) {
147
- var _a;
148
- const loadFunc = (_a = finalOptionsForComponent.pageLifetimes) === null || _a === void 0 ? void 0 : _a.load;
149
- console.log(loadFunc, finalOptionsForComponent);
150
- if (!loadFunc)
151
- return;
152
- const pageInstance = getPageInstance(this.getPageId());
153
- const __compLoadList__ = (pageInstance.__compLoadList__ || (pageInstance.__compLoadList__ = []));
154
- __compLoadList__.push(loadFunc.bind(this));
155
- }
156
106
  function collectRootComponentOption(finalOptions, funcOptions, rootComponentOptions) {
157
- console.log("-------------------------");
158
- InternalFieldProtection(rootComponentOptions.customEvents, ["load"]);
159
- InternalFieldProtection(rootComponentOptions.methods, ["load"]);
160
- InternalFieldProtection(rootComponentOptions.events, ["load"]);
161
107
  rootComponentOptions.customEvents && customEventsHandle(finalOptions, rootComponentOptions.customEvents);
162
108
  delete rootComponentOptions.customEvents;
163
109
  rootComponentOptions.events && eventsHandle(finalOptions, rootComponentOptions.events);
@@ -166,8 +112,10 @@ function collectRootComponentOption(finalOptions, funcOptions, rootComponentOpti
166
112
  otherFieldsHandle(finalOptions, rootComponentOptions);
167
113
  }
168
114
  export function collectOptionsForComponent(rootComponentOption, subComponentsList) {
115
+ var _a, _b;
169
116
  const finalOptionsForComponent = {
170
117
  options: {
118
+ addGlobalClass: true,
171
119
  multipleSlots: true,
172
120
  pureDataPattern: /^_/,
173
121
  virtualHost: true,
@@ -185,17 +133,16 @@ export function collectOptionsForComponent(rootComponentOption, subComponentsLis
185
133
  if (subComponentsList && !isEmptyObject(subComponentsList)) {
186
134
  subComponentsHandle(finalOptionsForComponent, subComponentsList, funcOptions);
187
135
  }
188
- if (!isEmptyObject(funcOptions)) {
189
- funcConfigHandle(finalOptionsForComponent, rootComponentOption === null || rootComponentOption === void 0 ? void 0 : rootComponentOption.isPage, funcOptions);
190
- }
136
+ funcConfigHandle(finalOptionsForComponent, rootComponentOption === null || rootComponentOption === void 0 ? void 0 : rootComponentOption.isPage, funcOptions);
191
137
  finalOptionsForComponent.methods && InternalFieldProtection(finalOptionsForComponent.methods, ["disposer"]);
192
- finalOptionsForComponent.behaviors.push(BBeforeCreate);
193
- console.log(finalOptionsForComponent, 999, funcOptions);
194
- attachedHijack(finalOptionsForComponent, [collectLoadLifetimesOfComponent], []);
195
- onLoadHijack(finalOptionsForComponent, [onLoadReceivedDataHandle, initComputed], [triggerCompLoad]);
138
+ ((_a = finalOptionsForComponent.methods) === null || _a === void 0 ? void 0 : _a.onLoad)
139
+ && hijack(finalOptionsForComponent.methods, "onLoad", [onLoadReceivedDataHandle, initComputed], []);
140
+ ((_b = finalOptionsForComponent.pageLifetimes) === null || _b === void 0 ? void 0 : _b.load)
141
+ && hijack(finalOptionsForComponent.pageLifetimes, "load", [onLoadReceivedDataHandle], []);
196
142
  if (finalOptionsForComponent.isPage) {
197
143
  Reflect.deleteProperty(finalOptionsForComponent.options, "virtualHost");
198
144
  }
145
+ finalOptionsForComponent.behaviors.push(BBeforeCreate);
199
146
  return finalOptionsForComponent;
200
147
  }
201
148
  //# sourceMappingURL=collectOptionsForComponent.js.map
package/dist/api/DefineComponent/collectOptionsForComponent.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"collectOptionsForComponent.js","sourceRoot":"","sources":["../../../src/api/DefineComponent/collectOptionsForComponent.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"collectOptionsForComponent.js","sourceRoot":"","sources":["../../../src/api/DefineComponent/collectOptionsForComponent.ts"],"names":[],"mappings":"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"}
package/dist/api/DefineComponent/index.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import type { IfExtends } from "hry-types/src/Any/IfExtends";
2
2
  import type { Func } from "hry-types/src/Misc/Func";
3
- import type { WMComponent, WMCompPageLifetimes, WMPageLifetimes } from "../../types/OfficialTypeAlias";
3
+ import type { WMComponent } from "../../types/OfficialTypeAlias";
4
4
  import type { LifetimesConstraint } from "../RootComponent/Lifetimes/LifetimesConstraint";
5
5
  import type { RootComponentDoc } from "../RootComponent/RootComponentDoc";
6
6
  import type { SubComponentDoc } from "../SubComponent/SubComponentDoc";
@@ -9,6 +9,11 @@ import type { CreateComponentDoc } from "./ReturnType/CreateComponentDoc";
9
9
  import type { CreatePageDoc } from "./ReturnType/CreatePageDoc";
10
10
  import type { RootComponentOption } from "./RootComponent/RootComponentOption";
11
11
  import type { SubComponentsOption } from "./SubComponents/SubComponentsOption";
12
+ import type { ComputedConstraint } from "../RootComponent/Computed/ComputedConstraint";
13
+ import type { DataConstraint } from "../RootComponent/Data/DataConstraint";
14
+ import type { MethodsConstraint } from "../RootComponent/Methods/MethodsConstraint";
15
+ import type { PageLifetimesOption } from "../RootComponent/PageLifetimes/PageLifetimesOption";
16
+ import type { StoreConstraint } from "../RootComponent/Store/StoreConstraint";
12
17
  type Path = `/${string}`;
13
18
  type RootOptions<TRootComponentDoc extends RootComponentDoc, TSubComponentTuple extends SubComponentDoc[], TName extends string, TPath extends Path> = NameOrPathOption<TName, TPath, TRootComponentDoc["isPage"] & {}> & RootComponentOption<TRootComponentDoc> & SubComponentsOption<TSubComponentTuple>;
14
19
  interface DefineComponentConstructor {
@@ -19,19 +24,14 @@ export type FinalOptionsOfComponent = {
19
24
  isPage?: boolean;
20
25
  options?: WMComponent.Options;
21
26
  properties?: Record<string, any>;
22
- data?: object;
23
- store?: object;
24
- computed?: Record<string, Func>;
27
+ data?: DataConstraint;
28
+ store?: StoreConstraint;
29
+ computed?: ComputedConstraint;
25
30
  observers?: Record<string, Func>;
26
31
  behaviors?: string[];
27
- methods?: Record<string, Func> & {
28
- __storeConfig__?: Func;
29
- };
32
+ methods?: MethodsConstraint;
30
33
  watch?: Record<string, Func>;
31
34
  lifetimes?: LifetimesConstraint;
32
- pageLifetimes?: Partial<WMCompPageLifetimes & {
33
- load: (prop: unknown) => void;
34
- } & WMPageLifetimes>;
35
- };
35
+ } & PageLifetimesOption<false, object>;
36
36
  export declare const DefineComponent: DefineComponentConstructor;
37
37
  export {};
package/dist/api/DefineComponent/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/DefineComponent/index.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAyD1E,MAAM,CAAC,MAAM,eAAe,GAA+B,UAAS,OAAO;IACzE,SAAS,CACP,0BAA0B,CAAC,OAAO,CAAC,aAAqD,EAAE,OAAO,CAAC,aAAa,CAAC,CACjH,CAAC;AACJ,CAAC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/DefineComponent/index.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAwD1E,MAAM,CAAC,MAAM,eAAe,GAA+B,UAAS,OAAO;IACzE,SAAS,CACP,0BAA0B,CAAC,OAAO,CAAC,aAAyC,EAAE,OAAO,CAAC,aAAa,CAAC,CACrG,CAAC;AACJ,CAAC,CAAC"}
package/dist/api/RootComponent/index.d.ts CHANGED
@@ -1,10 +1,9 @@
1
1
  import type { IfExtends } from "hry-types/src/Any/IfExtends";
2
- import type { NoInfer } from "hry-types/src/Generic/NoInfer";
3
2
  import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
4
3
  import type { Func } from "hry-types/src/Misc/Func";
5
4
  import type { ComputeIntersection } from "hry-types/src/Object/_api";
6
5
  import type { ComputeObject } from "../../types/ComputeObj";
7
- import type { WMCompOtherOption, WMCompPageLifetimes, WMPageLifetimes } from "../../types/OfficialTypeAlias";
6
+ import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
8
7
  import type { ComponentDoc } from "../DefineComponent/ReturnType/ComponentDoc";
9
8
  import type { ComputedConstraint } from "./Computed/ComputedConstraint";
10
9
  import type { ComputedOption } from "./Computed/ComputedOption";
@@ -30,7 +29,7 @@ import type { GetStoreDoc } from "./Store/GeTStoreDoc";
30
29
  import type { StoreConstraint } from "./Store/StoreConstraint";
31
30
  import type { StoreOption } from "./Store/StoreOption";
32
31
  import type { WatchOption } from "./Watch/WatchOption";
33
- 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, NoInfer<PropertiesDoc>> & LifetimesOption<TIsPage> & WatchOption<ComputedDoc & Required<PropertiesDoc> & DataDoc & StoreDoc> & Partial<Omit<WMCompOtherOption, "pageLifetimes">> & ThisType<RootComponentInstance<TIsPage, TMethods, DataDoc, DataDoc & Required<PropertiesDoc> & StoreDoc & ComputedDoc, CustomEventsDoc, StoreDoc>>;
32
+ 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<TIsPage> & WatchOption<ComputedDoc & Required<PropertiesDoc> & DataDoc & StoreDoc> & Partial<Omit<WMCompOtherOption, "pageLifetimes">> & ThisType<RootComponentInstance<TIsPage, TMethods, DataDoc, DataDoc & Required<PropertiesDoc> & StoreDoc & ComputedDoc, CustomEventsDoc, StoreDoc>>;
34
33
  type RootComponentConstructor<TComponentDocList extends ComponentDoc[]> = {
35
34
  <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, {}, {
36
35
  isPage: true;
@@ -57,13 +56,13 @@ export type RootComponentTrueOptions = {
57
56
  data?: DataConstraint;
58
57
  computed?: ComputedConstraint;
59
58
  customEvents?: CustomEventConstraint;
59
+ observers?: Record<string, Func>;
60
60
  methods?: MethodsConstraint;
61
+ behaviors?: string[];
61
62
  events?: EventsConstraint;
62
63
  store?: StoreConstraint;
63
64
  watch?: Record<string, Func>;
64
65
  lifetimes?: LifetimesConstraint;
65
- pageLifetimes?: Partial<WMCompPageLifetimes & {
66
- load: Func;
67
- } & WMPageLifetimes>;
66
+ pageLifetimes?: PageLifetimesOption<false, object>["pageLifetimes"] | PageLifetimesOption<true, object>["pageLifetimes"];
68
67
  };
69
68
  export {};
package/dist/api/RootComponent/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/RootComponent/index.ts"],"names":[],"mappings":"AA6HA,MAAM,UAAU,aAAa;IAM3B,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAmC,CAAQ,CAAC;AACxE,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/RootComponent/index.ts"],"names":[],"mappings":"AA4HA,MAAM,UAAU,aAAa;IAM3B,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAmC,CAAQ,CAAC;AACxE,CAAC"}
package/dist/api/SubComponent/SubPageLifetimes/SubPageLifetimesOption.d.ts CHANGED
@@ -1,2 +1,2 @@
1
1
  import type { PageLifetimesOption } from "../../RootComponent/PageLifetimes/PageLifetimesOption";
2
- export type SubPageLifetimesOption<TIsPage extends boolean, AllPropertiesDoc extends object> = PageLifetimesOption<TIsPage, AllPropertiesDoc>;
2
+ export type SubPageLifetimesOption<TIsPage extends boolean, PropertiesDoc extends object> = PageLifetimesOption<TIsPage, PropertiesDoc>;
package/dist/api/SubComponent/index.d.ts CHANGED
@@ -5,8 +5,15 @@ import type { GetComponentPrefix } from "../../types/GetComponentPrefix";
5
5
  import type { ReplacePrefix } from "../../types/ReplacePrefix";
6
6
  import type { ComponentDoc } from "../DefineComponent/ReturnType/ComponentDoc";
7
7
  import type { Func } from "hry-types/src/Misc/Func";
8
- import type { WMCompLifetimes, WMCompOtherOption, WMCompPageLifetimes, WMPageLifetimes } from "../../types/OfficialTypeAlias";
8
+ import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
9
+ import type { ComputedConstraint } from "../RootComponent/Computed/ComputedConstraint";
10
+ import type { DataConstraint } from "../RootComponent/Data/DataConstraint";
11
+ import type { EventsConstraint } from "../RootComponent/Events/EventsConstraint";
12
+ import type { LifetimesConstraint } from "../RootComponent/Lifetimes/LifetimesConstraint";
13
+ import type { MethodsConstraint } from "../RootComponent/Methods/MethodsConstraint";
14
+ import type { PageLifetimesOption } from "../RootComponent/PageLifetimes/PageLifetimesOption";
9
15
  import type { RootComponentDoc } from "../RootComponent/RootComponentDoc";
16
+ import type { StoreConstraint } from "../RootComponent/Store/StoreConstraint";
10
17
  import type { GetSubComputedDoc } from "./SubComputed/GetSubComputedDoc";
11
18
  import type { SubComputedConstraint } from "./SubComputed/SubComputedConstraint";
12
19
  import type { SubComputedOption } from "./SubComputed/SubComputedOption";
@@ -34,14 +41,14 @@ type SubComponentConstructor<TRootDoc extends RootComponentDoc, TOriginalCompDoc
34
41
  export declare function SubComponent<RootDoc extends RootComponentDoc, CompDoc extends ComponentDoc, Prefix extends string = "">(): IfExtends<EmptyObject, CompDoc, (opt: EmptyObject) => never, SubComponentConstructor<RootDoc, CompDoc, Prefix>>;
35
42
  export type SubComponentTrueOptions = {
36
43
  inhrit?: string;
37
- data?: Record<string, unknown>;
38
- computed?: Record<string, Func>;
39
- events?: Record<string, Func>;
40
- methods?: Record<string, Func>;
44
+ data?: DataConstraint;
45
+ computed?: ComputedConstraint;
46
+ store?: StoreConstraint;
47
+ events?: EventsConstraint;
48
+ methods?: MethodsConstraint;
49
+ observers?: Record<string, Func>;
41
50
  watch?: Record<string, Func>;
42
- lifetimes?: WMCompLifetimes["lifetimes"];
43
- pageLifetimes?: Partial<WMCompPageLifetimes & {
44
- load: Func;
45
- } & WMPageLifetimes>;
51
+ lifetimes?: LifetimesConstraint;
52
+ pageLifetimes?: PageLifetimesOption<false, object>["pageLifetimes"] | PageLifetimesOption<true, object>["pageLifetimes"];
46
53
  };
47
54
  export {};
package/dist/api/SubComponent/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/SubComponent/index.ts"],"names":[],"mappings":"AAsMA,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":"AAwMA,MAAM,UAAU,YAAY;IAK1B,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAkC,CAAQ,CAAC;AACvE,CAAC"}
package/dist/behaviors/BStore.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"BStore.js","sourceRoot":"","sources":["../../src/behaviors/BStore.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAG7D,MAAM,CAAC,MAAM,MAAM,GAAG,QAAQ,CAAC;IAC7B,gBAAgB,CAAC,OAAgC;QAE/C,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC;QAClC,IAAI,CAAC,WAAW;YAAE,OAAO;QACzB,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAgB,CAAC;QAChD,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;YAC9B,OAAO,CAAC,IAAI,KAAZ,OAAO,CAAC,IAAI,GAAK,EAAE,EAAC;YAEpB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAI7C,OAAO,CAAC,OAAO,KAAf,OAAO,CAAC,OAAO,GAAK,EAAE,EAAC;YAEvB,OAAO,CAAC,OAAO,CAAC,eAAe,GAAG,GAAG,EAAE,CAAC,WAAW,CAAC;YAEpD,OAAO,OAAO,CAAC,KAAK,CAAC;QACvB,CAAC;IACH,CAAC;IAED,SAAS,EAAE;QACT,OAAO;;YAEL,MAAM,WAAW,GAAG,MAAA,IAAI,CAAC,eAAe,oDAAI,CAAC;YAC7C,IAAI,CAAC,WAAW;gBAAE,OAAO;YACzB,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAgB,CAAC;YAEpE,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;YAEnB,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;gBAE9B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAC3B,WAAW,CAAC,GAAG,CAAC,EAChB,CAAC,KAAc,EAAE,EAAE;oBAEjB,IAAI,CAAC,OAAO,CAAC;wBACX,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC;qBACnB,CAAC,CAAC;gBACL,CAAC,EACD;oBACE,MAAM,EAAE,QAAQ,CAAC,UAAU;iBAC5B,CACF,CAAC;YACJ,CAAC;YACD,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAC5C,CAAC;QACD,QAAQ;YAGN,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAChC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,CAAC;QACH,CAAC;KACF;CACF,CAAC,CAAC"}
1
+ {"version":3,"file":"BStore.js","sourceRoot":"","sources":["../../src/behaviors/BStore.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAG7D,MAAM,CAAC,MAAM,MAAM,GAAG,QAAQ,CAAC;IAC7B,gBAAgB,CAAC,OAAgC;QAE/C,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC;QAClC,IAAI,CAAC,WAAW;YAAE,OAAO;QACzB,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAgB,CAAC;QAChD,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;YAC9B,OAAO,CAAC,IAAI,KAAZ,OAAO,CAAC,IAAI,GAAK,EAAE,EAAC;YAEpB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAG7C,OAAO,CAAC,OAAO,KAAf,OAAO,CAAC,OAAO,GAAK,EAAE,EAAC;YAEvB,OAAO,CAAC,OAAO,CAAC,eAAe,GAAG,GAAG,EAAE,CAAC,WAAW,CAAC;YAEpD,OAAO,OAAO,CAAC,KAAK,CAAC;QACvB,CAAC;IACH,CAAC;IACD,SAAS,EAAE;QACT,OAAO;;YAEL,MAAM,WAAW,GAAG,MAAA,IAAI,CAAC,eAAe,oDAAI,CAAC;YAC7C,IAAI,CAAC,WAAW;gBAAE,OAAO;YACzB,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAgB,CAAC;YAEpE,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;YAEnB,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;gBAE9B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAC3B,WAAW,CAAC,GAAG,CAAC,EAChB,CAAC,KAAc,EAAE,EAAE;oBAEjB,IAAI,CAAC,OAAO,CAAC;wBACX,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC;qBACnB,CAAC,CAAC;gBACL,CAAC,EACD;oBACE,MAAM,EAAE,QAAQ,CAAC,UAAU;iBAC5B,CACF,CAAC;YACJ,CAAC;YACD,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAC5C,CAAC;QAED,QAAQ;YAEN,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAChC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,CAAC;QACH,CAAC;KACF;CACF,CAAC,CAAC"}
package/dist/index.d.ts CHANGED
@@ -1,9 +1,9 @@
1
- import { navigateTo } from "./api/navigateTo";
2
1
  import { DefineComponent } from "./api/DefineComponent";
2
+ import { navigateTo } from "./api/navigateTo";
3
3
  import { RootComponent } from "./api/RootComponent";
4
4
  import { SubComponent } from "./api/SubComponent";
5
- import type { DetailedType } from "./types/DetailedType";
6
5
  import type { ComponentDocExtension } from "./types/ComponentDocExtension";
6
+ import type { DetailedType } from "./types/DetailedType";
7
7
  import type { GenerateDoc } from "./types/GenerateDoc";
8
8
  import type { ParamsEqual } from "./types/TwoParamsEqual";
9
9
  export type { Vant, Wm } from "./thirdLib";
package/dist/index.js CHANGED
@@ -1,5 +1,5 @@
1
- import { navigateTo } from "./api/navigateTo";
2
1
  import { DefineComponent } from "./api/DefineComponent";
2
+ import { navigateTo } from "./api/navigateTo";
3
3
  import { RootComponent } from "./api/RootComponent";
4
4
  import { SubComponent } from "./api/SubComponent";
5
5
  export { DefineComponent, navigateTo, RootComponent, SubComponent, };
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAmBlD,OAAO,EAEL,eAAe,EAGf,UAAU,EAEV,aAAa,EACb,YAAY,GACb,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAiBlD,OAAO,EAEL,eAAe,EAIf,UAAU,EAEV,aAAa,EACb,YAAY,GACb,CAAC"}
package/dist/utils/InnerMarker.js CHANGED
@@ -1,4 +1,4 @@
1
1
  export const INNERMARKER = {
2
- url: "__missannil__",
2
+ url: "__annil__",
3
3
  };
4
4
  //# sourceMappingURL=InnerMarker.js.map
package/dist/utils/InnerMarker.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"InnerMarker.js","sourceRoot":"","sources":["../../src/utils/InnerMarker.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,GAAG,EAAE,eAAsC;CAE5C,CAAC"}
1
+ {"version":3,"file":"InnerMarker.js","sourceRoot":"","sources":["../../src/utils/InnerMarker.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,GAAG,EAAE,WAAkC;CAExC,CAAC"}
package/dist/utils/deepClone.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"deepClone.js","sourceRoot":"","sources":["../../src/utils/deepClone.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,SAAS,CAAI,KAAQ;IACnC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAChD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAM,CAAC;IAEpD,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;IAE3D,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC;YACrD,KAAK,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
1
+ {"version":3,"file":"deepClone.js","sourceRoot":"","sources":["../../src/utils/deepClone.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,SAAS,CAAI,KAAQ;IACnC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAChD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAM,CAAC;IAEpD,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;IAE3D,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC;YACrD,KAAK,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "annil",
3
- "version": "1.1.2",
3
+ "version": "1.2.0-beta.0",
4
4
  "description": "微信小程序(原生开发)插件",
5
5
  "main": "dist/index.js",
6
6
  "types": "src/index.ts",
package/src/api/DefineComponent/collectOptionsForComponent.ts CHANGED
@@ -4,7 +4,6 @@ import { BComputedAndWatch } from "../../behaviors/BComputedAndWatch";
4
4
  import { initComputed } from "../../behaviors/BComputedAndWatch/initComputed";
5
5
  import type { Instance } from "../../behaviors/BComputedAndWatch/types";
6
6
  import { BStore } from "../../behaviors/BStore";
7
- import { deepClone } from "../../utils/deepClone";
8
7
  import { INNERMARKER } from "../../utils/InnerMarker";
9
8
  import { isEmptyObject } from "../../utils/isEmptyObject";
10
9
  import type { RootComponentTrueOptions } from "../RootComponent";
@@ -18,95 +17,128 @@ import type { PageInstance } from "../RootComponent/Instance/RootComponentInstan
18
17
  import type { SubComponentTrueOptions } from "../SubComponent";
19
18
  import type { FinalOptionsOfComponent, FuncOptions } from ".";
20
19
  /**
21
- * 针对通过 navigateTo传过来的数据解析
20
+ * 针对通过 navigateTo传过来的数据对页面onLoad周期传入数据解析
22
21
  * @param option - option中的url是拼接了encodeURIComponent转码的data对象的,key为INNERMARKER.url
23
22
  */
24
- /* istanbul ignore next */
23
+ /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
25
24
  function onLoadReceivedDataHandle(
26
25
  this: PageInstance,
27
26
  option: Record<typeof INNERMARKER.url, string>,
28
27
  ) {
29
28
  const innerData: string | undefined = option[INNERMARKER.url];
30
- // 未使用自定义的navigateTo
29
+ // 未使用navigateTo API
31
30
  if (innerData === undefined) return;
32
- const optionData = JSON.parse(decodeURIComponent(innerData));
31
+ const decodeOption = JSON.parse(decodeURIComponent(innerData));
33
32
 
34
33
  // 使用navigateTo
35
- for (const key in optionData) {
36
- option[key] = optionData[key];
34
+ for (const key in decodeOption) {
35
+ option[key] = decodeOption[key];
37
36
  }
38
-
39
- // setData会触发计算属性 继承属性等 。
40
- this.setData(option as any);
41
-
42
37
  delete option[INNERMARKER.url];
43
38
 
44
- Reflect.deleteProperty(this.data, INNERMARKER.url);
39
+ // 默认生命周期不会把接收的数据setData,为了更方便setData.注: 此时计算属性还未初始化。
40
+ // this.setData(option);
45
41
  }
46
-
47
42
  /**
48
- * onLoad生命周期劫持函数
43
+ * 针对通过 navigateTo传过来的数据对组件load周期传入数据解析
44
+ * @param option - option中的url是拼接了encodeURIComponent转码的data对象的,key为INNERMARKER.url
49
45
  */
50
- /* istanbul ignore next */
51
- function onLoadHijack(
52
- options: FinalOptionsOfComponent,
53
- before: Func[],
54
- after: Func[] = [],
55
- ) {
56
- options.methods ||= {};
57
-
58
- const cloneOpt = deepClone(options);
59
- const originalOnLoad: Func | undefined = options.methods.onLoad;
46
+ /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
47
+ // function loadReceivedDataHandle(
48
+ // this: PageInstance,
49
+ // option: Record<typeof INNERMARKER.url, string>,
50
+ // ) {
51
+ // const innerData: string | undefined = option[INNERMARKER.url];
52
+ // // 未使用自定义的navigateTo
53
+ // if (innerData === undefined) return;
54
+ // const decodeOption = JSON.parse(decodeURIComponent(innerData));
55
+
56
+ // // 使用navigateTo
57
+ // for (const key in decodeOption) {
58
+ // option[key] = decodeOption[key];
59
+ // }
60
+ // delete option[INNERMARKER.url];
61
+ // }
62
+ /**
63
+ * 劫持指定配置字段
64
+ */
65
+ /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
66
+ function hijack(config: object, field: string, before: Func[] = [], after: Func[] = []) {
67
+ const originalFunc: Func | undefined = config[field];
60
68
 
61
- options.methods.onLoad = function(props: unknown) {
62
- before.forEach((func) => {
63
- func.call(this, props, cloneOpt);
64
- });
69
+ config[field] = function(...args: any[]) {
70
+ before.forEach(func => func.call(this, ...args));
65
71
 
66
- originalOnLoad?.call(this, props);
72
+ originalFunc && originalFunc.apply(this, args);
67
73
 
68
- after.forEach((func) => {
69
- func.call(this, props, cloneOpt);
70
- });
74
+ after.forEach(func => func.call(this, ...args));
71
75
  };
76
+
77
+ return;
72
78
  }
79
+
73
80
  /**
74
- * attached生命周期劫持函数
81
+ * onLoad生命周期劫持函数
82
+ */
83
+ /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
84
+ // function onLoadHijack(
85
+ // options: FinalOptionsOfComponent,
86
+ // before: Func[],
87
+ // after: Func[] = [],
88
+ // ) {
89
+ // options.methods ||= {};
90
+
91
+ // const cloneOpt = deepClone(options);
92
+ // const originalOnLoad: Func | undefined = options.methods.onLoad;
93
+
94
+ // options.methods.onLoad = function(props: unknown) {
95
+ // before.forEach((func) => {
96
+ // func.call(this, props, cloneOpt);
97
+ // });
98
+
99
+ // originalOnLoad?.call(this, props);
100
+
101
+ // after.forEach((func) => {
102
+ // func.call(this, props, cloneOpt);
103
+ // });
104
+ // };
105
+ // }
106
+ /**
107
+ * 劫持pageLifetimes中的load字段
75
108
  */
76
109
  /* istanbul ignore next */
77
- function attachedHijack(
78
- options: FinalOptionsOfComponent,
79
- before: Func[],
80
- after: Func[] = [],
81
- ) {
82
- /* istanbul ignore next */
83
- options.lifetimes ||= {};
84
-
85
- const originalAttached: Func | undefined = options.lifetimes.attached;
86
-
87
- options.lifetimes.attached = function() {
88
- before.forEach((func) => {
89
- func.call(this, options);
90
- });
91
-
92
- originalAttached?.call(this);
93
-
94
- /* istanbul ignore next */
95
- after.forEach((func) => {
96
- func.call(this, options);
97
- });
98
- };
99
- }
110
+ // function loadHijack(
111
+ // options: FinalOptionsOfComponent,
112
+ // before: Func[],
113
+ // after: Func[] = [],
114
+ // ) {
115
+ // /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
116
+ // options.lifetimes ||= {};
117
+
118
+ // const originalAttached: Func | undefined = options.lifetimes.attached;
119
+
120
+ // options.lifetimes.attached = function() {
121
+ // before.forEach((func) => {
122
+ // func.call(this, options);
123
+ // });
124
+
125
+ // originalAttached?.call(this);
126
+
127
+ // /* istanbul ignore next */
128
+ // after.forEach((func) => {
129
+ // func.call(this, options);
130
+ // });
131
+ // };
132
+ // }
100
133
  /**
101
134
  * 内部保护字段 即不允许配置的字段名(所有方法下)
102
135
  */
103
136
  // const INNERFIELDS = ["disposer"];
104
137
 
105
138
  /**
106
- * 报错的形式避免输入字段和内部字段冲突
107
- * 保护config下不被配置keys包含的内部预定字段
139
+ * 报错的形式避免输入字段和内部字段冲突,保证config下不包含内部预定字段(列表)
108
140
  */
109
- /* istanbul ignore next */
141
+ /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
110
142
  function InternalFieldProtection(config: object | undefined, keys: string[]) {
111
143
  if (!config) return;
112
144
  const methodsConfigKeys = Object.keys(config);
@@ -126,14 +158,16 @@ function _funcConfigHandle(methodsConfig: object, configList: Record<string, Fun
126
158
  };
127
159
  }
128
160
  }
129
-
161
+ /**
162
+ * 把函数列表配置放入一个配置中循环一次运行
163
+ */
130
164
  function funcConfigHandle(
131
165
  finalOptionsForComponent: FinalOptionsOfComponent,
132
166
  isPage: boolean | undefined,
133
167
  funcOptions: FuncOptions,
134
168
  ) {
135
169
  // 测试框架无法测试page情形
136
- /* istanbul ignore next */
170
+ /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
137
171
  if (isPage) {
138
172
  // 页面时 生命周期方法(即 on 开头的方法),(https://developers.weixin.qq.com/miniprogram/dev/framework/custom-component/component.html)
139
173
  funcOptions.pageLifetimes && _funcConfigHandle(finalOptionsForComponent.methods ||= {}, funcOptions.pageLifetimes);
@@ -165,7 +199,9 @@ function funcFieldsCollect(
165
199
  }
166
200
  }
167
201
 
168
- // 其他字段加入到componentOptions对应字段配置中
202
+ /**
203
+ * 其他字段加入到componentOptions对应字段配置中
204
+ */
169
205
  function otherFieldsHandle(
170
206
  finalOptions: FinalOptionsOfComponent,
171
207
  rootComponentOptions: RootComponentTrueOptions,
@@ -174,7 +210,7 @@ function otherFieldsHandle(
174
210
  const config = rootComponentOptions[key];
175
211
  if (Array.isArray(config)) {
176
212
  // 好像只有behaviors是数组吧.
177
- /* istanbul ignore next */
213
+ /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
178
214
  (finalOptions[key] ||= []).push(...config);
179
215
  } else {
180
216
  Object.assign(finalOptions[key] ||= {}, config);
@@ -182,10 +218,10 @@ function otherFieldsHandle(
182
218
  }
183
219
  }
184
220
  /**
185
- * 把events字段配置变成函数放入到componentOptions.methods中
221
+ * 把events字段放入到componentOptions.methods中
186
222
  */
187
223
  function eventsHandle(componentOptions: FinalOptionsOfComponent, eventsConfig: EventsConstraint) {
188
- /* istanbul ignore next */
224
+ /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
189
225
  componentOptions.methods ||= {};
190
226
 
191
227
  Object.assign(componentOptions.methods, eventsConfig);
@@ -218,7 +254,7 @@ function customEventsHandle(
218
254
  componentOptions: FinalOptionsOfComponent,
219
255
  customEventsConfig: CustomEventConstraint,
220
256
  ) {
221
- /* istanbul ignore next */
257
+ /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
222
258
  componentOptions.methods ||= {};
223
259
 
224
260
  for (const key in customEventsConfig) {
@@ -239,45 +275,45 @@ function customEventsHandle(
239
275
  * 触发各个组件的页面load事件
240
276
  */
241
277
  /* istanbul ignore next */
242
- function triggerCompLoad(this: Instance, props: object) {
243
- if (!this.__compLoadList__) return;
244
- this.__compLoadList__.forEach((loadFunc) => {
245
- loadFunc(props);
246
- });
247
- }
278
+ // function triggerCompLoad(this: Instance, props: object) {
279
+ // if (!this.__compLoadList__) return;
280
+ // this.__compLoadList__.forEach((loadFunc) => {
281
+ // loadFunc(props);
282
+ // });
283
+ // }
248
284
  /* istanbul ignore next */
249
- function getPageInstance(pageId: string): Instance {
250
- const pagestack = getCurrentPages() as unknown as Instance[];
251
- let pageInstance: Instance;
252
- pagestack.some((instance) => {
253
- if (instance.getPageId() === pageId) {
254
- pageInstance = instance;
255
-
256
- return true;
257
- }
258
-
259
- return false;
260
- });
261
-
262
- // @ts-ignore pagestack中一定赋值了
263
- return pageInstance;
264
- }
285
+ // function getPageInstance(pageId: string): Instance {
286
+ // const pagestack = getCurrentPages() as unknown as Instance[];
287
+ // let pageInstance: Instance;
288
+ // pagestack.some((instance) => {
289
+ // if (instance.getPageId() === pageId) {
290
+ // pageInstance = instance;
291
+
292
+ // return true;
293
+ // }
294
+
295
+ // return false;
296
+ // });
297
+
298
+ // // @ts-ignore pagestack中一定赋值了
299
+ // return pageInstance;
300
+ // }
265
301
  /**
266
302
  * 收集组件pageLifetimes下的load周期函数到页面实例的__loadFunList__
267
303
  */
268
304
  /* istanbul ignore next */
269
- function collectLoadLifetimesOfComponent(this: Instance, finalOptionsForComponent: FinalOptionsOfComponent) {
270
- const loadFunc = finalOptionsForComponent.pageLifetimes?.load;
305
+ // function collectLoadLifetimesOfComponent(this: Instance, finalOptionsForComponent: FinalOptionsOfComponent) {
306
+ // const loadFunc = finalOptionsForComponent.pageLifetimes?.load;
271
307
 
272
- console.log(loadFunc, finalOptionsForComponent);
308
+ // console.log(loadFunc, finalOptionsForComponent);
273
309
 
274
- if (!loadFunc) return;
310
+ // if (!loadFunc) return;
275
311
 
276
- const pageInstance = getPageInstance(this.getPageId());
277
- const __compLoadList__: Function[] = (pageInstance.__compLoadList__ ||= []);
312
+ // const pageInstance = getPageInstance(this.getPageId());
313
+ // const __compLoadList__: Function[] = (pageInstance.__compLoadList__ ||= []);
278
314
 
279
- __compLoadList__.push(loadFunc.bind(this));
280
- }
315
+ // __compLoadList__.push(loadFunc.bind(this));
316
+ // }
281
317
  /**
282
318
  * 收集 rootComponentOptions 配置到 finalOptions 和 funcOptions 中
283
319
  * @param finalOptions - 收集配置对象
@@ -289,14 +325,6 @@ function collectRootComponentOption(
289
325
  funcOptions: FuncOptions,
290
326
  rootComponentOptions: RootComponentTrueOptions,
291
327
  ) {
292
- console.log("-------------------------");
293
-
294
- InternalFieldProtection(rootComponentOptions.customEvents, ["load"]);
295
-
296
- InternalFieldProtection(rootComponentOptions.methods, ["load"]);
297
-
298
- InternalFieldProtection(rootComponentOptions.events, ["load"]);
299
-
300
328
  rootComponentOptions.customEvents && customEventsHandle(finalOptions, rootComponentOptions.customEvents);
301
329
 
302
330
  delete rootComponentOptions.customEvents;
@@ -322,7 +350,7 @@ export function collectOptionsForComponent(
322
350
  const finalOptionsForComponent: FinalOptionsOfComponent = {
323
351
  // default options
324
352
  options: {
325
- // addGlobalClass: true,
353
+ addGlobalClass: true, // "styleIsolation": "apply-shared"
326
354
  multipleSlots: true,
327
355
  pureDataPattern: /^_/,
328
356
  virtualHost: true,
@@ -346,28 +374,27 @@ export function collectOptionsForComponent(
346
374
  if (subComponentsList && !isEmptyObject(subComponentsList)) {
347
375
  subComponentsHandle(finalOptionsForComponent, subComponentsList, funcOptions);
348
376
  }
349
- // 框架无法测试页面
350
- /* istanbul ignore next */
351
- if (!isEmptyObject(funcOptions)) {
352
- funcConfigHandle(finalOptionsForComponent, rootComponentOption?.isPage, funcOptions);
353
- }
377
+ // miniprogram-simulate(当前版本 1.6.1) 无法测试页面
378
+ /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
379
+ funcConfigHandle(finalOptionsForComponent, rootComponentOption?.isPage, funcOptions);
354
380
 
355
381
  finalOptionsForComponent.methods && InternalFieldProtection(finalOptionsForComponent.methods, ["disposer"]);
356
382
 
357
- // BBeforeCreate在最后面
358
- finalOptionsForComponent.behaviors!.push(BBeforeCreate);
359
-
360
- console.log(finalOptionsForComponent, 999, funcOptions);
383
+ /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
384
+ finalOptionsForComponent.methods?.onLoad
385
+ && hijack(finalOptionsForComponent.methods, "onLoad", [onLoadReceivedDataHandle, initComputed], []);
361
386
 
362
- attachedHijack(finalOptionsForComponent, [collectLoadLifetimesOfComponent], []);
387
+ /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
388
+ finalOptionsForComponent.pageLifetimes?.load
389
+ && hijack(finalOptionsForComponent.pageLifetimes, "load", [onLoadReceivedDataHandle], []);
363
390
 
364
- onLoadHijack(finalOptionsForComponent, [onLoadReceivedDataHandle, initComputed], [triggerCompLoad]);
365
-
366
- // 框架无法测试页面
367
- /* istanbul ignore next */
391
+ /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
368
392
  if (finalOptionsForComponent.isPage) {
393
+ // 页面时删除预设的虚拟组件字段
369
394
  Reflect.deleteProperty(finalOptionsForComponent.options!, "virtualHost");
370
395
  }
396
+ // BBeforeCreate在最后面,让BeforeCreate生命周期运行在最终建立组件时。
397
+ finalOptionsForComponent.behaviors!.push(BBeforeCreate);
371
398
 
372
399
  return finalOptionsForComponent;
373
400
  }
package/src/api/DefineComponent/index.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import type { IfExtends } from "hry-types/src/Any/IfExtends";
2
2
  import type { Func } from "hry-types/src/Misc/Func";
3
- import type { WMComponent, WMCompPageLifetimes, WMPageLifetimes } from "../../types/OfficialTypeAlias";
3
+ import type { WMComponent } from "../../types/OfficialTypeAlias";
4
4
 
5
5
  import type { LifetimesConstraint } from "../RootComponent/Lifetimes/LifetimesConstraint";
6
6
  import type { RootComponentDoc } from "../RootComponent/RootComponentDoc";
@@ -12,6 +12,11 @@ import type { RootComponentOption } from "./RootComponent/RootComponentOption";
12
12
  import type { SubComponentsOption } from "./SubComponents/SubComponentsOption";
13
13
 
14
14
  import type { RootComponentTrueOptions } from "../RootComponent";
15
+ import type { ComputedConstraint } from "../RootComponent/Computed/ComputedConstraint";
16
+ import type { DataConstraint } from "../RootComponent/Data/DataConstraint";
17
+ import type { MethodsConstraint } from "../RootComponent/Methods/MethodsConstraint";
18
+ import type { PageLifetimesOption } from "../RootComponent/PageLifetimes/PageLifetimesOption";
19
+ import type { StoreConstraint } from "../RootComponent/Store/StoreConstraint";
15
20
  import { collectOptionsForComponent } from "./collectOptionsForComponent";
16
21
 
17
22
  type Path = `/${string}`;
@@ -58,19 +63,18 @@ export type FinalOptionsOfComponent = {
58
63
  isPage?: boolean;
59
64
  options?: WMComponent.Options;
60
65
  properties?: Record<string, any>;
61
- data?: object;
62
- store?: object;
63
- computed?: Record<string, Func>;
66
+ data?: DataConstraint;
67
+ store?: StoreConstraint;
68
+ computed?: ComputedConstraint;
64
69
  observers?: Record<string, Func>;
65
70
  behaviors?: string[];
66
- methods?: Record<string, Func> & { __storeConfig__?: Func };
71
+ methods?: MethodsConstraint;
67
72
  watch?: Record<string, Func>;
68
73
  lifetimes?: LifetimesConstraint;
69
- pageLifetimes?: Partial<WMCompPageLifetimes & { load: (prop: unknown) => void } & WMPageLifetimes>;
70
- };
74
+ } & PageLifetimesOption<false, object>;
71
75
 
72
76
  export const DefineComponent: DefineComponentConstructor = function(options): any {
73
77
  Component(
74
- collectOptionsForComponent(options.rootComponent as RootComponentTrueOptions | undefined, options.subComponents),
78
+ collectOptionsForComponent(options.rootComponent as RootComponentTrueOptions, options.subComponents),
75
79
  );
76
80
  };
package/src/api/RootComponent/PageLifetimes/PageLifetimesOption.ts CHANGED
@@ -14,7 +14,8 @@ export type PageLifetimesOption<TIsPage extends boolean, PropertiesDoc extends o
14
14
  & Partial<WMCompPageLifetimes>
15
15
  & {
16
16
  /**
17
- * 事件发生在页面onLoad事件后,要求组件为同步组件
17
+ * 周期发生在组件attached之后,页面onLoad之前,要求组件为同步组件
18
+ * 最低基础库： `3.0.2`
18
19
  */
19
20
  load?: (props: object) => void | Promise<void>;
20
21
  }
@@ -33,7 +34,6 @@ export type PageLifetimesOption<TIsPage extends boolean, PropertiesDoc extends o
33
34
  * 页面加载时触发。一个页面只会调用一次，可以在 onLoad 的参数中获取Properties定义的数据。
34
35
  */
35
36
  onLoad?: (
36
- // 页面时PropertiesDoc对象字段是格外不加null的
37
37
  props: PropertiesDoc,
38
38
  ) => void | Promise<void>;
39
39
  }
package/src/api/RootComponent/index.ts CHANGED
@@ -1,10 +1,9 @@
1
1
  import type { IfExtends } from "hry-types/src/Any/IfExtends";
2
- import type { NoInfer } from "hry-types/src/Generic/NoInfer";
3
2
  import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
4
3
  import type { Func } from "hry-types/src/Misc/Func";
5
4
  import type { ComputeIntersection } from "hry-types/src/Object/_api";
6
5
  import type { ComputeObject } from "../../types/ComputeObj";
7
- import type { WMCompOtherOption, WMCompPageLifetimes, WMPageLifetimes } from "../../types/OfficialTypeAlias";
6
+ import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
8
7
  import type { ComponentDoc } from "../DefineComponent/ReturnType/ComponentDoc";
9
8
  import type { ComputedConstraint } from "./Computed/ComputedConstraint";
10
9
  import type { ComputedOption } from "./Computed/ComputedOption";
@@ -55,7 +54,7 @@ type RootComponentOptions<
55
54
  & DataOption<TData, keyof PropertiesDoc>
56
55
  & StoreOption<TStore, keyof (PropertiesDoc & DataDoc)>
57
56
  & ComputedOption<TComputed, keyof (PropertiesDoc & DataDoc & StoreDoc)>
58
- & PageLifetimesOption<TIsPage, NoInfer<PropertiesDoc>>
57
+ & PageLifetimesOption<TIsPage, PropertiesDoc>
59
58
  & LifetimesOption<TIsPage>
60
59
  & WatchOption<
61
60
  & ComputedDoc
@@ -138,10 +137,14 @@ export type RootComponentTrueOptions = {
138
137
  data?: DataConstraint;
139
138
  computed?: ComputedConstraint;
140
139
  customEvents?: CustomEventConstraint;
140
+ observers?: Record<string, Func>;
141
141
  methods?: MethodsConstraint;
142
+ behaviors?: string[];
142
143
  events?: EventsConstraint;
143
144
  store?: StoreConstraint;
144
145
  watch?: Record<string, Func>;
145
146
  lifetimes?: LifetimesConstraint;
146
- pageLifetimes?: Partial<WMCompPageLifetimes & { load: Func } & WMPageLifetimes>;
147
+ pageLifetimes?:
148
+ | PageLifetimesOption<false, object>["pageLifetimes"]
149
+ | PageLifetimesOption<true, object>["pageLifetimes"];
147
150
  };
package/src/api/SubComponent/SubPageLifetimes/SubPageLifetimesOption.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import type { PageLifetimesOption } from "../../RootComponent/PageLifetimes/PageLifetimesOption";
2
2
 
3
- export type SubPageLifetimesOption<TIsPage extends boolean, AllPropertiesDoc extends object> = PageLifetimesOption<
3
+ export type SubPageLifetimesOption<TIsPage extends boolean, PropertiesDoc extends object> = PageLifetimesOption<
4
4
  TIsPage,
5
- AllPropertiesDoc
5
+ PropertiesDoc
6
6
  >;
package/src/api/SubComponent/index.ts CHANGED
@@ -6,13 +6,15 @@ import type { ReplacePrefix } from "../../types/ReplacePrefix";
6
6
  import type { ComponentDoc } from "../DefineComponent/ReturnType/ComponentDoc";
7
7
 
8
8
  import type { Func } from "hry-types/src/Misc/Func";
9
- import type {
10
- WMCompLifetimes,
11
- WMCompOtherOption,
12
- WMCompPageLifetimes,
13
- WMPageLifetimes,
14
- } from "../../types/OfficialTypeAlias";
9
+ import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
10
+ import type { ComputedConstraint } from "../RootComponent/Computed/ComputedConstraint";
11
+ import type { DataConstraint } from "../RootComponent/Data/DataConstraint";
12
+ import type { EventsConstraint } from "../RootComponent/Events/EventsConstraint";
13
+ import type { LifetimesConstraint } from "../RootComponent/Lifetimes/LifetimesConstraint";
14
+ import type { MethodsConstraint } from "../RootComponent/Methods/MethodsConstraint";
15
+ import type { PageLifetimesOption } from "../RootComponent/PageLifetimes/PageLifetimesOption";
15
16
  import type { RootComponentDoc } from "../RootComponent/RootComponentDoc";
17
+ import type { StoreConstraint } from "../RootComponent/Store/StoreConstraint";
16
18
  import type { GetSubComputedDoc } from "./SubComputed/GetSubComputedDoc";
17
19
  import type { SubComputedConstraint } from "./SubComputed/SubComputedConstraint";
18
20
  import type { SubComputedOption } from "./SubComputed/SubComputedOption";
@@ -206,11 +208,16 @@ export function SubComponent<
206
208
 
207
209
  export type SubComponentTrueOptions = {
208
210
  inhrit?: string;
209
- data?: Record<string, unknown>;
210
- computed?: Record<string, Func>;
211
- events?: Record<string, Func>;
212
- methods?: Record<string, Func>;
211
+ data?: DataConstraint;
212
+ computed?: ComputedConstraint;
213
+ store?: StoreConstraint;
214
+ events?: EventsConstraint;
215
+ methods?: MethodsConstraint;
216
+ // behaviors?: string[];
217
+ observers?: Record<string, Func>;
213
218
  watch?: Record<string, Func>;
214
- lifetimes?: WMCompLifetimes["lifetimes"];
215
- pageLifetimes?: Partial<WMCompPageLifetimes & { load: Func } & WMPageLifetimes>;
219
+ lifetimes?: LifetimesConstraint;
220
+ pageLifetimes?:
221
+ | PageLifetimesOption<false, object>["pageLifetimes"]
222
+ | PageLifetimesOption<true, object>["pageLifetimes"];
216
223
  };
package/src/behaviors/BStore.ts CHANGED
@@ -15,7 +15,6 @@ export const BStore = Behavior({
15
15
  options.data[key] = toJS(storeConfig[key]());
16
16
 
17
17
  // 把响应式数据配置保留在methods的__storeConfig__字段下带入到组件实例中(不用函数返回方式也可以,但不符合methods字段类型),后续再从原型上删除。
18
- /* istanbul ignore next */
19
18
  options.methods ||= {};
20
19
 
21
20
  options.methods.__storeConfig__ = () => storeConfig;
@@ -23,7 +22,6 @@ export const BStore = Behavior({
23
22
  delete options.store;
24
23
  }
25
24
  },
26
-
27
25
  lifetimes: {
28
26
  created(this: Instance) {
29
27
  // 取出通过addStoreConfigToMethods函数带入的storeConfig
@@ -50,9 +48,9 @@ export const BStore = Behavior({
50
48
  }
51
49
  deleteProtoField(this, "__storeConfig__");
52
50
  },
51
+ /* istanbul ignore next */
53
52
  detached(this: Instance) {
54
- // 清除store数据 test中模拟了测试，所以忽略 框架不支持 issue {@link https://github.com/wechat-miniprogram/miniprogram-simulate/issues/110}
55
- /* istanbul ignore next */
53
+ // 清除store数据 test中模拟了测试，所以忽略 框架(1.6.1)不支持 issue {@link https://github.com/wechat-miniprogram/miniprogram-simulate/issues/110}
56
54
  for (const key in this.disposer) {
57
55
  this.disposer[key]();
58
56
  }
package/src/index.ts CHANGED
@@ -1,14 +1,9 @@
1
- import { navigateTo } from "./api/navigateTo";
2
-
3
1
  import { DefineComponent } from "./api/DefineComponent";
4
-
2
+ import { navigateTo } from "./api/navigateTo";
5
3
  import { RootComponent } from "./api/RootComponent";
6
-
7
4
  import { SubComponent } from "./api/SubComponent";
8
-
9
- import type { DetailedType } from "./types/DetailedType";
10
-
11
5
  import type { ComponentDocExtension } from "./types/ComponentDocExtension";
6
+ import type { DetailedType } from "./types/DetailedType";
12
7
  import type { GenerateDoc } from "./types/GenerateDoc";
13
8
  import type { ParamsEqual } from "./types/TwoParamsEqual";
14
9
  export type { Vant, Wm } from "./thirdLib";
@@ -28,6 +23,7 @@ export {
28
23
  DefineComponent,
29
24
  type DetailedType,
30
25
  type GenerateDoc,
26
+ /* istanbul ignore next */
31
27
  navigateTo,
32
28
  type ParamsEqual,
33
29
  RootComponent,
package/src/utils/InnerMarker.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  export const INNERMARKER = {
2
- url: "__missannil__" satisfies `_${string}`, // url默认传值Data字段 必须是内部字段,因为会加入到实例的data下。
2
+ url: "__annil__" satisfies `_${string}`, // url默认传值Data字段 必须是内部字段,因为会加入到实例的data下。
3
3
  // defUrl: "/xx&xx", // 标记 组件默认的的url类型
4
4
  };
package/src/utils/deepClone.ts CHANGED
@@ -5,6 +5,7 @@ export function deepClone<T>(value: T): T {
5
5
  if (typeof value !== "object" || value === null) {
6
6
  return value;
7
7
  }
8
+ /* istanbul ignore next */
8
9
  const clone = (Array.isArray(value) ? [] : {}) as T;
9
10
 
10
11
  Object.setPrototypeOf(clone, Object.getPrototypeOf(value));