@hairy/utils 0.6.8 → 0.6.10

package/dist/index.cjs

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,27 +15,19 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
+  Deferred: () => Deferred,
   UA: () => UA,
   arange: () => arange,
-  atWillToSize: () => atWillToSize,
-  atWillToUnit: () => atWillToUnit,
   compose: () => compose,
-  createDeferred: () => createDeferred,
-  delay: () => import_delay.default,
+  delay: () => delay,
   formDataToObject: () => formDataToObject,
+  formatSize: () => formatSize,
+  formatUnit: () => formatUnit,
   getTypeof: () => getTypeof,
   isAndroid: () => isAndroid,
   isBrowser: () => isBrowser,
@@ -50,15 +40,22 @@ __export(src_exports, {
   isIE9: () => isIE9,
   isIOS: () => isIOS,
   isMobile: () => isMobile,
+  isNumber: () => isNumber,
   isObject: () => isObject,
   isPhantomJS: () => isPhantomJS,
+  isPlainObject: () => isPlainObject,
+  isString: () => isString,
   isTypeof: () => isTypeof,
   isWeex: () => isWeex,
   isWindow: () => isWindow,
+  loop: () => loop,
+  noop: () => noop,
   objectToFormData: () => objectToFormData,
   pPipe: () => pPipe,
   pipe: () => pipe,
-  weexPlatform: () => weexPlatform
+  riposte: () => riposte,
+  weexPlatform: () => weexPlatform,
+  whenever: () => whenever
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -77,9 +74,14 @@ var isChrome = () => UA() && /chrome\/\d+/.test(UA()) && !isEdge();
 var isPhantomJS = () => UA() && /phantomjs/.test(UA());
 var isFF = () => typeof UA() === "string" && UA().match(/firefox\/(\d+)/);
 var isMobile = () => isBrowser() && navigator.userAgent.toLowerCase().includes("mobile");
+var isObject = (value) => typeof value === "object" && !Array.isArray(value);
+var isNumber = (value) => typeof value === "number";
+var isString = (value) => typeof value === "string";
+var isPlainObject = (value) => typeof value === "object" && value !== null && value.constructor === Object;
+var isFormData = (value) => isObject(value) && isBrowser() && value instanceof FormData;
+var isWindow = (value) => typeof window !== "undefined" && toString.call(value) === "[object Window]";
 
 // src/lang/index.ts
-var import_isObject = __toESM(require("lodash/isObject"));
 function formDataToObject(formData) {
   return Object.fromEntries(formData.entries());
 }
@@ -89,32 +91,22 @@ function objectToFormData(object) {
     formData.append(key, value);
   return formData;
 }
-function isFormData(value) {
-  return isObject(value) && isBrowser() && value instanceof FormData;
-}
-function isWindow(value) {
-  return typeof window !== "undefined" && toString.call(value) === "[object Window]";
-}
-function isObject(value) {
-  return (0, import_isObject.default)(value) && !Array.isArray(value);
-}
 
 // src/size/index.ts
-var import_isNumber = __toESM(require("lodash/isNumber"));
-var import_isString = __toESM(require("lodash/isString"));
-function atWillToUnit(value, unit = "px") {
-  if (!((0, import_isString.default)(value) || (0, import_isNumber.default)(value)))
+function formatUnit(value, unit = "px") {
+  if (!(isString(value) || isNumber(value)))
     return "";
-  return (0, import_isString.default)(value) && /\D/g.test(value) ? value : value + unit;
+  value = String(value);
+  return /\D/g.test(value) ? value : value + unit;
 }
-function atWillToSize(size, unit) {
-  const _atWillToUnit = (value) => atWillToUnit(value, unit);
-  if (typeof size === "string" || typeof size === "number")
-    return { width: _atWillToUnit(size), height: _atWillToUnit(size) };
-  if (Array.isArray(size))
-    return { width: _atWillToUnit(size[0]), height: _atWillToUnit(size[1]) };
-  if (typeof size === "object")
-    return { width: _atWillToUnit(size.width), height: _atWillToUnit(size.height) };
+function formatSize(dimension, unit) {
+  const _formatUnit = (value) => formatUnit(value, unit);
+  if (typeof dimension === "string" || typeof dimension === "number")
+    return { width: _formatUnit(dimension), height: _formatUnit(dimension) };
+  if (Array.isArray(dimension))
+    return { width: _formatUnit(dimension[0]), height: _formatUnit(dimension[1]) };
+  if (typeof dimension === "object")
+    return { width: _formatUnit(dimension.width), height: _formatUnit(dimension.height) };
   return { width: "", height: "" };
 }
 
@@ -127,24 +119,45 @@ function isTypeof(target, type) {
   return getTypeof(target) === type;
 }
 
-// ../../node_modules/.pnpm/p-pipe@4.0.0/node_modules/p-pipe/index.js
-function pPipe(...functions) {
-  if (functions.length === 0) {
-    throw new Error("Expected at least one argument");
+// src/util/deferred.ts
+var Deferred = class extends Promise {
+  constructor() {
+    let _resolve, _reject;
+    super((resolve_, reject_) => {
+      _resolve = resolve_;
+      _reject = reject_;
+    });
+    this.resolve = (value) => {
+      _resolve(value);
+      return this;
+    };
+    this.reject = (reason) => {
+      _reject(reason);
+      return this;
+    };
   }
+};
+
+// src/util/pipe.ts
+var pPipe = (...functions) => {
+  if (functions.length === 0)
+    throw new Error("Expected at least one argument");
   return async (input) => {
     let currentValue = input;
-    for (const function_ of functions) {
+    for (const function_ of functions)
       currentValue = await function_(currentValue);
-    }
     return currentValue;
   };
-}
-
-// src/util/index.ts
-var import_delay = __toESM(require("delay"));
+};
 var pipe = (...fns) => fns.reduce((v, f) => f(v));
 var compose = (...fns) => fns.reduceRight((v, f) => f(v));
+
+// src/util/util.ts
+function noop() {
+}
+function delay(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
 function arange(x1, x2, stp = 1, z = [], z0 = z.length) {
   if (!x2)
     x1 -= x2 = x1;
@@ -152,29 +165,33 @@ function arange(x1, x2, stp = 1, z = [], z0 = z.length) {
     z[z0++] = x1;
   return z;
 }
-function createDeferred() {
-  let resolve, reject;
-  const promise = new Promise((_resolve, _reject) => {
-    resolve = _resolve;
-    reject = _reject;
-  });
-  promise.resolve = (v) => {
-    resolve(v);
-    return promise;
-  };
-  promise.reject = reject;
-  return promise;
+function whenever(value, callback) {
+  return value ? callback(value) : void 0;
+}
+function loop(fn) {
+  async function next(ms) {
+    await delay(ms);
+    return fn(next);
+  }
+  return fn(next);
+}
+function riposte(...args) {
+  for (const [cond, value] of args) {
+    if (cond)
+      return value;
+  }
+  return void 0;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  Deferred,
   UA,
   arange,
-  atWillToSize,
-  atWillToUnit,
   compose,
-  createDeferred,
   delay,
   formDataToObject,
+  formatSize,
+  formatUnit,
   getTypeof,
   isAndroid,
   isBrowser,
@@ -187,13 +204,20 @@ function createDeferred() {
   isIE9,
   isIOS,
   isMobile,
+  isNumber,
   isObject,
   isPhantomJS,
+  isPlainObject,
+  isString,
   isTypeof,
   isWeex,
   isWindow,
+  loop,
+  noop,
   objectToFormData,
   pPipe,
   pipe,
-  weexPlatform
+  riposte,
+  weexPlatform,
+  whenever
 });

package/dist/index.d.ts

@@ -1,5 +1,4 @@
-export { default as pPipe } from 'p-pipe';
-export { default as delay } from 'delay';
+import _pPipe from 'p-pipe';
 
 declare const isBrowser: () => boolean;
 declare const isWeex: () => boolean;
@@ -14,7 +13,13 @@ declare const isIOS: () => boolean;
 declare const isChrome: () => boolean | "";
 declare const isPhantomJS: () => boolean | "";
 declare const isFF: () => false | RegExpMatchArray | null;
-declare const isMobile: () => boolean;
+declare const isMobile: () => boolean;
+declare const isObject: (value: any) => value is object;
+declare const isNumber: (value: any) => boolean;
+declare const isString: (value: any) => boolean;
+declare const isPlainObject: (value: any) => boolean;
+declare const isFormData: (value: any) => value is FormData;
+declare const isWindow: (value: any) => value is Window;
 
 /**
  * 将 formData 转换为 object
@@ -25,17 +30,14 @@ declare function formDataToObject(formData: FormData): Record<string, string>;
  * 将 object 转换为 formData
  * @param object
  */
-declare function objectToFormData(object: Record<string, string | File>): FormData;
-declare function isFormData(value: any): value is FormData;
-declare function isWindow(value: any): value is Window;
-declare function isObject(value: any): value is object;
+declare function objectToFormData(object: Record<string, string | File>): FormData;
 
-type AtwillNumber = string | number;
-type AtwillObject = {
+type Numeric = string | number | bigint;
+type DynamicObject = {
     [key: string]: any;
 };
-type AtwillNumberObject = {
-    [key: string]: AtwillNumber;
+type NumericObject = {
+    [key: string]: Numeric;
 };
 type StringObject = {
     [key: string]: string;
@@ -68,27 +70,20 @@ type Arrayable<T> = T | T[];
 type Option<L extends Key = 'label', V extends Key = 'value', C extends Key = 'children'> = {
     [P in L]?: string;
 } & {
-    [P in V]?: AtwillNumber;
+    [P in V]?: Numeric;
 } & {
     [P in C]?: Option<L, V, C>[];
 };
 
-declare function atWillToUnit(value: AtwillNumber, unit?: string): string;
-/** size 转换配置 */
-type AtWillSize = AtwillNumber | [AtwillNumber, AtwillNumber] | {
-    width: AtwillNumber;
-    height: AtwillNumber;
+declare function formatUnit(value: Numeric, unit?: string): string;
+type Dimension = Numeric | [Numeric, Numeric] | {
+    width: Numeric;
+    height: Numeric;
 };
-interface Size {
+declare function formatSize(dimension: Dimension, unit?: string): {
     width: string;
     height: string;
-}
-/**
- * 将 size 转换为宽高，用于元素宽高
- * @param size AtWillSize
- * @returns
- */
-declare function atWillToSize(size: AtWillSize, unit?: string): Size;
+};
 
 type TypeofType = 'string' | 'number' | 'bigint' | 'boolean' | 'symbol' | 'undefined' | 'object' | 'function' | 'null' | 'regexp';
 /**
@@ -105,17 +100,21 @@ declare function getTypeof(target: any): TypeofType;
  */
 declare function isTypeof(target: any, type: TypeofType): boolean;
 
+declare class Deferred<T> extends Promise<T> {
+    resolve: (value: T) => Deferred<T>;
+    reject: (reason?: any) => Deferred<T>;
+    constructor();
+}
+
+declare const pPipe: typeof _pPipe;
 declare const pipe: (...fns: any[]) => any;
-declare const compose: (...fns: any[]) => any;
-/**
- * 生成区间数组
- * arange(<start>, <stop>, [step=1], [target=[]], [at])
- */
+declare const compose: (...fns: any[]) => any;
+
+declare function noop(): any;
+declare function delay(ms: number): Promise<unknown>;
 declare function arange(x1: number, x2?: number, stp?: number, z?: number[], z0?: number): number[];
-type Deferred<T = void> = Promise<T> & {
-    resolve: (value: T) => void;
-    reject: (value?: any) => void;
-};
-declare function createDeferred<T = void>(): Deferred<T>;
+declare function whenever<T, C extends (value: Exclude<T, null | undefined>) => any>(value: T, callback: C): ReturnType<C> | undefined;
+declare function loop<T = void>(fn: (next: (ms: number) => Promise<T>) => Promise<T>): Promise<T>;
+declare function riposte<T>(...args: [cond: boolean, value: T][]): T;
 
-export { Arrayable, AtWillSize, AtwillNumber, AtwillNumberObject, AtwillObject, Awaitable, BooleanLike, DeepKeyof, DeepPartial, DeepReadonly, DeepReplace, DeepRequired, Deferred, Key, NumberObject, Option, Size, StringObject, SymbolObject, TypeofType, UA, arange, atWillToSize, atWillToUnit, compose, createDeferred, formDataToObject, getTypeof, isAndroid, isBrowser, isChrome, isEdge, isFF, isFormData, isIE, isIE11, isIE9, isIOS, isMobile, isObject, isPhantomJS, isTypeof, isWeex, isWindow, objectToFormData, pipe, weexPlatform };
+export { Arrayable, Awaitable, BooleanLike, DeepKeyof, DeepPartial, DeepReadonly, DeepReplace, DeepRequired, Deferred, Dimension, DynamicObject, Key, NumberObject, Numeric, NumericObject, Option, StringObject, SymbolObject, TypeofType, UA, arange, compose, delay, formDataToObject, formatSize, formatUnit, getTypeof, isAndroid, isBrowser, isChrome, isEdge, isFF, isFormData, isIE, isIE11, isIE9, isIOS, isMobile, isNumber, isObject, isPhantomJS, isPlainObject, isString, isTypeof, isWeex, isWindow, loop, noop, objectToFormData, pPipe, pipe, riposte, weexPlatform, whenever };

package/dist/index.mjs

@@ -13,9 +13,14 @@ var isChrome = () => UA() && /chrome\/\d+/.test(UA()) && !isEdge();
 var isPhantomJS = () => UA() && /phantomjs/.test(UA());
 var isFF = () => typeof UA() === "string" && UA().match(/firefox\/(\d+)/);
 var isMobile = () => isBrowser() && navigator.userAgent.toLowerCase().includes("mobile");
+var isObject = (value) => typeof value === "object" && !Array.isArray(value);
+var isNumber = (value) => typeof value === "number";
+var isString = (value) => typeof value === "string";
+var isPlainObject = (value) => typeof value === "object" && value !== null && value.constructor === Object;
+var isFormData = (value) => isObject(value) && isBrowser() && value instanceof FormData;
+var isWindow = (value) => typeof window !== "undefined" && toString.call(value) === "[object Window]";
 
 // src/lang/index.ts
-import _isObject from "lodash/isObject";
 function formDataToObject(formData) {
   return Object.fromEntries(formData.entries());
 }
@@ -25,32 +30,22 @@ function objectToFormData(object) {
     formData.append(key, value);
   return formData;
 }
-function isFormData(value) {
-  return isObject(value) && isBrowser() && value instanceof FormData;
-}
-function isWindow(value) {
-  return typeof window !== "undefined" && toString.call(value) === "[object Window]";
-}
-function isObject(value) {
-  return _isObject(value) && !Array.isArray(value);
-}
 
 // src/size/index.ts
-import isNumber from "lodash/isNumber";
-import isString from "lodash/isString";
-function atWillToUnit(value, unit = "px") {
+function formatUnit(value, unit = "px") {
   if (!(isString(value) || isNumber(value)))
     return "";
-  return isString(value) && /\D/g.test(value) ? value : value + unit;
+  value = String(value);
+  return /\D/g.test(value) ? value : value + unit;
 }
-function atWillToSize(size, unit) {
-  const _atWillToUnit = (value) => atWillToUnit(value, unit);
-  if (typeof size === "string" || typeof size === "number")
-    return { width: _atWillToUnit(size), height: _atWillToUnit(size) };
-  if (Array.isArray(size))
-    return { width: _atWillToUnit(size[0]), height: _atWillToUnit(size[1]) };
-  if (typeof size === "object")
-    return { width: _atWillToUnit(size.width), height: _atWillToUnit(size.height) };
+function formatSize(dimension, unit) {
+  const _formatUnit = (value) => formatUnit(value, unit);
+  if (typeof dimension === "string" || typeof dimension === "number")
+    return { width: _formatUnit(dimension), height: _formatUnit(dimension) };
+  if (Array.isArray(dimension))
+    return { width: _formatUnit(dimension[0]), height: _formatUnit(dimension[1]) };
+  if (typeof dimension === "object")
+    return { width: _formatUnit(dimension.width), height: _formatUnit(dimension.height) };
   return { width: "", height: "" };
 }
 
@@ -63,24 +58,45 @@ function isTypeof(target, type) {
   return getTypeof(target) === type;
 }
 
-// ../../node_modules/.pnpm/p-pipe@4.0.0/node_modules/p-pipe/index.js
-function pPipe(...functions) {
-  if (functions.length === 0) {
-    throw new Error("Expected at least one argument");
+// src/util/deferred.ts
+var Deferred = class extends Promise {
+  constructor() {
+    let _resolve, _reject;
+    super((resolve_, reject_) => {
+      _resolve = resolve_;
+      _reject = reject_;
+    });
+    this.resolve = (value) => {
+      _resolve(value);
+      return this;
+    };
+    this.reject = (reason) => {
+      _reject(reason);
+      return this;
+    };
   }
+};
+
+// src/util/pipe.ts
+var pPipe = (...functions) => {
+  if (functions.length === 0)
+    throw new Error("Expected at least one argument");
   return async (input) => {
     let currentValue = input;
-    for (const function_ of functions) {
+    for (const function_ of functions)
       currentValue = await function_(currentValue);
-    }
     return currentValue;
   };
-}
-
-// src/util/index.ts
-import { default as default2 } from "delay";
+};
 var pipe = (...fns) => fns.reduce((v, f) => f(v));
 var compose = (...fns) => fns.reduceRight((v, f) => f(v));
+
+// src/util/util.ts
+function noop() {
+}
+function delay(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
 function arange(x1, x2, stp = 1, z = [], z0 = z.length) {
   if (!x2)
     x1 -= x2 = x1;
@@ -88,28 +104,32 @@ function arange(x1, x2, stp = 1, z = [], z0 = z.length) {
     z[z0++] = x1;
   return z;
 }
-function createDeferred() {
-  let resolve, reject;
-  const promise = new Promise((_resolve, _reject) => {
-    resolve = _resolve;
-    reject = _reject;
-  });
-  promise.resolve = (v) => {
-    resolve(v);
-    return promise;
-  };
-  promise.reject = reject;
-  return promise;
+function whenever(value, callback) {
+  return value ? callback(value) : void 0;
+}
+function loop(fn) {
+  async function next(ms) {
+    await delay(ms);
+    return fn(next);
+  }
+  return fn(next);
+}
+function riposte(...args) {
+  for (const [cond, value] of args) {
+    if (cond)
+      return value;
+  }
+  return void 0;
 }
 export {
+  Deferred,
   UA,
   arange,
-  atWillToSize,
-  atWillToUnit,
   compose,
-  createDeferred,
-  default2 as delay,
+  delay,
   formDataToObject,
+  formatSize,
+  formatUnit,
   getTypeof,
   isAndroid,
   isBrowser,
@@ -122,13 +142,20 @@ export {
   isIE9,
   isIOS,
   isMobile,
+  isNumber,
   isObject,
   isPhantomJS,
+  isPlainObject,
+  isString,
   isTypeof,
   isWeex,
   isWindow,
+  loop,
+  noop,
   objectToFormData,
   pPipe,
   pipe,
-  weexPlatform
+  riposte,
+  weexPlatform,
+  whenever
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hairy/utils",
-  "version": "0.6.8",
+  "version": "0.6.10",
   "license": "MIT",
   "main": "./dist/index.cjs",
   "publishConfig": {
@@ -11,13 +11,8 @@
   ],
   "dependencies": {
     "@extra-array/arange": "^1.1.7",
-    "delay": "^5.0.0",
-    "lodash": "^4",
     "p-pipe": "^4.0.0"
   },
-  "devDependencies": {
-    "@types/lodash": "^4"
-  },
   "scripts": {
     "build": "ptsup src/index.ts --dts"
   },

package/src/index.ts

@@ -1,6 +0,0 @@
-export * from './is'
-export * from './lang'
-export * from './size'
-export * from './typeof'
-export * from './typings'
-export * from './util'