annil 1.5.8 → 1.5.9

package/CHANGELOG.md

@@ -4,6 +4,13 @@
 
 * 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
 
+## [1.5.9](https://github.com/missannil/annil/compare/v1.5.8...v1.5.9) (2024-01-06)
+
+
+### Bug Fixes
+
+* 无注入数据时 watch监控类型错误的问题和SubComponentdata数据为字面量类型造成实例类型错误的问题 ([3cb2b90](https://github.com/missannil/annil/commit/3cb2b9069a9aa0f95767a346f16634d4db3109f9))
+
 ## [1.5.8](https://github.com/missannil/annil/compare/v1.5.7...v1.5.8) (2024-01-05)
 
 

package/dist/api/InstanceInject/instanceConfig.d.ts

@@ -13,7 +13,7 @@ interface BaseInjectInfo {
 export interface IInjectInfo extends BaseInjectInfo {
 }
 export type IInjectData = IInjectInfo["data"] & ReturnTypeInObject<IInjectInfo["store"]>;
-export type IInjectStore = ReturnTypeInObject<IInjectInfo["store"]>;
+export type IInjectStore = StoreConstraint extends IInjectInfo["store"] ? unknown : ReturnTypeInObject<IInjectInfo["store"]>;
 export type IInjectMethods = IInjectInfo["methods"];
 declare class InstanceConfig {
     private info;

package/dist/api/InstanceInject/instanceConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"instanceConfig.js","sourceRoot":"","sources":["../../../src/api/InstanceInject/instanceConfig.ts"],"names":[],"mappings":"AA8BA,MAAM,cAAc;IAApB;QACU,SAAI,GAAiC,EAAE,CAAC;IAOlD,CAAC;IANC,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;IAC9B,CAAC;IACM,aAAa,CAAC,IAA6B;QAChD,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IACxC,CAAC;CACF;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC"}
+{"version":3,"file":"instanceConfig.js","sourceRoot":"","sources":["../../../src/api/InstanceInject/instanceConfig.ts"],"names":[],"mappings":"AA+BA,MAAM,cAAc;IAApB;QACU,SAAI,GAAiC,EAAE,CAAC;IAOlD,CAAC;IANC,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;IAC9B,CAAC;IACM,aAAa,CAAC,IAA6B;QAChD,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IACxC,CAAC;CACF;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC"}

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

@@ -5,6 +5,7 @@ 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";
+import type { AssignValues } from "../../types/AssignValues";
 import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
 import type { IInjectStore } from "../InstanceInject/instanceConfig";
 import type { ComputedConstraint } from "../RootComponent/Computed/ComputedConstraint";
@@ -34,7 +35,7 @@ import type { CreateSubComponentDoc } from "./SubReturnType/CreateSubComponentDo
 import type { SubStoreConstraint } from "./SubStore/SubStoreConstraint";
 import type { SubStoreOption } from "./SubStore/SubStoreOption";
 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 SubMethodsConstraint, InheritDoc extends object, SubDataDoc extends object, SubStoreDoc extends object, SubComputedDoc extends object, SubEventsDoc extends object, SubMethodsDoc extends object> = SubInheritOption<TInherit> & SubDataOption<TSubData, Exclude<keyof CurrentCompDoc["properties"], (keyof InheritDoc)>, Prefix> & SubStoreOption<TSubStore, Exclude<keyof CurrentCompDoc["properties"], (keyof (InheritDoc & SubDataDoc))>> & SubComputedOption<TSubComputed, Omit<CurrentCompDoc["properties"], (keyof (InheritDoc & SubDataDoc & SubStoreDoc))>> & SubEventsOption<TEvents, SubEventsDoc, keyof SubEventsConstraint<CurrentCompDoc>> & SubMethodsOption<TSubMethods, Prefix, keyof (CurrentCompDoc["customEvents"] & SubEventsDoc)> & SubPageLifetimesOption<IsPage, RootDoc["properties"] & {}> & SubLifetimesOption & SubWatchOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc & IInjectStore> & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "export" | "observers" | "relations">> & SubObserversOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc & IInjectStore> & ThisType<SubInstance<SubMethodsDoc & RootDoc["methods"], TSubData, AllRootDataDoc & SubDataDoc & SubComputedDoc & SubStoreDoc, RootDoc["customEvents"] & {}, SubStoreDoc>>;
+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 SubMethodsConstraint, InheritDoc extends object, SubDataDoc extends object, SubStoreDoc extends object, SubComputedDoc extends object, SubEventsDoc extends object, SubMethodsDoc extends object> = SubInheritOption<TInherit> & SubDataOption<TSubData, Exclude<keyof CurrentCompDoc["properties"], (keyof InheritDoc)>, Prefix> & SubStoreOption<TSubStore, Exclude<keyof CurrentCompDoc["properties"], (keyof (InheritDoc & SubDataDoc))>> & SubComputedOption<TSubComputed, Omit<CurrentCompDoc["properties"], (keyof (InheritDoc & SubDataDoc & SubStoreDoc))>> & SubEventsOption<TEvents, SubEventsDoc, keyof SubEventsConstraint<CurrentCompDoc>> & SubMethodsOption<TSubMethods, Prefix, keyof (CurrentCompDoc["customEvents"] & SubEventsDoc)> & SubPageLifetimesOption<IsPage, RootDoc["properties"] & {}> & SubLifetimesOption & SubWatchOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc & IInjectStore> & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "export" | "observers" | "relations">> & SubObserversOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc & IInjectStore> & ThisType<SubInstance<SubMethodsDoc & RootDoc["methods"], SubDataDoc, AllRootDataDoc & AssignValues<SubDataDoc & SubComputedDoc & SubStoreDoc, Required<CurrentCompDoc["properties"]>>, 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 = `${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] & {}>;

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/SubComponent/index.ts"],"names":[],"mappings":"AAiNA,MAAM,UAAU,YAAY;IAK1B,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAkC,CAAQ,CAAC;AACvE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/SubComponent/index.ts"],"names":[],"mappings":"AAkNA,MAAM,UAAU,YAAY;IAK1B,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAkC,CAAQ,CAAC;AACvE,CAAC"}

package/dist/types/AssignValues.d.ts

@@ -0,0 +1,9 @@
+import type { IfExtends } from "hry-types/src/Any/IfExtends";
+import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
+type _AssignValues<Target, Source, UniqueKey extends keyof Target> = ComputeIntersection<{
+    [k in UniqueKey]: Target[k];
+} & {
+    [k in Exclude<keyof Target, UniqueKey>]: Source[k];
+}>;
+export type AssignValues<Target, Source> = IfExtends<unknown, Target, unknown, _AssignValues<Target, Source, Exclude<keyof Target, keyof Source>>>;
+export {};

package/dist/types/AssignValues.js

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

package/dist/types/AssignValues.js.map

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

package/package.json

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

package/src/api/InstanceInject/instanceConfig.ts

@@ -21,7 +21,8 @@ export interface IInjectInfo extends BaseInjectInfo {
 
 export type IInjectData = IInjectInfo["data"] & ReturnTypeInObject<IInjectInfo["store"]>;
 
-export type IInjectStore = ReturnTypeInObject<IInjectInfo["store"]>;
+export type IInjectStore = StoreConstraint extends IInjectInfo["store"] ? unknown
+  : ReturnTypeInObject<IInjectInfo["store"]>;
 
 export type IInjectMethods = IInjectInfo["methods"];
 

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

@@ -67,7 +67,7 @@ SubComponent<Root, OnlyPropsCompDoc>()({
 SubComponent<Root, OnlyPropsCompDoc>()({
   computed: {
     aaa_num() {
-      return 123 as number;
+      return 123;
     },
     aaa_num123(): 123 {
       return 123;
@@ -90,8 +90,8 @@ SubComponent<Root, OnlyPropsCompDoc>()({
             bool: boolean;
             aaa_num: number;
             aaa_num123: 123;
-            aaa_str: "a";
-            aaa_obj: Mock_User;
+            aaa_str: "a" | "b";
+            aaa_obj: Mock_User | null;
           } & IInjectData
         >,
         Test.Pass
@@ -114,8 +114,8 @@ SubComponent<Root, OnlyPropsCompDoc>()({
             bool: boolean;
             aaa_num: number;
             aaa_num123: 123;
-            aaa_str: "a";
-            aaa_obj: Mock_User;
+            aaa_str: "a" | "b";
+            aaa_obj: Mock_User | null;
           } & IInjectData
         >,
         Test.Pass

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

@@ -54,10 +54,10 @@ SubComponent<{}, CompDoc>()({
         typeof this.data,
         ReadonlyDeep<
           {
-            aaa_str: "a";
-            aaa_num: 123;
-            aaa_obj: null;
             _aaa_str: string;
+            aaa_str: "a" | "b";
+            aaa_num: number;
+            aaa_obj: Mock_User | null;
           } & IInjectData
         >,
         Test.Pass

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

@@ -63,8 +63,8 @@ SubComponent<RootDoc, CompDoc>()({
             PoptionalObj: Mock_User;
             Dnum: number;
             Cnum: number;
-            // 自身Data
-            aaa_str: "str";
+            // 自身Data类型与CompDoc类型相同
+            aaa_str: string;
           } & IInjectData
         >,
         Test.Pass

package/src/api/SubComponent/index.ts

@@ -6,6 +6,7 @@ import type { ReplacePrefix } from "../../types/ReplacePrefix";
 import type { ComponentDoc } from "../DefineComponent/ReturnType/ComponentDoc";
 
 import type { Func } from "hry-types/src/Misc/Func";
+import type { AssignValues } from "../../types/AssignValues";
 import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
 import type { IInjectStore } from "../InstanceInject/instanceConfig";
 import type { ComputedConstraint } from "../RootComponent/Computed/ComputedConstraint";
@@ -94,8 +95,8 @@ type Options<
   & ThisType<
     SubInstance<
       SubMethodsDoc & RootDoc["methods"],
-      TSubData,
-      AllRootDataDoc & SubDataDoc & SubComputedDoc & SubStoreDoc,
+      SubDataDoc,
+      AllRootDataDoc & AssignValues<SubDataDoc & SubComputedDoc & SubStoreDoc, Required<CurrentCompDoc["properties"]>>,
       RootDoc["customEvents"] & {},
       SubStoreDoc
     >

package/src/types/AssignValues.ts

@@ -0,0 +1,26 @@
+import type { IfExtends } from "hry-types/src/Any/IfExtends";
+import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
+
+type _AssignValues<Target, Source, UniqueKey extends keyof Target> = ComputeIntersection<
+  & { [k in UniqueKey]: Target[k] }
+  // @ts-ignore
+  & { [k in Exclude<keyof Target, UniqueKey>]: Source[k] }
+>;
+
+/**
+ * Target与Source相同的key类型变为Source的类型
+ * @example
+ * ```ts
+ * type obj = { a: "a"; b: "b"; c: boolean };
+ * type obj2 = { a: number; b: string; d: number };
+ * type test = AssignValues<obj, obj2>;
+ * //  test = { a: number; b: string; c: boolean}
+ * type test1 = AssignValues<unknown, obj2>; // unknown
+ * ```
+ */
+export type AssignValues<Target, Source> = IfExtends<
+  unknown,
+  Target,
+  unknown,
+  _AssignValues<Target, Source, Exclude<keyof Target, keyof Source>>
+>;