@rebasepro/common 0.1.2 → 0.2.1

package/dist/index.umd.js

@@ -59,6 +59,10 @@
       return [];
     } else if (type === "map") {
       return {};
+    } else if (type === "vector") {
+      return null;
+    } else if (type === "binary") {
+      return null;
     } else {
       return null;
     }
@@ -1170,14 +1174,56 @@
     }
     return Object.keys(propertyCallbacks).length > 0 ? propertyCallbacks : void 0;
   };
-  function sanitizeRelation(relation, sourceCollection) {
+  function sanitizeRelation(relation, sourceCollection, resolveCollection) {
     if (!relation.target) {
       throw new Error("Relation is missing a `target` collection.");
     }
-    const targetCollection = relation.target();
+    const rawTarget = relation.target;
+    let targetCollection;
+    if (typeof rawTarget === "string") {
+      if (resolveCollection) {
+        targetCollection = resolveCollection(rawTarget);
+      }
+      if (!targetCollection) {
+        targetCollection = {
+          slug: rawTarget,
+          name: rawTarget
+        };
+      }
+    } else if (typeof rawTarget === "function") {
+      const evaluated = rawTarget();
+      if (typeof evaluated === "string") {
+        if (resolveCollection) {
+          targetCollection = resolveCollection(evaluated);
+        }
+        if (!targetCollection) {
+          targetCollection = {
+            slug: evaluated,
+            name: evaluated
+          };
+        }
+      } else {
+        targetCollection = evaluated;
+      }
+    }
+    if (!targetCollection) {
+      throw new Error("Relation is missing a valid `target` collection.");
+    }
     const newRelation = {
       ...relation
     };
+    newRelation.target = () => {
+      if (typeof rawTarget === "string") {
+        return resolveCollection && resolveCollection(rawTarget) || targetCollection;
+      } else if (typeof rawTarget === "function") {
+        const evaluated = rawTarget();
+        if (typeof evaluated === "string") {
+          return resolveCollection && resolveCollection(evaluated) || targetCollection;
+        }
+        return evaluated;
+      }
+      return targetCollection;
+    };
     if (!newRelation.relationName) {
       newRelation.relationName = utils.toSnakeCase(targetCollection.slug);
     }
@@ -1230,6 +1276,17 @@
                 break;
               }
             }
+            if (!isManyToManyInverse && targetCollection.properties) {
+              for (const [propKey, prop] of Object.entries(targetCollection.properties)) {
+                if (prop.type !== "relation") continue;
+                const relProp = prop;
+                const relName = relProp.relationName || propKey;
+                if (relName === newRelation.inverseRelationName && relProp.cardinality === "many" && (relProp.direction === "owning" || !relProp.direction)) {
+                  isManyToManyInverse = true;
+                  break;
+                }
+              }
+            }
           } catch (e) {
           }
         }
@@ -1597,6 +1654,12 @@
         return false;
       }
       this.reset();
+      collections.forEach((c) => {
+        if (c.slug) {
+          this.collectionsBySlug.set(c.slug, c);
+        }
+        this.collectionsByTableName.set(getTableName(c), c);
+      });
       const normalizedCollections = collections.map((c) => this.normalizeCollection({
         ...c
       }));
@@ -1675,7 +1738,7 @@
       if (types.getDataSourceCapabilities(result.driver).supportsRelations) {
         mergedRelations = mergedRelationsRaw.map((r) => {
           try {
-            return sanitizeRelation(r, result);
+            return sanitizeRelation(r, result, (slug) => this.get(slug));
           } catch {
             return r;
           }