@ocap/util 1.28.5 → 1.28.7

package/README.md

@@ -3,7 +3,7 @@
 ## Usage
 
 ```shell
-pnpm install @ocap/util
+bun install @ocap/util
 ```
 
 Then:

package/esm/create-sorted-list.mjs

@@ -1,5 +1,5 @@
-import uniq from "lodash/uniq.js";
 import flatten from "lodash/flatten.js";
+import uniq from "lodash/uniq.js";
 
 //#region src/create-sorted-list.ts
 const createSortedList = (list) => uniq(flatten(list)).filter(Boolean).sort();

package/esm/index.mjs

@@ -1,17 +1,17 @@
 import { BN } from "./bn.mjs";
 import BaseBN from "bn.js";
+import base64 from "base64-url";
+import base58 from "bs58";
+import camelCase from "lodash/camelCase.js";
 import isBoolean from "lodash/isBoolean.js";
-import isString from "lodash/isString.js";
+import isNull from "lodash/isNull.js";
 import isNumber from "lodash/isNumber.js";
 import isObject from "lodash/isObject.js";
-import upperFirst from "lodash/upperFirst.js";
-import camelCase from "lodash/camelCase.js";
-import isNull from "lodash/isNull.js";
+import isString from "lodash/isString.js";
 import rightPad from "lodash/padEnd.js";
 import leftPad from "lodash/padStart.js";
-import base58 from "bs58";
-import base64 from "base64-url";
-import * as utf8 from "utf8";
+import upperFirst from "lodash/upperFirst.js";
+import utf8 from "utf8";
 
 //#region src/index.ts
 const DID_PREFIX = "did:abt:";
@@ -26,7 +26,7 @@ const isBase58btc = (data) => {
 	if (data[0] === "z") try {
 		base58btc.decode(data);
 		return true;
-	} catch (err) {
+	} catch (_err) {
 		return false;
 	}
 	return false;
@@ -86,7 +86,7 @@ const stripHexPrefix = (str) => {
 * @param {Object} object
 * @returns {Boolean}
 */
-const isBN = (object) => object instanceof BN || object instanceof BaseBN || object && object.constructor && object.constructor.name === "BN";
+const isBN = (object) => object instanceof BN || object instanceof BaseBN || object?.constructor && object.constructor.name === "BN";
 /**
 * Returns true if object is BigNumber, otherwise false
 *
@@ -96,7 +96,7 @@ const isBN = (object) => object instanceof BN || object instanceof BaseBN || obj
 * @param {Object} object
 * @returns {Boolean}
 */
-const isBigNumber = (object) => object && object.constructor && object.constructor.name === "BigNumber";
+const isBigNumber = (object) => object?.constructor && object.constructor.name === "BigNumber";
 /**
 * Check if string is HEX, requires a 0x in front
 *
@@ -176,7 +176,7 @@ const hexToUtf8 = (hex) => {
 	hex = hex.split("").reverse().join("");
 	const l = hex.length;
 	for (let i = 0; i < l; i += 2) {
-		code = parseInt(hex.substr(i, 2), 16);
+		code = Number.parseInt(hex.substr(i, 2), 16);
 		str += String.fromCharCode(code);
 	}
 	return utf8.decode(str);
@@ -205,7 +205,8 @@ const hexToNumber = (value) => {
 */
 const numberToHex = (value) => {
 	if (isNull(value) || typeof value === "undefined") return value;
-	if (!isFinite(value) && !isHex(value)) throw new Error(`Given input "${value}" is not a number.`);
+	const isNumericString = typeof value === "string" && !Number.isNaN(Number(value)) && Number.isFinite(Number(value));
+	if (!Number.isFinite(value) && !isHex(value) && !isNumericString && !isBN(value) && !isBigNumber(value)) throw new Error(`Given input "${value}" is not a number.`);
 	const num = toBN(value);
 	const result = num.toString(16);
 	return num.lt(new BN(0)) ? `-0x${result.substr(1)}` : `0x${result}`;
@@ -244,7 +245,7 @@ const hexToBytes = (hex) => {
 	hex = hex.replace(/^0x/i, "");
 	hex = hex.length % 2 ? `0${hex}` : hex;
 	const bytes = [];
-	for (let c = 0; c < hex.length; c += 2) bytes.push(parseInt(hex.substr(c, 2), 16));
+	for (let c = 0; c < hex.length; c += 2) bytes.push(Number.parseInt(hex.substr(c, 2), 16));
 	return bytes;
 };
 /**

package/esm/md5.mjs

@@ -1,4 +1,4 @@
-import crypto from "crypto";
+import crypto from "node:crypto";
 
 //#region src/md5.ts
 const md5 = (x) => crypto.createHash("md5").update(x).digest("hex");

package/esm/ready.d.mts

@@ -1,8 +1,7 @@
-import EventEmitter from "events";
+import EventEmitter from "node:events";
 
 //#region src/ready.d.ts
 declare class Ready extends EventEmitter {
-  emit: $TSFixMe;
   ready: $TSFixMe;
   readyCallbacks: $TSFixMe;
   readyMarks: $TSFixMe;

package/esm/ready.mjs

@@ -1,4 +1,4 @@
-import EventEmitter from "events";
+import EventEmitter from "node:events";
 
 //#region src/ready.ts
 var Ready = class extends EventEmitter {

package/esm/tsfixme.d.ts

@@ -1,3 +1,2 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 type $TSFixMe = any;
 type $TSFixMeFunction = (...args: any[]) => any;

package/esm/url.d.mts

@@ -1,4 +1,4 @@
-import * as ipaddr from "ipaddr.js";
+import ipaddr from "ipaddr.js";
 
 //#region src/url.d.ts
 declare function parseIp(host: string): ipaddr.IPv4 | ipaddr.IPv6 | null;

package/esm/url.mjs

@@ -1,6 +1,6 @@
+import { Resolver } from "node:dns/promises";
 import { URL } from "url";
-import * as ipaddr from "ipaddr.js";
-import { Resolver } from "dns/promises.js";
+import ipaddr from "ipaddr.js";
 
 //#region src/url.ts
 const MAX_URL_LENGTH = 256;

package/lib/create-sorted-list.cjs

@@ -1,8 +1,8 @@
 const require_rolldown_runtime = require('./_virtual/rolldown_runtime.cjs');
-let lodash_uniq = require("lodash/uniq");
-lodash_uniq = require_rolldown_runtime.__toESM(lodash_uniq);
 let lodash_flatten = require("lodash/flatten");
 lodash_flatten = require_rolldown_runtime.__toESM(lodash_flatten);
+let lodash_uniq = require("lodash/uniq");
+lodash_uniq = require_rolldown_runtime.__toESM(lodash_uniq);
 
 //#region src/create-sorted-list.ts
 const createSortedList = (list) => (0, lodash_uniq.default)((0, lodash_flatten.default)(list)).filter(Boolean).sort();

package/lib/index.cjs

@@ -2,28 +2,28 @@ const require_rolldown_runtime = require('./_virtual/rolldown_runtime.cjs');
 const require_bn = require('./bn.cjs');
 let bn_js = require("bn.js");
 bn_js = require_rolldown_runtime.__toESM(bn_js);
+let base64_url = require("base64-url");
+base64_url = require_rolldown_runtime.__toESM(base64_url);
+let bs58 = require("bs58");
+bs58 = require_rolldown_runtime.__toESM(bs58);
+let lodash_camelCase = require("lodash/camelCase");
+lodash_camelCase = require_rolldown_runtime.__toESM(lodash_camelCase);
 let lodash_isBoolean = require("lodash/isBoolean");
 lodash_isBoolean = require_rolldown_runtime.__toESM(lodash_isBoolean);
-let lodash_isString = require("lodash/isString");
-lodash_isString = require_rolldown_runtime.__toESM(lodash_isString);
+let lodash_isNull = require("lodash/isNull");
+lodash_isNull = require_rolldown_runtime.__toESM(lodash_isNull);
 let lodash_isNumber = require("lodash/isNumber");
 lodash_isNumber = require_rolldown_runtime.__toESM(lodash_isNumber);
 let lodash_isObject = require("lodash/isObject");
 lodash_isObject = require_rolldown_runtime.__toESM(lodash_isObject);
-let lodash_upperFirst = require("lodash/upperFirst");
-lodash_upperFirst = require_rolldown_runtime.__toESM(lodash_upperFirst);
-let lodash_camelCase = require("lodash/camelCase");
-lodash_camelCase = require_rolldown_runtime.__toESM(lodash_camelCase);
-let lodash_isNull = require("lodash/isNull");
-lodash_isNull = require_rolldown_runtime.__toESM(lodash_isNull);
+let lodash_isString = require("lodash/isString");
+lodash_isString = require_rolldown_runtime.__toESM(lodash_isString);
 let lodash_padEnd = require("lodash/padEnd");
 lodash_padEnd = require_rolldown_runtime.__toESM(lodash_padEnd);
 let lodash_padStart = require("lodash/padStart");
 lodash_padStart = require_rolldown_runtime.__toESM(lodash_padStart);
-let bs58 = require("bs58");
-bs58 = require_rolldown_runtime.__toESM(bs58);
-let base64_url = require("base64-url");
-base64_url = require_rolldown_runtime.__toESM(base64_url);
+let lodash_upperFirst = require("lodash/upperFirst");
+lodash_upperFirst = require_rolldown_runtime.__toESM(lodash_upperFirst);
 let utf8 = require("utf8");
 utf8 = require_rolldown_runtime.__toESM(utf8);
 
@@ -40,7 +40,7 @@ const isBase58btc = (data) => {
 	if (data[0] === "z") try {
 		base58btc.decode(data);
 		return true;
-	} catch (err) {
+	} catch (_err) {
 		return false;
 	}
 	return false;
@@ -100,7 +100,7 @@ const stripHexPrefix = (str) => {
 * @param {Object} object
 * @returns {Boolean}
 */
-const isBN = (object) => object instanceof require_bn.BN || object instanceof bn_js.default || object && object.constructor && object.constructor.name === "BN";
+const isBN = (object) => object instanceof require_bn.BN || object instanceof bn_js.default || object?.constructor && object.constructor.name === "BN";
 /**
 * Returns true if object is BigNumber, otherwise false
 *
@@ -110,7 +110,7 @@ const isBN = (object) => object instanceof require_bn.BN || object instanceof bn
 * @param {Object} object
 * @returns {Boolean}
 */
-const isBigNumber = (object) => object && object.constructor && object.constructor.name === "BigNumber";
+const isBigNumber = (object) => object?.constructor && object.constructor.name === "BigNumber";
 /**
 * Check if string is HEX, requires a 0x in front
 *
@@ -158,7 +158,7 @@ const toBN = (num, base = 10) => {
 * @returns {String} hex representation of input string
 */
 const utf8ToHex = (str) => {
-	str = utf8.encode(str);
+	str = utf8.default.encode(str);
 	let hex = "";
 	str = str.replace(/^(?:\u0000)*/, "");
 	str = str.split("").reverse().join("");
@@ -190,10 +190,10 @@ const hexToUtf8 = (hex) => {
 	hex = hex.split("").reverse().join("");
 	const l = hex.length;
 	for (let i = 0; i < l; i += 2) {
-		code = parseInt(hex.substr(i, 2), 16);
+		code = Number.parseInt(hex.substr(i, 2), 16);
 		str += String.fromCharCode(code);
 	}
-	return utf8.decode(str);
+	return utf8.default.decode(str);
 };
 /**
 * Converts value to number representation
@@ -219,7 +219,8 @@ const hexToNumber = (value) => {
 */
 const numberToHex = (value) => {
 	if ((0, lodash_isNull.default)(value) || typeof value === "undefined") return value;
-	if (!isFinite(value) && !isHex(value)) throw new Error(`Given input "${value}" is not a number.`);
+	const isNumericString = typeof value === "string" && !Number.isNaN(Number(value)) && Number.isFinite(Number(value));
+	if (!Number.isFinite(value) && !isHex(value) && !isNumericString && !isBN(value) && !isBigNumber(value)) throw new Error(`Given input "${value}" is not a number.`);
 	const num = toBN(value);
 	const result = num.toString(16);
 	return num.lt(new require_bn.BN(0)) ? `-0x${result.substr(1)}` : `0x${result}`;
@@ -258,7 +259,7 @@ const hexToBytes = (hex) => {
 	hex = hex.replace(/^0x/i, "");
 	hex = hex.length % 2 ? `0${hex}` : hex;
 	const bytes = [];
-	for (let c = 0; c < hex.length; c += 2) bytes.push(parseInt(hex.substr(c, 2), 16));
+	for (let c = 0; c < hex.length; c += 2) bytes.push(Number.parseInt(hex.substr(c, 2), 16));
 	return bytes;
 };
 /**

package/lib/index.d.cts

@@ -1,7 +1,7 @@
 import { BN } from "./bn.cjs";
-import { LiteralUnion } from "type-fest";
 import rightPad from "lodash/padEnd";
 import leftPad from "lodash/padStart";
+import { LiteralUnion } from "type-fest";
 
 //#region src/index.d.ts
 declare const isBase58btc: (data: any) => boolean;

package/lib/md5.cjs

@@ -1,9 +1,9 @@
 const require_rolldown_runtime = require('./_virtual/rolldown_runtime.cjs');
-let crypto = require("crypto");
-crypto = require_rolldown_runtime.__toESM(crypto);
+let node_crypto = require("node:crypto");
+node_crypto = require_rolldown_runtime.__toESM(node_crypto);
 
 //#region src/md5.ts
-const md5 = (x) => crypto.default.createHash("md5").update(x).digest("hex");
+const md5 = (x) => node_crypto.default.createHash("md5").update(x).digest("hex");
 
 //#endregion
 exports.md5 = md5;

package/lib/ready.cjs

@@ -1,9 +1,9 @@
 const require_rolldown_runtime = require('./_virtual/rolldown_runtime.cjs');
-let events = require("events");
-events = require_rolldown_runtime.__toESM(events);
+let node_events = require("node:events");
+node_events = require_rolldown_runtime.__toESM(node_events);
 
 //#region src/ready.ts
-var Ready = class extends events.default {
+var Ready = class extends node_events.default {
 	constructor() {
 		super();
 		this.ready = false;

package/lib/ready.d.cts

@@ -1,8 +1,7 @@
-import EventEmitter from "events";
+import EventEmitter from "node:events";
 
 //#region src/ready.d.ts
 declare class Ready extends EventEmitter {
-  emit: $TSFixMe;
   ready: $TSFixMe;
   readyCallbacks: $TSFixMe;
   readyMarks: $TSFixMe;

package/lib/tsfixme.d.ts

@@ -1,3 +1,2 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 type $TSFixMe = any;
 type $TSFixMeFunction = (...args: any[]) => any;

package/lib/url.cjs

@@ -1,15 +1,15 @@
 const require_rolldown_runtime = require('./_virtual/rolldown_runtime.cjs');
+let node_dns_promises = require("node:dns/promises");
 let url = require("url");
 let ipaddr_js = require("ipaddr.js");
 ipaddr_js = require_rolldown_runtime.__toESM(ipaddr_js);
-let dns_promises = require("dns/promises");
 
 //#region src/url.ts
 const MAX_URL_LENGTH = 256;
 function parseIp(host) {
-	if (!ipaddr_js.isValid(host)) return null;
+	if (!ipaddr_js.default.isValid(host)) return null;
 	try {
-		return ipaddr_js.parse(host);
+		return ipaddr_js.default.parse(host);
 	} catch {
 		return null;
 	}
@@ -32,7 +32,7 @@ function isUnicastAddress(host) {
 }
 async function resolveHostAddresses(host) {
 	try {
-		const resolver = new dns_promises.Resolver();
+		const resolver = new node_dns_promises.Resolver();
 		resolver.setServers(["8.8.8.8", "1.1.1.1"]);
 		const addresses = [];
 		try {

package/lib/url.d.cts

@@ -1,4 +1,4 @@
-import * as ipaddr from "ipaddr.js";
+import ipaddr from "ipaddr.js";
 
 //#region src/url.d.ts
 declare function parseIp(host: string): ipaddr.IPv4 | ipaddr.IPv6 | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ocap/util",
-  "version": "1.28.5",
+  "version": "1.28.7",
   "type": "module",
   "description": "utils shared across multiple forge js libs, works in both node.js and browser",
   "keywords": [
@@ -12,28 +12,23 @@
     "access": "public"
   },
   "dependencies": {
+    "@ocap/types": "workspace:^",
     "@types/bn.js": "^5.2.0",
     "base64-url": "^2.3.3",
     "bn.js": "5.2.2",
     "bs58": "^5.0.0",
     "ipaddr.js": "^2.1.0",
     "lodash": "^4.17.21",
-    "utf8": "^3.0.0",
-    "@ocap/types": "^1.28.5"
+    "utf8": "^3.0.0"
   },
   "resolutions": {
     "elliptic": "6.5.3"
   },
   "devDependencies": {
-    "@arcblock/eslint-config-ts": "0.3.3",
     "@types/base64-url": "^2.2.2",
-    "@types/jest": "^29.5.13",
     "@types/lodash": "^4.17.10",
     "@types/node": "^22.7.5",
     "@types/utf8": "^3.0.3",
-    "eslint": "^8.57.0",
-    "jest": "^29.7.0",
-    "ts-jest": "^29.2.5",
     "tsdown": "^0.18.4",
     "type-fest": "^3.1.0",
     "typescript": "^5.6.2"
@@ -77,15 +72,15 @@
     "type": "git",
     "url": "git+https://github.com/ArcBlock/blockchain.git"
   },
-  "bugs": {
-    "url": "https://github.com/ArcBlock/blockchain/issues"
-  },
   "scripts": {
-    "lint": "eslint src tests",
-    "lint:fix": "npm run lint -- --fix",
-    "test": "jest --forceExit --detectOpenHandles",
+    "lint": "biome check",
+    "lint:fix": "biome check --write",
+    "test": "bun test",
     "coverage": "npm run test -- --coverage",
     "build": "tsdown",
     "build:watch": "tsdown -w"
+  },
+  "bugs": {
+    "url": "https://github.com/ArcBlock/blockchain/issues"
   }
-}
+}

package/LICENSE

@@ -1,13 +0,0 @@
-Copyright 2018-2025 ArcBlock
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.