annil 1.7.5-beta.4 → 1.7.6

package/src/types/ReplacePrefix.ts

@@ -1,5 +1,5 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { ComponentDoc } from "../api/DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../api/DefineComponent/ReturnType/ComponentType";
 // import type { ComponentDoc } from "../api/DefineComponent/CreateDoc/ComponentDoc";
 
 type _ReplacePrefix<O, TPrefix extends string> = {
@@ -11,7 +11,7 @@ type _ReplacePrefix<O, TPrefix extends string> = {
  * @param TComponentDoc - ComponentDoc
  * @returns ComponentDoc
  */
-export type ReplacePrefix<TComponentDoc extends ComponentDoc, TPrefix extends string = ""> =
+export type ReplacePrefix<TComponentDoc extends ComponentType, TPrefix extends string = ""> =
   & IfExtends<
     unknown,
     TComponentDoc["properties"],

package/src/utils/assertNonNullable.ts

@@ -3,6 +3,7 @@ import type { IfContains } from "hry-types/src/Any/IfContains";
 export function assertNonNullable<T>(
   value: IfContains<T, null | undefined, T, "参数类型必须包含 null 或 undefined">,
 ): NonNullable<T> {
+  /* istanbul ignore next  */
   if (value === null || value === undefined) {
     throw new Error(`${value} should not be null or undefined`);
   }

package/src/{api/DefineComponent/normalizeOptions/computedWatchHandle/isEqual.ts → utils/deepEqual.ts}

@@ -30,14 +30,13 @@ function isSamePattern(a: RegExp, b: RegExp) {
  * 两个函数使用toString()比较
  * 支持Date,RegExp
  */
-export function isEqual(a: unknown, b: unknown) {
+export function deepEqual(a: unknown, b: unknown) {
   // 如果两个值是原始类型或null，直接用Object.is比较
   if (a === null || b === null || typeof a !== "object" || typeof b !== "object") {
     if (typeof a !== "function" || typeof b !== "function") {
       return Object.is(a, b);
     }
   }
-
   // 如果两个值是对象类型，先判断它们的类型、构造函数和属性数量是否相同
   if (!isSameType(a, b) || a.constructor !== b.constructor || !isSameSize(a, b)) {
     return false;
@@ -67,7 +66,7 @@ export function isEqual(a: unknown, b: unknown) {
   for (const key of keysA) {
     if (keysB.includes(key)) {
       // @ts-ignore
-      if (!isEqual(a[key], b[key])) {
+      if (!deepEqual(a[key], b[key])) {
         return false;
       }
     } else {

package/dist/api/DefineComponent/ReturnType/ComponentDoc.d.ts

@@ -1,18 +0,0 @@
-type PrefixKeys = `${string}_${string}`;
-type _ComponentDoc = {
-    properties?: Record<PrefixKeys, any>;
-    customEvents?: Record<PrefixKeys, any>;
-};
-type Error = "{ properties?: Record<PrefixKeys, any>; customEvents?: Record<PrefixKeys, any>;}";
-type _Validator<O> = keyof O extends keyof _ComponentDoc ? keyof (O["properties"] & O["customEvents"]) extends PrefixKeys ? _ComponentDoc : Error : Error;
-/**
- * RootComponent Api 返回的类型
- * ```ts
- * RootComponentDoc = {
- * properties?: Record<PrefixKeys, any>;
- * customEvents?: Record<PrefixKeys, any>;
- * };
- * ```
- */
-export type ComponentDoc<O extends _Validator<O> = _ComponentDoc> = O;
-export {};

package/dist/api/DefineComponent/ReturnType/ComponentDoc.js

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

package/dist/api/DefineComponent/ReturnType/ComponentDoc.js.map

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

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/isEqual.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"isEqual.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/computedWatchHandle/isEqual.ts"],"names":[],"mappings":"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"}

package/dist/api/RootComponent/RootComponentDoc.js

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

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

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

package/dist/api/SubComponent/SubComponentDoc.js

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

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

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

package/dist/types/DocAssign.d.ts

@@ -1,10 +0,0 @@
-import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { ComputeIntersectionDeep } from "hry-types/src/Object/ComputeIntersectionDeep";
-import type { ComponentDoc } from "../api/DefineComponent/ReturnType/ComponentDoc";
-import type { GetComponentPrefix } from "./GetComponentPrefix";
-type Validator<TOriginalComponentDoc extends ComponentDoc, TExtensionDoc extends ComponentDoc, TOriginalPrefix extends PropertyKey = GetComponentPrefix<TOriginalComponentDoc>, TExtenstionPrefix extends PropertyKey = GetComponentPrefix<TExtensionDoc>, DuplicateKeys extends PropertyKey = Extract<keyof TExtensionDoc["properties"], keyof TOriginalComponentDoc["properties"]> | Extract<keyof TExtensionDoc["customEvents"], keyof TOriginalComponentDoc["customEvents"]>> = IfExtends<TOriginalPrefix, TExtenstionPrefix, IfExtends<DuplicateKeys, never, ComponentDoc, `${DuplicateKeys & string}字段重复`>, `前缀错误,应为${TOriginalPrefix & string}`>;
-/**
- * 有时组件文档内部包含一些slot或基本组件,可通过CompDocExtends泛型拓展组件文档,使得类型更安全
- */
-export type DocAssign<TOriginalComponentDoc extends ComponentDoc, TExtensionDoc extends Validator<TOriginalComponentDoc, TExtensionDoc>> = ComputeIntersectionDeep<TOriginalComponentDoc & TExtensionDoc>;
-export {};

package/dist/types/DocAssign.js

@@ -1,6 +0,0 @@
-export {};
-// type test0 = DocAssign<{ properties: { aaa_xxx: string } }, { properties: { aaa_xxx: string } }>; // => "aaa_xxx字段重复"
-// type test1 = DocAssign<{ customEvents: { aaa_xxx: string } }, { customEvents: { aaa_xxx: string } }>; // => "aaa_xxx字段重复"
-// type test2 = DocAssign<{ properties: { aaa_xxx: string } }, { properties: { ddd_xxx: string } }>; // => "前缀错误,应为aaa"
-// type test3 = DocAssign<{ customEvents: { aaa_xxx: string } }, { customEvents: { ddd_xxx: string } }>; // => "前缀错误,应为aaa"
-//# sourceMappingURL=DocAssign.js.map

package/dist/types/DocAssign.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"DocAssign.js","sourceRoot":"","sources":["../../src/types/DocAssign.ts"],"names":[],"mappings":";AA6BA,wHAAwH;AAExH,4HAA4H;AAE5H,uHAAuH;AAEvH,2HAA2H"}

package/src/types/DocAssign.ts

@@ -1,36 +0,0 @@
-import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { ComputeIntersectionDeep } from "hry-types/src/Object/ComputeIntersectionDeep";
-import type { ComponentDoc } from "../api/DefineComponent/ReturnType/ComponentDoc";
-import type { GetComponentPrefix } from "./GetComponentPrefix";
-
-type Validator<
-  TOriginalComponentDoc extends ComponentDoc,
-  TExtensionDoc extends ComponentDoc,
-  TOriginalPrefix extends PropertyKey = GetComponentPrefix<TOriginalComponentDoc>,
-  TExtenstionPrefix extends PropertyKey = GetComponentPrefix<TExtensionDoc>,
-  DuplicateKeys extends PropertyKey =
-    | Extract<keyof TExtensionDoc["properties"], keyof TOriginalComponentDoc["properties"]>
-    | Extract<keyof TExtensionDoc["customEvents"], keyof TOriginalComponentDoc["customEvents"]>,
-> = IfExtends<
-  TOriginalPrefix,
-  TExtenstionPrefix,
-  IfExtends<DuplicateKeys, never, ComponentDoc, `${DuplicateKeys & string}字段重复`>,
-  `前缀错误,应为${TOriginalPrefix & string}`
->;
-
-/**
- * 有时组件文档内部包含一些slot或基本组件,可通过CompDocExtends泛型拓展组件文档,使得类型更安全
- */
-export type DocAssign<
-  TOriginalComponentDoc extends ComponentDoc,
-  // @ts-ignore
-  TExtensionDoc extends Validator<TOriginalComponentDoc, TExtensionDoc>,
-> = ComputeIntersectionDeep<TOriginalComponentDoc & TExtensionDoc>;
-
-// type test0 = DocAssign<{ properties: { aaa_xxx: string } }, { properties: { aaa_xxx: string } }>; // => "aaa_xxx字段重复"
-
-// type test1 = DocAssign<{ customEvents: { aaa_xxx: string } }, { customEvents: { aaa_xxx: string } }>; // => "aaa_xxx字段重复"
-
-// type test2 = DocAssign<{ properties: { aaa_xxx: string } }, { properties: { ddd_xxx: string } }>; // => "前缀错误,应为aaa"
-
-// type test3 = DocAssign<{ customEvents: { aaa_xxx: string } }, { customEvents: { ddd_xxx: string } }>; // => "前缀错误,应为aaa"

package/tsconfig.json

@@ -1,23 +0,0 @@
-{
-  "compilerOptions": {
-    "lib": ["ES2022", "DOM"], // jest中用到了DOM类型
-    "target": "ES2017",
-    "module": "ES2022",
-    "moduleResolution": "Node",
-    "skipLibCheck": true, // 跳过声明文件的类型检查(.d.ts),你引用的依然会检查, 默认false(不跳过)。
-    "esModuleInterop": true, // 默认false. 兼容非ES模块引用的写法(如 import fs from 'fs').
-    "allowSyntheticDefaultImports": true, // 默认false. 允许从没有设置默认导出的模块中默认导入。
-    "strict": true,
-    "noEmit": true, // 不生成输出文件。
-    // "resolveJsonModule": true, // 允许导入json模块。
-    // "experimentalDecorators": true, // 启用装饰器,如@observable 小程序当前还不支持
-    "strictFunctionTypes": false, // e: Dataset<{ id: string }>会报错。
-    "forceConsistentCasingInFileNames": true,
-    "exactOptionalPropertyTypes": true, // 带有?标志的属性类型不在包含undefined类型
-    "noImplicitReturns": true, // 当启用时,TypeScript会检查函数中的所有代码路径，以确保它们返回值
-    "isolatedModules": true, // 模块化(.ts文件必须有导入或导出) 默认false
-    // "verbatimModuleSyntax": true, // 5.0后新增配置,替代preserveValueImports。
-    "types": ["hry-types", "mobx", "jest", "miniprogram-api-typings"]
-  },
-  "include": ["**/*.ts"]
-}