annil 1.4.0 → 1.5.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.
- package/CHANGELOG.md +12 -0
- package/README.md +4 -4
- package/dist/api/DefineComponent/collectOptionsForComponent.js +30 -11
- package/dist/api/DefineComponent/collectOptionsForComponent.js.map +1 -1
- package/dist/api/DefineComponent/index.js.map +1 -1
- package/dist/api/InstanceInject/instanceConfig.d.ts +23 -0
- package/dist/api/InstanceInject/instanceConfig.js +13 -0
- package/dist/api/InstanceInject/instanceConfig.js.map +1 -0
- package/dist/api/InstanceInject/test/normal.test.d.ts +1 -0
- package/dist/api/InstanceInject/test/normal.test.js +30 -0
- package/dist/api/InstanceInject/test/normal.test.js.map +1 -0
- package/dist/api/RootComponent/Computed/test/normal.test.js.map +1 -1
- package/dist/api/RootComponent/Data/test/normal.test.js.map +1 -1
- package/dist/api/RootComponent/Instance/RootComponentInstance.d.ts +4 -4
- package/dist/api/RootComponent/Instance/test/properties/mormal.test.js.map +1 -1
- package/dist/api/RootComponent/Instance/test/setData/error.test.js +0 -8
- package/dist/api/RootComponent/Instance/test/setData/error.test.js.map +1 -1
- package/dist/api/RootComponent/Instance/test/setData/normal.test.js +0 -1
- package/dist/api/RootComponent/Instance/test/setData/normal.test.js.map +1 -1
- package/dist/api/RootComponent/Properties/test/normalEmpty.test.js.map +1 -1
- package/dist/api/RootComponent/Properties/test/normalOptional.test.js.map +1 -1
- package/dist/api/RootComponent/Properties/test/normalRequired.test.js.map +1 -1
- package/dist/api/SubComponent/SubComputed/test/normal.test.js.map +1 -1
- package/dist/api/SubComponent/SubData/test/normal.test.js.map +1 -1
- package/dist/api/SubComponent/SubInstance/test/normal.test.js.map +1 -1
- package/dist/behaviors/BComputedAndWatch/data-tracer.js.map +1 -1
- package/dist/behaviors/BComputedAndWatch/types.d.ts +0 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/inject.d.ts +18 -0
- package/dist/inject.js +20 -0
- package/dist/inject.js.map +1 -0
- package/dist/types/Assign.d.ts +1 -0
- package/dist/types/Assign.js +2 -0
- package/dist/types/Assign.js.map +1 -0
- package/dist/types/OfficialTypeAlias.d.ts +1 -1
- package/package.json +2 -4
- package/src/api/DefineComponent/collectOptionsForComponent.ts +47 -11
- package/src/api/DefineComponent/index.ts +1 -0
- package/src/api/InstanceInject/instanceConfig.ts +39 -0
- package/src/api/InstanceInject/test/normal.test.ts +40 -0
- package/src/api/RootComponent/Computed/test/normal.test.ts +14 -11
- package/src/api/RootComponent/Data/test/normal.test.ts +4 -3
- package/src/api/RootComponent/Instance/RootComponentInstance.ts +4 -5
- package/src/api/RootComponent/Instance/test/properties/mormal.test.ts +6 -1
- package/src/api/RootComponent/Instance/test/setData/error.test.ts +0 -10
- package/src/api/RootComponent/Instance/test/setData/normal.test.ts +0 -3
- package/src/api/RootComponent/Properties/test/normalEmpty.test.ts +4 -2
- package/src/api/RootComponent/Properties/test/normalOptional.test.ts +11 -8
- package/src/api/RootComponent/Properties/test/normalRequired.test.ts +2 -1
- package/src/api/SubComponent/SubComputed/test/normal.test.ts +27 -22
- package/src/api/SubComponent/SubData/test/normal.test.ts +9 -6
- package/src/api/SubComponent/SubInstance/test/normal.test.ts +14 -11
- package/src/behaviors/BComputedAndWatch/data-tracer.ts +1 -0
- package/src/behaviors/BComputedAndWatch/types.ts +0 -1
- package/src/index.ts +3 -0
- package/src/inject.ts +34 -0
- package/src/types/Assign.ts +1 -0
- package/src/types/OfficialTypeAlias.ts +1 -1
- package/dist/api/InstanceInject/InstanceInject.d.ts +0 -0
- package/dist/api/InstanceInject/InstanceInject.js +0 -2
- package/dist/api/InstanceInject/InstanceInject.js.map +0 -1
- package/dist/api/InstanceInject/test/InjectConfig.d.ts +0 -0
- package/dist/api/InstanceInject/test/InjectConfig.js +0 -2
- package/dist/api/InstanceInject/test/InjectConfig.js.map +0 -1
- package/src/api/InstanceInject/InstanceInject.ts +0 -25
- package/src/api/InstanceInject/test/InjectConfig.ts +0 -50
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,18 @@
|
|
|
4
4
|
|
|
5
5
|
* 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
|
|
6
6
|
|
|
7
|
+
## [1.5.0](https://github.com/missannil/annil/compare/v1.4.0...v1.5.0) (2023-12-18)
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
### Features
|
|
11
|
+
|
|
12
|
+
* 新增组件实例全局注入功能 ([2e44e57](https://github.com/missannil/annil/commit/2e44e574d761d8f640d5f58e3984af8c86b94ec3))
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
### Bug Fixes
|
|
16
|
+
|
|
17
|
+
* 修复依赖，把hry-types放到peer中 ([2e44e57](https://github.com/missannil/annil/commit/2e44e574d761d8f640d5f58e3984af8c86b94ec3))
|
|
18
|
+
|
|
7
19
|
## [1.4.0](https://github.com/missannil/annil/compare/v1.3.1...v1.4.0) (2023-12-17)
|
|
8
20
|
|
|
9
21
|
|
package/README.md
CHANGED
|
@@ -64,7 +64,7 @@ annil(安奈儿)是微信小程序原生开发插件,其提供的API功能更强
|
|
|
64
64
|
- 可选
|
|
65
65
|
|
|
66
66
|
```bash
|
|
67
|
-
npm typescript
|
|
67
|
+
npm typescript --save-dev
|
|
68
68
|
```
|
|
69
69
|
|
|
70
70
|
```bash
|
|
@@ -93,8 +93,6 @@ annil(安奈儿)是微信小程序原生开发插件,其提供的API功能更强
|
|
|
93
93
|
module.exports = require("./mobx.cjs.production.min.js");
|
|
94
94
|
```
|
|
95
95
|
|
|
96
|
-
> 另外,构建时会出现`node_modules/miniprogram-api-typings/index.d.ts.js: Npm package entry file not found`错误,这是因为annil插件把官方类型库`miniprogram-api-typings`加入到生产依赖中,而npm构建时找不到它的生产目录所致,无视即可。还需删除`miniprogram_npm`下的`hry-types`目录(annil依赖的类型工具库)。
|
|
97
|
-
|
|
98
96
|
3. 配置tsconfig.json(使用ts开发时)
|
|
99
97
|
```json
|
|
100
98
|
{
|
|
@@ -102,7 +100,9 @@ annil(安奈儿)是微信小程序原生开发插件,其提供的API功能更强
|
|
|
102
100
|
// ...
|
|
103
101
|
"lib": ["ES2022"],
|
|
104
102
|
"skipLibCheck": true,
|
|
105
|
-
"
|
|
103
|
+
"strict": true,
|
|
104
|
+
"strictFunctionTypes": false, // 解决给事件参数e重定义类型报错的问题
|
|
105
|
+
"types": ["miniprogram-api-typings"]
|
|
106
106
|
}
|
|
107
107
|
// ...
|
|
108
108
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { instanceConfig } from "../..";
|
|
1
2
|
import { BBeforeCreate } from "../../behaviors/BbeforeCreated";
|
|
2
3
|
import { BComputedAndWatch } from "../../behaviors/BComputedAndWatch";
|
|
3
4
|
import { BStore } from "../../behaviors/BStore";
|
|
@@ -119,21 +120,39 @@ function collectRootComponentOption(finalOptions, funcOptions, rootComponentOpti
|
|
|
119
120
|
funcFieldsCollect(rootComponentOptions, funcOptions);
|
|
120
121
|
otherFieldsHandle(finalOptions, rootComponentOptions);
|
|
121
122
|
}
|
|
123
|
+
function merge(target, source) {
|
|
124
|
+
for (const key in source) {
|
|
125
|
+
const sourceVal = source[key];
|
|
126
|
+
if (key in target) {
|
|
127
|
+
const targetVal = target[key];
|
|
128
|
+
switch (key) {
|
|
129
|
+
case "behaviors":
|
|
130
|
+
{
|
|
131
|
+
target[key] = [...sourceVal, ...targetVal];
|
|
132
|
+
}
|
|
133
|
+
break;
|
|
134
|
+
default:
|
|
135
|
+
{
|
|
136
|
+
target[key] = Object.assign(targetVal, sourceVal);
|
|
137
|
+
}
|
|
138
|
+
break;
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
else {
|
|
142
|
+
target[key] = sourceVal;
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
return target;
|
|
146
|
+
}
|
|
122
147
|
export function collectOptionsForComponent(defineComponentOption) {
|
|
123
148
|
const rootComponentOption = defineComponentOption.rootComponent;
|
|
124
149
|
const subComponentsList = defineComponentOption.subComponents;
|
|
125
|
-
const finalOptionsForComponent = {
|
|
126
|
-
options: {
|
|
127
|
-
addGlobalClass: true,
|
|
128
|
-
multipleSlots: true,
|
|
129
|
-
pureDataPattern: /^_/,
|
|
130
|
-
virtualHost: true,
|
|
131
|
-
},
|
|
132
|
-
behaviors: [BStore, BComputedAndWatch],
|
|
133
|
-
methods: {},
|
|
150
|
+
const finalOptionsForComponent = merge(instanceConfig.injectInfo || {}, {
|
|
134
151
|
observers: {},
|
|
135
152
|
data: {},
|
|
136
|
-
|
|
153
|
+
methods: {},
|
|
154
|
+
behaviors: [BStore, BComputedAndWatch],
|
|
155
|
+
});
|
|
137
156
|
const funcOptions = {
|
|
138
157
|
pageLifetimes: {},
|
|
139
158
|
lifetimes: {},
|
|
@@ -151,7 +170,7 @@ export function collectOptionsForComponent(defineComponentOption) {
|
|
|
151
170
|
&& hijack(finalOptionsForComponent.pageLifetimes || (finalOptionsForComponent.pageLifetimes = {}), "load", [loadReceivedDataHandle], []);
|
|
152
171
|
hijack(finalOptionsForComponent.methods, "onLoad", [onLoadReceivedDataHandle], []);
|
|
153
172
|
finalOptionsForComponent.isPage
|
|
154
|
-
&& Reflect.deleteProperty(finalOptionsForComponent.options, "virtualHost");
|
|
173
|
+
&& finalOptionsForComponent.options && Reflect.deleteProperty(finalOptionsForComponent.options, "virtualHost");
|
|
155
174
|
finalOptionsForComponent.behaviors.push(BBeforeCreate);
|
|
156
175
|
return finalOptionsForComponent;
|
|
157
176
|
}
|
|
@@ -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;AAEtE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"collectOptionsForComponent.js","sourceRoot":"","sources":["../../../src/api/DefineComponent/collectOptionsForComponent.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/DefineComponent/index.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AA2C1E,MAAM,CAAC,MAAM,eAAe,GAA+B,UAAS,OAAO;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/DefineComponent/index.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AA2C1E,MAAM,CAAC,MAAM,eAAe,GAA+B,UAAS,OAAO;IAGzE,SAAS,CACP,0BAA0B,CAAC,OAAgC,CAAQ,CACpE,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { ReturnTypeInObject } from "hry-types/src/Object/ReturnTypeInObject";
|
|
2
|
+
import { WMComponentOption } from "../../types/OfficialTypeAlias";
|
|
3
|
+
import { DataConstraint } from "../RootComponent/Data/DataConstraint";
|
|
4
|
+
import { MethodsConstraint } from "../RootComponent/Methods/MethodsConstraint";
|
|
5
|
+
import { StoreConstraint } from "../RootComponent/Store/StoreConstraint";
|
|
6
|
+
interface BaseInjectInfo {
|
|
7
|
+
options?: WMComponentOption;
|
|
8
|
+
methods?: MethodsConstraint;
|
|
9
|
+
data?: DataConstraint;
|
|
10
|
+
store?: StoreConstraint;
|
|
11
|
+
behaviors?: string[];
|
|
12
|
+
}
|
|
13
|
+
export interface IInjectInfo extends BaseInjectInfo {
|
|
14
|
+
}
|
|
15
|
+
export type IInjectData = IInjectInfo["data"] & ReturnTypeInObject<IInjectInfo["store"]>;
|
|
16
|
+
export type IInjectMethods = IInjectInfo["methods"];
|
|
17
|
+
declare class InstanceConfig {
|
|
18
|
+
private info;
|
|
19
|
+
get injectInfo(): IInjectInfo | undefined;
|
|
20
|
+
setInjectInfo(info: IInjectInfo | undefined): void;
|
|
21
|
+
}
|
|
22
|
+
export declare const instanceConfig: InstanceConfig;
|
|
23
|
+
export {};
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
class InstanceConfig {
|
|
2
|
+
constructor() {
|
|
3
|
+
this.info = {};
|
|
4
|
+
}
|
|
5
|
+
get injectInfo() {
|
|
6
|
+
return this.info.injectInfo;
|
|
7
|
+
}
|
|
8
|
+
setInjectInfo(info) {
|
|
9
|
+
info && (this.info.injectInfo = info);
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
export const instanceConfig = new InstanceConfig();
|
|
13
|
+
//# sourceMappingURL=instanceConfig.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"instanceConfig.js","sourceRoot":"","sources":["../../../src/api/InstanceInject/instanceConfig.ts"],"names":[],"mappings":"AA4BA,MAAM,cAAc;IAApB;QACU,SAAI,GAAiC,EAAE,CAAC;IAOlD,CAAC;IANC,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;IAC9B,CAAC;IACM,aAAa,CAAC,IAA6B;QAChD,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IACxC,CAAC;CACF;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { Checking } from "hry-types";
|
|
2
|
+
import { RootComponent } from "../../RootComponent";
|
|
3
|
+
RootComponent()({
|
|
4
|
+
methods: {
|
|
5
|
+
testInjectTypes() {
|
|
6
|
+
Checking;
|
|
7
|
+
Checking;
|
|
8
|
+
Checking;
|
|
9
|
+
},
|
|
10
|
+
},
|
|
11
|
+
});
|
|
12
|
+
RootComponent()({
|
|
13
|
+
data: {
|
|
14
|
+
injectStr: 123,
|
|
15
|
+
},
|
|
16
|
+
store: {
|
|
17
|
+
injectTheme: (() => "aaa"),
|
|
18
|
+
},
|
|
19
|
+
methods: {
|
|
20
|
+
injectMethod() {
|
|
21
|
+
return 123;
|
|
22
|
+
},
|
|
23
|
+
testInjectTypes() {
|
|
24
|
+
Checking;
|
|
25
|
+
Checking;
|
|
26
|
+
Checking;
|
|
27
|
+
},
|
|
28
|
+
},
|
|
29
|
+
});
|
|
30
|
+
//# sourceMappingURL=normal.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../src/api/InstanceInject/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAQ,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD,aAAa,EAAE,CAAC;IACd,OAAO,EAAE;QACP,eAAe;YACb,QAAuD,CAAC;YAExD,QAA+E,CAAC;YAEhF,QAAuE,CAAC;QAC1E,CAAC;KACF;CACF,CAAC,CAAC;AAGH,aAAa,EAAE,CAAC;IACd,IAAI,EAAE;QAEJ,SAAS,EAAE,GAAG;KACf;IACD,KAAK,EAAE;QAEL,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAgB;KAC1C;IACD,OAAO,EAAE;QAEP,YAAY;YACV,OAAO,GAAG,CAAC;QACb,CAAC;QACD,eAAe;YACb,QAAuD,CAAC;YAExD,QAAwD,CAAC;YAEzD,QAAwD,CAAC;QAC3D,CAAC;KACF;CACF,CAAC,CAAC"}
|
|
@@ -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;AAGhD,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,QAcC,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,QAAgE,CAAC;QACnE,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,QAAgE,CAAC;QACnE,CAAC;KACF;CACF,CAAC,CAAC;AAEH,QAAkF,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;
|
|
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;AAIhD,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,QAAgE,CAAC;QACnE,CAAC;KACF;CACF,CAAC,CAAC;AAGH,QAA6E,CAAC;AAK9E,MAAM,aAAa,GAAG,aAAa,EAAE,CAAC;IACpC,OAAO,EAAE;QACP,EAAE;YAEA,QAAgE,CAAC;QACnE,CAAC;KACF;CACF,CAAC,CAAC;AAGH,QAA0E,CAAC"}
|
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
import type { ReadonlyDeep } from "hry-types/src/Any/_api";
|
|
2
2
|
import type { IfExtends } from "hry-types/src/Any/IfExtends";
|
|
3
|
-
import type { Func } from "hry-types/src/Misc/Func";
|
|
4
3
|
import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
|
|
5
4
|
import type { IReactionDisposer } from "mobx";
|
|
5
|
+
import { Assign } from "../../../types/Assign";
|
|
6
6
|
import type { WMComponentInstance, WMInstanceMethods, WMPageInstance } from "../../../types/OfficialTypeAlias";
|
|
7
|
+
import { IInjectData, IInjectMethods } from "../../InstanceInject/instanceConfig";
|
|
7
8
|
import type { CustomEventMethods } from "./CustomEventMethods";
|
|
8
9
|
import type { CustomSetData } from "./CustomSetData";
|
|
9
10
|
export type RootComponentInstance<TIsPage extends boolean, TMethods extends object, TData extends object, AllData extends object, CustomEventsDoc extends object, StoreDoc extends object> = IfExtends<false, TIsPage, WMComponentInstance, WMPageInstance> & Omit<WMInstanceMethods<{}>, "setData"> & CustomSetData<TData> & IfExtends<{}, StoreDoc, unknown, {
|
|
10
11
|
disposer?: {
|
|
11
12
|
[k in keyof StoreDoc]: IReactionDisposer;
|
|
12
13
|
};
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
data: ReadonlyDeep<ComputeIntersection<AllData>>;
|
|
14
|
+
}> & Assign<IInjectMethods, TMethods & CustomEventMethods<CustomEventsDoc>> & {
|
|
15
|
+
data: ReadonlyDeep<Assign<IInjectData, ComputeIntersection<AllData>>>;
|
|
16
16
|
};
|
|
17
17
|
export type ComponentInstance = RootComponentInstance<false, {}, {}, {}, {}, {}>;
|
|
18
18
|
export type PageInstance = RootComponentInstance<true, {}, {}, {}, {}, {}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mormal.test.js","sourceRoot":"","sources":["../../../../../../src/api/RootComponent/Instance/test/properties/mormal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAEhD,OAAO,EAAqB,aAAa,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"mormal.test.js","sourceRoot":"","sources":["../../../../../../src/api/RootComponent/Instance/test/properties/mormal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAEhD,OAAO,EAAqB,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAIlE,aAAa,EAAE,CAAC;IACd,UAAU,EAAE;QACV,GAAG,EAAE,MAAM;QACX,WAAW,EAAE;YACX,IAAI,EAAE,MAAwC;YAC9C,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;SACxB;KACF;IACD,SAAS,EAAE;QACT,QAAQ;YAEN,QAIC,CAAC;QACJ,CAAC;KACF;CACF,CAAC,CAAC;AAGH,aAAa,EAAE,CAAC;IACd,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE;QACV,GAAG,EAAE,MAAM;QACX,WAAW,EAAE;YACX,IAAI,EAAE,MAAwC;YAC9C,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;SACxB;KACF;IACD,aAAa,EAAE;QACb,MAAM,CAAC,IAAI;YACT,QAKa,CAAC;YAGd,QAAiF,CAAC;YAGlF,QAAiD,CAAC;QACpD,CAAC;KACF;CACF,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../../src/api/RootComponent/Instance/test/setData/error.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,aAAa,EAAE,CAAC;IACd,UAAU,EAAE;QACV,IAAI,EAAE,MAAM;KACb;IACD,IAAI,EAAE;QACJ,GAAG,EAAE,KAAK;QACV,GAAG,EAAE,GAAG;QACR,OAAO,EAAc,GAAG;QACxB,IAAI,EAAE,IAAI;QACV,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACd,GAAG,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE;KAC5B;IACD,KAAK,EAAE;QACL,IAAI,EAAE,GAAG,EAAE,CAAC,GAAG;KAChB;IACD,QAAQ,EAAE;QACR,IAAI;YACF,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;QACxB,CAAC;KACF;IACD,OAAO,EAAE;QACP,EAAE;YACA,IAAI,CAAC,OAAO,CAAC;gBAEX,IAAI,EAAE,EAAE;aACT,CAAC,CAAC;YAEH,IAAI,CAAC,OAAO,CAAC;gBAEX,IAAI,EAAE,GAAG;aACV,CAAC,CAAC;YAEH,IAAI,CAAC,OAAO,CAAC;gBAEX,IAAI,EAAE,GAAG;aACV,CAAC,CAAC;YAGH,IAAI,CAAC,OAAO,CAAC;gBAEX,GAAG,EAAE,GAAG;gBAER,GAAG,EAAE,KAAK;gBAEV,OAAO,EAAE,GAAG;gBAEZ,IAAI,EAAE,GAAG;gBAET,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC;gBACnB,GAAG,EAAE;oBAEH,GAAG,EAAE,KAAK;oBAEV,GAAG,EAAE,GAAG;iBACT;gBAED,SAAS,EAAE,KAAK;gBAEhB,SAAS,EAAE,GAAG;aACf,CAAC,CAAC;QACL,CAAC;KACF;CACF,CAAC,CAAC
|
|
1
|
+
{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../../src/api/RootComponent/Instance/test/setData/error.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,aAAa,EAAE,CAAC;IACd,UAAU,EAAE;QACV,IAAI,EAAE,MAAM;KACb;IACD,IAAI,EAAE;QACJ,GAAG,EAAE,KAAK;QACV,GAAG,EAAE,GAAG;QACR,OAAO,EAAc,GAAG;QACxB,IAAI,EAAE,IAAI;QACV,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACd,GAAG,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE;KAC5B;IACD,KAAK,EAAE;QACL,IAAI,EAAE,GAAG,EAAE,CAAC,GAAG;KAChB;IACD,QAAQ,EAAE;QACR,IAAI;YACF,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;QACxB,CAAC;KACF;IACD,OAAO,EAAE;QACP,EAAE;YACA,IAAI,CAAC,OAAO,CAAC;gBAEX,IAAI,EAAE,EAAE;aACT,CAAC,CAAC;YAEH,IAAI,CAAC,OAAO,CAAC;gBAEX,IAAI,EAAE,GAAG;aACV,CAAC,CAAC;YAEH,IAAI,CAAC,OAAO,CAAC;gBAEX,IAAI,EAAE,GAAG;aACV,CAAC,CAAC;YAGH,IAAI,CAAC,OAAO,CAAC;gBAEX,GAAG,EAAE,GAAG;gBAER,GAAG,EAAE,KAAK;gBAEV,OAAO,EAAE,GAAG;gBAEZ,IAAI,EAAE,GAAG;gBAET,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC;gBACnB,GAAG,EAAE;oBAEH,GAAG,EAAE,KAAK;oBAEV,GAAG,EAAE,GAAG;iBACT;gBAED,SAAS,EAAE,KAAK;gBAEhB,SAAS,EAAE,GAAG;aACf,CAAC,CAAC;QACL,CAAC;KACF;CACF,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../../src/api/RootComponent/Instance/test/setData/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAGzC,aAAa,EAAE,CAAC;IACd,IAAI,EAAE;QACJ,GAAG,EAAE,KAAK;QACV,GAAG,EAAE,GAAG;QACR,OAAO,EAAc,GAAG;QACxB,IAAI,EAAE,IAAI;QACV,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACd,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE;KACxB;IAED,OAAO,EAAE;QACP,EAAE;YAEA,IAAI,CAAC,OAAO,CAAC;gBACX,GAAG,EAAE,QAAQ;gBACb,GAAG,EAAE,GAAG;gBACR,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,GAAG;gBACZ,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;gBACd,GAAG,EAAE;oBACH,CAAC,EAAE,GAAG;oBACN,CAAC,EAAE,KAAK;iBACT;gBACD,OAAO,EAAE,GAAG;gBACZ,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;QACL,CAAC;KACF;CACF,CAAC,CAAC;AAEH,MAAM,KAAK,GAAG,UAAU,CAAC;IACvB,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,EAAE;CACR,CAAC,CAAC;AAEH,aAAa,EAAE,CAAC;IACd,KAAK,EAAE;QACL,IAAI,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI;KACvB;IACD,SAAS,EAAE;QACT,QAAQ;YACN,WAAW,CAAC,GAAG,EAAE;gBACf,KAAK,CAAC,IAAI,GAAG,MAAM,CAAC;YACtB,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../../src/api/RootComponent/Instance/test/setData/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAGzC,aAAa,EAAE,CAAC;IACd,IAAI,EAAE;QACJ,GAAG,EAAE,KAAK;QACV,GAAG,EAAE,GAAG;QACR,OAAO,EAAc,GAAG;QACxB,IAAI,EAAE,IAAI;QACV,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACd,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE;KACxB;IAED,OAAO,EAAE;QACP,EAAE;YAEA,IAAI,CAAC,OAAO,CAAC;gBACX,GAAG,EAAE,QAAQ;gBACb,GAAG,EAAE,GAAG;gBACR,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,GAAG;gBACZ,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;gBACd,GAAG,EAAE;oBACH,CAAC,EAAE,GAAG;oBACN,CAAC,EAAE,KAAK;iBACT;gBACD,OAAO,EAAE,GAAG;gBACZ,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;QACL,CAAC;KACF;CACF,CAAC,CAAC;AAEH,MAAM,KAAK,GAAG,UAAU,CAAC;IACvB,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,EAAE;CACR,CAAC,CAAC;AAEH,aAAa,EAAE,CAAC;IACd,KAAK,EAAE;QACL,IAAI,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI;KACvB;IACD,SAAS,EAAE;QACT,QAAQ;YACN,WAAW,CAAC,GAAG,EAAE;gBACf,KAAK,CAAC,IAAI,GAAG,MAAM,CAAC;YACtB,CAAC,CAAC,CAAC;QACL,CAAC;KACF;CACF,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalEmpty.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Properties/test/normalEmpty.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"normalEmpty.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Properties/test/normalEmpty.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAGhD,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAKtC,MAAM,QAAQ,GAAG,aAAa,EAAE,CAAC;IAC/B,UAAU,EAAE,EAAE;IACd,OAAO,EAAE;QACP,GAAG;YAED,QAAgE,CAAC;QACnE,CAAC;KACF;CACF,CAAC,CAAC;AAGH,QAIa,CAAC;AAKd,MAAM,YAAY,GAAG,aAAa,EAAE,CAAC;IACnC,OAAO,EAAE;QACP,GAAG;YAED,QAAgE,CAAC;QACnE,CAAC;KACF;CACF,CAAC,CAAC;AAGH,QAIa,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalOptional.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Properties/test/normalOptional.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"normalOptional.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Properties/test/normalOptional.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAIhD,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAMtC,MAAM,WAAW,GAAG,aAAa,EAAE,CAAC;IAClC,UAAU,EAAE;QACV,YAAY,EAAE;YACZ,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,GAAG;SACX;QACD,eAAe,EAAE;YACf,IAAI,EAAE,MAAyC;YAC/C,KAAK,EAAE,MAAM;SACd;QACD,cAAc,EAAE;YACd,IAAI,EAAE,KAA2D;YACjE,KAAK,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,CAA8B;SACnD;QACD,YAAY,EAAE;YACZ,IAAI,EAAE,MAAiC;YACvC,KAAK,EAAE;gBACL,EAAE,EAAE,IAAI;gBACR,GAAG,EAAE,EAAE;aACR;SACF;QACD,kBAAkB,EAAE;YAClB,IAAI,EAAE,MAAwC;YAC9C,KAAK,EAAE,IAAI;SACZ;QACD,cAAc,EAAE;YACd,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,QAAQ;YACf,aAAa,EAAE,CAAC,MAAM,CAAC;SACxB;KACF;IACD,OAAO,EAAE;QACP,GAAG;YAED,QAaC,CAAC;QACJ,CAAC;KACF;CACF,CAAC,CAAC;AAiBH,QAA4D,CAAC;AAO7D,aAAa,EAAE,CAAC;IACd,UAAU,EAAE;QACV,GAAG,EAAE,MAAmC;QACxC,IAAI,EAAE;YACJ,IAAI,EAAE,MAA2B;YACjC,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;SACxB;KACF;IACD,QAAQ,EAAE;QACR,GAAG;;YACD,MAAA,IAAI,CAAC,IAAI,CAAC,IAAI,0CAAE,IAAI,CAAC;QACvB,CAAC;KACF;CACF,CAAC,CAAC;AAOH,aAAa,EAAE,CAAC;IACd,UAAU,EAAE;QACV,GAAG,EAAE;YACH,IAAI,EAAE,MAA2B;YACjC,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;SAC1B;KACF;CACF,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalRequired.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Properties/test/normalRequired.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"normalRequired.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Properties/test/normalRequired.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAKhD,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAsBtC,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,GAAG,EAAE,MAAM;IACX,GAAG,EAAE,MAAM;IACX,IAAI,EAAE,OAAO;IACb,GAAG,EAAE,KAAK;IACV,GAAG,EAAE,MAAM;IACX,KAAK,EAAE,KAA2D;IAClE,SAAS,EAAE,MAAyC;IACpD,SAAS,EAAE,MAAiC;IAC5C,UAAU,EAAE,OAAqC;IACjD,SAAS,EAAE,KAA0C;IACrD,SAAS,EAAE,MAA6C;CAChB,CAAC;AAK3C,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,kBAAkB,EAAE;QAClB,IAAI,EAAE,MAAM;QACZ,aAAa,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;KACjC;IACD,2BAA2B,EAAE;QAC3B,IAAI,EAAE,MAAyC;QAC/C,aAAa,EAAE,CAAC,MAAiC,CAAC;KACnD;IACD,kBAAkB,EAAE;QAClB,IAAI,EAAE,MAAiC;QACvC,aAAa,EAAE,CAAC,MAAM,CAAC;KACxB;IACD,kBAAkB,EAAE;QAClB,IAAI,EAAE,MAAM;QACZ,aAAa,EAAE,CAAC,MAAiC,CAAC;KACnD;CACsC,CAAC;AAK1C,MAAM,CAAC,MAAM,kBAAkB,GAAG,gCAC7B,mBAAmB,GACnB,kBAAkB,CACiB,CAAC;AAoBzC,MAAM,WAAW,GAAG,aAAa,EAAE,CAAC;IAClC,UAAU,EAAE,kBAAkB;IAC9B,OAAO,EAAE;QACP,GAAG;YAED,QAAuF,CAAC;QAC1F,CAAC;KACF;CACF,CAAC,CAAC;AASH,QAA4D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubComputed/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/SubComputed/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAMhD,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AA4BrC,YAAY,EAAyB,CAAC;IAEpC,QAAQ,EAAE,EAAE;CACb,CAAC,CAAC;AAWH,YAAY,EAA0B,CAAC;IACrC,OAAO,EAAE;QACP,OAAO,EAAE,KAAK;KACf;IACD,IAAI,EAAE;QACJ,OAAO,EAAE,GAAG;KACb;IAED,QAAQ,EAAE;QACR,OAAO;YACL,OAAO,EAAsB,CAAC;QAChC,CAAC;QACD,UAAU;YACR,OAAO,GAAG,CAAC;QACb,CAAC;KACF;CACF,CAAC,CAAC;AAEH,YAAY,EAA0B,CAAC;IACrC,QAAQ,EAAE;QACR,OAAO;YACL,OAAO,GAAa,CAAC;QACvB,CAAC;QACD,UAAU;YACR,OAAO,GAAG,CAAC;QACb,CAAC;QACD,OAAO;YACL,OAAO,GAAG,CAAC;QACb,CAAC;QACD,OAAO;YACL,IAAI,CAAC,IAAI,CAAC;YAGV,QAgBC,CAAC;YAEF,OAAO,EAAe,CAAC;QACzB,CAAC;KACF;IACD,SAAS,EAAE;QACT,QAAQ;YAEN,QAgBC,CAAC;QACJ,CAAC;KACF;CACF,CAAC,CAAC;AAIH,YAAY,EAAc,CAAC;IACzB,QAAQ,EAAE;QACR,OAAO;YACL,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;QACxB,CAAC;QACD,QAAQ;YACN,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;QACxB,CAAC;QACD,OAAO;YACL,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;QAC3B,CAAC;QACD,OAAO;YACL,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;QACvB,CAAC;KACF;CACF,CAAC,CAAC"}
|
|
@@ -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;AAMhD,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,QAWC,CAAC;QACJ,CAAC;KACF;CACF,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubInstance/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/SubInstance/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAOhD,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAkCrC,YAAY,EAAoB,CAAC;IAC/B,IAAI,EAAE;QACJ,OAAO,EAAE,KAAK;KACf;IACD,KAAK,EAAE;QACL,gBAAgB,EAAE,GAAG,EAAE,CAAC,GAAG;KAC5B;IACD,QAAQ,EAAE,EAAE;IACZ,OAAO,EAAE;QACP,QAAQ,KAAI,CAAC;KACd;IACD,MAAM,EAAE;QACN,OAAO,KAAI,CAAC;KACb;IACD,SAAS,EAAE;QACT,OAAO;YAEL,QAgBC,CAAC;YAGF,QAAoD,CAAC;YAErD,QAAkE,CAAC;YAEnE,QAAqD,CAAC;QAGxD,CAAC;KACF;CACF,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-tracer.js","sourceRoot":"","sources":["../../../src/behaviors/BComputedAndWatch/data-tracer.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,SAAS,CACvB,IAAY,EACZ,WAAiC,EACjC,WAAqB,EAAE;IAEvB,MAAM,OAAO,GAAG;QACd,GAAG,CAAC,MAAc,EAAE,IAAY;YAI9B,IAAI,IAAI,KAAK,eAAe;gBAAE,OAAO,MAAM,CAAC;YAE5C,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;YAKzB,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAE1B,MAAM,eAAe,GAAG,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;gBAE5D,IAAI,eAAe,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC;oBAE7D,WAAW,CAAC,GAAG,EAAE,CAAC;gBACpB,CAAC;YACH,CAAC;YACD,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAItC,WAAW,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAGvD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,OAAO,GAAG,KAAK,UAAU,EAAE,CAAC;gBAErF,OAAO,OAAO,GAAG,KAAK,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;YAC5D,CAAC;YAED,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI;gBAAE,OAAO,GAAG,CAAC;YAExD,OAAO,SAAS,CAAC,GAAG,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QAC9C,CAAC;
|
|
1
|
+
{"version":3,"file":"data-tracer.js","sourceRoot":"","sources":["../../../src/behaviors/BComputedAndWatch/data-tracer.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,SAAS,CACvB,IAAY,EACZ,WAAiC,EACjC,WAAqB,EAAE;IAEvB,MAAM,OAAO,GAAG;QACd,GAAG,CAAC,MAAc,EAAE,IAAY;YAI9B,IAAI,IAAI,KAAK,eAAe;gBAAE,OAAO,MAAM,CAAC;YAE5C,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;YAKzB,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAE1B,MAAM,eAAe,GAAG,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;gBAE5D,IAAI,eAAe,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC;oBAE7D,WAAW,CAAC,GAAG,EAAE,CAAC;gBACpB,CAAC;YACH,CAAC;YACD,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAItC,WAAW,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAGvD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,OAAO,GAAG,KAAK,UAAU,EAAE,CAAC;gBAErF,OAAO,OAAO,GAAG,KAAK,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;YAC5D,CAAC;YAED,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI;gBAAE,OAAO,GAAG,CAAC;YAExD,OAAO,SAAS,CAAC,GAAG,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QAC9C,CAAC;QAED,GAAG,CAAC,OAAe,EAAE,IAAY;YAC/B,MAAM,KAAK,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC;QAC/B,CAAC;KACF,CAAC;IAEF,OAAO,IAAI,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,OAAY;IAEjC,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;QACpD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAC5C,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,GAAG,aAAa,CAAC;IAC1B,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
|
@@ -2,7 +2,6 @@ import type { Func } from "hry-types/src/Misc/Func";
|
|
|
2
2
|
import type { ComponentInstance, PageInstance } from "../../api/RootComponent/Instance/RootComponentInstance";
|
|
3
3
|
import type { ComputedDependence } from "./initComputed";
|
|
4
4
|
export type InstanceCustomFields = {
|
|
5
|
-
__pendingSetData__?: object | null;
|
|
6
5
|
__storeConfig__?: () => Record<string, () => unknown>;
|
|
7
6
|
__computedStatus__?: "待更新" | "更新完毕";
|
|
8
7
|
__computedUpdater__: Func;
|
package/dist/index.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { DefineComponent } from "./api/DefineComponent";
|
|
2
|
+
import { type IInjectInfo, instanceConfig } from "./api/InstanceInject/instanceConfig";
|
|
2
3
|
import { navigateTo } from "./api/navigateTo";
|
|
3
4
|
import { RootComponent } from "./api/RootComponent";
|
|
4
5
|
import { SubComponent } from "./api/SubComponent";
|
|
@@ -8,4 +9,4 @@ import type { GenerateDoc } from "./types/GenerateDoc";
|
|
|
8
9
|
import type { ParamsEqual } from "./types/TwoParamsEqual";
|
|
9
10
|
export type { Vant, Wm } from "./thirdLib";
|
|
10
11
|
export type { CurrentTargetDataset, Dataset, Detail, Mark, TargetDataset, WMBaseEvent, WMCustomEvent, } from "./types/OfficialTypeAlias";
|
|
11
|
-
export { type ComponentDocExtension, DefineComponent, type DetailedType, type GenerateDoc, navigateTo, type ParamsEqual, RootComponent, SubComponent, };
|
|
12
|
+
export { type ComponentDocExtension, DefineComponent, type DetailedType, type GenerateDoc, type IInjectInfo, instanceConfig, navigateTo, type ParamsEqual, RootComponent, SubComponent, };
|
package/dist/index.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { DefineComponent } from "./api/DefineComponent";
|
|
2
|
+
import { instanceConfig } from "./api/InstanceInject/instanceConfig";
|
|
2
3
|
import { navigateTo } from "./api/navigateTo";
|
|
3
4
|
import { RootComponent } from "./api/RootComponent";
|
|
4
5
|
import { SubComponent } from "./api/SubComponent";
|
|
5
|
-
export { DefineComponent, navigateTo, RootComponent, SubComponent, };
|
|
6
|
+
export { DefineComponent, instanceConfig, navigateTo, RootComponent, SubComponent, };
|
|
6
7
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAoB,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACvF,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,cAAc,EAEd,UAAU,EAEV,aAAa,EACb,YAAY,GACb,CAAC"}
|
package/dist/inject.d.ts
ADDED
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
declare function injectMethod(data: string): string;
|
|
2
|
+
declare const data: {
|
|
3
|
+
injectStr: string;
|
|
4
|
+
};
|
|
5
|
+
declare const methods: {
|
|
6
|
+
injectMethod: typeof injectMethod;
|
|
7
|
+
};
|
|
8
|
+
declare const store: {
|
|
9
|
+
injectTheme: () => "dark" | "light" | undefined;
|
|
10
|
+
};
|
|
11
|
+
declare module "./index" {
|
|
12
|
+
interface IInjectInfo {
|
|
13
|
+
data: typeof data;
|
|
14
|
+
store: typeof store;
|
|
15
|
+
methods: typeof methods;
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
export {};
|
package/dist/inject.js
ADDED
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { observable, runInAction } from "mobx";
|
|
2
|
+
const themeStore = observable({ theme: wx.getSystemInfoSync().theme });
|
|
3
|
+
wx.onThemeChange((Res) => {
|
|
4
|
+
runInAction(() => {
|
|
5
|
+
themeStore.theme = Res.theme;
|
|
6
|
+
});
|
|
7
|
+
});
|
|
8
|
+
function injectMethod(data) {
|
|
9
|
+
return data;
|
|
10
|
+
}
|
|
11
|
+
const data = {
|
|
12
|
+
injectStr: "injectStr",
|
|
13
|
+
};
|
|
14
|
+
const methods = {
|
|
15
|
+
injectMethod,
|
|
16
|
+
};
|
|
17
|
+
const store = {
|
|
18
|
+
injectTheme: () => themeStore.theme,
|
|
19
|
+
};
|
|
20
|
+
//# sourceMappingURL=inject.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"inject.js","sourceRoot":"","sources":["../src/inject.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAG/C,MAAM,UAAU,GAAG,UAAU,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,iBAAiB,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;AAEvE,EAAE,CAAC,aAAa,CAAC,CAAC,GAAG,EAAE,EAAE;IACvB,WAAW,CAAC,GAAG,EAAE;QACf,UAAU,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;IAC/B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAGH,SAAS,YAAY,CAAC,IAAY;IAChC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,IAAI,GAAG;IACX,SAAS,EAAE,WAAW;CACvB,CAAC;AACF,MAAM,OAAO,GAAG;IACd,YAAY;CACb,CAAC;AACF,MAAM,KAAK,GAAG;IACZ,WAAW,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK;CACpC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export type Assign<O1, O2> = Omit<O1, keyof O2> & O2;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Assign.js","sourceRoot":"","sources":["../../src/types/Assign.ts"],"names":[],"mappings":""}
|
|
@@ -10,7 +10,7 @@ export type Mark<TMark extends object> = Required<WechatMiniprogram.CustomEvent<
|
|
|
10
10
|
export type Detail<T> = WMCustomEvent<T>;
|
|
11
11
|
export type CurrentTargetDataset<T extends object> = WMCustomEvent<{}, {}, T>;
|
|
12
12
|
export type TargetDataset<TargetDataset extends object> = WMCustomEvent<{}, {}, {}, TargetDataset>;
|
|
13
|
-
export type WMComponentOption = WechatMiniprogram.Component.
|
|
13
|
+
export type WMComponentOption = WechatMiniprogram.Component.ComponentOptions;
|
|
14
14
|
export type WMNavigateToSuccessCallbackResult = WechatMiniprogram.NavigateToSuccessCallbackResult;
|
|
15
15
|
export type WMCompPageLifetimes = WechatMiniprogram.Component.PageLifetimes;
|
|
16
16
|
export type WMComponentInstance = WechatMiniprogram.Component.InstanceProperties;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "annil",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.5.0",
|
|
4
4
|
"description": "微信小程序(原生开发)插件",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "src/index.ts",
|
|
@@ -53,10 +53,8 @@
|
|
|
53
53
|
],
|
|
54
54
|
"author": "missannil",
|
|
55
55
|
"license": "MIT",
|
|
56
|
-
"dependencies": {
|
|
57
|
-
"hry-types": "^0.17.0"
|
|
58
|
-
},
|
|
59
56
|
"peerDependencies": {
|
|
57
|
+
"hry-types": "^0.17.0",
|
|
60
58
|
"miniprogram-api-typings": "^3.12.2"
|
|
61
59
|
}
|
|
62
60
|
}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import type { Func } from "hry-types/src/Misc/_api";
|
|
2
|
+
import { instanceConfig } from "../..";
|
|
2
3
|
import { BBeforeCreate } from "../../behaviors/BbeforeCreated";
|
|
3
4
|
import { BComputedAndWatch } from "../../behaviors/BComputedAndWatch";
|
|
4
5
|
import type { ComputedCache, Instance } from "../../behaviors/BComputedAndWatch/types";
|
|
5
6
|
import { BStore } from "../../behaviors/BStore";
|
|
7
|
+
import { Assign } from "../../types/Assign";
|
|
6
8
|
import type { WMComponent } from "../../types/OfficialTypeAlias";
|
|
7
9
|
import { INNERMARKER } from "../../utils/InnerMarker";
|
|
8
10
|
import { isEmptyObject } from "../../utils/isEmptyObject";
|
|
@@ -292,6 +294,44 @@ function collectRootComponentOption(
|
|
|
292
294
|
otherFieldsHandle(finalOptions, rootComponentOptions);
|
|
293
295
|
}
|
|
294
296
|
|
|
297
|
+
/**
|
|
298
|
+
* 合并 source 对象字段到 target字段
|
|
299
|
+
* @remarks 规则：
|
|
300
|
+
* 1. behaviors字段 源对象在前
|
|
301
|
+
* 2. 对象字段 源覆盖目标
|
|
302
|
+
* @param target - 目标对象
|
|
303
|
+
* @param source - 源对象
|
|
304
|
+
* @returns 按规则合并后的对象
|
|
305
|
+
*/
|
|
306
|
+
function merge<Target extends object, Source extends object>(target: Target, source: Source): Assign<Target, Source> {
|
|
307
|
+
for (const key in source) {
|
|
308
|
+
const sourceVal = source[key];
|
|
309
|
+
if (key in target) {
|
|
310
|
+
// @ts-ignore
|
|
311
|
+
const targetVal = target[key];
|
|
312
|
+
switch (key) {
|
|
313
|
+
case "behaviors":
|
|
314
|
+
{
|
|
315
|
+
// @ts-ignore
|
|
316
|
+
target[key] = [...sourceVal, ...targetVal];
|
|
317
|
+
}
|
|
318
|
+
break;
|
|
319
|
+
|
|
320
|
+
default:
|
|
321
|
+
{
|
|
322
|
+
// @ts-ignore 源覆盖目标
|
|
323
|
+
target[key] = Object.assign(targetVal, sourceVal);
|
|
324
|
+
}
|
|
325
|
+
break;
|
|
326
|
+
}
|
|
327
|
+
} else {
|
|
328
|
+
// @ts-ignore
|
|
329
|
+
target[key] = sourceVal;
|
|
330
|
+
}
|
|
331
|
+
}
|
|
332
|
+
|
|
333
|
+
return target as unknown as Assign<Target, Source>;
|
|
334
|
+
}
|
|
295
335
|
/**
|
|
296
336
|
* 返回一个由rootComponentOption和subComponentsList配置整合的对象
|
|
297
337
|
* @param rootComponentOption -
|
|
@@ -303,18 +343,14 @@ export function collectOptionsForComponent(
|
|
|
303
343
|
): FinalOptionsOfComponent {
|
|
304
344
|
const rootComponentOption = defineComponentOption.rootComponent;
|
|
305
345
|
const subComponentsList = defineComponentOption.subComponents;
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
addGlobalClass: true, // "styleIsolation": "apply-shared"
|
|
309
|
-
multipleSlots: true,
|
|
310
|
-
pureDataPattern: /^_/,
|
|
311
|
-
virtualHost: true,
|
|
312
|
-
},
|
|
313
|
-
behaviors: [BStore, BComputedAndWatch],
|
|
314
|
-
methods: {},
|
|
346
|
+
|
|
347
|
+
const finalOptionsForComponent: FinalOptionsOfComponent = merge(instanceConfig.injectInfo || {}, {
|
|
315
348
|
observers: {},
|
|
316
349
|
data: {},
|
|
317
|
-
|
|
350
|
+
methods: {},
|
|
351
|
+
behaviors: [BStore, BComputedAndWatch],
|
|
352
|
+
});
|
|
353
|
+
|
|
318
354
|
/**
|
|
319
355
|
* 有些字段配置同时存在根组件和子组件当中(如pageLifetimes，lifetimes,watch字段), 且key相同值类型为函数。funcConfig对象用于收集这些配置为数组形式,最终再一起整合进finalOptionsForComponent配置中。即funcConfig是一个临时中介对象。
|
|
320
356
|
*/
|
|
@@ -350,7 +386,7 @@ export function collectOptionsForComponent(
|
|
|
350
386
|
/* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
|
|
351
387
|
finalOptionsForComponent.isPage
|
|
352
388
|
// 页面时删除预设的虚拟组件字段
|
|
353
|
-
&& Reflect.deleteProperty(finalOptionsForComponent.options
|
|
389
|
+
&& finalOptionsForComponent.options && Reflect.deleteProperty(finalOptionsForComponent.options, "virtualHost");
|
|
354
390
|
|
|
355
391
|
// BBeforeCreate在最后面,让BeforeCreate生命周期运行在最终建立组件时。
|
|
356
392
|
finalOptionsForComponent.behaviors!.push(BBeforeCreate);
|
|
@@ -54,6 +54,7 @@ export type DefineComponentOption = {
|
|
|
54
54
|
*/
|
|
55
55
|
export const DefineComponent: DefineComponentConstructor = function(options): any {
|
|
56
56
|
// console.log("---------------------------");
|
|
57
|
+
|
|
57
58
|
Component(
|
|
58
59
|
collectOptionsForComponent(options as DefineComponentOption) as any,
|
|
59
60
|
);
|