@seedprotocol/sdk 0.7.0 → 0.7.2-next.593.gd5bd4ea

package/dist/cjs/{ModelProperty-BEsIHAjk.js → ModelProperty-BT6Un_MB.js}

@@ -2,11 +2,11 @@
 
 var xstate = require('xstate');
 require('reflect-metadata');
-var main_cjs = require('./index-C66AfYDG.js');
+var main_cjs = require('./index-Dls7aMjr.js');
 require('pluralize');
 var drizzleOrm = require('drizzle-orm');
 var debug = require('debug');
-var Schema = require('./Schema-qEp5mH1N.js');
+var Schema = require('./Schema-BXhXdUsA.js');
 require('immer');
 require('drizzle-orm/sqlite-core');
 require('@seedprotocol/arweave');
@@ -32,7 +32,7 @@ require('js-yaml');
 require('child_process');
 require('@seedprotocol/arweave/node');
 require('@seedprotocol/eas/node');
-require('./SchemaValidationService-CWEnZmOH.js');
+require('./SchemaValidationService-CC18QDfc.js');
 require('@sinclair/typebox/value');
 
 const logger$3 = debug('seedSdk:modelProperty:actors:saveToSchema');
@@ -43,12 +43,12 @@ 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 schemaHelpersMod = await Promise.resolve().then(function () { return require('./index-C66AfYDG.js'); }).then(function (n) { return n.schema$1; });
+    const schemaHelpersMod = await Promise.resolve().then(function () { return require('./index-Dls7aMjr.js'); }).then(function (n) { return n.schema$1; });
     const { listLatestSchemaFiles } = schemaHelpersMod;
     const latestSchemas = await listLatestSchemaFiles();
     for (const schema of latestSchemas) {
         try {
-            const fileManagerMod = await Promise.resolve().then(function () { return require('./index-C66AfYDG.js'); }).then(function (n) { return n.BaseFileManager$1; });
+            const fileManagerMod = await Promise.resolve().then(function () { return require('./index-Dls7aMjr.js'); }).then(function (n) { return n.BaseFileManager$1; });
             const { BaseFileManager } = fileManagerMod;
             const content = await BaseFileManager.readFileAsString(schema.filePath);
             const schemaFile = JSON.parse(content);
@@ -63,10 +63,10 @@ async function getSchemaNameFromModel(modelName) {
     }
     return undefined;
 }
-const saveToSchema = xstate.fromCallback(({ sendBack, input: { context } }) => {
+const saveToSchema = xstate.fromCallback(({ sendBack, input: { context }, self }) => {
     const _saveToSchema = async () => {
         // Use dynamic import to break circular dependency
-        const validationServiceMod = await Promise.resolve().then(function () { return require('./SchemaValidationService-CWEnZmOH.js'); });
+        const validationServiceMod = await Promise.resolve().then(function () { return require('./SchemaValidationService-CC18QDfc.js'); });
         const { SchemaValidationService } = validationServiceMod;
         const validationService = new SchemaValidationService();
         // Validate property structure before saving
@@ -85,14 +85,17 @@ const saveToSchema = xstate.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 dbMod = await Promise.resolve().then(function () { return require('./index-C66AfYDG.js'); }).then(function (n) { return n.db; });
+        const dbMod = await Promise.resolve().then(function () { return require('./index-Dls7aMjr.js'); }).then(function (n) { return n.db; });
         const { savePropertyToDb } = dbMod;
         await savePropertyToDb(context);
         // Mark schema as draft so user knows to save
         const schemaName = context._schemaName ?? (await getSchemaNameFromModel(context.modelName));
         if (schemaName) {
-            const schemaMod = await Promise.resolve().then(function () { return require('./Schema-qEp5mH1N.js'); });
+            const schemaMod = await Promise.resolve().then(function () { return require('./Schema-BXhXdUsA.js'); });
             const { Schema } = schemaMod;
+            // Stopped meanwhile (unloaded, or evicted with its schema): don't load the schema again
+            if (main_cjs.isActorStopped(self))
+                return;
             const schema = Schema.create(schemaName, { waitForReady: false });
             schema.getService().send({
                 type: 'markAsDraft',
@@ -113,7 +116,7 @@ const saveToSchema = xstate.fromCallback(({ sendBack, input: { context } }) => {
 });
 
 const logger$2 = debug('seedSdk:modelProperty:actors:compareAndMarkDraft');
-const compareAndMarkDraft = xstate.fromCallback(({ sendBack, input: { context } }) => {
+const compareAndMarkDraft = xstate.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 = xstate.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 dbMod = await Promise.resolve().then(function () { return require('./index-C66AfYDG.js'); }).then(function (n) { return n.db; });
+                const dbMod = await Promise.resolve().then(function () { return require('./index-Dls7aMjr.js'); }).then(function (n) { return n.db; });
                 const { getPropertyModelNameAndDataType, getModelNameByModelId } = dbMod;
                 let fromDb;
                 for (let attempt = 0; attempt < 6; attempt++) {
@@ -169,7 +172,7 @@ const compareAndMarkDraft = xstate.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 dbMod = await Promise.resolve().then(function () { return require('./index-C66AfYDG.js'); }).then(function (n) { return n.db; });
+                    const dbMod = await Promise.resolve().then(function () { return require('./index-Dls7aMjr.js'); }).then(function (n) { return n.db; });
                     const { savePropertyToDb } = dbMod;
                     // Ensure _propertyFileId is set for savePropertyToDb to find the property
                     const contextWithFileId = {
@@ -229,7 +232,7 @@ const compareAndMarkDraft = xstate.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 dbMod = await Promise.resolve().then(function () { return require('./index-C66AfYDG.js'); }).then(function (n) { return n.db; });
+            const dbMod = await Promise.resolve().then(function () { return require('./index-Dls7aMjr.js'); }).then(function (n) { return n.db; });
             const { savePropertyToDb } = dbMod;
             // Save to database (but not JSON file) - always save to DB when there are changes
             try {
@@ -243,8 +246,11 @@ const compareAndMarkDraft = xstate.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 schemaMod = await Promise.resolve().then(function () { return require('./Schema-qEp5mH1N.js'); });
+                const schemaMod = await Promise.resolve().then(function () { return require('./Schema-BXhXdUsA.js'); });
                 const { Schema } = schemaMod;
+                // Stopped meanwhile (unloaded, or evicted with its schema): don't load the schema again
+                if (main_cjs.isActorStopped(self))
+                    return;
                 const schema = Schema.create(fullContext._schemaName, {
                     waitForReady: false,
                 });
@@ -260,14 +266,14 @@ const compareAndMarkDraft = xstate.fromCallback(({ sendBack, input: { context }
             logger$2(`Property ${fullContext.modelName}:${fullContext.name} has no changes`);
             // Clear isEdited flag in database
             try {
-                const seedSchemaMod = await Promise.resolve().then(function () { return require('./index-C66AfYDG.js'); }).then(function (n) { return n.schema; });
+                const seedSchemaMod = await Promise.resolve().then(function () { return require('./index-Dls7aMjr.js'); }).then(function (n) { return n.schema; });
                 const { properties: propertiesTable, models: modelsTable } = seedSchemaMod;
                 const drizzleMod = await import('drizzle-orm');
                 const { eq, and } = drizzleMod;
                 const db = main_cjs.BaseDb.getAppDb();
                 if (db && fullContext.modelName && fullContext.name) {
                     // Find this property's model (model names are only unique per schema)
-                    const { resolveModelRecord } = await Promise.resolve().then(function () { return require('./index-C66AfYDG.js'); }).then(function (n) { return n.resolveModelRecord$1; });
+                    const { resolveModelRecord } = await Promise.resolve().then(function () { return require('./index-Dls7aMjr.js'); }).then(function (n) { return n.resolveModelRecord$1; });
                     const modelRecord = await resolveModelRecord(fullContext.modelName, {
                         modelId: typeof fullContext.modelId === 'number' ? fullContext.modelId : undefined,
                         schemaName: fullContext._schemaName,
@@ -311,7 +317,7 @@ const compareAndMarkDraft = xstate.fromCallback(({ sendBack, input: { context }
 });
 
 const logger$1 = debug('seedSdk:modelProperty:actors:validateProperty');
-const validateProperty = xstate.fromCallback(({ sendBack, input: { context } }) => {
+const validateProperty = xstate.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.
@@ -325,7 +331,7 @@ const validateProperty = xstate.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 dbMod = await Promise.resolve().then(function () { return require('./index-C66AfYDG.js'); }).then(function (n) { return n.db; });
+                const dbMod = await Promise.resolve().then(function () { return require('./index-Dls7aMjr.js'); }).then(function (n) { return n.db; });
                 const { getPropertyModelNameAndDataType, getModelNameByModelId } = dbMod;
                 // Try pending write first (property row may not exist yet)
                 if (fullContext.modelName === undefined && schemaFileId) {
@@ -377,10 +383,10 @@ const validateProperty = xstate.fromCallback(({ sendBack, input: { context } })
             fullContext = { ...fullContext, dataType: (fullContext.dataType ?? context._originalValues?.dataType) || 'Text' };
         }
         // Use dynamic imports to break circular dependencies
-        const validationServiceMod = await Promise.resolve().then(function () { return require('./SchemaValidationService-CWEnZmOH.js'); });
+        const validationServiceMod = await Promise.resolve().then(function () { return require('./SchemaValidationService-CC18QDfc.js'); });
         const { SchemaValidationService } = validationServiceMod;
         const validationService = new SchemaValidationService();
-        const schemaMod = await Promise.resolve().then(function () { return require('./Schema-qEp5mH1N.js'); });
+        const schemaMod = await Promise.resolve().then(function () { return require('./Schema-BXhXdUsA.js'); });
         const { Schema } = schemaMod;
         // Validate property structure
         const structureResult = validationService.validatePropertyStructure(fullContext);
@@ -389,6 +395,9 @@ const validateProperty = xstate.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 (main_cjs.isActorStopped(self))
+            return;
         if (fullContext._schemaName && fullContext.modelName) {
             try {
                 const schema = Schema.create(fullContext._schemaName, {
@@ -831,6 +840,8 @@ const TPropertyKeys = [
 ];
 class ModelProperty {
     constructor(property) {
+        /** currentEvictionEpoch() at construction: lookups started for this instance don't outlive an eviction. */
+        this._evictionEpoch = main_cjs.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)
@@ -993,7 +1004,7 @@ class ModelProperty {
                 return fallbackIsEdited;
             }
             // Find this property's model (by modelId when known; model names are only unique per schema)
-            const { resolveModelRecord } = await Promise.resolve().then(function () { return require('./index-C66AfYDG.js'); }).then(function (n) { return n.resolveModelRecord$1; });
+            const { resolveModelRecord } = await Promise.resolve().then(function () { return require('./index-Dls7aMjr.js'); }).then(function (n) { return n.resolveModelRecord$1; });
             const modelRecord = await resolveModelRecord(property.modelName, this._ownerModelScope(property), db);
             const modelRecords = modelRecord ? [modelRecord] : [];
             if (modelRecords.length === 0) {
@@ -1029,7 +1040,7 @@ class ModelProperty {
                 return undefined;
             }
             // Resolve the ref within the owning model's schema
-            const { resolveRefModelRecord } = await Promise.resolve().then(function () { return require('./index-C66AfYDG.js'); }).then(function (n) { return n.resolveModelRecord$1; });
+            const { resolveRefModelRecord } = await Promise.resolve().then(function () { return require('./index-Dls7aMjr.js'); }).then(function (n) { return n.resolveModelRecord$1; });
             const refModelRecord = await resolveRefModelRecord(refModelName, property ? this._ownerModelScope(property) : { schemaName: this._getSnapshotContext()._schemaName }, db);
             if (refModelRecord?.id) {
                 return refModelRecord.id;
@@ -1073,13 +1084,21 @@ class ModelProperty {
                 }
             }
             if (!model && modelId) {
-                const { resolveModelRecord } = await Promise.resolve().then(function () { return require('./index-C66AfYDG.js'); }).then(function (n) { return n.resolveModelRecord$1; });
+                const { resolveModelRecord } = await Promise.resolve().then(function () { return require('./index-Dls7aMjr.js'); }).then(function (n) { return n.resolveModelRecord$1; });
                 const modelFileId = (await resolveModelRecord(property.modelName, { modelId }))?.schemaFileId;
                 model = modelFileId ? main_cjs.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 && main_cjs.isActorStopped(this._service))
+                return undefined;
             if (!model) {
                 try {
-                    model = await main_cjs.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 main_cjs.Model.getByNameAsync(property.modelName, undefined, {
+                        evictionEpoch: this._evictionEpoch,
+                    });
                 }
                 catch {
                     model = undefined;
@@ -1531,7 +1550,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;
         }
@@ -1545,10 +1564,7 @@ class ModelProperty {
         if (!db) {
             return undefined;
         }
-        await db
-            .select()
-            .from(main_cjs.properties)
-            .limit(100);
+        const evictionEpoch = options?.evictionEpoch ?? main_cjs.currentEvictionEpoch();
         const propertyRecords = await db
             .select()
             .from(main_cjs.properties)
@@ -1598,6 +1614,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 (main_cjs.anyEvictionSince(evictionEpoch)) {
+            const schemaRows = await db
+                .select({ name: main_cjs.schemas.name })
+                .from(main_cjs.modelSchemas)
+                .innerJoin(main_cjs.schemas, drizzleOrm.eq(main_cjs.schemas.id, main_cjs.modelSchemas.schemaId))
+                .where(drizzleOrm.eq(main_cjs.modelSchemas.modelId, propertyRecord.modelId));
+            if (schemaRows.length === 0 ||
+                schemaRows.some((row) => main_cjs.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
@@ -1945,4 +1974,4 @@ var ModelProperty$1 = /*#__PURE__*/Object.freeze({
 });
 
 exports.ModelProperty = ModelProperty;
-//# sourceMappingURL=ModelProperty-BEsIHAjk.js.map
+//# sourceMappingURL=ModelProperty-BT6Un_MB.js.map