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

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

@@ -5,6 +5,7 @@ import { getPluralName } from './plural-registry.js';
 import { getBeforeHooks, getAfterHooks } from './hooks.js';
 import config from 'stonyx/config';
 import type { OrmRecord } from './types/orm-types.js';
+import { isOrmRecord } from './utils.js';
 
 interface OrmRequest$ extends Request {
   protocol?: string;
@@ -74,7 +75,7 @@ function getRelationshipInfo(property: unknown): RelationshipInfo | null {
 
 // Helper to introspect model relationships
 function getModelRelationships(modelName: string): { [key: string]: RelationshipInfo } {
-  const { modelClass } = (Orm.instance as Orm).getRecordClasses(modelName);
+  const { modelClass } = Orm.instance.getRecordClasses(modelName);
   if (!modelClass) return {};
 
   const model = new (modelClass as new (name: string) => { [key: string]: unknown })(modelName);
@@ -127,7 +128,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;
@@ -157,13 +158,14 @@ function traverseIncludePath(
 
     // Handle both belongsTo (single) and hasMany (array)
     const recordsToProcess: OrmRecord[] = Array.isArray(relatedRecords)
-      ? relatedRecords as OrmRecord[]
-      : [relatedRecords as OrmRecord];
+      ? relatedRecords.filter(isOrmRecord)
+      : isOrmRecord(relatedRecords) ? [relatedRecords] : [];
 
     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
@@ -280,7 +282,7 @@ export default class OrmRequest extends Request {
 
     // Define raw handlers first
     const getCollectionHandler: HandlerFn = async (request, { filter: accessFilter }) => {
-      const allRecords = await store.findAll(model) as OrmRecord[];
+      const allRecords = (await store.findAll(model)).filter(isOrmRecord);
 
       const queryFilters = parseFilters(request.query);
       const queryFilterPredicate = createFilterPredicate(queryFilters);
@@ -292,7 +294,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 +310,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
       });
@@ -343,13 +345,17 @@ 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;
+      const created = createRecord(model, recordAttributes as { [key: string]: unknown }, { serialize: false });
+      const record = isOrmRecord(created) ? created : null;
+      if (!record) return 500;
 
-      return { data: record.toJSON!({ fields: modelFields }) };
+      return { data: record.toJSON?.({ fields: modelFields }) };
     };
 
     const updateHandler: HandlerFn = async ({ body, params }) => {
-      const record = await store.find(model, getId(params)) as OrmRecord;
+      const found = await store.find(model, getId(params));
+      if (!found || !isOrmRecord(found)) return 404;
+      const record = found;
       const { attributes, relationships: rels } = (body?.data || {}) as {
         attributes?: { [key: string]: unknown };
         relationships?: { [key: string]: { data?: { id?: string | number } } };
@@ -381,7 +387,7 @@ export default class OrmRequest extends Request {
         }
       }
 
-      return { data: record.toJSON!() };
+      return { data: record.toJSON?.() };
     };
 
     const deleteHandler: HandlerFn = ({ params }) => {
@@ -453,8 +459,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.sqlDb;
+      if (sqlDb && WRITE_OPERATIONS.has(operation)) {
+        await sqlDb.persist(operation, this.model, context, response);
       }
 
       // Add response and relevant records to context
@@ -512,10 +519,11 @@ export default class OrmRequest extends Request {
         let data: unknown;
         if (info.isArray) {
           // hasMany - return array
-          data = ((relatedData || []) as OrmRecord[]).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 as OrmRecord).toJSON!({ baseUrl }) : null;
+          data = isOrmRecord(relatedData) ? relatedData.toJSON?.({ baseUrl }) : null;
         }
 
         return {
@@ -535,10 +543,17 @@ 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 }));
+          const related = Array.isArray(relatedData) ? relatedData.filter(isOrmRecord) : [];
+          data = related
+            .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;
+          if (isOrmRecord(relatedData) && relatedData.__model) {
+            data = { type: relatedData.__model.__name, id: relatedData.id };
+          } else {
+            data = 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 };
 }

package/src/postgres/postgres-db.ts

@@ -122,7 +122,7 @@ export default class PostgresDB {
     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?`);
 
@@ -132,13 +132,13 @@ export default class PostgresDB {
           const { up } = this.deps.parseMigrationFile(content);
 
           await this.deps.applyMigration(this.requirePool(), filename, up, this.pgConfig.migrationsTable as string | undefined);
-          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();
@@ -156,11 +156,11 @@ export default class PostgresDB {
           if (result) {
             const { up } = this.deps.parseMigrationFile(result.content);
             await this.deps.applyMigration(this.requirePool(), result.filename, up, this.pgConfig.migrationsTable as string | undefined);
-            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.');
         }
       }
     }
@@ -173,8 +173,8 @@ export default class PostgresDB {
       const drift = this.deps.detectSchemaDrift(schemas, snapshot as Parameters<typeof detectSchemaDrift>[1]);
 
       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.');
       }
     }
   }
@@ -200,7 +200,7 @@ export default class PostgresDB {
     for (const modelName of order) {
       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;
       }
 
@@ -217,7 +217,7 @@ export default class PostgresDB {
       } catch (error) {
         // 42P01 = undefined_table (PG equivalent of ER_NO_SUCH_TABLE)
         if (isDbError(error) && error.code === '42P01') {
-          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;
         }
 
@@ -231,7 +231,7 @@ export default class PostgresDB {
     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;
       }
 
@@ -256,7 +256,7 @@ export default class PostgresDB {
         }
       } catch (error) {
         if (isDbError(error) && error.code === '42P01') {
-          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;
@@ -345,13 +345,14 @@ export default class PostgresDB {
 
     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().query(sql, values);
 
       const records = result.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;
       });
 

package/src/postgres/schema-introspector.ts

@@ -93,9 +93,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',
       };
     }
@@ -189,7 +190,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);
@@ -233,11 +234,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/relationships.ts

@@ -13,11 +13,12 @@ export function getRelationships(type: string, sourceModel: string, targetModel:
   // create relationship map for this type of it doesn't already exist
   if (!allRelationships.has(sourceModel)) allRelationships.set(sourceModel, new Map());
 
-  const modelRelationship = allRelationships.get(sourceModel)!;
+  const modelRelationship = allRelationships.get(sourceModel) as Map<string, Map<unknown, unknown>> | undefined;
+  if (!modelRelationship) return undefined;
 
   if (!modelRelationship.has(targetModel)) modelRelationship.set(targetModel, new Map());
 
-  const relationship = modelRelationship.get(targetModel)!;
+  const relationship = modelRelationship.get(targetModel) as Map<unknown, unknown> | undefined;
 
   // TODO: Determine whether already having id should be handled differently
   //if (relationship.has(relationshipId)) return;

package/src/setup-rest-server.ts

@@ -14,7 +14,7 @@ interface AccessInstance {
 }
 
 export default async function(route: string, accessPath: string, metaRoute: boolean): Promise<void> {
-  let accessFiles: Record<string, (request: unknown) => unknown> | null = {};
+  const accessFiles: Record<string, (request: unknown) => unknown> = {};
 
   try {
     await forEachFileImport(accessPath, (accessClass: unknown) => {
@@ -31,14 +31,14 @@ export default async function(route: string, accessPath: string, metaRoute: bool
       for (const model of models === '*' ? availableModels : models) {
         if (model === dbKey) continue;
         if (!store.data.has(model)) throw new Error(`Unable to define access for Invalid Model "${model}". Model does not exist`);
-        if (accessFiles![model]) throw new Error(`Access for model "${model}" has already been defined by another access class.`);
+        if (accessFiles[model]) throw new Error(`Access for model "${model}" has already been defined by another access class.`);
 
-        accessFiles![model] = accessInstance.access;
+        accessFiles[model] = accessInstance.access;
       }
     });
   } 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');
@@ -47,7 +47,7 @@ export default async function(route: string, accessPath: string, metaRoute: bool
   const name = route === '/' ? 'index' : (route[0] === '/' ? route.slice(1) : route);
 
   // Configure endpoints for models and views with access configuration
-  for (const [model, access] of Object.entries(accessFiles!)) {
+  for (const [model, access] of Object.entries(accessFiles)) {
     const pluralizedModel = getPluralName(model);
     const modelName = name === 'index' ? pluralizedModel : `${name}/${pluralizedModel}`;
     RestServer.instance.mountRoute(OrmRequest, { name: modelName, options: { model, access } });
@@ -55,11 +55,8 @@ export default async function(route: string, accessPath: string, metaRoute: bool
 
   // 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;
 }