@hairy/utils 0.6.9 → 0.6.10

package/dist/index.cjs

@@ -1,13 +1,8 @@
 "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 __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -20,71 +15,16 @@ 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);
 
-// ../../node_modules/.pnpm/lodash@4.0.0/node_modules/lodash/isObjectLike.js
-var require_isObjectLike = __commonJS({
-  "../../node_modules/.pnpm/lodash@4.0.0/node_modules/lodash/isObjectLike.js"(exports, module2) {
-    function isObjectLike(value) {
-      return !!value && typeof value == "object";
-    }
-    module2.exports = isObjectLike;
-  }
-});
-
-// ../../node_modules/.pnpm/lodash@4.0.0/node_modules/lodash/isNumber.js
-var require_isNumber = __commonJS({
-  "../../node_modules/.pnpm/lodash@4.0.0/node_modules/lodash/isNumber.js"(exports, module2) {
-    var isObjectLike = require_isObjectLike();
-    var numberTag = "[object Number]";
-    var objectProto = global.Object.prototype;
-    var objectToString = objectProto.toString;
-    function isNumber2(value) {
-      return typeof value == "number" || isObjectLike(value) && objectToString.call(value) == numberTag;
-    }
-    module2.exports = isNumber2;
-  }
-});
-
-// ../../node_modules/.pnpm/lodash@4.0.0/node_modules/lodash/isArray.js
-var require_isArray = __commonJS({
-  "../../node_modules/.pnpm/lodash@4.0.0/node_modules/lodash/isArray.js"(exports, module2) {
-    var isArray = Array.isArray;
-    module2.exports = isArray;
-  }
-});
-
-// ../../node_modules/.pnpm/lodash@4.0.0/node_modules/lodash/isString.js
-var require_isString = __commonJS({
-  "../../node_modules/.pnpm/lodash@4.0.0/node_modules/lodash/isString.js"(exports, module2) {
-    var isArray = require_isArray();
-    var isObjectLike = require_isObjectLike();
-    var stringTag = "[object String]";
-    var objectProto = global.Object.prototype;
-    var objectToString = objectProto.toString;
-    function isString2(value) {
-      return typeof value == "string" || !isArray(value) && isObjectLike(value) && objectToString.call(value) == stringTag;
-    }
-    module2.exports = isString2;
-  }
-});
-
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
+  Deferred: () => Deferred,
   UA: () => UA,
   arange: () => arange,
   compose: () => compose,
-  createDeferred: () => createDeferred,
-  delay: () => import_delay.default,
+  delay: () => delay,
   formDataToObject: () => formDataToObject,
   formatSize: () => formatSize,
   formatUnit: () => formatUnit,
@@ -100,14 +40,20 @@ __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,
+  riposte: () => riposte,
   weexPlatform: () => weexPlatform,
   whenever: () => whenever
 });
@@ -128,6 +74,12 @@ 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
 function formDataToObject(formData) {
@@ -139,23 +91,13 @@ 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 typeof value === "object" && !Array.isArray(value);
-}
 
 // src/size/index.ts
-var import_isNumber = __toESM(require_isNumber());
-var import_isString = __toESM(require_isString());
 function formatUnit(value, unit = "px") {
-  if (!((0, import_isString.default)(value) || (0, import_isNumber.default)(value)))
+  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 formatSize(dimension, unit) {
   const _formatUnit = (value) => formatUnit(value, unit);
@@ -178,38 +120,44 @@ function isTypeof(target, type) {
 }
 
 // src/util/deferred.ts
-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;
-}
+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;
+    };
+  }
+};
 
-// ../../node_modules/.pnpm/p-pipe@4.0.0/node_modules/p-pipe/index.js
-function pPipe(...functions) {
-  if (functions.length === 0) {
+// 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/third.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/index.ts
+// 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;
@@ -217,17 +165,29 @@ function arange(x1, x2, stp = 1, z = [], z0 = z.length) {
     z[z0++] = x1;
   return z;
 }
-var pipe = (...fns) => fns.reduce((v, f) => f(v));
-var compose = (...fns) => fns.reduceRight((v, f) => f(v));
 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,
   compose,
-  createDeferred,
   delay,
   formDataToObject,
   formatSize,
@@ -244,14 +204,20 @@ function whenever(value, callback) {
   isIE9,
   isIOS,
   isMobile,
+  isNumber,
   isObject,
   isPhantomJS,
+  isPlainObject,
+  isString,
   isTypeof,
   isWeex,
   isWindow,
+  loop,
+  noop,
   objectToFormData,
   pPipe,
   pipe,
+  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,10 +30,7 @@ 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 Numeric = string | number | bigint;
 type DynamicObject = {
@@ -98,19 +100,21 @@ declare function getTypeof(target: any): TypeofType;
  */
 declare function isTypeof(target: any, type: TypeofType): boolean;
 
-type Deferred<T = void> = Promise<T> & {
-    resolve: (value: T) => void;
-    reject: (value?: any) => void;
-};
-declare function createDeferred<T = void>(): Deferred<T>;
+declare class Deferred<T> extends Promise<T> {
+    resolve: (value: T) => Deferred<T>;
+    reject: (reason?: any) => Deferred<T>;
+    constructor();
+}
 
-/**
- * 生成区间数组
- * arange(<start>, <stop>, [step=1], [target=[]], [at])
- */
-declare function arange(x1: number, x2?: number, stp?: number, z?: number[], z0?: number): number[];
+declare const pPipe: typeof _pPipe;
 declare const pipe: (...fns: any[]) => any;
-declare const compose: (...fns: any[]) => any;
-declare function whenever<T, C extends (value: Exclude<T, null | undefined>) => any>(value: T, callback: C): ReturnType<C> | undefined;
+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[];
+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, Awaitable, BooleanLike, DeepKeyof, DeepPartial, DeepReadonly, DeepReplace, DeepRequired, Deferred, Dimension, DynamicObject, Key, NumberObject, Numeric, NumericObject, Option, StringObject, SymbolObject, TypeofType, UA, arange, compose, createDeferred, formDataToObject, formatSize, formatUnit, getTypeof, isAndroid, isBrowser, isChrome, isEdge, isFF, isFormData, isIE, isIE11, isIE9, isIOS, isMobile, isObject, isPhantomJS, isTypeof, isWeex, isWindow, objectToFormData, pipe, weexPlatform, whenever };
+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

@@ -1,76 +1,3 @@
-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 __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  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
-));
-
-// ../../node_modules/.pnpm/lodash@4.0.0/node_modules/lodash/isObjectLike.js
-var require_isObjectLike = __commonJS({
-  "../../node_modules/.pnpm/lodash@4.0.0/node_modules/lodash/isObjectLike.js"(exports, module) {
-    function isObjectLike(value) {
-      return !!value && typeof value == "object";
-    }
-    module.exports = isObjectLike;
-  }
-});
-
-// ../../node_modules/.pnpm/lodash@4.0.0/node_modules/lodash/isNumber.js
-var require_isNumber = __commonJS({
-  "../../node_modules/.pnpm/lodash@4.0.0/node_modules/lodash/isNumber.js"(exports, module) {
-    var isObjectLike = require_isObjectLike();
-    var numberTag = "[object Number]";
-    var objectProto = global.Object.prototype;
-    var objectToString = objectProto.toString;
-    function isNumber2(value) {
-      return typeof value == "number" || isObjectLike(value) && objectToString.call(value) == numberTag;
-    }
-    module.exports = isNumber2;
-  }
-});
-
-// ../../node_modules/.pnpm/lodash@4.0.0/node_modules/lodash/isArray.js
-var require_isArray = __commonJS({
-  "../../node_modules/.pnpm/lodash@4.0.0/node_modules/lodash/isArray.js"(exports, module) {
-    var isArray = Array.isArray;
-    module.exports = isArray;
-  }
-});
-
-// ../../node_modules/.pnpm/lodash@4.0.0/node_modules/lodash/isString.js
-var require_isString = __commonJS({
-  "../../node_modules/.pnpm/lodash@4.0.0/node_modules/lodash/isString.js"(exports, module) {
-    var isArray = require_isArray();
-    var isObjectLike = require_isObjectLike();
-    var stringTag = "[object String]";
-    var objectProto = global.Object.prototype;
-    var objectToString = objectProto.toString;
-    function isString2(value) {
-      return typeof value == "string" || !isArray(value) && isObjectLike(value) && objectToString.call(value) == stringTag;
-    }
-    module.exports = isString2;
-  }
-});
-
 // src/is/index.ts
 var isBrowser = () => typeof window !== "undefined";
 var isWeex = () => typeof WXEnvironment !== "undefined" && !!WXEnvironment.platform;
@@ -86,6 +13,12 @@ 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
 function formDataToObject(formData) {
@@ -97,23 +30,13 @@ 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 typeof value === "object" && !Array.isArray(value);
-}
 
 // src/size/index.ts
-var import_isNumber = __toESM(require_isNumber());
-var import_isString = __toESM(require_isString());
 function formatUnit(value, unit = "px") {
-  if (!((0, import_isString.default)(value) || (0, import_isNumber.default)(value)))
+  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 formatSize(dimension, unit) {
   const _formatUnit = (value) => formatUnit(value, unit);
@@ -136,38 +59,44 @@ function isTypeof(target, type) {
 }
 
 // src/util/deferred.ts
-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;
-}
+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;
+    };
+  }
+};
 
-// ../../node_modules/.pnpm/p-pipe@4.0.0/node_modules/p-pipe/index.js
-function pPipe(...functions) {
-  if (functions.length === 0) {
+// 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/third.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/index.ts
+// 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;
@@ -175,17 +104,29 @@ function arange(x1, x2, stp = 1, z = [], z0 = z.length) {
     z[z0++] = x1;
   return z;
 }
-var pipe = (...fns) => fns.reduce((v, f) => f(v));
-var compose = (...fns) => fns.reduceRight((v, f) => f(v));
 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,
   compose,
-  createDeferred,
-  default2 as delay,
+  delay,
   formDataToObject,
   formatSize,
   formatUnit,
@@ -201,14 +142,20 @@ export {
   isIE9,
   isIOS,
   isMobile,
+  isNumber,
   isObject,
   isPhantomJS,
+  isPlainObject,
+  isString,
   isTypeof,
   isWeex,
   isWindow,
+  loop,
+  noop,
   objectToFormData,
   pPipe,
   pipe,
+  riposte,
   weexPlatform,
   whenever
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hairy/utils",
-  "version": "0.6.9",
+  "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'