@seedprotocol/sdk 0.4.3 → 0.4.4

package/dist/{ModelProperty-Cr3BmgkC.js → ModelProperty-gjcA83Mq.js}

@@ -1,7 +1,7 @@
 import { fromCallback, setup, assign, createActor } from 'xstate';
-import { a as ModelPropertyDataTypes, ad as getLatestSchemaVersion, s as BaseFileManager, p as BaseDb, q as models, ae as writeProcessMachine, af as generateId, ag as createReactiveProxy, ah as findEntity } from './json-I3vJhXo8.js';
+import { a as ModelPropertyDataTypes, ad as getLatestSchemaVersion, s as BaseFileManager, p as BaseDb, q as models, ae as createModelsFromJson, aa as loadSchemaFromFile, af as writeProcessMachine, r as properties, W as schemas, G as modelSchemas, ag as generateId, ah as waitForEntityIdle, ai as createReactiveProxy, aj as findEntity, ak as forceRemoveFromCaches, al as runDestroyLifecycle } from './ClientManager-DoHUt8tU.js';
 import 'pluralize';
-import { eq } from 'drizzle-orm';
+import { eq, and } from 'drizzle-orm';
 import debug from 'debug';
 
 const logger$4 = debug('seedSdk:helpers:updateSchema');
@@ -50,9 +50,9 @@ const getSchemaFilePath = (name, version, schemaFileId) => {
  * @throws Error if schema not found or missing schemaFileId
  */
 async function getSchemaFileId(schemaName) {
-    const { BaseDb } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aI; });
+    const { BaseDb } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aP; });
     const db = BaseDb.getAppDb();
-    const { schemas } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aN; });
+    const { schemas } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aU; });
     const { eq, desc } = await import('drizzle-orm');
     const dbSchema = await db
         .select()
@@ -65,6 +65,40 @@ async function getSchemaFileId(schemaName) {
     }
     return dbSchema[0].schemaFileId;
 }
+/**
+ * Write the full schema to a new version file (e.g. when new models were added).
+ * Used when _editedProperties contains 'schema:models' and there are no property-level updates.
+ * @param schemaName - Schema name
+ * @param schema - Full schema object (e.g. from _buildModelsFromInstances)
+ * @returns The file path of the new schema version
+ */
+async function writeFullSchemaNewVersion(schemaName, schema) {
+    const latestVersion = await getLatestSchemaVersion(schemaName);
+    const newVersion = latestVersion + 1;
+    const schemaWithNewVersion = {
+        ...schema,
+        version: newVersion,
+        metadata: {
+            ...schema.metadata,
+            updatedAt: new Date().toISOString(),
+        },
+        migrations: [
+            ...(schema.migrations || []),
+            {
+                version: newVersion,
+                timestamp: new Date().toISOString(),
+                description: 'New schema version (e.g. new models added)',
+                changes: [{ type: 'full_schema_write' }],
+            },
+        ],
+    };
+    const newFilePath = getSchemaFilePath(schemaName, newVersion, schema.id ?? (await getSchemaFileId(schemaName)));
+    const newContent = JSON.stringify(schemaWithNewVersion, null, 2);
+    await BaseFileManager.saveFile(newFilePath, newContent);
+    await BaseFileManager.waitForFileWithContent(newFilePath);
+    logger$4(`Created new schema version ${newVersion} for ${schemaName} at ${newFilePath}`);
+    return newFilePath;
+}
 /**
  * Get model name from modelId
  * @param modelId - The model ID to look up
@@ -317,11 +351,9 @@ async function loadSchemaWithRenames(schemaFilePath, modelRenames) {
             },
         ])),
     };
-    // Use dynamic import to break circular dependency
-    const { createModelsFromJson } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aW; });
     // Generate schema ID if missing
     if (!schemaFile.id) {
-        const { generateId } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aL; });
+        const { generateId } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aS; });
         schemaFile.id = generateId();
         logger$4('Generated schema ID for schema:', schemaFile.id);
     }
@@ -329,7 +361,7 @@ async function loadSchemaWithRenames(schemaFilePath, modelRenames) {
     // This ensures Model instances are created with correct IDs
     const modelFileIds = new Map();
     const propertyFileIds = new Map();
-    const { generateId } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aL; });
+    const { generateId } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aS; });
     for (const [modelName, model] of Object.entries(schemaFile.models)) {
         // Generate model ID if missing
         if (!model.id) {
@@ -364,7 +396,7 @@ async function loadSchemaWithRenames(schemaFilePath, modelRenames) {
         updatedAt: new Date(schemaFile.metadata.updatedAt).getTime(),
     };
     // Use dynamic import to break circular dependency
-    const { addSchemaToDb, addModelsToDb } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aR; });
+    const { addSchemaToDb, addModelsToDb } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aW; });
     // Add schema to database with schemaFileId
     const schemaRecord = await addSchemaToDb(schemaInput, schemaFile.id);
     // Add models to database with model renames handled and schemaFileIds
@@ -473,8 +505,6 @@ async function renameModelProperty(schemaName, modelName, oldPropertyName, newPr
     // Wait for the file to be available with content (important for browser/OPFS where writes may not be immediately readable)
     await BaseFileManager.waitForFileWithContent(newFilePath);
     logger$4(`Renamed property ${oldPropertyName} to ${newPropertyName} in schema ${schemaName} v${newVersion}`);
-    // Use dynamic import to break circular dependency
-    const { loadSchemaFromFile } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aW; });
     // Load the new schema file
     await loadSchemaFromFile(newFilePath);
     return newFilePath;
@@ -614,8 +644,6 @@ async function deleteModelFromSchema(schemaName, modelName, options = {}) {
     // Wait for the file to be available with content (important for browser/OPFS where writes may not be immediately readable)
     await BaseFileManager.waitForFileWithContent(newFilePath);
     logger$4(`Deleted model ${modelName} from schema ${schemaName} v${newVersion}`);
-    // Use dynamic import to break circular dependency
-    const { loadSchemaFromFile } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aW; });
     // Load the new schema file
     await loadSchemaFromFile(newFilePath);
     return newFilePath;
@@ -702,8 +730,6 @@ async function deletePropertyFromModel(schemaName, modelName, propertyName, opti
     // Wait for the file to be available with content (important for browser/OPFS where writes may not be immediately readable)
     await BaseFileManager.waitForFileWithContent(newFilePath);
     logger$4(`Deleted property ${propertyName} from model ${modelName} in schema ${schemaName} v${newVersion}`);
-    // Use dynamic import to break circular dependency
-    const { loadSchemaFromFile } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aW; });
     // Load the new schema file
     await loadSchemaFromFile(newFilePath);
     return newFilePath;
@@ -717,11 +743,11 @@ const logger$3 = debug('seedSdk:modelProperty:actors:saveToSchema');
  */
 async function getSchemaNameFromModel(modelName) {
     // Get the latest schema files and find which one contains this model
-    const { listLatestSchemaFiles } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aT; });
+    const { listLatestSchemaFiles } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aY; });
     const latestSchemas = await listLatestSchemaFiles();
     for (const schema of latestSchemas) {
         try {
-            const { BaseFileManager } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aK; });
+            const { BaseFileManager } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aR; });
             const content = await BaseFileManager.readFileAsString(schema.filePath);
             const schemaFile = JSON.parse(content);
             if (schemaFile.models && schemaFile.models[modelName]) {
@@ -738,7 +764,7 @@ async function getSchemaNameFromModel(modelName) {
 const saveToSchema = fromCallback(({ sendBack, input: { context } }) => {
     const _saveToSchema = async () => {
         // Use dynamic import to break circular dependency
-        const { SchemaValidationService } = await import('./SchemaValidationService-cTlURuDt.js');
+        const { SchemaValidationService } = await import('./SchemaValidationService-BfoEiHNr.js');
         const validationService = new SchemaValidationService();
         // Validate property structure before saving
         const validationResult = validationService.validatePropertyStructure(context);
@@ -766,8 +792,8 @@ const saveToSchema = fromCallback(({ sendBack, input: { context } }) => {
         await updateModelProperties(schemaName, [propertyUpdate]);
         // Clear isEdited flag in database after saving to schema file
         try {
-            const { BaseDb } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aI; });
-            const { properties: propertiesTable, models: modelsTable } = await import('./index-r45w9hEq.js').then(function (n) { return n.s; });
+            const { BaseDb } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aP; });
+            const { properties: propertiesTable, models: modelsTable } = await import('./index-D2OGsG4v.js').then(function (n) { return n.s; });
             const { eq, and } = await import('drizzle-orm');
             const db = BaseDb.getAppDb();
             if (db && context.modelName && context.name) {
@@ -820,45 +846,86 @@ var saveToSchema$1 = /*#__PURE__*/Object.freeze({
 const logger$2 = debug('seedSdk:modelProperty:actors:compareAndMarkDraft');
 const compareAndMarkDraft = fromCallback(({ sendBack, input: { context } }) => {
     const _compareAndMarkDraft = async () => {
+        // Fill modelName/dataType from _originalValues when missing, then from DB by schemaFileId
+        let fullContext = {
+            ...context,
+            modelName: context.modelName ?? context._originalValues?.modelName,
+            dataType: context.dataType ?? context._originalValues?.dataType,
+        };
+        const schemaFileIdForResolve = fullContext._propertyFileId || (typeof fullContext.id === 'string' ? fullContext.id : undefined);
+        if (schemaFileIdForResolve && (fullContext.modelName === undefined || fullContext.dataType === undefined)) {
+            try {
+                const { getPropertyModelNameAndDataType, getModelNameByModelId } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aW; });
+                let fromDb;
+                for (let attempt = 0; attempt < 6; attempt++) {
+                    fromDb = await getPropertyModelNameAndDataType(schemaFileIdForResolve);
+                    if (fromDb)
+                        break;
+                    if (attempt < 5)
+                        await new Promise((r) => setTimeout(r, 40));
+                }
+                if (fromDb) {
+                    fullContext = {
+                        ...fullContext,
+                        modelName: fullContext.modelName ?? fromDb.modelName,
+                        dataType: fullContext.dataType ?? fromDb.dataType,
+                    };
+                }
+                if (fullContext.modelName === undefined && schemaFileIdForResolve) {
+                    const mod = await Promise.resolve().then(function () { return ModelProperty$1; });
+                    const ModelProperty = mod?.ModelProperty ?? mod?.default;
+                    const pendingModelId = ModelProperty?.getPendingModelId?.(schemaFileIdForResolve);
+                    if (pendingModelId != null) {
+                        const modelName = await getModelNameByModelId(pendingModelId);
+                        if (modelName) {
+                            fullContext = { ...fullContext, modelName };
+                        }
+                    }
+                }
+            }
+            catch {
+                // ignore
+            }
+        }
+        const schemaFileId = fullContext._propertyFileId || (typeof fullContext.id === 'string' ? fullContext.id : undefined);
         // If _originalValues is not set, we still need to save to database if the property exists
         // This handles the case where the name is changed before _originalValues is initialized
-        if (!context._originalValues) {
+        if (!fullContext._originalValues) {
             logger$2('No original values to compare against');
-            logger$2(`[compareAndMarkDraft] Context: modelName=${context.modelName}, name=${context.name}, id=${context.id}, _propertyFileId=${context._propertyFileId}`);
+            logger$2(`[compareAndMarkDraft] Context: modelName=${fullContext.modelName}, name=${fullContext.name}, id=${fullContext.id}, _propertyFileId=${fullContext._propertyFileId}`);
             // If we have a name and modelName, try to save to database anyway
             // This ensures name changes are persisted even if _originalValues isn't initialized yet
             // We need either schemaFileId (id or _propertyFileId) to find the property in the database
-            const schemaFileId = context._propertyFileId || (typeof context.id === 'string' ? context.id : undefined);
-            if (context.modelName && context.name && schemaFileId) {
+            if (fullContext.modelName && fullContext.name && schemaFileId) {
                 logger$2(`[compareAndMarkDraft] _originalValues not set, but saving to database anyway for property ${context.modelName}:${context.name} (schemaFileId: ${schemaFileId})`);
                 try {
-                    const { savePropertyToDb } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aR; });
+                    const { savePropertyToDb } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aW; });
                     // Ensure _propertyFileId is set for savePropertyToDb to find the property
                     const contextWithFileId = {
-                        ...context,
+                        ...fullContext,
                         _propertyFileId: schemaFileId,
                     };
                     await savePropertyToDb(contextWithFileId);
-                    logger$2(`[compareAndMarkDraft] Successfully saved property ${context.modelName}:${context.name} to database (no _originalValues)`);
+                    logger$2(`[compareAndMarkDraft] Successfully saved property ${fullContext.modelName}:${fullContext.name} to database (no _originalValues)`);
                 }
                 catch (error) {
                     logger$2(`[compareAndMarkDraft] Error saving property to database (no _originalValues): ${error}`);
                     // Don't throw - this is a best-effort save, but log the error for debugging
-                    console.error(`[compareAndMarkDraft] Failed to save property ${context.modelName}:${context.name}:`, error);
+                    console.error(`[compareAndMarkDraft] Failed to save property ${fullContext.modelName}:${fullContext.name}:`, error);
                 }
             }
             else {
-                logger$2(`[compareAndMarkDraft] Cannot save property ${context.modelName}:${context.name} - missing required fields (schemaFileId: ${schemaFileId})`);
+                logger$2(`[compareAndMarkDraft] Cannot save property ${fullContext.modelName}:${fullContext.name} - missing required fields (schemaFileId: ${schemaFileId})`);
             }
             return;
         }
-        logger$2(`[compareAndMarkDraft] Comparing: context.name=${context.name}, _originalValues.name=${context._originalValues?.name}`);
+        logger$2(`[compareAndMarkDraft] Comparing: context.name=${fullContext.name}, _originalValues.name=${fullContext._originalValues?.name}`);
         // Compare current values with original
         // Only compare property fields, not internal fields
         const propertyFields = ['name', 'dataType', 'ref', 'refModelName', 'refModelId', 'refValueType', 'storageType', 'localStorageDir', 'filenameSuffix', 'modelName', 'modelId'];
         const hasChanges = propertyFields.some(key => {
-            const currentValue = context[key];
-            const originalValue = context._originalValues?.[key];
+            const currentValue = fullContext[key];
+            const originalValue = fullContext._originalValues?.[key];
             // Handle name changes specifically
             if (key === 'name') {
                 const nameChanged = currentValue !== originalValue;
@@ -869,8 +936,8 @@ const compareAndMarkDraft = fromCallback(({ sendBack, input: { context } }) => {
             }
             // Handle ref fields - compare by name
             if (key === 'ref' || key === 'refModelName') {
-                const currentRef = context.refModelName || context.ref;
-                const originalRef = context._originalValues?.refModelName || context._originalValues?.ref;
+                const currentRef = fullContext.refModelName || fullContext.ref;
+                const originalRef = fullContext._originalValues?.refModelName || fullContext._originalValues?.ref;
                 // Both undefined/null means no ref, so they're the same
                 if (!currentRef && !originalRef)
                     return false;
@@ -888,53 +955,55 @@ const compareAndMarkDraft = fromCallback(({ sendBack, input: { context } }) => {
             return currentValue !== originalValue;
         });
         if (hasChanges) {
-            logger$2(`Property ${context.modelName}:${context.name} has changes, marking as edited`);
-            logger$2(`[compareAndMarkDraft] Context when saving: id=${context.id}, _propertyFileId=${context._propertyFileId}, name=${context.name}, _originalValues.name=${context._originalValues?.name}`);
+            logger$2(`Property ${fullContext.modelName}:${fullContext.name} has changes, marking as edited`);
+            logger$2(`[compareAndMarkDraft] Context when saving: id=${fullContext.id}, _propertyFileId=${fullContext._propertyFileId}, name=${fullContext.name}, _originalValues.name=${fullContext._originalValues?.name}`);
             // Use dynamic import to break circular dependency
-            const { savePropertyToDb } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aR; });
+            const { savePropertyToDb } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aW; });
             // Save to database (but not JSON file) - always save to DB when there are changes
             try {
-                await savePropertyToDb(context);
-                logger$2(`[compareAndMarkDraft] Successfully saved property ${context.modelName}:${context.name} to database`);
+                await savePropertyToDb(fullContext);
+                logger$2(`[compareAndMarkDraft] Successfully saved property ${fullContext.modelName}:${fullContext.name} to database`);
             }
             catch (error) {
                 logger$2(`[compareAndMarkDraft] Error saving property to database: ${error}`);
                 throw error;
             }
             // Mark schema as draft if schema name is available
-            if (context._schemaName) {
+            if (fullContext._schemaName) {
                 // Get the Schema instance and mark it as draft
-                const { Schema } = await import('./Schema-DeKabJ0T.js');
-                const schema = Schema.create(context._schemaName);
+                const { Schema } = await import('./Schema-ClTcpgbt.js');
+                const schema = Schema.create(fullContext._schemaName, {
+                    waitForReady: false,
+                });
                 // Send event to Schema machine to mark as draft
                 schema.getService().send({
                     type: 'markAsDraft',
-                    propertyKey: `${context.modelName}:${context.name}`,
+                    propertyKey: `${fullContext.modelName}:${fullContext.name}`,
                 });
             }
         }
         else {
             // No changes - clear edited flag in database and context
-            logger$2(`Property ${context.modelName}:${context.name} has no changes`);
+            logger$2(`Property ${fullContext.modelName}:${fullContext.name} has no changes`);
             // Clear isEdited flag in database
             try {
-                const { BaseDb } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aI; });
-                const { properties: propertiesTable, models: modelsTable } = await import('./index-r45w9hEq.js').then(function (n) { return n.s; });
+                const { BaseDb } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aP; });
+                const { properties: propertiesTable, models: modelsTable } = await import('./index-D2OGsG4v.js').then(function (n) { return n.s; });
                 const { eq, and } = await import('drizzle-orm');
                 const db = BaseDb.getAppDb();
-                if (db && context.modelName && context.name) {
+                if (db && fullContext.modelName && fullContext.name) {
                     // Find model by name
                     const modelRecords = await db
                         .select({ id: modelsTable.id })
                         .from(modelsTable)
-                        .where(eq(modelsTable.name, context.modelName))
+                        .where(eq(modelsTable.name, fullContext.modelName))
                         .limit(1);
                     if (modelRecords.length > 0) {
                         // Find property by name and modelId
                         const propertyRecords = await db
                             .select({ id: propertiesTable.id })
                             .from(propertiesTable)
-                            .where(and(eq(propertiesTable.name, context.name), eq(propertiesTable.modelId, modelRecords[0].id)))
+                            .where(and(eq(propertiesTable.name, fullContext.name), eq(propertiesTable.modelId, modelRecords[0].id)))
                             .limit(1);
                         if (propertyRecords.length > 0) {
                             // Clear isEdited flag in database
@@ -942,7 +1011,7 @@ const compareAndMarkDraft = fromCallback(({ sendBack, input: { context } }) => {
                                 .update(propertiesTable)
                                 .set({ isEdited: false })
                                 .where(eq(propertiesTable.id, propertyRecords[0].id));
-                            logger$2(`Cleared isEdited flag in database for property ${context.modelName}:${context.name}`);
+                            logger$2(`Cleared isEdited flag in database for property ${fullContext.modelName}:${fullContext.name}`);
                         }
                     }
                 }
@@ -969,20 +1038,82 @@ const compareAndMarkDraft = fromCallback(({ sendBack, input: { context } }) => {
 const logger$1 = debug('seedSdk:modelProperty:actors:validateProperty');
 const validateProperty = fromCallback(({ sendBack, input: { context } }) => {
     const _validateProperty = async () => {
-        console.log('[validateProperty] Starting validation for property:', context.name);
+        // Use full context for validation: fill modelName/dataType from _originalValues when missing, then
+        // from DB by schemaFileId (context.id) so just-created renames don't fail structure validation.
+        let fullContext = {
+            ...context,
+            modelName: context.modelName ?? context._originalValues?.modelName,
+            dataType: context.dataType ?? context._originalValues?.dataType,
+        };
+        const schemaFileId = typeof context.id === 'string' ? context.id : undefined;
+        if (schemaFileId && (fullContext.modelName === undefined || fullContext.dataType === undefined)) {
+            // Brief wait so trackPendingWrite from ModelProperty.create() has time to run (it's in setTimeout(0))
+            await new Promise((r) => setTimeout(r, 60));
+            try {
+                const { getPropertyModelNameAndDataType, getModelNameByModelId } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aW; });
+                // Try pending write first (property row may not exist yet)
+                if (fullContext.modelName === undefined && schemaFileId) {
+                    const mod = await Promise.resolve().then(function () { return ModelProperty$1; });
+                    const ModelProperty = mod?.ModelProperty ?? mod?.default;
+                    const pendingModelId = ModelProperty?.getPendingModelId?.(schemaFileId);
+                    if (pendingModelId != null) {
+                        const modelName = await getModelNameByModelId(pendingModelId);
+                        if (modelName) {
+                            fullContext = { ...fullContext, modelName };
+                        }
+                    }
+                }
+                // Then DB property lookup with retry (catches row after initial write)
+                let fromDb;
+                for (let attempt = 0; attempt < 6; attempt++) {
+                    fromDb = await getPropertyModelNameAndDataType(schemaFileId);
+                    if (fromDb)
+                        break;
+                    if (attempt < 5)
+                        await new Promise((r) => setTimeout(r, 40));
+                }
+                if (fromDb) {
+                    fullContext = {
+                        ...fullContext,
+                        modelName: fullContext.modelName ?? fromDb.modelName,
+                        dataType: fullContext.dataType ?? fromDb.dataType,
+                    };
+                }
+                // If still no modelName, try pending write again (may have been set during retries)
+                if (fullContext.modelName === undefined && schemaFileId) {
+                    const mod = await Promise.resolve().then(function () { return ModelProperty$1; });
+                    const ModelProperty = mod?.ModelProperty ?? mod?.default;
+                    const pendingModelId = ModelProperty?.getPendingModelId?.(schemaFileId);
+                    if (pendingModelId != null) {
+                        const modelName = await getModelNameByModelId(pendingModelId);
+                        if (modelName) {
+                            fullContext = { ...fullContext, modelName };
+                        }
+                    }
+                }
+            }
+            catch {
+                // ignore
+            }
+        }
+        // Last resort for structure validation: TProperty requires dataType; allow name+id to pass if we have schemaFileId
+        if (fullContext.dataType === undefined && (fullContext.modelName !== undefined || schemaFileId)) {
+            fullContext = { ...fullContext, dataType: (fullContext.dataType ?? context._originalValues?.dataType) || 'Text' };
+        }
+        console.log('[validateProperty] Starting validation for property:', fullContext.name);
         console.log('[validateProperty] Context:', {
-            name: context.name,
-            modelName: context.modelName,
-            _schemaName: context._schemaName,
-            _originalValues: context._originalValues
+            name: fullContext.name,
+            modelName: fullContext.modelName,
+            _schemaName: fullContext._schemaName,
+            _originalValues: fullContext._originalValues
         });
         // Use dynamic imports to break circular dependencies
-        const { SchemaValidationService } = await import('./SchemaValidationService-cTlURuDt.js');
+        const { SchemaValidationService } = await import('./SchemaValidationService-BfoEiHNr.js');
         const validationService = new SchemaValidationService();
-        const { Schema } = await import('./Schema-DeKabJ0T.js');
+        const { Schema } = await import('./Schema-ClTcpgbt.js');
         // Validate property structure
         console.log('[validateProperty] Validating property structure...');
-        const structureResult = validationService.validatePropertyStructure(context);
+        const structureResult = validationService.validatePropertyStructure(fullContext);
         console.log('[validateProperty] Structure validation result:', structureResult.isValid);
         if (!structureResult.isValid) {
             console.log('[validateProperty] Structure validation failed:', structureResult.errors);
@@ -991,11 +1122,13 @@ const validateProperty = fromCallback(({ sendBack, input: { context } }) => {
         }
         console.log('[validateProperty] Structure validation passed');
         // If we have schema name and model name, validate against schema
-        console.log('[validateProperty] Checking schema validation:', { hasSchemaName: !!context._schemaName, hasModelName: !!context.modelName });
-        if (context._schemaName && context.modelName) {
+        console.log('[validateProperty] Checking schema validation:', { hasSchemaName: !!fullContext._schemaName, hasModelName: !!fullContext.modelName });
+        if (fullContext._schemaName && fullContext.modelName) {
             try {
-                console.log('[validateProperty] Creating schema instance:', context._schemaName);
-                const schema = Schema.create(context._schemaName);
+                console.log('[validateProperty] Creating schema instance:', fullContext._schemaName);
+                const schema = Schema.create(fullContext._schemaName, {
+                    waitForReady: false,
+                });
                 const schemaSnapshot = schema.getService().getSnapshot();
                 const schemaStatus = schemaSnapshot.value;
                 console.log('[validateProperty] Schema status:', schemaStatus);
@@ -1008,28 +1141,28 @@ const validateProperty = fromCallback(({ sendBack, input: { context } }) => {
                     if (schemaContext.models && Object.keys(schemaContext.models).length > 0) {
                         // If property name has changed, validate against the original name (from schema file)
                         // This handles the case where a property is renamed - the schema file still has the old name
-                        const propertyNameToValidate = context._originalValues?.name && context._originalValues.name !== context.name
-                            ? context._originalValues.name
-                            : context.name || '';
+                        const propertyNameToValidate = fullContext._originalValues?.name && fullContext._originalValues.name !== fullContext.name
+                            ? fullContext._originalValues.name
+                            : fullContext.name || '';
                         console.log('[validateProperty] Validating against schema:', {
-                            modelName: context.modelName,
+                            modelName: fullContext.modelName,
                             propertyNameToValidate,
-                            originalName: context._originalValues?.name,
-                            currentName: context.name
+                            originalName: fullContext._originalValues?.name,
+                            currentName: fullContext.name
                         });
-                        const schemaResult = validationService.validateProperty(schemaContext, context.modelName, propertyNameToValidate, context);
+                        const schemaResult = validationService.validateProperty(schemaContext, fullContext.modelName, propertyNameToValidate, fullContext);
                         console.log('[validateProperty] Schema validation result:', { isValid: schemaResult.isValid, errors: schemaResult.errors.length, errorCodes: schemaResult.errors.map(e => e.code) });
                         if (!schemaResult.isValid) {
                             // If property was renamed, some validation errors are expected (like property_not_found, missing_type)
                             // Only fail if it's a critical error that's not related to the rename
-                            const isRenamed = context._originalValues?.name && context._originalValues.name !== context.name;
+                            const isRenamed = fullContext._originalValues?.name && fullContext._originalValues.name !== fullContext.name;
                             const criticalErrors = schemaResult.errors.filter(err => {
                                 // Allow property_not_found and missing_type errors when property is renamed
                                 if (isRenamed && (err.code === 'property_not_found' || err.code === 'missing_type')) {
                                     return false; // Not critical
                                 }
                                 // For non-renamed properties, only allow property_not_found if we're validating with the same name
-                                if (err.code === 'property_not_found' && propertyNameToValidate === context.name) {
+                                if (err.code === 'property_not_found' && propertyNameToValidate === fullContext.name) {
                                     return false; // Not critical
                                 }
                                 return true; // Critical error
@@ -1163,6 +1296,15 @@ const modelPropertyMachine = setup({
                     }
                     newContext[key] = value;
                 }
+                // Preserve modelName and dataType from context or _originalValues so validation and savePropertyToDb
+                // never run with missing required/needed fields (e.g. when a just-created property is renamed before
+                // the full context is available from the creator).
+                if (newContext.modelName === undefined && context._originalValues?.modelName !== undefined) {
+                    newContext.modelName = context._originalValues.modelName;
+                }
+                if (newContext.dataType === undefined && context._originalValues?.dataType !== undefined) {
+                    newContext.dataType = context._originalValues.dataType;
+                }
                 // Compare with original values and set _isEdited flag (only for non-internal updates)
                 if (!onlyInternalFields && context._originalValues) {
                     const hasChanges = Object.keys(event).some((key) => {
@@ -1232,6 +1374,23 @@ const modelPropertyMachine = setup({
                 _schemaName: event.schemaName,
             })),
         },
+        destroyStarted: {
+            actions: assign({ _destroyInProgress: true, _destroyError: null }),
+        },
+        destroyDone: {
+            actions: assign({ _destroyInProgress: false }),
+        },
+        destroyError: {
+            actions: assign(({ event }) => ({
+                _destroyInProgress: false,
+                _destroyError: event.error instanceof Error
+                    ? { message: event.error.message, name: event.error.name }
+                    : { message: String(event.error) },
+            })),
+        },
+        clearDestroyError: {
+            actions: assign({ _destroyError: null }),
+        },
     },
     states: {
         idle: {
@@ -1357,6 +1516,32 @@ const modelPropertyMachine = setup({
     },
 });
 
+/**
+ * Returns property rows for a model identified by modelFileId (model's schemaFileId).
+ * Resolves modelFileId -> modelId via models table, then selects all properties where modelId = ?.
+ * Each row includes schemaFileId for use with ModelProperty.createById(schemaFileId).
+ */
+const getModelPropertiesData = async (modelFileId) => {
+    const appDb = BaseDb.getAppDb();
+    if (!appDb || !modelFileId) {
+        return [];
+    }
+    const modelRows = await appDb
+        .select({ id: models.id })
+        .from(models)
+        .where(eq(models.schemaFileId, modelFileId))
+        .limit(1);
+    if (modelRows.length === 0) {
+        return [];
+    }
+    const modelId = modelRows[0].id;
+    const rows = await appDb
+        .select()
+        .from(properties)
+        .where(eq(properties.modelId, modelId));
+    return rows;
+};
+
 const logger = debug('seedSdk:modelProperty:ModelProperty');
 // Define the property keys from TProperty
 const TPropertyKeys = [
@@ -1523,8 +1708,6 @@ class ModelProperty {
             return fallbackIsEdited;
         }
         try {
-            const { BaseDb } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aI; });
-            const { properties: propertiesTable, models: modelsTable } = await import('./index-r45w9hEq.js').then(function (n) { return n.s; });
             const { eq, and } = await import('drizzle-orm');
             const db = BaseDb.getAppDb();
             if (!db) {
@@ -1532,18 +1715,18 @@ class ModelProperty {
             }
             // Find model by name
             const modelRecords = await db
-                .select({ id: modelsTable.id })
-                .from(modelsTable)
-                .where(eq(modelsTable.name, property.modelName))
+                .select({ id: models.id })
+                .from(models)
+                .where(eq(models.name, property.modelName))
                 .limit(1);
             if (modelRecords.length === 0) {
                 return fallbackIsEdited;
             }
             // Find property by name and modelId
             const propertyRecords = await db
-                .select({ isEdited: propertiesTable.isEdited })
-                .from(propertiesTable)
-                .where(and(eq(propertiesTable.name, property.name), eq(propertiesTable.modelId, modelRecords[0].id)))
+                .select({ isEdited: properties.isEdited })
+                .from(properties)
+                .where(and(eq(properties.name, property.name), eq(properties.modelId, modelRecords[0].id)))
                 .limit(1);
             if (propertyRecords.length > 0) {
                 return propertyRecords[0].isEdited ?? false;
@@ -1564,9 +1747,6 @@ class ModelProperty {
             return undefined;
         }
         try {
-            const { BaseDb } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aI; });
-            const seedSchema = await import('./index-r45w9hEq.js').then(function (n) { return n.s; });
-            const modelsTable = seedSchema.models;
             const { eq } = await import('drizzle-orm');
             const db = BaseDb.getAppDb();
             if (!db) {
@@ -1574,8 +1754,8 @@ class ModelProperty {
             }
             const refModelRecords = await db
                 .select()
-                .from(modelsTable)
-                .where(eq(modelsTable.name, refModelName))
+                .from(models)
+                .where(eq(models.name, refModelName))
                 .limit(1);
             if (refModelRecords.length > 0 && refModelRecords[0].id) {
                 return refModelRecords[0].id;
@@ -1596,8 +1776,8 @@ class ModelProperty {
             return undefined;
         }
         try {
-            const { Model } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aS; });
-            const { modelPropertiesToObject } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aP; });
+            const { Model } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aX; });
+            const { modelPropertiesToObject } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aV; });
             const model = await Model.getByNameAsync(property.modelName);
             if (!model || !model.properties || model.properties.length === 0) {
                 return undefined;
@@ -1646,11 +1826,6 @@ class ModelProperty {
             // Try to get schema name from database first (more reliable)
             if (this.modelId) {
                 try {
-                    const { BaseDb } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aI; });
-                    const seedSchema = await import('./index-r45w9hEq.js').then(function (n) { return n.s; });
-                    const modelsTable = seedSchema.models;
-                    const modelSchemas = seedSchema.modelSchemas;
-                    const schemas = seedSchema.schemas;
                     const { eq } = await import('drizzle-orm');
                     const db = BaseDb.getAppDb();
                     if (db) {
@@ -1660,8 +1835,8 @@ class ModelProperty {
                         })
                             .from(modelSchemas)
                             .innerJoin(schemas, eq(modelSchemas.schemaId, schemas.id))
-                            .innerJoin(modelsTable, eq(modelSchemas.modelId, modelsTable.id))
-                            .where(eq(modelsTable.id, this.modelId))
+                            .innerJoin(models, eq(modelSchemas.modelId, models.id))
+                            .where(eq(models.id, this.modelId))
                             .limit(1);
                         if (modelSchemaRecords.length > 0) {
                             schemaName = modelSchemaRecords[0].schemaName;
@@ -1699,10 +1874,12 @@ class ModelProperty {
             schemaName,
         });
     }
-    static create(property) {
+    static create(property, options) {
         if (!property) {
             throw new Error('Property is required');
         }
+        const waitForReady = options?.waitForReady !== false;
+        const readyTimeout = options?.readyTimeout ?? 5000;
         // Debug: Log what's being passed to create()
         console.log(`[ModelProperty.create] Input property data:`, JSON.stringify({
             name: property.name,
@@ -1776,7 +1953,9 @@ class ModelProperty {
                 instance,
                 refCount: refCount + 1,
             });
-            return instance;
+            if (!waitForReady)
+                return instance;
+            return waitForEntityIdle(instance, { timeout: readyTimeout }).then(() => instance);
         }
         // Debug: Log what's being passed to the constructor
         console.log(`[ModelProperty.create] propertyWithId before constructor:`, JSON.stringify({
@@ -1851,7 +2030,7 @@ class ModelProperty {
                         else if (typeof propertyWithId.modelId === 'string') {
                             // modelId is a string (modelFileId), need to convert to database ID
                             try {
-                                const { getModelIdByFileId } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aR; });
+                                const { getModelIdByFileId } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aW; });
                                 resolvedModelId = await getModelIdByFileId(propertyWithId.modelId);
                                 logger(`Converted modelFileId "${propertyWithId.modelId}" to database modelId: ${resolvedModelId}`);
                             }
@@ -1864,7 +2043,7 @@ class ModelProperty {
                     // If we still don't have a modelId, try to resolve it from modelName
                     if (!resolvedModelId && propertyWithId.modelName) {
                         try {
-                            const { getModelId } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aR; });
+                            const { getModelId } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aW; });
                             // Get schemaName from context if available
                             const schemaName = snapshot.context._schemaName;
                             resolvedModelId = await getModelId(propertyWithId.modelName, schemaName);
@@ -1938,7 +2117,9 @@ class ModelProperty {
             // Start checking after a short delay to allow state machine to initialize
             setTimeout(checkAndSend, 0);
         }
-        return proxiedInstance;
+        if (!waitForReady)
+            return proxiedInstance;
+        return waitForEntityIdle(proxiedInstance, { timeout: readyTimeout }).then(() => proxiedInstance);
     }
     /**
      * Get ModelProperty instance by propertyFileId from static cache
@@ -1971,8 +2152,6 @@ class ModelProperty {
             return cachedInstance;
         }
         // Query database to get property data from ID
-        const { BaseDb } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aI; });
-        const { properties: propertiesTable, models: modelsTable } = await import('./index-r45w9hEq.js').then(function (n) { return n.s; });
         const { eq } = await import('drizzle-orm');
         const db = BaseDb.getAppDb();
         console.log('db', !!db);
@@ -1982,13 +2161,13 @@ class ModelProperty {
         }
         const testRecords = await db
             .select()
-            .from(propertiesTable)
+            .from(properties)
             .limit(100);
         console.log('testRecords', testRecords);
         const propertyRecords = await db
             .select()
-            .from(propertiesTable)
-            .where(eq(propertiesTable.schemaFileId, propertyFileId))
+            .from(properties)
+            .where(eq(properties.schemaFileId, propertyFileId))
             .limit(1);
         console.log('propertyRecords', propertyRecords);
         if (propertyRecords.length === 0) {
@@ -1997,9 +2176,9 @@ class ModelProperty {
         const propertyRecord = propertyRecords[0];
         // Get model name
         const modelRecords = await db
-            .select({ name: modelsTable.name })
-            .from(modelsTable)
-            .where(eq(modelsTable.id, propertyRecord.modelId))
+            .select({ name: models.name })
+            .from(models)
+            .where(eq(models.id, propertyRecord.modelId))
             .limit(1);
         if (modelRecords.length === 0) {
             return undefined;
@@ -2022,17 +2201,17 @@ class ModelProperty {
         // Get ref model name if applicable
         if (propertyRecord.refModelId) {
             const refModelRecords = await db
-                .select({ name: modelsTable.name })
-                .from(modelsTable)
-                .where(eq(modelsTable.id, propertyRecord.refModelId))
+                .select({ name: models.name })
+                .from(models)
+                .where(eq(models.id, propertyRecord.refModelId))
                 .limit(1);
             if (refModelRecords.length > 0) {
                 propertyData.refModelName = refModelRecords[0].name;
                 propertyData.ref = refModelRecords[0].name;
             }
         }
-        // Create ModelProperty instance
-        const instance = this.create(propertyData);
+        // Create ModelProperty instance (sync for createById so we can send updateContext)
+        const instance = this.create(propertyData, { waitForReady: false });
         // Set isEdited from database after creation
         if (isEditedFromDb) {
             instance._service.send({
@@ -2060,6 +2239,32 @@ class ModelProperty {
             readyTimeout,
         });
     }
+    /**
+     * Get all ModelProperty instances for a model.
+     * Loads property rows from DB for the given modelFileId, creates instances via createById, optionally waits for idle.
+     */
+    static async all(modelFileId, options) {
+        const { waitForReady = false, readyTimeout = 5000 } = options ?? {};
+        if (!modelFileId) {
+            return [];
+        }
+        const rows = await getModelPropertiesData(modelFileId);
+        const instances = [];
+        for (const row of rows) {
+            if (row.schemaFileId) {
+                const instance = await this.createById(row.schemaFileId);
+                if (instance) {
+                    instances.push(instance);
+                }
+            }
+        }
+        if (waitForReady && instances.length > 0) {
+            await Promise.all(instances.map((p) => waitForEntityIdle(p, {
+                timeout: readyTimeout,
+            })));
+        }
+        return instances;
+    }
     /**
      * Track a pending write for a property
      */
@@ -2098,6 +2303,13 @@ class ModelProperty {
             .filter(([_, write]) => write.modelId === modelId && write.status !== 'error')
             .map(([propertyFileId]) => propertyFileId);
     }
+    /**
+     * Get modelId for a property that has a pending write (row may not be in DB yet).
+     * Used to resolve modelName when validating a just-created property rename.
+     */
+    static getPendingModelId(propertyFileId) {
+        return this.pendingWrites.get(propertyFileId)?.modelId;
+    }
     getService() {
         return this._service;
     }
@@ -2204,6 +2416,61 @@ class ModelProperty {
             // Service might already be stopped
         }
     }
+    /**
+     * Destroy the model property: remove from caches, delete from database, update Schema context, stop service.
+     */
+    async destroy() {
+        const context = this._getSnapshotContext();
+        const cacheKey = context.modelName && context.name
+            ? `${context.modelName}:${context.name}`
+            : (context.id ?? '');
+        if (!cacheKey)
+            return;
+        forceRemoveFromCaches(this, {
+            getCacheKeys: () => [cacheKey],
+            caches: [ModelProperty.instanceCache],
+        });
+        await runDestroyLifecycle(this, {
+            getService: (instance) => instance._service,
+            doDestroy: async () => {
+                const db = BaseDb.getAppDb();
+                const schemaName = context._schemaName;
+                const modelName = context.modelName;
+                const propertyName = context.name;
+                if (!modelName || !propertyName)
+                    return;
+                if (db && schemaName) {
+                    const propertyRecords = await db
+                        .select({ propertyId: properties.id })
+                        .from(properties)
+                        .innerJoin(models, eq(properties.modelId, models.id))
+                        .innerJoin(modelSchemas, eq(models.id, modelSchemas.modelId))
+                        .innerJoin(schemas, eq(modelSchemas.schemaId, schemas.id))
+                        .where(and(eq(schemas.name, schemaName), eq(models.name, modelName), eq(properties.name, propertyName)))
+                        .limit(1);
+                    if (propertyRecords.length > 0 && propertyRecords[0].propertyId != null) {
+                        await db
+                            .delete(properties)
+                            .where(eq(properties.id, propertyRecords[0].propertyId));
+                    }
+                }
+                if (schemaName) {
+                    const { Schema } = await import('./Schema-ClTcpgbt.js');
+                    const schema = Schema.create(schemaName, { waitForReady: false });
+                    const snapshot = schema.getService().getSnapshot();
+                    const schemaContext = snapshot.context;
+                    if (schemaContext.models?.[modelName]?.properties?.[propertyName]) {
+                        const updatedModels = { ...schemaContext.models };
+                        const updatedProperties = { ...updatedModels[modelName].properties };
+                        delete updatedProperties[propertyName];
+                        updatedModels[modelName] = { ...updatedModels[modelName], properties: updatedProperties };
+                        schema.getService().send({ type: 'updateContext', models: updatedModels });
+                        schema.getService().send({ type: 'markAsDraft', propertyKey: `property:${modelName}:${propertyName}` });
+                    }
+                }
+            },
+        });
+    }
 }
 ModelProperty.instanceCache = new Map();
 // Pending writes tracking
@@ -2214,5 +2481,5 @@ var ModelProperty$1 = /*#__PURE__*/Object.freeze({
     ModelProperty: ModelProperty
 });
 
-export { ModelProperty as M, deleteModelFromSchema as a, ModelProperty$1 as b, convertPropertyToSchemaUpdate as c, deletePropertyFromModel as d, renameModelProperty as r, updateModelProperties as u };
-//# sourceMappingURL=ModelProperty-Cr3BmgkC.js.map
+export { ModelProperty as M, deleteModelFromSchema as a, ModelProperty$1 as b, convertPropertyToSchemaUpdate as c, deletePropertyFromModel as d, renameModelProperty as r, updateModelProperties as u, writeFullSchemaNewVersion as w };
+//# sourceMappingURL=ModelProperty-gjcA83Mq.js.map