@cyberskill/shared 2.5.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 s=require("lodash-es");var c=Object.defineProperty,y=Object.defineProperties,d=Object.getOwnPropertyDescriptors,u=Object.getOwnPropertySymbols,m=Object.prototype.hasOwnProperty,v=Object.prototype.propertyIsEnumerable,a=(t,e,n)=>e in t?c(t,e,{enumerable:!0,configurable:!0,writable:!0,value:n}):t[e]=n,l=(t,e)=>{for(var n in e||(e={}))m.call(e,n)&&a(t,n,e[n]);if(u)for(var n of u(e))v.call(e,n)&&a(t,n,e[n]);return t},f=(t,e)=>y(t,d(e));function g(t){try{return JSON.parse(t),!0}catch(e){return!1}}function _(t,e){return e.reduce((n,o)=>{if(n&&typeof n=="object"&&o in n)return n[o]},t)}function p(t,e,n){if(e.length===0)return t;const[o,...r]=e;if(r.length===0)return f(l({},t),{[o]:n});const i=t[o];return f(l({},t),{[o]:p(typeof i=="object"&&i!==null?i:{},r,n)})}function h(...t){if(t.length===0)return{};const e=t.filter(r=>r!=null).map(r=>typeof r!="object"?{}:r);if(e.length===0)return{};if(e.length===1)return e[0];if(e.every(s.isArray))return[].concat(...e);if(e.every(r=>typeof r=="object"&&r!==null&&!s.isArray(r)))return s.mergeWith({},...e,(r,i)=>{if(s.isArray(r)&&s.isArray(i))return r.concat(i)});if(e.every(r=>typeof r!="object"||r===null))throw new Error("deepMerge: Cannot merge primitive values. All arguments must be objects or arrays.");const n=e.some(s.isArray),o=e.some(r=>typeof r=="object"&&r!==null&&!s.isArray(r));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.")}exports.deepMerge=h;exports.getNestedValue=_;exports.isJSON=g;exports.setNestedValue=p;
+"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

@@ -71,3 +71,20 @@ export declare function deepMerge<T extends Record<string, unknown>>(...args: (T
  * @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 normalizeMongoFilter<T extends Record<string, unknown>>(filter: T): T;

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

@@ -1,46 +1,46 @@
-import { isArray as i, mergeWith as l } from "lodash-es";
-var c = Object.defineProperty, d = Object.defineProperties, m = Object.getOwnPropertyDescriptors, u = Object.getOwnPropertySymbols, y = Object.prototype.hasOwnProperty, v = Object.prototype.propertyIsEnumerable, f = (t, e, n) => e in t ? c(t, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : t[e] = n, a = (t, 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 = {}))
-    y.call(e, n) && f(t, n, e[n]);
+    b.call(e, n) && a(r, n, e[n]);
   if (u)
     for (var n of u(e))
-      v.call(e, n) && f(t, n, e[n]);
-  return t;
-}, p = (t, e) => d(t, m(e));
-function O(t) {
+      _.call(e, n) && a(r, n, e[n]);
+  return r;
+}, c = (r, e) => m(r, v(e));
+function j(r) {
   try {
-    return JSON.parse(t), !0;
+    return JSON.parse(r), !0;
   } catch (e) {
     return !1;
   }
 }
-function b(t, e) {
+function w(r, e) {
   return e.reduce((n, o) => {
     if (n && typeof n == "object" && o in n)
       return n[o];
-  }, t);
+  }, r);
 }
-function _(t, e, n) {
+function O(r, e, n) {
   if (e.length === 0)
-    return t;
-  const [o, ...r] = e;
-  if (r.length === 0)
-    return p(a({}, t), {
+    return r;
+  const [o, ...t] = e;
+  if (t.length === 0)
+    return c(f({}, r), {
       [o]: n
     });
-  const s = t[o];
-  return p(a({}, t), {
-    [o]: _(
+  const s = r[o];
+  return c(f({}, r), {
+    [o]: O(
       typeof s == "object" && s !== null ? s : {},
-      r,
+      t,
       n
     )
   });
 }
-function g(...t) {
-  if (t.length === 0)
+function P(...r) {
+  if (r.length === 0)
     return {};
-  const e = t.filter((r) => r != null).map((r) => typeof r != "object" ? {} : r);
+  const e = r.filter((t) => t != null).map((t) => typeof t != "object" ? {} : t);
   if (e.length === 0)
     return {};
   if (e.length === 1)
@@ -48,18 +48,18 @@ function g(...t) {
   if (e.every(i))
     return [].concat(...e);
   if (e.every(
-    (r) => typeof r == "object" && r !== null && !i(r)
+    (t) => typeof t == "object" && t !== null && !i(t)
   ))
-    return l({}, ...e, (r, s) => {
-      if (i(r) && i(s))
-        return r.concat(s);
+    return y({}, ...e, (t, s) => {
+      if (i(t) && i(s))
+        return t.concat(s);
     });
-  if (e.every((r) => typeof r != "object" || r === null))
+  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(
-    (r) => typeof r == "object" && r !== null && !i(r)
+    (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."
@@ -67,9 +67,25 @@ function g(...t) {
     "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 {
-  g as deepMerge,
-  b as getNestedValue,
-  O as isJSON,
-  _ 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.5.0",
+    "version": "2.6.0",
     "description": "CyberSkill Shared",
     "author": "Stephen Cheng",
     "license": "MIT",
@@ -249,7 +249,7 @@
         "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",