@statezero/core 0.1.78 → 0.1.80

package/dist/filtering/localFiltering.js

@@ -150,8 +150,11 @@ function processFieldPath(fieldPath, value, ModelClass, options = {}) {
     }
     // Join the processed path parts, using dot notation for sift
     const finalPath = processedPath.join('.');
-    // Normalize the value based on the field schema
-    const normalizedValue = normalizeFilterValue(finalFieldName, value, currentModel);
+    // For date part lookups, don't normalize the value - keep it as-is for numeric/string comparison
+    // Date parts like 'year', 'month', etc. expect numeric values, not Date objects
+    const isDatePartLookup = dateParts.includes(lookup) || (lookupChain.length === 2 && dateParts.includes(lookupChain[0]));
+    // Normalize the value based on the field schema (skip for date part lookups)
+    const normalizedValue = isDatePartLookup ? value : normalizeFilterValue(finalFieldName, value, currentModel);
     // Handle the date part + comparison chain if present
     if (lookupChain.length === 2) {
         const [datePart, comparisonOperator] = lookupChain;
@@ -231,7 +234,7 @@ function createOperatorFromLookup(field, lookup, value, isRelationship, ModelCla
         }
     }
     // Handle date-related lookups
-    if (['year', 'month', 'day', 'week_day', 'hour', 'minute', 'second'].includes(lookup)) {
+    if (['year', 'month', 'day', 'week_day', 'hour', 'minute', 'second', 'date', 'time'].includes(lookup)) {
         // For date part lookups, we'll use a custom operation
         return {
             field,
@@ -333,52 +336,59 @@ function createDateOperations(timezone = 'UTC') {
     const operations = {
         // Year - same in both
         $year(params, ownerQuery, options) {
+            const compareValue = typeof params === 'string' ? Number(params) : params;
             return createEqualsOperation((value) => {
                 const year = getDatePart(value, dt => dt.year);
-                return year !== null && year === params;
+                return year !== null && year === compareValue;
             }, ownerQuery, options);
         },
-        // Month - Luxon is 1-indexed like Django 
+        // Month - Luxon is 1-indexed like Django
         $month(params, ownerQuery, options) {
+            const compareValue = typeof params === 'string' ? Number(params) : params;
             return createEqualsOperation((value) => {
                 const month = getDatePart(value, dt => dt.month); // Already 1-indexed
-                return month !== null && month === params;
+                return month !== null && month === compareValue;
             }, ownerQuery, options);
         },
         // Day of month - same in both
         $day(params, ownerQuery, options) {
+            const compareValue = typeof params === 'string' ? Number(params) : params;
             return createEqualsOperation((value) => {
                 const day = getDatePart(value, dt => dt.day);
-                return day !== null && day === params;
+                return day !== null && day === compareValue;
             }, ownerQuery, options);
         },
         // Day of week - convert to Django's 1=Sunday format
         $week_day(params, ownerQuery, options) {
+            const compareValue = typeof params === 'string' ? Number(params) : params;
             return createEqualsOperation((value) => {
                 // Convert from Luxon (1=Monday, 7=Sunday) to Django (1=Sunday, 7=Saturday)
                 const weekDay = getDatePart(value, dt => dt.weekday === 7 ? 1 : dt.weekday + 1);
-                return weekDay !== null && weekDay === params;
+                return weekDay !== null && weekDay === compareValue;
             }, ownerQuery, options);
         },
         // Hour - same in both
         $hour(params, ownerQuery, options) {
+            const compareValue = typeof params === 'string' ? Number(params) : params;
             return createEqualsOperation((value) => {
                 const hour = getDatePart(value, dt => dt.hour);
-                return hour !== null && hour === params;
+                return hour !== null && hour === compareValue;
             }, ownerQuery, options);
         },
         // Minute - same in both
         $minute(params, ownerQuery, options) {
+            const compareValue = typeof params === 'string' ? Number(params) : params;
             return createEqualsOperation((value) => {
                 const minute = getDatePart(value, dt => dt.minute);
-                return minute !== null && minute === params;
+                return minute !== null && minute === compareValue;
             }, ownerQuery, options);
         },
         // Second - same in both
         $second(params, ownerQuery, options) {
+            const compareValue = typeof params === 'string' ? Number(params) : params;
             return createEqualsOperation((value) => {
                 const second = getDatePart(value, dt => dt.second);
-                return second !== null && second === params;
+                return second !== null && second === compareValue;
             }, ownerQuery, options);
         },
         // Date - extract date portion (ignore time)
@@ -408,11 +418,26 @@ function createDateOperations(timezone = 'UTC') {
                     return false;
                 // Convert to timezone
                 const luxonDate = DateTime.fromJSDate(dateValue).setZone(timezone);
-                const paramDate = DateTime.fromJSDate(new Date(params)).setZone(timezone);
+                // Parse the time string (format: "HH:MM:SS" or a Date object)
+                let paramHour, paramMinute, paramSecond;
+                if (typeof params === 'string') {
+                    // Parse time string like "10:30:45"
+                    const timeParts = params.split(':');
+                    paramHour = parseInt(timeParts[0], 10);
+                    paramMinute = parseInt(timeParts[1], 10);
+                    paramSecond = parseInt(timeParts[2], 10);
+                }
+                else {
+                    // If it's a Date object, extract time parts
+                    const paramDate = DateTime.fromJSDate(new Date(params)).setZone(timezone);
+                    paramHour = paramDate.hour;
+                    paramMinute = paramDate.minute;
+                    paramSecond = paramDate.second;
+                }
                 // Compare hour, minute, and second
-                return luxonDate.hour === paramDate.hour &&
-                    luxonDate.minute === paramDate.minute &&
-                    luxonDate.second === paramDate.second;
+                return luxonDate.hour === paramHour &&
+                    luxonDate.minute === paramMinute &&
+                    luxonDate.second === paramSecond;
             }, ownerQuery, options);
         }
     };
@@ -424,7 +449,9 @@ function createDateOperations(timezone = 'UTC') {
         'week_day': (dt) => dt.weekday === 7 ? 1 : dt.weekday + 1, // Convert to Django's format
         'hour': (dt) => dt.hour,
         'minute': (dt) => dt.minute,
-        'second': (dt) => dt.second
+        'second': (dt) => dt.second,
+        'date': (dt) => dt.toISODate(),
+        'time': (dt) => dt.hour * 3600 + dt.minute * 60 + dt.second
     };
     // Generate comparison operations for each date part (year_gt, month_lt, etc.)
     const datePartComparisons = ['gt', 'gte', 'lt', 'lte', 'exact'];
@@ -443,13 +470,16 @@ function createDateOperations(timezone = 'UTC') {
                     // Convert to timezone and extract part
                     const luxonDate = DateTime.fromJSDate(dateValue).setZone(timezone);
                     const partValue = extractor(luxonDate);
+                    // Coerce params to number for numeric comparisons (all parts except 'date' which is a string)
+                    // date part returns ISO date string like "2022-03-15", time returns number (seconds)
+                    const compareValue = part === 'date' ? params : (typeof params === 'string' ? Number(params) : params);
                     // Apply the appropriate comparison
                     switch (op) {
-                        case 'gt': return partValue > params;
-                        case 'gte': return partValue >= params;
-                        case 'lt': return partValue < params;
-                        case 'lte': return partValue <= params;
-                        case 'exact': return partValue === params;
+                        case 'gt': return partValue > compareValue;
+                        case 'gte': return partValue >= compareValue;
+                        case 'lt': return partValue < compareValue;
+                        case 'lte': return partValue <= compareValue;
+                        case 'exact': return partValue === compareValue;
                         default: return false;
                     }
                 }, ownerQuery, options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@statezero/core",
-  "version": "0.1.78",
+  "version": "0.1.80",
   "type": "module",
   "module": "ESNext",
   "description": "The type-safe frontend client for StateZero - connect directly to your backend models with zero boilerplate",