annil 1.6.5 → 1.7.1

package/CHANGELOG.md

@@ -4,6 +4,20 @@
 
 * 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
 
+## [1.7.1](https://github.com/missannil/annil/compare/v1.7.0...v1.7.1) (2024-04-12)
+
+
+### Bug Fixes
+
+* 1.7.0action发布时npm密钥过期问题 ([0ad71b9](https://github.com/missannil/annil/commit/0ad71b96aaa02668a4052cd57ea2ff8c46598107))
+
+## [1.7.0](https://github.com/missannil/annil/compare/v1.6.5...v1.7.0) (2024-04-11)
+
+
+### Features
+
+* subComponent的inherit字段加入数组类型,表示联合类型 ([a7930ff](https://github.com/missannil/annil/commit/a7930ff1abe18579bff6f1746911c2f30274325b))
+
 ## [1.6.5](https://github.com/missannil/annil/compare/v1.6.4...v1.6.5) (2024-02-13)
 
 

package/README.md

@@ -23,7 +23,7 @@
 
 ### 简介
 
-annil(安奈儿)是微信小程序原生开发插件,她会带给您惊喜。
+annil(安奈儿)是微信小程序原生开发插件。
 
 ### 特点
 

package/dist/api/SubComponent/SubInherit/SubInheritConstraint.d.ts

@@ -2,7 +2,8 @@ import type { SelectKeys } from "hry-types/src/Object/_api";
 import type { RemoveInnerData } from "../../../types/RemoveInnerData";
 import type { ComponentDoc } from "../../DefineComponent/ReturnType/ComponentDoc";
 type WXMLSign = "wxml";
+type unionAddList<Keys extends string> = Keys | Keys[];
 export type InheritConstraint<AllRootData extends object, TComponentDoc extends ComponentDoc> = {
-    [k in keyof TComponentDoc["properties"]]?: RemoveInnerData<SelectKeys<AllRootData, TComponentDoc["properties"][k]> & string> | WXMLSign;
+    [k in keyof TComponentDoc["properties"]]?: unionAddList<RemoveInnerData<SelectKeys<AllRootData, TComponentDoc["properties"][k]> & string>> | WXMLSign;
 };
 export {};

package/package.json

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

package/src/api/SubComponent/SubInherit/SubInheritConstraint.ts

@@ -4,12 +4,14 @@ import type { ComponentDoc } from "../../DefineComponent/ReturnType/ComponentDoc
 
 type WXMLSign = "wxml";
 
+type unionAddList<Keys extends string> = Keys | Keys[];
+
 /**
- * 子组件inherit字段约束,key为构建组件所需的properties字段,类型为根组件数据的key或`WXMLSign`。要求根数据类型为子数据类型的子类型。当key的值来自wxml(循环产生的子数据等情况)时用`WXMLSign`表示。
+ * 子组件inherit字段约束,key为构建组件所需的properties字段,类型为根组件数据的key或key[]或`WXMLSign`。要求根数据类型为子数据类型的子类型。当key的值来自wxml(循环产生的子数据等情况)时用`WXMLSign`表示。
  * @returns object
  */
 export type InheritConstraint<AllRootData extends object, TComponentDoc extends ComponentDoc> = {
   [k in keyof TComponentDoc["properties"]]?:
-    | RemoveInnerData<SelectKeys<AllRootData, TComponentDoc["properties"][k]> & string>
+    | unionAddList<RemoveInnerData<SelectKeys<AllRootData, TComponentDoc["properties"][k]> & string>>
     | WXMLSign;
 };

package/src/api/SubComponent/SubInherit/test/error.test.ts

@@ -74,3 +74,11 @@ SubComponent<Mock_RootDoc, Mock_CompDoc>()({
     aaa_xxx: "",
   },
 });
+// 4 数组时类型错误
+
+SubComponent<Mock_RootDoc, Mock_CompDoc>()({
+  inherit: {
+    // @ts-expect-error
+    aaa_num: ["optional_lit1eral_num", "require1d_num"],
+  },
+});

package/src/api/SubComponent/SubInherit/test/normal.test.ts

@@ -54,3 +54,14 @@ SubComponent<Mock_RootDoc, Mock_CompDoc>()({
     aaa_obj1: "" as "required_obj" | "optional_obj" | "wxml",
   },
 });
+
+// 3 value为数组时,表示多个字段的联合类型
+
+SubComponent<Mock_RootDoc, Mock_CompDoc>()({
+  inherit: {
+    aaa_num: ["optional_literal_num", "required_num"],
+    aaa_str: ["literal_str", "str"],
+    aaa_obj: "" as "required_obj" | "optional_obj" | ["required_obj" | "optional_obj"] | "wxml",
+    aaa_obj1: "" as "required_obj" | "optional_obj" | ["required_obj" | "optional_obj"] | "wxml",
+  },
+});