@lobb-js/core 0.24.0 → 0.25.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lobb-js/core",
   "license": "UNLICENSED",
-  "version": "0.24.0",
+  "version": "0.25.0",
   "type": "module",
   "publishConfig": {
     "access": "public"

package/src/api/collections/collectionStore.ts

@@ -861,6 +861,7 @@ export class CollectionStore {
         }
       } else if (resolved.type === "m2m") {
         const { junctionCollection, parentFKField, targetFKField } = resolved.junction;
+        const isSelfReferential = collectionName === childCollectionName;
         const parentIds = [...new Set(results.map((r) => r["id"]).filter((id) => id != null).map(String))];
 
         if (parentIds.length === 0) {
@@ -868,23 +869,28 @@ export class CollectionStore {
           continue;
         }
 
-        // Fetch junction rows to get target IDs per parent
-        const junctionRecords = await this.findAll({
+        const targetIdsByParent: Record<string, Set<string>> = {};
+        for (const parentId of parentIds) targetIdsByParent[parentId] = new Set();
+
+        const junctionFilter = isSelfReferential
+          ? { $or: [{ [parentFKField]: { $in: parentIds } }, { [targetFKField]: { $in: parentIds } }] }
+          : { [parentFKField]: { $in: parentIds } };
+
+        const junctionRows = await this.findAll({
           collectionName: junctionCollection,
-          params: { fields: `${parentFKField},${targetFKField}`, filter: { [parentFKField]: { $in: parentIds } } },
+          params: { fields: `${parentFKField},${targetFKField}`, filter: junctionFilter },
           triggeredBy: "INTERNAL",
           client,
         });
 
-        const targetIdsByParent: Record<string, string[]> = {};
-        for (const parentId of parentIds) targetIdsByParent[parentId] = [];
-        for (const jr of junctionRecords.data) {
-          const parentId = String(jr[parentFKField]);
-          const targetId = String(jr[targetFKField]);
-          if (targetIdsByParent[parentId]) targetIdsByParent[parentId].push(targetId);
+        for (const jr of junctionRows.data) {
+          const fwd = String(jr[parentFKField]);
+          const rev = String(jr[targetFKField]);
+          if (targetIdsByParent[fwd]) targetIdsByParent[fwd].add(rev);
+          if (isSelfReferential && targetIdsByParent[rev]) targetIdsByParent[rev].add(fwd);
         }
 
-        const allTargetIds = [...new Set(Object.values(targetIdsByParent).flat())];
+        const allTargetIds = [...new Set(Object.values(targetIdsByParent).flatMap((s) => [...s]))];
         const targetMap: Record<string, any> = {};
 
         if (allTargetIds.length > 0) {
@@ -904,7 +910,7 @@ export class CollectionStore {
 
         for (const result of results) {
           const parentId = String(result["id"]);
-          result[childCollectionName] = (targetIdsByParent[parentId] ?? []).map((id) => targetMap[id]).filter(Boolean);
+          result[childCollectionName] = [...(targetIdsByParent[parentId] ?? [])].map((id) => targetMap[id]).filter(Boolean);
         }
       } else {
         // Polymorphic — child records have polymorphic FK pointing to parent

package/src/config/ConfigManager.ts

@@ -387,7 +387,8 @@ export class ConfigManager {
         if ("type" in rel && rel.type === "polymorphic") return false;
         return (
           (rel as RegularRelation).from.collection === junctionName &&
-          (rel as RegularRelation).to.collection === toCollection
+          (rel as RegularRelation).to.collection === toCollection &&
+          (rel as RegularRelation).from.field !== fromRelation.from.field
         );
       });