@seedprotocol/sdk 0.7.5 → 0.7.6

package/dist/{Schema-8DxGcORY.js → Schema-DppObO6h.js}

@@ -1,13 +1,13 @@
 import { fromCallback, setup, assign, createActor } from 'xstate';
-import { av as SEED_PROTOCOL_SCHEMA_NAME, B as BaseDb, A as schemas, aN as addSchemaToDb, i as isDataType, M as ModelPropertyDataTypes, al as generateId, O as addModelsToDb, t as models, r as modelSchemas, v as properties, h as BaseFileManager, aQ as loadModelsFromDbForSchema, aK as isInternalSchema, aR as clearNameMatchLevels } from './BasePathResolver-CBTXCMFL.js';
-import { g as getRefValueType, J as createModelsFromJson, q as listCompleteSchemaFiles, K as getLatestSchemaVersion, l as loadSchemaFromFile, L as jsonPropertiesToSchemaProperties, u as loadAllSchemasFromDb, m as getClient } from './ClientManager-DRf4uuei.js';
+import { au as SEED_PROTOCOL_SCHEMA_NAME, B as BaseDb, A as schemas, aM as addSchemaToDb, i as isDataType, M as ModelPropertyDataTypes, ai as generateId, N as addModelsToDb, t as models, r as modelSchemas, v as properties, h as BaseFileManager, aP as loadModelsFromDbForSchema, aQ as mergeDbModelsIntoSchemaModels, aJ as isInternalSchema, aR as clearNameMatchLevels } from './index-CrvIcVFJ.js';
+import { g as getRefValueType, J as createRowsWrittenSignal, K as createModelsFromJson, q as listCompleteSchemaFiles, L as getLatestSchemaVersion, l as loadSchemaFromFile, M as jsonPropertiesToSchemaProperties, u as loadAllSchemasFromDb, m as getClient } from './ClientManager-D6YA20jP.js';
 import { eq, desc, and } from 'drizzle-orm';
 import debug from 'debug';
-import { c as currentEvictionEpoch, w as writeProcessMachine, t as trackDraftSave, M as Model, g as getDraftSaveError, C as ConflictError, r as recordSchemaDestroy, f as finishSchemaDestroy, d as setupEntityLiveQuery } from './errors-CIrbsN_i.js';
+import { c as currentEvictionEpoch, w as writeProcessMachine, t as trackDraftSave, M as Model, g as getDraftSaveError, C as ConflictError, r as recordSchemaDestroy, f as finishSchemaDestroy, d as setupEntityLiveQuery } from './errors-3tc6XkCB.js';
 import 'pluralize';
 import '@seedprotocol/eas';
-import { SchemaValidationService } from './SchemaValidationService-CE92y1TT.js';
-import { D as DEFAULT_READY_TIMEOUT_MS, d as waitForEntityIdle, m as createReactiveProxy, n as findEntity, C as ClientManagerState, _ as clearDestroySubscriptions, o as forceRemoveFromCaches, $ as unloadEntity, q as runDestroyLifecycle } from './Item-DTJPMjFk.js';
+import { SchemaValidationService } from './SchemaValidationService-DXQ-D531.js';
+import { D as DEFAULT_READY_TIMEOUT_MS, d as waitForEntityIdle, m as createReactiveProxy, n as findEntity, C as ClientManagerState, _ as clearDestroySubscriptions, o as forceRemoveFromCaches, $ as unloadEntity, q as runDestroyLifecycle } from './Item-B1MH0tXx.js';
 
 const logger$d = debug('seedSdk:schema:actors:loadOrCreateSchema');
 /**
@@ -51,7 +51,7 @@ const createModelInstances$2 = async (modelIds, evictionEpoch) => {
         return;
     }
     try {
-        const _mod_0 = await import('./errors-CIrbsN_i.js');
+        const _mod_0 = await import('./errors-3tc6XkCB.js');
         const _ns_0 = _mod_0.h;
         const modelMod = _ns_0;
         const { Model } = modelMod;
@@ -168,7 +168,7 @@ const loadOrCreateSchema = fromCallback(({ sendBack, input: { context } }) => {
             // For Seed Protocol, always load from internal file, never create new
             logger$d(`Loading internal Seed Protocol schema from SDK`);
             try {
-                const _mod_1 = await import('./ClientManager-DRf4uuei.js');
+                const _mod_1 = await import('./ClientManager-D6YA20jP.js');
                 const _ns_1 = _mod_1.S;
                 const internalSchema = _ns_1;
                 const schemaFile = internalSchema.default;
@@ -270,15 +270,17 @@ const loadOrCreateSchema = fromCallback(({ sendBack, input: { context } }) => {
                                 propertyFileIds.set(modelName, propIds);
                             }
                         }
-                        // Convert JSON models to Model classes, passing modelFileIds and propertyFileIds so Model instances use correct IDs
-                        const modelDefinitions = await createModelsFromJson(importData, modelFileIds, propertyFileIds);
+                        // Convert JSON models to Model classes, passing modelFileIds and propertyFileIds so Model instances use correct IDs.
+                        // addModelsToDb below writes their rows; the models adopt them once it has run.
+                        const rowsWritten = createRowsWrittenSignal();
+                        const modelDefinitions = await createModelsFromJson(importData, modelFileIds, propertyFileIds, schemaRecord ? rowsWritten.promise : undefined);
                         // Add models to database and link them to the schema with schemaFileIds
                         if (Object.keys(modelDefinitions).length > 0 && schemaRecord) {
                             await addModelsToDb(modelDefinitions, schemaRecord, undefined, {
                                 schemaFileId: schemaFile.id,
                                 modelFileIds,
                                 propertyFileIds,
-                            });
+                            }).finally(rowsWritten.settle);
                             logger$d(`Added ${Object.keys(modelDefinitions).length} models and their properties to database for Seed Protocol schema`);
                             // Verify properties are persisted (important for browser environments)
                             // Query the database to get model IDs that were just created
@@ -415,8 +417,10 @@ const loadOrCreateSchema = fromCallback(({ sendBack, input: { context } }) => {
                                     propertyFileIds.set(modelName, propIds);
                                 }
                             }
-                            // Convert JSON models to Model classes, passing modelFileIds and propertyFileIds so Model instances use correct IDs
-                            const modelDefinitions = await createModelsFromJson(importData, modelFileIds, propertyFileIds);
+                            // Convert JSON models to Model classes, passing modelFileIds and propertyFileIds so Model instances use correct IDs.
+                            // addModelsToDb below writes their rows; the models adopt them once it has run.
+                            const rowsWritten = createRowsWrittenSignal();
+                            const modelDefinitions = await createModelsFromJson(importData, modelFileIds, propertyFileIds, rowsWritten.promise);
                             // Verify all expected models are in modelDefinitions
                             const missingFromDefinitions = expectedModelNames.filter(name => !Object.keys(modelDefinitions).includes(name));
                             if (missingFromDefinitions.length > 0) {
@@ -427,7 +431,7 @@ const loadOrCreateSchema = fromCallback(({ sendBack, input: { context } }) => {
                                     schemaFileId: schemaFile.id,
                                     modelFileIds,
                                     propertyFileIds,
-                                });
+                                }).finally(rowsWritten.settle);
                                 logger$d(`Added ${Object.keys(modelDefinitions).length} models and their properties to database for existing Seed Protocol schema`);
                                 // Small delay to ensure database writes are visible (important for browser environments)
                                 await new Promise(resolve => setTimeout(resolve, 200));
@@ -663,7 +667,7 @@ const loadOrCreateSchema = fromCallback(({ sendBack, input: { context } }) => {
                     // Ensure models are populated (fallback for seed-protocol if missing)
                     if ((!mergedModels || Object.keys(mergedModels).length === 0) && schemaName === 'Seed Protocol') {
                         try {
-                            const _mod_2 = await import('./ClientManager-DRf4uuei.js');
+                            const _mod_2 = await import('./ClientManager-D6YA20jP.js');
                             const _ns_2 = _mod_2.S;
                             const internalSchema = _ns_2;
                             const internalSchemaFile = internalSchema.default;
@@ -681,40 +685,7 @@ const loadOrCreateSchema = fromCallback(({ sendBack, input: { context } }) => {
                         if (Object.keys(dbModels).length > 0) {
                             logger$d(`Found ${Object.keys(dbModels).length} models in database for schema ${schemaName}: ${Object.keys(dbModels).join(', ')}`);
                             // Merge: database models take precedence for properties, but preserve schemaData models for full structure
-                            mergedModels = {
-                                ...mergedModels,
-                                ...dbModels,
-                            };
-                            // For models that exist in both, merge properties (database properties override)
-                            // When a property was renamed in DB, schemaData has old name and DB has new name (same schemaFileId).
-                            // Remove schemaData properties whose id matches a DB property's schemaFileId to avoid duplicates.
-                            for (const [modelName, dbModel] of Object.entries(dbModels)) {
-                                if (mergedModels[modelName]) {
-                                    const schemaDataProps = mergedModels[modelName].properties || {};
-                                    const dbProps = dbModel.properties || {};
-                                    const dbSchemaFileIds = new Set();
-                                    for (const dbProp of Object.values(dbProps)) {
-                                        if (dbProp.schemaFileId) {
-                                            dbSchemaFileIds.add(dbProp.schemaFileId);
-                                        }
-                                    }
-                                    const filteredSchemaDataProps = {};
-                                    for (const [propName, prop] of Object.entries(schemaDataProps)) {
-                                        const propId = prop.id || prop.schemaFileId;
-                                        if (propId && dbSchemaFileIds.has(propId)) {
-                                            continue;
-                                        }
-                                        filteredSchemaDataProps[propName] = prop;
-                                    }
-                                    mergedModels[modelName] = {
-                                        ...mergedModels[modelName],
-                                        properties: {
-                                            ...filteredSchemaDataProps,
-                                            ...dbProps,
-                                        },
-                                    };
-                                }
-                            }
+                            mergedModels = mergeDbModelsIntoSchemaModels(mergedModels, dbModels);
                         }
                     }
                     // Create new schemaFile object with merged models (read-only approach)
@@ -781,40 +752,7 @@ const loadOrCreateSchema = fromCallback(({ sendBack, input: { context } }) => {
                                 logger$d(`Found ${Object.keys(dbModels).length} models in database for draft schema ${schemaName}: ${Object.keys(dbModels).join(', ')}`);
                                 // Merge: database models take precedence for properties, but preserve schemaData models for full structure
                                 let mergedModels = { ...(schemaFile.models || {}) };
-                                mergedModels = {
-                                    ...mergedModels,
-                                    ...dbModels,
-                                };
-                                // For models that exist in both, merge properties (database properties override)
-                                // When a property was renamed in DB, schemaData has old name and DB has new name (same schemaFileId).
-                                // Remove schemaData properties whose id matches a DB property's schemaFileId to avoid duplicates.
-                                for (const [modelName, dbModel] of Object.entries(dbModels)) {
-                                    if (mergedModels[modelName]) {
-                                        const schemaDataProps = mergedModels[modelName].properties || {};
-                                        const dbProps = dbModel.properties || {};
-                                        const dbSchemaFileIds = new Set();
-                                        for (const dbProp of Object.values(dbProps)) {
-                                            if (dbProp.schemaFileId) {
-                                                dbSchemaFileIds.add(dbProp.schemaFileId);
-                                            }
-                                        }
-                                        const filteredSchemaDataProps = {};
-                                        for (const [propName, prop] of Object.entries(schemaDataProps)) {
-                                            const propId = prop.id || prop.schemaFileId;
-                                            if (propId && dbSchemaFileIds.has(propId)) {
-                                                continue;
-                                            }
-                                            filteredSchemaDataProps[propName] = prop;
-                                        }
-                                        mergedModels[modelName] = {
-                                            ...mergedModels[modelName],
-                                            properties: {
-                                                ...filteredSchemaDataProps,
-                                                ...dbProps,
-                                            },
-                                        };
-                                    }
-                                }
+                                mergedModels = mergeDbModelsIntoSchemaModels(mergedModels, dbModels);
                                 // Update schemaFile with merged models
                                 schemaFile.models = mergedModels;
                             }
@@ -894,7 +832,7 @@ const loadOrCreateSchema = fromCallback(({ sendBack, input: { context } }) => {
                     // Ensure models are populated (fallback for seed-protocol if missing)
                     if ((!mergedModels || Object.keys(mergedModels).length === 0) && schemaName === 'Seed Protocol') {
                         try {
-                            const _mod_3 = await import('./ClientManager-DRf4uuei.js');
+                            const _mod_3 = await import('./ClientManager-D6YA20jP.js');
                             const _ns_3 = _mod_3.S;
                             const internalSchema = _ns_3;
                             const internalSchemaFile = internalSchema.default;
@@ -912,40 +850,7 @@ const loadOrCreateSchema = fromCallback(({ sendBack, input: { context } }) => {
                         if (Object.keys(dbModels).length > 0) {
                             logger$d(`Found ${Object.keys(dbModels).length} models in database for schema ${schemaName}: ${Object.keys(dbModels).join(', ')}`);
                             // Merge: database models take precedence for properties, but preserve file models for full structure
-                            mergedModels = {
-                                ...mergedModels,
-                                ...dbModels,
-                            };
-                            // For models that exist in both, merge properties (database properties override)
-                            // When a property was renamed in DB, schemaData has old name and DB has new name (same schemaFileId).
-                            // Remove schemaData properties whose id matches a DB property's schemaFileId to avoid duplicates.
-                            for (const [modelName, dbModel] of Object.entries(dbModels)) {
-                                if (mergedModels[modelName]) {
-                                    const schemaDataProps = mergedModels[modelName].properties || {};
-                                    const dbProps = dbModel.properties || {};
-                                    const dbSchemaFileIds = new Set();
-                                    for (const dbProp of Object.values(dbProps)) {
-                                        if (dbProp.schemaFileId) {
-                                            dbSchemaFileIds.add(dbProp.schemaFileId);
-                                        }
-                                    }
-                                    const filteredSchemaDataProps = {};
-                                    for (const [propName, prop] of Object.entries(schemaDataProps)) {
-                                        const propId = prop.id || prop.schemaFileId;
-                                        if (propId && dbSchemaFileIds.has(propId)) {
-                                            continue;
-                                        }
-                                        filteredSchemaDataProps[propName] = prop;
-                                    }
-                                    mergedModels[modelName] = {
-                                        ...mergedModels[modelName],
-                                        properties: {
-                                            ...filteredSchemaDataProps,
-                                            ...dbProps,
-                                        },
-                                    };
-                                }
-                            }
+                            mergedModels = mergeDbModelsIntoSchemaModels(mergedModels, dbModels);
                         }
                     }
                     // Create new schemaFile object with merged models (read-only approach)
@@ -985,7 +890,7 @@ const loadOrCreateSchema = fromCallback(({ sendBack, input: { context } }) => {
                         // Ensure models are populated (fallback for seed-protocol if missing)
                         if ((!mergedModels || Object.keys(mergedModels).length === 0) && schemaName === 'Seed Protocol') {
                             try {
-                                const _mod_4 = await import('./ClientManager-DRf4uuei.js');
+                                const _mod_4 = await import('./ClientManager-D6YA20jP.js');
                                 const _ns_4 = _mod_4.S;
                                 const internalSchema = _ns_4;
                                 const internalSchemaFile = internalSchema.default;
@@ -1003,40 +908,7 @@ const loadOrCreateSchema = fromCallback(({ sendBack, input: { context } }) => {
                             if (Object.keys(dbModels).length > 0) {
                                 logger$d(`Found ${Object.keys(dbModels).length} models in database for schema ${schemaName}: ${Object.keys(dbModels).join(', ')}`);
                                 // Merge: database models take precedence for properties, but preserve schemaData models for full structure
-                                mergedModels = {
-                                    ...mergedModels,
-                                    ...dbModels,
-                                };
-                                // For models that exist in both, merge properties (database properties override)
-                                // When a property was renamed in DB, schemaData has old name and DB has new name (same schemaFileId).
-                                // Remove schemaData properties whose id matches a DB property's schemaFileId to avoid duplicates.
-                                for (const [modelName, dbModel] of Object.entries(dbModels)) {
-                                    if (mergedModels[modelName]) {
-                                        const schemaDataProps = mergedModels[modelName].properties || {};
-                                        const dbProps = dbModel.properties || {};
-                                        const dbSchemaFileIds = new Set();
-                                        for (const dbProp of Object.values(dbProps)) {
-                                            if (dbProp.schemaFileId) {
-                                                dbSchemaFileIds.add(dbProp.schemaFileId);
-                                            }
-                                        }
-                                        const filteredSchemaDataProps = {};
-                                        for (const [propName, prop] of Object.entries(schemaDataProps)) {
-                                            const propId = prop.id || prop.schemaFileId;
-                                            if (propId && dbSchemaFileIds.has(propId)) {
-                                                continue;
-                                            }
-                                            filteredSchemaDataProps[propName] = prop;
-                                        }
-                                        mergedModels[modelName] = {
-                                            ...mergedModels[modelName],
-                                            properties: {
-                                                ...filteredSchemaDataProps,
-                                                ...dbProps,
-                                            },
-                                        };
-                                    }
-                                }
+                                mergedModels = mergeDbModelsIntoSchemaModels(mergedModels, dbModels);
                             }
                         }
                         // Create new schemaFile object with merged models (read-only approach)
@@ -1073,7 +945,7 @@ const loadOrCreateSchema = fromCallback(({ sendBack, input: { context } }) => {
                 // If schemaData is missing, try to load from internal schema file for seed-protocol
                 if (!dbSchema.schemaData && schemaName === 'Seed Protocol') {
                     try {
-                        const _mod_5 = await import('./ClientManager-DRf4uuei.js');
+                        const _mod_5 = await import('./ClientManager-D6YA20jP.js');
                         const _ns_5 = _mod_5.S;
                         const internalSchema = _ns_5;
                         const schemaFile = internalSchema.default;
@@ -1184,7 +1056,7 @@ const loadOrCreateSchema = fromCallback(({ sendBack, input: { context } }) => {
             // Ensure models are populated (fallback for seed-protocol if missing)
             if ((!mergedModels || Object.keys(mergedModels).length === 0) && schemaName === 'Seed Protocol') {
                 try {
-                    const _mod_6 = await import('./ClientManager-DRf4uuei.js');
+                    const _mod_6 = await import('./ClientManager-D6YA20jP.js');
                     const _ns_6 = _mod_6.S;
                     const internalSchema = _ns_6;
                     const internalSchemaFile = internalSchema.default;
@@ -1511,7 +1383,7 @@ const createModelInstances$1 = async (modelIds, evictionEpoch) => {
         return;
     }
     try {
-        const _mod_7 = await import('./errors-CIrbsN_i.js');
+        const _mod_7 = await import('./errors-3tc6XkCB.js');
         const _ns_7 = _mod_7.h;
         const mod = _ns_7;
         const Model = mod?.Model ?? mod?.default;
@@ -1560,7 +1432,7 @@ const checkExistingSchema = fromCallback(({ sendBack, input: { context } }) => {
         if (isInternal && schemaName === SEED_PROTOCOL_SCHEMA_NAME) {
             // For Seed Protocol, check if it exists in database
             try {
-                const _mod_8 = await import('./ClientManager-DRf4uuei.js');
+                const _mod_8 = await import('./ClientManager-D6YA20jP.js');
                 const _ns_8 = _mod_8.S;
                 const internalSchema = _ns_8;
                 const schemaFile = internalSchema.default;
@@ -1702,20 +1574,7 @@ const checkExistingSchema = fromCallback(({ sendBack, input: { context } }) => {
                     if (dbSchema.id) {
                         const dbModels = await loadModelsFromDbForSchema(dbSchema.id);
                         if (Object.keys(dbModels).length > 0) {
-                            let mergedModels = { ...(schemaFile.models || {}) };
-                            mergedModels = { ...mergedModels, ...dbModels };
-                            for (const [modelName, dbModel] of Object.entries(dbModels)) {
-                                if (mergedModels[modelName]) {
-                                    mergedModels[modelName] = {
-                                        ...mergedModels[modelName],
-                                        properties: {
-                                            ...mergedModels[modelName].properties,
-                                            ...dbModel.properties,
-                                        },
-                                    };
-                                }
-                            }
-                            schemaFile.models = mergedModels;
+                            schemaFile.models = mergeDbModelsIntoSchemaModels(schemaFile.models, dbModels);
                         }
                     }
                 }
@@ -1758,20 +1617,7 @@ const checkExistingSchema = fromCallback(({ sendBack, input: { context } }) => {
                     if (schemaFile && dbSchema.id) {
                         const dbModels = await loadModelsFromDbForSchema(dbSchema.id);
                         if (Object.keys(dbModels).length > 0) {
-                            let mergedModels = { ...(schemaFile.models || {}) };
-                            mergedModels = { ...mergedModels, ...dbModels };
-                            for (const [modelName, dbModel] of Object.entries(dbModels)) {
-                                if (mergedModels[modelName]) {
-                                    mergedModels[modelName] = {
-                                        ...mergedModels[modelName],
-                                        properties: {
-                                            ...mergedModels[modelName].properties,
-                                            ...dbModel.properties,
-                                        },
-                                    };
-                                }
-                            }
-                            schemaFile.models = mergedModels;
+                            schemaFile.models = mergeDbModelsIntoSchemaModels(schemaFile.models, dbModels);
                         }
                     }
                 }
@@ -1922,7 +1768,7 @@ const writeSchemaToDb = fromCallback(({ sendBack, input }) => {
             if (isInternal && schemaName === SEED_PROTOCOL_SCHEMA_NAME) {
                 // For Seed Protocol, load from internal file
                 logger$b(`Loading internal Seed Protocol schema from SDK`);
-                const _mod_9 = await import('./ClientManager-DRf4uuei.js');
+                const _mod_9 = await import('./ClientManager-D6YA20jP.js');
                 const _ns_9 = _mod_9.S;
                 const internalSchema = _ns_9;
                 finalSchema = internalSchema.default;
@@ -2247,15 +2093,17 @@ const writeModelsToDb = fromCallback(({ sendBack, input }) => {
                     propertyFileIds.set(modelName, propIds);
                 }
             }
-            // Convert JSON models to Model classes
-            const modelDefinitions = await createModelsFromJson(importData, modelFileIds, propertyFileIds);
+            // Convert JSON models to Model classes. addModelsToDb below writes their rows; the models adopt them
+            // once it has run.
+            const rowsWritten = createRowsWrittenSignal();
+            const modelDefinitions = await createModelsFromJson(importData, modelFileIds, propertyFileIds, rowsWritten.promise);
             // Add models to database
             if (Object.keys(modelDefinitions).length > 0) {
                 await addModelsToDb(modelDefinitions, schemaRecord, undefined, {
                     schemaFileId: schema.id,
                     modelFileIds,
                     propertyFileIds,
-                });
+                }).finally(rowsWritten.settle);
                 logger$9(`Added ${Object.keys(modelDefinitions).length} models and their properties to database`);
             }
             // Extract model IDs that were written
@@ -2393,7 +2241,7 @@ const createModelInstances = fromCallback(({ sendBack, input }) => {
             return;
         }
         try {
-            const _mod_10 = await import('./errors-CIrbsN_i.js');
+            const _mod_10 = await import('./errors-3tc6XkCB.js');
             const _ns_10 = _mod_10.h;
             const modelMod = _ns_10;
             const { Model } = modelMod;
@@ -2482,7 +2330,7 @@ const verifyModelInstancesInCache = fromCallback(({ sendBack, input }) => {
         }
         try {
             const result = await verifyWithRetry$2(async () => {
-                const _mod_11 = await import('./errors-CIrbsN_i.js');
+                const _mod_11 = await import('./errors-3tc6XkCB.js');
                 const _ns_11 = _mod_11.h;
                 const modelMod = _ns_11;
                 const { Model } = modelMod;
@@ -2541,8 +2389,8 @@ const writePropertiesToDb = fromCallback(({ sendBack, input }) => {
     const _write = async () => {
         const { modelIds } = input;
         try {
-            const _mod_12 = await import('./BasePathResolver-CBTXCMFL.js');
-            const _ns_12 = _mod_12.bb;
+            const _mod_12 = await import('./index-CrvIcVFJ.js');
+            const _ns_12 = _mod_12.bd;
             const modelSchemaMod = _ns_12;
             const { models: modelsTable, properties: propertiesTable } = modelSchemaMod;
             const drizzleMod = await import('drizzle-orm');
@@ -2731,9 +2579,9 @@ const createPropertyInstances = fromCallback(({ sendBack, input }) => {
             return;
         }
         try {
-            const modProp = await import('./ModelProperty-Dto5C0om.js');
+            const modProp = await import('./ModelProperty-Dw6dHdu_.js');
             const ModelProperty = modProp?.ModelProperty ?? modProp?.default;
-            const _mod_13 = await import('./errors-CIrbsN_i.js');
+            const _mod_13 = await import('./errors-3tc6XkCB.js');
             const _ns_13 = _mod_13.h;
             const modModel = _ns_13;
             const Model = modModel?.Model ?? modModel?.default;
@@ -2840,7 +2688,7 @@ const verifyPropertyInstancesInCache = fromCallback(({ sendBack, input }) => {
         }
         try {
             const result = await verifyWithRetry(async () => {
-                const mod = await import('./ModelProperty-Dto5C0om.js');
+                const mod = await import('./ModelProperty-Dw6dHdu_.js');
                 const ModelProperty = mod?.ModelProperty ?? mod?.default;
                 if (!ModelProperty) {
                     throw new Error('ModelProperty not available from dynamic import');
@@ -3848,8 +3696,6 @@ async function loadSchemaWithRenames(schemaFilePath, modelRenames) {
             propertyFileIds.set(modelName, propIds);
         }
     }
-    // Convert JSON models to Model classes, passing modelFileIds and propertyFileIds so Model instances use correct IDs
-    const modelDefinitions = await createModelsFromJson(importData, modelFileIds, propertyFileIds);
     // Convert schema file metadata to schema input for database
     const schemaInput = {
         name: schemaName,
@@ -3862,8 +3708,8 @@ async function loadSchemaWithRenames(schemaFilePath, modelRenames) {
         updatedAt: new Date(schemaFile.metadata.updatedAt).getTime(),
     };
     // Use dynamic import to break circular dependency
-    const _mod_14 = await import('./BasePathResolver-CBTXCMFL.js');
-    const _ns_14 = _mod_14.bg;
+    const _mod_14 = await import('./index-CrvIcVFJ.js');
+    const _ns_14 = _mod_14.bi;
     const dbMod = _ns_14;
     const { addSchemaToDb, addModelsToDb } = dbMod;
     // Add schema to database with schemaFileId
@@ -3874,13 +3720,17 @@ async function loadSchemaWithRenames(schemaFilePath, modelRenames) {
         modelName,
         jsonPropertiesToSchemaProperties(modelName, modelDef, propertyFileIds.get(modelName)),
     ]));
+    // Convert JSON models to Model classes, passing modelFileIds and propertyFileIds so Model instances use correct IDs.
+    // addModelsToDb below writes their rows; the models adopt them once it has run.
+    const rowsWritten = createRowsWrittenSignal();
+    const modelDefinitions = await createModelsFromJson(importData, modelFileIds, propertyFileIds, rowsWritten.promise);
     // Add models to database with model renames handled and schemaFileIds
     await addModelsToDb(modelDefinitions, schemaRecord, modelRenames, {
         schemaFileId: schemaFile.id,
         modelFileIds,
         propertyFileIds,
         propertyDefinitions,
-    });
+    }).finally(rowsWritten.settle);
     // Models are now Model instances, no registration needed
     // They should be created via Model.create() and are accessible via Model static methods
     for (const [modelName] of Object.entries(modelDefinitions)) {
@@ -3982,8 +3832,8 @@ async function renameModelProperty(schemaName, modelName, oldPropertyName, newPr
     await BaseFileManager.waitForFileWithContent(newFilePath);
     logger$1(`Renamed property ${oldPropertyName} to ${newPropertyName} in schema ${schemaName} v${newVersion}`);
     // Migrate metadata rows so ItemProperty values follow the new name (prevents duplicate ItemProperties)
-    const _mod_15 = await import('./BasePathResolver-CBTXCMFL.js');
-    const _ns_15 = _mod_15.bg;
+    const _mod_15 = await import('./index-CrvIcVFJ.js');
+    const _ns_15 = _mod_15.bi;
     const { migrateMetadataForPropertyRename } = _ns_15;
     const migratedCount = await migrateMetadataForPropertyRename(modelName, oldPropertyName, newPropertyName, oldProperty.id, { schemaName });
     if (migratedCount > 0) {
@@ -4979,7 +4829,7 @@ class Schema {
                 const modelDbId = modelInstance.getService().getSnapshot().context._dbId;
                 const db = BaseDb.getAppDb();
                 if (propertyContexts.length === 0 && modelDbId && db) {
-                    const { ModelProperty } = await import('./ModelProperty-Dto5C0om.js');
+                    const { ModelProperty } = await import('./ModelProperty-Dw6dHdu_.js');
                     const rows = await db.select().from(properties).where(eq(properties.modelId, modelDbId));
                     propertyContexts = rows.map((row) => {
                         const cached = row.schemaFileId ? ModelProperty.getById(row.schemaFileId) : undefined;
@@ -5145,7 +4995,7 @@ class Schema {
             savedSchema: publishedSchema,
         });
         // Clear edited flags on all ModelProperty instances and in database
-        const modelPropertyMod = await import('./ModelProperty-Dto5C0om.js');
+        const modelPropertyMod = await import('./ModelProperty-Dw6dHdu_.js');
         const { ModelProperty } = modelPropertyMod;
         for (const propertyKey of context._editedProperties) {
             const [modelName, propertyName] = propertyKey.split(':');
@@ -5169,8 +5019,8 @@ class Schema {
                 try {
                     if (db && modelName && propertyName) {
                         // Find this schema's model by name
-                        const _mod_16 = await import('./BasePathResolver-CBTXCMFL.js');
-                        const _ns_16 = _mod_16.bf;
+                        const _mod_16 = await import('./index-CrvIcVFJ.js');
+                        const _ns_16 = _mod_16.bh;
                         const { resolveModelRecord } = _ns_16;
                         const modelRecord = await resolveModelRecord(modelName, { schemaName: thisSchemaName }, db);
                         const modelRecords = modelRecord ? [modelRecord] : [];
@@ -5799,10 +5649,10 @@ class Schema {
         // instances too, or a re-import would get them back with dangling _dbIds.
         if (schemaName) {
             const evictedModelNames = Model.evictForSchema(schemaName);
-            const { ModelProperty } = await import('./ModelProperty-Dto5C0om.js');
+            const { ModelProperty } = await import('./ModelProperty-Dw6dHdu_.js');
             ModelProperty.evictForModels(evictedModelNames, schemaName);
             // Evicting stops new writes but not ones already running; let those land before deleting their rows
-            const _mod_17 = await import('./errors-CIrbsN_i.js');
+            const _mod_17 = await import('./errors-3tc6XkCB.js');
             const _ns_17 = _mod_17.e;
             const { waitForInFlightWrites } = _ns_17;
             await waitForInFlightWrites();
@@ -5835,7 +5685,7 @@ class Schema {
                         .map((r) => r.modelId)
                         .filter((id) => id != null)),
                 ];
-                const { detachModelRows } = await import('./detachRowsBeforeDelete-BVetHtn2.js');
+                const { detachModelRows } = await import('./detachRowsBeforeDelete-CtmIFpgV.js');
                 await detachModelRows(db, modelIds);
                 await db.delete(modelSchemas).where(inArray(modelSchemas.schemaId, schemaIds));
                 for (const modelId of modelIds) {
@@ -5850,8 +5700,8 @@ class Schema {
                 // the destroyed schema back on the next Schema.all().
                 // Match on name as well as id: versions imported from complete schema files can each
                 // have their own id, and any version left behind would bring the schema back.
-                const _mod_18 = await import('./ClientManager-DRf4uuei.js');
-                const _ns_18 = _mod_18.M;
+                const _mod_18 = await import('./ClientManager-D6YA20jP.js');
+                const _ns_18 = _mod_18.N;
                 const { listCompleteSchemaFiles } = _ns_18;
                 const files = await listCompleteSchemaFiles().catch(() => []);
                 const fs = await BaseFileManager.getFs();
@@ -6046,4 +5896,4 @@ var Schema$1 = /*#__PURE__*/Object.freeze({
 });
 
 export { Schema as S, deletePropertyFromModel as a, Schema$1 as b, deleteModelFromSchema as d, renameModelProperty as r, schemaMachine as s, updateModelProperties as u };
-//# sourceMappingURL=Schema-8DxGcORY.js.map
+//# sourceMappingURL=Schema-DppObO6h.js.map