a-js-tools 2.0.0-alpha.0 → 2.0.1

package/{src/getRandomString.mjs → es/getRandomString.js}

@@ -1,5 +1,6 @@
 import { isPlainObject, isNumber, isNaN, isUndefined } from 'a-type-of-js';
-import { isBrowser } from './isNode.mjs';
+import { ObjectAssign } from './object/createConstructor.js';
+import { getRandomInt } from './getRandomNumber.js';
 
 /**
  * 获取随机字符串
@@ -36,9 +37,8 @@ function getRandomString(options) {
         (isPlainObject(options) &&
             (!isNumber(options.length) ||
                 options.length < 1 ||
-                !Number.isInteger(options.length)))) {
+                !Number.isInteger(options.length))))
         throw new TypeError('参数类型错误 ❌ (getRandomString)');
-    }
     const initOptions = {
         length: 32,
         chars: 'abcdefghijklmnopqrstuvwxyz',
@@ -50,40 +50,43 @@ function getRandomString(options) {
         includeSpecial: false,
     };
     /// 生成 UUID
-    if (initOptions.type === 'uuid') {
+    if (initOptions.type === 'uuid')
         return crypto.randomUUID();
-    }
-    if (isNumber(options) && Number.isInteger(options) && options > 0) {
-        // 验证输入参数
-        Object.assign(initOptions, { length: options });
-    }
+    // 验证输入参数
+    if (isNumber(options) && Number.isInteger(options) && options > 0)
+        ObjectAssign(initOptions, { length: options });
     if (isPlainObject(options)) {
-        Object.assign(initOptions, options);
+        ObjectAssign(initOptions, options);
         initOptions.length = initOptions.length < 1 ? 32 : initOptions.length;
     }
     /**  生成随机字符串  */
     const templateCharsArr = initOptions.chars.split('');
     // 添加大写字母
-    if (initOptions.includeUppercaseLetters) {
+    if (initOptions.includeUppercaseLetters)
         interleaveString(templateCharsArr, initOptions.chars.toUpperCase());
-    }
     // 添加数字
-    if (initOptions.includeNumbers) {
+    if (initOptions.includeNumbers)
         interleaveString(templateCharsArr, initOptions.chars2);
-    }
     // 添加特殊字符
-    if (initOptions.includeSpecial) {
+    if (initOptions.includeSpecial)
         interleaveString(templateCharsArr, initOptions.chars3);
-    }
-    // 使用密码学安全的随机数生成器
-    const bytes = isBrowser() && window.crypto
-        ? window.crypto.getRandomValues(new Uint8Array(initOptions.length))
-        : global.crypto.getRandomValues(new Uint8Array(initOptions.length));
+    /** 结果字符串 */
     let result = '';
-    /**  获取最后的 chars 数据  */
-    const chars = templateCharsArr.join('');
-    // 循环遍历
-    bytes.forEach(byte => (result += chars.charAt(byte % chars.length)));
+    /** 混淆后的字符串 */
+    const str = templateCharsArr.join('');
+    /** 混淆后字符长度 */
+    const strLen = str.length;
+    if (globalThis && globalThis.crypto && globalThis.crypto.getRandomValues) {
+        // 使用密码学安全的随机数生成器
+        const bytes = globalThis.crypto.getRandomValues(new Uint8Array(initOptions.length));
+        /**  获取最后的 chars 数据  */
+        // 循环遍历
+        bytes.forEach(byte => (result += str[byte % strLen]));
+    }
+    else {
+        for (let i = 0; i < initOptions.length; i++)
+            result += str[getRandomInt(strLen - 1)];
+    }
     /**
      *
      *  字符串交叉函数
@@ -110,6 +113,11 @@ function getRandomString(options) {
             }
         }
     }
+    /// 结果字符串不包含字符
+    if (!/[a-zA-Z]/.test(result))
+        return String.fromCharCode(getRandomInt(97, 122)).concat(result.slice(1));
+    while (!/^[a-zA-Z]$/.test(result[0]))
+        result = result.slice(1) + result[0];
     return result;
 }
 

package/es/index.js

@@ -0,0 +1,14 @@
+export { toLowerCamelCase, toSplitCase } from './className.js';
+export { ObjectAssign, createConstructor } from './object/createConstructor.js';
+export { getRandomFloat, getRandomInt } from './getRandomNumber.js';
+export { getRandomString } from './getRandomString.js';
+export { debounce, throttle } from './performance.js';
+export { escapeRegExp } from './regexp/escapeRegExp.js';
+export { autoEscapedRegExp } from './regexp/autoEscapedRegExp.js';
+export { isBrowser, isNode } from './isNode.js';
+export { enArr } from './array/index.js';
+export { sleep } from './sleep.js';
+export { intersection } from './array/intersection.js';
+export { union } from './array/union.js';
+export { difference } from './array/difference.js';
+export { symmetricDifference } from './array/symmetricDifference.js';

package/{src/isNode.mjs → es/isNode.js}

@@ -6,7 +6,11 @@ import { isUndefined } from 'a-type-of-js';
  *
  */
 function isNode() {
-    return !isUndefined(globalThis?.process?.versions?.node);
+    return !isUndefined((globalThis &&
+        globalThis.process &&
+        globalThis.process.versions &&
+        globalThis.process.versions.node) ||
+        undefined);
 }
 /**
  *

package/{src/object/createConstructor.mjs → es/object/createConstructor.js}

@@ -36,7 +36,20 @@
  *
  */
 function createConstructor(constructor) {
+    constructor.prototype.apply = Function.apply;
+    constructor.prototype.bind = Function.bind;
+    constructor.prototype.call = Function.call;
+    constructor.prototype.length = Function.length;
+    // constructor.prototype.arguments = Function.arguments;
+    constructor.prototype.name = Function.name;
+    constructor.prototype.toString = Function.toString;
     return constructor;
 }
+/** 对象的 assign 用法 */
+function ObjectAssign(target, bar) {
+    const keys = Object.keys(bar);
+    keys.forEach(key => (target[key] = bar[key]));
+    return target;
+}
 
-export { createConstructor };
+export { ObjectAssign, createConstructor };

package/{src/performance.mjs → es/performance.js}

@@ -1,4 +1,6 @@
-import { isFunction, isPlainObject, isUndefined, isNull } from 'a-type-of-js';
+import { isUndefined, isNull } from 'a-type-of-js';
+import { isFunction } from 'a-type-of-js/isFunction';
+import { isNumber } from 'a-type-of-js/isNumber';
 
 /**
  * 防抖和节流
@@ -11,7 +13,8 @@ import { isFunction, isPlainObject, isUndefined, isNull } from 'a-type-of-js';
  *
  * 防抖
  *
- * @param options 使用参数
+ * @param   callback 回调函数
+ * @param   options    延迟时间（毫秒），默认 200 (ms) 或包含 this 的配置
  * @returns   返回的闭包函数
  * @example
  *
@@ -24,19 +27,17 @@ import { isFunction, isPlainObject, isUndefined, isNull } from 'a-type-of-js';
  * }
  *
  */
-function debounce(options) {
-    if (isFunction(options)) {
+function debounce(callback, options = 200) {
+    if (!isFunction(callback))
+        throw new TypeError('callback must be a function');
+    if (isNumber(options))
         options = {
-            callback: options,
-            delay: 200,
+            delay: options,
             this: null,
         };
-    }
-    if (!isPlainObject(options) || !isFunction(options.callback))
-        throw new TypeError('参数类型有误');
-    if (isUndefined(options.delay))
-        options.delay = 200;
-    if (!isFinite(options.delay) || options.delay < 0)
+    if (isUndefined(options.delay) ||
+        !isFinite(options.delay) ||
+        options.delay < 0)
         // 强制转换非数值
         options.delay = 200;
     /**  定时器返回的 id  */
@@ -51,60 +52,61 @@ function debounce(options) {
         clear();
         timeoutId = setTimeout(() => {
             try {
-                Reflect.apply(options.callback, options.this ?? null, args);
+                const _this = options && options.this ? options.this : null;
+                // 由于 Reflect.apply 并不能在 ES5 中使用，所以我们并不能保证能执行成功
+                callback.apply(_this, args);
+                // Reflect.apply(callback, options?.this ?? null, args);
             }
             catch (error) {
                 console.log('Debounce callback throw an error', error);
             }
-        }, Math.max(options.delay ?? 5, 5));
-    };
-    result.cancel = () => {
-        clear();
+        }, Math.max(options.delay || 5, 5));
     };
+    result.cancel = () => clear();
     return result;
 }
 /**
  *   节流
  *
- * @param options 使用的参数值
+ * @param callback   回调函数
+ * @param options      延迟时间（毫秒），默认 200 (ms) 或设置 this
  * @returns   返回的闭包函数
  */
-function throttle(options) {
-    if (isFunction(options)) {
+function throttle(callback, options = 200) {
+    if (!isFunction(callback))
+        throw new TypeError('callback must be a function');
+    if (isNumber(options))
         options = {
-            callback: options,
-            delay: 200,
+            delay: options,
             this: null,
         };
-    }
-    if (!isPlainObject(options) || !isFunction(options.callback))
-        throw new TypeError('参数类型有误');
-    if (isUndefined(options.delay))
-        options.delay = 200;
-    if (!isFinite(options.delay) || options.delay < 0)
+    if (isUndefined(options.delay) ||
+        !isFinite(options.delay) ||
+        options.delay < 0)
         // 强制转换非数值
         options.delay = 200;
     /**  延迟控制插销   */
     let inThrottle = false;
     /**  延迟控制   */
     let timeoutId = null;
+    const delay = options && options.delay ? options.delay : 5;
     const throttled = (...args) => {
         if (inThrottle)
             return;
         try {
-            Reflect.apply(options.callback, options.this ?? null, args);
+            const _this = options && options.this ? options.this : null;
+            callback.apply(_this, args);
         }
         catch (error) {
-            console.error('Throttle callback throw an error', error);
+            console.error('Throttle 执行回调抛出问题', error);
         }
         inThrottle = true;
-        if (!isNull(timeoutId)) {
+        if (!isNull(timeoutId))
             clearTimeout(timeoutId);
-        }
         timeoutId = setTimeout(() => {
             inThrottle = false;
             timeoutId = null;
-        }, Math.max(options.delay ?? 5, 5));
+        }, Math.max(delay, 5));
     };
     throttled.cancel = () => {
         if (!isNull(timeoutId)) {

package/{src/regexp/autoEscapedRegExp.mjs → es/regexp/autoEscapedRegExp.js}

@@ -1,6 +1,6 @@
 import { isString, isUndefined } from 'a-type-of-js';
-import { escapeRegExp } from './escapeRegExp.mjs';
-import { parse } from './parse.mjs';
+import { escapeRegExp } from './escapeRegExp.js';
+import { parse } from './parse.js';
 
 /**
  *
@@ -33,14 +33,12 @@ import { parse } from './parse.mjs';
  *
  */
 function autoEscapedRegExp(pattern, options) {
-    if (!isString(pattern)) {
+    if (!isString(pattern))
         throw new TypeError('pattern must be a 字符串');
-    }
     pattern = escapeRegExp(pattern);
     /** 简单转化  */
-    if (isUndefined(options)) {
+    if (isUndefined(options))
         return new RegExp(pattern);
-    }
     options = parse(options);
     return new RegExp(`${options.start ? '^' : ''}${pattern}${options.end ? '$' : ''}`, options.flags);
 }

package/{src/regexp/parse.mjs → es/regexp/parse.js}

@@ -13,19 +13,16 @@ function parse(options) {
         };
     }
     // 处理 flags
-    if (!isString(options.flags)) {
+    if (!isString(options.flags))
         options.flags = '';
-    }
     else {
         // 需求是保留字符串中的某一部分，使用
         const regexp = /[migsuy]/g;
         const matchResult = options.flags.match(regexp);
-        if (isNull(matchResult)) {
+        if (isNull(matchResult))
             options.flags = '';
-        }
-        else {
+        else
             options.flags = [...new Set(matchResult)].join('');
-        }
     }
     return options;
 }

package/{src/sleep.mjs → es/sleep.js}

@@ -1,4 +1,4 @@
-import { isZero } from 'a-type-of-js';
+import { isZero } from 'a-type-of-js/isNumber';
 
 /**
  *

package/{src → es/src}/getRandomNumber.d.ts

@@ -2,7 +2,7 @@
  *
  * 获取一个随机的整数类型
  *
- * 您可以传入两个参数并获取它们之间的任意数字
+ * 您可以传入两个参数并获取它们之间的任意数字，返回值<span style="color:#ff0;">*会包含端值*</span>
  *
  * 如果只传递一个参数，则如果提供的值为负数，则得到一个小于（或大于）该数字的整数
  *

package/es/src/index.d.ts

@@ -0,0 +1,11 @@
+export { toLowerCamelCase, toSplitCase } from './className';
+export type { CreateConstructor } from './object/createConstructor';
+export { createConstructor, ObjectAssign } from './object/createConstructor';
+export { getRandomFloat, getRandomInt } from './getRandomNumber';
+export { getRandomString } from './getRandomString';
+export { throttle, debounce } from './performance';
+export type { DebounceAndThrottleReturnType, debounce_throttle_options, } from './performance';
+export { escapeRegExp, autoEscapedRegExp } from './regexp';
+export { isBrowser, isNode } from './isNode';
+export { intersection, enArr, union, difference, symmetricDifference, } from './array';
+export { sleep } from './sleep';

package/{src → es/src}/object/createConstructor.d.ts

@@ -45,3 +45,5 @@ export interface CreateConstructor<T, Args extends unknown[] = unknown[]> {
  *
  */
 export declare function createConstructor<T, Args extends unknown[] = unknown[]>(constructor: (...argumentList: Args) => T): CreateConstructor<T, Args>;
+/** 对象的 assign 用法 */
+export declare function ObjectAssign(target: Record<string, unknown>, bar: Record<string, unknown>): Record<string, unknown>;

package/es/src/object/index.d.ts

@@ -0,0 +1,2 @@
+export type { CreateConstructor } from './createConstructor';
+export { createConstructor } from './createConstructor';

package/es/src/performance.d.ts

@@ -0,0 +1,50 @@
+/**
+ * 防抖和节流
+ *
+ * @packageDocumentation
+ * @module @a-js-tools/performance
+ * @license MIT
+ */
+type Callback = (...args: any[]) => void;
+/**
+ *
+ * 节流和防抖返回值类型
+ *
+ */
+export interface DebounceAndThrottleReturnType<F extends Callback> {
+    (...args: Parameters<F>): void;
+    cancel(): void;
+}
+/**  第二参数  */
+export type debounce_throttle_options = {
+    delay?: number;
+    this?: null | unknown;
+} | number;
+/**
+ *
+ * 防抖
+ *
+ * @param   callback 回调函数
+ * @param   options    延迟时间（毫秒），默认 200 (ms) 或包含 this 的配置
+ * @returns   返回的闭包函数
+ * @example
+ *
+ * ```ts
+ * const debounce = (callback: Function, delay = 300) => {
+ *   let timer: any = null
+ *   return (...args: any[]) => {
+ *     clearTimeout(timer)
+ *   }
+ * }
+ *
+ */
+export declare function debounce<F extends Callback>(callback: F, options?: debounce_throttle_options): DebounceAndThrottleReturnType<F>;
+/**
+ *   节流
+ *
+ * @param callback   回调函数
+ * @param options      延迟时间（毫秒），默认 200 (ms) 或设置 this
+ * @returns   返回的闭包函数
+ */
+export declare function throttle<F extends Callback>(callback: F, options?: debounce_throttle_options): DebounceAndThrottleReturnType<F>;
+export {};

package/package.json

@@ -1,51 +1,111 @@
 {
   "type": "module",
-  "version": "2.0.0-alpha.0",
+  "version": "2.0.1",
   "name": "a-js-tools",
-  "description": "一点点 🤏  js 函数",
   "license": "MIT",
   "dependencies": {
-    "a-type-of-js": "^1.0.2"
+    "a-type-of-js": "^2.0.0"
+  },
+  "main": "cjs/index.js",
+  "module": "es/index.js",
+  "types": "es/src/index.d.ts",
+  "author": {
+    "name": "泥豆君",
+    "email": "Mr.MudBean@outlook.com",
+    "url": "https://earthnut.dev"
+  },
+  "description": "一点点 🤏  js 函数",
+  "sideEffects": false,
+  "engines": {
+    "node": ">=18.0.0"
   },
-  "main": "index.cjs",
-  "module": "index.mjs",
-  "types": "index.d.ts",
   "files": [
-    "index.mjs",
-    "index.cjs",
-    "index.d.ts",
-    "src"
+    "es",
+    "cjs",
+    "LICENSE",
+    "README.md"
   ],
   "exports": {
-    "import": "./index.mjs",
-    "require": "./index.cjs",
-    "types": "./index.d.ts"
+    ".": {
+      "import": "./es/index.js",
+      "default": "./es/index.js",
+      "require": "./cjs/index.js",
+      "types": "./es/src/index.d.ts"
+    },
+    "./array": {
+      "default": "./es/array/index.js",
+      "import": "./es/array/index.js",
+      "require": "./cjs/array/index.js",
+      "types": "./es/src/array/index.d.ts"
+    },
+    "./className": {
+      "default": "./es/className.js",
+      "import": "./es/className.js",
+      "require": "./cjs/className.js",
+      "types": "./es/src/className.d.ts"
+    },
+    "./getRandomNumber": {
+      "default": "./es/getRandomNumber.js",
+      "import": "./es/getRandomNumber.js",
+      "require": "./cjs/getRandomNumber.js",
+      "types": "./es/src/getRandomNumber.d.ts"
+    },
+    "./getRandomString": {
+      "default": "./es/getRandomString.js",
+      "import": "./es/getRandomString.js",
+      "require": "./cjs/getRandomString.js",
+      "types": "./es/src/getRandomString.d.ts"
+    },
+    "./isNode": {
+      "default": "./es/isNode.js",
+      "import": "./es/isNode.js",
+      "require": "./cjs/isNode.js",
+      "types": "./es/src/isNode.d.ts"
+    },
+    "./object": {
+      "default": "./es/object/index.js",
+      "import": "./es/object/index.js",
+      "require": "./cjs/object/index.js",
+      "types": "./es/src/object/index.d.ts"
+    },
+    "./performance": {
+      "default": "./es/performance.js",
+      "import": "./es/performance.js",
+      "require": "./cjs/performance.js",
+      "types": "./es/src/performance.d.ts"
+    },
+    "./regexp": {
+      "default": "./es/regexp/index.js",
+      "import": "./es/regexp/index.js",
+      "require": "./cjs/regexp/index.js",
+      "types": "./es/src/regexp/index.d.ts"
+    },
+    "./sleep": {
+      "default": "./es/sleep.js",
+      "import": "./es/sleep.js",
+      "require": "./cjs/sleep.js",
+      "types": "./es/src/sleep.d.ts"
+    }
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/earthnutDev/a-js-tools.git"
+    "url": "git+https://github.com/MrMudBean/a-js-tools.git"
   },
   "keywords": [
     "a-js-tools",
-    "earthnut"
+    "Mr.MudBean",
+    "earthnut",
+    "js tools"
   ],
-  "author": {
-    "name": "花生亻",
-    "email": "earthnut.dev@outlook.com",
-    "url": "https://earthnut.dev/about"
-  },
-  "homepage": "https://earthnut.dev/a-js-tools",
+  "homepage": "https://earthnut.dev/npm/a-js-tools",
   "bugs": {
-    "url": "https://github.com/earthnutDev/a-js-tools/issues",
-    "email": "earthnut.dev@outlook.com"
+    "url": "https://github.com/MrMudBean/a-js-tools/issues",
+    "email": "Mr.MudBean@outlook.com"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "engines": {
-    "node": ">=15.0.0"
-  },
   "browserslist": [
     "last 2 versions not ie <= 11"
   ]

package/index.d.ts

@@ -1,10 +0,0 @@
-import { CreateConstructor, createConstructor } from 'src/object/createConstructor';
-export { toLowerCamelCase, toSplitCase, getRandomFloat, getRandomInt, getRandomString, } from './src/index';
-export { throttle, debounce } from './src/performance';
-export type { DebounceAndThrottleReturnType, debounce_throttle_options, } from './src/performance';
-export { escapeRegExp, autoEscapedRegExp } from './src/regexp';
-export { isBrowser, isNode } from './src/isNode';
-export { intersection, enArr, union, difference, symmetricDifference, } from './src/array/';
-export { createConstructor };
-export type { CreateConstructor };
-export { sleep } from './src/sleep';

package/index.mjs

@@ -1,14 +0,0 @@
-export { createConstructor } from './src/object/createConstructor.mjs';
-export { getRandomFloat, getRandomInt } from './src/getRandomNumber.mjs';
-export { toLowerCamelCase, toSplitCase } from './src/className.mjs';
-export { getRandomString } from './src/getRandomString.mjs';
-export { debounce, throttle } from './src/performance.mjs';
-export { escapeRegExp } from './src/regexp/escapeRegExp.mjs';
-export { autoEscapedRegExp } from './src/regexp/autoEscapedRegExp.mjs';
-export { isBrowser, isNode } from './src/isNode.mjs';
-export { enArr } from './src/array/index.mjs';
-export { sleep } from './src/sleep.mjs';
-export { intersection } from './src/array/intersection.mjs';
-export { union } from './src/array/union.mjs';
-export { difference } from './src/array/difference.mjs';
-export { symmetricDifference } from './src/array/symmetricDifference.mjs';

package/src/index.d.ts

@@ -1,3 +0,0 @@
-export { getRandomInt, getRandomFloat } from './getRandomNumber';
-export { toLowerCamelCase, toSplitCase } from './className';
-export { getRandomString } from './getRandomString';

package/src/performance.d.ts

@@ -1,52 +0,0 @@
-/**
- * 防抖和节流
- *
- * @packageDocumentation
- * @module @a-js-tools/performance
- * @license MIT
- */
-type Callback = (...args: unknown[]) => void;
-/**
- *
- * 节流和防抖返回值类型
- *
- */
-export interface DebounceAndThrottleReturnType<F extends Callback> {
-    (...args: Parameters<F>): void;
-    cancel(): void;
-}
-/**  参数类型  */
-export type debounce_throttle_options<T extends (...args: unknown[]) => void> = T | {
-    /**  回调函数  */
-    callback: T;
-    /**  使用的延迟时间，缺省值为 200ms  */
-    delay?: number;
-    /**  使用的 this  */
-    this?: null | unknown;
-};
-/**
- *
- * 防抖
- *
- * @param options 使用参数
- * @returns   返回的闭包函数
- * @example
- *
- * ```ts
- * const debounce = (callback: Function, delay = 300) => {
- *   let timer: any = null
- *   return (...args: any[]) => {
- *     clearTimeout(timer)
- *   }
- * }
- *
- */
-export declare function debounce<F extends (...args: unknown[]) => void>(options: debounce_throttle_options<F>): DebounceAndThrottleReturnType<F>;
-/**
- *   节流
- *
- * @param options 使用的参数值
- * @returns   返回的闭包函数
- */
-export declare function throttle<F extends (...args: unknown[]) => void>(options: debounce_throttle_options<F>): DebounceAndThrottleReturnType<F>;
-export {};