@statezero/core 0.1.51 → 0.1.53

package/dist/flavours/django/files.d.ts

@@ -11,13 +11,7 @@ export class FileObject {
     lastModified: number | null;
     uploaded: boolean;
     uploading: boolean;
-    uploadResult: {
-        file_path: any;
-        file_name: any;
-        file_url: any;
-        size: any;
-        mime_type: any;
-    } | null;
+    uploadResult: any;
     uploadError: any;
     fileData: any;
     uploadType: string | null;
@@ -31,7 +25,6 @@ export class FileObject {
     get status(): "failed" | "uploading" | "uploaded" | "pending";
     get filePath(): any;
     get fileUrl(): any;
-    serialize(): any;
     _initializeAndStartUpload(file: any, options: any): any;
     /**
      * Fast upload using S3 presigned URLs with multipart support
@@ -40,23 +33,11 @@ export class FileObject {
     /**
      * Handle single file upload
      */
-    _singleUpload(file: any, uploadData: any, options: any): Promise<{
-        file_path: any;
-        file_name: any;
-        file_url: any;
-        size: any;
-        mime_type: any;
-    } | null>;
+    _singleUpload(file: any, uploadData: any, options: any): Promise<any>;
     /**
      * Handle multipart upload with concurrency using p-queue
      */
-    _multipartUpload(file: any, uploadData: any, options: any): Promise<{
-        file_path: any;
-        file_name: any;
-        file_url: any;
-        size: any;
-        mime_type: any;
-    } | null>;
+    _multipartUpload(file: any, uploadData: any, options: any): Promise<any>;
     /**
      * Create file chunks for multipart upload
      */
@@ -64,13 +45,7 @@ export class FileObject {
     /**
      * Complete the upload (both single and multipart)
      */
-    _completeUpload(filePath: any, originalName: any, uploadId?: null, parts?: null): Promise<{
-        file_path: any;
-        file_name: any;
-        file_url: any;
-        size: any;
-        mime_type: any;
-    } | null>;
+    _completeUpload(filePath: any, originalName: any, uploadId?: null, parts?: null): Promise<any>;
     /**
      * Direct upload to Django backend (original method)
      */
@@ -85,10 +60,18 @@ export class FileObject {
     getBlob(): Blob;
     waitForUpload(): Promise<any>;
     toJSON(): {
+        name: any;
+        size: any;
+        type: any;
+        status: string;
+        uploaded: boolean;
         filePath: any;
-        fileName: any;
         fileUrl: any;
-        size: any;
-        mimeType: any;
+        uploadResult: any;
+        uploadError: string | null;
+        uploadType: string | null;
+        uploadId: any;
+        totalChunks: number;
+        completedChunks: number;
     };
 }

package/dist/flavours/django/files.js

@@ -10,24 +10,17 @@ export class FileObject {
         // Handle stored file data (from API)
         if (file &&
             typeof file === "object" &&
-            (file.file_path || file.filePath) && // Handle both formats
+            file.file_path &&
             !(file instanceof File)) {
-            // Handle both snake_case (from backend) and camelCase (from toJSON)
-            this.name = file.file_name || file.fileName;
+            // This is stored file data from the backend
+            this.name = file.file_name;
             this.size = file.size;
-            this.type = file.mime_type || file.mimeType;
+            this.type = file.mime_type; // Now coming from backend
             this.lastModified = null;
             // Mark as already uploaded
             this.uploaded = true;
             this.uploading = false;
-            // Store the entire response, normalizing format
-            this.uploadResult = {
-                file_path: file.file_path || file.filePath,
-                file_name: file.file_name || file.fileName,
-                file_url: file.file_url || file.fileUrl,
-                size: file.size,
-                mime_type: file.mime_type || file.mimeType,
-            };
+            this.uploadResult = file; // Store the entire response
             this.uploadError = null;
             this.fileData = null;
             // No upload properties needed
@@ -66,13 +59,6 @@ export class FileObject {
                 `Provided: ${this.chunkSize / (1024 * 1024)}MB`);
         }
         this.maxConcurrency = options.maxConcurrency || 3;
-        // This is to make the fileObject serializable by IDB in the cache
-        Object.defineProperty(this, "uploadPromise", {
-            value: Promise.resolve(this.uploadResult),
-            writable: true,
-            enumerable: false,
-            configurable: true,
-        });
         this.uploadPromise = this._initializeAndStartUpload(file, options);
     }
     get isStoredFile() {
@@ -96,24 +82,6 @@ export class FileObject {
         }
         return configInstance.buildFileUrl(this.uploadResult.file_url, this.constructor.configKey);
     }
-    serialize() {
-        const status = this.status;
-        if (status === "uploaded" && this.filePath) {
-            return this.filePath;
-        }
-        else if (status === "failed") {
-            throw new Error(`Cannot use FileObject in query - upload failed: ${this.uploadError}`);
-        }
-        else if (status === "uploading") {
-            throw new Error(`Cannot use FileObject in query - file is still uploading. Wait for upload to complete before executing the query.`);
-        }
-        else if (status === "pending") {
-            throw new Error(`Cannot use FileObject in query - file upload has not started yet.`);
-        }
-        else {
-            throw new Error(`Cannot use FileObject in query - unexpected status: ${status}`);
-        }
-    }
     async _initializeAndStartUpload(file, options) {
         const config = configInstance.getConfig();
         const backend = config.backendConfigs?.[this.constructor.configKey];
@@ -384,11 +352,19 @@ export class FileObject {
     }
     toJSON() {
         return {
+            name: this.name,
+            size: this.size,
+            type: this.type,
+            status: this.status,
+            uploaded: this.uploaded,
             filePath: this.filePath,
-            fileName: this.name,
             fileUrl: this.fileUrl,
-            size: this.size,
-            mimeType: this.type,
+            uploadResult: this.uploadResult,
+            uploadError: this.uploadError ? String(this.uploadError) : null,
+            uploadType: this.uploadType,
+            uploadId: this.uploadId,
+            totalChunks: this.totalChunks,
+            completedChunks: this.completedChunks,
         };
     }
 }

package/dist/flavours/django/makeApiCall.js

@@ -37,6 +37,51 @@ export function processIncludedEntities(modelStoreRegistry, included, ModelClass
         throw new Error(`Failed to process included entities: ${error.message}`);
     }
 }
+/**
+ * Recursively processes an object to replace FileObject instances with their file paths.
+ * Throws an error if any FileObject is not yet uploaded.
+ *
+ * @param {any} obj - The object to process
+ * @returns {any} The processed object with FileObjects replaced by paths
+ */
+function processFileObjects(obj) {
+    if (obj === null || obj === undefined) {
+        return obj;
+    }
+    // Handle FileObject instances
+    if (obj instanceof FileObject) {
+        const status = obj.status;
+        if (status === 'uploaded' && obj.filePath) {
+            return obj.filePath;
+        }
+        else if (status === 'error') {
+            throw new Error(`Cannot use FileObject in query - upload failed: ${obj.uploadError}`);
+        }
+        else if (status === 'uploading') {
+            throw new Error(`Cannot use FileObject in query - file is still uploading. Wait for upload to complete before executing the query.`);
+        }
+        else if (status === 'pending') {
+            throw new Error(`Cannot use FileObject in query - file upload has not started yet.`);
+        }
+        else {
+            throw new Error(`Cannot use FileObject in query - unexpected status: ${status}`);
+        }
+    }
+    // Handle arrays
+    if (Array.isArray(obj)) {
+        return obj.map(item => processFileObjects(item));
+    }
+    // Handle plain objects
+    if (typeof obj === 'object' && obj.constructor === Object) {
+        const processedObj = {};
+        for (const [key, value] of Object.entries(obj)) {
+            processedObj[key] = processFileObjects(value);
+        }
+        return processedObj;
+    }
+    // Return primitive values as-is
+    return obj;
+}
 /**
  * Makes an API call to the backend with the given QuerySet.
  * Automatically handles FileObject replacement with file paths for write operations.
@@ -84,6 +129,15 @@ export async function makeApiCall(querySet, operationType, args = {}, operationI
         "get_or_create", "update_or_create"
     ];
     const isWriteOperation = writeOperations.includes(operationType);
+    // Process FileObjects for write operations
+    if (isWriteOperation) {
+        try {
+            payload = processFileObjects(payload);
+        }
+        catch (error) {
+            throw new Error(`Failed to process file uploads: ${error.message}`);
+        }
+    }
     const baseUrl = backend.API_URL.replace(/\/+$/, "");
     const finalUrl = `${baseUrl}/${ModelClass.modelName}/`;
     const headers = backend.getAuthHeaders ? backend.getAuthHeaders() : {};

package/dist/flavours/django/model.js

@@ -13,7 +13,6 @@ import { FileObject } from './files.js';
 import { configInstance } from "../../config.js";
 import { parseStateZeroError, MultipleObjectsReturned, DoesNotExist, } from "./errors.js";
 import axios from "axios";
-import { typeOf } from "mathjs";
 /**
  * A constructor for a Model.
  *
@@ -101,15 +100,16 @@ export class Model {
             // Let DateParsingHelpers.parseDate throw if it fails
             return DateParsingHelpers.parseDate(value, field, ModelClass.schema);
         }
+        // File/Image fields need special handling - wrap as FileObject
         const fileFormats = ["file-path", "image-path"];
         if (ModelClass.schema &&
             fileFormats.includes(ModelClass.schema.properties[field]?.format) &&
             value) {
-            // If it's already a FileObject, serialize it
+            // Check if it's already a FileObject
             if (value instanceof FileObject) {
-                return value.toJSON();
+                return value;
             }
-            // If it's stored file data from API, create FileObject and serialize
+            // If it's stored file data from API, wrap it as FileObject
             if (typeof value === "object" && value.file_path) {
                 // Create anonymous subclass with correct configKey
                 const BackendFileObject = (_a = class extends FileObject {
@@ -117,12 +117,7 @@ export class Model {
                     __setFunctionName(_a, "BackendFileObject"),
                     _a.configKey = ModelClass.configKey,
                     _a);
-                const fileObj = new BackendFileObject(value);
-                return fileObj.toJSON(); // Get the computed fileUrl, etc.
-            }
-            // If it's just a file path string, return as-is
-            if (typeof value === "string") {
-                return value;
+                return new BackendFileObject(value);
             }
         }
         // relationship fields need special handling
@@ -215,6 +210,12 @@ export class Model {
             // Let DateParsingHelpers.serializeDate throw if it fails
             return DateParsingHelpers.serializeDate(value, field, ModelClass.schema);
         }
+        const fileFormats = ["file-path", "image-path"];
+        if (ModelClass.schema &&
+            fileFormats.includes(ModelClass.schema.properties[field]?.format) &&
+            value) {
+            return value.filePath || value.file_path || value;
+        }
         return value;
     }
     /**

package/package.json

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