reroute-js 0.35.0 → 0.36.0

package/elysia/src/routes/robots.d.ts

@@ -1,5 +1,5 @@
 /**
- * reroute-js v0.35.0
+ * reroute-js v0.36.0
  *
  * @license MIT
  * @copyright 2025 stewones <hi@stewan.io>

package/elysia/src/routes/rss.d.ts

@@ -1,5 +1,5 @@
 /**
- * reroute-js v0.35.0
+ * reroute-js v0.36.0
  *
  * @license MIT
  * @copyright 2025 stewones <hi@stewan.io>

package/elysia/src/routes/search.d.ts

@@ -1,5 +1,5 @@
 /**
- * reroute-js v0.35.0
+ * reroute-js v0.36.0
  *
  * @license MIT
  * @copyright 2025 stewones <hi@stewan.io>

package/elysia/src/routes/sitemap.d.ts

@@ -1,5 +1,5 @@
 /**
- * reroute-js v0.35.0
+ * reroute-js v0.36.0
  *
  * @license MIT
  * @copyright 2025 stewones <hi@stewan.io>

package/elysia/src/routes/ssr.d.ts

@@ -1,5 +1,5 @@
 /**
- * reroute-js v0.35.0
+ * reroute-js v0.36.0
  *
  * @license MIT
  * @copyright 2025 stewones <hi@stewan.io>

package/elysia/src/routes/static.d.ts

@@ -1,5 +1,5 @@
 /**
- * reroute-js v0.35.0
+ * reroute-js v0.36.0
  *
  * @license MIT
  * @copyright 2025 stewones <hi@stewan.io>

package/elysia/src/types.d.ts

@@ -1,5 +1,5 @@
 /**
- * reroute-js v0.35.0
+ * reroute-js v0.36.0
  *
  * @license MIT
  * @copyright 2025 stewones <hi@stewan.io>

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "reroute-js",
-	"version": "0.35.0",
+	"version": "0.36.0",
 	"type": "module",
 	"author": "stewones <hi@stewan.io>",
 	"scripts": {

package/react/index.d.ts

@@ -1,5 +1,5 @@
 /**
- * reroute-js v0.35.0
+ * reroute-js v0.36.0
  *
  * @license MIT
  * @copyright 2025 stewones <hi@stewan.io>

package/react/index.js

@@ -1,5 +1,5 @@
 /**
- * reroute-js v0.35.0
+ * reroute-js v0.36.0
  *
  * @license MIT
  * @copyright 2025 stewones <hi@stewan.io>
@@ -670,6 +670,44 @@ function sortByDate(order) {
     return order === "asc" ? da - db : db - da;
   };
 }
+function compareForSort(a, b) {
+  if (a == null && b == null)
+    return 0;
+  if (a == null)
+    return 1;
+  if (b == null)
+    return -1;
+  if (typeof a === "string" && typeof b === "string") {
+    const dateA = Date.parse(a);
+    const dateB = Date.parse(b);
+    if (!(Number.isNaN(dateA) || Number.isNaN(dateB))) {
+      return dateA - dateB;
+    }
+  }
+  if (a instanceof Date && b instanceof Date) {
+    return a.getTime() - b.getTime();
+  }
+  if (typeof a === "number" && typeof b === "number") {
+    return a - b;
+  }
+  return String(a).localeCompare(String(b));
+}
+function createSortFunction(sortSpec) {
+  const fields = Object.keys(sortSpec);
+  return (a, b) => {
+    for (const field of fields) {
+      const direction = sortSpec[field];
+      const multiplier = direction === -1 || direction === "desc" ? -1 : 1;
+      const aVal = getNestedValue(a, field);
+      const bVal = getNestedValue(b, field);
+      const comparison = compareForSort(aVal, bVal);
+      if (comparison !== 0) {
+        return comparison * multiplier;
+      }
+    }
+    return 0;
+  };
+}
 function getNestedValue(obj, path) {
   const parts = path.split(".");
   let current = obj;
@@ -680,26 +718,98 @@ function getNestedValue(obj, path) {
   }
   return current;
 }
-function applyFilter(items, filter) {
-  if (!filter)
-    return items;
+function compareValues(itemValue, operator, filterValue) {
+  const normalize = (val) => {
+    if (val == null)
+      return null;
+    if (val instanceof Date)
+      return val.getTime();
+    if (typeof val === "string") {
+      const date = Date.parse(val);
+      if (!Number.isNaN(date))
+        return date;
+    }
+    return val;
+  };
+  const normalizedItem = normalize(itemValue);
+  const normalizedFilter = normalize(filterValue);
+  switch (operator) {
+    case "$gt":
+      return normalizedItem != null && normalizedItem > normalizedFilter;
+    case "$gte":
+      return normalizedItem != null && normalizedItem >= normalizedFilter;
+    case "$lt":
+      return normalizedItem != null && normalizedItem < normalizedFilter;
+    case "$lte":
+      return normalizedItem != null && normalizedItem <= normalizedFilter;
+    case "$eq":
+      return itemValue === filterValue;
+    case "$ne":
+      return itemValue !== filterValue;
+    case "$in":
+      return Array.isArray(filterValue) && filterValue.includes(itemValue);
+    case "$nin":
+      return Array.isArray(filterValue) && !filterValue.includes(itemValue);
+    case "$regex": {
+      const regex = filterValue instanceof RegExp ? filterValue : new RegExp(filterValue);
+      return regex.test(String(itemValue ?? ""));
+    }
+    case "$exists":
+      return filterValue ? itemValue !== undefined : itemValue === undefined;
+    default:
+      return false;
+  }
+}
+function isOperatorObject(value) {
+  if (typeof value !== "object" || value === null || value instanceof RegExp || value instanceof Date) {
+    return false;
+  }
+  const keys = Object.keys(value);
+  return keys.length > 0 && keys.every((k) => k.startsWith("$"));
+}
+function matchesFilter(item, filter) {
   if (typeof filter === "function") {
-    return items.filter(filter);
+    return filter(item);
   }
-  return items.filter((item) => {
-    for (const key in filter) {
-      const filterValue = filter[key];
-      const itemValue = getNestedValue(item, key);
-      if (filterValue instanceof RegExp) {
-        if (!filterValue.test(String(itemValue ?? ""))) {
+  if ("$and" in filter && Array.isArray(filter.$and)) {
+    return filter.$and.every((f) => matchesFilter(item, f));
+  }
+  if ("$or" in filter && Array.isArray(filter.$or)) {
+    return filter.$or.some((f) => matchesFilter(item, f));
+  }
+  if ("$not" in filter && filter.$not) {
+    return !matchesFilter(item, filter.$not);
+  }
+  for (const key in filter) {
+    if (key === "$and" || key === "$or" || key === "$not")
+      continue;
+    const filterValue = filter[key];
+    const itemValue = getNestedValue(item, key);
+    if (filterValue instanceof RegExp) {
+      if (!filterValue.test(String(itemValue ?? ""))) {
+        return false;
+      }
+      continue;
+    }
+    if (isOperatorObject(filterValue)) {
+      for (const operator in filterValue) {
+        const opValue = filterValue[operator];
+        if (!compareValues(itemValue, operator, opValue)) {
           return false;
         }
-      } else if (itemValue !== filterValue) {
-        return false;
       }
+      continue;
     }
-    return true;
-  });
+    if (itemValue !== filterValue) {
+      return false;
+    }
+  }
+  return true;
+}
+function applyFilter(items, filter) {
+  if (!filter)
+    return items;
+  return items.filter((item) => matchesFilter(item, filter));
 }
 function prefetchContent(entry) {
   if (typeof window === "undefined")
@@ -866,12 +976,14 @@ function useContent(params) {
       return [];
     let cloned = [...list];
     cloned = applyFilter(cloned, filter);
-    if (typeof sort === "function")
+    if (typeof sort === "function") {
       cloned = cloned.sort(sort);
-    else if (typeof sort === "string") {
-      cloned = cloned.sort(sortByDate(sort === "date-asc" ? "asc" : "desc"));
-    } else if (sort && typeof sort === "object" && sort.date) {
-      cloned = cloned.sort(sortByDate(sort.date === "asc" ? "asc" : "desc"));
+    } else if (sort && typeof sort === "object") {
+      if ("date" in sort && Object.keys(sort).length === 1) {
+        cloned = cloned.sort(sortByDate(sort.date === "asc" ? "asc" : "desc"));
+      } else {
+        cloned = cloned.sort(createSortFunction(sort));
+      }
     }
     if (typeof limit === "number" && limit >= 0)
       cloned = cloned.slice(0, limit);
@@ -2992,4 +3104,4 @@ export {
   ClientOnly
 };
 
-//# debugId=23CFBB5812BF111B64756E2164756E21
+//# debugId=1E8A8CF30C6A18AA64756E2164756E21