annil 1.17.0 → 1.18.0

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

@@ -4,7 +4,6 @@ import type { Func } from "hry-types/src/Misc/Func";
 import type { ComputeIntersection } from "hry-types/src/Object/_api";
 import type { ComputeObject } from "../../types/ComputeObject";
 import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
-import type { RemoveNullOfRequired } from "../../types/RemoveNullOfRequired";
 import type { ComponentDoc } from "../DefineComponent/returnType/ComponentDoc";
 import type { IInjectAllData, IInjectMethods, IInjectStore, InjectData } from "../InstanceInject/instanceConfig";
 import type { ComputedConstraint } from "./Computed/ComputedConstraint";
@@ -30,11 +29,13 @@ import type { GetStoreDef } from "./Store/GetStoreDef";
 import type { StoreConstraint } from "./Store/StoreConstraint";
 import type { StoreOption } from "./Store/StoreOption";
 import type { WatchOption } from "./Watch/WatchOption";
-type RootComponentOptions<TEvents extends object, TIsPage extends boolean, TCustomEvents extends CustomEventConstraint, TMethods extends MethodsConstraint, TProperties extends PropertiesConstraint, TData extends object, TStore extends StoreConstraint, TComputed extends Record<string, Func>, EventsDef extends object, CustomEventsDef extends object, PropertiesDef extends object, DataDef extends object, StoreDef extends object, ComputedDef extends object, SelfAllDatas extends object, ValidInjectDatas extends object> = MethodsOption<TMethods, keyof (EventsDef & CustomEventsDef)> & PropertiesOption<TProperties> & IsPageOption<TIsPage> & EventsOption<TEvents> & IfExtends<TIsPage, false, CustomEventsOption<TCustomEvents, keyof EventsDef>, {}> & DataOption<TData, keyof PropertiesDef> & StoreOption<TStore, keyof (PropertiesDef & DataDef)> & ComputedOption<TComputed, keyof (PropertiesDef & DataDef & StoreDef)> & PageLifetimesOption<TIsPage, PropertiesDef> & LifetimesOption & WatchOption<ComputedDef & Required<PropertiesDef> & DataDef & StoreDef & IInjectStore> & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "observers">> & ObserversOption<ComputedDef & Required<PropertiesDef> & DataDef & StoreDef & IInjectStore> & ThisType<RootComponentInstance<TIsPage, TMethods & Omit<IInjectMethods, keyof TMethods>, DataDef, SelfAllDatas & ValidInjectDatas, CustomEventsDef, StoreDef>>;
+type RootComponentOptions<TEvents extends object, TIsPage extends boolean, TCustomEvents extends CustomEventConstraint, TMethods extends MethodsConstraint, TProperties extends PropertiesConstraint, TData extends object, TStore extends StoreConstraint, TComputed extends Record<string, Func>, EventsDef extends object, CustomEventsDef extends object, PropertiesDef extends object, DataDef extends object, StoreDef extends object, ComputedDef extends object, SelfAllDatas extends object, ValidInjectDatas extends object> = MethodsOption<TMethods, keyof (EventsDef & CustomEventsDef)> & PropertiesOption<TProperties> & IsPageOption<TIsPage> & EventsOption<TEvents> & IfExtends<TIsPage, false, CustomEventsOption<TCustomEvents, keyof EventsDef>, {}> & DataOption<TData, keyof PropertiesDef> & StoreOption<TStore, keyof (PropertiesDef & DataDef)> & ComputedOption<TComputed, keyof (PropertiesDef & DataDef & StoreDef)> & PageLifetimesOption<TIsPage, PropertiesDef> & LifetimesOption & WatchOption<ComputedDef & Required<PropertiesDef> & DataDef & StoreDef & IInjectStore> & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "observers">> & {
+    behaviors?: string[];
+} & ObserversOption<ComputedDef & Required<PropertiesDef> & DataDef & StoreDef & IInjectStore> & ThisType<RootComponentInstance<TIsPage, TMethods & Omit<IInjectMethods, keyof TMethods>, DataDef, SelfAllDatas & ValidInjectDatas, CustomEventsDef, StoreDef>>;
 type RootComponentConstructor<TComponentDocList extends ComponentDoc[]> = <TEvents extends EventsConstraint<TComponentDocList>, TStore extends StoreConstraint<ComputeIntersection<Required<PropertiesDef> & DataDef & Omit<InjectData, keyof (PropertiesDef & DataDef)>>>, TIsPage extends boolean = false, const TProperties extends PropertiesConstraint = {}, TData extends object = {}, TComputed extends ComputedConstraint = {}, TCustomEvents extends IfExtends<TIsPage, false, CustomEventConstraint, EmptyObject> = {}, TMethods extends MethodsConstraint = {}, EventsDef extends object = IfExtends<EventsConstraint<TComponentDocList>, TEvents, {}, TEvents>, CustomEventsDef extends object = GetCustomEventsDef<TCustomEvents>, PropertiesDef extends object = GetPropertiesDef<TProperties>, DataDef extends object = TData, StoreDef extends object = StoreConstraint<ComputeIntersection<Required<PropertiesDef> & DataDef & Omit<InjectData, keyof (PropertiesDef & DataDef)>>> extends TStore ? {} : GetStoreDef<TStore>, ComputedDef extends object = GetComputedDef<TComputed>, SelfAllDatas extends object = Required<PropertiesDef> & DataDef & StoreDef & ComputedDef, ValidInjectDatas extends object = Omit<IInjectAllData, keyof SelfAllDatas>>(options: RootComponentOptions<TEvents, TIsPage, TCustomEvents, TMethods, TProperties, TData, TStore, TComputed, EventsDef, CustomEventsDef, PropertiesDef, DataDef, StoreDef, ComputedDef, SelfAllDatas, ValidInjectDatas>) => ComputeIntersection<IfExtends<TIsPage, false, {}, {
     isPage: true;
 }> & IfExtends<EmptyObject, PropertiesDef, {}, {
-    properties: IfExtends<false, TIsPage, PropertiesDef, RemoveNullOfRequired<PropertiesDef>>;
+    properties: IfExtends<false, TIsPage, PropertiesDef, PropertiesDef>;
 }> & IfExtends<EmptyObject, DataDef, {}, {
     data: DataDef;
 }> & IfExtends<EmptyObject, StoreDef, {}, {

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/RootComponent/index.ts"],"names":[],"mappings":"AAyJA,MAAM,UAAU,aAAa;IAO3B,OAAO,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAC;AACnC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/RootComponent/index.ts"],"names":[],"mappings":"AAwJA,MAAM,UAAU,aAAa;IAO3B,OAAO,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAC;AACnC,CAAC"}

package/dist/behaviors/BbeforeCreated.d.ts

@@ -1 +1 @@
-export declare const BBeforeCreate: string;
+export declare const BBeforeCreate: WechatMiniprogram.Behavior.Identifier<WechatMiniprogram.Component.DataOption, WechatMiniprogram.Component.PropertyOption, WechatMiniprogram.Component.MethodOption, WechatMiniprogram.Component.BehaviorOption>;

package/dist/behaviors/BthrottleDebounce.d.ts

@@ -1 +1 @@
-export declare const BthrottleDebounce: string;
+export declare const BthrottleDebounce: WechatMiniprogram.Behavior.Identifier<WechatMiniprogram.Component.DataOption, WechatMiniprogram.Component.PropertyOption, WechatMiniprogram.Component.MethodOption, WechatMiniprogram.Component.BehaviorOption>;

package/dist/index.d.ts

@@ -1,13 +1,13 @@
+import { ChunkComponent } from "./api/ChunkComponent";
+import { CustomComponent } from "./api/CustomComponent";
 import { DefineComponent } from "./api/DefineComponent";
 import { type IInjectInfo, instanceConfig } from "./api/InstanceInject/instanceConfig";
 import { RootComponent } from "./api/RootComponent";
-import { SubComponent } from "./api/SubComponent";
 import { navigateBack, navigateTo, redirectTo } from "./api/wxSugar";
-import type { CreateComponentType } from "./types/CreateComponentType";
+import type { CreateComponentDoc } from "./types/CreateComponentDoc";
 import type { DetailedType } from "./types/DetailedType";
-import type { ExtendComponentType } from "./types/ExtendComponentType";
 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, navigateBack, navigateTo, redirectTo, RootComponent, SubComponent, };
+export { ChunkComponent, type CreateComponentDoc, CustomComponent, DefineComponent, type DetailedType, type IInjectInfo, instanceConfig, navigateBack, navigateTo, redirectTo, RootComponent, };

package/dist/index.js

@@ -1,8 +1,9 @@
+import { ChunkComponent } from "./api/ChunkComponent";
+import { CustomComponent } from "./api/CustomComponent";
 import { DefineComponent } from "./api/DefineComponent";
 import { instanceConfig } from "./api/InstanceInject/instanceConfig";
 import { RootComponent } from "./api/RootComponent";
-import { SubComponent } from "./api/SubComponent";
 import { navigateBack, navigateTo, redirectTo } from "./api/wxSugar";
 export * from "./utils/_utils";
-export { DefineComponent, instanceConfig, navigateBack, navigateTo, redirectTo, RootComponent, SubComponent, };
+export { ChunkComponent, CustomComponent, DefineComponent, instanceConfig, navigateBack, navigateTo, redirectTo, RootComponent, };
 //# 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,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAKrE,cAAc,gBAAgB,CAAC;AAwB/B,OAAO,EAEL,eAAe,EAIf,cAAc,EACd,YAAY,EACZ,UAAU,EACV,UAAU,EACV,aAAa,EACb,YAAY,GACb,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,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,UAAU,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAGrE,cAAc,gBAAgB,CAAC;AAwB/B,OAAO,EACL,cAAc,EAEd,eAAe,EACf,eAAe,EAGf,cAAc,EACd,YAAY,EACZ,UAAU,EACV,UAAU,EACV,aAAa,GACd,CAAC"}

package/dist/thirdLib/vant/Button.d.ts

@@ -1,5 +1,5 @@
-import type { CreateComponentType } from "../../types/CreateComponentType";
-export type Button = CreateComponentType<"button", {
+import type { CreateComponentDoc } from "../../types/CreateComponentDoc";
+export type Button = CreateComponentDoc<"button", {
     properties: {
         id?: string;
         type?: "primary" | "warning" | "danger" | "info";

package/dist/thirdLib/vant/NoticeBar.d.ts

@@ -1,11 +1,11 @@
-import type { CreateComponentType } from "../../types/CreateComponentType";
+import type { CreateComponentDoc } from "../../types/CreateComponentDoc";
 export type CssVar<T extends string = string> = `var(--${T}-${string})`;
 export type HEX = `#${number}`;
 export type RGBA = `rgba(${number},${number},${number},${number})`;
 export type RGB = `rgb(${number},${number},${number})`;
 export type TWClass = `${string}-${string}`;
 export type Color = RGBA | HEX | RGB | CssVar<"color">;
-export type NoticeBar = CreateComponentType<"noticeBar", {
+export type NoticeBar = CreateComponentDoc<"noticeBar", {
     properties: {
         mode?: "closeable" | "link";
         text?: string;

package/dist/thirdLib/vant/Popup.d.ts

@@ -1,6 +1,6 @@
-import type { CreateComponentType } from "../../types/CreateComponentType";
+import type { CreateComponentDoc } from "../../types/CreateComponentDoc";
 type Position = "top" | "bottom" | "left" | "right";
-export type Popup = CreateComponentType<"popup", {
+export type Popup = CreateComponentDoc<"popup", {
     properties: {
         show: boolean;
         zIndex?: number;

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

@@ -1,6 +1,6 @@
-import type { CreateComponentType } from "../../types/CreateComponentType";
+import type { CreateComponentDoc } from "../../types/CreateComponentDoc";
 type ConfirmType = "send" | "search" | "next" | "go" | "done" | "return";
-export type Textarea = CreateComponentType<"textarea", {
+export type Textarea = CreateComponentDoc<"textarea", {
     properties: {
         value?: string;
         placeholder?: string;

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

@@ -1,4 +1,4 @@
-import type { CreateComponentType } from "../../types/CreateComponentType";
+import type { CreateComponentDoc } from "../../types/CreateComponentDoc";
 type RegionChangeBegin = {
     type: "begin";
     causedBy: "gesture" | "update";
@@ -100,7 +100,7 @@ export type SegmentText = {
     startIndex: string;
     endIndex: number;
 };
-export type Map = CreateComponentType<"map", {
+export type Map = CreateComponentDoc<"map", {
     properties: {
         latitude: number;
         longitude: number;

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

@@ -1,6 +1,6 @@
 import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
-import type { CreateComponentType } from "../../types/CreateComponentType";
-export type ScrollView = CreateComponentType<"scrollView", {
+import type { CreateComponentDoc } from "../../types/CreateComponentDoc";
+export type ScrollView = CreateComponentDoc<"scrollView", {
     properties: {
         class?: string;
         style?: string;

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

@@ -1,4 +1,4 @@
-import type { CreateComponentType } from "../../types/CreateComponentType";
+import type { CreateComponentDoc } from "../../types/CreateComponentDoc";
 type CssVar<T extends string = string> = `var(--${T}-${string})`;
 type Color = `rgba(${number}, ${number}, ${number}, ${number})` | `#${number}` | CssVar<"color">;
 interface ChangeEventDetail {
@@ -7,7 +7,7 @@ interface ChangeEventDetail {
     source: "touch" | "" | "autoplay";
 }
 type AnimationfinishEventDetail = ChangeEventDetail;
-export type Swiper = CreateComponentType<"swiper", {
+export type Swiper = CreateComponentDoc<"swiper", {
     properties: {
         class?: string;
         style?: string;

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

@@ -1,6 +1,6 @@
-import type { CreateComponentType } from "../../types/CreateComponentType";
+import type { CreateComponentDoc } from "../../types/CreateComponentDoc";
 import type { BaseEvents } from "./baseEvents";
-export type View = CreateComponentType<"view", {
+export type View = CreateComponentDoc<"view", {
     properties: {
         hoverClass?: string;
         hoverStopPropagation?: boolean;

package/dist/types/{CreateComponentType.d.ts → CreateComponentDoc.d.ts}

@@ -2,8 +2,11 @@ import type { IfExtends } from "hry-types/src/Any/_api";
 import type { ComputeIntersection } from "hry-types/src/Object/_api";
 import type { ComponentDoc } from "../api/DefineComponent/returnType/ComponentDoc";
 import type { AddPrefix } from "./AddPrefix";
-export type CreateComponentType<TName extends string, T extends ComponentDoc> = ComputeIntersection<IfExtends<unknown, T["properties"], {}, {
+type ErrMsg = "{ properties?: Record<string, unknown>; events?: Record<string, unknown>; }";
+type Validator<T> = keyof T extends "properties" | "events" ? ComponentDoc : ErrMsg;
+export type CreateComponentDoc<TName extends string, T extends Validator<T>> = T extends ComponentDoc ? ComputeIntersection<IfExtends<unknown, T["properties"], {}, {
     properties: AddPrefix<T["properties"] & {}, TName>;
 }> & IfExtends<unknown, T["events"], {}, {
     events: AddPrefix<T["events"] & {}, TName>;
-}>>;
+}>> : ErrMsg;
+export {};

package/dist/types/CreateComponentDoc.js

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

package/dist/types/CreateComponentDoc.js.map

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

package/dist/utils/nonNullable.js

@@ -1,6 +1,6 @@
 export function nonNullable(value, message) {
     if (value === null || value === undefined) {
-        throw new Error(message !== null && message !== void 0 ? message : `${value} should not be null or undefined`);
+        throw new Error(message ?? `${value} should not be null or undefined`);
     }
     return value;
 }

package/dist/utils/nonNullable.js.map

@@ -1 +1 @@
-{"version":3,"file":"nonNullable.js","sourceRoot":"","sources":["../../src/utils/nonNullable.ts"],"names":[],"mappings":"AASA,MAAM,UAAU,WAAW,CACzB,KAAsE,EACtE,OAAgB;IAGhB,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,GAAG,KAAK,kCAAkC,CAAC,CAAC;IACzE,CAAC;IAED,OAAO,KAAuB,CAAC;AACjC,CAAC"}
+{"version":3,"file":"nonNullable.js","sourceRoot":"","sources":["../../src/utils/nonNullable.ts"],"names":[],"mappings":"AASA,MAAM,UAAU,WAAW,CACzB,KAAsE,EACtE,OAAgB;IAGhB,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,OAAO,IAAI,GAAG,KAAK,kCAAkC,CAAC,CAAC;IACzE,CAAC;IAED,OAAO,KAAuB,CAAC;AACjC,CAAC"}

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "annil",
-  "version": "1.17.0",
+  "version": "1.18.0",
   "description": "微信小程序(原生开发)插件",
   "main": "dist/index.js",
-  "types": "src/index.ts",
+  "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
     "url": "https://github.com/missannil/annil.git"
   },
+  "type": "module",
   "homepage": "https://github.com/missannil/annil.git",
   "scripts": {
     "coverage": "jest --coverage",
@@ -26,6 +27,8 @@
   "devDependencies": {
     "@commitlint/config-conventional": "^17.6.5",
     "@eslint-community/eslint-plugin-eslint-comments": "^4.7.1",
+    "@eslint/js": "^9.39.5",
+    "@jest/types": "^29.6.3",
     "@types/jest": "^29.5.5",
     "@types/node": "^20.19.37",
     "commitlint": "^17.6.5",
@@ -34,6 +37,7 @@
     "husky": "^8.0.3",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
+    "miniprogram-api-typings": "^5.2.1",
     "miniprogram-simulate": "^1.6.1",
     "mobx": "^6.9.0",
     "ts-jest": "^29.4.11",
@@ -42,12 +46,7 @@
     "vitepress": "^1.6.4"
   },
   "files": [
-    "LICENSE",
-    "CHANGELOG.md",
-    "README.md",
-    "src",
-    "dist",
-    "tsconfig.json"
+    "dist"
   ],
   "keywords": [
     "mini",
@@ -57,7 +56,5 @@
   ],
   "author": "missannil",
   "license": "MIT",
-  "peerDependencies": {
-    "miniprogram-api-typings": "^3.12.3"
-  }
+  "packageManager": "pnpm@11.8.0+sha512.c1f5e7c4cb241c8f174b743851d82f42b802324afc8b0f116b96adb15aa06664948dde36960a3ba1079ba5b4b29dd0140135b94b5b5f5263592249d68e555f26"
 }