@cyberskill/shared 2.6.0 → 2.8.0

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

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

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

@@ -73,11 +73,12 @@ export declare function deepMerge<T extends Record<string, unknown>>(...args: (T
 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.
+ * This function converts nested object filters to dot notation format while preserving
+ * MongoDB operators 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.
+ * @returns A normalized filter object with nested objects converted to dot notation,
+ *          while preserving MongoDB operators as nested objects.
  *
  * @example
  * ```typescript
@@ -85,6 +86,10 @@ export declare function deepMerge<T extends unknown[]>(...args: (T | null | unde
  * normalizeMongoFilter({ "location.countryId": "240" })
  * normalizeMongoFilter({ location: { countryId: "240" } })
  * // Both return: { "location.countryId": "240" }
+ *
+ * // MongoDB operators are preserved:
+ * normalizeMongoFilter({ id: { $in: ["240", "59"] } })
+ * // Returns: { id: { $in: ["240", "59"] } }
  * ```
  */
 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 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]);
+import { isArray as i, mergeWith as m } from "lodash-es";
+var v = Object.defineProperty, O = Object.defineProperties, b = Object.getOwnPropertyDescriptors, a = Object.getOwnPropertySymbols, h = Object.prototype.hasOwnProperty, _ = Object.prototype.propertyIsEnumerable, u = (r, e, t) => e in r ? v(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t, f = (r, e) => {
+  for (var t in e || (e = {}))
+    h.call(e, t) && u(r, t, e[t]);
+  if (a)
+    for (var t of a(e))
+      _.call(e, t) && u(r, t, e[t]);
   return r;
-}, c = (r, e) => m(r, v(e));
-function j(r) {
+}, c = (r, e) => O(r, b(e));
+function w(r) {
   try {
     return JSON.parse(r), !0;
   } catch (e) {
     return !1;
   }
 }
-function w(r, e) {
-  return e.reduce((n, o) => {
-    if (n && typeof n == "object" && o in n)
-      return n[o];
+function P(r, e) {
+  return e.reduce((t, n) => {
+    if (t && typeof t == "object" && n in t)
+      return t[n];
   }, r);
 }
-function O(r, e, n) {
+function g(r, e, t) {
   if (e.length === 0)
     return r;
-  const [o, ...t] = e;
-  if (t.length === 0)
+  const [n, ...o] = e;
+  if (o.length === 0)
     return c(f({}, r), {
-      [o]: n
+      [n]: t
     });
-  const s = r[o];
+  const s = r[n];
   return c(f({}, r), {
-    [o]: O(
+    [n]: g(
       typeof s == "object" && s !== null ? s : {},
-      t,
-      n
+      o,
+      t
     )
   });
 }
-function P(...r) {
+function A(...r) {
   if (r.length === 0)
     return {};
-  const e = r.filter((t) => t != null).map((t) => typeof t != "object" ? {} : t);
+  const e = r.filter((o) => o != null).map((o) => typeof o != "object" ? {} : o);
   if (e.length === 0)
     return {};
   if (e.length === 1)
@@ -48,44 +48,50 @@ function P(...r) {
   if (e.every(i))
     return [].concat(...e);
   if (e.every(
-    (t) => typeof t == "object" && t !== null && !i(t)
+    (o) => typeof o == "object" && o !== null && !i(o)
   ))
-    return y({}, ...e, (t, s) => {
-      if (i(t) && i(s))
-        return t.concat(s);
+    return m({}, ...e, (o, s) => {
+      if (i(o) && i(s))
+        return o.concat(s);
     });
-  if (e.every((t) => typeof t != "object" || t === null))
+  if (e.every((o) => typeof o != "object" || o === 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)
+  const t = e.some(i), n = e.some(
+    (o) => typeof o == "object" && o !== null && !i(o)
   );
-  throw n && o ? new Error(
+  throw t && n ? 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) {
+function l(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;
+  for (const [t, n] of Object.entries(r))
+    if (n && typeof n == "object" && !Array.isArray(n))
+      if (Object.keys(n).some(
+        (s) => s.startsWith("$")
+      ))
+        e[t] = l(n);
+      else {
+        const s = l(n);
+        for (const [p, y] of Object.entries(s)) {
+          const d = `${t}.${p}`;
+          e[d] = y;
+        }
       }
-    } else
-      e[n] = o;
+    else
+      e[t] = n;
   return e;
 }
 export {
-  P as deepMerge,
-  w as getNestedValue,
-  j as isJSON,
-  h as normalizeMongoFilter,
-  O as setNestedValue
+  A as deepMerge,
+  P as getNestedValue,
+  w as isJSON,
+  l as normalizeMongoFilter,
+  g as setNestedValue
 };

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@cyberskill/shared",
     "type": "module",
-    "version": "2.6.0",
+    "version": "2.8.0",
     "description": "CyberSkill Shared",
     "author": "Stephen Cheng",
     "license": "MIT",