@oscarpalmer/atoms 0.173.1 → 0.173.3

package/dist/index.mjs

@@ -1198,12 +1198,10 @@ function getNumber(value) {
 	if (EXPRESSION_ZEROISH.test(parsed)) return 0;
 	const isBinary = EXPRESSION_BINARY.test(trimmed);
 	if (isBinary || EXPRESSION_OCTAL.test(trimmed)) return Number.parseInt(trimmed.slice(2), isBinary ? 2 : OCTAL_VALUE);
-	return Number(EXPRESSION_HEX.test(trimmed) ? trimmed : trimmed.replace(EXPRESSION_UNDERSCORE, ""));
+	return Number(trimmed);
 }
 const EXPRESSION_BINARY = /^0b[01]+$/i;
-const EXPRESSION_HEX = /^0x[0-9a-f]+$/i;
 const EXPRESSION_OCTAL = /^0o[0-7]+$/i;
-const EXPRESSION_UNDERSCORE = /_/g;
 const EXPRESSION_ZEROISH = /^\s*0+\s*$/;
 const OCTAL_VALUE = 8;
 //#endregion
@@ -4058,11 +4056,11 @@ async function resultPromises(items, signal) {
 */
 function fromQuery(query) {
 	if (typeof query !== "string" || query.trim().length === 0) return {};
-	const parts = query.split("&");
+	const parts = query.split(AMPERSAND);
 	const { length } = parts;
 	const parameters = {};
 	for (let index = 0; index < length; index += 1) {
-		const decoded = parts[index].split("=").map(tryDecode);
+		const decoded = parts[index].split(EQUAL).map(tryDecode);
 		const key = decoded[0].replace(EXPRESSION_ARRAY_SUFFIX, "");
 		if (!ignoreKey(key)) setQueryValue(parameters, key, decoded[1]);
 	}
@@ -4078,8 +4076,8 @@ function getParts(value, fromArray, prefix) {
 		const full = join([prefix, fromArray ? void 0 : key], ".");
 		if (Array.isArray(val)) parts.push(...getParts(val, true, full));
 		else if (isPlainObject(val)) parts.push(...getParts(val, false, full));
-		else if (isDecodable(val)) parts.push(`${tryEncode(full)}=${tryEncode(val)}`);
-		else if (val instanceof Date) parts.push(`${tryEncode(full)}=${val.toJSON()}`);
+		else if (isDecodable(val)) parts.push(`${getString(tryEncode(full))}=${getString(tryEncode(val))}`);
+		else if (val instanceof Date) parts.push(`${getString(tryEncode(full))}=${val.toJSON()}`);
 	}
 	return parts;
 }
@@ -4096,7 +4094,7 @@ function isDecodable(value) {
 	return TYPES.has(typeof value);
 }
 function setQueryValue(parameters, key, value) {
-	if (key.includes(".")) setValue(parameters, key, getQueryValue(value));
+	if (EXPRESSION_DOT.test(key)) setValue(parameters, key, getQueryValue(value));
 	else if (key in parameters) {
 		if (!Array.isArray(parameters[key])) parameters[key] = [parameters[key]];
 		parameters[key].push(getQueryValue(value));
@@ -4108,10 +4106,13 @@ function setQueryValue(parameters, key, value) {
 * @returns Query string representation of the object
 */
 function toQuery(parameters) {
-	return isPlainObject(parameters) ? join(getParts(parameters, false).filter((part) => part.length > 0), "&") : "";
+	return isPlainObject(parameters) ? join(getParts(parameters, false).filter((part) => part.length > 0), AMPERSAND) : "";
 }
+const AMPERSAND = "&";
+const EQUAL = "=";
 const EXPRESSION_ARRAY_SUFFIX = /\[\]$/;
 const EXPRESSION_BOOLEAN = /^(false|true)$/;
+const EXPRESSION_DOT = /\./g;
 const TRUE = "true";
 const TYPES = new Set([
 	"boolean",

package/dist/internal/number.mjs

@@ -51,12 +51,10 @@ function getNumber(value) {
 	if (EXPRESSION_ZEROISH.test(parsed)) return 0;
 	const isBinary = EXPRESSION_BINARY.test(trimmed);
 	if (isBinary || EXPRESSION_OCTAL.test(trimmed)) return Number.parseInt(trimmed.slice(2), isBinary ? 2 : OCTAL_VALUE);
-	return Number(EXPRESSION_HEX.test(trimmed) ? trimmed : trimmed.replace(EXPRESSION_UNDERSCORE, ""));
+	return Number(trimmed);
 }
 const EXPRESSION_BINARY = /^0b[01]+$/i;
-const EXPRESSION_HEX = /^0x[0-9a-f]+$/i;
 const EXPRESSION_OCTAL = /^0o[0-7]+$/i;
-const EXPRESSION_UNDERSCORE = /_/g;
 const EXPRESSION_ZEROISH = /^\s*0+\s*$/;
 const OCTAL_VALUE = 8;
 //#endregion

package/dist/query.mjs

@@ -1,5 +1,5 @@
 import { isPlainObject } from "./internal/is.mjs";
-import { ignoreKey, join, tryDecode, tryEncode } from "./internal/string.mjs";
+import { getString, ignoreKey, join, tryDecode, tryEncode } from "./internal/string.mjs";
 import { getNumber } from "./internal/number.mjs";
 import { setValue } from "./internal/value/set.mjs";
 //#region src/query.ts
@@ -10,11 +10,11 @@ import { setValue } from "./internal/value/set.mjs";
 */
 function fromQuery(query) {
 	if (typeof query !== "string" || query.trim().length === 0) return {};
-	const parts = query.split("&");
+	const parts = query.split(AMPERSAND);
 	const { length } = parts;
 	const parameters = {};
 	for (let index = 0; index < length; index += 1) {
-		const decoded = parts[index].split("=").map(tryDecode);
+		const decoded = parts[index].split(EQUAL).map(tryDecode);
 		const key = decoded[0].replace(EXPRESSION_ARRAY_SUFFIX, "");
 		if (!ignoreKey(key)) setQueryValue(parameters, key, decoded[1]);
 	}
@@ -30,8 +30,8 @@ function getParts(value, fromArray, prefix) {
 		const full = join([prefix, fromArray ? void 0 : key], ".");
 		if (Array.isArray(val)) parts.push(...getParts(val, true, full));
 		else if (isPlainObject(val)) parts.push(...getParts(val, false, full));
-		else if (isDecodable(val)) parts.push(`${tryEncode(full)}=${tryEncode(val)}`);
-		else if (val instanceof Date) parts.push(`${tryEncode(full)}=${val.toJSON()}`);
+		else if (isDecodable(val)) parts.push(`${getString(tryEncode(full))}=${getString(tryEncode(val))}`);
+		else if (val instanceof Date) parts.push(`${getString(tryEncode(full))}=${val.toJSON()}`);
 	}
 	return parts;
 }
@@ -48,7 +48,7 @@ function isDecodable(value) {
 	return TYPES.has(typeof value);
 }
 function setQueryValue(parameters, key, value) {
-	if (key.includes(".")) setValue(parameters, key, getQueryValue(value));
+	if (EXPRESSION_DOT.test(key)) setValue(parameters, key, getQueryValue(value));
 	else if (key in parameters) {
 		if (!Array.isArray(parameters[key])) parameters[key] = [parameters[key]];
 		parameters[key].push(getQueryValue(value));
@@ -60,10 +60,13 @@ function setQueryValue(parameters, key, value) {
 * @returns Query string representation of the object
 */
 function toQuery(parameters) {
-	return isPlainObject(parameters) ? join(getParts(parameters, false).filter((part) => part.length > 0), "&") : "";
+	return isPlainObject(parameters) ? join(getParts(parameters, false).filter((part) => part.length > 0), AMPERSAND) : "";
 }
+const AMPERSAND = "&";
+const EQUAL = "=";
 const EXPRESSION_ARRAY_SUFFIX = /\[\]$/;
 const EXPRESSION_BOOLEAN = /^(false|true)$/;
+const EXPRESSION_DOT = /\./g;
 const TRUE = "true";
 const TYPES = new Set([
 	"boolean",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oscarpalmer/atoms",
-	"version": "0.173.1",
+	"version": "0.173.3",
 	"description": "Atomic utilities for making your JavaScript better.",
 	"keywords": [
 		"helper",

package/src/internal/number.ts

@@ -94,9 +94,7 @@ export function getNumber(value: unknown): number {
 		return Number.parseInt(trimmed.slice(2), isBinary ? 2 : OCTAL_VALUE);
 	}
 
-	return Number(
-		EXPRESSION_HEX.test(trimmed) ? trimmed : trimmed.replace(EXPRESSION_UNDERSCORE, ''),
-	);
+	return Number(trimmed);
 }
 
 // #endregion
@@ -105,12 +103,8 @@ export function getNumber(value: unknown): number {
 
 const EXPRESSION_BINARY = /^0b[01]+$/i;
 
-const EXPRESSION_HEX = /^0x[0-9a-f]+$/i;
-
 const EXPRESSION_OCTAL = /^0o[0-7]+$/i;
 
-const EXPRESSION_UNDERSCORE = /_/g;
-
 const EXPRESSION_ZEROISH = /^\s*0+\s*$/;
 
 const OCTAL_VALUE = 8;

package/src/query.ts

@@ -1,6 +1,6 @@
 import {isPlainObject} from './internal/is';
 import {getNumber} from './internal/number';
-import {ignoreKey, join, tryDecode, tryEncode} from './internal/string';
+import {getString, ignoreKey, join, tryDecode, tryEncode} from './internal/string';
 import {setValue} from './internal/value/set';
 import type {ArrayOrPlainObject, PlainObject} from './models';
 
@@ -16,13 +16,13 @@ export function fromQuery(query: string): PlainObject {
 		return {};
 	}
 
-	const parts = query.split('&');
+	const parts = query.split(AMPERSAND);
 	const {length} = parts;
 
 	const parameters: PlainObject = {};
 
 	for (let index = 0; index < length; index += 1) {
-		const decoded = parts[index].split('=').map(tryDecode);
+		const decoded = parts[index].split(EQUAL).map(tryDecode);
 		const key = decoded[0].replace(EXPRESSION_ARRAY_SUFFIX, '');
 
 		if (!ignoreKey(key)) {
@@ -50,9 +50,9 @@ function getParts(value: ArrayOrPlainObject, fromArray: boolean, prefix?: string
 		} else if (isPlainObject(val)) {
 			parts.push(...getParts(val, false, full));
 		} else if (isDecodable(val)) {
-			parts.push(`${tryEncode(full)}=${tryEncode(val)}`);
+			parts.push(`${getString(tryEncode(full))}=${getString(tryEncode(val))}`);
 		} else if (val instanceof Date) {
-			parts.push(`${tryEncode(full)}=${val.toJSON()}`);
+			parts.push(`${getString(tryEncode(full))}=${val.toJSON()}`);
 		}
 	}
 
@@ -86,7 +86,7 @@ function isDecodable(value: unknown): value is boolean | number | string {
 }
 
 function setQueryValue(parameters: PlainObject, key: string, value: string): void {
-	if (key.includes('.')) {
+	if (EXPRESSION_DOT.test(key)) {
 		setValue(parameters, key, getQueryValue(value));
 	} else {
 		if (key in parameters) {
@@ -110,7 +110,7 @@ export function toQuery(parameters: PlainObject): string {
 	return isPlainObject(parameters)
 		? join(
 				getParts(parameters, false).filter(part => part.length > 0),
-				'&',
+				AMPERSAND,
 			)
 		: '';
 }
@@ -119,10 +119,16 @@ export function toQuery(parameters: PlainObject): string {
 
 // #region Variables
 
+const AMPERSAND = '&';
+
+const EQUAL = '=';
+
 const EXPRESSION_ARRAY_SUFFIX = /\[\]$/;
 
 const EXPRESSION_BOOLEAN = /^(false|true)$/;
 
+const EXPRESSION_DOT = /\./g;
+
 const TRUE = 'true';
 
 const TYPES = new Set(['boolean', 'number', 'string']);