annil 1.7.4 → 1.7.5-beta.4

package/dist/api/DefineComponent/normalizeOptions/customEventsHandle.d.ts

@@ -0,0 +1,6 @@
+import type { CustomEventConstraint } from "../../RootComponent/CustomEvents/CustomEventConstraint";
+import type { FinalOptionsOfComponent } from ".";
+/**
+ * 把customEvents字段配置变成函数放入到componentOptions.methods中
+ */
+export declare function customEventsHandle(methods: FinalOptionsOfComponent["methods"], customEventsConfig: CustomEventConstraint): void;

package/dist/api/DefineComponent/normalizeOptions/customEventsHandle.js

@@ -0,0 +1,23 @@
+// 类型守卫
+function IsFullCustomEvents(customEventOptions) {
+    return Object.prototype.toString.call(customEventOptions) === "[object Object]";
+}
+/**
+ * 把customEvents字段配置变成函数放入到componentOptions.methods中
+ */
+export function customEventsHandle(methods, customEventsConfig) {
+    for (const key in customEventsConfig) {
+        const customEventOptions = customEventsConfig[key];
+        if (IsFullCustomEvents(customEventOptions)) {
+            methods[key] = function (detail) {
+                this.triggerEvent(key, detail, customEventOptions.options);
+            };
+        }
+        else {
+            methods[key] = function (detail) {
+                this.triggerEvent(key, detail);
+            };
+        }
+    }
+}
+//# sourceMappingURL=customEventsHandle.js.map

package/dist/api/DefineComponent/normalizeOptions/customEventsHandle.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"customEventsHandle.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/customEventsHandle.ts"],"names":[],"mappings":"AAOA,OAAO;AACP,SAAS,kBAAkB,CACzB,kBAAgC;IAEhC,OAAO,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,iBAAiB,CAAC;AAClF,CAAC;AACD;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAChC,OAA2C,EAC3C,kBAAyC;IAEzC,KAAK,MAAM,GAAG,IAAI,kBAAkB,EAAE,CAAC;QACrC,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAEnD,IAAI,kBAAkB,CAAC,kBAAkB,CAAC,EAAE,CAAC;YAC3C,OAAO,CAAC,GAAG,CAAC,GAAG,UAAyB,MAAe;gBACrD,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC;YAC7D,CAAC,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,GAAG,UAAyB,MAAe;gBACrD,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACjC,CAAC,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/hijackHandle/index.d.ts

@@ -0,0 +1,6 @@
+import type { Func } from "hry-types/src/Misc/Func";
+import type { FinalOptionsOfComponent } from "..";
+/**
+ * 劫持指定配置字段,在原有配置前执行指定函数
+ */
+export declare function hijack<T extends FinalOptionsOfComponent[keyof FinalOptionsOfComponent]>(config: T, field: keyof T, before: Func[]): void;

package/dist/api/DefineComponent/normalizeOptions/hijackHandle/index.js

@@ -0,0 +1,16 @@
+/**
+ * 劫持指定配置字段,在原有配置前执行指定函数
+ */
+export function hijack(config, field, before) {
+    // @ts-ignore 隐式索引
+    const originalFunc = config[field];
+    // @ts-ignore 隐式索引
+    config[field] = function (...args) {
+        before.forEach(func => func.call(this, ...args));
+        if (originalFunc)
+            originalFunc.apply(this, args);
+        // after.forEach(func => func.call(this, ...args));
+    };
+    return;
+}
+//# sourceMappingURL=index.js.map

package/dist/api/DefineComponent/normalizeOptions/hijackHandle/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/hijackHandle/index.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,UAAU,MAAM,CACpB,MAAS,EACT,KAAc,EACd,MAAc;IAGd,kBAAkB;IAClB,MAAM,YAAY,GAAqB,MAAM,CAAC,KAAK,CAAC,CAAC;IAErD,kBAAkB;IAClB,MAAM,CAAC,KAAK,CAAC,GAAG,UAAS,GAAG,IAAe;QACzC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;QAEjD,IAAI,YAAY;YAAE,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAEjD,mDAAmD;IACrD,CAAC,CAAC;IAEF,OAAO;AACT,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/hijackHandle/isPageCheck.d.ts

@@ -0,0 +1,5 @@
+import type { Instance } from "../../../RootComponent/Instance/RootComponentInstance";
+/**
+ * 劫持attached,根据this.route做判断 isPage值是否正确
+ */
+export declare function isPageCheck(isPage: boolean | undefined): (this: Instance) => void;

package/dist/api/DefineComponent/normalizeOptions/hijackHandle/isPageCheck.js

@@ -0,0 +1,17 @@
+/**
+ * 劫持attached,根据this.route做判断 isPage值是否正确
+ */
+export function isPageCheck(isPage) {
+    return function () {
+        const route = this.route;
+        if (route && isPage !== true) {
+            // 页面isPage值错误
+            throw Error(`页面 /${route} 中, RootComponent构建页面时,isPage字段值应为 true`);
+        }
+        if (!route && isPage !== false && isPage !== undefined) {
+            // 组件写了isPage = true
+            throw Error(`组件 ${this.is} 中  RootComponent构建组件时,可不写isPage字段或值为 false`);
+        }
+    };
+}
+//# sourceMappingURL=isPageCheck.js.map

package/dist/api/DefineComponent/normalizeOptions/hijackHandle/isPageCheck.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"isPageCheck.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/hijackHandle/isPageCheck.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,UAAU,WAAW,CAAC,MAA2B;IACrD,OAAO;QACL,MAAM,KAAK,GAAI,IAAqB,CAAC,KAA2B,CAAC;QACjE,IAAI,KAAK,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YAC7B,cAAc;YACd,MAAM,KAAK,CACT,OAAO,KAAK,yCAAyC,CACtD,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,KAAK,IAAI,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACvD,oBAAoB;YACpB,MAAM,KAAK,CACT,MAAM,IAAI,CAAC,EAAE,6CAA6C,CAC3D,CAAC;QACJ,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/hijackHandle/loadReceivedDataHandle.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 针对通过 navigateTo传过来的数据对组件load周期传入数据解析
+ * @param option - option中的url是拼接了encodeURIComponent转码的data对象的,key为INNERMARKER.url
+ */
+import { INNERMARKER } from "../../../../utils/InnerMarker";
+import type { PageInstance } from "../../../RootComponent/Instance/RootComponentInstance";
+export declare function loadReceivedDataHandle(this: PageInstance, option: Record<typeof INNERMARKER.url, string>): void;

package/dist/api/DefineComponent/normalizeOptions/hijackHandle/loadReceivedDataHandle.js

@@ -0,0 +1,20 @@
+/**
+ * 针对通过 navigateTo传过来的数据对组件load周期传入数据解析
+ * @param option - option中的url是拼接了encodeURIComponent转码的data对象的,key为INNERMARKER.url
+ */
+import { INNERMARKER } from "../../../../utils/InnerMarker";
+/* istanbul ignore next miniprogram-simulate(当前版本 1.6.1) 无法测试load */
+export function loadReceivedDataHandle(option) {
+    const innerData = option[INNERMARKER.url];
+    // 未使用自定义的navigateTo
+    if (innerData === undefined)
+        return;
+    // 使用navigateTo API
+    const decodeOption = JSON.parse(decodeURIComponent(innerData));
+    for (const key in decodeOption) {
+        option[key] = decodeOption[key];
+    }
+    // 给onLoad劫持函数一个标记,判断在新框架下已经被解析过了
+    option[INNERMARKER.url] = INNERMARKER.url;
+}
+//# sourceMappingURL=loadReceivedDataHandle.js.map

package/dist/api/DefineComponent/normalizeOptions/hijackHandle/loadReceivedDataHandle.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"loadReceivedDataHandle.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/hijackHandle/loadReceivedDataHandle.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAG5D,oEAAoE;AACpE,MAAM,UAAU,sBAAsB,CAEpC,MAA8C;IAE9C,MAAM,SAAS,GAAuB,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAC9D,oBAAoB;IACpB,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO;IACpC,mBAAmB;IACnB,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC;IAE/D,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;QAC/B,MAAM,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;IAClC,CAAC;IACD,iCAAiC;IACjC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC;AAC5C,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/hijackHandle/onLoadReceivedDataHandle.d.ts

@@ -0,0 +1,10 @@
+/**
+ * 原生Component会对传入的对象字段匹配的properties字段setData赋值。不符合字段或Page时不会赋值。
+ * 此函数为给实例setData赋值,默认传递值与properties相符(ts类型安全)。
+ * @param option - 传入onLoad的参数 有以下两种可能
+ * 1. 使用wx.navigateTo传值的。这种情况无内置字段 option[INNERMARKER.url] 等于 undefined
+ * 2. 使用插件提供的navigateTo传值。这种情况 INNERMARKER.url被load周期劫持函数解码后赋值INNERMARKER.url字段为本身,即option[INNERMARKER.url] 等于 INNERMARKER.url
+ */
+import { INNERMARKER } from "../../../../utils/InnerMarker";
+import type { PageInstance } from "../../../RootComponent/Instance/RootComponentInstance";
+export declare function onLoadReceivedDataHandle(this: PageInstance, option: Record<typeof INNERMARKER.url, string>): void;

package/dist/api/DefineComponent/normalizeOptions/hijackHandle/onLoadReceivedDataHandle.js

@@ -0,0 +1,26 @@
+/**
+ * 原生Component会对传入的对象字段匹配的properties字段setData赋值。不符合字段或Page时不会赋值。
+ * 此函数为给实例setData赋值,默认传递值与properties相符(ts类型安全)。
+ * @param option - 传入onLoad的参数 有以下两种可能
+ * 1. 使用wx.navigateTo传值的。这种情况无内置字段 option[INNERMARKER.url] 等于 undefined
+ * 2. 使用插件提供的navigateTo传值。这种情况 INNERMARKER.url被load周期劫持函数解码后赋值INNERMARKER.url字段为本身,即option[INNERMARKER.url] 等于 INNERMARKER.url
+ */
+import { INNERMARKER } from "../../../../utils/InnerMarker";
+/* istanbul ignore next miniprogram-simulate(当前版本 1.6.1) 无法测试页面生命周期 */
+export function onLoadReceivedDataHandle(option) {
+    const innerData = option[INNERMARKER.url];
+    // 情况1为undefined,2为INNERMARKER.url有值但不是本身,说明是老框架。3所以innerData等于 INNERMARKER.url即有组件配置了load(新框架在pageLifetimes.load中提前解析了)
+    if (innerData === undefined)
+        return;
+    if (innerData !== INNERMARKER.url) {
+        // 需要情况2 需要解析
+        const decodeOption = JSON.parse(decodeURIComponent(innerData));
+        for (const key in decodeOption) {
+            option[key] = decodeOption[key];
+        }
+    }
+    // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+    delete option[INNERMARKER.url];
+    this.setData(option);
+}
+//# sourceMappingURL=onLoadReceivedDataHandle.js.map

package/dist/api/DefineComponent/normalizeOptions/hijackHandle/onLoadReceivedDataHandle.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"onLoadReceivedDataHandle.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/hijackHandle/onLoadReceivedDataHandle.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAG5D,sEAAsE;AACtE,MAAM,UAAU,wBAAwB,CAEtC,MAA8C;IAE9C,MAAM,SAAS,GAAuB,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAE9D,wHAAwH;IACxH,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO;IACpC,IAAI,SAAS,KAAK,WAAW,CAAC,GAAG,EAAE,CAAC;QAClC,aAAa;QACb,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC;QAC/D,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;YAC/B,MAAM,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAED,gEAAgE;IAChE,OAAO,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAE/B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;AACvB,CAAC"}

package/dist/api/DefineComponent/{assignOptions → normalizeOptions}/index.d.ts

@@ -1,8 +1,6 @@
 import type { Func } from "hry-types/src/Misc/_api";
-import type { WMComponent } from "../../../types/OfficialTypeAlias";
 import type { ComputedConstraint } from "../../RootComponent/Computed/ComputedConstraint";
 import type { DataConstraint } from "../../RootComponent/Data/DataConstraint";
-import type { ComponentInstance, PageInstance } from "../../RootComponent/Instance/RootComponentInstance";
 import type { LifetimesConstraint } from "../../RootComponent/Lifetimes/LifetimesConstraint";
 import type { MethodsConstraint } from "../../RootComponent/Methods/MethodsConstraint";
 import type { PageLifetimesOption } from "../../RootComponent/PageLifetimes/PageLifetimesOption";
@@ -10,13 +8,6 @@ import type { PropertiesConstraint } from "../../RootComponent/Properties/Proper
 import type { StoreConstraint } from "../../RootComponent/Store/StoreConstraint";
 import type { DefineComponentOption } from "..";
 import type { ComputedCache } from "./computedWatchHandle/initComputedAndGetCache";
-type InstanceInnerFields = {
-    data: OptionsInnerFields["data"];
-    disposer: Record<string, Func>;
-    cloneData: OptionsInnerFields["data"];
-} & OptionsInnerFields["methods"];
-export type Instance = (ComponentInstance | PageInstance) & InstanceInnerFields;
-export type FuncOptions = Record<"pageLifetimes" | "lifetimes" | "watch" | "observers", Record<string, Func[]>>;
 export type WatchOldValue = Record<string, unknown[]>;
 export type OptionsInnerFields = {
     data: {
@@ -29,6 +20,14 @@ export type OptionsInnerFields = {
         __computedUpdater__?: Func;
     };
 };
+/**
+ * 临时的函数配置项
+ * 把根组件与子组件中配置类型为函数的相同字段配置收集在一起(数组)
+ */
+export type SameFuncOptions = Record<"pageLifetimes" | "lifetimes" | "watch" | "observers", Record<string, Func[]>>;
+/**
+ * 最终传入原生Component的配置项
+ */
 export type FinalOptionsOfComponent = {
     data: DataConstraint & OptionsInnerFields["data"];
     observers: Record<string, Func>;
@@ -36,14 +35,17 @@ export type FinalOptionsOfComponent = {
     methods: MethodsConstraint & OptionsInnerFields["methods"];
     externalClasses: string[];
     pageLifetimes: PageLifetimesOption<false, object>["pageLifetimes"] & {};
-    isPage?: boolean;
-    options?: WMComponent.Options;
-    properties?: PropertiesConstraint;
+    isPage: boolean;
+    options: WechatMiniprogram.Component.ComponentOptions;
+    properties: PropertiesConstraint;
     store?: StoreConstraint;
-    computed?: ComputedConstraint;
-    watch?: Record<string, Func>;
-    lifetimes?: LifetimesConstraint;
+    computed: ComputedConstraint;
+    watch: Record<string, Func>;
+    lifetimes: LifetimesConstraint;
 };
-export declare function isPageCheck(isPage: boolean | undefined): (this: Instance) => void;
-export declare function assignOptions(defineComponentOption: DefineComponentOption): FinalOptionsOfComponent;
-export {};
+/**
+ * 把DefineComponentOption转化为原生Component API支持的配置
+ * @param defineComponentOption
+ * @returns  返回符合原生Component API配置
+ */
+export declare function normalizeOptions(defineComponentOption: DefineComponentOption): FinalOptionsOfComponent;

package/dist/api/DefineComponent/normalizeOptions/index.js

@@ -0,0 +1,77 @@
+import { instanceConfig } from "../../..";
+import { BBeforeCreate } from "../../../behaviors/BbeforeCreated";
+import { BStore } from "../../../behaviors/BStore";
+import { isEmptyObject } from "../../../utils/isEmptyObject";
+import { computedWatchHandle } from "./computedWatchHandle";
+import { hijack } from "./hijackHandle";
+import { isPageCheck } from "./hijackHandle/isPageCheck";
+import { loadReceivedDataHandle } from "./hijackHandle/loadReceivedDataHandle";
+import { onLoadReceivedDataHandle } from "./hijackHandle/onLoadReceivedDataHandle";
+import { initStore } from "./initStore";
+import { injectInfoHandler } from "./injectInfoHandler";
+import { InternalFieldProtection } from "./internalFieldProtection";
+import { rootComponentOptionHandle } from "./rootComponentOptionHandle";
+import { sameFuncOptionsHandle } from "./sameFuncOptionsHandle";
+import { subComponentsOptionHandle } from "./subComponentsOptionHandle";
+/**
+ * 把DefineComponentOption转化为原生Component API支持的配置
+ * @param defineComponentOption
+ * @returns  返回符合原生Component API配置
+ */
+export function normalizeOptions(defineComponentOption) {
+    const rootComponentOption = defineComponentOption.rootComponent;
+    const subComponentsOption = defineComponentOption.subComponents;
+    const finalOptionsForComponent = injectInfoHandler({
+        observers: {},
+        data: {},
+        methods: {},
+        // 加入BStore,处理store字段的behavior
+        behaviors: [BStore],
+        externalClasses: [],
+        pageLifetimes: {},
+        isPage: false,
+        properties: {},
+        computed: {},
+        watch: {},
+        lifetimes: {},
+        options: {},
+    }, instanceConfig.injectInfo);
+    /**
+     * 为了更高的效率,在处理rootComponentOption和subComponentsOption数据时,把相同字段配置(pageLifetimes，lifetimes,watch,observers)收集到funcOptions中。
+     * 后续再一起处理这些字段,整合进finalOptionsForComponent配置中。即funcConfig是一个临时中介对象。
+     */
+    const sameFuncOptions = {
+        pageLifetimes: {},
+        lifetimes: {},
+        watch: {},
+        observers: {},
+    };
+    if (rootComponentOption && !isEmptyObject(rootComponentOption)) {
+        rootComponentOptionHandle(finalOptionsForComponent, sameFuncOptions, rootComponentOption);
+    }
+    if (subComponentsOption && !isEmptyObject(subComponentsOption)) {
+        subComponentsOptionHandle(finalOptionsForComponent, subComponentsOption, sameFuncOptions);
+    }
+    sameFuncOptionsHandle(finalOptionsForComponent, rootComponentOption === null || rootComponentOption === void 0 ? void 0 : rootComponentOption.isPage, sameFuncOptions);
+    // 配置与内部字段冲突验证
+    InternalFieldProtection(finalOptionsForComponent);
+    // 对页面传入参数进行处理 老框架劫持页面methods.onLoad,新框架劫持页面pageLifetimes.load
+    if (finalOptionsForComponent.isPage) {
+        hijack(finalOptionsForComponent.pageLifetimes, "load", [loadReceivedDataHandle]);
+    }
+    hijack(finalOptionsForComponent.methods, "onLoad", [onLoadReceivedDataHandle]);
+    // 验证isPage字段是否配置正确
+    hijack(finalOptionsForComponent.lifetimes, "attached", [isPageCheck(rootComponentOption === null || rootComponentOption === void 0 ? void 0 : rootComponentOption.isPage)]);
+    // 页面时删除预设的虚拟组件字段
+    if (finalOptionsForComponent.isPage && finalOptionsForComponent.options) {
+        Reflect.deleteProperty(finalOptionsForComponent.options, "virtualHost");
+    }
+    // 初始化store数据到data并把store配置放入到data的__storeConfig__下为后续使用
+    initStore(finalOptionsForComponent);
+    // 处理computed和watch配置
+    computedWatchHandle(finalOptionsForComponent);
+    // BBeforeCreate在最后面,让BeforeCreate生命周期运行在最终建立组件时。
+    finalOptionsForComponent.behaviors.push(BBeforeCreate);
+    return finalOptionsForComponent;
+}
+//# sourceMappingURL=index.js.map

package/dist/api/DefineComponent/normalizeOptions/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/index.ts"],"names":[],"mappings":"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"}

package/dist/api/DefineComponent/{assignOptions → normalizeOptions}/initStore/index.js

@@ -1,9 +1,11 @@
 export function initStore(finalOptionsForComponent) {
     const storeConfig = finalOptionsForComponent.store;
     if (storeConfig) {
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
         const { toJS } = require("mobx");
         for (const key in storeConfig) {
             finalOptionsForComponent.data[key] = toJS(storeConfig[key]());
+            // 把响应式数据配置保留在methods的__storeConfig__字段下带入到组件实例中(不用函数返回方式也可以,但不符合methods字段类型),后续再从原型上删除。
         }
         finalOptionsForComponent.data.__storeConfig__ = storeConfig;
         delete finalOptionsForComponent.store;

package/dist/api/DefineComponent/normalizeOptions/initStore/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/initStore/index.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,SAAS,CAAC,wBAAiD;IACzE,MAAM,WAAW,GAAG,wBAAwB,CAAC,KAAK,CAAC;IACnD,IAAI,WAAW,EAAE,CAAC;QAChB,iEAAiE;QACjE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAgB,CAAC;QAChD,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;YAC9B,wBAAwB,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAE9D,wFAAwF;QAC1F,CAAC;QACD,wBAAwB,CAAC,IAAI,CAAC,eAAe,GAAG,WAAW,CAAC;QAE5D,OAAO,wBAAwB,CAAC,KAAK,CAAC;IACxC,CAAC;AACH,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/injectInfoHandler.d.ts

@@ -0,0 +1,3 @@
+import type { IInjectInfo } from "../../..";
+import type { FinalOptionsOfComponent } from ".";
+export declare function injectInfoHandler(finalOptionsForComponent: FinalOptionsOfComponent, injectInfo: IInjectInfo | undefined): FinalOptionsOfComponent;

package/dist/api/DefineComponent/normalizeOptions/injectInfoHandler.js

@@ -0,0 +1,43 @@
+/**
+ * 把injectInfo字段合并到finalOptionsForComponent
+ * @remarks 规则：
+ * 1. behaviors字段 push
+ * 2. 对象字段 没有的话直接赋值，有的话Object.assign
+ * @param finalOptionsForComponent
+ * @param injectInfo
+ * @returns finalOptionsForComponent
+ */
+function mergeOptions(finalOptionsForComponent, injectInfo) {
+    for (const key in injectInfo) {
+        const injectVal = injectInfo[key];
+        if (key in finalOptionsForComponent) {
+            // @ts-ignore
+            const originalVal = finalOptionsForComponent[key];
+            switch (key) {
+                case "behaviors":
+                    {
+                        // @ts-ignore behaviors 是数组类型
+                        finalOptionsForComponent[key].push(...injectVal);
+                    }
+                    break;
+                default:
+                    {
+                        // @ts-ignore 覆盖目标
+                        finalOptionsForComponent[key] = Object.assign(originalVal, injectVal);
+                    }
+                    break;
+            }
+        }
+        else {
+            // @ts-ignore
+            finalOptionsForComponent[key] = injectVal;
+        }
+    }
+    return finalOptionsForComponent;
+}
+export function injectInfoHandler(finalOptionsForComponent, injectInfo) {
+    if (!injectInfo)
+        return finalOptionsForComponent;
+    return mergeOptions(finalOptionsForComponent, injectInfo);
+}
+//# sourceMappingURL=injectInfoHandler.js.map

package/dist/api/DefineComponent/normalizeOptions/injectInfoHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"injectInfoHandler.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/injectInfoHandler.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AACH,SAAS,YAAY,CACnB,wBAAiD,EACjD,UAAuB;IAEvB,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC7B,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,GAAG,IAAI,wBAAwB,EAAE,CAAC;YACpC,aAAa;YACb,MAAM,WAAW,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC;YAClD,QAAQ,GAAG,EAAE,CAAC;gBACZ,KAAK,WAAW;oBACd,CAAC;wBACC,6BAA6B;wBAC7B,wBAAwB,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;oBACnD,CAAC;oBACD,MAAM;gBAER;oBACE,CAAC;wBACC,kBAAkB;wBAClB,wBAAwB,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;oBACxE,CAAC;oBACD,MAAM;YACV,CAAC;QACH,CAAC;aAAM,CAAC;YACN,aAAa;YACb,wBAAwB,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;QAC5C,CAAC;IACH,CAAC;IAED,OAAO,wBAAwB,CAAC;AAClC,CAAC;AACD,MAAM,UAAU,iBAAiB,CAC/B,wBAAiD,EACjD,UAAmC;IAEnC,IAAI,CAAC,UAAU;QAAE,OAAO,wBAAwB,CAAC;IAEjD,OAAO,YAAY,CAAC,wBAAwB,EAAE,UAAU,CAAC,CAAC;AAC5D,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/internalFieldProtection.d.ts

@@ -0,0 +1,5 @@
+import type { FinalOptionsOfComponent } from ".";
+/**
+ * 报错的形式避免输入字段和内部字段冲突,保证config下不包含内部预定字段(列表)
+ */
+export declare function InternalFieldProtection(finalOptionsForComponent: FinalOptionsOfComponent): void;

package/dist/api/DefineComponent/normalizeOptions/internalFieldProtection.js

@@ -0,0 +1,23 @@
+// 内部字段
+const internalFiled = {
+    methods: ["disposer", "__computedUpdater__"],
+    data: ["__computedCache__", "__storeConfig__", "__watchOldValue__"],
+};
+/**
+ * 报错的形式避免输入字段和内部字段冲突,保证config下不包含内部预定字段(列表)
+ */
+export function InternalFieldProtection(finalOptionsForComponent) {
+    const methodsFieldKeys = Object.keys(finalOptionsForComponent.methods);
+    const dataFieldKeys = Object.keys(finalOptionsForComponent.data);
+    for (const key of methodsFieldKeys) {
+        if (internalFiled.methods.includes(key)) {
+            throw Error(`methods配置中的${key}字段已被内部字段占用`);
+        }
+    }
+    for (const key of dataFieldKeys) {
+        if (internalFiled.data.includes(key)) {
+            throw Error(`data配置中的${key}字段已被内部字段占用`);
+        }
+    }
+}
+//# sourceMappingURL=internalFieldProtection.js.map

package/dist/api/DefineComponent/normalizeOptions/internalFieldProtection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"internalFieldProtection.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/internalFieldProtection.ts"],"names":[],"mappings":"AAEA,OAAO;AACP,MAAM,aAAa,GAAG;IACpB,OAAO,EAAE,CAAC,UAAU,EAAE,qBAAqB,CAAC;IAC5C,IAAI,EAAE,CAAC,mBAAmB,EAAE,iBAAiB,EAAE,mBAAmB,CAAC;CACpE,CAAC;AAEF;;GAEG;AACH,MAAM,UAAU,uBAAuB,CAAC,wBAAiD;IACvF,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;IACvE,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;IAEjE,KAAK,MAAM,GAAG,IAAI,gBAAgB,EAAE,CAAC;QACnC,IAAI,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACxC,MAAM,KAAK,CAAC,cAAc,GAAG,YAAY,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;IACD,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;QAChC,IAAI,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACrC,MAAM,KAAK,CAAC,WAAW,GAAG,YAAY,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/otherFieldsHandle.d.ts

@@ -0,0 +1,6 @@
+import type { RootComponentTrueOptions } from "../../RootComponent";
+import type { FinalOptionsOfComponent } from ".";
+/**
+ * 其他字段加入到componentOptions对应字段配置中
+ */
+export declare function otherFieldsHandle(finalOptions: FinalOptionsOfComponent, rootComponentOptions: RootComponentTrueOptions): void;

package/dist/api/DefineComponent/normalizeOptions/otherFieldsHandle.js

@@ -0,0 +1,24 @@
+/**
+ * 其他字段加入到componentOptions对应字段配置中
+ */
+export function otherFieldsHandle(finalOptions, rootComponentOptions) {
+    for (const key in rootComponentOptions) {
+        // @ts-ignore 隐式索引
+        const config = rootComponentOptions[key];
+        if (Array.isArray(config) === true) {
+            //  "behaviors" || "externalClasses"是数组
+            // @ts-ignore 只有 behaviors 和 externalClasses, 且都默认为[]
+            finalOptions[key].push(...config);
+        }
+        else if (typeof config === "object") {
+            // @ts-ignore 隐式索引
+            Object.assign(finalOptions[key] || (finalOptions[key] = {}), config);
+        }
+        else {
+            // 函数字段有 根组件有 `export` 子组件无此字段
+            // @ts-ignore 隐式索引
+            finalOptions[key] = config;
+        }
+    }
+}
+//# sourceMappingURL=otherFieldsHandle.js.map

package/dist/api/DefineComponent/normalizeOptions/otherFieldsHandle.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"otherFieldsHandle.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/otherFieldsHandle.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAC/B,YAAqC,EACrC,oBAA8C;IAE9C,KAAK,MAAM,GAAG,IAAI,oBAAoB,EAAE,CAAC;QACvC,kBAAkB;QAClB,MAAM,MAAM,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC;YACnC,uCAAuC;YACvC,qDAAqD;YACrD,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;QACpC,CAAC;aAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YACtC,kBAAkB;YAClB,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,MAAhB,YAAY,CAAC,GAAG,IAAM,EAAE,GAAE,MAAM,CAAC,CAAC;QAClD,CAAC;aAAM,CAAC;YACN,8BAA8B;YAC9B,kBAAkB;YAClB,YAAY,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;QAC7B,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/rootComponentOptionHandle.d.ts

@@ -0,0 +1,9 @@
+import type { RootComponentTrueOptions } from "../../RootComponent";
+import type { FinalOptionsOfComponent, SameFuncOptions } from ".";
+/**
+ * 收集 rootComponentOptions 配置到 finalOptions 和 funcOptions 中
+ * @param finalOptions - 收集配置对象
+ * @param funcOptions  - 收集特殊配置对象字段
+ * @param rootComponentOptions - 被收集的源配置对象
+ */
+export declare function rootComponentOptionHandle(finalOptions: FinalOptionsOfComponent, funcOptions: SameFuncOptions, rootComponentOptions: RootComponentTrueOptions): void;

package/dist/api/DefineComponent/normalizeOptions/rootComponentOptionHandle.js

@@ -0,0 +1,18 @@
+import { customEventsHandle } from "./customEventsHandle";
+import { otherFieldsHandle } from "./otherFieldsHandle";
+import { sameFuncFieldsCollect } from "./sameFuncFieldsCollect";
+/**
+ * 收集 rootComponentOptions 配置到 finalOptions 和 funcOptions 中
+ * @param finalOptions - 收集配置对象
+ * @param funcOptions  - 收集特殊配置对象字段
+ * @param rootComponentOptions - 被收集的源配置对象
+ */
+export function rootComponentOptionHandle(finalOptions, funcOptions, rootComponentOptions) {
+    if (rootComponentOptions.customEvents)
+        customEventsHandle(finalOptions.methods, rootComponentOptions.customEvents);
+    if (rootComponentOptions.events)
+        Object.assign(finalOptions.methods, rootComponentOptions.events);
+    sameFuncFieldsCollect(rootComponentOptions, funcOptions);
+    otherFieldsHandle(finalOptions, rootComponentOptions);
+}
+//# sourceMappingURL=rootComponentOptionHandle.js.map

package/dist/api/DefineComponent/normalizeOptions/rootComponentOptionHandle.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rootComponentOptionHandle.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/rootComponentOptionHandle.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE;;;;;GAKG;AACH,MAAM,UAAU,yBAAyB,CACvC,YAAqC,EACrC,WAA4B,EAC5B,oBAA8C;IAE9C,IAAI,oBAAoB,CAAC,YAAY;QAAE,kBAAkB,CAAC,YAAY,CAAC,OAAO,EAAE,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAEnH,IAAI,oBAAoB,CAAC,MAAM;QAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAElG,qBAAqB,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC;IAEzD,iBAAiB,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;AACxD,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/sameFuncFieldsCollect.d.ts

@@ -0,0 +1,7 @@
+import type { RootComponentTrueOptions } from "../../RootComponent";
+import type { SubComponentTrueOptions } from "../../SubComponent";
+import type { SameFuncOptions } from ".";
+/**
+ * 把配置为函数的字段方法收集到funcOptions中
+ */
+export declare function sameFuncFieldsCollect(options: SubComponentTrueOptions | RootComponentTrueOptions, funcOptions: SameFuncOptions): void;

package/dist/api/DefineComponent/normalizeOptions/sameFuncFieldsCollect.js

@@ -0,0 +1,17 @@
+/**
+ * 把配置为函数的字段方法收集到funcOptions中
+ */
+export function sameFuncFieldsCollect(options, funcOptions) {
+    var _a;
+    let key;
+    for (key in funcOptions) {
+        const optionsKeyConfig = options[key];
+        if (optionsKeyConfig) {
+            for (const _key in optionsKeyConfig) {
+                // @ts-ignore
+                ((_a = funcOptions[key])[_key] || (_a[_key] = [])).push(optionsKeyConfig[_key]);
+            }
+        }
+    }
+}
+//# sourceMappingURL=sameFuncFieldsCollect.js.map

package/dist/api/DefineComponent/normalizeOptions/sameFuncFieldsCollect.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sameFuncFieldsCollect.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/sameFuncFieldsCollect.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,MAAM,UAAU,qBAAqB,CACnC,OAA2D,EAC3D,WAA4B;;IAE5B,IAAI,GAA0B,CAAC;IAC/B,KAAK,GAAG,IAAI,WAAW,EAAE,CAAC;QACxB,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;QACtC,IAAI,gBAAgB,EAAE,CAAC;YACrB,KAAK,MAAM,IAAI,IAAI,gBAAgB,EAAE,CAAC;gBACpC,aAAa;gBACb,OAAC,WAAW,CAAC,GAAG,CAAC,EAAC,IAAI,SAAJ,IAAI,IAAM,EAAE,EAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;YAC/D,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/sameFuncOptionsHandle.d.ts

@@ -0,0 +1,5 @@
+import type { FinalOptionsOfComponent, SameFuncOptions } from ".";
+/**
+ * 把函数列表配置放入一个配置中循环依次运行
+ */
+export declare function sameFuncOptionsHandle(finalOptionsForComponent: FinalOptionsOfComponent, isPage: boolean | undefined, funcOptions: SameFuncOptions): void;

package/dist/api/DefineComponent/normalizeOptions/sameFuncOptionsHandle.js

@@ -0,0 +1,34 @@
+import { isEmptyObject } from "../../../utils/isEmptyObject";
+/**
+ * 把函数配置放入一个配置中依次运行
+ */
+function _sameFuncOptionsHandle(config, configList) {
+    for (const key in configList) {
+        // @ts-ignore 隐式索引
+        config[key] = function (...args) {
+            configList[key].forEach(ele => ele.call(this, ...args));
+        };
+    }
+}
+/**
+ * 把函数列表配置放入一个配置中循环依次运行
+ */
+export function sameFuncOptionsHandle(finalOptionsForComponent, isPage, funcOptions) {
+    if (isPage) {
+        // 页面时 生命周期方法(即 on 开头的方法),(https://developers.weixin.qq.com/miniprogram/dev/framework/custom-component/component.html)
+        if (!isEmptyObject(funcOptions.pageLifetimes)) {
+            _sameFuncOptionsHandle(finalOptionsForComponent.methods, funcOptions.pageLifetimes);
+        }
+    }
+    else {
+        // 组件时
+        if (!isEmptyObject(funcOptions.pageLifetimes)) {
+            _sameFuncOptionsHandle(finalOptionsForComponent.pageLifetimes, funcOptions.pageLifetimes);
+        }
+    }
+    if (funcOptions.lifetimes)
+        _sameFuncOptionsHandle(finalOptionsForComponent.lifetimes || (finalOptionsForComponent.lifetimes = {}), funcOptions.lifetimes);
+    if (funcOptions.watch)
+        _sameFuncOptionsHandle(finalOptionsForComponent.watch || (finalOptionsForComponent.watch = {}), funcOptions.watch);
+}
+//# sourceMappingURL=sameFuncOptionsHandle.js.map

package/dist/api/DefineComponent/normalizeOptions/sameFuncOptionsHandle.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sameFuncOptionsHandle.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/sameFuncOptionsHandle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE7D;;GAEG;AACH,SAAS,sBAAsB,CAAC,MAAc,EAAE,UAAkC;IAChF,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC7B,kBAAkB;QAClB,MAAM,CAAC,GAAG,CAAC,GAAG,UAAS,GAAG,IAAe;YACvC,UAAU,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;QAC1D,CAAC,CAAC;IACJ,CAAC;AACH,CAAC;AACD;;GAEG;AACH,MAAM,UAAU,qBAAqB,CACnC,wBAAiD,EACjD,MAA2B,EAC3B,WAA4B;IAE5B,IAAI,MAAM,EAAE,CAAC;QACX,sHAAsH;QACtH,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE,CAAC;YAC9C,sBAAsB,CAAC,wBAAwB,CAAC,OAAO,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;QACtF,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM;QACN,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE,CAAC;YAC9C,sBAAsB,CAAC,wBAAwB,CAAC,aAAa,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;QAC5F,CAAC;IACH,CAAC;IACD,IAAI,WAAW,CAAC,SAAS;QAAE,sBAAsB,CAAC,wBAAwB,CAAC,SAAS,KAAlC,wBAAwB,CAAC,SAAS,GAAK,EAAE,GAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAEpH,IAAI,WAAW,CAAC,KAAK;QAAE,sBAAsB,CAAC,wBAAwB,CAAC,KAAK,KAA9B,wBAAwB,CAAC,KAAK,GAAK,EAAE,GAAE,WAAW,CAAC,KAAK,CAAC,CAAC;AAC1G,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/subComponentsOptionHandle.d.ts

@@ -0,0 +1,3 @@
+import type { SubComponentTrueOptions } from "../../SubComponent";
+import type { FinalOptionsOfComponent, SameFuncOptions } from ".";
+export declare function subComponentsOptionHandle(componentOptions: FinalOptionsOfComponent, subComponents: SubComponentTrueOptions[], funcOptions: SameFuncOptions): void;

package/dist/api/DefineComponent/normalizeOptions/subComponentsOptionHandle.js

@@ -0,0 +1,11 @@
+import { otherFieldsHandle } from "./otherFieldsHandle";
+import { sameFuncFieldsCollect } from "./sameFuncFieldsCollect";
+export function subComponentsOptionHandle(componentOptions, subComponents, funcOptions) {
+    subComponents.forEach((subOption) => {
+        if (subOption.events)
+            Object.assign(componentOptions.methods, subOption.events);
+        sameFuncFieldsCollect(subOption, funcOptions);
+        otherFieldsHandle(componentOptions, subOption);
+    });
+}
+//# sourceMappingURL=subComponentsOptionHandle.js.map

package/dist/api/DefineComponent/normalizeOptions/subComponentsOptionHandle.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"subComponentsOptionHandle.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/subComponentsOptionHandle.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,MAAM,UAAU,yBAAyB,CACvC,gBAAyC,EACzC,aAAwC,EACxC,WAA4B;IAE5B,aAAa,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;QAClC,IAAI,SAAS,CAAC,MAAM;YAAE,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;QAEhF,qBAAqB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QAE9C,iBAAiB,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;AACL,CAAC"}