annil 1.3.0-dev.202312100 → 1.4.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 +26 -0
- package/README.md +28 -16
- package/dist/api/DefineComponent/collectOptionsForComponent.d.ts +11 -6
- package/dist/api/DefineComponent/collectOptionsForComponent.js +30 -35
- package/dist/api/DefineComponent/collectOptionsForComponent.js.map +1 -1
- package/dist/api/DefineComponent/index.js.map +1 -1
- package/dist/api/RootComponent/CustomEvents/test/GetCustomEventDoc.test.js +0 -1
- package/dist/api/RootComponent/CustomEvents/test/GetCustomEventDoc.test.js.map +1 -1
- package/dist/api/RootComponent/CustomEvents/test/GetFullEventDoc.test.js +0 -1
- package/dist/api/RootComponent/CustomEvents/test/GetFullEventDoc.test.js.map +1 -1
- package/dist/api/RootComponent/CustomEvents/test/GetShortEventDoc.test.js +0 -1
- package/dist/api/RootComponent/CustomEvents/test/GetShortEventDoc.test.js.map +1 -1
- package/dist/api/RootComponent/Lifetimes/test/error.test.js +1 -1
- package/dist/api/RootComponent/Lifetimes/test/error.test.js.map +1 -1
- package/dist/api/RootComponent/Lifetimes/test/normal.test.js +1 -1
- package/dist/api/RootComponent/Lifetimes/test/normal.test.js.map +1 -1
- package/dist/api/RootComponent/PageLifetimes/PageLifetimesOption.d.ts +1 -1
- package/dist/api/RootComponent/index.js +1 -1
- package/dist/api/RootComponent/index.js.map +1 -1
- package/dist/api/navigateTo.js.map +1 -1
- package/dist/behaviors/BComputedAndWatch/computedUpdater.js +2 -11
- package/dist/behaviors/BComputedAndWatch/computedUpdater.js.map +1 -1
- package/dist/behaviors/BComputedAndWatch/data-tracer.js +3 -0
- package/dist/behaviors/BComputedAndWatch/data-tracer.js.map +1 -1
- package/dist/behaviors/BComputedAndWatch/getPathsValue.d.ts +1 -2
- package/dist/behaviors/BComputedAndWatch/getPathsValue.js +2 -2
- package/dist/behaviors/BComputedAndWatch/getPathsValue.js.map +1 -1
- package/dist/behaviors/BComputedAndWatch/getPropertiesValue.d.ts +2 -0
- package/dist/behaviors/BComputedAndWatch/getPropertiesValue.js +41 -0
- package/dist/behaviors/BComputedAndWatch/getPropertiesValue.js.map +1 -0
- package/dist/behaviors/BComputedAndWatch/index.js +36 -39
- package/dist/behaviors/BComputedAndWatch/index.js.map +1 -1
- package/dist/behaviors/BComputedAndWatch/initComputed.d.ts +4 -8
- package/dist/behaviors/BComputedAndWatch/initComputed.js +16 -40
- package/dist/behaviors/BComputedAndWatch/initComputed.js.map +1 -1
- package/dist/behaviors/BComputedAndWatch/isEqual.js.map +1 -1
- package/dist/behaviors/BComputedAndWatch/types.d.ts +8 -5
- package/dist/behaviors/BStore.js +1 -4
- package/dist/behaviors/BStore.js.map +1 -1
- package/dist/behaviors/BbeforeCreated.js.map +1 -1
- package/dist/thirdLib/index.js +1 -2
- package/dist/thirdLib/index.js.map +1 -1
- package/dist/utils/InnerMarker.js.map +1 -1
- package/dist/utils/isEmptyObject.d.ts +1 -1
- package/dist/utils/isEmptyObject.js.map +1 -1
- package/package.json +7 -4
- package/src/api/DefineComponent/collectOptionsForComponent.ts +57 -58
- package/src/api/DefineComponent/index.ts +1 -1
- package/src/api/RootComponent/Lifetimes/test/error.test.ts +1 -1
- package/src/api/RootComponent/Lifetimes/test/normal.test.ts +1 -1
- package/src/api/RootComponent/PageLifetimes/PageLifetimesOption.ts +1 -1
- package/src/api/RootComponent/Watch/test/WatchProperties.test.ts +1 -1
- package/src/api/RootComponent/index.ts +1 -1
- package/src/api/navigateTo.ts +1 -0
- package/src/behaviors/BComputedAndWatch/computedUpdater.ts +2 -20
- package/src/behaviors/BComputedAndWatch/data-tracer.ts +6 -1
- package/src/behaviors/BComputedAndWatch/getPathsValue.ts +2 -4
- package/src/behaviors/BComputedAndWatch/getPropertiesValue.ts +57 -0
- package/src/behaviors/BComputedAndWatch/index.ts +55 -59
- package/src/behaviors/BComputedAndWatch/initComputed.ts +36 -90
- package/src/behaviors/BComputedAndWatch/isEqual.ts +1 -0
- package/src/behaviors/BComputedAndWatch/types.ts +13 -11
- package/src/behaviors/BStore.ts +3 -7
- package/src/behaviors/BbeforeCreated.ts +5 -2
- package/src/utils/InnerMarker.ts +1 -2
- package/src/utils/isEmptyObject.ts +1 -1
- package/tsconfig.json +26 -0
- package/dist/behaviors/BComputedAndWatch/IsPage.d.ts +0 -2
- package/dist/behaviors/BComputedAndWatch/IsPage.js +0 -4
- package/dist/behaviors/BComputedAndWatch/IsPage.js.map +0 -1
- package/src/behaviors/BComputedAndWatch/IsPage.ts +0 -5
|
@@ -1,54 +1,51 @@
|
|
|
1
1
|
import { deepClone } from "../../utils/deepClone";
|
|
2
2
|
import { deleteProtoField } from "../../utils/deleteProtoField";
|
|
3
3
|
import { isEmptyObject } from "../../utils/isEmptyObject";
|
|
4
|
+
import { computedUpdater } from "./computedUpdater";
|
|
4
5
|
import { getPathsValue } from "./getPathsValue";
|
|
6
|
+
import { getPropertiesValue } from "./getPropertiesValue";
|
|
5
7
|
import { initComputed } from "./initComputed";
|
|
6
8
|
import { isEqual } from "./isEqual";
|
|
7
|
-
import { isPage } from "./IsPage";
|
|
8
9
|
function initWatchOldValue(watchConfig) {
|
|
9
10
|
const watchOldValue = {};
|
|
10
11
|
for (const key in watchConfig) {
|
|
11
|
-
watchOldValue[key] = deepClone(getPathsValue
|
|
12
|
+
watchOldValue[key] = deepClone(getPathsValue(this.data, key));
|
|
12
13
|
}
|
|
13
14
|
return watchOldValue;
|
|
14
15
|
}
|
|
15
16
|
export const BComputedAndWatch = Behavior({
|
|
16
17
|
definitionFilter(options) {
|
|
18
|
+
const rawPropertiesValue = getPropertiesValue(options.properties);
|
|
19
|
+
const methodOpt = options.methods;
|
|
17
20
|
const computedConfig = options.computed;
|
|
18
21
|
if (computedConfig && !isEmptyObject(computedConfig)) {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
case "待更新":
|
|
33
|
-
{
|
|
34
|
-
const isUpdated = this.__computedUpdater__();
|
|
35
|
-
if (isUpdated) {
|
|
36
|
-
this.__computedStatus__ = "更新完毕";
|
|
37
|
-
}
|
|
38
|
-
else {
|
|
39
|
-
originalFunc && originalFunc.call(this);
|
|
40
|
-
}
|
|
22
|
+
const computedCache = initComputed(options, computedConfig, Object.assign(Object.assign({}, options.data), rawPropertiesValue));
|
|
23
|
+
methodOpt.__computedInitCache__ = () => computedCache;
|
|
24
|
+
}
|
|
25
|
+
const observersConfig = options.observers;
|
|
26
|
+
const originalFunc = observersConfig["**"];
|
|
27
|
+
observersConfig["**"] = function () {
|
|
28
|
+
const computedStatus = this.__computedStatus__;
|
|
29
|
+
switch (computedStatus) {
|
|
30
|
+
case "待更新":
|
|
31
|
+
{
|
|
32
|
+
const isUpdated = this.__computedUpdater__();
|
|
33
|
+
if (isUpdated) {
|
|
34
|
+
this.__computedStatus__ = "更新完毕";
|
|
41
35
|
}
|
|
42
|
-
|
|
43
|
-
case "更新完毕":
|
|
44
|
-
{
|
|
45
|
-
this.__computedStatus__ = "待更新";
|
|
36
|
+
else {
|
|
46
37
|
originalFunc && originalFunc.call(this);
|
|
47
38
|
}
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
39
|
+
}
|
|
40
|
+
break;
|
|
41
|
+
case "更新完毕":
|
|
42
|
+
{
|
|
43
|
+
this.__computedStatus__ = "待更新";
|
|
44
|
+
originalFunc && originalFunc.call(this);
|
|
45
|
+
}
|
|
46
|
+
break;
|
|
47
|
+
}
|
|
48
|
+
};
|
|
52
49
|
const watchConfig = options.watch;
|
|
53
50
|
if (watchConfig && !isEmptyObject(watchConfig)) {
|
|
54
51
|
const methodsConfig = options.methods || (options.methods = {});
|
|
@@ -69,18 +66,18 @@ export const BComputedAndWatch = Behavior({
|
|
|
69
66
|
},
|
|
70
67
|
lifetimes: {
|
|
71
68
|
created() {
|
|
72
|
-
var _a;
|
|
73
|
-
const
|
|
69
|
+
var _a, _b;
|
|
70
|
+
const __computedInitCache__ = (_a = this.__computedInitCache__) === null || _a === void 0 ? void 0 : _a.call(this);
|
|
71
|
+
this.__computedCache__ = __computedInitCache__;
|
|
72
|
+
deleteProtoField(this, "__computedInitCache__");
|
|
73
|
+
this.__computedStatus__ = "待更新";
|
|
74
|
+
this.__computedUpdater__ = computedUpdater.bind(this);
|
|
75
|
+
const watchConfig = (_b = this.__watchConfig__) === null || _b === void 0 ? void 0 : _b.call(this);
|
|
74
76
|
deleteProtoField(this, "__watchConfig__");
|
|
75
77
|
if (watchConfig) {
|
|
76
78
|
this.__watchOldValue__ = initWatchOldValue.call(this, watchConfig);
|
|
77
79
|
}
|
|
78
80
|
},
|
|
79
|
-
attached() {
|
|
80
|
-
if (!isPage(this)) {
|
|
81
|
-
initComputed.call(this);
|
|
82
|
-
}
|
|
83
|
-
},
|
|
84
81
|
},
|
|
85
82
|
});
|
|
86
83
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/behaviors/BComputedAndWatch/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/behaviors/BComputedAndWatch/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,9 @@
|
|
|
1
1
|
import type { Func } from "hry-types/src/Misc/Func";
|
|
2
|
-
import type {
|
|
2
|
+
import type { FinalOptionsOfComponent } from "../../api/DefineComponent/collectOptionsForComponent";
|
|
3
|
+
import type { ComputedCache, ItemCache } from "./types";
|
|
3
4
|
export type ComputedDependence = {
|
|
4
5
|
paths: string[];
|
|
5
6
|
val: unknown;
|
|
6
7
|
};
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
value: unknown;
|
|
10
|
-
};
|
|
11
|
-
export declare function getComputedInfo(this: Instance, computedKeys: string[], computedFunc: Func, key: string): false | ComputedInfo;
|
|
12
|
-
export declare function initComputed(this: Instance): void;
|
|
13
|
-
export {};
|
|
8
|
+
export declare function getItemCache(initAllData: object, computedKeys: string[], computedFunc: Func): false | ItemCache;
|
|
9
|
+
export declare function initComputed(options: FinalOptionsOfComponent, computedConfig: Record<string, Func>, initAllData: object, uninitedkeys?: string[], computedCache?: ComputedCache): ComputedCache;
|
|
@@ -1,33 +1,21 @@
|
|
|
1
|
-
import { deleteProtoField } from "../../utils/deleteProtoField";
|
|
2
|
-
import { computedUpdater } from "./computedUpdater";
|
|
3
1
|
import { deepProxy, unwrap } from "./data-tracer";
|
|
4
2
|
function isValidDependences(dependences, computedKeys) {
|
|
5
3
|
for (const { paths: path, val } of dependences) {
|
|
6
|
-
if (val === undefined && computedKeys.includes(path[0])) {
|
|
4
|
+
if ((val === undefined) && computedKeys.includes(path[0])) {
|
|
7
5
|
return false;
|
|
8
6
|
}
|
|
9
7
|
}
|
|
10
8
|
return true;
|
|
11
9
|
}
|
|
12
|
-
export function
|
|
10
|
+
export function getItemCache(initAllData, computedKeys, computedFunc) {
|
|
13
11
|
const dependences = [];
|
|
14
|
-
|
|
15
|
-
const _this = this;
|
|
16
|
-
const computedThis = new Proxy({ data: deepProxy(this.data, dependences) }, {
|
|
17
|
-
get(target, key) {
|
|
18
|
-
if (key === "data") {
|
|
19
|
-
return Reflect.get(target, key);
|
|
20
|
-
}
|
|
21
|
-
return Reflect.get(_this, key);
|
|
22
|
-
},
|
|
23
|
-
});
|
|
24
|
-
initValue = computedFunc.call(computedThis);
|
|
12
|
+
const initValue = computedFunc.call({ data: deepProxy(initAllData, dependences) });
|
|
25
13
|
if (isValidDependences(dependences, computedKeys)) {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
14
|
+
return {
|
|
15
|
+
dependences: uniqueDependences(dependences),
|
|
16
|
+
method: computedFunc,
|
|
17
|
+
value: unwrap(initValue),
|
|
18
|
+
};
|
|
31
19
|
}
|
|
32
20
|
else {
|
|
33
21
|
return false;
|
|
@@ -52,35 +40,23 @@ function uniqueDependences(dependences) {
|
|
|
52
40
|
}
|
|
53
41
|
return dependences;
|
|
54
42
|
}
|
|
55
|
-
function
|
|
43
|
+
export function initComputed(options, computedConfig, initAllData, uninitedkeys = Object.keys(computedConfig), computedCache = {}) {
|
|
56
44
|
for (const key of uninitedkeys) {
|
|
57
|
-
const
|
|
45
|
+
const itemCache = getItemCache(initAllData, uninitedkeys, computedConfig[key]);
|
|
58
46
|
uninitedkeys = uninitedkeys.filter(ele => ele !== key);
|
|
59
|
-
if (
|
|
47
|
+
if (itemCache === false) {
|
|
60
48
|
uninitedkeys.push(key);
|
|
61
49
|
}
|
|
62
50
|
else {
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
};
|
|
51
|
+
const dataOpt = options.data || (options.data = {});
|
|
52
|
+
dataOpt[key] = itemCache.value;
|
|
53
|
+
initAllData[key] = itemCache.value;
|
|
54
|
+
computedCache[key] = itemCache;
|
|
68
55
|
}
|
|
69
56
|
}
|
|
70
57
|
if (uninitedkeys.length === 0) {
|
|
71
58
|
return computedCache;
|
|
72
59
|
}
|
|
73
|
-
return
|
|
74
|
-
}
|
|
75
|
-
export function initComputed() {
|
|
76
|
-
var _a;
|
|
77
|
-
const computedConfig = (_a = this.__computedConfig__) === null || _a === void 0 ? void 0 : _a.call(this);
|
|
78
|
-
deleteProtoField(this, "__computedConfig__");
|
|
79
|
-
if (computedConfig) {
|
|
80
|
-
this.__computedStatus__ = "初始化中";
|
|
81
|
-
this.__computedCache__ = _initComputed.call(this, computedConfig, Object.keys(computedConfig));
|
|
82
|
-
this.__computedUpdater__ = computedUpdater.bind(this);
|
|
83
|
-
this.__computedStatus__ = "待更新";
|
|
84
|
-
}
|
|
60
|
+
return initComputed(options, computedConfig, initAllData, uninitedkeys, computedCache);
|
|
85
61
|
}
|
|
86
62
|
//# sourceMappingURL=initComputed.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initComputed.js","sourceRoot":"","sources":["../../../src/behaviors/BComputedAndWatch/initComputed.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"initComputed.js","sourceRoot":"","sources":["../../../src/behaviors/BComputedAndWatch/initComputed.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isEqual.js","sourceRoot":"","sources":["../../../src/behaviors/BComputedAndWatch/isEqual.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,OAAO,CAAC,KAAc,EAAE,KAAc;IACpD,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAC/F,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACjC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAGjC,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,EAAE,CAAC;QAClC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"isEqual.js","sourceRoot":"","sources":["../../../src/behaviors/BComputedAndWatch/isEqual.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,OAAO,CAAC,KAAc,EAAE,KAAc;IACpD,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAC/F,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACjC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAGjC,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,EAAE,CAAC;QAClC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QAExB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YAC7D,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -4,19 +4,22 @@ import type { ComputedDependence } from "./initComputed";
|
|
|
4
4
|
export type InstanceCustomFields = {
|
|
5
5
|
__pendingSetData__?: object | null;
|
|
6
6
|
__storeConfig__?: () => Record<string, () => unknown>;
|
|
7
|
-
__computedStatus__?: "
|
|
7
|
+
__computedStatus__?: "待更新" | "更新完毕";
|
|
8
8
|
__computedUpdater__: Func;
|
|
9
|
-
|
|
10
|
-
__computedCache__
|
|
9
|
+
__computedInitCache__?: () => ComputedCache;
|
|
10
|
+
__computedCache__: ComputedCache | undefined;
|
|
11
11
|
__watchOldValue__?: WatchOldValue;
|
|
12
12
|
__watchConfig__?: () => Record<string, Func>;
|
|
13
13
|
__compLoadList__?: Func[];
|
|
14
|
+
__prePropertiesValue__: object | undefined;
|
|
15
|
+
__setDataFromInner__?: boolean;
|
|
14
16
|
disposer: Record<string, Func>;
|
|
15
17
|
};
|
|
16
18
|
export type Instance = (ComponentInstance | PageInstance) & InstanceCustomFields;
|
|
17
|
-
export type
|
|
19
|
+
export type ItemCache = {
|
|
18
20
|
dependences: ComputedDependence[];
|
|
19
21
|
method: Func;
|
|
20
22
|
value: unknown;
|
|
21
|
-
}
|
|
23
|
+
};
|
|
24
|
+
export type ComputedCache = Record<string, ItemCache>;
|
|
22
25
|
export type WatchOldValue = Record<string, unknown[]>;
|
package/dist/behaviors/BStore.js
CHANGED
|
@@ -6,11 +6,8 @@ export const BStore = Behavior({
|
|
|
6
6
|
return;
|
|
7
7
|
const { toJS } = require("mobx");
|
|
8
8
|
for (const key in storeConfig) {
|
|
9
|
-
options.data || (options.data = {});
|
|
10
9
|
options.data[key] = toJS(storeConfig[key]());
|
|
11
|
-
options.methods || (options.methods = {});
|
|
12
10
|
options.methods.__storeConfig__ = () => storeConfig;
|
|
13
|
-
delete options.store;
|
|
14
11
|
}
|
|
15
12
|
},
|
|
16
13
|
lifetimes: {
|
|
@@ -19,6 +16,7 @@ export const BStore = Behavior({
|
|
|
19
16
|
const storeConfig = (_a = this.__storeConfig__) === null || _a === void 0 ? void 0 : _a.call(this);
|
|
20
17
|
if (!storeConfig)
|
|
21
18
|
return;
|
|
19
|
+
deleteProtoField(this, "__storeConfig__");
|
|
22
20
|
const { comparer, reaction, toJS } = require("mobx");
|
|
23
21
|
this.disposer = {};
|
|
24
22
|
for (const key in storeConfig) {
|
|
@@ -30,7 +28,6 @@ export const BStore = Behavior({
|
|
|
30
28
|
equals: comparer.structural,
|
|
31
29
|
});
|
|
32
30
|
}
|
|
33
|
-
deleteProtoField(this, "__storeConfig__");
|
|
34
31
|
},
|
|
35
32
|
detached() {
|
|
36
33
|
for (const key in this.disposer) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BStore.js","sourceRoot":"","sources":["../../src/behaviors/BStore.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAG7D,MAAM,CAAC,MAAM,MAAM,GAAG,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"BStore.js","sourceRoot":"","sources":["../../src/behaviors/BStore.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAG7D,MAAM,CAAC,MAAM,MAAM,GAAG,QAAQ,CAAC;IAE7B,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,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAG7C,OAAO,CAAC,OAAO,CAAC,eAAe,GAAG,GAAG,EAAE,CAAC,WAAW,CAAC;QACtD,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,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;YAE1C,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;QACH,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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BbeforeCreated.js","sourceRoot":"","sources":["../../src/behaviors/BbeforeCreated.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,aAAa,GAAG,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"BbeforeCreated.js","sourceRoot":"","sources":["../../src/behaviors/BbeforeCreated.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,aAAa,GAAG,QAAQ,CAAC;IAEpC,gBAAgB,CACd,OAAwF;QAGxF,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAU,CAAC,YAAY,CAAC;QAEzD,gBAAgB,IAAI,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;CACF,CAAC,CAAC"}
|
package/dist/thirdLib/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/thirdLib/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/thirdLib/index.ts"],"names":[],"mappings":""}
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"InnerMarker.js","sourceRoot":"","sources":["../../src/utils/InnerMarker.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,GAAG,EAAE,WAAW;CACjB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare function isEmptyObject(obj:
|
|
1
|
+
export declare function isEmptyObject(obj: object): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isEmptyObject.js","sourceRoot":"","sources":["../../src/utils/isEmptyObject.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"isEmptyObject.js","sourceRoot":"","sources":["../../src/utils/isEmptyObject.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,aAAa,CAAC,GAAW;IACvC,IACE,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,YAAY,GAAG,IAAI,GAAG,YAAY,GAAG;WACtG,GAAG,YAAY,OAAO,IAAI,GAAG,YAAY,OAAO,EACnD,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;AAC3C,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "annil",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.4.0",
|
|
4
4
|
"description": "微信小程序(原生开发)插件",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "src/index.ts",
|
|
@@ -42,7 +42,8 @@
|
|
|
42
42
|
"CHANGELOG.md",
|
|
43
43
|
"README.md",
|
|
44
44
|
"src",
|
|
45
|
-
"dist"
|
|
45
|
+
"dist",
|
|
46
|
+
"tsconfig.json"
|
|
46
47
|
],
|
|
47
48
|
"keywords": [
|
|
48
49
|
"mini",
|
|
@@ -53,7 +54,9 @@
|
|
|
53
54
|
"author": "missannil",
|
|
54
55
|
"license": "MIT",
|
|
55
56
|
"dependencies": {
|
|
56
|
-
"hry-types": "^0.17.0"
|
|
57
|
-
|
|
57
|
+
"hry-types": "^0.17.0"
|
|
58
|
+
},
|
|
59
|
+
"peerDependencies": {
|
|
60
|
+
"miniprogram-api-typings": "^3.12.2"
|
|
58
61
|
}
|
|
59
62
|
}
|