annil 1.0.5 → 1.0.6

package/CHANGELOG.md

@@ -4,6 +4,13 @@
 
 * 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
 
+## [1.0.6](https://github.com/missannil/annil/compare/v1.0.5...v1.0.6) (2023-12-02)
+
+
+### Bug Fixes
+
+* 修复 properties对象字段为字面量类型时value类型不匹配的问题 ([faa5c96](https://github.com/missannil/annil/commit/faa5c96c0c0af8112b7828911cc0d40f56903669))
+
 ## [1.0.5](https://github.com/missannil/annil/compare/v1.0.4...v1.0.5) (2023-12-02)
 
 

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

@@ -1,9 +1,9 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { Select } from "hry-types/src/Object/Select";
-import type { ComputeIntersection } from "hry-types/src/Object/_api";
+import type { ComputeIntersection, NonReadonlyDeep } 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 = GetOptionalDoc<Select<TProperties, OptionalType>, TIsPage>, RequiredDoc = GetRequiredDoc<Omit<TProperties, keyof OptionalDoc>, TIsPage>> = IfExtends<Type, "all", ComputeIntersection<OptionalDoc & RequiredDoc>, IfExtends<Type, "Optional", OptionalDoc, RequiredDoc>>;
+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>;
 export {};

package/dist/api/RootComponent/Properties/PropertiesConstraint.d.ts

@@ -1,14 +1,14 @@
 import type { DetailedType } from "../../../types/DetailedType";
 export type RequiredSingle = DetailedType;
-export type RequiredUnion<Literal = unknown> = {
-    type: DetailedType<Literal>;
+export type RequiredUnion = {
+    type: DetailedType;
     optionalTypes: DetailedType[];
 };
-export type RequiredType<Literal = unknown> = RequiredUnion<Literal> | RequiredSingle;
-export type OptionalType<Literal = unknown> = {
-    type: DetailedType<Literal>;
-    value: Literal;
+export type RequiredType = RequiredUnion | RequiredSingle;
+export type OptionalType = {
+    type: DetailedType;
+    value: unknown;
     optionalTypes?: DetailedType[];
 };
-export type PropertiesTypes<Literal = unknown> = OptionalType<Literal> | RequiredType<Literal>;
-export type PropertiesConstraint<Literal = unknown> = Record<string, PropertiesTypes<Literal>>;
+export type PropertiesTypes = OptionalType | RequiredType;
+export type PropertiesConstraint = Record<string, PropertiesTypes>;

package/dist/api/RootComponent/Properties/test/normalOptional.test.js

@@ -53,4 +53,12 @@ RootComponent()({
         },
     },
 });
+RootComponent()({
+    properties: {
+        obj: {
+            type: Object,
+            value: { gender: "male" },
+        },
+    },
+});
 //# sourceMappingURL=normalOptional.test.js.map

package/dist/api/RootComponent/Properties/test/normalOptional.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalOptional.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Properties/test/normalOptional.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAGhD,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAMtC,MAAM,WAAW,GAAG,aAAa,EAAE,CAAC;IAClC,UAAU,EAAE;QACV,YAAY,EAAE;YACZ,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,GAAG;SACX;QACD,eAAe,EAAE;YACf,IAAI,EAAE,MAAyC;YAC/C,KAAK,EAAE,MAAM;SACd;QACD,cAAc,EAAE;YACd,IAAI,EAAE,KAA2D;YACjE,KAAK,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,CAA8B;SACnD;QACD,YAAY,EAAE;YACZ,IAAI,EAAE,MAAiC;YACvC,KAAK,EAAE;gBACL,EAAE,EAAE,IAAI;gBACR,GAAG,EAAE,EAAE;aACR;SACF;QACD,kBAAkB,EAAE;YAClB,IAAI,EAAE,MAAwC;YAC9C,KAAK,EAAE,IAAI;SACZ;QACD,cAAc,EAAE;YACd,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,QAAQ;YACf,aAAa,EAAE,CAAC,MAAM,CAAC;SACxB;KACF;IACD,OAAO,EAAE;QACP,GAAG;YAED,QAWC,CAAC;QACJ,CAAC;KACF;CACF,CAAC,CAAC;AAiBH,QAA4D,CAAC;AAO7D,aAAa,EAAE,CAAC;IACd,UAAU,EAAE;QACV,GAAG,EAAE,MAAmC;QACxC,IAAI,EAAE;YACJ,IAAI,EAAE,MAA2B;YACjC,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;SACxB;KACF;IACD,QAAQ,EAAE;QACR,GAAG;;YACD,MAAA,IAAI,CAAC,IAAI,CAAC,IAAI,0CAAE,IAAI,CAAC;QACvB,CAAC;KACF;CACF,CAAC,CAAC"}
+{"version":3,"file":"normalOptional.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Properties/test/normalOptional.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAGhD,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAMtC,MAAM,WAAW,GAAG,aAAa,EAAE,CAAC;IAClC,UAAU,EAAE;QACV,YAAY,EAAE;YACZ,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,GAAG;SACX;QACD,eAAe,EAAE;YACf,IAAI,EAAE,MAAyC;YAC/C,KAAK,EAAE,MAAM;SACd;QACD,cAAc,EAAE;YACd,IAAI,EAAE,KAA2D;YACjE,KAAK,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,CAA8B;SACnD;QACD,YAAY,EAAE;YACZ,IAAI,EAAE,MAAiC;YACvC,KAAK,EAAE;gBACL,EAAE,EAAE,IAAI;gBACR,GAAG,EAAE,EAAE;aACR;SACF;QACD,kBAAkB,EAAE;YAClB,IAAI,EAAE,MAAwC;YAC9C,KAAK,EAAE,IAAI;SACZ;QACD,cAAc,EAAE;YACd,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,QAAQ;YACf,aAAa,EAAE,CAAC,MAAM,CAAC;SACxB;KACF;IACD,OAAO,EAAE;QACP,GAAG;YAED,QAWC,CAAC;QACJ,CAAC;KACF;CACF,CAAC,CAAC;AAiBH,QAA4D,CAAC;AAO7D,aAAa,EAAE,CAAC;IACd,UAAU,EAAE;QACV,GAAG,EAAE,MAAmC;QACxC,IAAI,EAAE;YACJ,IAAI,EAAE,MAA2B;YACjC,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;SACxB;KACF;IACD,QAAQ,EAAE;QACR,GAAG;;YACD,MAAA,IAAI,CAAC,IAAI,CAAC,IAAI,0CAAE,IAAI,CAAC;QACvB,CAAC;KACF;CACF,CAAC,CAAC;AAOH,aAAa,EAAE,CAAC;IACd,UAAU,EAAE;QACV,GAAG,EAAE;YACH,IAAI,EAAE,MAA2B;YACjC,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;SAC1B;KACF;CACF,CAAC,CAAC"}

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

@@ -31,7 +31,7 @@ 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> = {
-    <Literal extends string | number | boolean | null | Literal[] | object, TEvents extends EventsConstraint<TReceivedComponentDoc>, TIsPage extends boolean = false, TProperties extends PropertiesConstraint<Literal> = {}, 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>): ComputeIntersectionDeep<IfExtends<TIsPage, false, {}, {
         isPage: true;
     }> & IfExtends<EmptyObject, PropertiesDoc, {}, {
         properties: PropertiesDoc;

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/RootComponent/index.ts"],"names":[],"mappings":"AAqIA,MAAM,UAAU,aAAa;IAM3B,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAmC,CAAQ,CAAC;AACxE,CAAC"}
+{"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "annil",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "微信小程序(原生开发)插件",
   "main": "dist/index.js",
   "scripts": {
@@ -47,7 +47,7 @@
   "author": "missannil",
   "license": "MIT",
   "dependencies": {
-    "hry-types": "^0.16.12",
+    "hry-types": "^0.17.0",
     "miniprogram-api-typings": "^3.12.1"
   }
 }

package/src/api/RootComponent/Properties/GetPropertiesDoc.ts

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

package/src/api/RootComponent/Properties/PropertiesConstraint.ts

@@ -8,31 +8,31 @@ export type RequiredSingle = DetailedType;
 /**
  * properties 必传(联合)类型
  */
-export type RequiredUnion<Literal = unknown> = {
-  type: DetailedType<Literal>;
+export type RequiredUnion = {
+  type: DetailedType;
   optionalTypes: DetailedType[];
 };
 
 /**
  * properties 必传类型
  */
-export type RequiredType<Literal = unknown> = RequiredUnion<Literal> | RequiredSingle;
+export type RequiredType = RequiredUnion | RequiredSingle;
 
 /**
  * properties 选传类型
  */
-export type OptionalType<Literal = unknown> = {
-  type: DetailedType<Literal>;
-  value: Literal;
+export type OptionalType = {
+  type: DetailedType;
+  value: unknown;
   optionalTypes?: DetailedType[];
 };
 
 /**
  * Properties 字段类型
  */
-export type PropertiesTypes<Literal = unknown> = OptionalType<Literal> | RequiredType<Literal>;
+export type PropertiesTypes = OptionalType | RequiredType;
 
 /**
  * RootComponent API properties 字段约束
  */
-export type PropertiesConstraint<Literal = unknown> = Record<string, PropertiesTypes<Literal>>;
+export type PropertiesConstraint = Record<string, PropertiesTypes>;

package/src/api/RootComponent/Properties/test/normalOptional.test.ts

@@ -93,3 +93,17 @@ RootComponent()({
     },
   },
 });
+
+/**
+ * 对象类型字面量类型可验证通过。
+ */
+type obj = { gender: "male" | "femal" };
+
+RootComponent()({
+  properties: {
+    obj: {
+      type: Object as DetailedType<obj>,
+      value: { gender: "male" },
+    },
+  },
+});

package/src/api/RootComponent/index.ts

@@ -77,17 +77,10 @@ type RootComponentOptions<
 
 type RootComponentConstructor<TReceivedComponentDoc extends ComponentDoc[] | ComponentDoc> = {
   <
-    Literal extends
-      | string
-      | number
-      | boolean
-      | null
-      | Literal[]
-      | object,
     // TEvents 不能有默认值 {} 会引起事件参数类型(e)失效
     TEvents extends EventsConstraint<TReceivedComponentDoc>,
     TIsPage extends boolean = false,
-    TProperties extends PropertiesConstraint<Literal> = {},
+    const TProperties extends PropertiesConstraint = {},
     TData extends object = {},
     TStore extends StoreConstraint = {},
     TComputed extends ComputedConstraint = {},