pure-orm 4.0.0 → 4.0.2

package/dist/src/core.d.ts

@@ -51,7 +51,7 @@ export interface ICreateCoreOptions {
 }
 export interface ICore {
     createFromDatabase: <T extends ICollection<IModel>>(rows: any) => T;
-    createAnyFromDatabase: <T extends ICollection<IModel>>(rows: any, rootKey: string | IModel) => T;
+    createAnyFromDatabase: <T extends ICollection<IModel>>(rows: any, rootKey: string | IModelClass) => T;
     createOneFromDatabase: <T extends IModel>(rows: any) => T;
     createOneOrNoneFromDatabase: <T extends IModel>(rows: any) => T | void;
     createManyFromDatabase: <T extends ICollection<IModel>>(rows: any) => T;

package/dist/src/core.js

@@ -73,13 +73,16 @@ const createCore = ({ entities: externalEntities }) => {
         map.set(entity.Model, entity);
         return map;
     }, new Map());
-    const getEntityByModel = (model) => {
-        const entity = modelToEntityMap.get(model.constructor);
+    const getEntityByModelClass = (Model) => {
+        const entity = modelToEntityMap.get(Model);
         if (!entity) {
-            throw new Error(`Could not find entity for class ${model.constructor}`);
+            throw new Error(`Could not find entity for class ${Model}`);
         }
         return entity;
     };
+    const getEntityByModel = (model) => {
+        return getEntityByModelClass(model.constructor);
+    };
     /*
      * In:
      *  [
@@ -135,12 +138,19 @@ const createCore = ({ entities: externalEntities }) => {
                     ...nodes.slice(0, indexOfOldestParent + 1).reverse()
                 ];
                 const nodeItPointsTo = parentHeirarchy.find((parent) => {
-                    const index = Object.values(getEntityByModel(model).references).indexOf(parent.constructor);
-                    if (index === -1) {
+                    const indexes = Object.values(getEntityByModel(model).references)
+                        .map((x, i) => x === parent.constructor ? i : null)
+                        .filter((x, i) => x != null);
+                    if (!indexes.length) {
                         return false;
                     }
-                    const property = Object.keys(getEntityByModel(model).references)[index];
-                    return model[property] === parent.id;
+                    for (const index of indexes) {
+                        const property = Object.keys(getEntityByModel(model).references)[index];
+                        if (model[property] === parent.id) {
+                            return true;
+                        }
+                    }
+                    return false;
                 });
                 if (isNodeAlreadySeen) {
                     if (nodeItPointsTo && !nodePointingToIt) {
@@ -274,7 +284,7 @@ const createCore = ({ entities: externalEntities }) => {
         if (!rows || !rows.length) {
             const Collection = typeof rootKey === 'string'
                 ? getEntityByTableName(rootKey).Collection
-                : getEntityByModel(rootKey).Collection;
+                : getEntityByModelClass(rootKey).Collection;
             return new Collection({ models: [] });
         }
         return createFromDatabase(rows);