pure-orm 4.0.1 → 4.0.2

package/dist/src/core.js

@@ -138,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) {

package/dist/src/core.spec.js

@@ -10,6 +10,7 @@ const entities_5 = require("../test-utils/five/entities");
 const entities_6 = require("../test-utils/six/entities");
 const entities_7 = require("../test-utils/twelve/entities");
 const entities_8 = require("../test-utils/thirteen/entities");
+const entities_9 = require("../test-utils/fourteen/entities");
 const article_1 = require("../test-utils/blog/models/article");
 const two = require('../test-utils/two/results');
 const three = require('../test-utils/three/results');
@@ -24,6 +25,7 @@ const ten = require('../test-utils/ten/results.json');
 const eleven = require('../test-utils/eleven/results.json');
 const twelve = require('../test-utils/twelve/results.json');
 const thirteen = require('../test-utils/thirteen/results.json');
+const fourteen = require('../test-utils/fourteen/results.json');
 describe('createFromDatabase', () => {
     test('multiple rows reduce to one nested object (with all one-to-one or one-to-many tables)', () => {
         const core = (0, core_1.createCore)({ entities: entities_1.entities });
@@ -575,6 +577,19 @@ describe('createFromDatabase', () => {
         expect(member === null || member === void 0 ? void 0 : member.recommendations.models[3].category.id).toEqual(4);
         expect(member === null || member === void 0 ? void 0 : member.recommendations.models[3].recommendationAudiences.models[0].audience.id).toEqual(1);
     });
+    // Issue occcurs in nestClump
+    // Problem when a table has two columns which reference the same other table
+    test('14', () => {
+        var _a;
+        const core = (0, core_1.createCore)({ entities: entities_9.entities });
+        const persons = core.createFromDatabase(fourteen);
+        expect(persons === null || persons === void 0 ? void 0 : persons.models.length).toEqual(1);
+        expect(persons.models[0].id).toEqual(67);
+        // Known issue: A reference always uses the model's name,
+        // instead of some version of the column's name
+        expect((_a = persons.models[0].customers) === null || _a === void 0 ? void 0 : _a.models.length).toEqual(1);
+        expect(persons.models[0].customers.models[0].id).toEqual(4);
+    });
 });
 describe('createOneFromDatabase', () => {
     test('reduces to one', () => {

package/dist/test-utils/fourteen/entities.d.ts

@@ -0,0 +1,6 @@
+export declare const entities: {
+    tableName: string;
+    columns: import("../../src/core").IColumn[];
+    Model: typeof import("./models/person").Person;
+    Collection: typeof import("./models/person").Persons;
+}[];

package/dist/test-utils/fourteen/entities.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.entities = void 0;
+const person_1 = require("./models/person");
+const customer_1 = require("./models/customer");
+exports.entities = [person_1.personEntity, customer_1.customerEntity];

package/dist/test-utils/fourteen/entities.ts

@@ -0,0 +1,3 @@
+import { personEntity } from './models/person';
+import { customerEntity } from './models/customer';
+export const entities = [personEntity, customerEntity];

package/dist/test-utils/fourteen/models/customer.d.ts

@@ -0,0 +1,19 @@
+import { IModel, ICollection, IColumns } from '../../../src/index';
+export declare const tableName: string;
+export declare const columns: IColumns;
+export declare class Customer implements IModel {
+    id: number;
+    lockedToAffiliateId: number;
+    lockedToSalespersonId: number;
+    constructor(props: any);
+}
+export declare class Customers implements ICollection<Customer> {
+    models: Array<Customer>;
+    constructor({ models }: any);
+}
+export declare const customerEntity: {
+    tableName: string;
+    columns: import("../../../src/core").IColumn[];
+    Model: typeof Customer;
+    Collection: typeof Customers;
+};

package/dist/test-utils/fourteen/models/customer.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.customerEntity = exports.Customers = exports.Customer = exports.columns = exports.tableName = void 0;
+const person_1 = require("./person");
+exports.tableName = 'customer';
+exports.columns = [
+    'id',
+    { column: 'locked_to_affiliate_id', references: person_1.Person },
+    { column: 'locked_to_salesperson_id', references: person_1.Person }
+];
+class Customer {
+    constructor(props) {
+        this.id = props.id;
+        this.lockedToAffiliateId = props.lockedToAffiliateId;
+        this.lockedToSalespersonId = props.lockedToSalespersonId;
+    }
+}
+exports.Customer = Customer;
+class Customers {
+    constructor({ models }) {
+        this.models = models;
+    }
+}
+exports.Customers = Customers;
+exports.customerEntity = {
+    tableName: exports.tableName,
+    columns: exports.columns,
+    Model: Customer,
+    Collection: Customers
+};

package/dist/test-utils/fourteen/models/customer.ts

@@ -0,0 +1,36 @@
+import { IModel, ICollection, IColumns } from '../../../src/index';
+import { Person } from './person';
+
+export const tableName: string = 'customer';
+
+export const columns: IColumns = [
+  'id',
+  { column: 'locked_to_affiliate_id', references: Person },
+  { column: 'locked_to_salesperson_id', references: Person }
+];
+
+export class Customer implements IModel {
+  id: number;
+  lockedToAffiliateId: number;
+  lockedToSalespersonId: number;
+
+  constructor(props: any) {
+    this.id = props.id;
+    this.lockedToAffiliateId = props.lockedToAffiliateId;
+    this.lockedToSalespersonId = props.lockedToSalespersonId;
+  }
+}
+
+export class Customers implements ICollection<Customer> {
+  models: Array<Customer>;
+  constructor({ models }: any) {
+    this.models = models;
+  }
+}
+
+export const customerEntity = {
+  tableName,
+  columns,
+  Model: Customer,
+  Collection: Customers
+};

package/dist/test-utils/fourteen/models/person.d.ts

@@ -0,0 +1,17 @@
+import { IModel, ICollection, IColumns } from '../../../src/index';
+export declare const tableName: string;
+export declare const columns: IColumns;
+export declare class Person implements IModel {
+    id: number;
+    constructor(props: any);
+}
+export declare class Persons implements ICollection<Person> {
+    models: Array<Person>;
+    constructor({ models }: any);
+}
+export declare const personEntity: {
+    tableName: string;
+    columns: import("../../../src/core").IColumn[];
+    Model: typeof Person;
+    Collection: typeof Persons;
+};

package/dist/test-utils/fourteen/models/person.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.personEntity = exports.Persons = exports.Person = exports.columns = exports.tableName = void 0;
+exports.tableName = 'person';
+exports.columns = ['id'];
+class Person {
+    constructor(props) {
+        this.id = props.id;
+    }
+}
+exports.Person = Person;
+class Persons {
+    constructor({ models }) {
+        this.models = models;
+    }
+}
+exports.Persons = Persons;
+exports.personEntity = {
+    tableName: exports.tableName,
+    columns: exports.columns,
+    Model: Person,
+    Collection: Persons
+};

package/dist/test-utils/fourteen/models/person.ts

@@ -0,0 +1,27 @@
+import { IModel, ICollection, IColumns } from '../../../src/index';
+
+export const tableName: string = 'person';
+
+export const columns: IColumns = ['id'];
+
+export class Person implements IModel {
+  id: number;
+
+  constructor(props: any) {
+    this.id = props.id;
+  }
+}
+
+export class Persons implements ICollection<Person> {
+  models: Array<Person>;
+  constructor({ models }: any) {
+    this.models = models;
+  }
+}
+
+export const personEntity = {
+  tableName,
+  columns,
+  Model: Person,
+  Collection: Persons
+};

package/dist/test-utils/fourteen/results.json

@@ -0,0 +1,8 @@
+[
+  {
+    "person#id": 67,
+    "customer#id": 4,
+    "customer#locked_to_affiliate_id": null,
+    "customer#locked_to_salesperson_id": 67
+  }
+]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pure-orm",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
   "engines": {

package/src/core.spec.ts

@@ -8,6 +8,7 @@ import { entities as fiveEntities } from '../test-utils/five/entities';
 import { entities as sixEntities } from '../test-utils/six/entities';
 import { entities as twelveEntities } from '../test-utils/twelve/entities';
 import { entities as thirteenEntities } from '../test-utils/thirteen/entities';
+import { entities as fourteenEntities } from '../test-utils/fourteen/entities';
 import { Articles } from '../test-utils/blog/models/article';
 const two = require('../test-utils/two/results');
 const three = require('../test-utils/three/results');
@@ -22,6 +23,7 @@ const ten = require('../test-utils/ten/results.json');
 const eleven = require('../test-utils/eleven/results.json');
 const twelve = require('../test-utils/twelve/results.json');
 const thirteen = require('../test-utils/thirteen/results.json');
+const fourteen = require('../test-utils/fourteen/results.json');
 
 describe('createFromDatabase', () => {
   test('multiple rows reduce to one nested object (with all one-to-one or one-to-many tables)', () => {
@@ -1066,6 +1068,19 @@ describe('createFromDatabase', () => {
         .audience.id
     ).toEqual(1);
   });
+
+  // Issue occcurs in nestClump
+  // Problem when a table has two columns which reference the same other table
+  test('14', () => {
+    const core = createCore({ entities: fourteenEntities });
+    const persons = core.createFromDatabase(fourteen);
+    expect(persons?.models.length).toEqual(1);
+    expect(persons.models[0].id).toEqual(67);
+    // Known issue: A reference always uses the model's name,
+    // instead of some version of the column's name
+    expect(persons.models[0].customers?.models.length).toEqual(1);
+    expect(persons.models[0].customers.models[0].id).toEqual(4);
+  });
 });
 
 describe('createOneFromDatabase', () => {

package/src/core.ts

@@ -292,16 +292,23 @@ export const createCore = ({
           ...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: IModelClass, i: number) =>
+              x === parent.constructor ? i : null
+            )
+            .filter((x: number | null, i) => x != null) as Array<number>;
+          if (!indexes.length) {
             return false;
           }
-          const property = Object.keys(getEntityByModel(model).references)[
-            index
-          ];
-          return model[property as keyof typeof model] === 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) {

package/test-utils/fourteen/entities.ts

@@ -0,0 +1,3 @@
+import { personEntity } from './models/person';
+import { customerEntity } from './models/customer';
+export const entities = [personEntity, customerEntity];

package/test-utils/fourteen/models/customer.ts

@@ -0,0 +1,36 @@
+import { IModel, ICollection, IColumns } from '../../../src/index';
+import { Person } from './person';
+
+export const tableName: string = 'customer';
+
+export const columns: IColumns = [
+  'id',
+  { column: 'locked_to_affiliate_id', references: Person },
+  { column: 'locked_to_salesperson_id', references: Person }
+];
+
+export class Customer implements IModel {
+  id: number;
+  lockedToAffiliateId: number;
+  lockedToSalespersonId: number;
+
+  constructor(props: any) {
+    this.id = props.id;
+    this.lockedToAffiliateId = props.lockedToAffiliateId;
+    this.lockedToSalespersonId = props.lockedToSalespersonId;
+  }
+}
+
+export class Customers implements ICollection<Customer> {
+  models: Array<Customer>;
+  constructor({ models }: any) {
+    this.models = models;
+  }
+}
+
+export const customerEntity = {
+  tableName,
+  columns,
+  Model: Customer,
+  Collection: Customers
+};

package/test-utils/fourteen/models/person.ts

@@ -0,0 +1,27 @@
+import { IModel, ICollection, IColumns } from '../../../src/index';
+
+export const tableName: string = 'person';
+
+export const columns: IColumns = ['id'];
+
+export class Person implements IModel {
+  id: number;
+
+  constructor(props: any) {
+    this.id = props.id;
+  }
+}
+
+export class Persons implements ICollection<Person> {
+  models: Array<Person>;
+  constructor({ models }: any) {
+    this.models = models;
+  }
+}
+
+export const personEntity = {
+  tableName,
+  columns,
+  Model: Person,
+  Collection: Persons
+};

package/test-utils/fourteen/results.json

@@ -0,0 +1,8 @@
+[
+  {
+    "person#id": 67,
+    "customer#id": 4,
+    "customer#locked_to_affiliate_id": null,
+    "customer#locked_to_salesperson_id": 67
+  }
+]