@statezero/core 0.1.50 → 0.1.52

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

@@ -25,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
@@ -60,11 +59,6 @@ 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;

package/dist/flavours/django/files.js

@@ -30,7 +30,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
@@ -82,25 +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") {
-            // Fix: use "failed" instead of "error"
-            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];
@@ -367,23 +348,7 @@ 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 {

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.
  *
@@ -108,7 +107,7 @@ export class Model {
             value) {
             // Check if it's already a FileObject
             if (value instanceof FileObject) {
-                return value.asStatic();
+                return value;
             }
             // If it's stored file data from API, wrap it as FileObject
             if (typeof value === "object" && value.file_path) {
@@ -118,7 +117,7 @@ export class Model {
                     __setFunctionName(_a, "BackendFileObject"),
                     _a.configKey = ModelClass.configKey,
                     _a);
-                return new BackendFileObject(value).asStatic();
+                return new BackendFileObject(value);
             }
         }
         // relationship fields need special handling
@@ -211,13 +210,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.52",
   "type": "module",
   "module": "ESNext",
   "description": "The type-safe frontend client for StateZero - connect directly to your backend models with zero boilerplate",