@cyberskill/shared 2.4.0 → 2.6.0

package/dist/util/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("./common/common.util.cjs"),t=require("./object/object.util.cjs"),a=require("./serializer/serializer.util.cjs"),e=require("./string/string.util.cjs"),i=require("./validate/validate.util.cjs");exports.mapEnvironment=r.mapEnvironment;exports.regexSearchMapper=r.regexSearchMapper;exports.removeAccent=r.removeAccent;exports.uniqueArray=r.uniqueArray;exports.deepMerge=t.deepMerge;exports.getNestedValue=t.getNestedValue;exports.isJSON=t.isJSON;exports.setNestedValue=t.setNestedValue;exports.serializer=a.serializer;exports.generateRandomPassword=e.generateRandomPassword;exports.generateShortId=e.generateShortId;exports.generateSlug=e.generateSlug;exports.getFileName=e.getFileName;exports.substringBetween=e.substringBetween;exports.validate=i.validate;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const t=require("./common/common.util.cjs"),e=require("./object/object.util.cjs"),a=require("./serializer/serializer.util.cjs"),r=require("./string/string.util.cjs"),i=require("./validate/validate.util.cjs");exports.mapEnvironment=t.mapEnvironment;exports.regexSearchMapper=t.regexSearchMapper;exports.removeAccent=t.removeAccent;exports.uniqueArray=t.uniqueArray;exports.deepMerge=e.deepMerge;exports.getNestedValue=e.getNestedValue;exports.isJSON=e.isJSON;exports.normalizeMongoFilter=e.normalizeMongoFilter;exports.setNestedValue=e.setNestedValue;exports.serializer=a.serializer;exports.generateRandomPassword=r.generateRandomPassword;exports.generateShortId=r.generateShortId;exports.generateSlug=r.generateSlug;exports.getFileName=r.getFileName;exports.substringBetween=r.substringBetween;exports.validate=i.validate;

package/dist/util/index.js

@@ -1,22 +1,23 @@
-import { mapEnvironment as t, regexSearchMapper as a, removeAccent as o, uniqueArray as n } from "./common/common.util.js";
-import { deepMerge as g, getNestedValue as p, isJSON as s, setNestedValue as i } from "./object/object.util.js";
-import { serializer as l } from "./serializer/serializer.util.js";
-import { generateRandomPassword as x, generateShortId as f, generateSlug as N, getFileName as S, substringBetween as c } from "./string/string.util.js";
+import { mapEnvironment as t, regexSearchMapper as o, removeAccent as a, uniqueArray as n } from "./common/common.util.js";
+import { deepMerge as g, getNestedValue as i, isJSON as p, normalizeMongoFilter as s, setNestedValue as l } from "./object/object.util.js";
+import { serializer as u } from "./serializer/serializer.util.js";
+import { generateRandomPassword as f, generateShortId as N, generateSlug as S, getFileName as c, substringBetween as v } from "./string/string.util.js";
 import { validate as h } from "./validate/validate.util.js";
 export {
   g as deepMerge,
-  x as generateRandomPassword,
-  f as generateShortId,
-  N as generateSlug,
-  S as getFileName,
-  p as getNestedValue,
-  s as isJSON,
+  f as generateRandomPassword,
+  N as generateShortId,
+  S as generateSlug,
+  c as getFileName,
+  i as getNestedValue,
+  p as isJSON,
   t as mapEnvironment,
-  a as regexSearchMapper,
-  o as removeAccent,
-  l as serializer,
-  i as setNestedValue,
-  c as substringBetween,
+  s as normalizeMongoFilter,
+  o as regexSearchMapper,
+  a as removeAccent,
+  u as serializer,
+  l as setNestedValue,
+  v as substringBetween,
   n as uniqueArray,
   h as validate
 };

package/dist/util/object/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./object.util.cjs");exports.deepMerge=e.deepMerge;exports.getNestedValue=e.getNestedValue;exports.isJSON=e.isJSON;exports.setNestedValue=e.setNestedValue;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./object.util.cjs");exports.deepMerge=e.deepMerge;exports.getNestedValue=e.getNestedValue;exports.isJSON=e.isJSON;exports.normalizeMongoFilter=e.normalizeMongoFilter;exports.setNestedValue=e.setNestedValue;

package/dist/util/object/index.js

@@ -1,7 +1,8 @@
-import { deepMerge as s, getNestedValue as d, isJSON as r, setNestedValue as N } from "./object.util.js";
+import { deepMerge as o, getNestedValue as r, isJSON as l, normalizeMongoFilter as s, setNestedValue as a } from "./object.util.js";
 export {
-  s as deepMerge,
-  d as getNestedValue,
-  r as isJSON,
-  N as setNestedValue
+  o as deepMerge,
+  r as getNestedValue,
+  l as isJSON,
+  s as normalizeMongoFilter,
+  a as setNestedValue
 };

package/dist/util/object/object.util.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("lodash-es");var l=Object.defineProperty,d=Object.defineProperties,y=Object.getOwnPropertyDescriptors,u=Object.getOwnPropertySymbols,_=Object.prototype.hasOwnProperty,O=Object.prototype.propertyIsEnumerable,a=(e,r,t)=>r in e?l(e,r,{enumerable:!0,configurable:!0,writable:!0,value:t}):e[r]=t,p=(e,r)=>{for(var t in r||(r={}))_.call(r,t)&&a(e,t,r[t]);if(u)for(var t of u(r))O.call(r,t)&&a(e,t,r[t]);return e},f=(e,r)=>d(e,y(r));function P(e){try{return JSON.parse(e),!0}catch(r){return!1}}function g(e,r){return r.reduce((t,n)=>{if(t&&typeof t=="object"&&n in t)return t[n]},e)}function c(e,r,t){if(r.length===0)return e;const[n,...i]=r;if(i.length===0)return f(p({},e),{[n]:t});const s=e[n];return f(p({},e),{[n]:c(typeof s=="object"&&s!==null?s:{},i,t)})}function v(...e){if(e.every(o.isArray))return[].concat(...e);if(e.every(o.isPlainObject))return o.mergeWith({},...e,(r,t)=>{if(o.isArray(r)&&o.isArray(t))return r.concat(t)});throw new Error("deepMerge: All arguments must be either arrays or objects of the same type.")}exports.deepMerge=v;exports.getNestedValue=g;exports.isJSON=P;exports.setNestedValue=c;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("lodash-es");var m=Object.defineProperty,v=Object.defineProperties,b=Object.getOwnPropertyDescriptors,a=Object.getOwnPropertySymbols,g=Object.prototype.hasOwnProperty,O=Object.prototype.propertyIsEnumerable,u=(r,e,n)=>e in r?m(r,e,{enumerable:!0,configurable:!0,writable:!0,value:n}):r[e]=n,l=(r,e)=>{for(var n in e||(e={}))g.call(e,n)&&u(r,n,e[n]);if(a)for(var n of a(e))O.call(e,n)&&u(r,n,e[n]);return r},c=(r,e)=>v(r,b(e));function _(r){try{return JSON.parse(r),!0}catch(e){return!1}}function h(r,e){return e.reduce((n,o)=>{if(n&&typeof n=="object"&&o in n)return n[o]},r)}function f(r,e,n){if(e.length===0)return r;const[o,...t]=e;if(t.length===0)return c(l({},r),{[o]:n});const s=r[o];return c(l({},r),{[o]:f(typeof s=="object"&&s!==null?s:{},t,n)})}function j(...r){if(r.length===0)return{};const e=r.filter(t=>t!=null).map(t=>typeof t!="object"?{}:t);if(e.length===0)return{};if(e.length===1)return e[0];if(e.every(i.isArray))return[].concat(...e);if(e.every(t=>typeof t=="object"&&t!==null&&!i.isArray(t)))return i.mergeWith({},...e,(t,s)=>{if(i.isArray(t)&&i.isArray(s))return t.concat(s)});if(e.every(t=>typeof t!="object"||t===null))throw new Error("deepMerge: Cannot merge primitive values. All arguments must be objects or arrays.");const n=e.some(i.isArray),o=e.some(t=>typeof t=="object"&&t!==null&&!i.isArray(t));throw n&&o?new Error("deepMerge: Cannot mix arrays and objects. All arguments must be either arrays or objects."):new Error("deepMerge: Invalid arguments provided. All arguments must be objects or arrays of the same type.")}function p(r){if(!r||typeof r!="object")return r;const e={};for(const[n,o]of Object.entries(r))if(o&&typeof o=="object"&&!Array.isArray(o)){const t=p(o);for(const[s,y]of Object.entries(t)){const d=`${n}.${s}`;e[d]=y}}else e[n]=o;return e}exports.deepMerge=j;exports.getNestedValue=h;exports.isJSON=_;exports.normalizeMongoFilter=p;exports.setNestedValue=f;

package/dist/util/object/object.util.d.ts

@@ -30,13 +30,61 @@ export declare function getNestedValue<T>(obj: T, path: (string | number)[]): un
 export declare function setNestedValue<T>(obj: T, path: (string | number)[], value: unknown): T;
 /**
  * Deep merges multiple objects or arrays into a single object or array.
- * This function handles different types of merging:
+ * This function handles different types of merging with improved type safety and error handling:
  * - If all arguments are arrays, it concatenates them
  * - If all arguments are objects, it deeply merges them (concatenating arrays within objects)
- * - Throws an error if mixed types are provided
+ * - Handles null/undefined values gracefully by treating them as empty objects
+ * - Provides better type inference and safety
+ * - Throws descriptive errors for invalid input
  *
- * @param args - The objects or arrays to merge.
+ * @param args - The objects or arrays to merge. Can be empty, in which case returns an empty object.
  * @returns The merged result - either a concatenated array or a deeply merged object.
- * @throws {Error} When arguments are mixed types (some arrays, some objects).
+ * @throws {Error} When arguments are mixed types (some arrays, some objects) or when all arguments are primitive values.
+ *
+ * @example
+ * ```typescript
+ * // Merge objects
+ * deepMerge({ a: 1 }, { b: 2 }, { a: 3 }) // { a: 3, b: 2 }
+ *
+ * // Merge arrays
+ * deepMerge([1, 2], [3, 4]) // [1, 2, 3, 4]
+ *
+ * // Handle null/undefined
+ * deepMerge({ a: 1 }, null, undefined, { b: 2 }) // { a: 1, b: 2 }
+ *
+ * // Nested objects with arrays
+ * deepMerge(
+ *   { items: [1, 2], config: { theme: 'dark' } },
+ *   { items: [3, 4], config: { size: 'large' } }
+ * ) // { items: [1, 2, 3, 4], config: { theme: 'dark', size: 'large' } }
+ * ```
+ */
+/**
+ * Deep merges multiple objects into a single object.
+ * @param args - The objects to merge. Can be empty, in which case returns an empty object.
+ * @returns The merged object.
+ */
+export declare function deepMerge<T extends Record<string, unknown>>(...args: (T | null | undefined)[]): T;
+/**
+ * Deep merges multiple arrays into a single array.
+ * @param args - The arrays to merge. Can be empty, in which case returns an empty array.
+ * @returns The merged array.
+ */
+export declare function deepMerge<T extends unknown[]>(...args: (T | null | undefined)[]): T;
+/**
+ * Normalizes MongoDB filters to support both dot notation strings and nested objects.
+ * This function converts nested object filters to dot notation format to ensure
+ * consistent behavior across different filter input formats.
+ *
+ * @param filter - The filter object to normalize.
+ * @returns A normalized filter object with nested objects converted to dot notation.
+ *
+ * @example
+ * ```typescript
+ * // Both of these will work the same way:
+ * normalizeMongoFilter({ "location.countryId": "240" })
+ * normalizeMongoFilter({ location: { countryId: "240" } })
+ * // Both return: { "location.countryId": "240" }
+ * ```
  */
-export declare function deepMerge<T = unknown>(...args: T[]): T;
+export declare function normalizeMongoFilter<T extends Record<string, unknown>>(filter: T): T;

package/dist/util/object/object.util.js

@@ -1,55 +1,91 @@
-import { isArray as i, isPlainObject as c, mergeWith as l } from "lodash-es";
-var _ = Object.defineProperty, O = Object.defineProperties, d = Object.getOwnPropertyDescriptors, s = Object.getOwnPropertySymbols, y = Object.prototype.hasOwnProperty, P = Object.prototype.propertyIsEnumerable, u = (e, r, t) => r in e ? _(e, r, { enumerable: !0, configurable: !0, writable: !0, value: t }) : e[r] = t, f = (e, r) => {
-  for (var t in r || (r = {}))
-    y.call(r, t) && u(e, t, r[t]);
-  if (s)
-    for (var t of s(r))
-      P.call(r, t) && u(e, t, r[t]);
-  return e;
-}, a = (e, r) => O(e, d(r));
-function g(e) {
+import { isArray as i, mergeWith as y } from "lodash-es";
+var d = Object.defineProperty, m = Object.defineProperties, v = Object.getOwnPropertyDescriptors, u = Object.getOwnPropertySymbols, b = Object.prototype.hasOwnProperty, _ = Object.prototype.propertyIsEnumerable, a = (r, e, n) => e in r ? d(r, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : r[e] = n, f = (r, e) => {
+  for (var n in e || (e = {}))
+    b.call(e, n) && a(r, n, e[n]);
+  if (u)
+    for (var n of u(e))
+      _.call(e, n) && a(r, n, e[n]);
+  return r;
+}, c = (r, e) => m(r, v(e));
+function j(r) {
   try {
-    return JSON.parse(e), !0;
-  } catch (r) {
+    return JSON.parse(r), !0;
+  } catch (e) {
     return !1;
   }
 }
-function h(e, r) {
-  return r.reduce((t, n) => {
-    if (t && typeof t == "object" && n in t)
-      return t[n];
-  }, e);
+function w(r, e) {
+  return e.reduce((n, o) => {
+    if (n && typeof n == "object" && o in n)
+      return n[o];
+  }, r);
 }
-function m(e, r, t) {
-  if (r.length === 0)
-    return e;
-  const [n, ...p] = r;
-  if (p.length === 0)
-    return a(f({}, e), {
-      [n]: t
+function O(r, e, n) {
+  if (e.length === 0)
+    return r;
+  const [o, ...t] = e;
+  if (t.length === 0)
+    return c(f({}, r), {
+      [o]: n
     });
-  const o = e[n];
-  return a(f({}, e), {
-    [n]: m(
-      typeof o == "object" && o !== null ? o : {},
-      p,
-      t
+  const s = r[o];
+  return c(f({}, r), {
+    [o]: O(
+      typeof s == "object" && s !== null ? s : {},
+      t,
+      n
     )
   });
 }
-function w(...e) {
+function P(...r) {
+  if (r.length === 0)
+    return {};
+  const e = r.filter((t) => t != null).map((t) => typeof t != "object" ? {} : t);
+  if (e.length === 0)
+    return {};
+  if (e.length === 1)
+    return e[0];
   if (e.every(i))
     return [].concat(...e);
-  if (e.every(c))
-    return l({}, ...e, (r, t) => {
-      if (i(r) && i(t))
-        return r.concat(t);
+  if (e.every(
+    (t) => typeof t == "object" && t !== null && !i(t)
+  ))
+    return y({}, ...e, (t, s) => {
+      if (i(t) && i(s))
+        return t.concat(s);
     });
-  throw new Error("deepMerge: All arguments must be either arrays or objects of the same type.");
+  if (e.every((t) => typeof t != "object" || t === null))
+    throw new Error(
+      "deepMerge: Cannot merge primitive values. All arguments must be objects or arrays."
+    );
+  const n = e.some(i), o = e.some(
+    (t) => typeof t == "object" && t !== null && !i(t)
+  );
+  throw n && o ? new Error(
+    "deepMerge: Cannot mix arrays and objects. All arguments must be either arrays or objects."
+  ) : new Error(
+    "deepMerge: Invalid arguments provided. All arguments must be objects or arrays of the same type."
+  );
+}
+function h(r) {
+  if (!r || typeof r != "object")
+    return r;
+  const e = {};
+  for (const [n, o] of Object.entries(r))
+    if (o && typeof o == "object" && !Array.isArray(o)) {
+      const t = h(o);
+      for (const [s, l] of Object.entries(t)) {
+        const p = `${n}.${s}`;
+        e[p] = l;
+      }
+    } else
+      e[n] = o;
+  return e;
 }
 export {
-  w as deepMerge,
-  h as getNestedValue,
-  g as isJSON,
-  m as setNestedValue
+  P as deepMerge,
+  w as getNestedValue,
+  j as isJSON,
+  h as normalizeMongoFilter,
+  O as setNestedValue
 };

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@cyberskill/shared",
     "type": "module",
-    "version": "2.4.0",
+    "version": "2.6.0",
     "description": "CyberSkill Shared",
     "author": "Stephen Cheng",
     "license": "MIT",
@@ -208,11 +208,11 @@
     },
     "dependencies": {
         "@antfu/eslint-config": "5.0.0",
-        "@apollo/client": "3.13.8",
-        "@apollo/client-integration-nextjs": "0.12.2",
+        "@apollo/client": "3.13.9",
+        "@apollo/client-integration-nextjs": "0.12.3",
         "@apollo/server": "5.0.0",
         "@as-integrations/express5": "1.1.2",
-        "@dotenvx/dotenvx": "1.48.3",
+        "@dotenvx/dotenvx": "1.48.4",
         "@eddeee888/gcg-typescript-resolver-files": "0.12.1",
         "@eslint-react/eslint-plugin": "1.52.3",
         "@graphql-codegen/cli": "5.0.7",
@@ -249,15 +249,15 @@
         "lodash-es": "4.17.21",
         "migrate-mongo": "12.1.3",
         "mongodb": "6.18.0",
-        "mongoose": "8.16.5",
+        "mongoose": "8.17.0",
         "mongoose-aggregate-paginate-v2": "1.1.4",
         "mongoose-paginate-v2": "1.9.1",
         "next-intl": "4.3.4",
         "node-fetch": "3.3.2",
         "node-persist": "4.0.4",
         "qs": "6.14.0",
-        "react": "19.1.0",
-        "react-dom": "19.1.0",
+        "react": "19.1.1",
+        "react-dom": "19.1.1",
         "react-hot-toast": "2.5.2",
         "react-i18next": "15.6.1",
         "slugify": "1.6.6",
@@ -271,7 +271,7 @@
         "@commitlint/cli": "19.8.1",
         "@commitlint/config-conventional": "19.8.1",
         "@eslint/config-inspector": "1.1.0",
-        "@next/eslint-plugin-next": "15.4.4",
+        "@next/eslint-plugin-next": "15.4.5",
         "@testing-library/jest-dom": "6.6.4",
         "@testing-library/react": "16.3.0",
         "@types/apollo-upload-client": "18.0.0",
@@ -289,15 +289,15 @@
         "@types/migrate-mongo": "10.0.5",
         "@types/node": "24.1.0",
         "@types/node-persist": "3.1.8",
-        "@types/react": "19.1.8",
-        "@types/react-dom": "19.1.6",
+        "@types/react": "19.1.9",
+        "@types/react-dom": "19.1.7",
         "@types/unorm": "1.3.31",
         "@types/uuid": "10.0.0",
         "@types/ws": "8.18.1",
         "@types/yargs": "17.0.33",
         "@vitest/browser": "3.2.4",
         "eslint": "9.32.0",
-        "eslint-config-next": "15.4.4",
+        "eslint-config-next": "15.4.5",
         "glob": "11.0.3",
         "lint-staged": "16.1.2",
         "node-modules-inspector": "1.0.0",