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

package/dist/relationships.js

@@ -10,6 +10,8 @@ export function getRelationships(type, sourceModel, targetModel, relationshipId)
     if (!allRelationships.has(sourceModel))
         allRelationships.set(sourceModel, new Map());
     const modelRelationship = allRelationships.get(sourceModel);
+    if (!modelRelationship)
+        return undefined;
     if (!modelRelationship.has(targetModel))
         modelRelationship.set(targetModel, new Map());
     const relationship = modelRelationship.get(targetModel);

package/dist/setup-rest-server.js

@@ -8,7 +8,7 @@ import { dbKey } from './db.js';
 import { getPluralName } from './plural-registry.js';
 import log from 'stonyx/log';
 export default async function (route, accessPath, metaRoute) {
-    let accessFiles = {};
+    const accessFiles = {};
     try {
         await forEachFileImport(accessPath, (accessClass) => {
             const accessInstance = new accessClass();
@@ -32,8 +32,8 @@ export default async function (route, accessPath, metaRoute) {
         });
     }
     catch (error) {
-        log.error(error instanceof Error ? error.message : String(error));
-        log.warn('You must define a valid access configuration file in order to access ORM generated REST endpoints.');
+        log.error?.(error instanceof Error ? error.message : String(error));
+        log.warn?.('You must define a valid access configuration file in order to access ORM generated REST endpoints.');
     }
     await waitForModule('rest-server');
     // Remove "/" prefix and name mount point accordingly
@@ -46,9 +46,7 @@ export default async function (route, accessPath, metaRoute) {
     }
     // Mount the meta route when metaRoute config is enabled
     if (metaRoute) {
-        log.warn('SECURITY RISK! - Meta route is enabled via metaRoute config. This feature is intended for development purposes only!');
+        log.warn?.('SECURITY RISK! - Meta route is enabled via metaRoute config. This feature is intended for development purposes only!');
         RestServer.instance.mountRoute(MetaRequest, { name });
     }
-    // Cleanup references
-    accessFiles = null;
 }

package/dist/store.js

@@ -245,6 +245,8 @@ export default class Store {
             }];
         while (queue.length > 0) {
             const item = queue.shift();
+            if (!item)
+                break;
             const key = `${item.modelName}:${item.recordId}`;
             if (visited.has(key))
                 continue;

package/dist/utils.js

@@ -6,7 +6,8 @@ export function isDbError(error) {
 export function pluralize(word) {
     if (word.includes('-')) {
         const parts = word.split('-');
-        const pluralizedLast = basePluralize(parts.pop());
+        const last = parts.pop();
+        const pluralizedLast = basePluralize(last);
         return [...parts, pluralizedLast].join('-');
     }
     return basePluralize(word);

package/dist/view-resolver.js

@@ -101,7 +101,9 @@ export default class ViewResolver {
             if (!groups.has(key)) {
                 groups.set(key, []);
             }
-            groups.get(key).push(record);
+            const group = groups.get(key);
+            if (group)
+                group.push(record);
         }
         const results = [];
         for (const [groupKey, groupRecords] of groups) {

package/package.json

@@ -4,7 +4,7 @@
     "stonyx-async",
     "stonyx-module"
   ],
-  "version": "0.2.1-beta.87",
+  "version": "0.2.1-beta.88",
   "description": "",
   "main": "dist/index.js",
   "type": "module",

package/src/aggregates.ts

@@ -27,13 +27,15 @@ export class AggregateProperty {
       return 0;
     }
 
-    switch (this.aggregateType) {
-      case 'count':
-        return relatedRecords.length;
+    if (this.aggregateType === 'count') return relatedRecords.length;
+
+    const field = this.field;
+    if (!field) return null;
 
+    switch (this.aggregateType) {
       case 'sum':
         return relatedRecords.reduce((acc, record) => {
-          const val = parseFloat(record?.__data?.[this.field!] as string ?? record?.[this.field!] as string);
+          const val = parseFloat(record?.__data?.[field] as string ?? record?.[field] as string);
           return acc + (isNaN(val) ? 0 : val);
         }, 0);
 
@@ -41,7 +43,7 @@ export class AggregateProperty {
         let sum = 0;
         let count = 0;
         for (const record of relatedRecords) {
-          const val = parseFloat(record?.__data?.[this.field!] as string ?? record?.[this.field!] as string);
+          const val = parseFloat(record?.__data?.[field] as string ?? record?.[field] as string);
           if (!isNaN(val)) {
             sum += val;
             count++;
@@ -53,7 +55,7 @@ export class AggregateProperty {
       case 'min': {
         let min: number | null = null;
         for (const record of relatedRecords) {
-          const val = parseFloat(record?.__data?.[this.field!] as string ?? record?.[this.field!] as string);
+          const val = parseFloat(record?.__data?.[field] as string ?? record?.[field] as string);
           if (!isNaN(val) && (min === null || val < min)) min = val;
         }
         return min;
@@ -62,7 +64,7 @@ export class AggregateProperty {
       case 'max': {
         let max: number | null = null;
         for (const record of relatedRecords) {
-          const val = parseFloat(record?.__data?.[this.field!] as string ?? record?.[this.field!] as string);
+          const val = parseFloat(record?.__data?.[field] as string ?? record?.[field] as string);
           if (!isNaN(val) && (max === null || val > max)) max = val;
         }
         return max;

package/src/belongs-to.ts

@@ -4,7 +4,7 @@ import type { SourceRecord } from './types/orm-types.js';
 
 function getOrSet<K, V>(map: Map<K, V>, key: K, defaultValue: V): V {
   if (!map.has(key)) map.set(key, defaultValue);
-  return map.get(key)!;
+  return map.get(key) as V;
 }
 
 interface BelongsToOptions {

package/src/db.ts

@@ -84,7 +84,7 @@ export default class DB {
         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);
         }
       }
@@ -97,7 +97,7 @@ export default class DB {
         )).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);
         }
       }
@@ -176,13 +176,13 @@ export default class DB {
       if (dbFileExists) 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(): Promise<DBRecord> {

package/src/hooks.ts

@@ -40,7 +40,8 @@ export function beforeHook(operation: string, model: string, handler: HookHandle
   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 () => {
@@ -66,7 +67,8 @@ export function afterHook(operation: string, model: string, handler: HookHandler
   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 () => {

package/src/main.ts

@@ -187,7 +187,8 @@ export default class Orm {
   static get db(): OrmDB | SqlDb {
     if (!Orm.initialized) throw new Error('ORM has not been initialized yet');
 
-    return Orm.instance.db!;
+    if (!Orm.instance.db) throw new Error('ORM database has not been initialized');
+    return Orm.instance.db;
   }
 
   getRecordClasses(modelName: string): { modelClass: unknown; serializerClass: unknown } {
@@ -218,7 +219,7 @@ export default class Orm {
     this.warnings.add(message);
 
     setTimeout(() => {
-      this.warnings.forEach(warning => log.warn!(warning));
+      this.warnings.forEach(warning => log.warn?.(warning));
       this.warnings.clear();
     }, 0);
   }

package/src/manage-record.ts

@@ -142,8 +142,11 @@ function assignRecordId(modelName: string, rawData: { [key: string]: unknown }):
     return;
   }
 
-  const modelStore = Array.from(store.get(modelName)!.values()) as OrmRecord[];
-  rawData.id = modelStore.length ? (modelStore.at(-1)!.id as number) + 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()) as OrmRecord[];
+  const lastRecord = modelStore.at(-1);
+  rawData.id = lastRecord ? (lastRecord.id as number) + 1 : 1;
 }
 
 function isStringIdModel(modelName: string): boolean {

package/src/mysql/migration-generator.ts

@@ -51,9 +51,12 @@ interface GeneratedMigration {
 type Snapshot = Record<string, SnapshotEntry & { isView?: boolean; viewName?: string; viewQuery?: string; source?: string }>;
 
 export async function generateMigration(description: string = 'migration'): Promise<GeneratedMigration | null> {
-  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!);
+  const migrationsPath = path.resolve(rootPath, migrationsDir);
 
   await createDirectory(migrationsPath);
 
@@ -71,7 +74,7 @@ export async function generateMigration(description: string = 'migration'): Prom
     const viewDiffPrelim = diffViewSnapshots(previousViewSnapshotPrelim, currentViewSnapshotPrelim);
 
     if (!viewDiffPrelim.hasChanges) {
-      log.db!('No schema changes detected.');
+      log.db?.('No schema changes detected.');
       return null;
     }
   }
@@ -104,7 +107,8 @@ export async function generateMigration(description: string = 'migration'): Prom
 
   // 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};`);
   }
@@ -130,7 +134,8 @@ export async function generateMigration(description: string = 'migration'): Prom
 
   // 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';
@@ -184,7 +189,7 @@ export async function generateMigration(description: string = 'migration'): Prom
   const combinedHasChanges = diff.hasChanges || viewDiff.hasChanges;
 
   if (!combinedHasChanges) {
-    log.db!('No schema changes detected.');
+    log.db?.('No schema changes detected.');
     return null;
   }
 
@@ -202,7 +207,7 @@ export async function generateMigration(description: string = 'migration'): Prom
   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 };
 }

package/src/mysql/mysql-db.ts

@@ -89,7 +89,9 @@ export default class MysqlDB {
 
     this.deps = { ...defaultDeps, ...deps } as MysqlDBDeps;
     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;
   }
 
   private requirePool(): Pool {
@@ -104,7 +106,8 @@ export default class MysqlDB {
   }
 
   async startup(): Promise<void> {
-    const migrationsPath = this.deps.path.resolve(this.deps.config.rootPath, this.mysqlConfig.migrationsDir!);
+    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);
@@ -112,7 +115,7 @@ export default class MysqlDB {
     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?`);
 
@@ -122,13 +125,13 @@ export default class MysqlDB {
           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) {
       const schemas = this.deps.introspectModels();
@@ -146,25 +149,26 @@ 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();
-    const snapshot = await this.deps.loadLatestSnapshot(this.deps.path.resolve(this.deps.config.rootPath, this.mysqlConfig.migrationsDir!)) as Record<string, SnapshotEntry>;
+    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)) as Record<string, SnapshotEntry>;
 
     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.');
       }
     }
   }
@@ -191,7 +195,7 @@ export default class MysqlDB {
       // Check the model's memory flag — skip non-memory models
       const { modelClass } = Orm.instance.getRecordClasses(modelName) as { modelClass?: { memory?: boolean } };
       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;
       }
 
@@ -209,7 +213,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;
         }
 
@@ -223,7 +227,7 @@ export default class MysqlDB {
     for (const [viewName, viewSchema] of Object.entries(viewSchemas)) {
       const { modelClass: viewClass } = Orm.instance.getRecordClasses(viewName) as { modelClass?: { memory?: boolean } };
       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;
       }
 
@@ -240,7 +244,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;
@@ -314,14 +318,15 @@ 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] as Record<string, unknown>[];
 
       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 }) as unknown as OrmRecord;
       });
 
@@ -432,7 +437,8 @@ export default class MysqlDB {
     if (isPendingId && result.insertId) {
       const pendingId = record.id;
       const realId = result.insertId;
-      const modelStore = this.deps.store.get(modelName)!;
+      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 as number | string);
       record.__data.id = realId;

package/src/mysql/schema-introspector.ts

@@ -74,9 +74,10 @@ export function introspectModels(): Record<string, ModelSchema> {
 
     // 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!)),
+        references: sanitizeTableName(getPluralName(targetModelName)),
         column: 'id',
       };
     }
@@ -155,7 +156,7 @@ export function getTopologicalOrder(schemas: Record<string, ModelSchema>): strin
 
     // Visit dependencies (belongsTo targets) first
     for (const targetModelName of Object.values(schema.relationships.belongsTo)) {
-      visit(targetModelName!);
+      if (targetModelName) visit(targetModelName);
     }
 
     order.push(name);
@@ -199,11 +200,13 @@ export function introspectViews(): Record<string, ViewSchema> {
 
       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;
       } else if (property instanceof ModelProperty) {

package/src/orm-request.ts

@@ -127,7 +127,7 @@ function buildResponse(
 
   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;
@@ -163,7 +163,8 @@ function traverseIncludePath(
     for (const relatedRecord of recordsToProcess) {
       if (!relatedRecord) continue;
 
-      const type = relatedRecord.__model!.__name;
+      if (!relatedRecord.__model) continue;
+      const type = relatedRecord.__model.__name;
       const id = relatedRecord.id as string | number;
 
       // Initialize Set for this type if needed
@@ -292,7 +293,7 @@ export default class OrmRequest extends Request {
       if (queryFilterPredicate) recordsToReturn = recordsToReturn.filter(queryFilterPredicate as (record: OrmRecord) => boolean);
 
       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}` },
@@ -308,7 +309,7 @@ export default class OrmRequest extends Request {
       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
       });
@@ -345,7 +346,7 @@ export default class OrmRequest extends Request {
       const recordAttributes = id !== undefined ? { id, ...sanitizedAttributes } : sanitizedAttributes;
       const record = createRecord(model, recordAttributes as { [key: string]: unknown }, { serialize: false }) as unknown as OrmRecord;
 
-      return { data: record.toJSON!({ fields: modelFields }) };
+      return { data: record.toJSON?.({ fields: modelFields }) };
     };
 
     const updateHandler: HandlerFn = async ({ body, params }) => {
@@ -381,7 +382,7 @@ export default class OrmRequest extends Request {
         }
       }
 
-      return { data: record.toJSON!() };
+      return { data: record.toJSON?.() };
     };
 
     const deleteHandler: HandlerFn = ({ params }) => {
@@ -453,8 +454,9 @@ export default class OrmRequest extends Request {
       const response = await handler(request, state);
 
       // Persist to SQL database for write operations
-      if ((Orm.instance as Orm).sqlDb && WRITE_OPERATIONS.has(operation)) {
-        await (Orm.instance as Orm).sqlDb!.persist(operation, this.model, context, response);
+      const sqlDb = (Orm.instance as Orm).sqlDb;
+      if (sqlDb && WRITE_OPERATIONS.has(operation)) {
+        await sqlDb.persist(operation, this.model, context, response);
       }
 
       // Add response and relevant records to context
@@ -512,10 +514,10 @@ export default class OrmRequest extends Request {
         let data: unknown;
         if (info.isArray) {
           // hasMany - return array
-          data = ((relatedData || []) as OrmRecord[]).map(r => r.toJSON!({ baseUrl }));
+          data = ((relatedData || []) as OrmRecord[]).map(r => r.toJSON?.({ baseUrl }));
         } else {
           // belongsTo - return single or null
-          data = relatedData ? (relatedData as OrmRecord).toJSON!({ baseUrl }) : null;
+          data = relatedData ? (relatedData as OrmRecord).toJSON?.({ baseUrl }) : null;
         }
 
         return {
@@ -535,10 +537,15 @@ export default class OrmRequest extends Request {
         let data: unknown;
         if (info.isArray) {
           // hasMany - return array of linkage objects
-          data = ((relatedData || []) as OrmRecord[]).map(r => ({ type: r.__model!.__name, id: r.id }));
+          data = ((relatedData || []) as OrmRecord[])
+            .filter((r): r is OrmRecord & { __model: { __name: string } } => Boolean(r.__model))
+            .map(r => ({ type: r.__model.__name, id: r.id }));
         } else {
           // belongsTo - return single linkage or null
-          data = relatedData ? { type: (relatedData as OrmRecord).__model!.__name, id: (relatedData as OrmRecord).id } : null;
+          const model = relatedData ? (relatedData as OrmRecord).__model : undefined;
+          data = model
+            ? { type: model.__name, id: (relatedData as OrmRecord).id }
+            : null;
         }
 
         return {

package/src/postgres/migration-generator.ts

@@ -68,7 +68,7 @@ export async function generateMigration(description: string = 'migration', confi
     const viewDiffPrelim = diffViewSnapshots(previousViewSnapshotPrelim, currentViewSnapshotPrelim);
 
     if (!viewDiffPrelim.hasChanges) {
-      log.db!('No schema changes detected.');
+      log.db?.('No schema changes detected.');
       return null;
     }
   }
@@ -118,7 +118,8 @@ export async function generateMigration(description: string = 'migration', confi
 
   // 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};`);
   }
@@ -144,7 +145,8 @@ export async function generateMigration(description: string = 'migration', confi
 
   // 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}`;
@@ -198,7 +200,7 @@ export async function generateMigration(description: string = 'migration', confi
   const combinedHasChanges = diff.hasChanges || viewDiff.hasChanges;
 
   if (!combinedHasChanges) {
-    log.db!('No schema changes detected.');
+    log.db?.('No schema changes detected.');
     return null;
   }
 
@@ -216,7 +218,7 @@ export async function generateMigration(description: string = 'migration', confi
   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 };
 }