@dune2/tools 1.1.3 → 1.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dune2/tools",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "",
   "keywords": [
     "i18n"

package/src/factory/fieldsMap.tsx

@@ -29,11 +29,6 @@ export const fieldsMap: any =
         },
       );
 
-type DeepKeys<T> =
-  T extends Record<string, any>
-    ? { [K in keyof T]: K | DeepKeys<T[K]> }[keyof T]
-    : never;
-
 /**
  * FieldsMap 会将对象的所有键（包括嵌套对象中的键）拍平为单层结构，
  * 并将每个键映射为自身的字符串字面量类型。
@@ -48,12 +43,15 @@ type UnionToIntersection<U> = (U extends any ? (x: U) => void : never) extends (
   ? I
   : never;
 
-// 递归收集各层属性（保留原属性引用），数组下钻元素，忽略 undefined/null
-type Pieces<T> = T extends readonly (infer U)[]
-  ? Pieces<U>
-  : T extends object
-    ? {
-        // 保留原属性引用 + 下钻
-        [K in keyof T]-?: Pick<T, K> & Pieces<T[K]>;
-      }[keyof T]
-    : {};
+// 递归收集各层属性（保留原属性引用），数组下钻元素，忽略 undefined/null，遇到循环则停止
+type Pieces<T, Seen extends readonly unknown[] = []> = T extends Seen[number]
+  ? // 已经走过这一层，避免循环
+    {}
+  : T extends readonly (infer U)[]
+    ? Pieces<U, Seen>
+    : T extends object
+      ? {
+          // 保留原属性引用 + 下钻
+          [K in keyof T]-?: Pick<T, K> & Pieces<T[K], [...Seen, T]>;
+        }[keyof T]
+      : {};

package/src/numbro/index.ts

@@ -255,6 +255,41 @@ export class Numbro {
     return numbro(r);
   }
 
+  /**
+   * 判断当前数是否大于 other
+   */
+  gt(other: OperationParams): boolean {
+    return this.bigNumber.isGreaterThan(this.castToBigNumber(other));
+  }
+
+  /**
+   * 判断当前数是否大于等于 other
+   */
+  gte(other: OperationParams): boolean {
+    return this.bigNumber.isGreaterThanOrEqualTo(this.castToBigNumber(other));
+  }
+
+  /**
+   * 判断当前数是否小于 other
+   */
+  lt(other: OperationParams): boolean {
+    return this.bigNumber.isLessThan(this.castToBigNumber(other));
+  }
+
+  /**
+   * 判断当前数是否小于等于 other
+   */
+  lte(other: OperationParams): boolean {
+    return this.bigNumber.isLessThanOrEqualTo(this.castToBigNumber(other));
+  }
+
+  /**
+   * 判断当前数是否等于 other
+   */
+  eq(other: OperationParams): boolean {
+    return this.bigNumber.isEqualTo(this.castToBigNumber(other));
+  }
+
   /**
    * 两个数相除
    * @see https://mikemcl.github.io/bignumber.js/#dividedBy