@ceale/util 1.14.2 → 1.16.0

package/README.md

@@ -43,4 +43,10 @@
     - tryCatch()
 - `type.ts`
     - assert()
-    - defineEnum()
+    - expand()
+    - defineEnum()
+    - Enum()
+    - EnumKeys<>
+- Object.prototype
+    - hasKeys()
+    - inKeys()

package/dist/cjs/index.js

@@ -37,12 +37,14 @@ __export(exports_src, {
   sleepAsync: () => sleepAsync,
   sleep: () => sleep,
   quadraticCurve: () => quadraticCurve,
+  expand: () => expand,
   defineEnum: () => defineEnum,
   debounce: () => debounce,
   cubicCurve: () => cubicCurve,
   css: () => css,
   assert: () => assert,
   QuadraticBezier: () => QuadraticBezier,
+  Enum: () => Enum,
   CubicBezier: () => CubicBezier
 });
 module.exports = __toCommonJS(exports_src);
@@ -422,23 +424,34 @@ var tryCatch = (parameter) => {
   throw new TypeError("参数类型错误，应为 Promise 或函数");
 };
 // src/type.ts
-var assert = (variable) => {};
-var defineEnum = (...keys) => {
-  const obj = keys.reduce((acc, key) => {
-    acc[key] = key;
-    return acc;
-  }, {});
-  Object.defineProperty(obj, "keys", {
-    value: () => keys,
-    writable: false,
-    enumerable: false,
-    configurable: false
-  });
-  Object.defineProperty(obj, "includes", {
-    value: (key) => keys.includes(key),
-    writable: false,
-    enumerable: false,
-    configurable: false
-  });
-  return obj;
-};
+var assert = (variable) => variable;
+var expand = (variable) => variable;
+var defineEnum = (...keys) => keys.reduce((acc, key) => {
+  acc[key] = key;
+  return acc;
+}, {});
+var Enum = (keys) => ({
+  keys: () => Object.keys(keys),
+  includes: (key) => Object.keys(keys).includes(key)
+});
+// src/object.ts
+Object.defineProperty(Object.prototype, "hasKeys", {
+  value: function(...keys) {
+    if (keys.length === 0)
+      return false;
+    return keys.every((key) => this.hasOwnProperty(key));
+  },
+  enumerable: false,
+  writable: true,
+  configurable: true
+});
+Object.defineProperty(Object.prototype, "inKeys", {
+  value: function(...keys) {
+    if (keys.length === 0)
+      return false;
+    return keys.every((key) => (key in this));
+  },
+  enumerable: false,
+  writable: true,
+  configurable: true
+});

package/dist/esm/index.js

@@ -373,26 +373,37 @@ var tryCatch = (parameter) => {
   throw new TypeError("参数类型错误，应为 Promise 或函数");
 };
 // src/type.ts
-var assert = (variable) => {};
-var defineEnum = (...keys) => {
-  const obj = keys.reduce((acc, key) => {
-    acc[key] = key;
-    return acc;
-  }, {});
-  Object.defineProperty(obj, "keys", {
-    value: () => keys,
-    writable: false,
-    enumerable: false,
-    configurable: false
-  });
-  Object.defineProperty(obj, "includes", {
-    value: (key) => keys.includes(key),
-    writable: false,
-    enumerable: false,
-    configurable: false
-  });
-  return obj;
-};
+var assert = (variable) => variable;
+var expand = (variable) => variable;
+var defineEnum = (...keys) => keys.reduce((acc, key) => {
+  acc[key] = key;
+  return acc;
+}, {});
+var Enum = (keys) => ({
+  keys: () => Object.keys(keys),
+  includes: (key) => Object.keys(keys).includes(key)
+});
+// src/object.ts
+Object.defineProperty(Object.prototype, "hasKeys", {
+  value: function(...keys) {
+    if (keys.length === 0)
+      return false;
+    return keys.every((key) => this.hasOwnProperty(key));
+  },
+  enumerable: false,
+  writable: true,
+  configurable: true
+});
+Object.defineProperty(Object.prototype, "inKeys", {
+  value: function(...keys) {
+    if (keys.length === 0)
+      return false;
+    return keys.every((key) => (key in this));
+  },
+  enumerable: false,
+  writable: true,
+  configurable: true
+});
 export {
   waitSync,
   wait,
@@ -402,11 +413,13 @@ export {
   sleepAsync,
   sleep,
   quadraticCurve,
+  expand,
   defineEnum,
   debounce,
   cubicCurve,
   css,
   assert,
   QuadraticBezier,
+  Enum,
   CubicBezier
 };

package/dist/types/css.d.ts

@@ -1,5 +1,7 @@
-import type { CSSProperties } from "vue";
-import type { AtRules } from "csstype";
+import type { AtRules, Properties, PropertiesHyphen } from "csstype";
+export interface CSSProperties extends PropertiesHyphen<string | number>, Properties<string | number> {
+    [v: `--${string}`]: string | number | undefined;
+}
 export declare namespace css {
     type RuleValue = string & {
         RuleValue: never;

package/dist/types/index.d.ts

@@ -7,3 +7,4 @@ export * from "./task";
 export * from "./bezier";
 export * from "./error";
 export * from "./type";
+export * from "./object";

package/dist/types/object.d.ts

@@ -1,34 +1,15 @@
 declare global {
     interface Object {
-        deepAssign<T, U>(target: T, source: U, options?: DeepAssignOptions): T & U;
-        deepAssign<T, U, V>(target: T, source1: U, source2: V, options?: DeepAssignOptions): T & U & V;
-        deepAssign<T, U, V, W>(target: T, source1: U, source2: V, source3: W, options?: DeepAssignOptions): T & U & V & W;
-        deepAssign(target: any, ...sources: any[]): any;
+        /**
+         * 复数版本的`hasOwnProperty`
+         * @param keys 要检查的属性名
+         */
+        hasKeys(...keys: string[]): boolean;
+        /**
+         * 复数版本的`in`
+         * @param keys 要检查的属性名
+         */
+        inKeys(...keys: string[]): boolean;
     }
 }
-interface DeepAssignOptions {
-    /**
-     * 合并深度:
-     * - true: 无限深度
-     * - false: 浅层合并 (等同于 Object.assign)
-     * - number: 指定最大深度
-     * @default true
-     */
-    deep?: boolean | number;
-    /**
-     * 是否覆盖目标对象属性:
-     * - true: 源对象属性覆盖目标对象
-     * - false: 只合并目标对象没有的属性
-     * @default true
-     */
-    overwrite?: boolean;
-    /**
-     * 数组合并策略:
-     * - 'merge': （默认）合并数组项 (递归合并数组元素)
-     * - 'concat': 连接数组
-     * - 'replace': 替换整个数组
-     * @default 'replace'
-     */
-    arrayStrategy?: 'replace' | 'merge' | 'concat';
-}
 export {};

package/dist/types/type.d.ts

@@ -2,8 +2,16 @@
  * 就地断言一个变量为指定类型
  * @template Type 断言的类型，默认为`any`
  * @param variable 待断言的变量
+ * @returns 传入的变量，且类型已经被断言为指定类型
  */
 export declare const assert: <Type = any>(variable: any) => asserts variable is Type;
+/**
+ * 拓展一个变量的类型
+ * @param variable 待拓展的变量
+ * @param Type 拓展的类型
+ * @returns 传入的变量，且类型被拓展为指定类型
+ */
+export declare const expand: <Type>(variable: any) => asserts variable is (typeof variable & Type);
 /**
  * 定义一个枚举类型。
  * 返回一个枚举对象，其中每个键名与值相同。
@@ -17,7 +25,33 @@ export declare const assert: <Type = any>(variable: any) => asserts variable is
  *     C: "C"
  * }
  */
-export declare const defineEnum: <T extends string>(...keys: T[]) => { [K in T]: K; } & {
-    keys(): T[];
-    includes(key: any): boolean;
+export declare const defineEnum: <T extends string>(...keys: T[]) => { [K in T]: K; };
+/**
+ * 枚举工具函数，为枚举对象提供工具方法
+ * @param keys 由 defineEnum 创建的枚举对象
+ * @returns 返回一个包含`keys`、`includes`方法的对象
+ *
+ * @example
+ * const 对吗 = defineEnum("对", "不对")
+ *
+ * // 获取所有枚举键
+ * Enum(对吗).keys() // ["对", "不对"]
+ *
+ * // 检查值是否为有效枚举值
+ * Enum(对吗).includes("对") // true
+ * Enum(对吗).includes("错") // false
+ */
+export declare const Enum: (keys: Record<string, string>) => {
+    keys: () => (keyof typeof keys)[];
+    includes: (key: any) => boolean;
 };
+/**
+ * 提取枚举的所有键组成联合类型
+ * @template E 由 defineEnum 创建的枚举对象
+ * @returns 枚举键的联合类型
+ *
+ * @example
+ * const 对吗 = defineEnum("对", "不对")
+ * Enum<typeof 对吗> // "对" | "不对"
+ */
+export type EnumKeys<E> = E[keyof E];

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@ceale/util",
+  "version": "1.16.0",
+  
   "author": "Ceale",
-  "version": "1.14.2",
-  "module": "index.ts",
+  "description": "小工具集",
+  "repository": {
+    "url": "git+https://github.com/Ceale/ts-util.git"
+  },
+
+  "license": "Unlicense or CC0 or WTFPL",
+  "keywords": [ "util" ],
+
   "type": "module",
+  "module": "index.ts",
   "main": "dist/esm/index.js",
   "types": "dist/types/index.d.ts",
   "files": ["dist"],
-  "repository": {
-    "url": "git+https://github.com/Ceale/ts-util.git"
-  },
-  "scripts": {
-    "build": "bun run build:esm && bun run build:cjs && bun run build:ts",
-    "build:esm": "bun build --outdir=dist/esm/ --format=esm --target=node src/index.ts",
-    "build:cjs": "bun build --outdir=dist/cjs/ --format=cjs --target=node src/index.ts",
-    "build:ts": "tsc --project tsconfig.build.json"
-  },
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
@@ -24,14 +24,18 @@
     },
     "./package.json": "./package.json"
   },
+
+  "scripts": {
+    "build": "bun run build:esm && bun run build:cjs && bun run build:ts",
+    "build:esm": "bun build --outdir=dist/esm/ --format=esm --target=node src/index.ts",
+    "build:cjs": "bun build --outdir=dist/cjs/ --format=cjs --target=node src/index.ts",
+    "build:ts": "tsc --project tsconfig.build.json"
+  },
   "devDependencies": {
+    "typescript": "^5",
     "@types/bun": "latest"
   },
-  "peerDependencies": {
-    "typescript": "^5"
-  },
   "dependencies": {
-    "csstype": "^3.1.3",
-    "vue": "^3.5.21"
+    "csstype": "^3.1.3"
   }
 }