@seedprotocol/sdk 0.7.0 → 0.7.1

package/dist/{ModelProperty-lth9L37R.js → ModelProperty-6llK4MTH.js}

@@ -1,17 +1,17 @@
 import { fromCallback, setup, assign, createActor } from 'xstate';
 import 'reflect-metadata';
-import { w as writeProcessMachine, i as isActorStopped, M as Model } from './index-DtfjeuxC.js';
-import { x as getModelIdByFileId, n as normalizeDataType, y as getModelId } from './db-BJZN0a0a.js';
+import { i as isActorStopped, w as writeProcessMachine, c as currentEvictionEpoch, M as Model, b as anyEvictionSince, s as schemaEvictedSince } from './index-Y-yYyRBf.js';
+import { x as getModelIdByFileId, n as normalizeDataType, y as getModelId } from './db-Lw0KVZmc.js';
 import 'pluralize';
-import { B as BaseDb, m as models, p as properties, s as schemas, i as modelSchemas, a as BaseFileManager } from './BasePathResolver-ndE8XTpw.js';
+import { B as BaseDb, j as models, p as properties, s as schemas, g as modelSchemas, a as BaseFileManager } from './BasePathResolver-DRT09oVv.js';
 import { eq, and } from 'drizzle-orm';
 import { modelPropertiesToObject } from './model-DGMe-TTm.js';
 import debug from 'debug';
-import './tabEvents-DYI2GU7i.js';
-import { S as Schema } from './Schema-DOhlrQ-N.js';
-import { j as waitForEntityIdle, k as createReactiveProxy, m as findEntity, n as forceRemoveFromCaches, o as runDestroyLifecycle } from './Item-zBFWQDU9.js';
+import './tabEvents-C6NXS6Jl.js';
+import { S as Schema } from './Schema-D-Ud-XYw.js';
+import { j as waitForEntityIdle, k as createReactiveProxy, m as findEntity, n as forceRemoveFromCaches, o as runDestroyLifecycle } from './Item-ZUAmf943.js';
 import { generateId } from './generateId-BopUwD8F.js';
-import './ClientManager-DLleL_2e.js';
+import './ClientManager-DngaZdw6.js';
 import '@seedprotocol/arweave';
 import '@seedprotocol/eas';
 import '@noble/hashes/sha3';
@@ -23,7 +23,7 @@ import '@sinclair/typebox';
 import 'drizzle-orm/sqlite-core';
 import 'nanoid';
 import 'nanoid-dictionary';
-import './SchemaValidationService-DDKr5piy.js';
+import './SchemaValidationService-IoS7JquP.js';
 import '@sinclair/typebox/value';
 import 'rxjs';
 
@@ -35,14 +35,14 @@ 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 _mod_0 = await import('./ClientManager-DLleL_2e.js');
+    const _mod_0 = await import('./ClientManager-DngaZdw6.js');
     const _ns_0 = _mod_0.G;
     const schemaHelpersMod = _ns_0;
     const { listLatestSchemaFiles } = schemaHelpersMod;
     const latestSchemas = await listLatestSchemaFiles();
     for (const schema of latestSchemas) {
         try {
-            const _mod_1 = await import('./BasePathResolver-ndE8XTpw.js');
+            const _mod_1 = await import('./BasePathResolver-DRT09oVv.js');
             const _ns_1 = _mod_1.O;
             const fileManagerMod = _ns_1;
             const { BaseFileManager } = fileManagerMod;
@@ -59,10 +59,10 @@ async function getSchemaNameFromModel(modelName) {
     }
     return undefined;
 }
-const saveToSchema = fromCallback(({ sendBack, input: { context } }) => {
+const saveToSchema = fromCallback(({ sendBack, input: { context }, self }) => {
     const _saveToSchema = async () => {
         // Use dynamic import to break circular dependency
-        const validationServiceMod = await import('./SchemaValidationService-DDKr5piy.js');
+        const validationServiceMod = await import('./SchemaValidationService-IoS7JquP.js');
         const { SchemaValidationService } = validationServiceMod;
         const validationService = new SchemaValidationService();
         // Validate property structure before saving
@@ -81,7 +81,7 @@ const saveToSchema = fromCallback(({ sendBack, input: { context } }) => {
             throw new Error(`Model not found for modelId: ${context.modelId}`);
         }
         // Persist to database only - schema file is updated only when user calls Schema.saveNewVersion()
-        const _mod_2 = await import('./db-BJZN0a0a.js');
+        const _mod_2 = await import('./db-Lw0KVZmc.js');
         const _ns_2 = _mod_2.Z;
         const dbMod = _ns_2;
         const { savePropertyToDb } = dbMod;
@@ -89,10 +89,13 @@ const saveToSchema = fromCallback(({ sendBack, input: { context } }) => {
         // Mark schema as draft so user knows to save
         const schemaName = context._schemaName ?? (await getSchemaNameFromModel(context.modelName));
         if (schemaName) {
-            const _mod_3 = await import('./Schema-DOhlrQ-N.js');
+            const _mod_3 = await import('./Schema-D-Ud-XYw.js');
             const _ns_3 = _mod_3.b;
             const schemaMod = _ns_3;
             const { Schema } = schemaMod;
+            // Stopped meanwhile (unloaded, or evicted with its schema): don't load the schema again
+            if (isActorStopped(self))
+                return;
             const schema = Schema.create(schemaName, { waitForReady: false });
             schema.getService().send({
                 type: 'markAsDraft',
@@ -113,7 +116,7 @@ const saveToSchema = fromCallback(({ sendBack, input: { context } }) => {
 });
 
 const logger$2 = debug('seedSdk:modelProperty:actors:compareAndMarkDraft');
-const compareAndMarkDraft = fromCallback(({ sendBack, input: { context } }) => {
+const compareAndMarkDraft = fromCallback(({ sendBack, input: { context }, self }) => {
     const _compareAndMarkDraft = async () => {
         // Fill modelName/dataType from _originalValues when missing, then from DB by schemaFileId
         let fullContext = {
@@ -124,7 +127,7 @@ const compareAndMarkDraft = fromCallback(({ sendBack, input: { context } }) => {
         const schemaFileIdForResolve = fullContext._propertyFileId || (typeof fullContext.id === 'string' ? fullContext.id : undefined);
         if (schemaFileIdForResolve && (fullContext.modelName === undefined || fullContext.dataType === undefined)) {
             try {
-                const _mod_4 = await import('./db-BJZN0a0a.js');
+                const _mod_4 = await import('./db-Lw0KVZmc.js');
                 const _ns_4 = _mod_4.Z;
                 const dbMod = _ns_4;
                 const { getPropertyModelNameAndDataType, getModelNameByModelId } = dbMod;
@@ -171,7 +174,7 @@ const compareAndMarkDraft = fromCallback(({ sendBack, input: { context } }) => {
             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 _mod_5 = await import('./db-BJZN0a0a.js');
+                    const _mod_5 = await import('./db-Lw0KVZmc.js');
                     const _ns_5 = _mod_5.Z;
                     const dbMod = _ns_5;
                     const { savePropertyToDb } = dbMod;
@@ -233,7 +236,7 @@ const compareAndMarkDraft = fromCallback(({ sendBack, input: { context } }) => {
             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 _mod_6 = await import('./db-BJZN0a0a.js');
+            const _mod_6 = await import('./db-Lw0KVZmc.js');
             const _ns_6 = _mod_6.Z;
             const dbMod = _ns_6;
             const { savePropertyToDb } = dbMod;
@@ -249,10 +252,13 @@ const compareAndMarkDraft = fromCallback(({ sendBack, input: { context } }) => {
             // Mark schema as draft if schema name is available
             if (fullContext._schemaName) {
                 // Get the Schema instance and mark it as draft
-                const _mod_7 = await import('./Schema-DOhlrQ-N.js');
+                const _mod_7 = await import('./Schema-D-Ud-XYw.js');
                 const _ns_7 = _mod_7.b;
                 const schemaMod = _ns_7;
                 const { Schema } = schemaMod;
+                // Stopped meanwhile (unloaded, or evicted with its schema): don't load the schema again
+                if (isActorStopped(self))
+                    return;
                 const schema = Schema.create(fullContext._schemaName, {
                     waitForReady: false,
                 });
@@ -268,7 +274,7 @@ const compareAndMarkDraft = fromCallback(({ sendBack, input: { context } }) => {
             logger$2(`Property ${fullContext.modelName}:${fullContext.name} has no changes`);
             // Clear isEdited flag in database
             try {
-                const _mod_8 = await import('./index-B0LgJblD.js');
+                const _mod_8 = await import('./index-5b3JsS55.js');
                 const _ns_8 = _mod_8.s;
                 const seedSchemaMod = _ns_8;
                 const { properties: propertiesTable, models: modelsTable } = seedSchemaMod;
@@ -277,7 +283,7 @@ const compareAndMarkDraft = fromCallback(({ sendBack, input: { context } }) => {
                 const db = BaseDb.getAppDb();
                 if (db && fullContext.modelName && fullContext.name) {
                     // Find this property's model (model names are only unique per schema)
-                    const _mod_9 = await import('./db-BJZN0a0a.js');
+                    const _mod_9 = await import('./db-Lw0KVZmc.js');
                     const _ns_9 = _mod_9.Y;
                     const { resolveModelRecord } = _ns_9;
                     const modelRecord = await resolveModelRecord(fullContext.modelName, {
@@ -323,7 +329,7 @@ const compareAndMarkDraft = fromCallback(({ sendBack, input: { context } }) => {
 });
 
 const logger$1 = debug('seedSdk:modelProperty:actors:validateProperty');
-const validateProperty = fromCallback(({ sendBack, input: { context } }) => {
+const validateProperty = fromCallback(({ sendBack, input: { context }, self }) => {
     const _validateProperty = async () => {
         // 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.
@@ -337,7 +343,7 @@ const validateProperty = fromCallback(({ sendBack, input: { context } }) => {
             // 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 _mod_10 = await import('./db-BJZN0a0a.js');
+                const _mod_10 = await import('./db-Lw0KVZmc.js');
                 const _ns_10 = _mod_10.Z;
                 const dbMod = _ns_10;
                 const { getPropertyModelNameAndDataType, getModelNameByModelId } = dbMod;
@@ -391,10 +397,10 @@ const validateProperty = fromCallback(({ sendBack, input: { context } }) => {
             fullContext = { ...fullContext, dataType: (fullContext.dataType ?? context._originalValues?.dataType) || 'Text' };
         }
         // Use dynamic imports to break circular dependencies
-        const validationServiceMod = await import('./SchemaValidationService-DDKr5piy.js');
+        const validationServiceMod = await import('./SchemaValidationService-IoS7JquP.js');
         const { SchemaValidationService } = validationServiceMod;
         const validationService = new SchemaValidationService();
-        const _mod_11 = await import('./Schema-DOhlrQ-N.js');
+        const _mod_11 = await import('./Schema-D-Ud-XYw.js');
         const _ns_11 = _mod_11.b;
         const schemaMod = _ns_11;
         const { Schema } = schemaMod;
@@ -405,6 +411,9 @@ const validateProperty = fromCallback(({ sendBack, input: { context } }) => {
             return;
         }
         // If we have schema name and model name, validate against schema
+        // Stopped meanwhile (unloaded, or evicted with its schema): don't load the schema again
+        if (isActorStopped(self))
+            return;
         if (fullContext._schemaName && fullContext.modelName) {
             try {
                 const schema = Schema.create(fullContext._schemaName, {
@@ -847,6 +856,8 @@ const TPropertyKeys = [
 ];
 class ModelProperty {
     constructor(property) {
+        /** currentEvictionEpoch() at construction: lookups started for this instance don't outlive an eviction. */
+        this._evictionEpoch = currentEvictionEpoch();
         // id is now the schemaFileId (string), _dbId is the database integer ID
         // Preserve _propertyFileId if it exists in the property object (from getPropertySchema)
         // Convert null to undefined for optional fields (TypeBox validation expects undefined, not null)
@@ -1009,7 +1020,7 @@ class ModelProperty {
                 return fallbackIsEdited;
             }
             // Find this property's model (by modelId when known; model names are only unique per schema)
-            const _mod_12 = await import('./db-BJZN0a0a.js');
+            const _mod_12 = await import('./db-Lw0KVZmc.js');
             const _ns_12 = _mod_12.Y;
             const { resolveModelRecord } = _ns_12;
             const modelRecord = await resolveModelRecord(property.modelName, this._ownerModelScope(property), db);
@@ -1047,7 +1058,7 @@ class ModelProperty {
                 return undefined;
             }
             // Resolve the ref within the owning model's schema
-            const _mod_13 = await import('./db-BJZN0a0a.js');
+            const _mod_13 = await import('./db-Lw0KVZmc.js');
             const _ns_13 = _mod_13.Y;
             const { resolveRefModelRecord } = _ns_13;
             const refModelRecord = await resolveRefModelRecord(refModelName, property ? this._ownerModelScope(property) : { schemaName: this._getSnapshotContext()._schemaName }, db);
@@ -1093,15 +1104,23 @@ class ModelProperty {
                 }
             }
             if (!model && modelId) {
-                const _mod_14 = await import('./db-BJZN0a0a.js');
+                const _mod_14 = await import('./db-Lw0KVZmc.js');
                 const _ns_14 = _mod_14.Y;
                 const { resolveModelRecord } = _ns_14;
                 const modelFileId = (await resolveModelRecord(property.modelName, { modelId }))?.schemaFileId;
                 model = modelFileId ? Model.getById(modelFileId) : undefined;
             }
+            // Evicted (with its schema) or unloaded while the lookups above ran: don't instantiate its model
+            // again from rows that are being deleted.
+            if (!model && isActorStopped(this._service))
+                return undefined;
             if (!model) {
                 try {
-                    model = await Model.getByNameAsync(property.modelName);
+                    // The epoch from when this instance was built: an eviction of the model's schema since
+                    // then (this instance may already be stopped) must not re-create the model.
+                    model = await Model.getByNameAsync(property.modelName, undefined, {
+                        evictionEpoch: this._evictionEpoch,
+                    });
                 }
                 catch {
                     model = undefined;
@@ -1553,7 +1572,7 @@ class ModelProperty {
      * Create or get ModelProperty instance by propertyFileId
      * Queries the database to find the property if not cached
      */
-    static async createById(propertyFileId) {
+    static async createById(propertyFileId, options) {
         if (!propertyFileId) {
             return undefined;
         }
@@ -1567,10 +1586,7 @@ class ModelProperty {
         if (!db) {
             return undefined;
         }
-        await db
-            .select()
-            .from(properties)
-            .limit(100);
+        const evictionEpoch = options?.evictionEpoch ?? currentEvictionEpoch();
         const propertyRecords = await db
             .select()
             .from(properties)
@@ -1620,6 +1636,19 @@ class ModelProperty {
                 propertyData.ref = refModelRecords[0].name;
             }
         }
+        // Its model's schema was evicted while we read the rows (e.g. a model's property lookup in flight
+        // during Schema.destroy or test cleanup): don't bring the property back.
+        if (anyEvictionSince(evictionEpoch)) {
+            const schemaRows = await db
+                .select({ name: schemas.name })
+                .from(modelSchemas)
+                .innerJoin(schemas, eq(schemas.id, modelSchemas.schemaId))
+                .where(eq(modelSchemas.modelId, propertyRecord.modelId));
+            if (schemaRows.length === 0 ||
+                schemaRows.some((row) => schemaEvictedSince(row.name, evictionEpoch))) {
+                return undefined;
+            }
+        }
         // Create ModelProperty instance (sync for createById so we can send updateContext)
         const instance = this.create(propertyData, { waitForReady: false });
         // Set isEdited from database after creation
@@ -1967,4 +1996,4 @@ var ModelProperty$1 = /*#__PURE__*/Object.freeze({
 });
 
 export { ModelProperty };
-//# sourceMappingURL=ModelProperty-lth9L37R.js.map
+//# sourceMappingURL=ModelProperty-6llK4MTH.js.map