annil 1.17.0 → 1.18.0

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

@@ -1,87 +0,0 @@
-import { Checking, type Test } from "hry-types";
-import type { ComponentDoc } from "../../../DefineComponent/returnType/ComponentDoc";
-
-import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
-import type { IInjectAllData } from "../../../InstanceInject/instanceConfig";
-import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
-import type { RootComponentDefinition } from "../../../RootComponent/returnType";
-import { SubComponent } from "../..";
-
-type RootDoc = RootComponentDefinition<{
-  properties: {
-    Pstr: string;
-    Pobj: Mock_User | null;
-    PoptionalObj?: Mock_User;
-  };
-  data: {
-    Dnum: number;
-  };
-  computed: {
-    Cnum: number;
-  };
-  methods: {
-    RootM: () => number;
-  };
-  customEvents: {
-    RootCus: string;
-  };
-  events: {
-    RootE1: () => string;
-  };
-}>;
-
-type CompDoc = ComponentDoc<{
-  properties: {
-    aaa_str: string;
-  };
-  events: {
-    aaa_num: number;
-  };
-}>;
-
-SubComponent<RootDoc, CompDoc>()({
-  data: {
-    aaa_str: "str" as string,
-  },
-  computed: {},
-  methods: {
-    aaa_SubM() {
-      void 0;
-    },
-  },
-  events: {
-    aaa_num() {
-      void 0;
-    },
-  },
-  lifetimes: {
-    created() {
-      // this.data
-      void Checking<
-        typeof this.data,
-        ComputeIntersection<
-          {
-            // RootData
-            Pstr: string;
-            Pobj: Mock_User | null;
-            PoptionalObj: Mock_User;
-            Dnum: number;
-            Cnum: number;
-            // 自身Data类型与CompDoc类型相同
-            aaa_str: string;
-          } & IInjectAllData
-        >,
-        Test.Pass
-      >;
-
-      // this.Methods 可调用自身和RootDoc中的methods方法,其他不可以
-      void Checking<typeof this.RootM, () => number, Test.Pass>;
-
-      void Checking<typeof this.RootCus, (detail: string) => void, Test.Pass>;
-
-      void Checking<typeof this.aaa_SubM, () => void, Test.Pass>;
-
-      // 其他官方字段 ...
-    },
-  },
-});

package/src/api/SubComponent/SubLifetimes/SubLifetimesOption.ts

@@ -1,3 +0,0 @@
-import type { LifetimesOption } from "../../RootComponent/Lifetimes/LifetimesOption";
-
-export type SubLifetimesOption = LifetimesOption;

package/src/api/SubComponent/SubMethods/SubMethodsConstraint.ts

@@ -1,3 +0,0 @@
-import type { Func } from "hry-types/src/Misc/Func";
-
-export type SubMethodsConstraint = Record<string, Func>;

package/src/api/SubComponent/SubMethods/SubMethodsOption.ts

@@ -1,17 +0,0 @@
-import type { G } from "hry-types";
-
-import type { SubMethodsConstraint } from "./SubMethodsConstraint";
-
-export type SubMethodsOption<
-  TMethods extends SubMethodsConstraint,
-  TPrefix extends string,
-  ExcludedKeys extends PropertyKey,
-> = {
-  /**
-   * 前缀检测和重复检测(与events和组件customEvents字段)
-   */
-  methods?:
-    & TMethods
-    & G.KeyValidator<TMethods, `${TPrefix}_${string}`>
-    & G.DuplicateFieldValidator<TMethods, ExcludedKeys>;
-};

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

@@ -1,51 +0,0 @@
-import type { ComponentDoc } from "../../../DefineComponent/returnType/ComponentDoc";
-import type { Bubbles } from "../../../RootComponent/CustomEvents/CustomEventsTag";
-import type { RootComponentDefinition } from "../../../RootComponent/returnType";
-import { SubComponent } from "../..";
-
-type RootDoc = RootComponentDefinition<{
-  methods: {
-    Mstr: () => string;
-  };
-  events: {
-    Estr: () => string;
-  };
-  customEvents: {
-    Cstr: string;
-  };
-}>;
-
-type CompDoc = ComponentDoc<{
-  events: {
-    aaa_str: string | Bubbles;
-  };
-}>;
-
-// 1 前缀错误
-SubComponent<RootDoc, CompDoc>()({
-  methods: {
-    // @ts-expect-error 1.1 前缀错误
-    xxx_yyy() {
-      void 0;
-    },
-  },
-});
-
-// 2 重复检测
-SubComponent<RootDoc, CompDoc>()({
-  events: {
-    aaa_str_catch() {
-      void 0;
-    },
-  },
-  methods: {
-    // @ts-expect-error 2.1 与组件自定义事件字段重复
-    aaa_str() {
-      void 0;
-    },
-    // @ts-expect-error 2.2 与events字段重复
-    aaa_str_catch() {
-      void 0;
-    },
-  },
-});

package/src/api/SubComponent/SubMethods/test/normarl.test.ts

@@ -1,33 +0,0 @@
-import type { ComponentDoc } from "../../../DefineComponent/returnType/ComponentDoc";
-import type { RootComponentDefinition } from "../../../RootComponent/returnType";
-import { SubComponent } from "../..";
-
-type RootDoc = RootComponentDefinition<{
-  methods: {
-    Mstr: () => string;
-  };
-}>;
-
-type CompDoc = ComponentDoc<{
-  events: {
-    aaa_str: string;
-  };
-}>;
-
-// methods字段同组件前缀
-SubComponent<RootDoc, CompDoc>()({
-  methods: {
-    aaa_xxx() {
-      void 0;
-    },
-    aaa_yyy() {
-      void 0;
-    },
-    // ...
-  },
-});
-
-// 2 默认可以为{}。
-SubComponent<RootDoc, CompDoc>()({
-  methods: {},
-});

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

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

package/src/api/SubComponent/SubPageLifetimes/SubPageLifetimesOption.ts

@@ -1,6 +0,0 @@
-import type { PageLifetimesOption } from "../../RootComponent/PageLifetimes/PageLifetimesOption";
-
-export type SubPageLifetimesOption<TIsPage extends boolean, PropertiesDoc extends object> = PageLifetimesOption<
-  TIsPage,
-  PropertiesDoc
->;

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

@@ -1 +0,0 @@
-// 同 RootComponent的PageLifetimes

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

@@ -1 +0,0 @@
-// 同 RootComponent的PageLifetimes

package/src/api/SubComponent/SubReturnType/CreateSubComponentDoc.ts

@@ -1,41 +0,0 @@
-import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
-import type { ComputeIntersection, Select } from "hry-types/src/Object/_api";
-import type { ComputeObject } from "../../../types/ComputeObject";
-import type { RemovePrefix } from "../../../types/RemovePrefix";
-import type { Composed } from "../../RootComponent/CustomEvents/CustomEventsTag";
-
-type SelectStopEvents<T extends object> = {
-  [k in keyof T as k extends `${infer R}_catch` ? R : never]: unknown;
-};
-
-type GetComposedEvents<
-  TCustomEventsDoc extends object,
-> = Select<
-  TCustomEventsDoc,
-  Composed,
-  "contains->"
->;
-
-export type CreatSubComponentDoc<
-  ComponentCustomEvents extends object,
-  EventsDoc extends object,
-  // allDatas extends object,
-  // SubMethods extends object,
-  ComposedEvents extends object = ComputeObject<
-    RemovePrefix<
-      Omit<
-        GetComposedEvents<ComponentCustomEvents>,
-        keyof SelectStopEvents<EventsDoc>
-      >
-    >
-  >,
-  CustomCompDoc = ComputeIntersection<
-    // 1. 从原始组件文档中排除子组件文档中的事件
-    IfExtends<EmptyObject, ComposedEvents, {}, { composedEvents: ComposedEvents }>
-  >, // & IfExtends<EmptyObject, SubMethods, {}, { methods: SubMethods }>
-> // & IfExtends<EmptyObject, allDatas, {}, { allDatas: allDatas }>
- =
-  // SubComponent中计算属性字段函数若不写返回类型,可能会造成结果中没有计算属性字段类型,若没有其他字段,结果就为'{}',如果加入到DefineComponent的subComponents字段中会引起本来应该报错的组件(例如:'aaa组件缺少xxx必传字段')不报错。所以这里把结果为{}的情况替换为never。可以让组件类型为字符串时报错。
-  // & IfExtends<EmptyObject, SubEventsDoc, {}, { events: SubEventsDoc }>
-  IfExtends<EmptyObject, CustomCompDoc, never, CustomCompDoc>;

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

@@ -1,18 +0,0 @@
-import { Checking, type Test } from "hry-types";
-import type { ComponentDoc } from "../../../DefineComponent/returnType/ComponentDoc";
-import { SubComponent } from "../..";
-
-type CompDoc = ComponentDoc<{
-  properties: {
-    aaa_str: string;
-    aaa_bool: boolean;
-    aaa_num?: number;
-  };
-}>;
-
-const SubDoc = SubComponent<{}, CompDoc>()({});
-void SubDoc;
-// 返回穿透的自定义事件, 并去除了前缀
-type SubDocExpect = "缺少必传的字段aaa_str、aaa_bool";
-
-Checking<typeof SubDoc, SubDocExpect, Test.Pass>();

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

@@ -1,98 +0,0 @@
-/* eslint-disable @typescript-eslint/no-empty-function */
-import { Checking, type Test } from "hry-types";
-import type { ComponentDoc } from "../../../DefineComponent/returnType/ComponentDoc";
-import type {
-  Bubbles,
-  BubblesCaptureComposed,
-  BubblesComposed,
-  Capture,
-  CaptureComposed,
-} from "../../../RootComponent/CustomEvents/CustomEventsTag";
-import { SubComponent } from "../..";
-
-type CompDoc = ComponentDoc<{
-  properties: {
-    aaa_str: string;
-  };
-  events: {
-    aaa_num: number;
-    aaa_bubbles: number | Bubbles;
-    aaa_bubblesComposed: number | BubblesComposed;
-    aaa_captrue: number | Capture;
-    aaa_captrueComposed: number | CaptureComposed;
-    aaa_bubblesCaptrueComposed: number | BubblesCaptureComposed;
-  };
-}>;
-
-const SubDoc = SubComponent<{}, CompDoc>()({
-  data: {
-    aaa_str: "string",
-  },
-});
-void SubDoc;
-// 返回穿透的自定义事件,并去除了前缀
-type SubDocExpect = {
-  composedEvents: {
-    bubblesComposed: number | BubblesComposed;
-    captrueComposed: number | CaptureComposed;
-    bubblesCaptrueComposed: number | BubblesCaptureComposed;
-  };
-  // allDatas: {
-  //   aaa_str: "string";
-  // };
-};
-
-Checking<typeof SubDoc, SubDocExpect, Test.Pass>();
-// 去除已经声明的穿透事件
-const removeCatchedEvents = SubComponent<{}, CompDoc>()({
-  data: {
-    aaa_str: "string",
-  },
-  events: {
-    aaa_bubblesCaptrueComposed_catch() {
-    },
-    aaa_bubblesComposed_catch() {
-    },
-    aaa_captrueComposed_catch() {
-    },
-  },
-});
-void removeCatchedEvents;
-// 返回穿透的自定义事件,并去除了前缀
-// type RemoveSubDoc = {
-//   allDatas: {
-//     aaa_str: "string";
-//   };
-//   events: {
-//     aaa_bubblesCaptrueComposed_catch(): void;
-//     aaa_bubblesComposed_catch(): void;
-//     aaa_captrueComposed_catch(): void;
-//   };
-// };
-
-Checking<typeof removeCatchedEvents, never, Test.Pass>();
-// 去除有后缀时,已经声明的穿透事件
-const removeCatchedEventsOfSuffix = SubComponent<{}, CompDoc, "aa">()({
-  data: {
-    aaaAa_str: "string",
-  },
-  events: {
-    aaaAa_bubblesCaptrueComposed_catch() {},
-    aaaAa_bubblesComposed_catch() {},
-    aaaAa_captrueComposed_catch() {},
-  },
-});
-void removeCatchedEventsOfSuffix;
-// 返回穿透的自定义事件,并去除了前缀
-// type RemoveCatchedEventsOfSuffix = {
-//   allDatas: {
-//     aaaAa_str: "string";
-//   };
-//   events: {
-//     aaaAa_bubblesCaptrueComposed_catch(): void;
-//     aaaAa_bubblesComposed_catch(): void;
-//     aaaAa_captrueComposed_catch(): void;
-//   };
-// };
-
-Checking<typeof removeCatchedEventsOfSuffix, never, Test.Pass>();

package/src/api/SubComponent/SubStore/SubStoreConstraint.ts

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

package/src/api/SubComponent/SubStore/SubStoreOption.ts

@@ -1,32 +0,0 @@
-import type { G } from "hry-types";
-import type { Validators } from "../../../types/Validators";
-
-export type SubStoreOption<TStore extends object, legalKeys extends PropertyKey> = {
-  /**
-   * 全局响应式数据字段,全局store对应数据变化实例对应数据自动setData。
-   * 约束为组件properties字段去除inherit和data的剩余字段和内部字段
-   * 有非法字段(除了约束字段外的字段)检测
-   * @example
-   * ```ts
-   * {
-   *   //...
-   *   store: {
-   *     aaa_str: () => sroreX.str,
-   *   },
-   * }
-   * ```
-   */
-  store?:
-    & TStore
-    & Validators<
-      [
-        G.IllegalFieldValidator<
-          TStore,
-          legalKeys,
-          0,
-          "",
-          "与inherit和data字段重复或前缀错误"
-        >,
-      ]
-    >;
-};

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

@@ -1,60 +0,0 @@
-import { observable } from "mobx";
-
-import type { ComponentDoc } from "../../../DefineComponent/returnType/ComponentDoc";
-import { SubComponent } from "../..";
-const user = observable({
-  name: "zhao",
-  age: 20,
-});
-
-type DocA = ComponentDoc<{
-  properties: {
-    aaa_str: string;
-    aaa_num: number;
-  };
-}>;
-
-SubComponent<{
-  properties: {
-    str: string;
-  };
-}, DocA>()({
-  inherit: {
-    aaa_str: "str",
-  },
-  data: {
-    aaa_num: 20,
-    _aaa_xxx: 30,
-  },
-  store: {
-    // @ts-expect-error 1 与 inherit 字段重复
-    aaa_str: () => user.name,
-    // @ts-expect-error 2 与 data 字段重复
-    aaa_num: () => user.age,
-    // @ts-expect-error 3 超出约束字段
-    nu1m: () => user.age,
-    // @ts-expect-error 4 与data的内部字段重复
-    _aaa_xxx: () => user.age,
-  },
-});
-SubComponent<{
-  properties: {
-    aaa_num: number;
-  };
-}, DocA>()({
-  store: {
-    // @ts-expect-error 与 root 的 properties 字段重复
-    aaa_num: () => 123,
-  },
-});
-// 类型约束错误
-SubComponent<{
-  properties: {
-    aaa_num: number;
-  };
-}, DocA>()({
-  store: {
-    // @ts-expect-error 返回类型错误
-    aaa_num: () => "str",
-  },
-});

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

@@ -1,43 +0,0 @@
-import { observable } from "mobx";
-
-import type { ComponentDoc } from "../../../DefineComponent/returnType/ComponentDoc";
-import { SubComponent } from "../..";
-const user = observable({
-  name: "zhao",
-  age: 20,
-  isReady: false,
-});
-
-type DocA = ComponentDoc<{
-  properties: {
-    aaa_str: string;
-    aaa_num: number;
-  };
-}>;
-
-SubComponent<{}, DocA>()({
-  store: {
-    // 1 可写文档字段
-    aaa_str: () => user.name,
-    aaa_num: () => user.age,
-  },
-});
-
-SubComponent<{}, DocA, "a">()({
-  store: {
-    // 2 可写内部字段
-    _aaaA_xxx: () => user.age,
-  },
-});
-// store中可写 额外字段 isReady
-SubComponent<{ data: { _num: number } }, DocA, "a">()({
-  store: {
-    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

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

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

@@ -1,90 +0,0 @@
-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 { SubComponent } from "../..";
-
-type RootDoc = RootComponentDefinition<{
-  properties: {
-    obj: Mock_User | null;
-  };
-  data: {
-    num: number;
-  };
-  store: {
-    bool: boolean;
-  };
-}>;
-
-type CompDoc = ComponentDoc<{
-  properties: {
-    aaa_obj: Mock_User | null;
-    aaa_str: string;
-    aaa_num: number;
-    aaa_bool: boolean;
-  };
-}>;
-
-/**
- *  watch computed字段时需要手写类型,可悬停鼠标到key查看类型
- */
-SubComponent<RootDoc, CompDoc>()({
-  computed: {
-    aaa_str(): string {
-      return this.data.aaa_num.toString();
-    },
-    aaa_num(): number {
-      return 123;
-    },
-    aaa_bool(): boolean {
-      return this.data.bool;
-    },
-    aaa_obj(): Mock_User {
-      return {} as Mock_User;
-    },
-  },
-  watch: {
-    aaa_num(newValue: number, oldValue: number) {
-      void oldValue;
-      Checking<number, typeof newValue, Test.Pass>();
-
-      Checking<number, typeof oldValue, Test.Pass>();
-    },
-    aaa_str(newValue: string, oldValue: string) {
-      void oldValue;
-      Checking<string, typeof newValue, Test.Pass>();
-
-      Checking<string, typeof oldValue, Test.Pass>();
-    },
-    aaa_bool(newValue: boolean, oldValue: boolean) {
-      void oldValue;
-      Checking<boolean, typeof newValue, Test.Pass>();
-
-      Checking<boolean, typeof oldValue, Test.Pass>();
-    },
-    aaa_obj(newValue: Mock_User, oldValue: Mock_User | null) {
-      void oldValue;
-      Checking<Mock_User, typeof newValue, Test.Pass>();
-
-      Checking<Mock_User | null, typeof oldValue, Test.Pass>();
-    },
-    "aaa_obj.**"(newValue: Mock_User, oldValue: Mock_User | null) {
-      void oldValue;
-      Checking<Mock_User, typeof newValue, Test.Pass>();
-
-      Checking<Mock_User | null, typeof oldValue, Test.Pass>();
-    },
-    "aaa_obj.id"(newValue: string, oldValue: string) {
-      void oldValue;
-      Checking<string, typeof newValue, Test.Pass>();
-
-      Checking<string, typeof oldValue, Test.Pass>();
-    },
-    "aaa_obj.age"(newValue: number, oldValue: number) {
-      void oldValue;
-      Checking<number, typeof newValue, Test.Pass>();
-
-      Checking<number, typeof oldValue, Test.Pass>();
-    },
-  },
-});