annil 1.14.0 → 1.16.0

package/src/api/{CustomComponent/CustomStore/CustomStoreConstraint.ts → SubComponent/SubStore/SubStoreConstraint.ts}

@@ -5,9 +5,9 @@ import type { Getter } from "../../RootComponent/Store/StoreConstraint";
  * 子组件Data字段约束
  * @returns 当剩余对象不为空对象,约束对象的key为剩余key,类型为剩余key对应的文档类型或函数返回类型。
  */
-export type CustomStoreConstraint<
+export type SubStoreConstraint<
   PropertyDoc extends object,
   legal extends object,
 > = {
-  [k in keyof legal]?: Getter<PropertyDoc, AddNullForObject<legal[k]>>;
+  [k in keyof legal]?: Getter<PropertyDoc, AddNullForObject<legal[k]> | undefined>;
 };

package/src/api/{CustomComponent/CustomStore/CustomStoreOption.ts → SubComponent/SubStore/SubStoreOption.ts}

@@ -1,7 +1,7 @@
 import type { G } from "hry-types";
 import type { Validators } from "../../../types/Validators";
 
-export type CustomStoreOption<TStore extends object, legalKeys extends PropertyKey> = {
+export type SubStoreOption<TStore extends object, legalKeys extends PropertyKey> = {
   /**
    * 全局响应式数据字段,全局store对应数据变化实例对应数据自动setData。
    * 约束为组件properties字段去除inherit和data的剩余字段和内部字段

package/src/api/{CustomComponent/CustomStore → SubComponent/SubStore}/test/error.test.ts

@@ -1,7 +1,7 @@
 import { observable } from "mobx";
 
 import type { ComponentDoc } from "../../../DefineComponent/returnType/ComponentDoc";
-import { CustomComponent } from "../..";
+import { SubComponent } from "../..";
 const user = observable({
   name: "zhao",
   age: 20,
@@ -14,7 +14,7 @@ type DocA = ComponentDoc<{
   };
 }>;
 
-CustomComponent<{
+SubComponent<{
   properties: {
     str: string;
   };
@@ -34,10 +34,10 @@ CustomComponent<{
     // @ts-expect-error 3 超出约束字段
     nu1m: () => user.age,
     // @ts-expect-error 4 与data的内部字段重复
-    aaa_xxx: () => user.age,
+    _aaa_xxx: () => user.age,
   },
 });
-CustomComponent<{
+SubComponent<{
   properties: {
     aaa_num: number;
   };
@@ -48,13 +48,13 @@ CustomComponent<{
   },
 });
 // 类型约束错误
-CustomComponent<{
+SubComponent<{
   properties: {
     aaa_num: number;
   };
 }, DocA>()({
   store: {
     // @ts-expect-error 返回类型错误
-    aaa_num: () => undefined,
+    aaa_num: () => "str",
   },
 });

package/src/api/{CustomComponent/CustomStore → SubComponent/SubStore}/test/normal.test.ts

@@ -1,10 +1,11 @@
 import { observable } from "mobx";
 
 import type { ComponentDoc } from "../../../DefineComponent/returnType/ComponentDoc";
-import { CustomComponent } from "../..";
+import { SubComponent } from "../..";
 const user = observable({
   name: "zhao",
   age: 20,
+  isReady: false,
 });
 
 type DocA = ComponentDoc<{
@@ -14,23 +15,29 @@ type DocA = ComponentDoc<{
   };
 }>;
 
-CustomComponent<{}, DocA>()({
+SubComponent<{}, DocA>()({
   store: {
-    // 1 可写组件字段
+    // 1 可写文档字段
     aaa_str: () => user.name,
     aaa_num: () => user.age,
   },
 });
 
-CustomComponent<{}, DocA, "a">()({
+SubComponent<{}, DocA, "a">()({
   store: {
     // 2 可写内部字段
     _aaaA_xxx: () => user.age,
   },
 });
 // store中可写 额外字段 isReady
-CustomComponent<{ data: { _num: number } }, DocA, "a">()({
+SubComponent<{ data: { _num: number } }, DocA, "a">()({
   store: {
-    aaaA_isReady: () => false,
+    aaaA_isReady: () => user.isReady,
+  },
+});
+// 4 可以返回undefined,表示该字段不可响应式,不报错,有警告。
+SubComponent<{ properties: { num: number } }, DocA, "a">()({
+  store: {
+    aaaA_num: (data) => data.num > 10 ? user.age : void 0,
   },
 });

package/src/api/SubComponent/SubWatch/SubWatchOption.ts

@@ -0,0 +1,3 @@
+import type { WatchOption } from "../../RootComponent/Watch/WatchOption";
+
+export type SubWatchOption<TWatchData extends object> = WatchOption<TWatchData>;

package/src/api/{CustomComponent/CustomWatch → SubComponent/SubWatch}/test/WatchComputed.test.ts

@@ -2,7 +2,7 @@ import { Checking, type Test } from "hry-types";
 import type { ComponentDoc } from "../../../DefineComponent/returnType/ComponentDoc";
 import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
 import type { RootComponentDefinition } from "../../../RootComponent/returnType";
-import { CustomComponent } from "../..";
+import { SubComponent } from "../..";
 
 type RootDoc = RootComponentDefinition<{
   properties: {
@@ -28,7 +28,7 @@ type CompDoc = ComponentDoc<{
 /**
  *  watch computed字段时需要手写类型,可悬停鼠标到key查看类型
  */
-CustomComponent<RootDoc, CompDoc>()({
+SubComponent<RootDoc, CompDoc>()({
   computed: {
     aaa_str(): string {
       return this.data.aaa_num.toString();

package/src/api/{CustomComponent/CustomWatch → SubComponent/SubWatch}/test/WatchProperties.test.ts

@@ -1,5 +1,5 @@
 import { Checking, type Test } from "hry-types";
-import { CustomComponent, type DetailedType, RootComponent } from "../../../..";
+import { type DetailedType, RootComponent, SubComponent } from "../../../..";
 import type { OptionalType } from "../../../RootComponent/Properties/PropertiesConstraint";
 import {
   type Mock_Cart,
@@ -45,7 +45,7 @@ void rootComponent;
 /**
  * watch properties字段 深度只读, 必传对象字段newValue去除null
  */
-CustomComponent<Root, { properties: { aaa_num: number } }>()({
+SubComponent<Root, { properties: { aaa_num: number } }>()({
   watch: {
     // 必传单一字段
     str(newValue, oldValue) {

package/src/api/{CustomComponent/CustomWatch → SubComponent/SubWatch}/test/WatchRootData.test.ts

@@ -3,7 +3,7 @@ import { Checking, type Test } from "hry-types";
 import type { ComponentDoc } from "../../../DefineComponent/returnType/ComponentDoc";
 
 import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
-import { CustomComponent } from "../..";
+import { SubComponent } from "../..";
 
 interface TestObj {
   subObj: Mock_User;
@@ -37,7 +37,7 @@ interface RootDoc {
 /**
  * watch RootDoc中的数据字段
  */
-CustomComponent<RootDoc, CompDoc>()({
+SubComponent<RootDoc, CompDoc>()({
   data: {
     aaa_str: "str",
   },

package/src/api/{CustomComponent/CustomWatch → SubComponent/SubWatch}/test/WatchSubData.test.ts

@@ -1,6 +1,6 @@
 import { Checking, type Test } from "hry-types";
 import type { ComponentDoc } from "../../../DefineComponent/returnType/ComponentDoc";
-import { CustomComponent } from "../..";
+import { SubComponent } from "../..";
 
 type CompDoc = ComponentDoc<{
   properties: {
@@ -10,14 +10,14 @@ type CompDoc = ComponentDoc<{
 }>;
 
 // 可以为空对象
-CustomComponent<{}, CompDoc>()({
+SubComponent<{}, CompDoc>()({
   watch: {},
 });
 
 /**
  * watch 自身data字段
  */
-CustomComponent<{}, CompDoc>()({
+SubComponent<{}, CompDoc>()({
   data: {
     aaa_str: "123",
 

package/src/api/{CustomComponent/CustomWatch → SubComponent/SubWatch}/test/WtachInject.test.ts

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

package/src/api/{CustomComponent/CustomWatch → SubComponent/SubWatch}/test/error.test.ts

@@ -1,8 +1,8 @@
 import type { Wm } from "../../../..";
-import { CustomComponent } from "../..";
+import { SubComponent } from "../..";
 
 // 测试1
-CustomComponent<{ events: { a: string } }, Wm.View>()({
+SubComponent<{ events: { a: string } }, Wm.View>()({
   watch: {
     // @ts-expect-error 无可监控字段时，约束为EmptyObject,不可写任何字段
     nothing() {
@@ -14,7 +14,7 @@ CustomComponent<{ events: { a: string } }, Wm.View>()({
 /**
  * 测试2  超出约束字段报错
  */
-CustomComponent<{ events: { a: string } }, Wm.View>()({
+SubComponent<{ events: { a: string } }, Wm.View>()({
   data: {
     view_hoverClass: " h-100",
   },
@@ -28,7 +28,7 @@ CustomComponent<{ events: { a: string } }, Wm.View>()({
     },
   },
 });
-CustomComponent<{ data: { user: null | object } }, Wm.View>()({
+SubComponent<{ data: { user: null | object } }, Wm.View>()({
   data: {
     view_hoverClass: " h-100",
   },
@@ -45,7 +45,7 @@ CustomComponent<{ data: { user: null | object } }, Wm.View>()({
 /**
  * 3  对象联合null的类型 不能watch子字段
  */
-CustomComponent<{ data: { user: null | object } }, { properties: { a: number } }>()({
+SubComponent<{ data: { user: null | object } }, { properties: { a: number } }>()({
   watch: {
     user(newValue, oldValue) {
       void oldValue;

package/src/api/{CustomComponent → SubComponent}/index.ts

@@ -12,29 +12,26 @@ import type { ComponentDoc } from "../DefineComponent/returnType/ComponentDoc";
 import type { IInjectStore } from "../InstanceInject/instanceConfig";
 import type { RootComponentDefinition } from "../RootComponent/returnType";
 import type { GetStoreDef } from "../RootComponent/Store/GetStoreDef";
-import type { CustomComputedConstraint } from "./CustomComputed/CustomComputedConstraint";
-import type { CustomComputedOption } from "./CustomComputed/CustomComputedOption";
-import type { GetCustomComputedDoc } from "./CustomComputed/GetCustomComputedDoc";
-import type { CustomDataConstraint } from "./CustomData/CustomDataConstraint";
-import type { CustomDataOption } from "./CustomData/CustomDataOption";
-import type { CustomEventsConstraint } from "./CustomEvents/CustomEventsConstraint";
-import type { CustomEventsOption } from "./CustomEvents/CustomEventsOption";
-import type { CustomInheritConstraint } from "./CustomInherit/CustomInheritConstraint";
-import type { CustomInheritOption } from "./CustomInherit/CustomInheritOption";
-import type { CustomInstance } from "./CustomInstance/SubInstance";
-import type { CustomLifetimesOption } from "./CustomLifetimes/SubLifetimesOption";
-import type { CustomMethodsConstraint } from "./CustomMethods/CustomMethodsConstraint";
-import type { CustomMethodsOption } from "./CustomMethods/CustomMethodsOption";
-import type { CustomObserversOption } from "./CustomObservers/CustomObserversOption";
-import type { CustomPageLifetimesOption } from "./CustomPageLifetimes/CustomPageLifetimesOption";
-import type { CreatCustomComponentDoc } from "./CustomReturnType/CreateCustomComponentDoc";
-import type { CustomStoreConstraint } from "./CustomStore/CustomStoreConstraint";
-import type { CustomStoreOption } from "./CustomStore/CustomStoreOption";
-import type { CustomWatchOption } from "./CustomWatch/CustomWatchOption";
-// type getLegalKeys<K> = K extends Exclude<CompDocKeys, (keyof (InheritDoc & SubDataDoc))> ? K
-//   : K extends keyof AllRootDataDoc ? never
-//   : K extends Extract<Exclude<keyof NoInfer<TSubStore>, keyof SubDataDoc>, InnerFields<Prefix>> ? K
-//   : never;
+import type { GetSubComputedDoc } from "./SubComputed/GetSubComputedDoc";
+import type { SubComputedConstraint } from "./SubComputed/SubComputedConstraint";
+import type { SubComputedOption } from "./SubComputed/SubComputedOption";
+import type { SubDataConstraint } from "./SubData/SubDataConstraint";
+import type { SubDataOption } from "./SubData/SubDataOption";
+import type { SubEventsConstraint } from "./SubEvents/SubEventsConstraint";
+import type { SubEventsOption } from "./SubEvents/SubEventsOption";
+import type { SubInheritConstraint } from "./SubInherit/SubInheritConstraint";
+import type { SubInheritOption } from "./SubInherit/SubInheritOption";
+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 type { SubObserversOption } from "./SubObservers/SubObserversOption";
+import type { SubPageLifetimesOption } from "./SubPageLifetimes/SubPageLifetimesOption";
+import type { CreatSubComponentDoc } from "./SubReturnType/CreateSubComponentDoc";
+import type { SubStoreConstraint } from "./SubStore/SubStoreConstraint";
+import type { SubStoreOption } from "./SubStore/SubStoreOption";
+import type { SubWatchOption } from "./SubWatch/SubWatchOption";
+
 type Options<
   RootDoc extends RootComponentDefinition,
   IsPage extends boolean,
@@ -46,7 +43,7 @@ type Options<
   TSubStore extends object,
   TSubComputed extends object,
   TEvents extends object,
-  TSubMethods extends CustomMethodsConstraint,
+  TSubMethods extends SubMethodsConstraint,
   InheritDoc extends object,
   SubDataDoc extends object,
   SubStoreDoc extends object,
@@ -55,7 +52,7 @@ type Options<
   SubMethodsDoc extends object,
   CompDocKeys extends PropertyKey = keyof CurrentCompDoc["properties"],
 > =
-  & CustomInheritOption<
+  & SubInheritOption<
     TInherit,
     {
       [k in keyof NoInfer<TInherit>]:
@@ -66,7 +63,7 @@ type Options<
           : never;
     }[keyof NoInfer<TInherit>]
   >
-  & CustomDataOption<
+  & SubDataOption<
     TSubData,
     // 合法的配置
     {
@@ -81,7 +78,7 @@ type Options<
     }[keyof NoInfer<TSubData>],
     "子组件无需此字段或与Inherit字段重复"
   >
-  & CustomStoreOption<
+  & SubStoreOption<
     TSubStore,
     {
       [k in keyof NoInfer<TSubStore>]:
@@ -94,16 +91,7 @@ type Options<
           : never;
     }[keyof NoInfer<TSubStore>]
   >
-  // 下面为之前的写法 不好与根组件的字段重复检测。
-
-  // // 合法的字段(继承组件类型的keys)
-  // | Exclude<CompDocKeys, (keyof (InheritDoc & SubDataDoc))>
-  // // 合法的内部字段(不与data重复的内部字段)
-  // | Extract<Exclude<keyof NoInfer<TSubStore>, keyof SubDataDoc>, InnerFields<Prefix>>
-  // 不与allData重复的字段
-  // | Exclude<keyof NoInfer<TSubStore>, keyof AllRootDataDoc>
-
-  & CustomComputedOption<
+  & SubComputedOption<
     TSubComputed,
     {
       [k in keyof NoInfer<TSubComputed>]:
@@ -128,11 +116,11 @@ type Options<
   //   >;
   // }
   // 无需与根组件的events字段重复检测,因为根组件多了bubbles字段,一定不会重复
-  & CustomEventsOption<TEvents, SubEventsDoc, keyof CustomEventsConstraint<CurrentCompDoc>>
-  & CustomMethodsOption<TSubMethods, Prefix, keyof (CurrentCompDoc["events"] & SubEventsDoc)>
-  & CustomPageLifetimesOption<IsPage, NonNullable<RootDoc["properties"]>>
-  & CustomLifetimesOption
-  & CustomWatchOption<
+  & SubEventsOption<TEvents, SubEventsDoc, keyof SubEventsConstraint<CurrentCompDoc>>
+  & SubMethodsOption<TSubMethods, Prefix, keyof (CurrentCompDoc["events"] & SubEventsDoc)>
+  & SubPageLifetimesOption<IsPage, NonNullable<RootDoc["properties"]>>
+  & SubLifetimesOption
+  & SubWatchOption<
     & SubComputedDoc
     & SubDataDoc
     & AllRootDataDoc
@@ -140,7 +128,7 @@ type Options<
     & IInjectStore
   >
   & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "export" | "observers" | "relations">>
-  & CustomObserversOption<
+  & SubObserversOption<
     & SubComputedDoc
     & SubDataDoc
     & AllRootDataDoc
@@ -148,7 +136,7 @@ type Options<
     & IInjectStore
   >
   & ThisType<
-    CustomInstance<
+    SubInstance<
       SubMethodsDoc & RootDoc["methods"],
       Replace<SubDataDoc, Required<CurrentCompDoc["properties"]>>, // Replace目的是让setData中的类型与文档中定义的类型一致
       // SubDataDoc,
@@ -159,7 +147,7 @@ type Options<
     >
   >;
 
-type CustomComponentConstructor<
+type SubComponentConstructor<
   TRootDoc extends RootComponentDefinition,
   TOriginalCompDoc extends ComponentDoc,
   // 补充的前缀
@@ -181,34 +169,34 @@ type CustomComponentConstructor<
     & TRootDoc["computed"]
     & TRootDoc["store"],
 > = <
-  TInherit extends CustomInheritConstraint<AllRootDataDoc, CurrentCompDoc>,
-  TData extends CustomDataConstraint<
+  TInherit extends SubInheritConstraint<AllRootDataDoc, CurrentCompDoc>,
+  TData extends SubDataConstraint<
     & Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc>
     & Record<InnerFields<CurrentPrefix>, unknown> // 内部字段
   >,
-  TStore extends CustomStoreConstraint<
+  TStore extends SubStoreConstraint<
     Required<TRootDoc["properties"]>,
     & Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & DataDoc)>
     & Record<InnerFields<CurrentPrefix>, unknown> // 内部字段
   >,
-  TEvents extends CustomEventsConstraint<CurrentCompDoc>,
+  TEvents extends SubEventsConstraint<CurrentCompDoc>,
   // 加默认值计算字段无提示且需要手写返回类型,不加watch无法对computed监控
-  TComputed extends CustomComputedConstraint<
+  TComputed extends SubComputedConstraint<
     & Omit<
       Required<CurrentCompDoc["properties"]>,
       keyof (InheritDoc & DataDoc & StoreDoc)
     >
     & Record<InnerFields<CurrentPrefix>, unknown> // 内部字段
   >,
-  TMethods extends CustomMethodsConstraint = {},
+  TMethods extends SubMethodsConstraint = {},
   InheritDoc extends object = IfExtends<
-    CustomInheritConstraint<AllRootDataDoc, CurrentCompDoc>,
+    SubInheritConstraint<AllRootDataDoc, CurrentCompDoc>,
     TInherit,
     {},
     TInherit
   >,
   DataDoc extends object = IfExtends<
-    CustomDataConstraint<
+    SubDataConstraint<
       & Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc>
       & Record<InnerFields<CurrentPrefix>, unknown>
     >,
@@ -217,7 +205,7 @@ type CustomComponentConstructor<
     TData
   >,
   StoreDoc extends object = IfExtends<
-    CustomStoreConstraint<
+    SubStoreConstraint<
       Required<TRootDoc["properties"]>,
       & Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & DataDoc)>
       & Record<InnerFields<CurrentPrefix>, unknown>
@@ -228,7 +216,7 @@ type CustomComponentConstructor<
   >,
   // 无效的计算
   ComputedDoc extends object = IfExtends<
-    CustomComputedConstraint<
+    SubComputedConstraint<
       & Omit<
         Required<CurrentCompDoc["properties"]>,
         keyof (InheritDoc & DataDoc & StoreDoc)
@@ -237,10 +225,10 @@ type CustomComponentConstructor<
     >,
     TComputed,
     {},
-    GetCustomComputedDoc<TComputed>
+    GetSubComputedDoc<TComputed>
   >,
   EventsDoc extends object = IfExtends<
-    CustomEventsConstraint<CurrentCompDoc>,
+    SubEventsConstraint<CurrentCompDoc>,
     TEvents,
     {},
     TEvents
@@ -255,12 +243,12 @@ type CustomComponentConstructor<
       & StoreDoc
       // 改用ComputedDoc是会报错的
       & IfExtends<
-        CustomComputedConstraint<
+        SubComputedConstraint<
           Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & DataDoc & StoreDoc)>
         >,
         TComputed,
         {},
-        GetCustomComputedDoc<TComputed>
+        GetSubComputedDoc<TComputed>
       >
     )
   >,
@@ -287,7 +275,7 @@ type CustomComponentConstructor<
 ) => IfExtends<
   MissingRequiredField,
   never,
-  CreatCustomComponentDoc<
+  CreatSubComponentDoc<
     NonNullable<CurrentCompDoc["events"]>,
     EventsDoc
   >,
@@ -298,7 +286,7 @@ type CustomComponentConstructor<
  * 自定义组件构建函数
  * @returns `(options:) => ComponentDoc`
  */
-export function CustomComponent<
+export function SubComponent<
   TRootComponentDefinition extends RootComponentDefinition,
   TCompDoc extends ComponentDoc,
   Prefix extends string = "",
@@ -306,7 +294,7 @@ export function CustomComponent<
   EmptyObject,
   TCompDoc,
   (opt: EmptyObject) => never,
-  CustomComponentConstructor<TRootComponentDefinition, TCompDoc, Prefix>
+  SubComponentConstructor<TRootComponentDefinition, TCompDoc, Prefix>
 > {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   return ((options: any) => options) as any;

package/src/api/{CustomComponent → SubComponent}/returnType.ts

@@ -7,7 +7,7 @@ import type { MethodsConstraint } from "../RootComponent/Methods/MethodsConstrai
 import type { PageLifetimesOption } from "../RootComponent/PageLifetimes/PageLifetimesOption";
 import type { StoreConstraint } from "../RootComponent/Store/StoreConstraint";
 
-type _CustomComponentDefinition = {
+type _SubComponentDefinition = {
   composedEvents?: Record<string, unknown>;
 };
 
@@ -15,15 +15,15 @@ type _CustomComponentDefinition = {
 type _Validator<O, Doc, ErrKeys = Exclude<keyof O, keyof Doc>> = [ErrKeys] extends [never] ? Doc
   : `错误的字段${ErrKeys & string}`;
 /**
- * CustomComponent API 的返回类型
+ * SubComponent API 的返回类型
  */
-export type CustomComponentDefinition<
-  O extends _Validator<O, _CustomComponentDefinition> = _CustomComponentDefinition,
+export type SubComponentDefinition<
+  O extends _Validator<O, _SubComponentDefinition> = _SubComponentDefinition,
 > = O;
 /**
- * CustomComponent API 返回的运行时类型
+ * SubComponent API 返回的运行时类型
  */
-export type CustomComponentDefinitionRuntime = {
+export type SubComponentDefinitionRuntime = {
   inhrit?: string;
   data?: DataConstraint;
   computed?: ComputedConstraint;
@@ -37,4 +37,3 @@ export type CustomComponentDefinitionRuntime = {
     | PageLifetimesOption<false, object>["pageLifetimes"]
     | PageLifetimesOption<true, object>["pageLifetimes"];
 };
-// import type { CustomComponentRuntime } from "../CustomComponent";

package/src/index.ts

@@ -1,8 +1,7 @@
-import { ChunkComponent } from "./api/ChunkComponent";
-import { CustomComponent } from "./api/CustomComponent";
 import { DefineComponent } from "./api/DefineComponent";
 import { type IInjectInfo, instanceConfig } from "./api/InstanceInject/instanceConfig";
 import { RootComponent } from "./api/RootComponent";
+import { SubComponent } from "./api/SubComponent";
 import { navigateBack, navigateTo, redirectTo } from "./api/wxSugar";
 import type { CreateComponentType } from "./types/CreateComponentType";
 import type { DetailedType } from "./types/DetailedType";
@@ -33,9 +32,7 @@ export type {
 } from "./types/OfficialTypeAlias";
 
 export {
-  ChunkComponent,
   type CreateComponentType,
-  CustomComponent,
   DefineComponent,
   type DetailedType,
   type ExtendComponentType,
@@ -45,4 +42,5 @@ export {
   navigateTo,
   redirectTo,
   RootComponent,
+  SubComponent,
 };

package/src/thirdLib/wm/swiper.test.ts

@@ -1,7 +1,7 @@
-import { CustomComponent, typeEqual } from "../../index";
+import { SubComponent, typeEqual } from "../../index";
 import type { Wm } from "../index";
 
-CustomComponent<{}, Wm.Swiper>()({
+SubComponent<{}, Wm.Swiper>()({
   data: {
     swiper_style: "16/9",
   },

package/tsconfig.json

@@ -2,11 +2,12 @@
   "compilerOptions": {
     "lib": ["ES2022", "DOM"], // jest中用到了DOM类型
     "target": "ES2017",
-    "module": "ES2022",
-    "moduleResolution": "Node",
+    "module": "es2022",
+    "moduleResolution": "bundler",
     "skipLibCheck": true, // 跳过声明文件的类型检查(.d.ts),你引用的依然会检查, 默认false(不跳过)。
     "esModuleInterop": true, // 默认false. 兼容非ES模块引用的写法(如 import fs from 'fs').
     "allowSyntheticDefaultImports": true, // 默认false. 允许从没有设置默认导出的模块中默认导入。
+    "verbatimModuleSyntax": true, // 保留原始import/export语法, 与ESM写法一致。
     "strict": true,
     "noEmit": true, // 不生成输出文件。
     // "resolveJsonModule": true, // 允许导入json模块。
@@ -16,7 +17,6 @@
     "exactOptionalPropertyTypes": true, // 带有?标志的属性类型不在包含undefined类型
     "noImplicitReturns": true, // 当启用时,TypeScript会检查函数中的所有代码路径，以确保它们返回值
     "isolatedModules": true, // 模块化(.ts文件必须有导入或导出) 默认false
-    // "verbatimModuleSyntax": true, // 5.0后新增配置,替代preserveValueImports。
     "types": ["hry-types", "mobx", "jest", "miniprogram-api-typings", "node"]
   },
   "include": ["src/**/*.ts", "jest/**/*.ts"],

package/dist/api/ChunkComponent/ChunkComputed/ChunkComputedConstraint.d.ts

@@ -1 +0,0 @@
-export type ChunkComputedConstraint = Record<string, () => void>;

package/dist/api/ChunkComponent/ChunkComputed/ChunkComputedConstraint.js

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

package/dist/api/ChunkComponent/ChunkComputed/ChunkComputedConstraint.js.map

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

package/dist/api/ChunkComponent/ChunkComputed/ChunkComputedOption.d.ts

@@ -1,10 +0,0 @@
-import type { G } from "hry-types";
-import type { Validators } from "../../../types/Validators";
-import type { ValidatorPrefix } from "../ChunkData/validatePrefix";
-import type { ChunkComputedConstraint } from "./ChunkComputedConstraint";
-export type ChunkComputedOption<TComputed extends ChunkComputedConstraint, CompareKeys extends PropertyKey, TPrefix extends string> = {
-    computed?: TComputed & Validators<[
-        G.DuplicateFieldValidator<TComputed, CompareKeys, "字段重复">,
-        ValidatorPrefix<TComputed, TPrefix>
-    ]>;
-};

package/dist/api/ChunkComponent/ChunkComputed/ChunkComputedOption.js

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

package/dist/api/ChunkComponent/ChunkComputed/ChunkComputedOption.js.map

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

package/dist/api/ChunkComponent/ChunkData/chunkDataOption.d.ts

@@ -1,9 +0,0 @@
-import type { G } from "hry-types";
-import type { Validators } from "../../../types/Validators";
-import type { ValidatorPrefix } from "./validatePrefix";
-export type ChunkDataOption<TData extends object, TDuplicateKeys extends PropertyKey, Prefix extends string> = {
-    data?: TData & Validators<[
-        G.DuplicateFieldValidator<TData, TDuplicateKeys, "字段重复">,
-        ValidatorPrefix<TData, Prefix>
-    ]>;
-};