@stonyx/orm 0.2.1-beta.87 → 0.2.1-beta.89

package/dist/aggregates.js

@@ -18,19 +18,22 @@ export class AggregateProperty {
                 return null;
             return 0;
         }
+        if (this.aggregateType === 'count')
+            return relatedRecords.length;
+        const field = this.field;
+        if (!field)
+            return null;
         switch (this.aggregateType) {
-            case 'count':
-                return relatedRecords.length;
             case 'sum':
                 return relatedRecords.reduce((acc, record) => {
-                    const val = parseFloat(record?.__data?.[this.field] ?? record?.[this.field]);
+                    const val = parseFloat(record?.__data?.[field] ?? record?.[field]);
                     return acc + (isNaN(val) ? 0 : val);
                 }, 0);
             case 'avg': {
                 let sum = 0;
                 let count = 0;
                 for (const record of relatedRecords) {
-                    const val = parseFloat(record?.__data?.[this.field] ?? record?.[this.field]);
+                    const val = parseFloat(record?.__data?.[field] ?? record?.[field]);
                     if (!isNaN(val)) {
                         sum += val;
                         count++;
@@ -41,7 +44,7 @@ export class AggregateProperty {
             case 'min': {
                 let min = null;
                 for (const record of relatedRecords) {
-                    const val = parseFloat(record?.__data?.[this.field] ?? record?.[this.field]);
+                    const val = parseFloat(record?.__data?.[field] ?? record?.[field]);
                     if (!isNaN(val) && (min === null || val < min))
                         min = val;
                 }
@@ -50,7 +53,7 @@ export class AggregateProperty {
             case 'max': {
                 let max = null;
                 for (const record of relatedRecords) {
-                    const val = parseFloat(record?.__data?.[this.field] ?? record?.[this.field]);
+                    const val = parseFloat(record?.__data?.[field] ?? record?.[field]);
                     if (!isNaN(val) && (max === null || val > max))
                         max = val;
                 }

package/dist/db.js

@@ -21,6 +21,12 @@ import { createRecord } from './manage-record.js';
 import { createFile, createDirectory, updateFile, readFile, fileExists } from '@stonyx/utils/file';
 import path from 'path';
 export const dbKey = '__db';
+function asDBRecord(value) {
+    if (typeof value !== 'object' || value === null || typeof value.format !== 'function') {
+        throw new Error('createRecord did not return a valid DBRecord');
+    }
+    return value;
+}
 export default class DB {
     static instance;
     record;
@@ -66,7 +72,7 @@ export default class DB {
                 const data = await readFile(dbFilePath, { json: true });
                 const hasData = collectionKeys.some(key => Array.isArray(data[key]) && data[key].length > 0);
                 if (hasData) {
-                    log.error(`DB mode mismatch: db.json contains data but mode is set to 'directory'. Run migration first:\n\n  stonyx db:migrate-to-directory\n`);
+                    log.error?.(`DB mode mismatch: db.json contains data but mode is set to 'directory'. Run migration first:\n\n  stonyx db:migrate-to-directory\n`);
                     process.exit(1);
                 }
             }
@@ -76,7 +82,7 @@ export default class DB {
             if (dirExists) {
                 const hasCollectionFiles = (await Promise.all(collectionKeys.map(key => fileExists(path.join(dirPath, `${key}.json`))))).some(Boolean);
                 if (hasCollectionFiles) {
-                    log.error(`DB mode mismatch: directory '${config.orm.db.directory}/' contains collection files but mode is set to 'file'. Run migration first:\n\n  stonyx db:migrate-to-file\n`);
+                    log.error?.(`DB mode mismatch: directory '${config.orm.db.directory}/' contains collection files but mode is set to 'file'. Run migration first:\n\n  stonyx db:migrate-to-file\n`);
                     process.exit(1);
                 }
             }
@@ -138,11 +144,11 @@ export default class DB {
                 await updateFile(dbFilePath, skeleton, { json: true });
             else
                 await createFile(dbFilePath, skeleton, { json: true });
-            log.db(`DB has been successfully saved to ${config.orm.db.directory}/ directory`);
+            log.db?.(`DB has been successfully saved to ${config.orm.db.directory}/ directory`);
             return;
         }
         await updateFile(`${config.rootPath}/${file}`, jsonData, { json: true });
-        log.db(`DB has been successfully saved to ${file}`);
+        log.db?.(`DB has been successfully saved to ${file}`);
     }
     async getRecord() {
         const { mode } = config.orm.db;
@@ -153,7 +159,7 @@ export default class DB {
     async getRecordFromFile() {
         const { file } = config.orm.db;
         const data = await readFile(file, { json: true, missingFileCallback: this.create.bind(this) });
-        return createRecord(dbKey, data, { isDbRecord: true, serialize: false, transform: false });
+        return asDBRecord(createRecord(dbKey, data, { isDbRecord: true, serialize: false, transform: false }));
     }
     async getRecordFromDirectory() {
         const dirPath = this.getDirPath();
@@ -161,7 +167,7 @@ export default class DB {
         const dirExists = await fileExists(dirPath);
         if (!dirExists) {
             const data = await this.create();
-            return createRecord(dbKey, data, { isDbRecord: true, serialize: false, transform: false });
+            return asDBRecord(createRecord(dbKey, data, { isDbRecord: true, serialize: false, transform: false }));
         }
         const assembled = {};
         await Promise.all(collectionKeys.map(async (key) => {
@@ -169,6 +175,6 @@ export default class DB {
             const exists = await fileExists(filePath);
             assembled[key] = exists ? await readFile(filePath, { json: true }) : [];
         }));
-        return createRecord(dbKey, assembled, { isDbRecord: true, serialize: false, transform: false });
+        return asDBRecord(createRecord(dbKey, assembled, { isDbRecord: true, serialize: false, transform: false }));
     }
 }

package/dist/hooks.js

@@ -31,7 +31,9 @@ export function beforeHook(operation, model, handler) {
     if (!beforeHooks.has(key)) {
         beforeHooks.set(key, []);
     }
-    beforeHooks.get(key).push(handler);
+    const hooks = beforeHooks.get(key);
+    if (hooks)
+        hooks.push(handler);
     // Return unsubscribe function
     return () => {
         const hooks = beforeHooks.get(key);
@@ -56,7 +58,9 @@ export function afterHook(operation, model, handler) {
     if (!afterHooks.has(key)) {
         afterHooks.set(key, []);
     }
-    afterHooks.get(key).push(handler);
+    const hooks = afterHooks.get(key);
+    if (hooks)
+        hooks.push(handler);
     // Return unsubscribe function
     return () => {
         const hooks = afterHooks.get(key);

package/dist/main.js

@@ -145,6 +145,8 @@ export default class Orm {
     static get db() {
         if (!Orm.initialized)
             throw new Error('ORM has not been initialized yet');
+        if (!Orm.instance.db)
+            throw new Error('ORM database has not been initialized');
         return Orm.instance.db;
     }
     getRecordClasses(modelName) {
@@ -170,7 +172,7 @@ export default class Orm {
     warn(message) {
         this.warnings.add(message);
         setTimeout(() => {
-            this.warnings.forEach(warning => log.warn(warning));
+            this.warnings.forEach(warning => log.warn?.(warning));
             this.warnings.clear();
         }, 0);
     }

package/dist/manage-record.js

@@ -1,6 +1,7 @@
 import Orm, { store } from '@stonyx/orm';
 import OrmRecord from './record.js';
 import { getGlobalRegistry, getPendingRegistry, getPendingBelongsToRegistry, getBelongsToRegistry, getHasManyRegistry } from './relationships.js';
+import { isOrmRecord } from './utils.js';
 const defaultOptions = {
     isDbRecord: false,
     serialize: true,
@@ -23,7 +24,7 @@ export function createRecord(modelName, rawData = {}, userOptions = {}) {
         throw new Error(`Model store for '${modelName}' is not registered. Ensure the model is defined before creating records.`);
     assignRecordId(modelName, rawData);
     const existingRecord = modelStore.get(rawData.id);
-    if (existingRecord) {
+    if (existingRecord instanceof OrmRecord) {
         // Update the existing record with new data so the last entry wins
         updateRecord(existingRecord, rawData, { ...options, update: true });
         return existingRecord;
@@ -52,7 +53,8 @@ export function createRecord(modelName, rawData = {}, userOptions = {}) {
     }
     // Fulfill pending belongsTo relationships
     const pendingBelongsToQueue = getPendingBelongsToRegistry();
-    const pendingBelongsTo = pendingBelongsToQueue.get(modelName)?.get(record.id);
+    const pendingBelongsToRaw = pendingBelongsToQueue.get(modelName)?.get(record.id);
+    const pendingBelongsTo = Array.isArray(pendingBelongsToRaw) ? pendingBelongsToRaw : undefined;
     if (pendingBelongsTo) {
         const belongsToReg = getBelongsToRegistry();
         const hasManyReg = getHasManyRegistry();
@@ -105,8 +107,12 @@ function assignRecordId(modelName, rawData) {
         rawData.__pendingSqlId = true;
         return;
     }
-    const modelStore = Array.from(store.get(modelName).values());
-    rawData.id = modelStore.length ? modelStore.at(-1).id + 1 : 1;
+    const storeMap = store.get(modelName);
+    if (!storeMap)
+        throw new Error(`Cannot assign record ID: model "${modelName}" not found in store`);
+    const modelStore = Array.from(storeMap.values()).filter(isOrmRecord);
+    const lastRecord = modelStore.at(-1);
+    rawData.id = lastRecord ? lastRecord.id + 1 : 1;
 }
 function isStringIdModel(modelName) {
     const modelClass = Orm.instance.getRecordClasses(modelName).modelClass;

package/dist/mysql/migration-generator.js

@@ -4,7 +4,12 @@ import path from 'path';
 import config from 'stonyx/config';
 import log from 'stonyx/log';
 export async function generateMigration(description = 'migration') {
-    const { migrationsDir } = config.orm.mysql;
+    const mysqlConfig = config.orm.mysql;
+    if (!mysqlConfig)
+        throw new Error('MySQL configuration (config.orm.mysql) is required for migration generation');
+    const { migrationsDir } = mysqlConfig;
+    if (!migrationsDir)
+        throw new Error('MySQL migrationsDir is required in config');
     const rootPath = config.rootPath;
     const migrationsPath = path.resolve(rootPath, migrationsDir);
     await createDirectory(migrationsPath);
@@ -20,7 +25,7 @@ export async function generateMigration(description = 'migration') {
         const previousViewSnapshotPrelim = extractViewsFromSnapshot(previousSnapshot);
         const viewDiffPrelim = diffViewSnapshots(previousViewSnapshotPrelim, currentViewSnapshotPrelim);
         if (!viewDiffPrelim.hasChanges) {
-            log.db('No schema changes detected.');
+            log.db?.('No schema changes detected.');
             return null;
         }
     }
@@ -47,7 +52,9 @@ export async function generateMigration(description = 'migration') {
     }
     // Removed columns
     for (const { model, column, type } of diff.removedColumns) {
-        const table = previousSnapshot[model].table;
+        const table = previousSnapshot[model]?.table;
+        if (!table)
+            throw new Error(`Missing table name in snapshot for model "${model}"`);
         upStatements.push(`ALTER TABLE \`${table}\` DROP COLUMN \`${column}\`;`);
         downStatements.push(`ALTER TABLE \`${table}\` ADD COLUMN \`${column}\` ${type};`);
     }
@@ -70,7 +77,9 @@ export async function generateMigration(description = 'migration') {
     }
     // Removed foreign keys
     for (const { model, column, references } of diff.removedForeignKeys) {
-        const table = previousSnapshot[model].table;
+        const table = previousSnapshot[model]?.table;
+        if (!table)
+            throw new Error(`Missing table name in snapshot for model "${model}"`);
         // Resolve FK column type from the referenced table's PK type in previous snapshot
         const refModel = Object.entries(previousSnapshot).find(([, s]) => s.table === references.references);
         const fkType = refModel && refModel[1].idType === 'string' ? 'VARCHAR(255)' : 'INT';
@@ -119,7 +128,7 @@ export async function generateMigration(description = 'migration') {
     }
     const combinedHasChanges = diff.hasChanges || viewDiff.hasChanges;
     if (!combinedHasChanges) {
-        log.db('No schema changes detected.');
+        log.db?.('No schema changes detected.');
         return null;
     }
     // Merge view snapshot into the main snapshot
@@ -133,7 +142,7 @@ export async function generateMigration(description = 'migration') {
     const content = `-- UP\n${upStatements.join('\n')}\n\n-- DOWN\n${downStatements.join('\n')}\n`;
     await createFile(path.join(migrationsPath, filename), content);
     await createFile(path.join(migrationsPath, '.snapshot.json'), JSON.stringify(combinedSnapshot, null, 2));
-    log.db(`Migration generated: ${filename}`);
+    log.db?.(`Migration generated: ${filename}`);
     return { filename, content, snapshot: combinedSnapshot };
 }
 export async function loadLatestSnapshot(migrationsPath) {

package/dist/mysql/mysql-db.js

@@ -32,7 +32,10 @@ export default class MysqlDB {
         MysqlDB.instance = this;
         this.deps = { ...defaultDeps, ...deps };
         this.pool = null;
-        this.mysqlConfig = this.deps.config.orm.mysql;
+        const mysqlConfig = this.deps.config.orm.mysql;
+        if (!mysqlConfig)
+            throw new Error('MySQL configuration (config.orm.mysql) is required');
+        this.mysqlConfig = mysqlConfig;
     }
     requirePool() {
         if (!this.pool)
@@ -45,26 +48,28 @@ export default class MysqlDB {
         await this.loadMemoryRecords();
     }
     async startup() {
+        if (!this.mysqlConfig.migrationsDir)
+            throw new Error('MySQL migrationsDir is required in config');
         const migrationsPath = this.deps.path.resolve(this.deps.config.rootPath, this.mysqlConfig.migrationsDir);
         // Check for pending migrations
         const applied = await this.deps.getAppliedMigrations(this.requirePool(), this.mysqlConfig.migrationsTable);
         const files = await this.deps.getMigrationFiles(migrationsPath);
         const pending = files.filter(f => !applied.includes(f));
         if (pending.length > 0) {
-            this.deps.log.db(`${pending.length} pending migration(s) found.`);
+            this.deps.log.db?.(`${pending.length} pending migration(s) found.`);
             const shouldApply = await this.deps.confirm(`${pending.length} pending migration(s) found. Apply now?`);
             if (shouldApply) {
                 for (const filename of pending) {
                     const content = await this.deps.readFile(this.deps.path.join(migrationsPath, filename));
                     const { up } = this.deps.parseMigrationFile(content);
                     await this.deps.applyMigration(this.requirePool(), filename, up, this.mysqlConfig.migrationsTable);
-                    this.deps.log.db(`Applied migration: ${filename}`);
+                    this.deps.log.db?.(`Applied migration: ${filename}`);
                 }
                 // Reload records after applying migrations
                 await this.loadMemoryRecords();
             }
             else {
-                this.deps.log.warn('Skipping pending migrations. Schema may be outdated.');
+                this.deps.log.warn?.('Skipping pending migrations. Schema may be outdated.');
             }
         }
         else if (files.length === 0) {
@@ -78,23 +83,25 @@ export default class MysqlDB {
                     if (result) {
                         const { up } = this.deps.parseMigrationFile(result.content);
                         await this.deps.applyMigration(this.requirePool(), result.filename, up, this.mysqlConfig.migrationsTable);
-                        this.deps.log.db(`Applied migration: ${result.filename}`);
+                        this.deps.log.db?.(`Applied migration: ${result.filename}`);
                         await this.loadMemoryRecords();
                     }
                 }
                 else {
-                    this.deps.log.warn('Skipping initial migration. Tables may not exist.');
+                    this.deps.log.warn?.('Skipping initial migration. Tables may not exist.');
                 }
             }
         }
         // Check for schema drift
         const schemas = this.deps.introspectModels();
+        if (!this.mysqlConfig.migrationsDir)
+            throw new Error('MySQL migrationsDir is required in config');
         const snapshot = await this.deps.loadLatestSnapshot(this.deps.path.resolve(this.deps.config.rootPath, this.mysqlConfig.migrationsDir));
         if (Object.keys(snapshot).length > 0) {
             const drift = this.deps.detectSchemaDrift(schemas, snapshot);
             if (drift.hasChanges) {
-                this.deps.log.warn('Schema drift detected: models have changed since the last migration.');
-                this.deps.log.warn('Run `stonyx db:generate-migration` to create a new migration.');
+                this.deps.log.warn?.('Schema drift detected: models have changed since the last migration.');
+                this.deps.log.warn?.('Run `stonyx db:generate-migration` to create a new migration.');
             }
         }
     }
@@ -117,7 +124,7 @@ export default class MysqlDB {
             // Check the model's memory flag — skip non-memory models
             const { modelClass } = Orm.instance.getRecordClasses(modelName);
             if (modelClass?.memory === false) {
-                this.deps.log.db(`Skipping memory load for '${modelName}' (memory: false)`);
+                this.deps.log.db?.(`Skipping memory load for '${modelName}' (memory: false)`);
                 continue;
             }
             const schema = schemas[modelName];
@@ -133,7 +140,7 @@ export default class MysqlDB {
             catch (error) {
                 // Table may not exist yet (pre-migration) — skip gracefully
                 if (isDbError(error) && error.code === 'ER_NO_SUCH_TABLE') {
-                    this.deps.log.db(`Table '${schema.table}' does not exist yet. Skipping load for '${modelName}'.`);
+                    this.deps.log.db?.(`Table '${schema.table}' does not exist yet. Skipping load for '${modelName}'.`);
                     continue;
                 }
                 throw error;
@@ -144,7 +151,7 @@ export default class MysqlDB {
         for (const [viewName, viewSchema] of Object.entries(viewSchemas)) {
             const { modelClass: viewClass } = Orm.instance.getRecordClasses(viewName);
             if (viewClass?.memory !== true) {
-                this.deps.log.db(`Skipping memory load for view '${viewName}' (memory: false)`);
+                this.deps.log.db?.(`Skipping memory load for view '${viewName}' (memory: false)`);
                 continue;
             }
             const schema = { table: viewSchema.viewName, columns: viewSchema.columns || {}, foreignKeys: viewSchema.foreignKeys || {} };
@@ -159,7 +166,7 @@ export default class MysqlDB {
             }
             catch (error) {
                 if (isDbError(error) && error.code === 'ER_NO_SUCH_TABLE') {
-                    this.deps.log.db(`View '${viewSchema.viewName}' does not exist yet. Skipping load for '${viewName}'.`);
+                    this.deps.log.db?.(`View '${viewSchema.viewName}' does not exist yet. Skipping load for '${viewName}'.`);
                     continue;
                 }
                 throw error;
@@ -224,12 +231,13 @@ export default class MysqlDB {
         }
         if (!schema)
             return [];
-        const { sql, values } = this.deps.buildSelect(schema.table, conditions);
+        const resolvedSchema = schema;
+        const { sql, values } = this.deps.buildSelect(resolvedSchema.table, conditions);
         try {
             const result = await this.requirePool().execute(sql, values);
             const rows = result[0];
             const records = rows.map(row => {
-                const rawData = this._rowToRawData(row, schema);
+                const rawData = this._rowToRawData(row, resolvedSchema);
                 return this.deps.createRecord(modelName, rawData, { isDbRecord: true, serialize: false, transform: false });
             });
             // Don't let memory:false records accumulate in the store
@@ -328,6 +336,8 @@ export default class MysqlDB {
             const pendingId = record.id;
             const realId = result.insertId;
             const modelStore = this.deps.store.get(modelName);
+            if (!modelStore)
+                throw new Error(`Model "${modelName}" not found in store during ID re-key`);
             modelStore.delete(pendingId);
             record.__data.id = realId;
             record.id = realId;

package/dist/mysql/schema-introspector.js

@@ -53,6 +53,8 @@ export function introspectModels() {
         }
         // Build foreign keys from belongsTo relationships
         for (const [relName, targetModelName] of Object.entries(relationships.belongsTo)) {
+            if (!targetModelName)
+                continue;
             const fkColumn = `${relName}_id`;
             foreignKeys[fkColumn] = {
                 references: sanitizeTableName(getPluralName(targetModelName)),
@@ -122,7 +124,8 @@ export function getTopologicalOrder(schemas) {
             return;
         // Visit dependencies (belongsTo targets) first
         for (const targetModelName of Object.values(schema.relationships.belongsTo)) {
-            visit(targetModelName);
+            if (targetModelName)
+                visit(targetModelName);
         }
         order.push(name);
     }
@@ -158,11 +161,13 @@ export function introspectViews() {
             const relInfo = getRelationshipInfo(property);
             if (relInfo?.type === 'belongsTo') {
                 relationships.belongsTo[key] = relInfo.modelName;
-                const fkColumn = `${key}_id`;
-                foreignKeys[fkColumn] = {
-                    references: sanitizeTableName(getPluralName(relInfo.modelName)),
-                    column: 'id',
-                };
+                if (relInfo.modelName) {
+                    const fkColumn = `${key}_id`;
+                    foreignKeys[fkColumn] = {
+                        references: sanitizeTableName(getPluralName(relInfo.modelName)),
+                        column: 'id',
+                    };
+                }
             }
             else if (relInfo?.type === 'hasMany') {
                 relationships.hasMany[key] = relInfo.modelName;

package/dist/orm-request.js

@@ -4,6 +4,7 @@ import { camelCaseToKebabCase } from '@stonyx/utils/string';
 import { getPluralName } from './plural-registry.js';
 import { getBeforeHooks, getAfterHooks } from './hooks.js';
 import config from 'stonyx/config';
+import { isOrmRecord } from './utils.js';
 const methodAccessMap = {
     GET: 'read',
     POST: 'create',
@@ -69,7 +70,7 @@ function buildResponse(data, includeParam, recordOrRecords, options = {}) {
         return response;
     const includedRecords = collectIncludedRecords(recordOrRecords, includes);
     if (includedRecords.length > 0) {
-        response.included = includedRecords.map(record => record.toJSON({ baseUrl }));
+        response.included = includedRecords.map(record => record.toJSON?.({ baseUrl }));
     }
     return response;
 }
@@ -91,11 +92,13 @@ function traverseIncludePath(currentRecords, includePath, depth, seen, included)
             continue;
         // Handle both belongsTo (single) and hasMany (array)
         const recordsToProcess = Array.isArray(relatedRecords)
-            ? relatedRecords
-            : [relatedRecords];
+            ? relatedRecords.filter(isOrmRecord)
+            : isOrmRecord(relatedRecords) ? [relatedRecords] : [];
         for (const relatedRecord of recordsToProcess) {
             if (!relatedRecord)
                 continue;
+            if (!relatedRecord.__model)
+                continue;
             const type = relatedRecord.__model.__name;
             const id = relatedRecord.id;
             // Initialize Set for this type if needed
@@ -196,7 +199,7 @@ export default class OrmRequest extends Request {
         const modelRelationships = getModelRelationships(model);
         // Define raw handlers first
         const getCollectionHandler = async (request, { filter: accessFilter }) => {
-            const allRecords = await store.findAll(model);
+            const allRecords = (await store.findAll(model)).filter(isOrmRecord);
             const queryFilters = parseFilters(request.query);
             const queryFilterPredicate = createFilterPredicate(queryFilters);
             const fieldsMap = parseFields(request.query);
@@ -207,7 +210,7 @@ export default class OrmRequest extends Request {
             if (queryFilterPredicate)
                 recordsToReturn = recordsToReturn.filter(queryFilterPredicate);
             const baseUrl = getBaseUrl(request);
-            const data = recordsToReturn.map(record => record.toJSON({ fields: modelFields, baseUrl }));
+            const data = recordsToReturn.map(record => record.toJSON?.({ fields: modelFields, baseUrl }));
             return buildResponse(data, request.query?.include, recordsToReturn, {
                 links: { self: `${baseUrl}/${pluralizedModel}` },
                 baseUrl
@@ -220,7 +223,7 @@ export default class OrmRequest extends Request {
             const fieldsMap = parseFields(request.query);
             const modelFields = fieldsMap.get(pluralizedModel) || fieldsMap.get(model);
             const baseUrl = getBaseUrl(request);
-            return buildResponse(record.toJSON({ fields: modelFields, baseUrl }), request.query?.include, record, {
+            return buildResponse(record.toJSON?.({ fields: modelFields, baseUrl }), request.query?.include, record, {
                 links: { self: `${baseUrl}/${pluralizedModel}/${request.params.id}` },
                 baseUrl
             });
@@ -245,11 +248,17 @@ export default class OrmRequest extends Request {
                 }
             }
             const recordAttributes = id !== undefined ? { id, ...sanitizedAttributes } : sanitizedAttributes;
-            const record = createRecord(model, recordAttributes, { serialize: false });
-            return { data: record.toJSON({ fields: modelFields }) };
+            const created = createRecord(model, recordAttributes, { serialize: false });
+            const record = isOrmRecord(created) ? created : null;
+            if (!record)
+                return 500;
+            return { data: record.toJSON?.({ fields: modelFields }) };
         };
         const updateHandler = async ({ body, params }) => {
-            const record = await store.find(model, getId(params));
+            const found = await store.find(model, getId(params));
+            if (!found || !isOrmRecord(found))
+                return 404;
+            const record = found;
             const { attributes, relationships: rels } = (body?.data || {});
             if (!attributes && !rels)
                 return 400; // Bad request
@@ -277,7 +286,7 @@ export default class OrmRequest extends Request {
                     updateRecord(record, relUpdates);
                 }
             }
-            return { data: record.toJSON() };
+            return { data: record.toJSON?.() };
         };
         const deleteHandler = ({ params }) => {
             store.remove(model, getId(params));
@@ -340,8 +349,9 @@ export default class OrmRequest extends Request {
             // Execute main handler
             const response = await handler(request, state);
             // Persist to SQL database for write operations
-            if (Orm.instance.sqlDb && WRITE_OPERATIONS.has(operation)) {
-                await Orm.instance.sqlDb.persist(operation, this.model, context, response);
+            const sqlDb = Orm.instance.sqlDb;
+            if (sqlDb && WRITE_OPERATIONS.has(operation)) {
+                await sqlDb.persist(operation, this.model, context, response);
             }
             // Add response and relevant records to context
             context.response = response;
@@ -390,11 +400,12 @@ export default class OrmRequest extends Request {
                 let data;
                 if (info.isArray) {
                     // hasMany - return array
-                    data = (relatedData || []).map(r => r.toJSON({ baseUrl }));
+                    const related = Array.isArray(relatedData) ? relatedData.filter(isOrmRecord) : [];
+                    data = related.map(r => r.toJSON?.({ baseUrl }));
                 }
                 else {
                     // belongsTo - return single or null
-                    data = relatedData ? relatedData.toJSON({ baseUrl }) : null;
+                    data = isOrmRecord(relatedData) ? relatedData.toJSON?.({ baseUrl }) : null;
                 }
                 return {
                     links: { self: `${baseUrl}/${pluralizedModel}/${request.params.id}/${dasherizedName}` },
@@ -411,11 +422,19 @@ export default class OrmRequest extends Request {
                 let data;
                 if (info.isArray) {
                     // hasMany - return array of linkage objects
-                    data = (relatedData || []).map(r => ({ type: r.__model.__name, id: r.id }));
+                    const related = Array.isArray(relatedData) ? relatedData.filter(isOrmRecord) : [];
+                    data = related
+                        .filter((r) => Boolean(r.__model))
+                        .map(r => ({ type: r.__model.__name, id: r.id }));
                 }
                 else {
                     // belongsTo - return single linkage or null
-                    data = relatedData ? { type: relatedData.__model.__name, id: relatedData.id } : null;
+                    if (isOrmRecord(relatedData) && relatedData.__model) {
+                        data = { type: relatedData.__model.__name, id: relatedData.id };
+                    }
+                    else {
+                        data = null;
+                    }
                 }
                 return {
                     links: {

package/dist/postgres/migration-generator.js

@@ -19,7 +19,7 @@ export async function generateMigration(description = 'migration', configKey = '
         const previousViewSnapshotPrelim = extractViewsFromSnapshot(previousSnapshot);
         const viewDiffPrelim = diffViewSnapshots(previousViewSnapshotPrelim, currentViewSnapshotPrelim);
         if (!viewDiffPrelim.hasChanges) {
-            log.db('No schema changes detected.');
+            log.db?.('No schema changes detected.');
             return null;
         }
     }
@@ -59,7 +59,9 @@ export async function generateMigration(description = 'migration', configKey = '
     }
     // Removed columns
     for (const { model, column, type } of diff.removedColumns) {
-        const table = previousSnapshot[model].table;
+        const table = previousSnapshot[model]?.table;
+        if (!table)
+            throw new Error(`Missing table name in snapshot for model "${model}"`);
         upStatements.push(`ALTER TABLE "${table}" DROP COLUMN "${column}";`);
         downStatements.push(`ALTER TABLE "${table}" ADD COLUMN "${column}" ${type};`);
     }
@@ -82,7 +84,9 @@ export async function generateMigration(description = 'migration', configKey = '
     }
     // Removed foreign keys
     for (const { model, column, references } of diff.removedForeignKeys) {
-        const table = previousSnapshot[model].table;
+        const table = previousSnapshot[model]?.table;
+        if (!table)
+            throw new Error(`Missing table name in snapshot for model "${model}"`);
         const refModel = Object.entries(previousSnapshot).find(([, s]) => s.table === references.references);
         const fkType = refModel && refModel[1].idType === 'string' ? 'VARCHAR(255)' : 'INTEGER';
         const constraintName = `fk_${table}_${column}`;
@@ -131,7 +135,7 @@ export async function generateMigration(description = 'migration', configKey = '
     }
     const combinedHasChanges = diff.hasChanges || viewDiff.hasChanges;
     if (!combinedHasChanges) {
-        log.db('No schema changes detected.');
+        log.db?.('No schema changes detected.');
         return null;
     }
     // Merge view snapshot into the main snapshot
@@ -145,7 +149,7 @@ export async function generateMigration(description = 'migration', configKey = '
     const content = `-- UP\n${upStatements.join('\n')}\n\n-- DOWN\n${downStatements.join('\n')}\n`;
     await createFile(path.join(migrationsPath, filename), content);
     await createFile(path.join(migrationsPath, '.snapshot.json'), JSON.stringify(combinedSnapshot, null, 2));
-    log.db(`Migration generated: ${filename}`);
+    log.db?.(`Migration generated: ${filename}`);
     return { filename, content, snapshot: combinedSnapshot };
 }
 export async function loadLatestSnapshot(migrationsPath) {