annil 1.0.8 → 1.1.0

package/CHANGELOG.md

@@ -4,6 +4,13 @@
 
 * 解决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)
 
 

package/LICENSE

@@ -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

@@ -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

@@ -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

@@ -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"}
+{"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/test/normalComponentDoc.test.js.map

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

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

@@ -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

@@ -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"}
+{"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

@@ -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"}
+{"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

@@ -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/types/includes.d.ts

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

package/dist/types/includes.js

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

package/dist/types/includes.js.map

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

package/package.json

@@ -1,15 +1,21 @@
 {
   "name": "annil",
-  "version": "1.0.8",
+  "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

@@ -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

@@ -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

@@ -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/test/normalComponentDoc.test.ts

@@ -1,5 +1,4 @@
 import { Checking, type Test } from "hry-types";
-import { type ComputeIntersectionDeep } from "hry-types/src/Object/ComputeIntersectionDeep";
 import { type DetailedType, RootComponent } from "../../../..";
 import type { CustomEventConstraint } from "../../../RootComponent/CustomEvents/CustomEventConstraint";
 import type {
@@ -12,6 +11,7 @@ import type {
   Composed,
 } from "../../../RootComponent/CustomEvents/CustomEventsTag";
 
+import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
 import type { PropertiesConstraint } from "../../../RootComponent/Properties/PropertiesConstraint";
 import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
 import type { RootComponentDoc } from "../../../RootComponent/RootComponentDoc";
@@ -60,7 +60,7 @@ const customEvents = {
     options: { bubbles: true, capturePhase: true, composed: true },
   },
 } satisfies CustomEventConstraint;
-// 只有Properties字段
+
 const OnlyPropsRootDoc = RootComponent()({
   properties,
 });
@@ -70,10 +70,10 @@ const onlyProperties = DefineComponent({
   rootComponent: OnlyPropsRootDoc,
 });
 
-// 可传对象字段加入null,(rootDoc中必传对象加入null了)
+// 1. 类型为typeof OnlyPropsRootDoc加前缀(组件名)
 type OnlyPropertiesExpected = {
   properties: {
-    test_optionalObj?: Mock_User | null; // 多了null
+    test_optionalObj?: Mock_User | null;
     test_optionalObjOrNull?: Mock_User | null;
     test_str: string;
     test_obj: Mock_User | null;
@@ -82,7 +82,6 @@ type OnlyPropertiesExpected = {
 
 Checking<typeof onlyProperties, OnlyPropertiesExpected, Test.Pass>;
 
-// 只有customEvents字段
 const OnlyCustomEventsRootDoc = RootComponent()({
   customEvents,
 });
@@ -92,6 +91,7 @@ const compOnlyCustomEvents = DefineComponent({
   rootComponent: OnlyCustomEventsRootDoc,
 });
 
+// 2 rootComponent中只有customEvents字段时 加前缀(组件名) 无properties字段
 type CompOnlyCustomEventsExpected = {
   customEvents: {
     test_str: string;
@@ -99,7 +99,7 @@ type CompOnlyCustomEventsExpected = {
     test_unionStr: "male" | "female";
     test_list: string | 0 | 1 | 2 | null;
     test_bubbles: string | Bubbles;
-    test_capturePhase: Capture | null;
+    test_capturePhase: null | Capture;
     test_bubbles_capturePhase: string | number | BubblesCapture;
     test_bubbles_composed: "male" | "female" | BubblesComposed;
     test_capturePhase_composed: string | 0 | 1 | 2 | CaptureComposed | null;
@@ -109,48 +109,19 @@ type CompOnlyCustomEventsExpected = {
 
 Checking<typeof compOnlyCustomEvents, CompOnlyCustomEventsExpected, Test.Pass>;
 
-// 都有
 const rootComponent = RootComponent()({
   properties,
   customEvents,
 });
-
+// 3. properties和customEvents字段都有时
 const compDoc = DefineComponent({
   name: "test",
   rootComponent,
 });
 
-Checking<typeof compDoc, ComputeIntersectionDeep<CompOnlyCustomEventsExpected & OnlyPropertiesExpected>, Test.Pass>;
-
-// rootComponent字段和SubComponents字段同时具有properties字段时
-// const A = {} as { properties: { str: string; obj: { age: number } } };
-
-// const B = {} as { properties: { num: number } };
-
-// const C = {} as { properties: { bool: boolean } };
-
-// const CompDoc = DefineComponent({
-//   name: "test",
-//   subComponents: [A, B, C],
-// });
-
-// // 因为子组件中properties不存在相同key,所以返回类型是交叉的。
-// type CompDocExpect = ComputeIntersectionDeep<
-//   {
-//     properties: {
-//       test_str: string;
-//       test_obj: {
-//         age: number;
-//       } | null;
-//       test_num: number;
-//       test_bool: boolean;
-//     };
-//   }
-// >;
-
-// Checking<typeof CompDoc, CompDocExpect, Test.Pass>;
+Checking<typeof compDoc, ComputeIntersection<CompOnlyCustomEventsExpected & OnlyPropertiesExpected>, Test.Pass>;
 
-type D = SubComponentDoc<{
+type SubA = SubComponentDoc<{
   str: string | Bubbles | Composed;
   num: number | Capture | Composed;
   null: null | Bubbles | Capture | Composed;
@@ -158,10 +129,10 @@ type D = SubComponentDoc<{
 
 const customEventsRootDoc = DefineComponent({
   name: "test",
-  subComponents: [{} as D],
+  subComponents: [{} as SubA],
 });
 
-// 预期添加组件名做为前缀
+// 4 子组件返回的事件类型是必带Composed的
 type customEventsRootDocExpect = {
   customEvents: {
     test_str: string | Bubbles | Composed;
@@ -172,19 +143,19 @@ type customEventsRootDocExpect = {
 
 Checking<typeof customEventsRootDoc, customEventsRootDocExpect, Test.Pass>;
 
-type E = SubComponentDoc<{
+type SubB = SubComponentDoc<{
   str: number | Bubbles | Composed;
   num: string | Capture | Composed;
   null: boolean | Bubbles | Capture | Composed;
 }>;
 
-// 子组件有相同自定义字段时
+//
 const WhenSameKeyOfCustomEventsRootDoc = DefineComponent({
   name: "test",
-  subComponents: [{} as D, {} as E],
+  subComponents: [{} as SubA, {} as SubB],
 });
 
-// customEvents相同key类型联合
+// 5 子组件中存在相同自定义事件字段时,类型联合
 type WhenSameKeyOfCustomEventsRootDocExpect = {
   customEvents: {
     test_str: string | number | Bubbles | Composed;
@@ -201,15 +172,16 @@ type RootDocCatch = RootComponentDoc<{
   };
 }>;
 
-// 根组件有阻止(catch)子组件事件时
 const whenRootDocCatch = DefineComponent({
   name: "test",
   rootComponent: {} as RootDocCatch,
-  subComponents: [{} as D],
+  subComponents: [{} as SubA],
 });
 
+// 6 根组件有阻止(catch)子组件事件时(子组件aaa的str事件是阻止事件,不会被继续传递),去除对应的事件
 type whenRootDocCatchExpect = {
   customEvents: {
+    // 少了str事件
     test_num: number | Composed | Capture;
     test_null: Bubbles | Composed | Capture | null;
   };
@@ -217,7 +189,7 @@ type whenRootDocCatchExpect = {
 
 Checking<typeof whenRootDocCatch, whenRootDocCatchExpect, Test.Pass>;
 
-// ComponetDoc可能返回类型为{}
+// 7 根组件和子组件都没有事件和properties时 返回组件类型为 {}
 const ComponetDoc = DefineComponent({
   name: "test",
   rootComponent: {},

package/src/api/DefineComponent/ReturnType/test/normalPageDoc.test.ts

@@ -26,7 +26,7 @@ const compDocOnlyProperties = DefineComponent({
   rootComponent: OnlyPropsRootDoc,
 });
 
-// 页面时返回的propertiesDoc无前缀
+// 1 页面时返回的propertiesDoc无前缀
 type CompDocOnlyPropertiesExpected = {
   path: "/pages/index/index";
   properties: {
@@ -39,11 +39,11 @@ type CompDocOnlyPropertiesExpected = {
 
 Checking<typeof compDocOnlyProperties, CompDocOnlyPropertiesExpected, Test.Pass>;
 
-// 页面类型不受subComponents是[never,never]时影响
+// 2 页面类型不受subComponents是[never,never]时影响
 const whenSubIsAllNever = DefineComponent({
   path: "/pages/index/index",
   rootComponent: OnlyPropsRootDoc,
-  subComponents: [{} as never],
+  subComponents: [{} as never, {} as never],
 });
 
 Checking<typeof whenSubIsAllNever, CompDocOnlyPropertiesExpected, Test.Pass>;

package/src/api/DefineComponent/RootComponent/RootComponentOption.ts

@@ -4,5 +4,8 @@ import type { RootComponentDoc } from "../../RootComponent/RootComponentDoc";
  * DefineComponent API`rootComponent`字段配置
  */
 export type RootComponentOption<TRootComponent extends RootComponentDoc> = {
+  /**
+   * 根组件配置
+   */
   rootComponent?: TRootComponent;
 };

package/src/api/DefineComponent/SubComponents/SubComponentsOption.ts

@@ -10,15 +10,9 @@ import type { SubComponentDoc } from "../../SubComponent/SubComponentDoc";
  */
 export type SubComponentsOption<
   TSubComponentTuple extends SubComponentDoc[],
-> // // 子组件中properties字段重复的key,用做验证(报错)
- = // PropertiesDuplicatedKeys extends string = Extends<TSubComponentTuple["length"], 0 | 1> extends true ? never
-  //   : GetPropertiesDuplicatedKeys<Shift<TSubComponentTuple>, keyof TSubComponentTuple[0]["properties"]>,
-  {
-    subComponents?: [...TSubComponentTuple];
-    // & IfExtends<
-    //   PropertiesDuplicatedKeys,
-    //   never,
-    //   unknown,
-    //   `⚠️重复的字段:${UnionToComma<PropertiesDuplicatedKeys>}⚠️`
-    // >;
-  };
+> = {
+  /**
+   * 子组件列表
+   */
+  subComponents?: [...TSubComponentTuple];
+};

package/src/api/DefineComponent/SubComponents/test/normal.test.ts

@@ -11,13 +11,13 @@ const NonEmptyRootDoc = {} as SubComponentDoc<{
   a: string | Bubbles | Composed;
 }>;
 
-// 组件时
+// 1 组件时
 DefineComponent({
   name: "test",
   subComponents: [SubDocIsAny, NonEmptyRootDoc],
 });
 
-// 页面时
+// 2 页面时
 DefineComponent({
   path: "/test/index/index",
   rootComponent: { isPage: true },
@@ -30,10 +30,9 @@ const B = {} as { a: string | Composed; b: string | Composed };
 
 const C = {} as { a: boolean | Composed; c: boolean | Composed };
 
-// subComponents字段支持最多999个子组件
 const aaa = DefineComponent({
   name: "test",
-  // 支持999个子项
+  // 3 subComponents字段支持最多999个子组件
   subComponents: [
     A,
     B,

package/src/api/DefineComponent/index.ts

@@ -22,7 +22,7 @@ type RootOptions<
   TName extends string,
   TPath extends Path,
 > =
-  & NameOrPathOption<TName, TPath, TRootComponentDoc>
+  & NameOrPathOption<TName, TPath, TRootComponentDoc["isPage"] & {}>
   & RootComponentOption<TRootComponentDoc>
   & SubComponentsOption<TSubComponentTuple>;
 

package/src/types/includes.ts

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

package/dist/api/DefineComponent/SubComponents/test/error.test.js

@@ -1,2 +0,0 @@
-"use strict";
-//# sourceMappingURL=error.test.js.map

package/dist/api/DefineComponent/SubComponents/test/error.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/SubComponents/test/error.test.ts"],"names":[],"mappings":""}

package/src/api/DefineComponent/SubComponents/test/error.test.ts

@@ -1,14 +0,0 @@
-// import type { SubComponentDoc } from "../../../SubComponent/SubComponentDoc";
-// import { DefineComponent } from "../..";
-
-// const B = { properties: { aaa: 456 } } satisfies SubComponentDoc;
-// const C = { properties: { aaa: 456 } } satisfies SubComponentDoc;
-// const D = { properties: { bbb: 456 } } satisfies SubComponentDoc;
-// const E = { properties: { bbb: 456 } } satisfies SubComponentDoc;
-// const A = { properties: { ccc: 123 } } satisfies SubComponentDoc;
-
-// DefineComponent({
-//   name: "test",
-//   // @ts-expect-error 重复的properties字段  aaa 、 bbb
-//   subComponents: [A, B, C, D, E],
-// });

package/tsconfig.json

@@ -1,29 +0,0 @@
-{
-  "compilerOptions": {
-    "lib": ["ES2022", "DOM"], // jest中用到了DOM类型
-    "target": "ES2017",
-    "module": "ES2022",
-    "strict": true,
-    "strictFunctionTypes": false, // e: Dataset<{ id: string }>会报错。
-    "exactOptionalPropertyTypes": true, // 带有?标志的属性类型不在包含undefined
-    "skipLibCheck": true, // 跳过声明文件的类型检查(.d.ts),除了你引用的, 默认false(不跳过)。
-    "moduleResolution": "Bundler", // 模块解析策略 //5.0 新值 bundler
-    "noImplicitAny": true, // 不允许隐式的any类型
-    "esModuleInterop": true, // 默认false 将 CommonJS/AMD/UMD 模块视为类似于 ES6 模块,但有缺陷。
-    "removeComments": true, // 去除注释
-    "noEmit": true,
-    "noImplicitReturns": true, // 隐式函数返回
-    "forceConsistentCasingInFileNames": true, // 区分文件名的大小写
-    "noUnusedLocals": true, // 报告未使用局部变量的错误
-    "noUnusedParameters": false, // 报告函数中未使用参数的错误
-    "suppressImplicitAnyIndexErrors": true, // 为true关闭隐式索引错误,但很激进,建议使用@ts-ignore
-    "isolatedModules": true, // 独立模块(必须有导入或导出) 默认false
-    "preserveValueImports": true, // 引入类型加type
-    "ignoreDeprecations": "5.0",
-    "noFallthroughCasesInSwitch": true, // 报告switch语句中漏接情况的错误
-    "allowSyntheticDefaultImports": true, // esModuleInterop 为true时自动true
-    // 默认加载所有@types下的包 types指定具体的包,其他拒绝。包含上级目录
-    "types": ["hry-types", "mobx", "jest", "miniprogram-api-typings"]
-  },
-  "include": ["**/*.ts"]
-}