@statezero/core 0.1.50 → 0.1.51

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

@@ -11,7 +11,13 @@ export class FileObject {
     lastModified: number | null;
     uploaded: boolean;
     uploading: boolean;
-    uploadResult: any;
+    uploadResult: {
+        file_path: any;
+        file_name: any;
+        file_url: any;
+        size: any;
+        mime_type: any;
+    } | null;
     uploadError: any;
     fileData: any;
     uploadType: string | null;
@@ -34,11 +40,23 @@ export class FileObject {
     /**
      * Handle single file upload
      */
-    _singleUpload(file: any, uploadData: any, options: any): Promise<any>;
+    _singleUpload(file: any, uploadData: any, options: any): Promise<{
+        file_path: any;
+        file_name: any;
+        file_url: any;
+        size: any;
+        mime_type: any;
+    } | null>;
     /**
      * Handle multipart upload with concurrency using p-queue
      */
-    _multipartUpload(file: any, uploadData: any, options: any): Promise<any>;
+    _multipartUpload(file: any, uploadData: any, options: any): Promise<{
+        file_path: any;
+        file_name: any;
+        file_url: any;
+        size: any;
+        mime_type: any;
+    } | null>;
     /**
      * Create file chunks for multipart upload
      */
@@ -46,7 +64,13 @@ export class FileObject {
     /**
      * Complete the upload (both single and multipart)
      */
-    _completeUpload(filePath: any, originalName: any, uploadId?: null, parts?: null): Promise<any>;
+    _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>;
     /**
      * Direct upload to Django backend (original method)
      */
@@ -60,24 +84,11 @@ export class FileObject {
      */
     getBlob(): Blob;
     waitForUpload(): Promise<any>;
-    /**
-     * Returns a static version of this FileObject that can be stored in IndexedDB
-     * Creates a new FileObject using the stored file constructor path
-     */
-    asStatic(): any;
     toJSON(): {
-        name: any;
-        size: any;
-        type: any;
-        status: string;
-        uploaded: boolean;
         filePath: any;
+        fileName: any;
         fileUrl: any;
-        uploadResult: any;
-        uploadError: string | null;
-        uploadType: string | null;
-        uploadId: any;
-        totalChunks: number;
-        completedChunks: number;
+        size: any;
+        mimeType: any;
     };
 }

package/dist/flavours/django/files.js

@@ -10,17 +10,24 @@ export class FileObject {
         // Handle stored file data (from API)
         if (file &&
             typeof file === "object" &&
-            file.file_path &&
+            (file.file_path || file.filePath) && // Handle both formats
             !(file instanceof File)) {
-            // This is stored file data from the backend
-            this.name = file.file_name;
+            // Handle both snake_case (from backend) and camelCase (from toJSON)
+            this.name = file.file_name || file.fileName;
             this.size = file.size;
-            this.type = file.mime_type; // Now coming from backend
+            this.type = file.mime_type || file.mimeType;
             this.lastModified = null;
             // Mark as already uploaded
             this.uploaded = true;
             this.uploading = false;
-            this.uploadResult = file; // Store the entire response
+            // 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.uploadError = null;
             this.fileData = null;
             // No upload properties needed
@@ -30,7 +37,7 @@ export class FileObject {
             this.completedChunks = 0;
             this.chunkSize = null;
             this.maxConcurrency = null;
-            this.uploadPromise = null;
+            this.uploadPromise = Promise.resolve(this.uploadResult);
             return;
         }
         // Handle File objects (for upload) - existing code
@@ -59,6 +66,13 @@ 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() {
@@ -88,7 +102,6 @@ export class FileObject {
             return this.filePath;
         }
         else if (status === "failed") {
-            // Fix: use "failed" instead of "error"
             throw new Error(`Cannot use FileObject in query - upload failed: ${this.uploadError}`);
         }
         else if (status === "uploading") {
@@ -367,39 +380,15 @@ export class FileObject {
         return new Blob([this.fileData], { type: this.type });
     }
     async waitForUpload() {
-        if (this.uploaded && this.uploadResult && !this.uploadPromise) {
-            return this.uploadResult;
-        }
-        if (this.uploadPromise) {
-            return this.uploadPromise;
-        }
-        throw new Error("No upload in progress and file not uploaded");
-    }
-    /**
-     * Returns a static version of this FileObject that can be stored in IndexedDB
-     * Creates a new FileObject using the stored file constructor path
-     */
-    asStatic() {
-        if (!this.uploaded || !this.uploadResult) {
-            throw new Error("Cannot create static version of file that hasn't been uploaded");
-        }
-        return new this.constructor(this.uploadResult);
+        return this.uploadPromise;
     }
     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,
-            uploadResult: this.uploadResult,
-            uploadError: this.uploadError ? String(this.uploadError) : null,
-            uploadType: this.uploadType,
-            uploadId: this.uploadId,
-            totalChunks: this.totalChunks,
-            completedChunks: this.completedChunks,
+            size: this.size,
+            mimeType: this.type,
         };
     }
 }

package/dist/flavours/django/model.js

@@ -101,16 +101,15 @@ 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) {
-            // Check if it's already a FileObject
+            // If it's already a FileObject, serialize it
             if (value instanceof FileObject) {
-                return value.asStatic();
+                return value.toJSON();
             }
-            // If it's stored file data from API, wrap it as FileObject
+            // If it's stored file data from API, create FileObject and serialize
             if (typeof value === "object" && value.file_path) {
                 // Create anonymous subclass with correct configKey
                 const BackendFileObject = (_a = class extends FileObject {
@@ -118,7 +117,12 @@ export class Model {
                     __setFunctionName(_a, "BackendFileObject"),
                     _a.configKey = ModelClass.configKey,
                     _a);
-                return new BackendFileObject(value).asStatic();
+                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;
             }
         }
         // relationship fields need special handling
@@ -211,13 +215,6 @@ export class Model {
             // Let DateParsingHelpers.serializeDate throw if it fails
             return DateParsingHelpers.serializeDate(value, field, ModelClass.schema);
         }
-        // FileObjects need special
-        const fileFormats = ["file-path", "image-path"];
-        if (ModelClass.schema &&
-            fileFormats.includes(ModelClass.schema.properties[field]?.format)) {
-            value = this.getField(field);
-            return value ? value.serialize() : null;
-        }
         return value;
     }
     /**

package/package.json

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