@valkyriestudios/utils 12.31.0 → 12.32.0

package/date/isFormat.js

@@ -92,12 +92,10 @@ function compileSpec(spec, is_chunk = false) {
     return cached;
 }
 function isDateFormat(input, spec) {
-    if (typeof input !== 'string' || input.trim().length === 0) {
-        throw new TypeError('isDateFormat: input must be a non-empty string');
-    }
-    if (typeof spec !== 'string') {
+    if (typeof input !== 'string')
+        throw new TypeError('isDateFormat: input must be a string');
+    if (typeof spec !== 'string')
         throw new TypeError('isDateFormat: spec must be a string');
-    }
     const { tokens, rgx } = compileSpec(SPEC_ALIASES[spec] || spec);
     if (!tokens.length)
         return false;

package/formdata/toObject.js

@@ -3,19 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.toObject = toObject;
 exports.default = toObject;
 const isFormat_1 = require("../date/isFormat");
-const RGX_CLOSE = /\]/g;
-const RGX_DIGIT = /^\d+$/;
-function assignValue(acc, rawkey, value, single) {
+const RGX_TOKENS = /[^.[\]]+/g;
+function assign(acc, rawkey, value, single) {
     let cursor = acc;
-    const keys = rawkey.replace(RGX_CLOSE, '').split(/\[|\./);
+    const keys = rawkey.match(RGX_TOKENS);
     const keys_len = keys.length;
     for (let i = 0; i < keys_len; i++) {
         const key = keys[i];
         if (i < (keys_len - 1)) {
             const n_key = Array.isArray(cursor) ? Number(key) : key;
-            if (!cursor[n_key]) {
-                cursor[n_key] = RGX_DIGIT.test(keys[i + 1]) ? [] : {};
-            }
+            if (!cursor[n_key])
+                cursor[n_key] = Number.isInteger(+keys[i + 1]) ? [] : {};
             cursor = cursor[n_key];
         }
         else if (!(key in cursor) || single.has(key)) {
@@ -42,31 +40,31 @@ function toObject(form, config) {
     const nNumber = config?.normalize_number !== false;
     const acc = {};
     form.forEach((value, key) => {
-        if (set !== true && typeof value === 'string' && value !== '' && !set.has(key)) {
+        if (set !== true && value !== '' && typeof value === 'string' && !set.has(key)) {
             if (nBool) {
-                const lower = value.toLowerCase();
-                if (lower === 'true') {
-                    assignValue(acc, key, true, single);
-                    return;
-                }
-                else if (lower === 'false') {
-                    assignValue(acc, key, false, single);
-                    return;
+                switch (value) {
+                    case 'true':
+                    case 'TRUE':
+                    case 'True':
+                        return assign(acc, key, true, single);
+                    case 'false':
+                    case 'FALSE':
+                    case 'False':
+                        return assign(acc, key, false, single);
+                    default:
+                        break;
                 }
             }
             if (nNumber) {
                 const nVal = Number(value);
-                if (!isNaN(nVal)) {
-                    assignValue(acc, key, nVal, single);
-                    return;
-                }
-            }
-            if (nDate && (0, isFormat_1.isDateFormat)(value, 'ISO')) {
-                assignValue(acc, key, new Date(value), single);
-                return;
+                if (!isNaN(nVal))
+                    return assign(acc, key, nVal, single);
             }
+            if (nDate &&
+                (0, isFormat_1.isDateFormat)(value, 'ISO'))
+                return assign(acc, key, new Date(value), single);
         }
-        assignValue(acc, key, value, single);
+        assign(acc, key, value, single);
     });
     return acc;
 }

package/index.d.ts

@@ -38,10 +38,25 @@ declare module "array/join" {
     export { join, join as default };
 }
 declare module "object/merge" {
-    type MergeOptions = {
-        union?: boolean;
+    type Merge<T, U> = {
+        [K in keyof T | keyof U]: K extends keyof U ? U[K] : K extends keyof T ? T[K] : never;
     };
-    function merge(target: Record<string, any>, source?: Record<string, any> | Record<string, any>[], opts?: MergeOptions): Record<string, any>;
+    type MergeNonUnion<T, U> = {
+        [K in keyof T]: K extends keyof U ? U[K] : T[K];
+    };
+    type MergeArray<T, U extends Record<string, unknown>[], Union extends boolean> = U extends [infer Head, ...infer Tail] ? Head extends Record<string, unknown> ? Tail extends Record<string, unknown>[] ? MergeArray<Union extends true ? Merge<T, Head> : MergeNonUnion<T, Head>, Tail, Union> : Union extends true ? Merge<T, Head> : MergeNonUnion<T, Head> : T : T;
+    function merge<T extends Record<string, unknown>, U extends Record<string, unknown>>(target: T, source: U, opts: {
+        union: true;
+    }): Merge<T, U>;
+    function merge<T extends Record<string, unknown>, U extends Record<string, unknown>>(target: T, source: U, opts?: {
+        union?: false;
+    }): MergeNonUnion<T, U>;
+    function merge<T extends Record<string, unknown>, U extends Record<string, unknown>[]>(target: T, sources: [...U], opts: {
+        union: true;
+    }): MergeArray<T, U, true>;
+    function merge<T extends Record<string, unknown>, U extends Record<string, unknown>[]>(target: T, sources: [...U], opts?: {
+        union?: false;
+    }): MergeArray<T, U, false>;
     export { merge, merge as default };
 }
 declare module "array/mapFn" {

package/object/merge.d.ts

@@ -1,17 +1,31 @@
-type MergeOptions = {
-    /**
-     * Defaults to false, when passed as true it ensures all keys from both objects
-     * are available in the merged object
-     */
-    union?: boolean;
+/**
+ * For union true: for every key in T or U, use U’s type if available; otherwise T’s.
+ */
+type Merge<T, U> = {
+    [K in keyof T | keyof U]: K extends keyof U ? U[K] : K extends keyof T ? T[K] : never;
+};
+/**
+ * For union false: only keys in T are retained; if U has a key, override its type.
+ */
+type MergeNonUnion<T, U> = {
+    [K in keyof T]: K extends keyof U ? U[K] : T[K];
 };
 /**
- * Deep merge two objects together while ensuring nested objects also get merged,
- * take note: this does not merge onto passed objects by reference but instead
- * returns a new object
- *
- * @param {Record<string,any>} target - Base Object
- * @param {Record<string,any>|Record<string,any>[]} source - (default={}) Object to merge onto base object
+ * Recursively merge an array of source objects.
+ * For each element in the array, apply Merge (if union is true)
+ * or MergeNonUnion (if union is false).
  */
-declare function merge(target: Record<string, any>, source?: Record<string, any> | Record<string, any>[], opts?: MergeOptions): Record<string, any>;
+type MergeArray<T, U extends Record<string, unknown>[], Union extends boolean> = U extends [infer Head, ...infer Tail] ? Head extends Record<string, unknown> ? Tail extends Record<string, unknown>[] ? MergeArray<Union extends true ? Merge<T, Head> : MergeNonUnion<T, Head>, Tail, Union> : Union extends true ? Merge<T, Head> : MergeNonUnion<T, Head> : T : T;
+declare function merge<T extends Record<string, unknown>, U extends Record<string, unknown>>(target: T, source: U, opts: {
+    union: true;
+}): Merge<T, U>;
+declare function merge<T extends Record<string, unknown>, U extends Record<string, unknown>>(target: T, source: U, opts?: {
+    union?: false;
+}): MergeNonUnion<T, U>;
+declare function merge<T extends Record<string, unknown>, U extends Record<string, unknown>[]>(target: T, sources: [...U], opts: {
+    union: true;
+}): MergeArray<T, U, true>;
+declare function merge<T extends Record<string, unknown>, U extends Record<string, unknown>[]>(target: T, sources: [...U], opts?: {
+    union?: false;
+}): MergeArray<T, U, false>;
 export { merge, merge as default };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@valkyriestudios/utils",
-    "version": "12.31.0",
+    "version": "12.32.0",
     "description": "A collection of single-function utilities for common tasks",
     "author": {
         "name": "Peter Vermeulen",
@@ -75,6 +75,14 @@
             "types": "./is.d.ts"
         },
         "./array": {
+            "import": {
+                "default": "./array/index.js",
+                "types": "./array/index.d.ts"
+            },
+            "require": {
+                "default": "./array/index.js",
+                "types": "./array/index.d.ts"
+            },
             "default": "./array/index.js",
             "types": "./array/index.d.ts"
         },
@@ -1100,11 +1108,11 @@
         }
     },
     "devDependencies": {
-        "@types/node": "^22.13.1",
+        "@types/node": "^22.13.5",
         "esbuild-register": "^3.6.0",
-        "eslint": "^9.19.0",
+        "eslint": "^9.21.0",
         "nyc": "^17.1.0",
         "typescript": "^5.7.3",
-        "typescript-eslint": "^8.23.0"
+        "typescript-eslint": "^8.25.0"
     }
 }