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

package/src/store.ts

@@ -30,6 +30,10 @@ interface StoreRecord {
   [key: string]: unknown;
 }
 
+function isStoreRecord(value: unknown): value is StoreRecord {
+  return typeof value === 'object' && value !== null && '__data' in value;
+}
+
 export default class Store {
   static instance: Store | undefined;
 
@@ -103,7 +107,7 @@ export default class Store {
       if (!conditions || Object.keys(conditions).length === 0) return records;
 
       return records.filter((record: unknown) =>
-        Object.entries(conditions).every(([key, value]) => (record as StoreRecord).__data[key] === value)
+        Object.entries(conditions).every(([key, value]) => isStoreRecord(record) && record.__data[key] === value)
       );
     }
 
@@ -127,7 +131,7 @@ export default class Store {
     if (!conditions || Object.keys(conditions).length === 0) return records;
 
     return records.filter((record: unknown) =>
-      Object.entries(conditions).every(([key, value]) => (record as StoreRecord).__data[key] === value)
+      Object.entries(conditions).every(([key, value]) => isStoreRecord(record) && record.__data[key] === value)
     );
   }
 
@@ -149,7 +153,7 @@ export default class Store {
     if (Object.keys(conditions).length === 0) return records;
 
     return records.filter((record: unknown) =>
-      Object.entries(conditions).every(([key, value]) => (record as StoreRecord).__data[key] === value)
+      Object.entries(conditions).every(([key, value]) => isStoreRecord(record) && record.__data[key] === value)
     );
   }
 
@@ -185,12 +189,13 @@ export default class Store {
       return;
     }
 
-    const record = modelStore.get(id as string | number) as StoreRecord | undefined;
-
-    if (!record) {
+    if (typeof id !== 'string' && typeof id !== 'number') return;
+    const raw = modelStore.get(id);
+    if (!raw || !isStoreRecord(raw)) {
       console.warn(`[Store] Cannot unload record: ${model}:${id} not found in store`);
       return;
     }
+    const record = raw;
 
     const { toUnload, visited } = options.includeChildren
       ? this._buildUnloadQueue(record, options)
@@ -224,7 +229,10 @@ export default class Store {
       }
     }
 
-    for (const relationshipType of TYPES) (relationships.get(relationshipType) as Map<string, unknown>).delete(model);
+    for (const relationshipType of TYPES) {
+      const reg = relationships.get(relationshipType);
+      if (reg instanceof Map) reg.delete(model);
+    }
   }
 
   private _removeFromHasManyArrays(modelName: string, recordId: unknown, visited: Set<string>): void {
@@ -240,7 +248,7 @@ export default class Store {
         // Don't modify arrays of records being deleted
         if (visited.has(sourceKey)) continue;
 
-        const index = hasManyArray.findIndex(r => r && (r as StoreRecord).id === recordId);
+        const index = hasManyArray.findIndex(r => r && isStoreRecord(r) && r.id === recordId);
         if (index !== -1) hasManyArray.splice(index, 1);
       }
     }
@@ -254,17 +262,19 @@ export default class Store {
       if (!targetModelMap) continue;
 
       for (const [sourceRecordId, belongsToRecord] of targetModelMap) {
-        if (belongsToRecord && (belongsToRecord as StoreRecord).id === recordId) {
+        if (belongsToRecord && isStoreRecord(belongsToRecord) && belongsToRecord.id === recordId) {
           const sourceKey = `${sourceModel}:${sourceRecordId}`;
 
           if (visited.has(sourceKey)) continue;
           targetModelMap.set(sourceRecordId, null);
 
-          const sourceRecord = this.get(sourceModel, sourceRecordId as string | number) as StoreRecord | undefined;
-          if (sourceRecord && sourceRecord.__relationships) {
-            for (const [key, value] of Object.entries(sourceRecord.__relationships)) {
-              if (value && (value as StoreRecord).id === recordId) {
-                sourceRecord.__relationships[key] = null;
+          if (typeof sourceRecordId !== 'string' && typeof sourceRecordId !== 'number') continue;
+          const sourceRaw = this.get(sourceModel, sourceRecordId);
+          if (!sourceRaw || !isStoreRecord(sourceRaw)) continue;
+          if (sourceRaw.__relationships) {
+            for (const [key, value] of Object.entries(sourceRaw.__relationships)) {
+              if (value && isStoreRecord(value) && value.id === recordId) {
+                sourceRaw.__relationships[key] = null;
               }
             }
           }
@@ -301,13 +311,13 @@ export default class Store {
       // hasMany children - always include
       if (Array.isArray(value)) {
         for (const childRecord of value) {
-          if (childRecord) children.push({ childRecord: childRecord as StoreRecord, relationshipKey: key, type: 'hasMany' });
+          if (childRecord && isStoreRecord(childRecord)) children.push({ childRecord, relationshipKey: key, type: 'hasMany' });
         }
-      } else if (value && !this._isBidirectionalRelationship(
+      } else if (value && isStoreRecord(value) && value.__model && !this._isBidirectionalRelationship(
         record.__model.__name,
-        (value as StoreRecord).__model.__name
+        value.__model.__name
       )) {
-        children.push({ childRecord: value as StoreRecord, relationshipKey: key, type: 'belongsTo' });
+        children.push({ childRecord: value, relationshipKey: key, type: 'belongsTo' });
       }
     }
 
@@ -332,7 +342,8 @@ export default class Store {
     }];
 
     while (queue.length > 0) {
-      const item = queue.shift()!;
+      const item = queue.shift();
+      if (!item) break;
       const key = `${item.modelName}:${item.recordId}`;
 
       if (visited.has(key)) continue;

package/src/utils.ts

@@ -1,14 +1,20 @@
 import { pluralize as basePluralize } from '@stonyx/utils/string';
+import type { OrmRecord } from './types/orm-types.js';
 
 export function isDbError(error: unknown): error is { code: string; message: string } {
   return typeof error === 'object' && error !== null && 'code' in error && typeof (error as Record<string, unknown>).code === 'string' && 'message' in error && typeof (error as Record<string, unknown>).message === 'string';
 }
 
+export function isOrmRecord(value: unknown): value is OrmRecord {
+  return typeof value === 'object' && value !== null && '__data' in value && '__relationships' in value;
+}
+
 // Wrapper to handle dasherized model names (e.g., "access-link" → "access-links")
 export function pluralize(word: string): string {
   if (word.includes('-')) {
     const parts = word.split('-');
-    const pluralizedLast = basePluralize(parts.pop()!);
+    const last = parts.pop() as string;
+    const pluralizedLast = basePluralize(last);
     return [...parts, pluralizedLast].join('-');
   }
 

package/src/view-resolver.ts

@@ -137,7 +137,8 @@ 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: unknown[] = [];