@statezero/core 0.1.1 → 0.1.3-9.1

package/dist/cli/commands/syncModels.js

@@ -94,6 +94,59 @@ import { loadConfigFromFile } from "../configFileLoader.js";
  * @property {string} model
  */
 // --------------------
+// Fallback Selection for Inquirer Errors
+// --------------------
+/**
+ * Simple fallback that generates all models when inquirer fails
+ * @param {Array} choices - Array of choice objects with {name, value, checked} properties
+ * @param {string} message - Selection message
+ * @returns {Promise<Array>} - All model values
+ */
+async function fallbackSelectAll(choices, message) {
+    console.log(`\n${message}`);
+    console.log("Interactive selection not available - generating ALL models:");
+    const allModels = [];
+    for (const choice of choices) {
+        // Skip separators (they don't have a 'value' property)
+        if (!choice.value) {
+            console.log(choice.name); // Print separator text
+            continue;
+        }
+        // Add ALL models, regardless of checked status
+        allModels.push(choice.value);
+        console.log(`  ✓ ${choice.name}`);
+    }
+    console.log(`\nGenerating ALL ${allModels.length} models.`);
+    return allModels;
+}
+/**
+ * Model selection with inquirer fallback
+ * @param {Array} choices - Array of choice objects
+ * @param {string} message - Selection message
+ * @returns {Promise<Array>} - Selected model objects
+ */
+async function selectModels(choices, message) {
+    try {
+        // Try to use inquirer first
+        const inquirer = (await import("inquirer")).default;
+        const { selectedModels } = await inquirer.prompt([
+            {
+                type: "checkbox",
+                name: "selectedModels",
+                message,
+                choices,
+                pageSize: 20,
+            },
+        ]);
+        return selectedModels;
+    }
+    catch (error) {
+        // Fall back to generating all models if inquirer fails for any reason
+        console.warn("Interactive selection failed, generating all models:", error.message);
+        return await fallbackSelectAll(choices, message);
+    }
+}
+// --------------------
 // Handlebars Templates & Helpers
 // --------------------
 // Updated JS_MODEL_TEMPLATE with getters and setters
@@ -106,7 +159,7 @@ const JS_MODEL_TEMPLATE = `/**
 
 import { Model, Manager, QuerySet, getModelClass } from '{{modulePath}}';
 import { wrapReactiveModel } from '{{modulePath}}';
-import schemaData from './{{className}}.schema.json';
+import schemaData from './{{toLowerCase className}}.schema.json';
 
 /**
  * Model-specific QuerySet implementation
@@ -174,22 +227,6 @@ export class {{className}} extends Model {
       });
     });
   }
-
-  /**
-   * Serialize the model's data.
-   * Returns a plain object containing the current values of all fields,
-   * including raw IDs for relationship fields.
-   * @returns {Object}
-   */
-  serialize() {
-    const data = {};
-    // Simply assign the current value of each field.
-    // No special handling or PK extraction for relationships here.
-    {{#each properties}}
-    data.{{name}} = this.{{name}};
-    {{/each}}
-    return data;
-  }
 }
 `;
 // Updated TS_DECLARATION_TEMPLATE with improved relationship handling
@@ -446,6 +483,9 @@ Handlebars.registerHelper("ifDefaultProvided", function (defaultValue, options)
 Handlebars.registerHelper("isRequired", function (required) {
     return required ? "" : "?";
 });
+Handlebars.registerHelper("toLowerCase", function (str) {
+    return str.toLowerCase();
+});
 const jsTemplate = Handlebars.compile(JS_MODEL_TEMPLATE);
 const dtsTemplate = Handlebars.compile(TS_DECLARATION_TEMPLATE);
 // --------------------
@@ -944,14 +984,12 @@ export declare const FileObject: typeof ${backend.NAME}FileObject;
 // --------------------
 // Main Runner: Fetch models and prompt selection
 // --------------------
-// Update main function to use this new approach
 async function main() {
     // Load configuration from file (CLI-only or tests) before any other operations.
     loadConfigFromFile();
     // Retrieve the validated configuration from the global config singleton.
     const configData = configInstance.getConfig();
     const backendConfigs = configData.backendConfigs;
-    const inquirer = (await import("inquirer")).default;
     const fetchPromises = Object.keys(backendConfigs).map(async (key) => {
         const backend = backendConfigs[key];
         backend.NAME = key;
@@ -966,8 +1004,10 @@ async function main() {
     });
     const backendModels = await Promise.all(fetchPromises);
     const choices = [];
+    // Create a simple separator object for environments where inquirer.Separator isn't available
+    const createSeparator = (text) => ({ name: text, value: null });
     for (const { backend, models } of backendModels) {
-        choices.push(new inquirer.Separator(`\n=== ${backend.NAME} ===\n`));
+        choices.push(createSeparator(`\n=== ${backend.NAME} ===\n`));
         for (const model of models) {
             choices.push({
                 name: model,
@@ -980,15 +1020,7 @@ async function main() {
         console.log("No models to synchronise");
         process.exit(0);
     }
-    const { selectedModels } = await inquirer.prompt([
-        {
-            type: "checkbox",
-            name: "selectedModels",
-            message: "Select models to synchronise:",
-            choices,
-            pageSize: 20,
-        },
-    ]);
+    const selectedModels = await selectModels(choices, "Select models to synchronise:");
     if (!selectedModels || selectedModels.length === 0) {
         console.log("No models selected. Exiting.");
         process.exit(0);

package/dist/cli/index.js

@@ -1,14 +1,22 @@
 #!/usr/bin/env node
-import dotenv from 'dotenv';
+import dotenv from "dotenv";
 dotenv.config();
-import yargs from 'yargs';
-import { hideBin } from 'yargs/helpers';
-import { generateSchema } from './commands/syncModels.js';
+import yargs from "yargs";
+import { hideBin } from "yargs/helpers";
+import { generateSchema } from "./commands/syncModels.js";
+import { generateActions } from "./commands/syncActions.js";
+import { sync } from "./commands/sync.js"; // Import the new combined sync function
 yargs(hideBin(process.argv))
-    .command('sync-models', 'Generate model classes from the openapi schema', 
-// No CLI options since API_URL and GENERATED_TYPES_DIR are read from .env.
-{}, async () => {
-    await generateSchema({});
+    // The new 'sync' command
+    .command("sync", "Synchronize both models and actions from the backend", {}, // Builder for command-specific options (if any)
+async (argv) => {
+    await sync(argv);
 })
-    .help()
-    .argv;
+    .command("sync-models", "Generate model classes from the backend schema", {}, async (argv) => {
+    await generateSchema(argv);
+})
+    .command("sync-actions", "Generate action functions from the backend schema", {}, async (argv) => {
+    await generateActions(); // This function does not take arguments
+})
+    .demandCommand(1, "You must provide a command to run. Use --help to see available commands.")
+    .help().argv;

package/dist/config.d.ts

@@ -29,6 +29,10 @@ export function initializeAllEventReceivers(): Object;
  * @param {Function} getterFn - The getModelClass function imported from model-registry.js
  */
 export function registerModelGetter(getterFn: Function): void;
+/**
+ * Helper function to build file URLs
+ */
+export function buildFileUrl(fileUrl: any, backendKey?: string): any;
 /**
  * Get a model class by name using the registered getter.
  *
@@ -47,6 +51,7 @@ export namespace configInstance {
     export { initializeEventReceiver };
     export { registerModelGetter };
     export { getModelClass };
+    export { buildFileUrl };
 }
 export default configInstance;
 import { PusherEventReceiver } from './core/eventReceivers.js';

package/dist/config.js

@@ -44,15 +44,23 @@ const eventConfigSchema = z.object({
     }
 });
 const backendSchema = z.object({
-    API_URL: z.string().url('API_URL must be a valid URL'),
-    GENERATED_TYPES_DIR: z.string({ required_error: 'GENERATED_TYPES_DIR is required' }),
+    API_URL: z.string().url("API_URL must be a valid URL"),
+    GENERATED_TYPES_DIR: z.string({
+        required_error: "GENERATED_TYPES_DIR is required",
+    }),
+    GENERATED_ACTIONS_DIR: z.string().optional(),
     BACKEND_TZ: z.string().optional(),
-    fileUploadMode: z.enum(['server', 's3']).default('server'),
-    getAuthHeaders: z.function().optional()
-        .refine((fn) => fn === undefined || typeof fn === 'function', 'getAuthHeaders must be a function if provided'),
-    eventInterceptor: z.function().optional()
-        .refine((fn) => fn === undefined || typeof fn === 'function', 'eventInterceptor must be a function if provided'),
-    events: z.lazy(() => eventConfigSchema.optional())
+    fileRootURL: z.string().url("fileRootURL must be a valid URL").optional(),
+    fileUploadMode: z.enum(["server", "s3"]).default("server"),
+    getAuthHeaders: z
+        .function()
+        .optional()
+        .refine((fn) => fn === undefined || typeof fn === "function", "getAuthHeaders must be a function if provided"),
+    eventInterceptor: z
+        .function()
+        .optional()
+        .refine((fn) => fn === undefined || typeof fn === "function", "eventInterceptor must be a function if provided"),
+    events: z.lazy(() => eventConfigSchema.optional()),
 });
 const configSchema = z.object({
     backendConfigs: z.record(z.string(), backendSchema)
@@ -76,7 +84,8 @@ const configSchema = z.object({
             }
         }
         return { message: errors.join('; ') };
-    })
+    }),
+    periodicSyncIntervalSeconds: z.number().min(5).nullable().optional().default(null),
 });
 // Internal variable to hold the validated configuration.
 let config = null;
@@ -212,6 +221,26 @@ export function registerModelGetter(getterFn) {
     }
     modelGetter = getterFn;
 }
+/**
+ * Helper function to build file URLs
+ */
+export function buildFileUrl(fileUrl, backendKey = 'default') {
+    // If URL is already absolute (cloud storage), use it as-is
+    if (fileUrl && fileUrl.startsWith('http')) {
+        return fileUrl;
+    }
+    const cfg = getConfig();
+    const backend = cfg.backendConfigs[backendKey];
+    if (!backend) {
+        throw new ConfigError(`Backend "${backendKey}" not found in configuration.`);
+    }
+    // If no fileRootURL provided, return relative URL as-is
+    if (!backend.fileRootURL) {
+        return fileUrl;
+    }
+    // Construct full URL
+    return backend.fileRootURL.replace(/\/$/, '') + fileUrl;
+}
 /**
  * Get a model class by name using the registered getter.
  *
@@ -237,6 +266,7 @@ export const configInstance = {
     setBackendConfig,
     initializeEventReceiver,
     registerModelGetter,
-    getModelClass
+    getModelClass,
+    buildFileUrl
 };
 export default configInstance;

package/dist/flavours/django/dates.js

@@ -23,7 +23,7 @@ export class DateParsingHelpers {
         // Get field-specific format from schema
         const formatStrings = {
             'date': schema.date_format,
-            'datetime': schema.datetime_format
+            'date-time': schema.datetime_format
         };
         const dateFormat = formatStrings[fieldFormat];
         // Check if format is supported
@@ -56,13 +56,13 @@ export class DateParsingHelpers {
             return date;
         }
         const fieldFormat = schema.properties[fieldName].format;
-        if (!["date", "datetime"].includes(fieldFormat)) {
+        if (!["date", "date-time"].includes(fieldFormat)) {
             throw new Error(`Only date and date-time fields can be processed to JS date objects. ${fieldName} has format ${fieldFormat}`);
         }
         // Get field-specific format from schema
         const formatStrings = {
             'date': schema.date_format,
-            'datetime': schema.datetime_format
+            'date-time': schema.datetime_format
         };
         const dateFormat = formatStrings[fieldFormat];
         // Check if format is supported

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

@@ -5,10 +5,10 @@ export class FileObject {
     static configKey: string;
     static MIN_CHUNK_SIZE: number;
     constructor(file: any, options?: {});
-    name: string;
-    size: number;
-    type: string;
-    lastModified: number;
+    name: any;
+    size: any;
+    type: any;
+    lastModified: number | null;
     uploaded: boolean;
     uploading: boolean;
     uploadResult: any;
@@ -21,6 +21,7 @@ export class FileObject {
     chunkSize: any;
     maxConcurrency: any;
     uploadPromise: any;
+    get isStoredFile(): any;
     get status(): "failed" | "uploading" | "uploaded" | "pending";
     get filePath(): any;
     get fileUrl(): any;
@@ -59,9 +60,9 @@ export class FileObject {
     getBlob(): Blob;
     waitForUpload(): Promise<any>;
     toJSON(): {
-        name: string;
-        size: number;
-        type: string;
+        name: any;
+        size: any;
+        type: any;
         status: string;
         uploaded: boolean;
         filePath: any;

package/dist/flavours/django/files.js

@@ -5,9 +5,37 @@ import PQueue from "p-queue";
  * FileObject - A file wrapper that handles uploads to StateZero backend
  */
 export class FileObject {
+    // Simple changes to FileObject constructor
     constructor(file, options = {}) {
+        // Handle stored file data (from API)
+        if (file &&
+            typeof file === "object" &&
+            file.file_path &&
+            !(file instanceof File)) {
+            // This is stored file data from the backend
+            this.name = file.file_name;
+            this.size = file.size;
+            this.type = file.mime_type; // Now coming from backend
+            this.lastModified = null;
+            // Mark as already uploaded
+            this.uploaded = true;
+            this.uploading = false;
+            this.uploadResult = file; // Store the entire response
+            this.uploadError = null;
+            this.fileData = null;
+            // No upload properties needed
+            this.uploadType = null;
+            this.uploadId = null;
+            this.totalChunks = 0;
+            this.completedChunks = 0;
+            this.chunkSize = null;
+            this.maxConcurrency = null;
+            this.uploadPromise = Promise.resolve(this.uploadResult);
+            return;
+        }
+        // Handle File objects (for upload) - existing code
         if (!file || !(file instanceof File)) {
-            throw new Error("FileObject requires a File object");
+            throw new Error("FileObject requires a File object or stored file data");
         }
         // Store file metadata directly
         this.name = file.name;
@@ -33,6 +61,9 @@ export class FileObject {
         this.maxConcurrency = options.maxConcurrency || 3;
         this.uploadPromise = this._initializeAndStartUpload(file, options);
     }
+    get isStoredFile() {
+        return this.uploaded && !this.fileData && this.uploadResult?.file_path;
+    }
     get status() {
         if (this.uploadError)
             return "failed";
@@ -46,7 +77,10 @@ export class FileObject {
         return this.uploadResult?.file_path;
     }
     get fileUrl() {
-        return this.uploadResult?.file_url;
+        if (!this.uploadResult?.file_url) {
+            return null;
+        }
+        return configInstance.buildFileUrl(this.uploadResult.file_url, this.constructor.configKey);
     }
     async _initializeAndStartUpload(file, options) {
         const config = configInstance.getConfig();

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

@@ -35,6 +35,14 @@ export class Model {
      * @throws {ValidationError} If an unknown key is found.
      */
     static validateFields(data: Object): void;
+    /**
+     * Static method to validate data without creating an instance
+     * @param {Object} data - Data to validate
+     * @param {string} validateType - 'create' or 'update'
+     * @param {boolean} partial - Whether to allow partial validation
+     * @returns {Promise<boolean>} Promise that resolves to true if valid, throws error if invalid
+     */
+    static validate(data: Object, validateType?: string, partial?: boolean): Promise<boolean>;
     constructor(data?: {});
     _data: {};
     _pk: any;
@@ -105,6 +113,13 @@ export class Model {
      * @throws {Error} If the instance has not been saved (no primary key).
      */
     refreshFromDb(): Promise<void>;
+    /**
+     * Validates the model instance using the same serialize behavior as save()
+     * @param {string} validateType - 'create' or 'update' (defaults to auto-detect)
+     * @param {boolean} partial - Whether to allow partial validation
+     * @returns {Promise<boolean>} Promise that resolves to true if valid, throws error if invalid
+     */
+    validate(validateType?: string, partial?: boolean): Promise<boolean>;
 }
 /**
  * A constructor for a Model.