annil 1.5.1 → 1.5.2

package/dist/src/behaviors/BComputedAndWatch/types.js.map

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

package/dist/src/behaviors/BStore.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BStore.js","sourceRoot":"","sources":["../../../src/behaviors/BStore.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAG7D,MAAM,CAAC,MAAM,MAAM,GAAG,QAAQ,CAAC;IAE7B,gBAAgB,CAAC,OAAgC;QAE/C,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC;QAClC,IAAI,CAAC,WAAW;YAAE,OAAO;QACzB,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAgB,CAAC;QAChD,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;YAC9B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAG7C,OAAO,CAAC,OAAO,CAAC,eAAe,GAAG,GAAG,EAAE,CAAC,WAAW,CAAC;QACtD,CAAC;IACH,CAAC;IACD,SAAS,EAAE;QACT,OAAO;;YAEL,MAAM,WAAW,GAAG,MAAA,IAAI,CAAC,eAAe,oDAAI,CAAC;YAC7C,IAAI,CAAC,WAAW;gBAAE,OAAO;YACzB,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;YAE1C,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAgB,CAAC;YAEpE,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;YAEnB,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;gBAE9B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAC3B,WAAW,CAAC,GAAG,CAAC,EAChB,CAAC,KAAc,EAAE,EAAE;oBAEjB,IAAI,CAAC,OAAO,CAAC;wBACX,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC;qBACnB,CAAC,CAAC;gBACL,CAAC,EACD;oBACE,MAAM,EAAE,QAAQ,CAAC,UAAU;iBAC5B,CACF,CAAC;YACJ,CAAC;QACH,CAAC;QAED,QAAQ;YAEN,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAChC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,CAAC;QACH,CAAC;KACF;CACF,CAAC,CAAC"}

package/dist/src/behaviors/BbeforeCreated.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BbeforeCreated.js","sourceRoot":"","sources":["../../../src/behaviors/BbeforeCreated.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,aAAa,GAAG,QAAQ,CAAC;IAEpC,gBAAgB,CACd,OAAwF;QAGxF,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAU,CAAC,YAAY,CAAC;QAEzD,gBAAgB,IAAI,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;CACF,CAAC,CAAC"}

package/dist/src/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAoB,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACvF,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAiBlD,OAAO,EAEL,eAAe,EAIf,cAAc,EACd,UAAU,EAEV,aAAa,EACb,YAAY,GACb,CAAC"}

package/dist/{thirdLib → src/thirdLib}/index.js.map

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

package/dist/{thirdLib → src/thirdLib}/vant/Button.js.map

@@ -1 +1 @@
-{"version":3,"file":"Button.js","sourceRoot":"","sources":["../../../src/thirdLib/vant/Button.ts"],"names":[],"mappings":""}
+{"version":3,"file":"Button.js","sourceRoot":"","sources":["../../../../src/thirdLib/vant/Button.ts"],"names":[],"mappings":""}

package/dist/src/thirdLib/vant/NoticeBar.js.map

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

package/dist/{thirdLib → src/thirdLib}/vant/Popup.js.map

@@ -1 +1 @@
-{"version":3,"file":"Popup.js","sourceRoot":"","sources":["../../../src/thirdLib/vant/Popup.ts"],"names":[],"mappings":""}
+{"version":3,"file":"Popup.js","sourceRoot":"","sources":["../../../../src/thirdLib/vant/Popup.ts"],"names":[],"mappings":""}

package/dist/{thirdLib → src/thirdLib}/vant/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/thirdLib/vant/index.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/thirdLib/vant/index.ts"],"names":[],"mappings":""}

package/dist/src/thirdLib/wm/Textarea.js.map

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

package/dist/src/thirdLib/wm/baseEvents.js.map

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

package/dist/{thirdLib → src/thirdLib}/wm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/thirdLib/wm/index.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/thirdLib/wm/index.ts"],"names":[],"mappings":""}

package/dist/src/thirdLib/wm/scrollView.js.map

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

package/dist/{thirdLib → src/thirdLib}/wm/swiper.js.map

@@ -1 +1 @@
-{"version":3,"file":"swiper.js","sourceRoot":"","sources":["../../../src/thirdLib/wm/swiper.ts"],"names":[],"mappings":""}
+{"version":3,"file":"swiper.js","sourceRoot":"","sources":["../../../../src/thirdLib/wm/swiper.ts"],"names":[],"mappings":""}

package/dist/{thirdLib → src/thirdLib}/wm/view.js.map

@@ -1 +1 @@
-{"version":3,"file":"view.js","sourceRoot":"","sources":["../../../src/thirdLib/wm/view.ts"],"names":[],"mappings":""}
+{"version":3,"file":"view.js","sourceRoot":"","sources":["../../../../src/thirdLib/wm/view.ts"],"names":[],"mappings":""}

package/dist/src/types/AddNullForObject.js.map

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

package/dist/{types → src/types}/AddPrefix.js.map

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

package/dist/{types → src/types}/Assign.js.map

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

package/dist/src/types/ComponentDocExtension.js.map

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

package/dist/{types → src/types}/ComputeObj.js.map

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

package/dist/src/types/CreateComponentDoc.js.map

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

package/dist/{types → src/types}/DetailedType.js.map

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

package/dist/{types → src/types}/GenerateDoc.js.map

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

package/dist/src/types/GetComponentPrefix.js.map

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

package/dist/src/types/GetPropertiesDuplicatedKeys.js.map

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

package/dist/src/types/Has.js.map

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

package/dist/src/types/InferDetailedType.js.map

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

package/dist/src/types/InferDetailedType.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/types/InferDetailedType.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"InferDetailedType.test.js","sourceRoot":"","sources":["../../../src/types/InferDetailedType.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAKhD,QAAiE,CAAC;AAElE,QAAiE,CAAC;AAElE,QAAmE,CAAC;AAEpE,QAAmE,CAAC;AAEpE,QAAiE,CAAC;AAElE,QAA0E,CAAC;AAE3E,QAA0G,CAAC"}

package/dist/src/types/ListOfSamePrimitive.js.map

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

package/dist/src/types/OfficialTypeAlias.js.map

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

package/dist/src/types/PrefixValidator.js.map

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

package/dist/src/types/RemoveInnerData.js.map

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

package/dist/{types → src/types}/RemoveNever.js.map

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

package/dist/src/types/RemoveNullOfRequired.js.map

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

package/dist/{types → src/types}/RemovePrefix.js.map

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

package/dist/src/types/ReplacePrefix.js.map

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

package/dist/{types → src/types}/RequiredKeys.js.map

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

package/dist/{types → src/types}/Shift.js.map

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

package/dist/src/types/TwoParamsEqual.js.map

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

package/dist/src/types/UnionToComma.test.js.map

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

package/dist/{types → src/types}/Validators.js.map

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

package/dist/{types → src/types}/includes.js.map

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

package/dist/src/utils/InnerMarker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"InnerMarker.js","sourceRoot":"","sources":["../../../src/utils/InnerMarker.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,GAAG,EAAE,WAAW;CACjB,CAAC"}

package/dist/src/utils/deepClone.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"deepClone.js","sourceRoot":"","sources":["../../../src/utils/deepClone.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,SAAS,CAAI,KAAQ;IACnC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAChD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAM,CAAC;IAEpD,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;IAG3D,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC;YACrD,KAAK,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}

package/dist/src/utils/deleteProtoField.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"deleteProtoField.js","sourceRoot":"","sources":["../../../src/utils/deleteProtoField.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,gBAAgB,CAAmB,GAAM,EAAE,GAAY;IACrE,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;AAC1D,CAAC"}

package/dist/src/utils/isEmptyObject.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"isEmptyObject.js","sourceRoot":"","sources":["../../../src/utils/isEmptyObject.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,aAAa,CAAC,GAAW;IACvC,IACE,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,YAAY,GAAG,IAAI,GAAG,YAAY,GAAG;WACtG,GAAG,YAAY,OAAO,IAAI,GAAG,YAAY,OAAO,EACnD,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;AAC3C,CAAC"}

package/package.json

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

package/src/api/DefineComponent/collectOptionsForComponent.ts

@@ -41,6 +41,7 @@ export type FinalOptionsOfComponent = {
   methods: MethodsConstraint & {
     __computedInitCache__?: () => ComputedCache;
   };
+  externalClasses: string[];
   isPage?: boolean;
   options?: WMComponent.Options;
   properties?: PropertiesConstraint;
@@ -217,7 +218,7 @@ function otherFieldsHandle(
   for (const key in rootComponentOptions) {
     // @ts-ignore 隐式索引
     const config = rootComponentOptions[key];
-    if (key === "behaviors") {
+    if (key === "behaviors" || key === "externalClasses") {
       // 是不是只有behaviors是数组
       finalOptions[key].push(...config);
     } else {
@@ -349,6 +350,7 @@ export function collectOptionsForComponent(
     data: {},
     methods: {},
     behaviors: [BStore, BComputedAndWatch],
+    externalClasses: [],
   });
 
   /**

package/src/api/InstanceInject/instanceConfig.ts

@@ -21,6 +21,8 @@ export interface IInjectInfo extends BaseInjectInfo {
 
 export type IInjectData = IInjectInfo["data"] & ReturnTypeInObject<IInjectInfo["store"]>;
 
+export type IInjectStore = ReturnTypeInObject<IInjectInfo["store"]>;
+
 export type IInjectMethods = IInjectInfo["methods"];
 
 /**

package/src/api/RootComponent/Instance/RootComponentInstance.ts

@@ -23,7 +23,7 @@ export type RootComponentInstance<
   // 加入自定义setData方法
   & CustomSetData<TData>
   & IfExtends<{}, StoreDoc, unknown, {
-    disposer?: { [k in keyof StoreDoc]: IReactionDisposer };
+    disposer: { [k in keyof StoreDoc]: IReactionDisposer };
   }>
   & Assign<IInjectMethods, TMethods & CustomEventMethods<CustomEventsDoc>>
   & { data: ReadonlyDeep<Assign<IInjectData, ComputeIntersection<AllData>>> };

package/src/api/RootComponent/Observers/ObserversOption.ts

@@ -0,0 +1,60 @@
+import type { ReadonlyDeep } from "hry-types/src/Any/_api";
+import type { IfExtends } from "hry-types/src/Any/IfExtends";
+import type { IsPureObject } from "hry-types/src/Any/IsPureObject";
+import type { NoInfer } from "hry-types/src/Generic/NoInfer";
+import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
+
+type getFirstKeys<T extends string> = T extends `${infer F}.${string}` ? F : never;
+
+type getLastKeys<T extends string> = T extends `${string}.${infer L}` ? L : never;
+
+// 加入对象字段一级key 例如 `obj.xxx`(newValue,oldValue){...}和`obj.**`
+type AddFieldsOfObject<
+  TWatchData extends object,
+  _WatchKeys extends keyof TWatchData,
+  secondKeys extends string = {
+    [k in _WatchKeys]: IsPureObject<Exclude<TWatchData[k], null>> extends true
+      ? `${k & string}.${(keyof Exclude<TWatchData[k], null>) & string}` | `${k & string}.**`
+      : never;
+  }[_WatchKeys],
+> = {
+  [k in secondKeys]?: (
+    // @ts-ignore
+    newValue: ReadonlyDeep<
+      IfExtends<
+        getLastKeys<k>,
+        "**",
+        // @ts-ignore
+        TWatchData[getFirstKeys<k>],
+        // @ts-ignore
+        NonNullable<(Exclude<TWatchData[getFirstKeys<k>], null>)[getLastKeys<k>]>
+      >
+    >,
+  ) => void;
+};
+
+export type ObserversOption<TWatchData extends object, _WatchKeys extends keyof TWatchData = keyof TWatchData> = {
+  /**
+   * 监控所有data字段,值变化时(JSON.stringify判断)运行watch函数,一参为最新值,二参为变化前值。
+   * 对象数据可通过`obj.xxx:`监控具体字段(只加入了一级字段类型提示)
+   */
+  observers?: IfExtends<
+    {},
+    TWatchData,
+    EmptyObject,
+    // 不加NoInfer会导致只监控计算字段时错误
+    NoInfer<
+      & {
+        [k in _WatchKeys]?: (
+          newValue: ReadonlyDeep<TWatchData[k]>,
+        ) => void;
+      }
+      // 解决单独书写计算书写字段的报错(或许是:ts字面量约束检测提前计算属性key引起的错误提示)
+      & {
+        [k in _WatchKeys as never]: unknown;
+      }
+      // 加入对象的一级字段类型提示
+      & AddFieldsOfObject<TWatchData, _WatchKeys>
+    >
+  >;
+};

package/src/api/RootComponent/Observers/test/normal.test.ts

@@ -0,0 +1,24 @@
+import { Checking, Test } from "hry-types";
+import { ReadonlyDeep } from "hry-types/src/Any/_api";
+import { User } from "../../../../../jest/common";
+import { RootComponent } from "../..";
+
+RootComponent()({
+  data: {
+    obj: {} as User | null,
+  },
+  observers: {
+    obj(a) {
+      Checking<typeof a, ReadonlyDeep<User> | null, Test.Pass>;
+    },
+    "obj.**"(a) {
+      Checking<typeof a, ReadonlyDeep<User> | null, Test.Pass>;
+    },
+    "obj.age"(a) {
+      Checking<typeof a, number, Test.Pass>;
+    },
+    "obj.name"(a) {
+      Checking<typeof a, string, Test.Pass>;
+    },
+  },
+});

package/src/api/RootComponent/RootComponentDoc.ts

@@ -14,6 +14,7 @@ type _RootComponentDoc = {
   watch?: Record<string, Func>;
   lifetimes?: LifetimesConstraint;
   pageLifetimes?: Partial<WMCompPageLifetimes & { load: Func }>;
+  externalClasses?: string[];
 };
 
 // 验证key是否合法

package/src/api/RootComponent/Watch/WatchOption.ts

@@ -8,32 +8,41 @@ type getFirstKeys<T extends string> = T extends `${infer F}.${string}` ? F : nev
 
 type getLastKeys<T extends string> = T extends `${string}.${infer L}` ? L : never;
 
-// 加入对象字段一级key 例如 `obj.xxx`(newValue,oldValue){...}
+// 加入对象字段一级key 例如 `obj.xxx`(newValue,oldValue){...}和`obj.**`
 type AddFieldsOfObject<
   TWatchData extends object,
   _WatchKeys extends keyof TWatchData,
   secondKeys extends string = {
     [k in _WatchKeys]: IsPureObject<Exclude<TWatchData[k], null>> extends true
-      ? `${k & string}.${(keyof Exclude<TWatchData[k], null>) & string}`
+      ? `${k & string}.${(keyof Exclude<TWatchData[k], null>) & string}` | `${k & string}.**`
       : never;
   }[_WatchKeys],
-> =
-  & {
-    // 添加对象类型.keys
-    [
-      k in _WatchKeys as IsPureObject<Exclude<TWatchData[k], null>> extends true
-        ? `${k & string}.${(keyof Exclude<TWatchData[k], null>) & string}`
-        : never
-    ]?: unknown;
-  }
-  & {
-    [k in secondKeys]?: (
-      // @ts-ignore
-      newValue: ReadonlyDeep<(Exclude<TWatchData[getFirstKeys<k>], null>)[getLastKeys<k>] & {}>,
-      // @ts-ignore
-      oldValue: ReadonlyDeep<(Exclude<TWatchData[getFirstKeys<k>], null>)[getLastKeys<k>]>,
-    ) => void;
-  };
+> = {
+  [k in secondKeys]?: (
+    // @ts-ignore
+    newValue: ReadonlyDeep<
+      IfExtends<
+        getLastKeys<k>,
+        "**",
+        // @ts-ignore
+        Exclude<TWatchData[getFirstKeys<k>], null>,
+        // @ts-ignore
+        NonNullable<(Exclude<TWatchData[getFirstKeys<k>], null>)[getLastKeys<k>]>
+      >
+    >,
+    oldValue: ReadonlyDeep<
+      IfExtends<
+        getLastKeys<k>,
+        "**",
+        // @ts-ignore
+        TWatchData[getFirstKeys<k>],
+        // @ts-ignore
+        (Exclude<TWatchData[getFirstKeys<k>], null>)[getLastKeys<k>]
+      >
+    >,
+    // ReadonlyDeep<(Exclude<TWatchData[getFirstKeys<k>], null>)[getLastKeys<k>]>,
+  ) => void;
+};
 
 export type WatchOption<TWatchData extends object, _WatchKeys extends keyof TWatchData = keyof TWatchData> = {
   /**

package/src/api/RootComponent/Watch/test/WatchProperties.test.ts

@@ -142,6 +142,11 @@ RootComponent()({
 
       Checking<number | undefined, typeof oldValue, Test.Pass>;
     },
+    "optional_obj.**"(newValue, oldValue) {
+      Checking<ReadonlyDeep<Mock_User>, typeof newValue, Test.Pass>;
+
+      Checking<ReadonlyDeep<Mock_User | null>, typeof oldValue, Test.Pass>;
+    },
     "optional_obj.id"(newValue, oldValue) {
       Checking<string, typeof newValue, Test.Pass>;
 

package/src/api/RootComponent/Watch/test/WtachInject.test.ts

@@ -2,15 +2,10 @@ import { Checking, Test } from "hry-types";
 import { RootComponent } from "../..";
 
 /**
- * watch data字段 深度只读
+ * watch 只能监控 注入的store字段
  */
 RootComponent()({
   watch: {
-    injectStr(newValue, oldValue) {
-      Checking<string, typeof newValue, Test.Pass>;
-
-      Checking<string, typeof oldValue, Test.Pass>;
-    },
     injectTheme(newValue, oldValue) {
       Checking<"dark" | "light" | undefined, typeof newValue, Test.Pass>;
 

package/src/api/RootComponent/index.ts

@@ -5,7 +5,7 @@ import type { ComputeIntersection } from "hry-types/src/Object/_api";
 import type { ComputeObject } from "../../types/ComputeObj";
 import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
 import type { ComponentDoc } from "../DefineComponent/ReturnType/ComponentDoc";
-import { IInjectData } from "../InstanceInject/instanceConfig";
+import { IInjectStore } from "../InstanceInject/instanceConfig";
 import type { ComputedConstraint } from "./Computed/ComputedConstraint";
 import type { ComputedOption } from "./Computed/ComputedOption";
 import type { GetComputedDoc } from "./Computed/GetComputedDoc";
@@ -22,6 +22,7 @@ import type { LifetimesConstraint } from "./Lifetimes/LifetimesConstraint";
 import type { LifetimesOption } from "./Lifetimes/LifetimesOption";
 import type { MethodsConstraint } from "./Methods/MethodsConstraint";
 import type { MethodsOption } from "./Methods/MethodsOption";
+import { ObserversOption } from "./Observers/ObserversOption";
 import type { PageLifetimesOption } from "./PageLifetimes/PageLifetimesOption";
 import type { GetPropertiesDoc } from "./Properties/GetPropertiesDoc";
 import type { PropertiesConstraint } from "./Properties/PropertiesConstraint";
@@ -62,9 +63,16 @@ type RootComponentOptions<
     & Required<PropertiesDoc>
     & DataDoc
     & StoreDoc
-    & IInjectData
+    & IInjectStore
+  >
+  & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "export" | "observers">>
+  & ObserversOption<
+    & ComputedDoc
+    & Required<PropertiesDoc>
+    & DataDoc
+    & StoreDoc
+    & IInjectStore
   >
-  & Partial<Omit<WMCompOtherOption, "pageLifetimes">>
   & ThisType<
     RootComponentInstance<
       TIsPage,
@@ -104,6 +112,7 @@ type RootComponentConstructor<TComponentDocList extends ComponentDoc[]> = {
       TData,
       TStore,
       TComputed,
+      // TObservers,
       EventsDoc,
       CustomEventsDoc,
       PropertiesDoc,

package/src/api/SubComponent/SubObservers/SubObserversOption.ts

@@ -0,0 +1,3 @@
+import { ObserversOption } from "../../RootComponent/Observers/ObserversOption";
+
+export type SubObserversOption<TObserversData extends object> = ObserversOption<TObserversData>;

package/src/api/SubComponent/SubWatch/test/WatchComputed.test.ts

@@ -64,6 +64,11 @@ SubComponent<RootDoc, CompDoc>()({
 
       Checking<Mock_User | null, typeof oldValue, Test.Pass>;
     },
+    "aaa_obj.**"(newValue: Mock_User, oldValue: Mock_User | null) {
+      Checking<Mock_User, typeof newValue, Test.Pass>;
+
+      Checking<Mock_User | null, typeof oldValue, Test.Pass>;
+    },
     "aaa_obj.id"(newValue: string, oldValue: string) {
       Checking<string, typeof newValue, Test.Pass>;
 

package/src/api/SubComponent/SubWatch/test/WatchRootData.test.ts

@@ -75,6 +75,11 @@ SubComponent<RootDoc, CompDoc>()({
 
       Checking<ReadonlyDeep<TestObj>, typeof oldValue, Test.Pass>;
     },
+    "optional_obj.**"(newValue, oldValue) {
+      Checking<ReadonlyDeep<TestObj>, typeof newValue, Test.Pass>;
+
+      Checking<ReadonlyDeep<TestObj>, typeof oldValue, Test.Pass>;
+    },
     "optional_obj.subObj"(newValue, oldValue) {
       Checking<ReadonlyDeep<Mock_User>, typeof newValue, Test.Pass>;
 

package/src/api/SubComponent/SubWatch/test/WtachInject.test.ts

@@ -0,0 +1,15 @@
+import { Checking, Test } from "hry-types";
+import { SubComponent } from "../..";
+
+/**
+ * watch  注入的store字段
+ */
+SubComponent<{}, { properties: { aaa_num: number } }>()({
+  watch: {
+    injectTheme(newValue, oldValue) {
+      Checking<"dark" | "light" | undefined, typeof newValue, Test.Pass>;
+
+      Checking<"dark" | "light" | undefined, typeof oldValue, Test.Pass>;
+    },
+  },
+});

package/src/api/SubComponent/index.ts

@@ -7,6 +7,7 @@ import type { ComponentDoc } from "../DefineComponent/ReturnType/ComponentDoc";
 
 import type { Func } from "hry-types/src/Misc/Func";
 import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
+import { IInjectStore } from "../InstanceInject/instanceConfig";
 import type { ComputedConstraint } from "../RootComponent/Computed/ComputedConstraint";
 import type { DataConstraint } from "../RootComponent/Data/DataConstraint";
 import type { EventsConstraint } from "../RootComponent/Events/EventsConstraint";
@@ -28,6 +29,7 @@ import type { SubInstance } from "./SubInstance/SubInstance";
 import type { SubLifetimesOption } from "./SubLifetimes/SubLifetimesOption";
 import type { SubMethodsConstraint } from "./SubMethods/SubMethodsConstraint";
 import type { SubMethodsOption } from "./SubMethods/SubMethodsOption";
+import { SubObserversOption } from "./SubObservers/SubObserversOption";
 import type { SubPageLifetimesOption } from "./SubPageLifetimes/SubPageLifetimesOption";
 import type { CreateSubComponentDoc } from "./SubReturnType/CreateSubComponentDoc";
 import type { SubStoreConstraint } from "./SubStore/SubDataConstraint";
@@ -80,8 +82,16 @@ type Options<
     & SubDataDoc
     & AllRootDataDoc
     & SubStoreDoc
+    & IInjectStore
+  >
+  & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "export" | "observers">>
+  & SubObserversOption<
+    & SubComputedDoc
+    & SubDataDoc
+    & AllRootDataDoc
+    & SubStoreDoc
+    & IInjectStore
   >
-  & Partial<Omit<WMCompOtherOption, "pageLifetimes">>
   & ThisType<
     SubInstance<
       SubMethodsDoc & RootDoc["methods"],

package/src/behaviors/BComputedAndWatch/getPathsValue.ts

@@ -1,15 +1,19 @@
 /**
  * 获取指定paths的值
  * @param this  - 组件实例 Instance
- * @param paths - 支持多字段(用`,`分开) 例如 'obj.xxx,a,b' 监控了3个字段
+ * @param paths - 支持多字段(用`,`分开) 例如 'obj.xxx,a,b.**' 监控了3个字段
  * @returns unknown[] 每项对应paths每项的值
  */
 export function getPathsValue(data: object, paths: string) {
   const valueList: unknown[] = [];
 
-  // ['obj.xxx','a','b'].forEach
+  // ['obj.xxx','a','b.**'].forEach
   paths.split(",").forEach(path => {
-    // path : 'obj.xxx' | 'a' | 'b'
+    // path : 'obj.xxx' | 'a' | 'b.**'
+    if (path.includes(".**")) {
+      // "b.**" => 'b'
+      path = path.slice(0, -3);
+    }
     const value = path.split(".").reduce((pre: any, path) => {
       // pre有可能为undefined|null,比如obj是未初始化的计算属性(undefined),还有可能是properties的对象类型(默认为null)
       try {

package/src/behaviors/BComputedAndWatch/index.ts

@@ -89,14 +89,18 @@ export const BComputedAndWatch = Behavior({
       methodsConfig.__watchConfig__ = () => watchConfig;
 
       /* istanbul ignore next */
-      const observersConfig = options.observers ||= {};
+      const observersConfig = options.observers;
       for (const key in watchConfig) {
         const watchHadle = watchConfig[key];
+        const originObserversHandle = observersConfig[key] as Func | undefined;
 
         // 在监控多个数据时,参数是多个值
         observersConfig[key] = function(this: Instance, ...newValue: unknown[]) {
+          originObserversHandle && originObserversHandle.call(this, ...newValue);
+
           const watchOldValue = this.__watchOldValue__!;
           const oldValue = watchOldValue[key];
+
           if (isEqual(newValue, oldValue)) return;
           watchOldValue[key] = deepClone(newValue);