annil 1.1.1 → 1.1.2
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.
- package/CHANGELOG.md +7 -0
- package/dist/api/DefineComponent/collectOptionsForComponent.d.ts +2 -2
- package/dist/api/DefineComponent/collectOptionsForComponent.js +55 -6
- package/dist/api/DefineComponent/collectOptionsForComponent.js.map +1 -1
- package/dist/api/DefineComponent/index.d.ts +2 -2
- package/dist/api/RootComponent/Computed/ComputedOption.d.ts +2 -2
- package/dist/api/RootComponent/Computed/GetComputedDoc.d.ts +2 -2
- package/dist/api/RootComponent/Computed/test/normal.test.js +5 -12
- package/dist/api/RootComponent/Computed/test/normal.test.js.map +1 -1
- package/dist/api/RootComponent/CustomEvents/CustomEventsOption.d.ts +2 -2
- package/dist/api/RootComponent/Data/DataConstraint.d.ts +1 -1
- package/dist/api/RootComponent/Data/DataOption.d.ts +2 -2
- package/dist/api/RootComponent/Data/GetDataDoc.d.ts +1 -4
- package/dist/api/RootComponent/Data/test/GetDataDoc.test.d.ts +3 -2
- package/dist/api/RootComponent/Data/test/GetDataDoc.test.js +5 -5
- package/dist/api/RootComponent/Data/test/GetDataDoc.test.js.map +1 -1
- package/dist/api/RootComponent/Data/test/normal.test.js.map +1 -1
- package/dist/api/RootComponent/Events/EventsConstraint.d.ts +6 -5
- package/dist/api/RootComponent/Events/EventsOption.d.ts +2 -3
- package/dist/api/RootComponent/Events/test/normal.test.js +1 -1
- package/dist/api/RootComponent/Events/test/normal.test.js.map +1 -1
- package/dist/api/RootComponent/Lifetimes/LifetimesConstraint.d.ts +5 -4
- package/dist/api/RootComponent/Lifetimes/test/error.test.js.map +1 -1
- package/dist/api/RootComponent/PageLifetimes/PageLifetimesOption.d.ts +6 -7
- package/dist/api/RootComponent/PageLifetimes/test/error.test.js +3 -1
- package/dist/api/RootComponent/PageLifetimes/test/error.test.js.map +1 -1
- package/dist/api/RootComponent/PageLifetimes/test/normal.test.js +3 -1
- package/dist/api/RootComponent/PageLifetimes/test/normal.test.js.map +1 -1
- package/dist/api/RootComponent/RootComponentDoc.d.ts +17 -3
- package/dist/api/RootComponent/Store/GeTStoreDoc.d.ts +1 -1
- package/dist/api/RootComponent/Store/StoreOption.d.ts +2 -2
- package/dist/api/RootComponent/Store/test/normal.test.js.map +1 -1
- package/dist/api/RootComponent/Watch/test/WatchProperties.test.js +0 -2
- package/dist/api/RootComponent/Watch/test/WatchProperties.test.js.map +1 -1
- package/dist/api/RootComponent/index.d.ts +5 -5
- package/dist/api/RootComponent/index.js.map +1 -1
- package/dist/api/SubComponent/SubData/SubDataConstraint.d.ts +2 -2
- package/dist/api/SubComponent/SubData/test/normal.test.js +0 -15
- package/dist/api/SubComponent/SubData/test/normal.test.js.map +1 -1
- package/dist/api/SubComponent/SubEvents/SubEventsConstraint.d.ts +2 -2
- package/dist/api/SubComponent/SubEvents/SubEventsOptions.d.ts +2 -2
- package/dist/api/SubComponent/SubEvents/test/error.test.js.map +1 -1
- package/dist/api/SubComponent/SubEvents/test/normal.test.js +20 -0
- package/dist/api/SubComponent/SubEvents/test/normal.test.js.map +1 -1
- package/dist/api/SubComponent/SubInherit/SubInheritConstraint.d.ts +3 -2
- package/dist/api/SubComponent/SubInherit/SubInheritOption.d.ts +3 -0
- package/dist/api/SubComponent/SubInherit/SubInheritOption.js +2 -0
- package/dist/api/SubComponent/SubInherit/SubInheritOption.js.map +1 -0
- package/dist/api/SubComponent/SubInherit/test/error.test.js +1 -1
- package/dist/api/SubComponent/SubInherit/test/error.test.js.map +1 -1
- package/dist/api/SubComponent/SubInherit/test/normal.test.js.map +1 -1
- package/dist/api/SubComponent/SubMethods/SubMethodsOption.d.ts +3 -2
- package/dist/api/SubComponent/SubMethods/test/error.test.js +6 -0
- package/dist/api/SubComponent/SubMethods/test/error.test.js.map +1 -1
- package/dist/api/SubComponent/SubMethods/test/normarl.test.js +3 -3
- package/dist/api/SubComponent/SubMethods/test/normarl.test.js.map +1 -1
- package/dist/api/SubComponent/SubPageLifetimes/test/error.test.d.ts +0 -1
- package/dist/api/SubComponent/SubPageLifetimes/test/error.test.js +1 -11
- package/dist/api/SubComponent/SubPageLifetimes/test/error.test.js.map +1 -1
- package/dist/api/SubComponent/SubPageLifetimes/test/normal.test.d.ts +0 -1
- package/dist/api/SubComponent/SubPageLifetimes/test/normal.test.js +1 -25
- package/dist/api/SubComponent/SubPageLifetimes/test/normal.test.js.map +1 -1
- package/dist/api/SubComponent/SubStore/SubDataConstraint.d.ts +2 -2
- package/dist/api/SubComponent/SubStore/SubStoreOption.d.ts +1 -1
- package/dist/api/SubComponent/SubStore/test/error.test.js +2 -0
- package/dist/api/SubComponent/SubStore/test/error.test.js.map +1 -1
- package/dist/api/SubComponent/SubStore/test/normal.test.js +1 -0
- package/dist/api/SubComponent/SubStore/test/normal.test.js.map +1 -1
- package/dist/api/SubComponent/SubWatch/SubWatchOption.d.ts +2 -1
- package/dist/api/SubComponent/SubWatch/test/WatchComputed.test.d.ts +1 -0
- package/dist/api/SubComponent/SubWatch/test/WatchComputed.test.js +44 -1
- package/dist/api/SubComponent/SubWatch/test/WatchComputed.test.js.map +1 -1
- package/dist/api/SubComponent/SubWatch/test/error.test.js +10 -2
- package/dist/api/SubComponent/SubWatch/test/error.test.js.map +1 -1
- package/dist/api/SubComponent/index.d.ts +3 -4
- package/dist/api/SubComponent/index.js.map +1 -1
- package/dist/behaviors/BComputedAndWatch/index.js.map +1 -1
- package/dist/behaviors/BComputedAndWatch/types.d.ts +1 -0
- package/dist/behaviors/BStore.js.map +1 -1
- package/dist/behaviors/BbeforeCreated.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.js.map +1 -1
- package/dist/types/OfficialTypeAlias.d.ts +1 -1
- package/dist/types/RemoveInnerData.d.ts +1 -0
- package/dist/types/RemoveInnerData.js +2 -0
- package/dist/types/RemoveInnerData.js.map +1 -0
- package/package.json +4 -2
- package/src/api/DefineComponent/collectOptionsForComponent.ts +99 -16
- package/src/api/DefineComponent/index.ts +2 -2
- package/src/api/RootComponent/Computed/ComputedOption.ts +23 -3
- package/src/api/RootComponent/Computed/GetComputedDoc.ts +1 -3
- package/src/api/RootComponent/Computed/test/normal.test.ts +9 -19
- package/src/api/RootComponent/CustomEvents/CustomEventsOption.ts +26 -22
- package/src/api/RootComponent/CustomEvents/test/error.test.ts +5 -5
- package/src/api/RootComponent/CustomEvents/test/normal.test.ts +1 -1
- package/src/api/RootComponent/Data/DataConstraint.ts +1 -1
- package/src/api/RootComponent/Data/DataOption.ts +6 -4
- package/src/api/RootComponent/Data/GetDataDoc.ts +1 -18
- package/src/api/RootComponent/Data/test/GetDataDoc.test.ts +14 -25
- package/src/api/RootComponent/Data/test/error.test.ts +2 -2
- package/src/api/RootComponent/Data/test/normal.test.ts +5 -8
- package/src/api/RootComponent/Events/EventsConstraint.ts +24 -19
- package/src/api/RootComponent/Events/EventsOption.ts +54 -6
- package/src/api/RootComponent/Events/test/normal.test.ts +16 -16
- package/src/api/RootComponent/Instance/test/properties/mormal.test.ts +1 -1
- package/src/api/RootComponent/IsPage/IsPageOption.ts +1 -1
- package/src/api/RootComponent/Lifetimes/LifetimesConstraint.ts +11 -8
- package/src/api/RootComponent/Lifetimes/LifetimesOption.ts +26 -0
- package/src/api/RootComponent/Lifetimes/test/error.test.ts +3 -13
- package/src/api/RootComponent/Lifetimes/test/normal.test.ts +1 -1
- package/src/api/RootComponent/Methods/MethodsOption.ts +3 -0
- package/src/api/RootComponent/PageLifetimes/PageLifetimesOption.ts +21 -10
- package/src/api/RootComponent/PageLifetimes/test/error.test.ts +7 -5
- package/src/api/RootComponent/PageLifetimes/test/normal.test.ts +9 -10
- package/src/api/RootComponent/Properties/PropertiesOption.ts +19 -32
- package/src/api/RootComponent/RootComponentDoc.ts +19 -3
- package/src/api/RootComponent/Store/GeTStoreDoc.ts +1 -1
- package/src/api/RootComponent/Store/StoreOption.ts +14 -2
- package/src/api/RootComponent/Store/test/error.test.ts +5 -5
- package/src/api/RootComponent/Store/test/normal.test.ts +1 -0
- package/src/api/RootComponent/Watch/test/WatchProperties.test.ts +1 -12
- package/src/api/RootComponent/index.ts +13 -15
- package/src/api/SubComponent/SubComputed/SubComputedOption.ts +0 -1
- package/src/api/SubComponent/SubData/SubDataConstraint.ts +2 -3
- package/src/api/SubComponent/SubData/SubDataOption.ts +4 -0
- package/src/api/SubComponent/SubData/test/error.test.ts +1 -1
- package/src/api/SubComponent/SubData/test/normal.test.ts +6 -37
- package/src/api/SubComponent/SubEvents/SubEventsConstraint.ts +7 -2
- package/src/api/SubComponent/SubEvents/SubEventsOptions.ts +7 -2
- package/src/api/SubComponent/SubEvents/test/error.test.ts +5 -4
- package/src/api/SubComponent/SubEvents/test/normal.test.ts +31 -4
- package/src/api/SubComponent/SubInherit/SubInheritConstraint.ts +6 -3
- package/src/api/SubComponent/SubInherit/SubInheritOption.ts +8 -0
- package/src/api/SubComponent/SubInherit/test/error.test.ts +9 -7
- package/src/api/SubComponent/SubInherit/test/normal.test.ts +5 -4
- package/src/api/SubComponent/SubMethods/SubMethodsOption.ts +7 -3
- package/src/api/SubComponent/SubMethods/test/error.test.ts +13 -5
- package/src/api/SubComponent/SubMethods/test/normarl.test.ts +6 -12
- package/src/api/SubComponent/SubPageLifetimes/test/error.test.ts +1 -32
- package/src/api/SubComponent/SubPageLifetimes/test/normal.test.ts +1 -74
- package/src/api/SubComponent/SubStore/SubDataConstraint.ts +2 -2
- package/src/api/SubComponent/SubStore/SubStoreOption.ts +15 -1
- package/src/api/SubComponent/SubStore/test/error.test.ts +4 -0
- package/src/api/SubComponent/SubStore/test/normal.test.ts +2 -0
- package/src/api/SubComponent/SubWatch/SubWatchOption.ts +2 -1
- package/src/api/SubComponent/SubWatch/test/WatchComputed.test.ts +75 -43
- package/src/api/SubComponent/SubWatch/test/error.test.ts +12 -3
- package/src/api/SubComponent/index.ts +9 -5
- package/src/behaviors/BComputedAndWatch/index.ts +2 -2
- package/src/behaviors/BComputedAndWatch/types.ts +1 -0
- package/src/behaviors/BStore.ts +2 -2
- package/src/behaviors/BbeforeCreated.ts +2 -2
- package/src/index.ts +9 -1
- package/src/types/OfficialTypeAlias.ts +7 -11
- package/src/types/RemoveInnerData.ts +5 -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.1.2](https://github.com/missannil/annil/compare/v1.1.1...v1.1.2) (2023-12-06)
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
### Bug Fixes
|
|
11
|
+
|
|
12
|
+
* 测试load功能 ([bb3f0fd](https://github.com/missannil/annil/commit/bb3f0fd2315f2429488478047109b07d16686741))
|
|
13
|
+
|
|
7
14
|
## [1.1.1](https://github.com/missannil/annil/compare/v1.1.0...v1.1.1) (2023-12-04)
|
|
8
15
|
|
|
9
16
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { RootComponentTrueOptions } from "../RootComponent";
|
|
2
2
|
import type { SubComponentTrueOptions } from "../SubComponent";
|
|
3
|
-
import type {
|
|
4
|
-
export declare function collectOptionsForComponent(rootComponentOption: RootComponentTrueOptions | undefined, subComponentsList: SubComponentTrueOptions[] | undefined):
|
|
3
|
+
import type { FinalOptionsOfComponent } from ".";
|
|
4
|
+
export declare function collectOptionsForComponent(rootComponentOption: RootComponentTrueOptions | undefined, subComponentsList: SubComponentTrueOptions[] | undefined): FinalOptionsOfComponent;
|
|
@@ -31,10 +31,24 @@ function onLoadHijack(options, before, after = []) {
|
|
|
31
31
|
});
|
|
32
32
|
};
|
|
33
33
|
}
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
const
|
|
37
|
-
|
|
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
|
+
});
|
|
45
|
+
};
|
|
46
|
+
}
|
|
47
|
+
function InternalFieldProtection(config, keys) {
|
|
48
|
+
if (!config)
|
|
49
|
+
return;
|
|
50
|
+
const methodsConfigKeys = Object.keys(config);
|
|
51
|
+
for (const key of keys) {
|
|
38
52
|
if (methodsConfigKeys.includes(key)) {
|
|
39
53
|
throw Error(`${key}已被内部字段占用`);
|
|
40
54
|
}
|
|
@@ -110,7 +124,40 @@ function customEventsHandle(componentOptions, customEventsConfig) {
|
|
|
110
124
|
}
|
|
111
125
|
}
|
|
112
126
|
}
|
|
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
|
+
}
|
|
113
156
|
function collectRootComponentOption(finalOptions, funcOptions, rootComponentOptions) {
|
|
157
|
+
console.log("-------------------------");
|
|
158
|
+
InternalFieldProtection(rootComponentOptions.customEvents, ["load"]);
|
|
159
|
+
InternalFieldProtection(rootComponentOptions.methods, ["load"]);
|
|
160
|
+
InternalFieldProtection(rootComponentOptions.events, ["load"]);
|
|
114
161
|
rootComponentOptions.customEvents && customEventsHandle(finalOptions, rootComponentOptions.customEvents);
|
|
115
162
|
delete rootComponentOptions.customEvents;
|
|
116
163
|
rootComponentOptions.events && eventsHandle(finalOptions, rootComponentOptions.events);
|
|
@@ -141,9 +188,11 @@ export function collectOptionsForComponent(rootComponentOption, subComponentsLis
|
|
|
141
188
|
if (!isEmptyObject(funcOptions)) {
|
|
142
189
|
funcConfigHandle(finalOptionsForComponent, rootComponentOption === null || rootComponentOption === void 0 ? void 0 : rootComponentOption.isPage, funcOptions);
|
|
143
190
|
}
|
|
144
|
-
finalOptionsForComponent.methods && InternalFieldProtection(finalOptionsForComponent.methods);
|
|
191
|
+
finalOptionsForComponent.methods && InternalFieldProtection(finalOptionsForComponent.methods, ["disposer"]);
|
|
145
192
|
finalOptionsForComponent.behaviors.push(BBeforeCreate);
|
|
146
|
-
|
|
193
|
+
console.log(finalOptionsForComponent, 999, funcOptions);
|
|
194
|
+
attachedHijack(finalOptionsForComponent, [collectLoadLifetimesOfComponent], []);
|
|
195
|
+
onLoadHijack(finalOptionsForComponent, [onLoadReceivedDataHandle, initComputed], [triggerCompLoad]);
|
|
147
196
|
if (finalOptionsForComponent.isPage) {
|
|
148
197
|
Reflect.deleteProperty(finalOptionsForComponent.options, "virtualHost");
|
|
149
198
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collectOptionsForComponent.js","sourceRoot":"","sources":["../../../src/api/DefineComponent/collectOptionsForComponent.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,gDAAgD,CAAC;AAE9E,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAgB1D,SAAS,wBAAwB,CAE/B,MAA8C;IAE9C,MAAM,SAAS,GAAuB,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAE9D,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO;IACpC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC;IAG7D,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC7B,MAAM,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IAGD,IAAI,CAAC,OAAO,CAAC,MAAa,CAAC,CAAC;IAE5B,OAAO,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAE/B,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC;AACrD,CAAC;AAMD,SAAS,YAAY,CACnB,
|
|
1
|
+
{"version":3,"file":"collectOptionsForComponent.js","sourceRoot":"","sources":["../../../src/api/DefineComponent/collectOptionsForComponent.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ interface DefineComponentConstructor {
|
|
|
15
15
|
<TRootComponentDoc extends RootComponentDoc = {}, TSubComponentTuple extends SubComponentDoc[] = [], TName extends string = "", TPath extends Path = "/">(options: RootOptions<TRootComponentDoc, TSubComponentTuple, TName, TPath>): IfExtends<"", TName, CreatePageDoc<TRootComponentDoc, TPath>, CreateComponentDoc<TRootComponentDoc, TName, TSubComponentTuple>>;
|
|
16
16
|
}
|
|
17
17
|
export type FuncOptions = Record<"pageLifetimes" | "lifetimes" | "watch", Record<string, Func[]>>;
|
|
18
|
-
export type
|
|
18
|
+
export type FinalOptionsOfComponent = {
|
|
19
19
|
isPage?: boolean;
|
|
20
20
|
options?: WMComponent.Options;
|
|
21
21
|
properties?: Record<string, any>;
|
|
@@ -30,7 +30,7 @@ export type FinalOptionsForComponent = {
|
|
|
30
30
|
watch?: Record<string, Func>;
|
|
31
31
|
lifetimes?: LifetimesConstraint;
|
|
32
32
|
pageLifetimes?: Partial<WMCompPageLifetimes & {
|
|
33
|
-
load:
|
|
33
|
+
load: (prop: unknown) => void;
|
|
34
34
|
} & WMPageLifetimes>;
|
|
35
35
|
};
|
|
36
36
|
export declare const DefineComponent: DefineComponentConstructor;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { DuplicateFieldValidator } from "hry-types/src/Generic/DuplicateFieldValidator";
|
|
2
2
|
import type { ComputedConstraint } from "./ComputedConstraint";
|
|
3
|
-
export type ComputedOption<TComputed extends ComputedConstraint,
|
|
4
|
-
computed?: TComputed & DuplicateFieldValidator<TComputed,
|
|
3
|
+
export type ComputedOption<TComputed extends ComputedConstraint, CompareKeys extends PropertyKey> = {
|
|
4
|
+
computed?: TComputed & DuplicateFieldValidator<TComputed, CompareKeys>;
|
|
5
5
|
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { ComputedConstraint } from "./ComputedConstraint";
|
|
2
|
-
export type GetComputedDoc<TComputed extends ComputedConstraint> =
|
|
2
|
+
export type GetComputedDoc<TComputed extends ComputedConstraint> = {
|
|
3
3
|
[k in keyof TComputed]: ReturnType<TComputed[k]>;
|
|
4
|
-
}
|
|
4
|
+
};
|
|
@@ -7,9 +7,12 @@ const RootDoc = RootComponent()({
|
|
|
7
7
|
data: {
|
|
8
8
|
lastName: "lastName",
|
|
9
9
|
},
|
|
10
|
+
store: {
|
|
11
|
+
prefix: () => "hry-",
|
|
12
|
+
},
|
|
10
13
|
computed: {
|
|
11
14
|
fullName() {
|
|
12
|
-
return this.data.firstName + this.data.lastName;
|
|
15
|
+
return this.data.prefix + this.data.firstName + this.data.lastName;
|
|
13
16
|
},
|
|
14
17
|
user() {
|
|
15
18
|
return {};
|
|
@@ -19,6 +22,7 @@ const RootDoc = RootComponent()({
|
|
|
19
22
|
},
|
|
20
23
|
readOnly() {
|
|
21
24
|
Checking;
|
|
25
|
+
this.data.user.id = "xxx";
|
|
22
26
|
return "str";
|
|
23
27
|
},
|
|
24
28
|
},
|
|
@@ -41,15 +45,4 @@ const EmptyComputedFieldDoc = RootComponent()({
|
|
|
41
45
|
},
|
|
42
46
|
});
|
|
43
47
|
Checking;
|
|
44
|
-
RootComponent()({
|
|
45
|
-
isPage: true,
|
|
46
|
-
properties: {
|
|
47
|
-
obj: Object,
|
|
48
|
-
},
|
|
49
|
-
computed: {
|
|
50
|
-
age() {
|
|
51
|
-
return this.data.obj.age;
|
|
52
|
-
},
|
|
53
|
-
},
|
|
54
|
-
});
|
|
55
48
|
//# sourceMappingURL=normal.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Computed/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Computed/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAEhD,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAGtC,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;IAC9B,UAAU,EAAE;QACV,SAAS,EAAE,MAAM;KAClB;IACD,IAAI,EAAE;QACJ,QAAQ,EAAE,UAAU;KACrB;IACD,KAAK,EAAE;QACL,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM;KACrB;IACD,QAAQ,EAAE;QACR,QAAQ;YAEN,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;QACrE,CAAC;QACD,IAAI;YACF,OAAO,EAAe,CAAC;QACzB,CAAC;QAED,WAAW;YACT,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;QAChD,CAAC;QACD,QAAQ;YAEN,QAYC,CAAC;YAGF,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC;YAE1B,OAAO,KAAK,CAAC;QACf,CAAC;KACF;CACF,CAAC,CAAC;AAUH,QAAoE,CAAC;AAKrE,MAAM,kBAAkB,GAAG,aAAa,EAAE,CAAC;IACzC,OAAO,EAAE;QACP,EAAE;YAEA,QAAyC,CAAC;QAC5C,CAAC;KACF;CACF,CAAC,CAAC;AAEH,QAA+E,CAAC;AAKhF,MAAM,qBAAqB,GAAG,aAAa,EAAE,CAAC;IAC5C,QAAQ,EAAE,EAAE;IACZ,OAAO,EAAE;QACP,EAAE;YAEA,QAAyC,CAAC;QAC5C,CAAC;KACF;CACF,CAAC,CAAC;AAEH,QAAkF,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { V } from "hry-types";
|
|
2
2
|
import type { CustomEventConstraint } from "./CustomEventConstraint";
|
|
3
|
-
export type CustomEventsOption<TCustomEvents extends CustomEventConstraint,
|
|
4
|
-
customEvents?: TCustomEvents & V.IllegalFieldValidator<TCustomEvents, "bubbles" | "composed" | "capturePhase", 1, "options"> & V.DuplicateFieldValidator<TCustomEvents,
|
|
3
|
+
export type CustomEventsOption<TCustomEvents extends CustomEventConstraint, EventsKeys extends PropertyKey> = {
|
|
4
|
+
customEvents?: TCustomEvents & V.IllegalFieldValidator<TCustomEvents, "bubbles" | "composed" | "capturePhase", 1, "options"> & V.DuplicateFieldValidator<TCustomEvents, EventsKeys, "与events字段重复">;
|
|
5
5
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export type DataConstraint = Record<string,
|
|
1
|
+
export type DataConstraint = Record<string, unknown>;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { V } from "hry-types";
|
|
2
|
-
export type DataOption<TData extends object,
|
|
3
|
-
data?: TData & V.DuplicateFieldValidator<TData,
|
|
2
|
+
export type DataOption<TData extends object, PropertiesKeys extends PropertyKey> = {
|
|
3
|
+
data?: TData & V.DuplicateFieldValidator<TData, PropertiesKeys, "与properties字段重复">;
|
|
4
4
|
};
|
|
@@ -1,4 +1 @@
|
|
|
1
|
-
|
|
2
|
-
import type { IfExtends } from "hry-types/src/Any/IfExtends";
|
|
3
|
-
import type { Func } from "hry-types/src/Misc/Func";
|
|
4
|
-
export type GetDataDoc<TData extends object, Type extends "去掉函数字段" | "返回函数字段" | "函数值类型变为函数返回类型" = "函数值类型变为函数返回类型"> = IfExtends<Type, "函数值类型变为函数返回类型", O.ReturnTypeInObject<TData>, IfExtends<Type, "去掉函数字段", O.Filter<TData, Func>, O.Select<TData, Func>>>;
|
|
1
|
+
export type GetDataDoc<TData extends object> = TData;
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { Checking } from "hry-types";
|
|
2
2
|
export const mock_data = {
|
|
3
|
-
|
|
3
|
+
func: {
|
|
4
|
+
foo(num) {
|
|
5
|
+
return num + 1;
|
|
6
|
+
},
|
|
7
|
+
},
|
|
4
8
|
num: 2,
|
|
5
9
|
str: "str",
|
|
6
10
|
};
|
|
7
11
|
Checking;
|
|
8
12
|
Checking;
|
|
9
|
-
Checking;
|
|
10
|
-
Checking;
|
|
11
|
-
Checking;
|
|
12
|
-
Checking;
|
|
13
13
|
//# sourceMappingURL=GetDataDoc.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetDataDoc.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Data/test/GetDataDoc.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"GetDataDoc.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Data/test/GetDataDoc.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAIhD,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,IAAI,EAAE;QACJ,GAAG,CAAC,GAAW;YACb,OAAO,GAAG,GAAG,CAAC,CAAC;QACjB,CAAC;KACF;IACD,GAAG,EAAE,CAAC;IACN,GAAG,EAAE,KAAK;CACX,CAAC;AAYF,QAAyC,CAAC;AAO1C,QAAyC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Data/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAGhD,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Data/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAGhD,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAItC,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;IAC9B,IAAI,EAAE;QACJ,MAAM,EAAW,MAAM;QACvB,GAAG,EAAE,GAAG;QACR,eAAe,EAAE,GAAG;KACrB;IACD,OAAO,EAAE;QACP,GAAG;YACD,QAIC,CAAC;QACJ,CAAC;KACF;CACF,CAAC,CAAC;AAQH,QAA4D,CAAC;AAG7D,MAAM,gBAAgB,GAAG,aAAa,EAAE,CAAC;IACvC,IAAI,EAAE,EAAE;IACR,OAAO,EAAE;QACP,EAAE;YAEA,QAAyC,CAAC;QAC5C,CAAC;KACF;CACF,CAAC,CAAC;AAGH,QAA6E,CAAC;AAK9E,MAAM,aAAa,GAAG,aAAa,EAAE,CAAC;IACpC,OAAO,EAAE;QACP,EAAE;YAEA,QAAyC,CAAC;QAC5C,CAAC;KACF;CACF,CAAC,CAAC;AAGH,QAA0E,CAAC"}
|
|
@@ -1,16 +1,17 @@
|
|
|
1
|
+
import type { IfExtends } from "hry-types/src/Any/_api";
|
|
1
2
|
import type { Select } from "hry-types/src/Object/_api";
|
|
2
3
|
import type { Detail, WMBaseEvent } from "../../../types/OfficialTypeAlias";
|
|
3
4
|
import type { ComponentDoc } from "../../DefineComponent/ReturnType/ComponentDoc";
|
|
4
5
|
import type { CustomEventsDoc } from "../CustomEvents/CustomEventsDoc";
|
|
5
6
|
import type { Bubbles, BubblesCaptureComposed, BubblesComposed, Capture, CaptureComposed, CustomEventsTags } from "../CustomEvents/CustomEventsTag";
|
|
6
7
|
type FilterNormalFields<O extends object> = Select<O, Bubbles | Capture, "contains->">;
|
|
7
|
-
type GetBubblesOrCaptureEventsFromCompDoc<
|
|
8
|
+
type GetBubblesOrCaptureEventsFromCompDoc<ComponentDocList extends ComponentDoc[], Result extends CustomEventsDoc = {}> = ComponentDocList extends [infer Head extends ComponentDoc, ...infer Rest extends ComponentDoc[]] ? GetBubblesOrCaptureEventsFromCompDoc<Rest, Result & (FilterNormalFields<Head["customEvents"] & {}>)> : Result;
|
|
8
9
|
type _AddSuffixForKey<key extends string, Value extends CustomEventsTags> = Value extends BubblesComposed ? `${key}_bubbles` | `${key}_bubbles_catch` : Value extends CaptureComposed ? `${key}_capture` | `${key}_capture_catch` : Value extends BubblesCaptureComposed ? `${key}_bubbles&capture` | `${key}_bubbles&capture_catch` : never;
|
|
9
10
|
type TransformCustomEventsDocTypeToFunctionTypeAndAddSuffix<T extends CustomEventsDoc> = {
|
|
10
11
|
[k in keyof T as _AddSuffixForKey<k & string, Extract<T[k], CustomEventsTags>>]?: (detail: Detail<Exclude<T[k], CustomEventsTags>>) => void;
|
|
11
12
|
};
|
|
12
|
-
type GetAllSubCustomEventsConstraint<
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
type GetAllSubCustomEventsConstraint<ComponentDocList extends ComponentDoc[], AllCustomEvents extends CustomEventsDoc = GetBubblesOrCaptureEventsFromCompDoc<ComponentDocList>> = IfExtends<{}, AllCustomEvents, BaseEvent, TransformCustomEventsDocTypeToFunctionTypeAndAddSuffix<AllCustomEvents>>;
|
|
14
|
+
type BaseEvent = Record<string, (e: WMBaseEvent) => any>;
|
|
15
|
+
export type EventsConstraint<ComponentDocList extends ComponentDoc[] = []> = IfExtends<[
|
|
16
|
+
], ComponentDocList, BaseEvent, GetAllSubCustomEventsConstraint<ComponentDocList>>;
|
|
16
17
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Events/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAWhD,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAMtC,aAAa,EAAE,CAAC;IACd,MAAM,EAAE;QACN,
|
|
1
|
+
{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Events/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAWhD,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAMtC,aAAa,EAAE,CAAC;IACd,MAAM,EAAE;QACN,KAAK,CAAC,CAAC;YACL,QAA0C,CAAC;QAC7C,CAAC;KACF;CACF,CAAC,CAAC;AAKH,aAAa,EAAE,CAAC;IACd,MAAM,EAAE;QAEN,OAAO,CACL,CAKC;YAED,QAAuD,CAAC;YAExD,MAAM,QAAQ,GAAG,CAAC,CAAC,IAAK,CAAC,QAAQ,CAAC;YAElC,QAAoD,CAAC;YAErD,QAAoF,CAAC;YAErF,QAAsE,CAAC;QACzE,CAAC;QAED,GAAG,CAAC,CAA0B;YAC5B,QAAgD,CAAC;QACnD,CAAC;QAED,GAAG,CAAC,CAAuB;YACzB,MAAM,MAAM,GAAG,CAAC,CAAC,IAAK,CAAC,EAAE,CAAC;YAE1B,QAA0C,CAAC;QAC7C,CAAC;QAED,GAAG,CAAC,CAAwC;YAC1C,QAA+D,CAAC;QAClE,CAAC;QAED,GAAG,CAAC,CAAiC;YACnC,QAAwD,CAAC;QAC3D,CAAC;KACF;CACF,CAAC,CAAC;AAsBH,MAAM,OAAO,GAAG,aAAa,EAAkC,CAAC;IAC9D,MAAM,EAAE;QAEN,eAAe,CAAC,CAAC;YACf,QAA4C,CAAC;QAC/C,CAAC;QAED,qBAAqB,CAAC,CAAC;YACrB,QAA4C,CAAC;QAC/C,CAAC;QAED,eAAe,CAAC,CAA+E;YAC7F,QAA4C,CAAC;YAE7C,QAAgF,CAAC;YAEjF,QAAkE,CAAC;QACrE,CAAC;QAED,qBAAqB,CAAC,CAAC;YACrB,QAA4C,CAAC;QAC/C,CAAC;KACF;CACF,CAAC,CAAC;AAYH,QAAkD,CAAC;AAKnD,MAAM,iBAAiB,GAAG,aAAa,EAAkC,CAAC;IACxE,MAAM,EAAE,EAAE;CACX,CAAC,CAAC;AAEH,QAAiD,CAAC;AAKlD,MAAM,cAAc,GAAG,aAAa,EAAkC,CAAC,EAAE,CAAC,CAAC;AAE3E,QAA8C,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
+
import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
|
|
1
2
|
import type { WMCompLifetimes } from "../../../types/OfficialTypeAlias";
|
|
2
|
-
import type {
|
|
3
|
-
export type LifetimesConstraint = WMCompLifetimes["lifetimes"] & {
|
|
4
|
-
beforeCreate?: (options:
|
|
5
|
-
}
|
|
3
|
+
import type { FinalOptionsOfComponent } from "../../DefineComponent";
|
|
4
|
+
export type LifetimesConstraint = ComputeIntersection<WMCompLifetimes["lifetimes"] & {
|
|
5
|
+
beforeCreate?: (options: FinalOptionsOfComponent) => void;
|
|
6
|
+
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Lifetimes/test/error.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Lifetimes/test/error.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAEtC,aAAa,EAAE,CAAC;IACd,SAAS,EAAE;QACT,YAAY,KAAI,CAAC;QACjB,OAAO,KAAI,CAAC;QACZ,QAAQ,KAAI,CAAC;QACb,KAAK,KAAI,CAAC;QACV,QAAQ,KAAI,CAAC;QACb,KAAK,CAAC,GAAG;YACP,GAAG,CAAC,KAAK,CAAC;QACZ,CAAC;QACD,KAAK,KAAI,CAAC;QAEV,GAAG,KAAI,CAAC;KACT;CACF,CAAC,CAAC;AAEH,aAAa,EAAE,CAAC;IACd,MAAM,EAAE,IAAI;IAEZ,SAAS,EAAE,EAAE;CACd,CAAC,CAAC"}
|
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
import type { IfExtends } from "hry-types/src/Any/IfExtends";
|
|
2
2
|
import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
|
|
3
3
|
import type { WMCompPageLifetimes, WMPageLifetimes } from "../../../types/OfficialTypeAlias";
|
|
4
|
-
import type { RemoveNullOfRequired } from "../../../types/RemoveNullOfRequired";
|
|
5
4
|
export type PageLifetimesOption<TIsPage extends boolean, PropertiesDoc extends object> = IfExtends<TIsPage, false, {
|
|
6
|
-
pageLifetimes?: Partial<WMCompPageLifetimes> & {
|
|
7
|
-
load?: () => void
|
|
8
|
-
}
|
|
5
|
+
pageLifetimes?: ComputeIntersection<Partial<WMCompPageLifetimes> & {
|
|
6
|
+
load?: (props: object) => void | Promise<void>;
|
|
7
|
+
}>;
|
|
9
8
|
}, {
|
|
10
|
-
pageLifetimes?: Partial<Omit<WMPageLifetimes, "onLoad">> & {
|
|
11
|
-
onLoad?: (props:
|
|
12
|
-
}
|
|
9
|
+
pageLifetimes?: ComputeIntersection<Partial<Omit<WMPageLifetimes, "onLoad">> & {
|
|
10
|
+
onLoad?: (props: PropertiesDoc) => void | Promise<void>;
|
|
11
|
+
}>;
|
|
13
12
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/PageLifetimes/test/error.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAItC,aAAa,EAAE,CAAC;IACd,aAAa,EAAE;QACb,IAAI,KAAI,CAAC;QACT,IAAI,KAAI,CAAC;QACT,MAAM,KAAI,CAAC;QACX,IAAI,
|
|
1
|
+
{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/PageLifetimes/test/error.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAItC,aAAa,EAAE,CAAC;IACd,aAAa,EAAE;QACb,IAAI,KAAI,CAAC;QACT,IAAI,KAAI,CAAC;QACT,MAAM,KAAI,CAAC;QACX,IAAI,CAAC,KAAK;YACR,KAAK,CAAC;QACR,CAAC;QAED,GAAG,KAAI,CAAC;KACT;CACF,CAAC,CAAC;AAKH,aAAa,EAAE,CAAC;IACd,MAAM,EAAE,IAAI;IACZ,aAAa,EAAE;QACb,MAAM,CAAC,KAAK;YACV,KAAK,CAAC;QACR,CAAC;QAED,GAAG,KAAI,CAAC;KACT;CACF,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/PageLifetimes/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAChD,OAAO,EAAqB,aAAa,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/PageLifetimes/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAChD,OAAO,EAAqB,aAAa,EAAE,MAAM,aAAa,CAAC;AAO/D,aAAa,EAAE,CAAC;IAEd,aAAa,EAAE;QACb,IAAI,KAAI,CAAC;QACT,MAAM,CAAC,IAAI;YACT,QAAsE,CAAC;QACzE,CAAC;QACD,IAAI,KAAI,CAAC;QAET,IAAI,CAAC,GAAG;YACN,QAAuC,CAAC;QAC1C,CAAC;KACF;CACF,CAAC,CAAC;AAKH,aAAa,EAAE,CAAC;IACd,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE;QACV,GAAG,EAAE,MAAM;QACX,GAAG,EAAE,MAAM;QACX,KAAK,EAAE;YACL,IAAI,EAAE,MAAiC;YACvC,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE;SACnC;QACD,cAAc,EAAE;YACd,IAAI,EAAE,MAAwC;YAC9C,KAAK,EAAE,IAAI;SACZ;KACF;IAED,aAAa,EAAE;QAEb,MAAM,CAAC,KAAK;YACV,QASC,CAAC;QACJ,CAAC;QACD,MAAM;YACJ,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACxB,CAAC;KACF;CACF,CAAC,CAAC"}
|
|
@@ -14,8 +14,22 @@ type _RootComponentDoc = {
|
|
|
14
14
|
lifetimes?: LifetimesConstraint;
|
|
15
15
|
pageLifetimes?: Partial<WMCompPageLifetimes & {
|
|
16
16
|
load: Func;
|
|
17
|
-
}
|
|
17
|
+
}>;
|
|
18
18
|
};
|
|
19
|
-
type _Validator<O, ErrKeys = Exclude<keyof O, keyof
|
|
20
|
-
export type RootComponentDoc<O extends _Validator<O> = _RootComponentDoc> = O;
|
|
19
|
+
type _Validator<O, Doc, ErrKeys = Exclude<keyof O, keyof Doc>> = [ErrKeys] extends [never] ? Doc : `错误的字段${ErrKeys & string}`;
|
|
20
|
+
export type RootComponentDoc<O extends _Validator<O, _RootComponentDoc> = _RootComponentDoc> = O;
|
|
21
|
+
type _RootPageDoc = {
|
|
22
|
+
isPage?: boolean;
|
|
23
|
+
properties?: object;
|
|
24
|
+
data?: object;
|
|
25
|
+
computed?: object;
|
|
26
|
+
customEvents?: object;
|
|
27
|
+
methods?: object;
|
|
28
|
+
events?: object;
|
|
29
|
+
store?: object;
|
|
30
|
+
watch?: Record<string, Func>;
|
|
31
|
+
lifetimes?: LifetimesConstraint;
|
|
32
|
+
pageLifetimes?: Partial<WMPageLifetimes>;
|
|
33
|
+
};
|
|
34
|
+
export type RootPageDoc<O extends _Validator<O, _RootPageDoc> = _RootPageDoc> = O;
|
|
21
35
|
export {};
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { V } from "hry-types";
|
|
2
2
|
import type { StoreConstraint } from "./StoreConstraint";
|
|
3
|
-
export type StoreOption<TStore extends StoreConstraint,
|
|
4
|
-
store?: TStore & V.DuplicateFieldValidator<TStore,
|
|
3
|
+
export type StoreOption<TStore extends StoreConstraint, TDuplicateKeys extends PropertyKey> = {
|
|
4
|
+
store?: TStore & V.DuplicateFieldValidator<TStore, TDuplicateKeys, "字段重复">;
|
|
5
5
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Store/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,MAAM,IAAI,GAAG,UAAU,CAAC;IACtB,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,EAAE;CACR,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAG,aAAa,EAAE,CAAC;IAC/B,KAAK,EAAE;QACL,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI;QACzB,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG;KACxB;CACF,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Store/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,MAAM,IAAI,GAAG,UAAU,CAAC;IACtB,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,EAAE;CACR,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAG,aAAa,EAAE,CAAC;IAC/B,KAAK,EAAE;QACL,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI;QACzB,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG;KACxB;CACF,CAAC,CAAC;AAUH,QAAsD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WatchProperties.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Watch/test/WatchProperties.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAGhD,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"WatchProperties.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Watch/test/WatchProperties.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,13 +26,13 @@ import type { PageLifetimesOption } from "./PageLifetimes/PageLifetimesOption";
|
|
|
26
26
|
import type { GetPropertiesDoc } from "./Properties/GetPropertiesDoc";
|
|
27
27
|
import type { PropertiesConstraint } from "./Properties/PropertiesConstraint";
|
|
28
28
|
import type { PropertiesOption } from "./Properties/PropertiesOption";
|
|
29
|
-
import type {
|
|
29
|
+
import type { GetStoreDoc } from "./Store/GeTStoreDoc";
|
|
30
30
|
import type { StoreConstraint } from "./Store/StoreConstraint";
|
|
31
31
|
import type { StoreOption } from "./Store/StoreOption";
|
|
32
32
|
import type { WatchOption } from "./Watch/WatchOption";
|
|
33
|
-
type RootComponentOptions<
|
|
34
|
-
type RootComponentConstructor<
|
|
35
|
-
<TEvents extends EventsConstraint<
|
|
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>>;
|
|
34
|
+
type RootComponentConstructor<TComponentDocList extends ComponentDoc[]> = {
|
|
35
|
+
<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
36
|
isPage: true;
|
|
37
37
|
}> & IfExtends<EmptyObject, PropertiesDoc, {}, {
|
|
38
38
|
properties: PropertiesDoc;
|
|
@@ -50,7 +50,7 @@ type RootComponentConstructor<TReceivedComponentDoc extends ComponentDoc[] | Com
|
|
|
50
50
|
customEvents: ComputeObject<CustomEventsDoc>;
|
|
51
51
|
}>>;
|
|
52
52
|
};
|
|
53
|
-
export declare function RootComponent<
|
|
53
|
+
export declare function RootComponent<TComponentDocList extends ComponentDoc[] = []>(): RootComponentConstructor<TComponentDocList>;
|
|
54
54
|
export type RootComponentTrueOptions = {
|
|
55
55
|
isPage?: boolean;
|
|
56
56
|
properties?: PropertiesConstraint;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/RootComponent/index.ts"],"names":[],"mappings":"
|
|
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,3 +1,3 @@
|
|
|
1
|
-
export type SubDataConstraint<
|
|
2
|
-
[k in
|
|
1
|
+
export type SubDataConstraint<TComponentDoc extends object> = {
|
|
2
|
+
[k in keyof TComponentDoc]?: TComponentDoc[k];
|
|
3
3
|
};
|
|
@@ -10,19 +10,6 @@ SubComponent()({
|
|
|
10
10
|
_aaa_template: "internal",
|
|
11
11
|
},
|
|
12
12
|
});
|
|
13
|
-
const res = SubComponent()({
|
|
14
|
-
inherit: {
|
|
15
|
-
view_style: "wxml",
|
|
16
|
-
},
|
|
17
|
-
data: {
|
|
18
|
-
view_class: "h-full",
|
|
19
|
-
view_hover_class: "none",
|
|
20
|
-
view_obj: {},
|
|
21
|
-
view_str: "a",
|
|
22
|
-
view_ddd: 123,
|
|
23
|
-
},
|
|
24
|
-
});
|
|
25
|
-
Checking;
|
|
26
13
|
SubComponent()({
|
|
27
14
|
inherit: {
|
|
28
15
|
aaa_str: "wxml",
|
|
@@ -33,8 +20,6 @@ SubComponent()({
|
|
|
33
20
|
_aaa_str: "str",
|
|
34
21
|
},
|
|
35
22
|
});
|
|
36
|
-
const res1 = SubComponent()({});
|
|
37
|
-
Checking;
|
|
38
23
|
SubComponent()({
|
|
39
24
|
data: {
|
|
40
25
|
aaa_str: "a",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubData/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubData/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAKhD,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAUrC,YAAY,EAAe,CAAC;IAC1B,OAAO,EAAE;QACP,OAAO,EAAE,MAAM;KAChB;IACD,IAAI,EAAE;QAEJ,OAAO,EAAE,GAAG;QACZ,OAAO,EAAE,GAAG;QAEZ,aAAa,EAAE,UAAU;KAC1B;CACF,CAAC,CAAC;AAGH,YAAY,EAAuC,CAAC;IAClD,OAAO,EAAE;QACP,OAAO,EAAE,MAAM;QACf,OAAO,EAAE,MAAM;QACf,OAAO,EAAE,MAAM;KAChB;IACD,IAAI,EAAE;QAEJ,QAAQ,EAAE,KAAK;KAChB;CACF,CAAC,CAAC;AAEH,YAAY,EAAe,CAAC;IAC1B,IAAI,EAAE;QACJ,OAAO,EAAE,GAAG;QACZ,OAAO,EAAE,GAAG;QACZ,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,KAAK;KAChB;IACD,OAAO,EAAE;QACP,KAAK;YAEH,QASC,CAAC;QACJ,CAAC;KACF;CACF,CAAC,CAAC"}
|