annil 1.0.6 → 1.0.7

package/CHANGELOG.md

@@ -4,6 +4,13 @@
 
 * 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
 
+## [1.0.7](https://github.com/missannil/annil/compare/v1.0.6...v1.0.7) (2023-12-02)
+
+
+### Bug Fixes
+
+* 修复DefinedComponent的subComonsnts字段为[never]类型时,生成page类型错误的情况 ([a8aec74](https://github.com/missannil/annil/commit/a8aec74bbe964585f71d96bebdc85a32241271aa))
+
 ## [1.0.6](https://github.com/missannil/annil/compare/v1.0.5...v1.0.6) (2023-12-02)
 
 

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

@@ -1,11 +1,8 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { ComputeIntersectionDeep } from "hry-types/src/Object/ComputeIntersectionDeep";
-import type { RemoveNullOfRequired } from "../../../types/RemoveNullOfRequired";
 import type { RootComponentDoc } from "../../RootComponent/RootComponentDoc";
-import type { SubComponentDoc } from "../../SubComponent/SubComponentDoc";
-import type { GetPropertiesDocOfSubDoc } from "./GetPropertiesDocOfSubDoc";
-export type CreatePageDoc<TRootDoc extends RootComponentDoc, TPath extends string, TSubComponentTuple extends SubComponentDoc[], AllPropertiesDoc = TRootDoc["properties"] & GetPropertiesDocOfSubDoc<TSubComponentTuple>> = ComputeIntersectionDeep<{
+export type CreatePageDoc<TRootDoc extends RootComponentDoc, TPath extends string> = ComputeIntersectionDeep<{
     path: TPath;
-} & IfExtends<unknown, AllPropertiesDoc, unknown, {
-    properties: RemoveNullOfRequired<AllPropertiesDoc>;
+} & IfExtends<unknown, TRootDoc["properties"], unknown, {
+    properties: TRootDoc["properties"];
 }>>;

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

@@ -22,4 +22,10 @@ const compDocOnlyProperties = DefineComponent({
     rootComponent: OnlyPropsRootDoc,
 });
 Checking;
+const whenSubIsAllNever = DefineComponent({
+    path: "/pages/index/index",
+    rootComponent: OnlyPropsRootDoc,
+    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"}
+{"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"}

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

@@ -12,7 +12,7 @@ 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>;
 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, TSubComponentTuple>, CreateComponentDoc<TRootComponentDoc, TName, TSubComponentTuple>>;
+    <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>>;
 }
 export type FuncOptions = Record<"pageLifetimes" | "lifetimes" | "watch", Record<string, Func[]>>;
 export type FinalOptionsForComponent = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "annil",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "微信小程序(原生开发)插件",
   "main": "dist/index.js",
   "scripts": {

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

@@ -1,26 +1,18 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { ComputeIntersectionDeep } from "hry-types/src/Object/ComputeIntersectionDeep";
-import type { RemoveNullOfRequired } from "../../../types/RemoveNullOfRequired";
 import type { RootComponentDoc } from "../../RootComponent/RootComponentDoc";
-import type { SubComponentDoc } from "../../SubComponent/SubComponentDoc";
-import type { GetPropertiesDocOfSubDoc } from "./GetPropertiesDocOfSubDoc";
 
 export type CreatePageDoc<
   TRootDoc extends RootComponentDoc,
   TPath extends string,
-  TSubComponentTuple extends SubComponentDoc[],
-  // 获取所有properties字段
-  AllPropertiesDoc = TRootDoc["properties"] & GetPropertiesDocOfSubDoc<TSubComponentTuple>,
 > = ComputeIntersectionDeep<
   & { path: TPath }
   & IfExtends<
     unknown,
-    AllPropertiesDoc,
+    TRootDoc["properties"],
     unknown,
     {
-      // @ts-ignore AllPropertiesDoc 必为 object
-      //  RemoveNullOfRequired 页面传值时必传字段不需要RootComponent返回时为对象加入的null类型
-      properties: RemoveNullOfRequired<AllPropertiesDoc>;
+      properties: TRootDoc["properties"];
     }
   >
 >;

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

@@ -38,3 +38,12 @@ type CompDocOnlyPropertiesExpected = {
 };
 
 Checking<typeof compDocOnlyProperties, CompDocOnlyPropertiesExpected, Test.Pass>;
+
+// 页面类型不受subComponents是[never,never]时影响
+const whenSubIsAllNever = DefineComponent({
+  path: "/pages/index/index",
+  rootComponent: OnlyPropsRootDoc,
+  subComponents: [{} as never],
+});
+
+Checking<typeof whenSubIsAllNever, CompDocOnlyPropertiesExpected, Test.Pass>;

package/src/api/DefineComponent/index.ts

@@ -39,7 +39,7 @@ interface DefineComponentConstructor {
     "",
     TName,
     // 生成页面文档
-    CreatePageDoc<TRootComponentDoc, TPath, TSubComponentTuple>,
+    CreatePageDoc<TRootComponentDoc, TPath>,
     // 生成组件文档
     CreateComponentDoc<TRootComponentDoc, TName, TSubComponentTuple>
   >;