npm - annil - Versions diffs - 1.0.7 → 1.1.0 - Mend

annil 1.0.7 → 1.1.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.

Files changed (79) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -4,6 +4,20 @@
 * 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
+## [1.1.0](https://github.com/missannil/annil/compare/v1.0.8...v1.1.0) (2023-12-04)
+### Features
+* 计算属性支持this任意字段,之前只支持data字段 ([5ea92cb](https://github.com/missannil/annil/commit/5ea92cbf32f4892056474973c0a55be780f68894))
+## [1.0.8](https://github.com/missannil/annil/compare/v1.0.7...v1.0.8) (2023-12-03)
+### Bug Fixes
+* 组件类型中别名被解析的问题 ([67e4886](https://github.com/missannil/annil/commit/67e48868b55853c41f5ad4c713dab12e31380f64))
 ## [1.0.7](https://github.com/missannil/annil/compare/v1.0.6...v1.0.7) (2023-12-02)

package/LICENSE CHANGED Viewed

@@ -1,6 +1,6 @@
 The MIT License (MIT)
-Copyright (c) 2013-present, Yuxi (Evan) You
+Copyright (c) 2020, zewei (missannil) zhao
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/api/DefineComponent/NameOrPage/NameOrPathOption.d.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { RootComponentDoc } from "../../RootComponent/RootComponentDoc";
-export type NameOrPageOption<TName extends string, TPath extends `/${string}`, TRootComponent extends RootComponentDoc> = TRootComponent["isPage"] extends true ? {
+import type { Includes } from "../../../types/includes";
+export type NameOrPageOption<TName extends string, TPath extends `/${string}`, IsPage extends boolean> = IsPage extends true ? {
     path: TPath;
 } : {
-    name: TName & IfExtends<TName, "", () => "⚠️组件名不可为空⚠️", unknown>;
+    name: TName & IfExtends<TName, "", () => "⚠️组件名不可为空⚠️", IfExtends<Includes<TName, "_">, true, () => "⚠️组件名不可包含下划线 _ ⚠️", unknown>>;
 };

package/dist/api/DefineComponent/NameOrPage/test/error.test.js CHANGED Viewed

@@ -15,4 +15,8 @@ DefineComponent({
     name: "",
     rootComponent: {},
 });
+DefineComponent({
+    name: "ddd_ddd",
+    rootComponent: {},
+});
 //# sourceMappingURL=error.test.js.map

package/dist/api/DefineComponent/NameOrPage/test/error.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/NameOrPage/test/error.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAExC,eAAe,CAAC;IAEd,IAAI,EAAE,MAAM;IACZ,aAAa,EAAE,EAAE,MAAM,EAAE,IAAI,EAA6B;CAC3D,CAAC,CAAC;AAEH,eAAe,CAAC;IAEd,IAAI,EAAE,oBAAoB;IAC1B,aAAa,EAAE,EAA6B;CAC7C,CAAC,CAAC;AAEH,eAAe,CAAC;IAEd,IAAI,EAAE,mBAAmB;IACzB,aAAa,EAAE,EAAE,MAAM,EAAE,IAAI,EAA6B;CAC3D,CAAC,CAAC;AAEH,eAAe,CAAC;IAEd,IAAI,EAAE,EAAE;IACR,aAAa,EAAE,EAA6B;CAC7C,CAAC,CAAC"}
1	+ {"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/NameOrPage/test/error.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAExC,eAAe,CAAC;IAEd,IAAI,EAAE,MAAM;IACZ,aAAa,EAAE,EAAE,MAAM,EAAE,IAAI,EAA6B;CAC3D,CAAC,CAAC;AAEH,eAAe,CAAC;IAEd,IAAI,EAAE,oBAAoB;IAC1B,aAAa,EAAE,EAA6B;CAC7C,CAAC,CAAC;AAEH,eAAe,CAAC;IAEd,IAAI,EAAE,mBAAmB;IACzB,aAAa,EAAE,EAAE,MAAM,EAAE,IAAI,EAA6B;CAC3D,CAAC,CAAC;AAEH,eAAe,CAAC;IAEd,IAAI,EAAE,EAAE;IACR,aAAa,EAAE,EAA6B;CAC7C,CAAC,CAAC;AAEH,eAAe,CAAC;IAEd,IAAI,EAAE,SAAS;IACf,aAAa,EAAE,EAA6B;CAC7C,CAAC,CAAC"}

package/dist/api/DefineComponent/ReturnType/CreateComponentDoc.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { ComputeIntersectionDeep } from "hry-types/src/Object/ComputeIntersectionDeep";
+import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
 import type { AddNullForObject } from "../../../types/AddNullForObject";
 import type { RootComponentDoc } from "../../RootComponent/RootComponentDoc";
 import type { SubComponentDoc } from "../../SubComponent/SubComponentDoc";
@@ -7,7 +7,7 @@ import type { GetCustomEventDocOfSubDoc } from "./GetCustomEventDocOfSubDoc";
 type GetStopKeys<O> = {
     [k in keyof O]: k extends `${string}_${infer Key}_${string}_catch` ? Key : never;
 }[keyof O];
-export type CreateComponentDoc<TRootDoc extends RootComponentDoc, TName extends string, TSubComponentTuple extends SubComponentDoc[], AllPropertiesDoc extends unknown | object = TRootDoc["properties"], AllCustomEventsDoc extends unknown | object = TRootDoc["customEvents"] & GetCustomEventDocOfSubDoc<TSubComponentTuple[number]>, StopKeys extends string = GetStopKeys<TRootDoc["events"]>, FinalCustomEventDoc extends object = Omit<AllCustomEventsDoc, StopKeys>> = ComputeIntersectionDeep<IfExtends<unknown, AllPropertiesDoc, {}, {
+export type CreateComponentDoc<TRootDoc extends RootComponentDoc, TName extends string, TSubComponentTuple extends SubComponentDoc[], AllPropertiesDoc extends unknown | object = TRootDoc["properties"], AllCustomEventsDoc extends unknown | object = TRootDoc["customEvents"] & GetCustomEventDocOfSubDoc<TSubComponentTuple[number]>, StopKeys extends string = GetStopKeys<TRootDoc["events"]>, FinalCustomEventDoc extends object = Omit<AllCustomEventsDoc, StopKeys>> = ComputeIntersection<IfExtends<unknown, AllPropertiesDoc, {}, {
     properties: {
         [k in keyof AllPropertiesDoc as `${TName}_${k & string}`]: AddNullForObject<AllPropertiesDoc[k]>;
     };

package/dist/api/DefineComponent/ReturnType/CreatePageDoc.d.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { ComputeIntersectionDeep } from "hry-types/src/Object/ComputeIntersectionDeep";
+import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
 import type { RootComponentDoc } from "../../RootComponent/RootComponentDoc";
-export type CreatePageDoc<TRootDoc extends RootComponentDoc, TPath extends string> = ComputeIntersectionDeep<{
+export type CreatePageDoc<TRootDoc extends RootComponentDoc, TPath extends string> = ComputeIntersection<{
     path: TPath;
 } & IfExtends<unknown, TRootDoc["properties"], unknown, {
     properties: TRootDoc["properties"];

package/dist/api/DefineComponent/ReturnType/test/normalComponentDoc.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"normalComponentDoc.test.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/ReturnType/test/normalComponentDoc.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;~~AAEhD~~,OAAO,EAAqB,aAAa,EAAE,MAAM,aAAa,CAAC;~~AAgB~~/D,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAExC,MAAM,UAAU,GAAG;IACjB,GAAG,EAAE,MAAM;IACX,GAAG,EAAE,MAAiC;IACtC,WAAW,EAAE;QACX,IAAI,EAAE,MAAiC;QACvC,KAAK,EAAE,EAAe;KACvB;IACD,iBAAiB,EAAE;QACjB,IAAI,EAAE,MAAwC;QAC9C,KAAK,EAAE,IAAI;KACZ;CAC6B,CAAC;AACjC,MAAM,YAAY,GAAG;IACnB,GAAG,EAAE,MAAM;IACX,IAAI,EAAE,IAAI;IACV,QAAQ,EAAE,MAAyC;IACnD,IAAI,EAAE,CAAC,MAAM,EAAE,MAAiC,EAAE,IAAI,CAAC;IACvD,OAAO,EAAE;QACP,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;KAC3B;IACD,YAAY,EAAE;QACZ,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE;KAChC;IACD,oBAAoB,EAAE;QACpB,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;QACxB,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE;KAC/C;IACD,gBAAgB,EAAE;QAChB,MAAM,EAAE,MAAyC;QACjD,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;KAC3C;IACD,qBAAqB,EAAE;QACrB,MAAM,EAAE,CAAC,MAAM,EAAE,MAAiC,EAAE,IAAI,CAAC;QACzD,OAAO,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;KAChD;IACD,6BAA6B,EAAE;QAC7B,MAAM,EAAE,OAAO;QACf,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;KAC/D;CAC8B,CAAC;AAElC,MAAM,gBAAgB,GAAG,aAAa,EAAE,CAAC;IACvC,UAAU;CACX,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG,eAAe,CAAC;IACrC,IAAI,EAAE,MAAM;IACZ,aAAa,EAAE,gBAAgB;CAChC,CAAC,CAAC;AAYH,QAAkE,CAAC;~~AAGnE~~,MAAM,uBAAuB,GAAG,aAAa,EAAE,CAAC;IAC9C,YAAY;CACb,CAAC,CAAC;AAEH,MAAM,oBAAoB,GAAG,eAAe,CAAC;IAC3C,IAAI,EAAE,MAAM;IACZ,aAAa,EAAE,uBAAuB;CACvC,CAAC,CAAC;~~AAiBH~~,QAA8E,CAAC;~~AAG~~/E,MAAM,aAAa,GAAG,aAAa,EAAE,CAAC;IACpC,UAAU;IACV,YAAY;CACb,CAAC,CAAC;AAEH,MAAM,OAAO,GAAG,eAAe,CAAC;IAC9B,IAAI,EAAE,MAAM;IACZ,aAAa;CACd,CAAC,CAAC;AAEH,~~QAAmH~~,CAAC;~~AAoCpH~~,MAAM,mBAAmB,GAAG,eAAe,CAAC;IAC1C,IAAI,EAAE,MAAM;IACZ,aAAa,EAAE,CAAC,~~EAAO~~,CAAC;~~CACzB~~,CAAC,CAAC;AAWH,QAA0E,CAAC;AAS3E,MAAM,gCAAgC,GAAG,eAAe,CAAC;IACvD,IAAI,EAAE,MAAM;IACZ,aAAa,EAAE,CAAC,~~EAAO~~,EAAE,~~EAAO~~,CAAC;~~CAClC~~,CAAC,CAAC;AAWH,QAAoG,CAAC;~~AASrG~~,MAAM,gBAAgB,GAAG,eAAe,CAAC;IACvC,IAAI,EAAE,MAAM;IACZ,aAAa,EAAE,EAAkB;IACjC,aAAa,EAAE,CAAC,~~EAAO~~,CAAC;~~CACzB~~,CAAC,CAAC;~~AASH~~,QAAoE,CAAC;AAGrE,MAAM,WAAW,GAAG,eAAe,CAAC;IAClC,IAAI,EAAE,MAAM;IACZ,aAAa,EAAE,EAAE;IACjB,aAAa,EAAE,EAAE;CAClB,CAAC,CAAC;AAEH,QAA2C,CAAC"}
1	+ {"version":3,"file":"normalComponentDoc.test.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/ReturnType/test/normalComponentDoc.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAChD,OAAO,EAAqB,aAAa,EAAE,MAAM,aAAa,CAAC;AAiB/D,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAExC,MAAM,UAAU,GAAG;IACjB,GAAG,EAAE,MAAM;IACX,GAAG,EAAE,MAAiC;IACtC,WAAW,EAAE;QACX,IAAI,EAAE,MAAiC;QACvC,KAAK,EAAE,EAAe;KACvB;IACD,iBAAiB,EAAE;QACjB,IAAI,EAAE,MAAwC;QAC9C,KAAK,EAAE,IAAI;KACZ;CAC6B,CAAC;AACjC,MAAM,YAAY,GAAG;IACnB,GAAG,EAAE,MAAM;IACX,IAAI,EAAE,IAAI;IACV,QAAQ,EAAE,MAAyC;IACnD,IAAI,EAAE,CAAC,MAAM,EAAE,MAAiC,EAAE,IAAI,CAAC;IACvD,OAAO,EAAE;QACP,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;KAC3B;IACD,YAAY,EAAE;QACZ,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE;KAChC;IACD,oBAAoB,EAAE;QACpB,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;QACxB,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE;KAC/C;IACD,gBAAgB,EAAE;QAChB,MAAM,EAAE,MAAyC;QACjD,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;KAC3C;IACD,qBAAqB,EAAE;QACrB,MAAM,EAAE,CAAC,MAAM,EAAE,MAAiC,EAAE,IAAI,CAAC;QACzD,OAAO,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;KAChD;IACD,6BAA6B,EAAE;QAC7B,MAAM,EAAE,OAAO;QACf,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;KAC/D;CAC8B,CAAC;AAElC,MAAM,gBAAgB,GAAG,aAAa,EAAE,CAAC;IACvC,UAAU;CACX,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG,eAAe,CAAC;IACrC,IAAI,EAAE,MAAM;IACZ,aAAa,EAAE,gBAAgB;CAChC,CAAC,CAAC;AAYH,QAAkE,CAAC;AAEnE,MAAM,uBAAuB,GAAG,aAAa,EAAE,CAAC;IAC9C,YAAY;CACb,CAAC,CAAC;AAEH,MAAM,oBAAoB,GAAG,eAAe,CAAC;IAC3C,IAAI,EAAE,MAAM;IACZ,aAAa,EAAE,uBAAuB;CACvC,CAAC,CAAC;AAkBH,QAA8E,CAAC;AAE/E,MAAM,aAAa,GAAG,aAAa,EAAE,CAAC;IACpC,UAAU;IACV,YAAY;CACb,CAAC,CAAC;AAEH,MAAM,OAAO,GAAG,eAAe,CAAC;IAC9B,IAAI,EAAE,MAAM;IACZ,aAAa;CACd,CAAC,CAAC;AAEH,QAA+G,CAAC;AAQhH,MAAM,mBAAmB,GAAG,eAAe,CAAC;IAC1C,IAAI,EAAE,MAAM;IACZ,aAAa,EAAE,CAAC,EAAU,CAAC;CAC5B,CAAC,CAAC;AAWH,QAA0E,CAAC;AAS3E,MAAM,gCAAgC,GAAG,eAAe,CAAC;IACvD,IAAI,EAAE,MAAM;IACZ,aAAa,EAAE,CAAC,EAAU,EAAE,EAAU,CAAC;CACxC,CAAC,CAAC;AAWH,QAAoG,CAAC;AAQrG,MAAM,gBAAgB,GAAG,eAAe,CAAC;IACvC,IAAI,EAAE,MAAM;IACZ,aAAa,EAAE,EAAkB;IACjC,aAAa,EAAE,CAAC,EAAU,CAAC;CAC5B,CAAC,CAAC;AAWH,QAAoE,CAAC;AAGrE,MAAM,WAAW,GAAG,eAAe,CAAC;IAClC,IAAI,EAAE,MAAM;IACZ,aAAa,EAAE,EAAE;IACjB,aAAa,EAAE,EAAE;CAClB,CAAC,CAAC;AAEH,QAA2C,CAAC"}

package/dist/api/DefineComponent/ReturnType/test/normalPageDoc.test.js CHANGED Viewed

@@ -25,7 +25,7 @@ Checking;
 const whenSubIsAllNever = DefineComponent({
     path: "/pages/index/index",
     rootComponent: OnlyPropsRootDoc,
-    subComponents: [{}],
+    subComponents: [{}, {}],
 });
 Checking;
 //# sourceMappingURL=normalPageDoc.test.js.map

package/dist/api/DefineComponent/ReturnType/test/normalPageDoc.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"normalPageDoc.test.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/ReturnType/test/normalPageDoc.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAChD,OAAO,EAAqB,aAAa,EAAE,MAAM,aAAa,CAAC;AAG/D,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAExC,MAAM,gBAAgB,GAAG,aAAa,EAAE,CAAC;IACvC,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE;QACV,GAAG,EAAE,MAAM;QACX,GAAG,EAAE,MAAiC;QACtC,WAAW,EAAE;YACX,IAAI,EAAE,MAAiC;YACvC,KAAK,EAAE,EAAe;SACvB;QACD,iBAAiB,EAAE;YACjB,IAAI,EAAE,MAAwC;YAC9C,KAAK,EAAE,IAAI;SACZ;KACF;IACD,YAAY,EAAE,EAAE;CACjB,CAAC,CAAC;AAEH,MAAM,qBAAqB,GAAG,eAAe,CAAC;IAC5C,IAAI,EAAE,oBAAoB;IAC1B,aAAa,EAAE,gBAAgB;CAChC,CAAC,CAAC;AAaH,QAAgF,CAAC;AAGjF,MAAM,iBAAiB,GAAG,eAAe,CAAC;IACxC,IAAI,EAAE,oBAAoB;IAC1B,aAAa,EAAE,gBAAgB;IAC/B,aAAa,EAAE,CAAC,EAAW,CAAC;~~CAC7B~~,CAAC,CAAC;AAEH,QAA4E,CAAC"}
1	+ {"version":3,"file":"normalPageDoc.test.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/ReturnType/test/normalPageDoc.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAChD,OAAO,EAAqB,aAAa,EAAE,MAAM,aAAa,CAAC;AAG/D,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAExC,MAAM,gBAAgB,GAAG,aAAa,EAAE,CAAC;IACvC,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE;QACV,GAAG,EAAE,MAAM;QACX,GAAG,EAAE,MAAiC;QACtC,WAAW,EAAE;YACX,IAAI,EAAE,MAAiC;YACvC,KAAK,EAAE,EAAe;SACvB;QACD,iBAAiB,EAAE;YACjB,IAAI,EAAE,MAAwC;YAC9C,KAAK,EAAE,IAAI;SACZ;KACF;IACD,YAAY,EAAE,EAAE;CACjB,CAAC,CAAC;AAEH,MAAM,qBAAqB,GAAG,eAAe,CAAC;IAC5C,IAAI,EAAE,oBAAoB;IAC1B,aAAa,EAAE,gBAAgB;CAChC,CAAC,CAAC;AAaH,QAAgF,CAAC;AAGjF,MAAM,iBAAiB,GAAG,eAAe,CAAC;IACxC,IAAI,EAAE,oBAAoB;IAC1B,aAAa,EAAE,gBAAgB;IAC/B,aAAa,EAAE,CAAC,EAAW,EAAE,EAAW,CAAC;CAC1C,CAAC,CAAC;AAEH,QAA4E,CAAC"}

package/dist/api/DefineComponent/SubComponents/test/normal.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/SubComponents/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAGhD,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAExC,MAAM,WAAW,GAAG,EAElB,CAAC;AAEH,MAAM,eAAe,GAAG,EAEtB,CAAC;AAGH,eAAe,CAAC;IACd,IAAI,EAAE,MAAM;IACZ,aAAa,EAAE,CAAC,WAAW,EAAE,eAAe,CAAC;CAC9C,CAAC,CAAC;AAGH,eAAe,CAAC;IACd,IAAI,EAAE,mBAAmB;IACzB,aAAa,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;IAC/B,aAAa,EAAE,CAAC,WAAW,EAAE,eAAe,CAAC;CAC9C,CAAC,CAAC;AAEH,MAAM,CAAC,GAAG,EAAoD,CAAC;AAE/D,MAAM,CAAC,GAAG,EAAoD,CAAC;AAE/D,MAAM,CAAC,GAAG,EAAsD,CAAC;AAGjE,MAAM,GAAG,GAAG,eAAe,CAAC;IAC1B,IAAI,EAAE,MAAM;IAEZ,aAAa,EAAE;QACb,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;KACF;CACF,CAAC,CAAC;AAEH,QAMa,CAAC"}
1	+ {"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/SubComponents/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAGhD,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAExC,MAAM,WAAW,GAAG,EAElB,CAAC;AAEH,MAAM,eAAe,GAAG,EAEtB,CAAC;AAGH,eAAe,CAAC;IACd,IAAI,EAAE,MAAM;IACZ,aAAa,EAAE,CAAC,WAAW,EAAE,eAAe,CAAC;CAC9C,CAAC,CAAC;AAGH,eAAe,CAAC;IACd,IAAI,EAAE,mBAAmB;IACzB,aAAa,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;IAC/B,aAAa,EAAE,CAAC,WAAW,EAAE,eAAe,CAAC;CAC9C,CAAC,CAAC;AAEH,MAAM,CAAC,GAAG,EAAoD,CAAC;AAE/D,MAAM,CAAC,GAAG,EAAoD,CAAC;AAE/D,MAAM,CAAC,GAAG,EAAsD,CAAC;AAEjE,MAAM,GAAG,GAAG,eAAe,CAAC;IAC1B,IAAI,EAAE,MAAM;IAEZ,aAAa,EAAE;QACb,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;QACD,CAAC;KACF;CACF,CAAC,CAAC;AAEH,QAMa,CAAC"}

package/dist/api/DefineComponent/index.d.ts CHANGED Viewed

@@ -10,7 +10,7 @@ import type { CreatePageDoc } from "./ReturnType/CreatePageDoc";
 import type { RootComponentOption } from "./RootComponent/RootComponentOption";
 import type { SubComponentsOption } from "./SubComponents/SubComponentsOption";
 type Path = `/${string}`;
-type RootOptions<TRootComponentDoc extends RootComponentDoc, TSubComponentTuple extends SubComponentDoc[], TName extends string, TPath extends Path> = NameOrPathOption<TName, TPath, TRootComponentDoc> & RootComponentOption<TRootComponentDoc> & SubComponentsOption<TSubComponentTuple>;
+type RootOptions<TRootComponentDoc extends RootComponentDoc, TSubComponentTuple extends SubComponentDoc[], TName extends string, TPath extends Path> = NameOrPathOption<TName, TPath, TRootComponentDoc["isPage"] & {}> & RootComponentOption<TRootComponentDoc> & SubComponentsOption<TSubComponentTuple>;
 interface DefineComponentConstructor {
     <TRootComponentDoc extends RootComponentDoc = {}, TSubComponentTuple extends SubComponentDoc[] = [], TName extends string = "", TPath extends Path = "/">(options: RootOptions<TRootComponentDoc, TSubComponentTuple, TName, TPath>): IfExtends<"", TName, CreatePageDoc<TRootComponentDoc, TPath>, CreateComponentDoc<TRootComponentDoc, TName, TSubComponentTuple>>;
 }

package/dist/api/RootComponent/Properties/GetOptionalDoc.d.ts CHANGED Viewed

@@ -1,8 +1,7 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { Select } from "hry-types/src/Object/Select";
 import type { AddNullForObject } from "../../../types/AddNullForObject";
 import type { InferDetailedType } from "../../../types/InferDetailedType";
-import type { OptionalType, PropertiesConstraint } from "./PropertiesConstraint";
-export type GetOptionalDoc<TProperties extends PropertiesConstraint, TIsPage extends boolean, Optional extends Record<string, OptionalType> = Select<TProperties, OptionalType>> = {
-    [k in keyof Optional]?: IfExtends<unknown, Optional[k]["optionalTypes"], IfExtends<false, TIsPage, AddNullForObject<InferDetailedType<Optional[k]["type"]>>, InferDetailedType<Optional[k]["type"]>>, IfExtends<false, TIsPage, AddNullForObject<InferDetailedType<Optional[k]["type"]> | InferDetailedType<(Optional[k]["optionalTypes"] & {})[number]>>, InferDetailedType<Optional[k]["type"]> | InferDetailedType<(Optional[k]["optionalTypes"] & {})[number]>>>;
+import type { OptionalType } from "./PropertiesConstraint";
+export type GetOptionalDoc<TOptionalProperties extends Record<string, OptionalType>, TIsPage extends boolean> = {
+    -readonly [k in keyof TOptionalProperties]?: IfExtends<unknown, TOptionalProperties[k]["optionalTypes"], IfExtends<false, TIsPage, AddNullForObject<InferDetailedType<TOptionalProperties[k]["type"]>>, InferDetailedType<TOptionalProperties[k]["type"]>>, IfExtends<false, TIsPage, AddNullForObject<InferDetailedType<TOptionalProperties[k]["type"]> | InferDetailedType<(TOptionalProperties[k]["optionalTypes"] & {})[number]>>, InferDetailedType<TOptionalProperties[k]["type"]> | InferDetailedType<(TOptionalProperties[k]["optionalTypes"] & {})[number]>>>;
 };

package/dist/api/RootComponent/Properties/GetPropertiesDoc.d.ts CHANGED Viewed

@@ -1,9 +1,8 @@
-import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { Select } from "hry-types/src/Object/Select";
-import type { ComputeIntersection, NonReadonlyDeep } from "hry-types/src/Object/_api";
+import type { ComputeIntersection } from "hry-types/src/Object/_api";
 import type { GetOptionalDoc } from "./GetOptionalDoc";
 import type { GetRequiredDoc } from "./GetRequiredDoc";
 import type { OptionalType, PropertiesConstraint } from "./PropertiesConstraint";
-type _GetPropertiesDoc<TProperties extends PropertiesConstraint, TIsPage extends boolean, Type extends "Required" | "Optional" | "all" = "all", OptionalDoc = NonReadonlyDeep<GetOptionalDoc<Select<TProperties, OptionalType>, TIsPage>>, RequiredDoc = NonReadonlyDeep<GetRequiredDoc<Omit<TProperties, keyof OptionalDoc>, TIsPage>>> = IfExtends<Type, "all", ComputeIntersection<OptionalDoc & RequiredDoc>, IfExtends<Type, "Optional", OptionalDoc, RequiredDoc>>;
-export type GetPropertiesDoc<TProperties extends PropertiesConstraint, TisPage extends boolean, Type extends "Required" | "Optional" | "all" = "all"> = _GetPropertiesDoc<TProperties, TisPage, Type>;
+type _GetPropertiesDoc<TProperties extends PropertiesConstraint, TIsPage extends boolean, OptionalDoc extends object = GetOptionalDoc<Select<TProperties, OptionalType>, TIsPage>, RequiredDoc extends object = GetRequiredDoc<Omit<TProperties, keyof OptionalDoc>, TIsPage>> = ComputeIntersection<OptionalDoc & RequiredDoc>;
+export type GetPropertiesDoc<TProperties extends PropertiesConstraint, TisPage extends boolean> = _GetPropertiesDoc<TProperties, TisPage>;
 export {};

package/dist/api/RootComponent/Properties/GetRequiredDoc.d.ts CHANGED Viewed

@@ -1,8 +1,7 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { Select } from "hry-types/src/Object/Select";
 import type { AddNullForObject } from "../../../types/AddNullForObject";
 import type { InferDetailedType } from "../../../types/InferDetailedType";
-import type { PropertiesConstraint, RequiredSingle, RequiredType } from "./PropertiesConstraint";
-export type GetRequiredDoc<TProperties extends PropertiesConstraint, TIsPage extends boolean, Required extends Record<string, RequiredType> = Select<TProperties, RequiredType>> = {
-    [k in keyof Required]: IfExtends<Required[k], RequiredSingle, IfExtends<false, TIsPage, AddNullForObject<InferDetailedType<Required[k]>>, InferDetailedType<Required[k]>>, IfExtends<false, TIsPage, AddNullForObject<InferDetailedType<Required[k]["type"]>> | AddNullForObject<InferDetailedType<Required[k]["optionalTypes"][number]>>, InferDetailedType<Required[k]["type"]> | InferDetailedType<Required[k]["optionalTypes"][number]>>>;
+import type { RequiredSingle, RequiredType } from "./PropertiesConstraint";
+export type GetRequiredDoc<TProperties extends Record<string, RequiredType>, TIsPage extends boolean> = {
+    -readonly [k in keyof TProperties]: IfExtends<TProperties[k], RequiredSingle, IfExtends<false, TIsPage, AddNullForObject<InferDetailedType<TProperties[k]>>, InferDetailedType<TProperties[k]>>, IfExtends<false, TIsPage, AddNullForObject<InferDetailedType<TProperties[k]["type"]> | InferDetailedType<TProperties[k]["optionalTypes"][number]>>, InferDetailedType<TProperties[k]["type"]> | InferDetailedType<TProperties[k]["optionalTypes"][number]>>>;
 };

package/dist/api/RootComponent/Store/test/normal.test.js CHANGED Viewed

@@ -1,13 +1,15 @@
+import { Checking } from "hry-types";
 import { observable } from "mobx";
 import { RootComponent } from "../..";
 const user = observable({
     name: "zhao",
     age: 20,
 });
-RootComponent()({
+const storeDoc = RootComponent()({
     store: {
         userName: () => user.name,
         userAge: () => user.age,
     },
 });
+Checking;
 //# sourceMappingURL=normal.test.js.map

package/dist/api/RootComponent/Store/test/normal.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Store/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,MAAM,IAAI,GAAG,UAAU,CAAC;IACtB,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,EAAE;CACR,CAAC,CAAC;AAEH,aAAa,EAAE,CAAC;~~IACd~~,KAAK,EAAE;QACL,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI;QACzB,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG;KACxB;CACF,CAAC,CAAC"}
1	+ {"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Store/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,MAAM,IAAI,GAAG,UAAU,CAAC;IACtB,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,EAAE;CACR,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAG,aAAa,EAAE,CAAC;IAC/B,KAAK,EAAE;QACL,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI;QACzB,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG;KACxB;CACF,CAAC,CAAC;AASH,QAAsD,CAAC"}

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

@@ -2,7 +2,8 @@ import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { NoInfer } from "hry-types/src/Generic/NoInfer";
 import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
 import type { Func } from "hry-types/src/Misc/Func";
-import type { ComputeIntersectionDeep } from "hry-types/src/Object/_api";
+import type { ComputeIntersection } from "hry-types/src/Object/_api";
+import type { ComputeObject } from "../../types/ComputeObj";
 import type { WMCompOtherOption, WMCompPageLifetimes, WMPageLifetimes } from "../../types/OfficialTypeAlias";
 import type { ComponentDoc } from "../DefineComponent/ReturnType/ComponentDoc";
 import type { ComputedConstraint } from "./Computed/ComputedConstraint";
@@ -31,14 +32,14 @@ import type { StoreOption } from "./Store/StoreOption";
 import type { WatchOption } from "./Watch/WatchOption";
 type RootComponentOptions<TReceivedComponentDoc extends object, 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>, EventsDoc extends object, CustomEventsDoc extends object, PropertiesDoc extends object, DataDoc extends object, StoreDoc extends object, ComputedDoc extends object> = MethodsOption<TMethods, keyof (EventsDoc & CustomEventsDoc)> & PropertiesOption<TProperties> & IsPageOption<TIsPage> & CustomEventsOption<TCustomEvents, EventsDoc> & EventsOption<TEvents, EventsConstraint<TReceivedComponentDoc>> & DataOption<TData, PropertiesDoc> & StoreOption<TStore, PropertiesDoc & DataDoc> & ComputedOption<TComputed, Required<PropertiesDoc> & DataDoc & StoreDoc> & PageLifetimesOption<TIsPage, NoInfer<PropertiesDoc>> & LifetimesOption<TIsPage> & WatchOption<ComputedDoc & Required<PropertiesDoc> & DataDoc & StoreDoc> & Partial<Omit<WMCompOtherOption, "pageLifetimes">> & ThisType<RootComponentInstance<TIsPage, TMethods, DataDoc, DataDoc & Required<PropertiesDoc> & StoreDoc & ComputedDoc, CustomEventsDoc, StoreDoc>>;
 type RootComponentConstructor<TReceivedComponentDoc extends ComponentDoc[] | ComponentDoc> = {
-    <TEvents extends EventsConstraint<TReceivedComponentDoc>, TIsPage extends boolean = false, const TProperties extends PropertiesConstraint = {}, TData extends object = {}, TStore extends StoreConstraint = {}, TComputed extends ComputedConstraint = {}, TCustomEvents extends IfExtends<TIsPage, false, CustomEventConstraint, EmptyObject> = {}, TMethods extends MethodsConstraint = {}, EventsDoc extends object = IfExtends<EventsConstraint<TReceivedComponentDoc>, TEvents, {}, TEvents>, CustomEventsDoc extends object = GetCustomEventDoc<TCustomEvents>, PropertiesDoc extends object = GetPropertiesDoc<TProperties, TIsPage>, DataDoc extends object = TData, StoreDoc extends object = GeTStoreDoc<TStore>, ComputedDoc extends object = GetComputedDoc<TComputed>>(options: RootComponentOptions<TReceivedComponentDoc, TEvents, TIsPage, TCustomEvents, TMethods, TProperties, TData, TStore, TComputed, EventsDoc, CustomEventsDoc, PropertiesDoc, DataDoc, StoreDoc, ComputedDoc>): ComputeIntersectionDeep<IfExtends<TIsPage, false, {}, {
+    <TEvents extends EventsConstraint<TReceivedComponentDoc>, TIsPage extends boolean = false, const TProperties extends PropertiesConstraint = {}, TData extends object = {}, TStore extends StoreConstraint = {}, TComputed extends ComputedConstraint = {}, TCustomEvents extends IfExtends<TIsPage, false, CustomEventConstraint, EmptyObject> = {}, TMethods extends MethodsConstraint = {}, EventsDoc extends object = IfExtends<EventsConstraint<TReceivedComponentDoc>, TEvents, {}, TEvents>, CustomEventsDoc extends object = GetCustomEventDoc<TCustomEvents>, PropertiesDoc extends object = GetPropertiesDoc<TProperties, TIsPage>, DataDoc extends object = TData, StoreDoc extends object = GeTStoreDoc<TStore>, ComputedDoc extends object = GetComputedDoc<TComputed>>(options: RootComponentOptions<TReceivedComponentDoc, TEvents, TIsPage, TCustomEvents, TMethods, TProperties, TData, TStore, TComputed, EventsDoc, CustomEventsDoc, PropertiesDoc, DataDoc, StoreDoc, ComputedDoc>): ComputeIntersection<IfExtends<TIsPage, false, {}, {
         isPage: true;
     }> & IfExtends<EmptyObject, PropertiesDoc, {}, {
         properties: PropertiesDoc;
     }> & IfExtends<EmptyObject, DataDoc, {}, {
         data: DataDoc;
     }> & IfExtends<EmptyObject, StoreDoc, {}, {
-        store: StoreDoc;
+        store: ComputeObject<StoreDoc>;
     }> & IfExtends<EmptyObject, ComputedDoc, {}, {
         computed: ComputedDoc;
     }> & IfExtends<EmptyObject, TMethods, {}, {
@@ -46,7 +47,7 @@ type RootComponentConstructor<TReceivedComponentDoc extends ComponentDoc[] | Com
     }> & IfExtends<EmptyObject, EventsDoc, {}, {
         events: EventsDoc;
     }> & IfExtends<EmptyObject, CustomEventsDoc, {}, {
-        customEvents: CustomEventsDoc;
+        customEvents: ComputeObject<CustomEventsDoc>;
     }>>;
 };
 export declare function RootComponent<TReceivedComponentDoc extends ComponentDoc[] | ComponentDoc = {}>(): RootComponentConstructor<TReceivedComponentDoc>;

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

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/RootComponent/index.ts"],"names":[],"mappings":"~~AA8HA~~,MAAM,UAAU,aAAa;IAM3B,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAmC,CAAQ,CAAC;AACxE,CAAC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/RootComponent/index.ts"],"names":[],"mappings":"AA+HA,MAAM,UAAU,aAAa;IAM3B,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAmC,CAAQ,CAAC;AACxE,CAAC"}

package/dist/api/SubComponent/SubData/test/normal.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubData/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAOhD,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAWrC,YAAY,EAAe,CAAC;IAC1B,OAAO,EAAE;QACP,OAAO,EAAE,MAAM;KAChB;IACD,IAAI,EAAE;QACJ,OAAO,EAAE,GAAG;QACZ,OAAO,EAAE,GAAG;QACZ,aAAa,EAAE,UAAU;KAC1B;CACF,CAAC,CAAC;~~AAKH~~,MAAM,GAAG,GAAG,YAAY,EAAmB,CAAC;IAC1C,OAAO,EAAE;QACP,UAAU,EAAE,MAAM;KACnB;IACD,IAAI,EAAE;QAEJ,UAAU,EAAE,QAAQ;QACpB,gBAAgB,EAAE,MAAM;QAExB,QAAQ,EAAE,EAAsB;QAChC,QAAQ,EAAE,GAAG;QACb,QAAQ,EAAE,GAAG;KACd;CACF,CAAC,CAAC;AAEH,QAAsC,CAAC;AAGvC,YAAY,EAAe,CAAC;IAC1B,OAAO,EAAE;QACP,OAAO,EAAE,MAAM;QACf,OAAO,EAAE,MAAM;QACf,OAAO,EAAE,MAAM;KAChB;IACD,IAAI,EAAE;QACJ,QAAQ,EAAE,KAAK;KAChB;CACF,CAAC,CAAC;AAMH,MAAM,IAAI,GAAG,YAAY,EAAoB,CAAC,EAAE,CAAC,CAAC;AAElD,QAAuC,CAAC;AAExC,YAAY,EAAe,CAAC;IAC1B,IAAI,EAAE;QACJ,OAAO,EAAE,GAAG;QACZ,OAAO,EAAE,GAAG;QACZ,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,KAAK;KAChB;IACD,OAAO,EAAE;QACP,KAAK;YAEH,QASC,CAAC;QACJ,CAAC;KACF;CACF,CAAC,CAAC"}
1	+ {"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubData/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAOhD,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAWrC,YAAY,EAAe,CAAC;IAC1B,OAAO,EAAE;QACP,OAAO,EAAE,MAAM;KAChB;IACD,IAAI,EAAE;QACJ,OAAO,EAAE,GAAG;QACZ,OAAO,EAAE,GAAG;QACZ,aAAa,EAAE,UAAU;KAC1B;CACF,CAAC,CAAC;AAQH,MAAM,GAAG,GAAG,YAAY,EAAmB,CAAC;IAC1C,OAAO,EAAE;QACP,UAAU,EAAE,MAAM;KACnB;IACD,IAAI,EAAE;QAEJ,UAAU,EAAE,QAAQ;QACpB,gBAAgB,EAAE,MAAM;QAExB,QAAQ,EAAE,EAAsB;QAChC,QAAQ,EAAE,GAAG;QACb,QAAQ,EAAE,GAAG;KACd;CACF,CAAC,CAAC;AAEH,QAAsC,CAAC;AAGvC,YAAY,EAAe,CAAC;IAC1B,OAAO,EAAE;QACP,OAAO,EAAE,MAAM;QACf,OAAO,EAAE,MAAM;QACf,OAAO,EAAE,MAAM;KAChB;IACD,IAAI,EAAE;QACJ,QAAQ,EAAE,KAAK;KAChB;CACF,CAAC,CAAC;AAMH,MAAM,IAAI,GAAG,YAAY,EAAoB,CAAC,EAAE,CAAC,CAAC;AAElD,QAAuC,CAAC;AAExC,YAAY,EAAe,CAAC;IAC1B,IAAI,EAAE;QACJ,OAAO,EAAE,GAAG;QACZ,OAAO,EAAE,GAAG;QACZ,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,KAAK;KAChB;IACD,OAAO,EAAE;QACP,KAAK;YAEH,QASC,CAAC;QACJ,CAAC;KACF;CACF,CAAC,CAAC"}

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

@@ -1,7 +1,7 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
 import type { RequiredKeys } from "hry-types/src/Object/RequiredKeys";
-import type { ExtractDocPrefix } from "../../types/GetComponentPrefix";
+import type { GetComponentPrefix } from "../../types/GetComponentPrefix";
 import type { ReplacePrefix } from "../../types/ReplacePrefix";
 import type { ComponentDoc } from "../DefineComponent/ReturnType/ComponentDoc";
 import type { Func } from "hry-types/src/Misc/Func";
@@ -27,7 +27,7 @@ import type { SubWatchOption } from "./SubWatch/SubWatchOption";
 type Options<RootDoc extends RootComponentDoc, IsPage extends boolean, CurrentCompDoc extends ComponentDoc, Prefix extends string, AllRootDataDoc extends object, TInherit extends object, TSubData extends object, TSubStore extends object, TSubComputed extends object, TEvents extends object, TSubMethods extends object, InheritDoc extends object, SubDataDoc extends object, SubStoreDoc extends object, SubComputedDoc extends object, SubEventsDoc extends object, SubMethodsDoc extends object> = {
     inherit?: TInherit;
 } & SubDataOption<TSubData, Exclude<keyof CurrentCompDoc["properties"], (keyof InheritDoc)>, Prefix> & SubStoreOption<TSubStore, Exclude<keyof CurrentCompDoc["properties"], (keyof (InheritDoc & SubDataDoc))>, Prefix> & SubComputedOption<TSubComputed, Omit<CurrentCompDoc["properties"], (keyof (InheritDoc & SubDataDoc & SubStoreDoc))>> & SubEventsOption<TEvents, SubEventsDoc, keyof SubEventsConstraint<CurrentCompDoc>> & SubMethodsOption<TSubMethods, Prefix, keyof CurrentCompDoc["customEvents"]> & SubPageLifetimesOption<IsPage, RootDoc["properties"] & {}> & SubLifetimesOption & SubWatchOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc> & Partial<Omit<WMCompOtherOption, "pageLifetimes">> & ThisType<SubInstance<SubMethodsDoc & RootDoc["methods"], TSubData, AllRootDataDoc & SubDataDoc & SubComputedDoc & SubStoreDoc, RootDoc["customEvents"] & {}, SubStoreDoc>>;
-type SubComponentConstructor<TRootDoc extends RootComponentDoc, TOriginalCompDoc extends ComponentDoc, TSupplementalPrefix extends string = "", IsPage extends boolean = TRootDoc["isPage"] extends true ? true : false, CurrentPrefix extends string = `${ExtractDocPrefix<TOriginalCompDoc>}${Capitalize<TSupplementalPrefix>}`, CurrentCompDoc extends ComponentDoc = IfExtends<TSupplementalPrefix, "", TOriginalCompDoc, ReplacePrefix<TOriginalCompDoc, CurrentPrefix>>, AllRootDataDoc extends object = Required<TRootDoc["properties"]> & TRootDoc["data"] & TRootDoc["computed"] & TRootDoc["store"]> = {
+type SubComponentConstructor<TRootDoc extends RootComponentDoc, TOriginalCompDoc extends ComponentDoc, TSupplementalPrefix extends string = "", IsPage extends boolean = TRootDoc["isPage"] extends true ? true : false, CurrentPrefix extends string = `${GetComponentPrefix<TOriginalCompDoc>}${Capitalize<TSupplementalPrefix>}`, CurrentCompDoc extends ComponentDoc = IfExtends<TSupplementalPrefix, "", TOriginalCompDoc, ReplacePrefix<TOriginalCompDoc, 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>>, TSubStore extends SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)>>, TEvents extends SubEventsConstraint<CurrentCompDoc>, TSubComputed extends SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)>>, TSubMethods extends SubMethodsConstraint = {}, InheritDoc extends object = IfExtends<InheritConstraint<AllRootDataDoc, CurrentCompDoc>, TInherit, {}, TInherit>, SubDataDoc extends object = IfExtends<SubDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc>>, TSubData, {}, TSubData>, SubStoreDoc extends object = IfExtends<SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)>>, TSubStore, {}, {
         [k in keyof TSubStore]: ReturnType<TSubStore[k] & {}>;
     }>, SubComputedDoc extends object = IfExtends<SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)>>, TSubComputed, {}, GetSubComputedDoc<TSubComputed>>, SubEventsDoc extends object = IfExtends<SubEventsConstraint<CurrentCompDoc>, TEvents, {}, TEvents>, SubMethodsDoc extends object = TSubMethods, MissingRequiredField extends PropertyKey = Exclude<RequiredKeys<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<TOriginalCompDoc["customEvents"] & {}, SubEventsDoc, MissingRequiredField>;

package/dist/index.d.ts CHANGED Viewed

@@ -1,10 +1,11 @@
-export type { Vant, Wm } from "./thirdLib";
-export type { Dataset, Detail, WMBaseEvent, WMCustomEvent } from "./types/OfficialTypeAlias";
 import { navigateTo } from "./api/navigateTo";
 import { DefineComponent } from "./api/DefineComponent";
 import { RootComponent } from "./api/RootComponent";
 import { SubComponent } from "./api/SubComponent";
 import type { DetailedType } from "./types/DetailedType";
+import type { ComponentDocExtension } from "./types/ComponentDocExtension";
 import type { GenerateDoc } from "./types/GenerateDoc";
 import type { ParamsEqual } from "./types/TwoParamsEqual";
-export { DefineComponent, type DetailedType, type GenerateDoc, navigateTo, type ParamsEqual, RootComponent, SubComponent, };
+export type { Vant, Wm } from "./thirdLib";
+export type { Dataset, Detail, WMBaseEvent, WMCustomEvent } from "./types/OfficialTypeAlias";
+export { type ComponentDocExtension, DefineComponent, type DetailedType, type GenerateDoc, navigateTo, type ParamsEqual, RootComponent, SubComponent, };

package/dist/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"~~AAIA~~,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;~~AAOlD~~,OAAO,~~EACL~~,eAAe,EAGf,UAAU,EAEV,aAAa,EACb,YAAY,GACb,CAAC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAWlD,OAAO,EAEL,eAAe,EAGf,UAAU,EAEV,aAAa,EACb,YAAY,GACb,CAAC"}

package/dist/types/ComponentDocExtension.d.ts ADDED Viewed

@@ -0,0 +1,7 @@
+import type { IfExtends } from "hry-types/src/Any/IfExtends";
+import type { ComputeIntersectionDeep } from "hry-types/src/Object/ComputeIntersectionDeep";
+import type { ComponentDoc } from "../api/DefineComponent/ReturnType/ComponentDoc";
+import type { GetComponentPrefix } from "./GetComponentPrefix";
+type Validator<TOriginalComponentDoc extends ComponentDoc, TExtensionDoc extends ComponentDoc, TOriginalPrefix extends PropertyKey = GetComponentPrefix<TOriginalComponentDoc>, TExtenstionPrefix extends PropertyKey = GetComponentPrefix<TExtensionDoc>, DuplicateKeys extends PropertyKey = Extract<keyof TExtensionDoc["properties"], keyof TOriginalComponentDoc["properties"]> | Extract<keyof TExtensionDoc["customEvents"], keyof TOriginalComponentDoc["customEvents"]>> = IfExtends<TOriginalPrefix, TExtenstionPrefix, IfExtends<DuplicateKeys, never, ComponentDoc, `${DuplicateKeys & string}字段重复`>, `前缀错误,应为${TOriginalPrefix & string}`>;
+export type ComponentDocExtension<TOriginalComponentDoc extends ComponentDoc, TExtensionDoc extends Validator<TOriginalComponentDoc, TExtensionDoc>> = ComputeIntersectionDeep<TOriginalComponentDoc & TExtensionDoc>;
+export {};

package/dist/types/ComponentDocExtension.js ADDED Viewed

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

package/dist/types/ComponentDocExtension.js.map ADDED Viewed

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

package/dist/types/ComputeObj.d.ts ADDED Viewed

@@ -0,0 +1,3 @@
+export type ComputeObject<T> = T extends unknown ? {
+    [k in keyof T]: T[k];
+} : never;

package/dist/types/ComputeObj.js ADDED Viewed

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

package/dist/types/ComputeObj.js.map ADDED Viewed

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

package/dist/types/GetComponentPrefix.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
+import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
 import type { ComponentDoc } from "../api/DefineComponent/ReturnType/ComponentDoc";
-export type ExtractDocPrefix<TComponentDoc extends ComponentDoc> = keyof IfExtends<unknown, TComponentDoc["properties"], TComponentDoc["customEvents"], TComponentDoc["properties"]> extends `${infer P}_${string}` ? P : "";
+export type GetComponentPrefix<TComponentDoc extends ComponentDoc> = EmptyObject extends TComponentDoc ? never : keyof IfExtends<unknown, TComponentDoc["properties"], TComponentDoc["customEvents"], TComponentDoc["properties"]> extends `${infer P}_${string}` ? P : never;

package/dist/types/includes.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export type Includes<S extends string, searchString extends string> = S extends `${string}${searchString}${string}` ? true : false;

package/dist/types/includes.js ADDED Viewed

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

package/dist/types/includes.js.map ADDED Viewed

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

package/package.json CHANGED Viewed

@@ -1,15 +1,21 @@
 {
   "name": "annil",
-  "version": "1.0.7",
+  "version": "1.1.0",
   "description": "微信小程序(原生开发)插件",
   "main": "dist/index.js",
+  "types": "src/index.ts",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/missannil/annil.git"
+  },
+  "homepage": "https://github.com/missannil/annil.git",
   "scripts": {
     "test": "jest --watch",
     "coverage": "jest --coverage",
     "prepare": "husky install",
     "lint": "eslint . --fix && npm run fmt",
     "fmt": "dprint fmt",
-    "type": "tsc --watch",
+    "test:type": "tsc --watch",
     "build": "tsc -p tsconfig.build.json"
   },
   "devDependencies": {
@@ -33,16 +39,14 @@
     "LICENSE",
     "CHANGELOG.md",
     "README.md",
-    "src/",
-    "dist/",
-    "tsconfig.json"
+    "src",
+    "dist"
   ],
   "keywords": [
     "mini",
     "miniprogram",
-    "wechat",
     "program",
-    "wmp"
+    "wechat"
   ],
   "author": "missannil",
   "license": "MIT",

package/src/api/DefineComponent/NameOrPage/NameOrPathOption.ts CHANGED Viewed

@@ -1,16 +1,14 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { RootComponentDoc } from "../../RootComponent/RootComponentDoc";
+import type { Includes } from "../../../types/includes";
 /**
- * 根据TRootComponent类型,生成name或path字段
- * @remarks RootComponentDoc为页面时(isPage为true),返回path字段,否则返回name字段
- * @returns  `{ name: TName } or { path: TPage }`
+ * 根据IsPage,生成name或path字段
  */
 export type NameOrPageOption<
   TName extends string,
   TPath extends `/${string}`,
-  TRootComponent extends RootComponentDoc,
-> = TRootComponent["isPage"] extends true ? {
+  IsPage extends boolean,
+> = IsPage extends true ? {
     /**
      * 页面路径已'/'开头
      */
@@ -18,7 +16,14 @@ export type NameOrPageOption<
   }
   : {
     /**
-     * 组件名不可为空
+     * 组件名不可为空串和含有下划线
      */
-    name: TName & IfExtends<TName, "", () => "⚠️组件名不可为空⚠️", unknown>;
+    name:
+      & TName
+      & IfExtends<
+        TName,
+        "",
+        () => "⚠️组件名不可为空⚠️",
+        IfExtends<Includes<TName, "_">, true, () => "⚠️组件名不可包含下划线 _ ⚠️", unknown>
+      >;
   };

package/src/api/DefineComponent/NameOrPage/test/error.test.ts CHANGED Viewed

@@ -2,25 +2,31 @@ import type { RootComponentDoc } from "../../../RootComponent/RootComponentDoc";
 import { DefineComponent } from "../..";
 DefineComponent({
-  // @ts-expect-error RootComponentDoc中isPage为true时 应该书写page字段
+  // @ts-expect-error  1 RootComponentDoc中isPage为true时 应该书写page字段
   name: "test",
   rootComponent: { isPage: true } satisfies RootComponentDoc,
 });
 DefineComponent({
-  // @ts-expect-error RootComponentDoc中isPage不为true时 应该书写name字段
+  // @ts-expect-error 2 RootComponentDoc中isPage不为true时 应该书写name字段
   path: "/pages/index/index",
   rootComponent: {} satisfies RootComponentDoc,
 });
 DefineComponent({
-  // @ts-expect-error 页面路径已'/'开头
+  // @ts-expect-error 3 页面路径已'/'开头
   path: "pages/index/index",
   rootComponent: { isPage: true } satisfies RootComponentDoc,
 });
 DefineComponent({
-  // @ts-expect-error 组件名不可为空
+  // @ts-expect-error 4 组件名不可为空
   name: "",
   rootComponent: {} satisfies RootComponentDoc,
 });
+DefineComponent({
+  // @ts-expect-error 5 组件名不可包含下划线 _
+  name: "ddd_ddd",
+  rootComponent: {} satisfies RootComponentDoc,
+});

package/src/api/DefineComponent/NameOrPage/test/normal.test.ts CHANGED Viewed

@@ -1,12 +1,12 @@
 import { DefineComponent } from "../..";
-//  RootComponentDoc的isPage类型为true时,必写path字段.
+//  1. RootComponentDoc的isPage类型为true时,必写path字段.
 DefineComponent({
   path: "/pages/index/index",
   rootComponent: { isPage: true },
 });
-//  RootComponentDoc的isPage类型不为true时,必写name字段.
+// 2. RootComponentDoc的isPage类型不为true时,必写name字段.
 DefineComponent({
   name: "test",
   rootComponent: {},

package/src/api/DefineComponent/ReturnType/CreateComponentDoc.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { ComputeIntersectionDeep } from "hry-types/src/Object/ComputeIntersectionDeep";
+import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
 import type { AddNullForObject } from "../../../types/AddNullForObject";
 import type { RootComponentDoc } from "../../RootComponent/RootComponentDoc";
 import type { SubComponentDoc } from "../../SubComponent/SubComponentDoc";
@@ -19,7 +19,7 @@ export type CreateComponentDoc<
     & GetCustomEventDocOfSubDoc<TSubComponentTuple[number]>,
   StopKeys extends string = GetStopKeys<TRootDoc["events"]>,
   FinalCustomEventDoc extends object = Omit<AllCustomEventsDoc, StopKeys>,
-> = ComputeIntersectionDeep<
+> = ComputeIntersection<
   & IfExtends<
     unknown,
     AllPropertiesDoc,

package/src/api/DefineComponent/ReturnType/CreatePageDoc.ts CHANGED Viewed

@@ -1,11 +1,11 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { ComputeIntersectionDeep } from "hry-types/src/Object/ComputeIntersectionDeep";
+import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
 import type { RootComponentDoc } from "../../RootComponent/RootComponentDoc";
 export type CreatePageDoc<
   TRootDoc extends RootComponentDoc,
   TPath extends string,
-> = ComputeIntersectionDeep<
+> = ComputeIntersection<
   & { path: TPath }
   & IfExtends<
     unknown,