annil 1.9.0 → 1.11.0-alpha.3

package/dist/api/SlotComponent/index.d.ts

@@ -0,0 +1,34 @@
+import type { IfExtends } from "hry-types/src/Any/IfExtends";
+import type { Func } from "hry-types/src/Misc/Func";
+import type { ComputeObject } from "../../types/ComputeObj";
+import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
+import type { IInjectAllData, IInjectMethods, IInjectStore } from "../InstanceInject/instanceConfig";
+import type { ComputedConstraint } from "../RootComponent/Computed/ComputedConstraint";
+import type { RootComponentInstance } from "../RootComponent/Instance/RootComponentInstance";
+import type { LifetimesOption } from "../RootComponent/Lifetimes/LifetimesOption";
+import type { MethodsConstraint } from "../RootComponent/Methods/MethodsConstraint";
+import type { ObserversOption } from "../RootComponent/Observers/ObserversOption";
+import type { PageLifetimesOption } from "../RootComponent/PageLifetimes/PageLifetimesOption";
+import type { RootComponentType } from "../RootComponent/RootComponentType";
+import type { GetStoreDoc } from "../RootComponent/Store/GeTStoreDoc";
+import type { StoreConstraint } from "../RootComponent/Store/StoreConstraint";
+import type { WatchOption } from "../RootComponent/Watch/WatchOption";
+import type { GetSlotComputedDoc } from "./SlotComputed/GetSlotComputedDoc";
+import type { SlotComputedOption } from "./SlotComputed/SlotComputedOption";
+import type { SlotDataOption } from "./SlotData/SlotDataOption";
+import type { SlotEventsConstraint } from "./SlotEvents/SlotEventsConstraint";
+import type { SlotEventsOption } from "./SlotEvents/SlotEventsOption";
+import type { SlotMethodsOption } from "./SlotMethods/SlotMethodsOption";
+import type { SoltStoreOption } from "./SlotStore/SlotStoreOption";
+import type { SLotSuperDataOption } from "./SLotSuperDatas/SlotSuperDatasOption";
+type SoltComponentOptions<Prefix extends string, TSuperData extends PropertyKey[], TEvents extends SlotEventsConstraint, TIsPage extends boolean, TMethods extends MethodsConstraint, TData extends object, TStore extends StoreConstraint, TComputed extends Record<string, Func>, EventsDoc extends object, PropertiesDoc extends object, DataDoc extends object, StoreDoc extends object, ComputedDoc extends object, AllSuperDatas extends object, AllSuperMethods extends object, AllSuperEvents extends object> = SLotSuperDataOption<TSuperData> & SlotDataOption<TData, keyof (AllSuperDatas & IInjectAllData), `${Prefix}_${string}` | `_${Prefix}_${string}`> & SoltStoreOption<TStore, keyof (TData & AllSuperDatas & IInjectAllData), Prefix> & SlotComputedOption<TComputed, keyof (TData & StoreDoc & AllSuperDatas & IInjectAllData), {
+    data: ComputeObject<TData & StoreDoc & AllSuperDatas & ComputedDoc & IInjectAllData>;
+}, Prefix> & SlotEventsOption<TEvents, keyof (AllSuperMethods & AllSuperEvents & IInjectMethods), `${Prefix}_${string}`> & SlotMethodsOption<TMethods, keyof (AllSuperMethods & AllSuperEvents & EventsDoc & IInjectMethods), `${Prefix}_${string}`> & PageLifetimesOption<TIsPage, PropertiesDoc> & LifetimesOption & WatchOption<ComputedDoc & Required<AllSuperDatas> & DataDoc & StoreDoc & IInjectStore> & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "observers">> & ObserversOption<ComputedDoc & Required<AllSuperDatas> & DataDoc & StoreDoc & IInjectStore> & ThisType<RootComponentInstance<TIsPage, TMethods & AllSuperMethods, DataDoc, DataDoc & StoreDoc & ComputedDoc & AllSuperDatas & IInjectAllData, {}, StoreDoc>>;
+type SlotComponentConstructor<RootDoc extends RootComponentType, SubDoc extends SubComponentType, Prefix extends string, IsPage extends boolean = RootDoc["isPage"] extends true ? true : false, AllSuperDatas extends object = Required<RootDoc["properties"]> & RootDoc["data"] & RootDoc["computed"] & RootDoc["store"] & SubDoc["allDatas"], AllSuperMethods extends object = RootDoc["methods"] & SubDoc["methods"] & {}, AllSuperEvents extends object = RootDoc["events"] & SubDoc["methods"] & SubDoc["events"] & {}> = <TSuperData extends (keyof AllSuperDatas)[], TEvents extends SlotEventsConstraint, TData extends object = {}, TStore extends StoreConstraint = {}, TComputed extends ComputedConstraint = {}, TMethods extends MethodsConstraint = {}, DataDoc extends object = TData, EventsDoc extends object = IfExtends<SlotEventsConstraint, TEvents, {}, TEvents>, PropertiesDoc extends object = RootDoc["properties"] & {}, StoreDoc extends object = GetStoreDoc<TStore>, ComputedDoc extends object = GetSlotComputedDoc<TComputed>>(options: SoltComponentOptions<Prefix, TSuperData, TEvents, IsPage, TMethods, TData, TStore, TComputed, EventsDoc, PropertiesDoc, DataDoc, StoreDoc, ComputedDoc, AllSuperDatas, AllSuperMethods, AllSuperEvents>) => never;
+type SubComponentType = {
+    allDatas?: Record<string, unknown>;
+    methods?: Record<string, () => unknown>;
+    events?: Record<string, () => unknown>;
+};
+export declare function SlotComponent<RootDoc extends RootComponentType, SubDoc extends SubComponentType, name extends string>(): SlotComponentConstructor<RootDoc, SubDoc, name>;
+export {};

package/dist/api/SlotComponent/index.js

@@ -0,0 +1,5 @@
+export function SlotComponent() {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    return (options) => options;
+}
+//# sourceMappingURL=index.js.map

package/dist/api/SlotComponent/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/SlotComponent/index.ts"],"names":[],"mappings":"AAkJA,MAAM,UAAU,aAAa;IAS3B,8DAA8D;IAC9D,OAAO,CAAC,OAAY,EAAE,EAAE,CAAC,OAAgB,CAAC;AAC5C,CAAC"}

package/dist/api/SubComponent/SubComponentType.d.ts

@@ -1,9 +1,9 @@
-import type { SelectKeys } from "hry-types/src/Object/_api";
-import type { Composed, CustomEventsTags } from "../RootComponent/CustomEvents/CustomEventsTag";
+import type { CustomEventsTags } from "../RootComponent/CustomEvents/CustomEventsTag";
 type _SubComponentType = {
-    [k in string]: string | number | bigint | boolean | symbol | null | Record<string, any> | unknown[] | CustomEventsTags;
+    composedEvents?: Record<string, string | number | bigint | boolean | symbol | null | undefined | Record<string, any> | unknown[] | CustomEventsTags>;
+    allDatas?: Record<string, unknown>;
+    methods?: Record<string, unknown>;
 };
-type _Validator<O, ErrKeys = Exclude<keyof O, SelectKeys<O, Composed, "contains->">>> = [ErrKeys] extends [never] ? _SubComponentType : `${ErrKeys & string} 不是穿透事件`;
 /**
  * SubComponent API 返回类型
  * @remarks 穿透的子组件自定义事件
@@ -13,5 +13,5 @@ type _Validator<O, ErrKeys = Exclude<keyof O, SelectKeys<O, Composed, "contains-
  * };
  * ```
  */
-export type SubComponentType<O extends _Validator<O> = _SubComponentType> = O;
+export type SubComponentType<O extends _SubComponentType = _SubComponentType> = O;
 export {};

package/dist/api/SubComponent/SubComputed/GetSubComputedDoc.d.ts

@@ -1,3 +1,3 @@
-export type GetSubComputedDoc<TComputed extends AnyObject> = {
+export type GetSubComputedDoc<TComputed extends Record<string, any>> = {
     [k in keyof TComputed]: ReturnType<TComputed[k]>;
 };

package/dist/api/SubComponent/SubData/SubDataOption.d.ts

@@ -1,8 +1,8 @@
 import type { G } from "hry-types";
-export type SubDataOption<TSubData extends object, legalKeys extends PropertyKey> = {
+export type SubDataOption<TSubData extends object, legalKeys extends PropertyKey, errMsg extends string> = {
     /**
      * 可写子组件所需数据和内部公共数据
      * 非法字段检测和与Inherit字段的重复检测
      */
-    data?: TSubData & G.IllegalFieldValidator<TSubData, legalKeys, 0, "", "子组件无需此字段或与Inherit字段重复">;
+    data?: TSubData & G.IllegalFieldValidator<TSubData, legalKeys, 0, "", errMsg>;
 };

package/dist/api/SubComponent/SubMethods/SubMethodsOption.d.ts

@@ -1,9 +1,8 @@
 import type { G } from "hry-types";
-import type { PrefixValidator } from "hry-types/src/Generic/PrefixValidator";
 import type { SubMethodsConstraint } from "./SubMethodsConstraint";
 export type SubMethodsOption<TSubMethods extends SubMethodsConstraint, TPrefix extends string, ExcludedKeys extends PropertyKey> = {
     /**
      * 前缀检测和重复检测(与events和组件customEvents字段)
      */
-    methods?: TSubMethods & PrefixValidator<TSubMethods, TPrefix> & G.DuplicateFieldValidator<TSubMethods, ExcludedKeys>;
+    methods?: TSubMethods & G.KeyValidator<TSubMethods, `${TPrefix}_${string}`> & G.DuplicateFieldValidator<TSubMethods, ExcludedKeys>;
 };

package/dist/api/SubComponent/SubReturnType/CreateSubComponentDoc.d.ts

@@ -1,6 +1,7 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
 import type { ComputeIntersection, Select } from "hry-types/src/Object/_api";
+import type { ComputeObject } from "../../../types/ComputeObj";
 import type { RemovePrefix } from "../../../types/RemovePrefix";
 import type { UnionToComma } from "../../../types/UnionToComma.test";
 import type { Composed } from "../../RootComponent/CustomEvents/CustomEventsTag";
@@ -8,5 +9,11 @@ type SelectStopEvents<T extends object> = {
     [k in keyof T as k extends `${infer R}_catch` ? R : never]: unknown;
 };
 type GetComposedEvents<TCustomEventsDoc extends object> = Select<TCustomEventsDoc, Composed, "contains->">;
-export type CreateSubComponentDoc<OriginalCompDoc extends object, SubEventsDoc extends object, MissingRequiredField extends PropertyKey, SubCompDoc = ComputeIntersection<RemovePrefix<Omit<GetComposedEvents<OriginalCompDoc>, keyof SelectStopEvents<SubEventsDoc>>>>> = IfExtends<MissingRequiredField, never, IfExtends<EmptyObject, SubCompDoc, never, SubCompDoc>, `缺少必传的字段${UnionToComma<MissingRequiredField & string>}`>;
+export type CreateSubComponentDoc<OriginalCompDoc extends object, SubEventsDoc extends object, MissingRequiredField extends PropertyKey, allDatas extends object, SubMethods extends object, ComposedEvents extends object = ComputeObject<RemovePrefix<Omit<GetComposedEvents<OriginalCompDoc>, keyof SelectStopEvents<SubEventsDoc>>>>, SubCompDoc = ComputeIntersection<IfExtends<EmptyObject, ComposedEvents, {}, {
+    composedEvents: ComposedEvents;
+}> & IfExtends<EmptyObject, SubMethods, {}, {
+    methods: SubMethods;
+}> & IfExtends<EmptyObject, allDatas, {}, {
+    allDatas: allDatas;
+}>>> = IfExtends<MissingRequiredField, never, IfExtends<EmptyObject, SubCompDoc, never, SubCompDoc>, `缺少必传的字段${UnionToComma<MissingRequiredField & string>}`>;
 export {};

package/dist/api/SubComponent/index.d.ts

@@ -38,7 +38,15 @@ import type { CreateSubComponentDoc } from "./SubReturnType/CreateSubComponentDo
 import type { SubStoreConstraint } from "./SubStore/SubStoreConstraint";
 import type { SubStoreOption } from "./SubStore/SubStoreOption";
 import type { SubWatchOption } from "./SubWatch/SubWatchOption";
-type Options<RootDoc extends RootComponentType, IsPage extends boolean, CurrentCompDoc extends ComponentType, Prefix extends string, AllRootDataDoc extends object, TInherit extends object, TSubData extends object, TSubStore extends object, TSubComputed extends object, TEvents extends object, TSubMethods extends SubMethodsConstraint, InheritDoc extends object, SubDataDoc extends object, SubStoreDoc extends object, SubComputedDoc extends object, SubEventsDoc extends object, SubMethodsDoc extends object, CompDocKeys extends PropertyKey = keyof CurrentCompDoc["properties"]> = SubInheritOption<TInherit, CompDocKeys> & SubDataOption<TSubData, Exclude<CompDocKeys, (keyof InheritDoc)> | InnerFields<Prefix>> & SubStoreOption<TSubStore, Exclude<CompDocKeys, (keyof (InheritDoc & SubDataDoc))> | InnerFields<Prefix>> & SubComputedOption<TSubComputed, Exclude<CompDocKeys, (keyof (InheritDoc & SubDataDoc & SubStoreDoc))> | InnerFields<Prefix>, {
+type Options<RootDoc extends RootComponentType, IsPage extends boolean, CurrentCompDoc extends ComponentType, Prefix extends string, AllRootDataDoc extends object, TInherit extends object, TSubData extends object, TSubStore extends object, TSubComputed extends object, TEvents extends object, TSubMethods extends SubMethodsConstraint, InheritDoc extends object, SubDataDoc extends object, SubStoreDoc extends object, SubComputedDoc extends object, SubEventsDoc extends object, SubMethodsDoc extends object, CompDocKeys extends PropertyKey = keyof CurrentCompDoc["properties"]> = SubInheritOption<TInherit, {
+    [k in keyof NoInfer<TInherit>]: k extends keyof (AllRootDataDoc) ? never : k extends CompDocKeys ? k : never;
+}[keyof NoInfer<TInherit>]> & SubDataOption<TSubData, {
+    [k in keyof NoInfer<TSubData>]: k extends keyof (AllRootDataDoc) ? never : k extends Exclude<CompDocKeys, (keyof (InheritDoc))> ? k : k extends InnerFields<Prefix> ? k : never;
+}[keyof NoInfer<TSubData>], "子组件无需此字段或与Inherit字段重复"> & SubStoreOption<TSubStore, {
+    [k in keyof NoInfer<TSubStore>]: k extends keyof (AllRootDataDoc & SubDataDoc) ? never : k extends Exclude<CompDocKeys, (keyof (InheritDoc & SubDataDoc))> ? k : k extends InnerFields<Prefix> ? k : never;
+}[keyof NoInfer<TSubStore>]> & SubComputedOption<TSubComputed, {
+    [k in keyof NoInfer<TSubComputed>]: k extends keyof (AllRootDataDoc & SubDataDoc & SubStoreDoc) ? never : k extends Exclude<CompDocKeys, (keyof (InheritDoc & SubDataDoc & SubStoreDoc))> ? k : k extends InnerFields<Prefix> ? k : never;
+}[keyof NoInfer<TSubComputed>], {
     data: ComputeObject<AllRootDataDoc & Replace<SubComputedDoc, Required<CurrentCompDoc["properties"]>> & SubStoreDoc & SubDataDoc & IInjectAllData>;
 }> & SubEventsOption<TEvents, SubEventsDoc, keyof SubEventsConstraint<CurrentCompDoc>> & SubMethodsOption<TSubMethods, Prefix, keyof (CurrentCompDoc["customEvents"] & SubEventsDoc)> & SubPageLifetimesOption<IsPage, NonNullable<RootDoc["properties"]>> & SubLifetimesOption & SubWatchOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc & IInjectStore> & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "export" | "observers" | "relations">> & SubObserversOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc & IInjectStore> & ThisType<SubInstance<SubMethodsDoc & RootDoc["methods"], Replace<SubDataDoc, Required<CurrentCompDoc["properties"]>>, AllRootDataDoc & Replace<SubDataDoc & SubComputedDoc & SubStoreDoc, Required<CurrentCompDoc["properties"]>>, NonNullable<RootDoc["customEvents"]>, SubStoreDoc>>;
 type SubComponentConstructor<TRootDoc extends RootComponentType, TOriginalCompDoc extends ComponentType, TSupplementalPrefix extends string = "", IsPage extends boolean = TRootDoc["isPage"] extends true ? true : false, CurrentPrefix extends string = `${GetComponentPrefix<TOriginalCompDoc>}${Capitalize<TSupplementalPrefix>}`, CurrentCompDoc extends ComponentType = IfExtends<TSupplementalPrefix, "", TOriginalCompDoc & {
@@ -48,7 +56,8 @@ ReplacePrefix<TOriginalCompDoc & {
     properties: Extra<CurrentPrefix>;
 }, CurrentPrefix>>, AllRootDataDoc extends object = Required<TRootDoc["properties"]> & TRootDoc["data"] & TRootDoc["computed"] & TRootDoc["store"]> = <TInherit extends InheritConstraint<AllRootDataDoc, CurrentCompDoc>, TSubData extends SubDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubStore extends SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TEvents extends SubEventsConstraint<CurrentCompDoc>, TSubComputed extends SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubMethods extends SubMethodsConstraint = {}, InheritDoc extends object = IfExtends<InheritConstraint<AllRootDataDoc, CurrentCompDoc>, TInherit, {}, TInherit>, SubDataDoc extends object = IfExtends<SubDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubData, {}, TSubData>, SubStoreDoc extends object = IfExtends<SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubStore, {}, {
     [k in keyof TSubStore]: ReturnType<NonNullable<TSubStore[k]>>;
-}>, SubComputedDoc extends object = IfExtends<SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubComputed, {}, GetSubComputedDoc<TSubComputed>>, SubEventsDoc extends object = IfExtends<SubEventsConstraint<CurrentCompDoc>, TEvents, {}, TEvents>, SubMethodsDoc extends object = TSubMethods, MissingRequiredField extends PropertyKey = Exclude<RequiredKeys<NonNullable<CurrentCompDoc["properties"]>>, keyof (InheritDoc & SubDataDoc & SubStoreDoc & IfExtends<SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)>>, TSubComputed, {}, GetSubComputedDoc<TSubComputed>>)>>(options: Options<TRootDoc, IsPage, CurrentCompDoc, CurrentPrefix, AllRootDataDoc, TInherit, TSubData, TSubStore, TSubComputed, TEvents, TSubMethods, InheritDoc, SubDataDoc, SubStoreDoc, SubComputedDoc, SubEventsDoc, SubMethodsDoc>) => CreateSubComponentDoc<NonNullable<CurrentCompDoc["customEvents"]>, SubEventsDoc, MissingRequiredField>;
+}>, SubComputedDoc extends object = IfExtends<SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubComputed, {}, GetSubComputedDoc<TSubComputed>>, SubEventsDoc extends object = IfExtends<SubEventsConstraint<CurrentCompDoc>, TEvents, {}, TEvents>, SubMethodsDoc extends object = TSubMethods, MissingRequiredField extends PropertyKey = Exclude<RequiredKeys<NonNullable<CurrentCompDoc["properties"]>>, keyof (InheritDoc & SubDataDoc & SubStoreDoc & IfExtends<SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)>>, TSubComputed, {}, GetSubComputedDoc<TSubComputed>>)>>(options: Options<TRootDoc, IsPage, CurrentCompDoc, CurrentPrefix, AllRootDataDoc, TInherit, TSubData, TSubStore, TSubComputed, TEvents, TSubMethods, InheritDoc, SubDataDoc, SubStoreDoc, SubComputedDoc, SubEventsDoc, SubMethodsDoc>) => CreateSubComponentDoc<NonNullable<CurrentCompDoc["customEvents"]>, SubEventsDoc, MissingRequiredField, ComputeObject<SubDataDoc & SubComputedDoc & SubStoreDoc>, // allDatas
+SubMethodsDoc>;
 /**
  * 子组件构建函数
  * @returns `(options:) => SubComponentDoc`

package/dist/api/SubComponent/index.js

@@ -6,4 +6,5 @@ export function SubComponent() {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     return ((options) => options);
 }
+// export type SubComponentType =string
 //# sourceMappingURL=index.js.map

package/dist/api/SubComponent/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/SubComponent/index.ts"],"names":[],"mappings":"AA4OA;;;GAGG;AACH,MAAM,UAAU,YAAY;IAK1B,8DAA8D;IAC9D,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAkC,CAAQ,CAAC;AACvE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/SubComponent/index.ts"],"names":[],"mappings":"AAqSA;;;GAGG;AACH,MAAM,UAAU,YAAY;IAK1B,8DAA8D;IAC9D,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAkC,CAAQ,CAAC;AACvE,CAAC;AAiBD,uCAAuC"}

package/dist/api/wxSugar.d.ts

@@ -16,6 +16,15 @@ type NavigateToOption<T extends PageDoc> = {
  * test页面onLoad(data)的参数data接受内容为` data = {num:"123",obj:"{"name":"zhao"}"}`即默认的url传的数据值为字符串,需要在接收时自行解析(JSON.parse)。且url采取ASCII编码只能接受0x20-0x7e区间的符号。无法使用一些特殊符号 如 ` :/?#[]@!$&'()*+,;= `。
  * navigateTo API 为 wx.navigateTo的语法糖,增加了data字段,最终的url数据拼接了通过encodeURIComponent编码(支持默认忽略的特殊符号)的data字段,在跳转页面的onload中通过decodeURIComponent解析url赋值给实例的data对象。为求使用时更加方便(无需对参数data解析再赋值)。且有ts类型提示。
  */
-export declare function navigateTo<TPageDoc extends PageDoc = never>(option: NoInfer<NavigateToOption<TPageDoc>>): Promise<WechatMiniprogram.NavigateToSuccessCallbackResult>;
+export declare function navigateTo<TPageDoc extends PageDoc = never>(option: NoInfer<NavigateToOption<TPageDoc>>, onBack?: (res: unknown) => void): Promise<WechatMiniprogram.NavigateToSuccessCallbackResult>;
+type WMNavigateBackOption = WechatMiniprogram.NavigateBackOption;
+type NavigateBackOption<Data> = WMNavigateBackOption & {
+    data?: Data;
+};
+/**
+ * @param options
+ * @returns
+ */
+export declare function navigateBack<Data, T extends NavigateBackOption<Data> = NavigateBackOption<Data>>(options?: T): WechatMiniprogram.PromisifySuccessResult<T, WMNavigateBackOption>;
 export declare function redirectTo<TPageDoc extends PageDoc = never>(option: NoInfer<NavigateToOption<TPageDoc>>): Promise<WechatMiniprogram.GeneralCallbackResult>;
 export {};

package/dist/api/wxSugar.js

@@ -10,12 +10,14 @@ function _encodeURIComponent(option) {
     Reflect.deleteProperty(option, "data");
     return Object.assign(result, option);
 }
+const backFuncs = [];
 /**
  * 页面onload参数中接受的数据值是传递的url解析后的字符串。例如:A页面通过`wx.navigateTo({url:'/pages/test/test?num=123&obj={"name":"zhao"}'})`
  * test页面onLoad(data)的参数data接受内容为` data = {num:"123",obj:"{"name":"zhao"}"}`即默认的url传的数据值为字符串,需要在接收时自行解析(JSON.parse)。且url采取ASCII编码只能接受0x20-0x7e区间的符号。无法使用一些特殊符号 如 ` :/?#[]@!$&'()*+,;= `。
  * navigateTo API 为 wx.navigateTo的语法糖,增加了data字段,最终的url数据拼接了通过encodeURIComponent编码(支持默认忽略的特殊符号)的data字段,在跳转页面的onload中通过decodeURIComponent解析url赋值给实例的data对象。为求使用时更加方便(无需对参数data解析再赋值)。且有ts类型提示。
  */
-export function navigateTo(option) {
+export function navigateTo(option, onBack) {
+    backFuncs.push(onBack);
     // @ts-ignore 隐式索引
     if (!option.data) {
         return wx.navigateTo(option);
@@ -24,6 +26,27 @@ export function navigateTo(option) {
         return wx.navigateTo(_encodeURIComponent(option));
     }
 }
+/**
+ * @param options
+ * @returns
+ */
+export function navigateBack(options) {
+    const backFunc = backFuncs.pop();
+    if (backFunc) {
+        if (!options || options.data === undefined) {
+            throw new Error("navigateBack 需要带有data参数的配置对象,因为返回的组件需要data数据");
+        }
+        const data = options.data;
+        const complete = options.complete;
+        options.complete = (res) => {
+            backFunc(data);
+            if (complete) {
+                complete(res);
+            }
+        };
+    }
+    return wx.navigateBack(options);
+}
 export function redirectTo(option) {
     // @ts-ignore 隐式索引
     if (!option.data) {

package/dist/api/wxSugar.js.map

@@ -1 +1 @@
-{"version":3,"file":"wxSugar.js","sourceRoot":"","sources":["../../src/api/wxSugar.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAwBnD;;GAEG;AACH,SAAS,mBAAmB,CAC1B,MAAuE;IAEvE,MAAM,MAAM,GAAuB;QACjC,GAAG,EAAE,GAAG,MAAM,CAAC,GAAG,IAAI,WAAW,CAAC,GAAG,IACnC,kBAAkB,CAChB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAE/B,EAAE;KACH,CAAC;IAEF,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAEtC,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEvC,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AACvC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,UAAU,CACxB,MAA2C;IAE3C,kBAAkB;IAClB,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACjB,OAAO,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;SAAM,CAAC;QACN,OAAO,EAAE,CAAC,UAAU,CAClB,mBAAmB,CAAC,MAAuD,CAAC,CAC7E,CAAC;IACJ,CAAC;AACH,CAAC;AACD,MAAM,UAAU,UAAU,CACxB,MAA2C;IAE3C,kBAAkB;IAClB,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACjB,OAAO,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;SAAM,CAAC;QACN,OAAO,EAAE,CAAC,UAAU,CAClB,mBAAmB,CAAC,MAAuD,CAAC,CAC7E,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"wxSugar.js","sourceRoot":"","sources":["../../src/api/wxSugar.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAwBnD;;GAEG;AACH,SAAS,mBAAmB,CAC1B,MAAuE;IAEvE,MAAM,MAAM,GAAuB;QACjC,GAAG,EAAE,GAAG,MAAM,CAAC,GAAG,IAAI,WAAW,CAAC,GAAG,IACnC,kBAAkB,CAChB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAE/B,EAAE;KACH,CAAC;IAEF,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAEtC,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEvC,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AACvC,CAAC;AACD,MAAM,SAAS,GAAmD,EAAE,CAAC;AACrE;;;;GAIG;AACH,MAAM,UAAU,UAAU,CACxB,MAA2C,EAC3C,MAA+B;IAE/B,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvB,kBAAkB;IAClB,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACjB,OAAO,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;SAAM,CAAC;QACN,OAAO,EAAE,CAAC,UAAU,CAClB,mBAAmB,CAAC,MAAuD,CAAC,CAC7E,CAAC;IACJ,CAAC;AACH,CAAC;AAID;;;GAGG;AACH,MAAM,UAAU,YAAY,CAC1B,OAAW;IAEX,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC;IACjC,IAAI,QAAQ,EAAE,CAAC;QACb,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;QAClE,CAAC;QACD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QAC1B,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QAClC,OAAO,CAAC,QAAQ,GAAG,CAAC,GAAG,EAAE,EAAE;YACzB,QAAQ,CAAC,IAAI,CAAC,CAAC;YACf,IAAI,QAAQ,EAAE,CAAC;gBACb,QAAQ,CAAC,GAAG,CAAC,CAAC;YAChB,CAAC;QACH,CAAC,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;AAClC,CAAC;AACD,MAAM,UAAU,UAAU,CACxB,MAA2C;IAE3C,kBAAkB;IAClB,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACjB,OAAO,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;SAAM,CAAC;QACN,OAAO,EAAE,CAAC,UAAU,CAClB,mBAAmB,CAAC,MAAuD,CAAC,CAC7E,CAAC;IACJ,CAAC;AACH,CAAC"}

package/dist/index.d.ts

@@ -1,8 +1,9 @@
 import { DefineComponent } from "./api/DefineComponent";
 import { type IInjectInfo, instanceConfig } from "./api/InstanceInject/instanceConfig";
 import { RootComponent } from "./api/RootComponent";
+import { SlotComponent } from "./api/SlotComponent";
 import { SubComponent } from "./api/SubComponent";
-import { navigateTo, redirectTo } from "./api/wxSugar";
+import { navigateBack, navigateTo, redirectTo } from "./api/wxSugar";
 import type { CreateComponentType } from "./types/CreateComponentType";
 import type { DetailedType } from "./types/DetailedType";
 import type { ExtendComponentType } from "./types/ExtendComponentType";
@@ -11,4 +12,4 @@ export * from "./utils/_utils";
 export type { Bubbles, BubblesCapture, BubblesCaptureComposed, BubblesComposed, Capture, CaptureComposed, Composed, CustomEventsTags, } from "./api/RootComponent/CustomEvents/CustomEventsTag";
 export type { Vant, Wm } from "./thirdLib";
 export type { CurrentTargetDataset, Dataset, Detail, Mark, TargetDataset, WMBaseEvent, WMCustomEvent, } from "./types/OfficialTypeAlias";
-export { type CreateComponentType, DefineComponent, type DetailedType, type ExtendComponentType, type IInjectInfo, instanceConfig, navigateTo, type ParamsEqual, redirectTo, RootComponent, SubComponent, };
+export { type CreateComponentType, DefineComponent, type DetailedType, type ExtendComponentType, type IInjectInfo, instanceConfig, navigateBack, navigateTo, type ParamsEqual, redirectTo, RootComponent, SlotComponent, SubComponent, };

package/dist/index.js

@@ -1,8 +1,9 @@
 import { DefineComponent } from "./api/DefineComponent";
 import { instanceConfig } from "./api/InstanceInject/instanceConfig";
 import { RootComponent } from "./api/RootComponent";
+import { SlotComponent } from "./api/SlotComponent";
 import { SubComponent } from "./api/SubComponent";
-import { navigateTo, redirectTo } from "./api/wxSugar";
+import { navigateBack, navigateTo, redirectTo } from "./api/wxSugar";
 export * from "./utils/_utils";
-export { DefineComponent, instanceConfig, navigateTo, redirectTo, RootComponent, SubComponent, };
+export { DefineComponent, instanceConfig, navigateBack, navigateTo, redirectTo, RootComponent, SlotComponent, SubComponent, };
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +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,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAKvD,cAAc,gBAAgB,CAAC;AAwB/B,OAAO,EAEL,eAAe,EAIf,cAAc,EACd,UAAU,EAEV,UAAU,EACV,aAAa,EACb,YAAY,GACb,CAAC"}
+{"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,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAKrE,cAAc,gBAAgB,CAAC;AAwB/B,OAAO,EAEL,eAAe,EAIf,cAAc,EACd,YAAY,EACZ,UAAU,EAEV,UAAU,EACV,aAAa,EACb,aAAa,EACb,YAAY,GACb,CAAC"}

package/dist/thirdLib/wm/Textarea.d.ts

@@ -1,28 +1,136 @@
 import type { CreateComponentType } from "../../types/CreateComponentType";
+type ConfirmType = "send" | "search" | "next" | "go" | "done" | "return";
 export type Textarea = CreateComponentType<"textarea", {
     properties: {
         /**
-         * 输入框的内容
+         * 输入框的内容 1.0.0
          */
         value?: string;
         /**
-         * 最大输入长度，设置为 -1 的时候不限制最大长度 默认140
+         * 输入框为空时占位符 1.0.0
+         */
+        placeholder?: string;
+        /**
+         * 指定 placeholder 的样式类，目前仅支持color,font-size和font-weight	1.0.0
+         */
+        placeholderClass?: string;
+        /**
+         * 指定 placeholder 的样式，目前仅支持color,font-size和font-weight 1.0.0
+         */
+        placeholderStyle?: string;
+        /**
+         * 如果 textarea 是在一个 position:fixed 的区域，需要显示指定属性 fixed 为 true	1.0.0
+         */
+        fixed?: boolean;
+        /**
+         * 是否禁用输入框 1.0.0
+         */
+        disabled?: boolean;
+        /**
+         * 	默认140	否	最大输入长度，设置为 -1 的时候不限制最大长度	1.0.0
          */
         maxlength?: number;
         /**
-         * 输入框为空时占位符
+         * 自动聚焦，拉起键盘 1.0.0
          */
-        placeholder?: string;
+        autoFocus?: boolean;
+        /**
+         * 获取焦点 1.0.0
+         */
+        focus?: boolean;
+        /**
+         * 是否自动增高，设置auto-height时，style.height不生效 1.0.0
+         */
+        autoHeight?: boolean;
+        /**
+         * 指定光标与键盘的距离。取textarea距离底部的距离和cursor-spacing指定的距离的最小值作为光标与键盘的距离 1.0.0
+         */
+        cursorSpacing?: number;
+        /**
+         * 指定focus时的光标位置 1.5.0
+         */
+        cursor?: number;
+        /**
+         * 光标起始位置，自动聚集时有效，需与selection-end搭配使用 1.9.0
+         */
+        selectionStart?: number;
+        /**
+         * 光标结束位置，自动聚集时有效，需与selection-start搭配使用 1.9.0
+         */
+        selectionEnd?: number;
+        /**
+         * 键盘弹起时，是否自动上推页面 1.9.90
+         */
+        adjustPosition?: boolean;
+        /**
+         * focus时，点击页面的时候不收起键盘 2.8.2
+         */
+        holdKeyboard?: boolean;
+        /**
+         * 是否去掉 iOS 下的默认内边距 2.10.0
+         */
+        disableDefaultPadding?: boolean;
+        /**
+         * 设置键盘右下角按钮的文字	2.13.0
+         */
+        confirmType?: ConfirmType;
+        /**
+         * 点击键盘右下角按钮时是否保持键盘不收起 2.16.0
+         */
+        confirmHold?: boolean;
+        /**
+         * 键盘对齐位置 2.16.1 cursor	对齐光标位置 bottom	对齐输入框底部
+         */
+        adjustKeyboardTo?: "cursor" | "bottom";
+        /**
+         * 是否显示键盘上方带有”完成“按钮那一栏 1.6.0
+         */
+        showConfirmBar?: boolean;
     };
     customEvents: {
+        /**
+         * 输入框行数变化时调用 1.0.0
+         */
         linechange: {
             height: number;
             heightRpx: number;
             lineCount: number;
         };
+        /**
+         * 当键盘输入时，触发 input 事件 1.0.0
+         */
         input: {
             value: string;
             cursor: number;
+            keyCode: number;
+        };
+        /**
+         * 输入框聚焦时触发 1.0.0
+         */
+        focus?: {
+            value: string;
+            height: number;
+        };
+        /**
+         * 输入框失去焦点时触发 1.0.0
+         */
+        blur?: {
+            value: string;
+            cursor: number;
+        };
+        /**
+         * 点击完成时， 触发 confirm 事件 1.0.0
+         */
+        confirm?: {
+            value: string;
+        };
+        /**
+         * 键盘高度发生变化的时候触发此事件， 2.7.0
+         */
+        keyboardheightchange?: {
+            height: number;
+            duration: number;
         };
     };
 }>;
+export {};

package/dist/thirdLib/wm/index.d.ts

@@ -2,3 +2,4 @@ export type { ScrollView } from "./scrollView";
 export type { Swiper } from "./swiper";
 export type { View } from "./view";
 export type { Textarea } from "./Textarea";
+export type { Map } from "./map";

package/dist/thirdLib/wm/map.d.ts

@@ -0,0 +1,201 @@
+import type { CreateComponentType } from "../../types/CreateComponentType";
+type RegionChangeBegin = {
+    type: "begin";
+    causedBy: "gesture" | "update";
+};
+export type MarkLocation = {
+    latitude: number;
+    longitude: number;
+};
+type RegionChangeEnd = {
+    type: "end";
+    causedBy: "drag" | "scale" | "update";
+    centerLocation: MarkLocation;
+    region: {
+        northeast: MarkLocation;
+        southwest: MarkLocation;
+    };
+    rotate: number;
+    scale: number;
+    skew: number;
+};
+type RegionChangeDetail = RegionChangeBegin | RegionChangeEnd;
+export type Callout = {
+    content: string;
+    display: "ALWAYS" | "BYCLICK";
+    color?: string;
+    fontSize?: string | number;
+    borderWidth?: number;
+    borderRadius?: number;
+    borderColor?: string;
+    bgColor?: string;
+    padding?: number;
+    textAlign?: "center" | "left" | "right";
+    /**
+     * 横向偏移量，向右为正数	number	2.11.0
+     */
+    anchorX?: number;
+    /**
+     * anchorY	纵向偏移量，向下为正数 number	2.11.0
+     */
+    anchorYL?: number;
+};
+export type Marker = {
+    id: number;
+    width: number | string;
+    height: number | string;
+    clusterId?: number;
+    joinCluster?: boolean;
+    latitude: number;
+    longitude: number;
+    title?: string;
+    zIndex?: number;
+    iconPath: string;
+    rotate?: number;
+    alpha?: number;
+    callout?: Callout;
+    customCallout?: Callout;
+    label?: Callout;
+    anchor?: {
+        x: number;
+        y: number;
+    };
+    ariaLabel?: string;
+    collisionRelation?: string;
+    collision?: string;
+};
+export type Circle = {
+    latitude: number;
+    longitude: number;
+    radius: number;
+    color?: string;
+    fillColor?: string;
+    strokeWidth?: number;
+    level?: string;
+};
+export type Polygon = {
+    dashArray?: number[];
+    points: MarkLocation[];
+    strokeWidth?: number;
+    strokeColor?: string;
+    fillColor?: string;
+    zIndex?: number;
+    level?: string;
+};
+export type Polyline = {
+    points: MarkLocation[];
+    color?: string;
+    colorList?: string[];
+    width?: number;
+    dottedLine?: boolean;
+    arrowLine?: boolean;
+    arrowIconPath?: string;
+    borderColor?: string;
+    borderWidth?: number;
+    level?: string;
+    textStyle?: TextStyle;
+    segmentTexts?: SegmentText[];
+};
+export type TextStyle = {
+    textColor?: string;
+    strokeColor?: string;
+    fontSize?: number;
+};
+export type SegmentText = {
+    name: string;
+    startIndex: string;
+    endIndex: number;
+};
+export type Map = CreateComponentType<"map", {
+    properties: {
+        latitude: number;
+        longitude: number;
+        scale?: number;
+        minScale?: number;
+        maxScale?: number;
+        markers?: Marker[];
+        covers?: Marker[];
+        polyline?: Polyline[];
+        circles?: Circle[];
+        controls?: Marker[];
+        includePoints?: Marker[];
+        /**
+         * 显示带有方向的当前定位点 1.0.0
+         */
+        showLocation?: boolean;
+        polygons?: Polygon[];
+        subkey?: string;
+        layerStyle?: number;
+        rotate?: number;
+        skew?: number;
+        enable3D?: boolean;
+        showCompass?: boolean;
+        showScale?: boolean;
+        enableOverlooking?: boolean;
+        enableAutoMaxOverlooking?: boolean;
+        enableZoom?: boolean;
+        enableScroll?: boolean;
+        enableRotate?: boolean;
+        enableSatellite?: boolean;
+        enableTraffic?: boolean;
+        enablePOI?: boolean;
+        enableBuilding?: boolean;
+        setting?: object;
+    };
+    customEvents: {
+        tap: MarkLocation;
+        markertap: {
+            markerId: number;
+        };
+        labeltap: {
+            markerId: number;
+        };
+        controltap: {
+            controlId: number;
+        };
+        callouttap: {
+            markerId: number;
+        };
+        updated: undefined;
+        /**
+         * 视野改变时，regionchange 会触发两次，返回的 type 值分别为 begin 和 end。
+         * 2.8.0 起 begin 阶段返回 causedBy，有效值为 gesture(手势触发) & update(接口触发)
+         * 2.3.0 起 end 阶段返回 causedBy，有效值为 drag(拖动导致)、scale(缩放导致)、update(调用更新接口导致)
+         */
+        regionchange: RegionChangeDetail;
+        poitap: {
+            name: string;
+            longitude: number;
+            latitude: number;
+        };
+        polylinetap: {
+            longitude: number;
+            latitude: number;
+        };
+        abilitysuccess: {
+            ability: string;
+            errCode: number;
+            errMsg: string;
+        };
+        abilityfail: {
+            ability: string;
+            errCode: number;
+            errMsg: string;
+        };
+        authsuccess: {
+            errCode: number;
+            errMsg: string;
+        };
+        interpolatepoint: {
+            markerId: number;
+            longitude: number;
+            latitude: number;
+            animationStatus: "interpolating" | "complete";
+        };
+        error: {
+            longitude: number;
+            latitude: number;
+        };
+    };
+}>;
+export {};

package/dist/thirdLib/wm/map.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=map.js.map

package/dist/thirdLib/wm/map.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"map.js","sourceRoot":"","sources":["../../../src/thirdLib/wm/map.ts"],"names":[],"mappings":""}

package/dist/types/Extra.d.ts

@@ -1,3 +1 @@
-export type Extra<Prefix extends string> = {
-    [K in `${Prefix}_isReady`]?: boolean;
-};
+export type Extra<Prefix extends string> = Partial<Record<`${Prefix}_isReady`, boolean>>;