@statezero/core 0.2.13 → 0.2.15

package/dist/filtering/localFiltering.js

@@ -83,6 +83,7 @@ function processFieldPath(fieldPath, value, ModelClass, options = {}) {
     let currentModel = ModelClass;
     let processedPath = [];
     let isRelationship = false;
+    let isM2M = false; // Track if this is a many-to-many relationship
     let finalFieldName = null; // Track the actual field name for schema lookup
     for (let i = 0; i < fieldParts.length; i++) {
         let part = fieldParts[i];
@@ -96,6 +97,7 @@ function processFieldPath(fieldPath, value, ModelClass, options = {}) {
             // This is a relationship field
             const relationship = currentModel.relationshipFields.get(part);
             const relatedModel = relationship.ModelClass();
+            const relationshipType = relationship.relationshipType;
             // Add this relationship field to the path
             processedPath.push(part);
             // If this is not the last part, update the current model to the related model
@@ -104,13 +106,22 @@ function processFieldPath(fieldPath, value, ModelClass, options = {}) {
             }
             else {
                 // This is the last part and it's a relationship
-                // We need to add the primary key field of the related model
                 isRelationship = true;
-                // For foreign key relationships, we need to append the primary key field
-                // to properly match Django's behavior
-                const pkField = relatedModel.primaryKeyField || 'id';
-                processedPath.push(pkField);
-                finalFieldName = pkField;
+                // For many-to-many relationships, don't append the primary key field
+                // M2M fields store an array of PKs directly, not objects
+                if (relationshipType === 'many-to-many') {
+                    isM2M = true;
+                    // Keep path as-is (e.g., 'comprehensive_models')
+                    // Sift will handle array membership check
+                    finalFieldName = part;
+                }
+                else {
+                    // For foreign key relationships, we need to append the primary key field
+                    // to properly match Django's behavior
+                    const pkField = relatedModel.primaryKeyField || 'id';
+                    processedPath.push(pkField);
+                    finalFieldName = pkField;
+                }
                 currentModel = relatedModel;
             }
         }
@@ -145,7 +156,7 @@ function processFieldPath(fieldPath, value, ModelClass, options = {}) {
     }
     // Handle the single lookup operation if present
     if (lookup) {
-        return createOperatorFromLookup(finalPath, lookup, normalizedValue, isRelationship, currentModel, finalFieldName);
+        return createOperatorFromLookup(finalPath, lookup, normalizedValue, isRelationship, currentModel, finalFieldName, isM2M);
     }
     // If there's no explicit lookup and this is a relationship field,
     // we've already appended the PK field name to the path
@@ -192,9 +203,10 @@ function createDatePartComparisonOperator(field, datePart, comparisonOperator, v
  * @param {boolean} isRelationship - Whether the field is a relationship
  * @param {Class} ModelClass - The model class (unused, for future extensibility)
  * @param {string} finalFieldName - The final field name (unused, for future extensibility)
+ * @param {boolean} isM2M - Whether the field is a many-to-many relationship
  * @returns {Object} Object with field name and sift operator
  */
-function createOperatorFromLookup(field, lookup, value, isRelationship, ModelClass, finalFieldName) {
+function createOperatorFromLookup(field, lookup, value, isRelationship, ModelClass, finalFieldName, isM2M = false) {
     // Helper function to escape special characters in regex
     function escapeRegExp(string) {
         return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
@@ -203,7 +215,23 @@ function createOperatorFromLookup(field, lookup, value, isRelationship, ModelCla
     if (isRelationship) {
         // For relationship fields with lookups, we need special handling
         if (lookup === 'isnull') {
-            // Check for both undefined and null values
+            if (isM2M) {
+                // For M2M fields, isnull=True means null OR empty array, but not undefined because
+                // that can mean the field was not fetched so we can't be sure
+                // isnull=False means has at least one item
+                // Use a custom function since sift doesn't support $or inside field operators
+                return {
+                    field,
+                    operator: {
+                        $where: function (fieldValue) {
+                            const isEmpty = fieldValue === null ||
+                                (Array.isArray(fieldValue) && fieldValue.length === 0);
+                            return value ? isEmpty : !isEmpty;
+                        }
+                    }
+                };
+            }
+            // For FK/O2O, check for both undefined and null values
             return {
                 field,
                 operator: value ? { $in: [null, undefined] } : { $nin: [null, undefined] }
@@ -905,6 +933,12 @@ export function pickRequiredFields(requiredPaths, instance) {
             // skip missing
             return;
         }
+        // Convert M2M arrays from Model instances to PKs for comparison
+        // This handles the case where the live representation returns [Model1, Model2]
+        // but we need [pk1, pk2] for sift filtering
+        if (Array.isArray(value) && value.length > 0 && value[0]?.pk !== undefined) {
+            value = value.map(item => item.pk);
+        }
         // Build nested structure in the result
         let cursor = result;
         parts.forEach((key, idx) => {

package/dist/models/backend1/django_app/comprehensivemodel.js

@@ -64,7 +64,7 @@ ComprehensiveModel.configKey = 'backend1';
 ComprehensiveModel.modelName = 'django_app.comprehensivemodel';
 ComprehensiveModel.primaryKeyField = 'id';
 ComprehensiveModel.objects = new ComprehensiveModelManager(ComprehensiveModel);
-ComprehensiveModel.fields = ['id', 'char_field', 'text_field', 'int_field', 'bool_field', 'datetime_field', 'decimal_field', 'json_field', 'money_field_currency', 'money_field', 'related'];
+ComprehensiveModel.fields = ['id', 'char_field', 'text_field', 'int_field', 'bool_field', 'datetime_field', 'decimal_field', 'json_field', 'money_field_currency', 'money_field', 'nullable_money_field_currency', 'nullable_money_field', 'related'];
 ComprehensiveModel.schema = schemaData;
 ComprehensiveModel.relationshipFields = new Map([
     ['related', { 'ModelClass': () => getModelClass('django_app.deepmodellevel1', 'backend1'), 'relationshipType': 'foreign-key' }]

package/dist/models/backend1/django_app/order.d.ts

@@ -31,7 +31,10 @@ export class Order extends Model {
     static objects: OrderManager;
     static fields: string[];
     static schema: any;
-    static relationshipFields: Map<any, any>;
+    static relationshipFields: Map<string, {
+        ModelClass: () => Function | null;
+        relationshipType: string;
+    }>;
     constructor(data: any);
     /**
      * Define property getters and setters for all model fields

package/dist/models/backend1/django_app/order.js

@@ -64,6 +64,8 @@ Order.configKey = 'backend1';
 Order.modelName = 'django_app.order';
 Order.primaryKeyField = 'id';
 Order.objects = new OrderManager(Order);
-Order.fields = ['id', 'order_number', 'customer_name', 'customer_email', 'total', 'status', 'created_at', 'last_updated'];
+Order.fields = ['id', 'order_number', 'customer_name', 'customer_email', 'total', 'status', 'created_at', 'last_updated', 'items'];
 Order.schema = schemaData;
-Order.relationshipFields = new Map([]);
+Order.relationshipFields = new Map([
+    ['items', { 'ModelClass': () => getModelClass('django_app.orderitem', 'backend1'), 'relationshipType': 'many-to-many' }]
+]);

package/dist/models/default/django_app/comprehensivemodel.js

@@ -64,7 +64,7 @@ ComprehensiveModel.configKey = 'default';
 ComprehensiveModel.modelName = 'django_app.comprehensivemodel';
 ComprehensiveModel.primaryKeyField = 'id';
 ComprehensiveModel.objects = new ComprehensiveModelManager(ComprehensiveModel);
-ComprehensiveModel.fields = ['id', 'char_field', 'text_field', 'int_field', 'bool_field', 'datetime_field', 'decimal_field', 'json_field', 'money_field_currency', 'money_field', 'related'];
+ComprehensiveModel.fields = ['id', 'char_field', 'text_field', 'int_field', 'bool_field', 'datetime_field', 'decimal_field', 'json_field', 'money_field_currency', 'money_field', 'nullable_money_field_currency', 'nullable_money_field', 'related'];
 ComprehensiveModel.schema = schemaData;
 ComprehensiveModel.relationshipFields = new Map([
     ['related', { 'ModelClass': () => getModelClass('django_app.deepmodellevel1', 'default'), 'relationshipType': 'foreign-key' }]

package/dist/models/default/django_app/order.d.ts

@@ -31,7 +31,10 @@ export class Order extends Model {
     static objects: OrderManager;
     static fields: string[];
     static schema: any;
-    static relationshipFields: Map<any, any>;
+    static relationshipFields: Map<string, {
+        ModelClass: () => Function | null;
+        relationshipType: string;
+    }>;
     constructor(data: any);
     /**
      * Define property getters and setters for all model fields

package/dist/models/default/django_app/order.js

@@ -64,6 +64,8 @@ Order.configKey = 'default';
 Order.modelName = 'django_app.order';
 Order.primaryKeyField = 'id';
 Order.objects = new OrderManager(Order);
-Order.fields = ['id', 'order_number', 'customer_name', 'customer_email', 'total', 'status', 'created_at', 'last_updated'];
+Order.fields = ['id', 'order_number', 'customer_name', 'customer_email', 'total', 'status', 'created_at', 'last_updated', 'items'];
 Order.schema = schemaData;
-Order.relationshipFields = new Map([]);
+Order.relationshipFields = new Map([
+    ['items', { 'ModelClass': () => getModelClass('django_app.orderitem', 'default'), 'relationshipType': 'many-to-many' }]
+]);

package/package.json

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