pure-orm 4.0.0 → 4.0.2

package/dist/src/driver-integrations/index.d.ts

@@ -5,6 +5,7 @@ export interface ICreateForDriverOptions {
     logError?: (err: Error) => never;
 }
 export interface ICoreIntegratedDriver extends ICore {
+    db: any;
     one: <T extends IModel>(query: string, values?: object, errorHandler?: (err: Error) => never) => T;
     oneOrNone: <T extends IModel>(query: string, values?: object, errorHandler?: (err: Error) => never) => T | void;
     many: <T extends ICollection<IModel>>(query: string, values?: object, errorHandler?: (err: Error) => never) => T;

package/dist/src/orm.d.ts

@@ -16,5 +16,26 @@ export interface IPureORM extends ICoreIntegratedDriver {
     }) => T;
     delete: <T extends IModel>(model: T) => void;
     deleteMatching: <T extends IModel>(model: T) => void;
+    getSqlInsertParts: (model: IModel) => {
+        columns: string;
+        values: Array<string>;
+        valuesVar: Array<string>;
+    };
+    getSqlUpdateParts: (model: IModel, on?: string) => {
+        clause: string;
+        idVar: string;
+        values: Array<string>;
+    };
+    getMatchingParts: (model: IModel) => {
+        whereClause: string;
+        values: Array<string>;
+    };
+    getMatchingPartsObject: (model: IModel) => {
+        whereClause: string;
+        values: Array<string>;
+    };
+    getNewWith: (model: IModel, sqlColumns: any, values: any) => IModel;
+    getValueBySqlColumn: (model: IModel, sqlColumn: string) => string;
+    getSqlColumnForPropertyName: (model: IModel, propertyName: string) => string;
 }
 export declare const create: ({ entities: externalEntities, db, logError }: ICreateOptions) => IPureORM;

package/dist/src/orm.js

@@ -91,6 +91,9 @@ const create = ({ entities: externalEntities, db, logError }) => {
     const getValueBySqlColumn = (model, sqlColumn) => {
         return model[orm.getEntityByModel(model).propertyNames[orm.getEntityByModel(model).columnNames.indexOf(sqlColumn)]];
     };
+    const getSqlColumnForPropertyName = (model, propertyName) => {
+        return orm.getEntityByModel(model).columnNames[orm.getEntityByModel(model).propertyNames.indexOf(propertyName)];
+    };
     /* ------------------------------------------------------------------------*/
     /* Built-in basic CRUD functions ------------------------------------------*/
     /* ------------------------------------------------------------------------*/
@@ -110,7 +113,7 @@ const create = ({ entities: externalEntities, db, logError }) => {
         const query = `
       UPDATE "${orm.getEntityByModel(model).tableName}"
       SET ${clause}
-      WHERE "${orm.getEntityByModel(model).tableName}".${on} = ${idVar}
+      WHERE "${orm.getEntityByModel(model).tableName}".${getSqlColumnForPropertyName(model, on)} = ${idVar}
       RETURNING ${orm.getEntityByModel(model).selectColumnsClause};
     `;
         return orm.one(query, values);
@@ -184,7 +187,8 @@ const create = ({ entities: externalEntities, db, logError }) => {
         getMatchingParts,
         getMatchingPartsObject,
         getNewWith,
-        getValueBySqlColumn
+        getValueBySqlColumn,
+        getSqlColumnForPropertyName
     });
 };
 exports.create = create;

package/dist/src/orm.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/orm.spec.js

@@ -0,0 +1,102 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable max-len */
+const index_1 = require("./index");
+const entities_1 = require("../test-utils/order/entities");
+test('getSqlInsertParts', () => {
+    const orm = (0, index_1.create)({
+        entities: entities_1.entities,
+        db: { $config: { pgp: true } }
+    });
+    const order = new entities_1.entities[0].Model({
+        id: 1,
+        email: 'test@test.com',
+        subtotalPrice: 100,
+        utmSourceId: 10
+    });
+    expect(orm.getSqlInsertParts(order)).toEqual({
+        columns: '"id", "email", "subtotal_price", "utm_source_id"',
+        values: [1, 'test@test.com', 100, 10],
+        valuesVar: ['$1', '$2', '$3', '$4']
+    });
+});
+test('getSqlUpdateParts', () => {
+    const orm = (0, index_1.create)({
+        entities: entities_1.entities,
+        db: { $config: { pgp: true } }
+    });
+    const order = new entities_1.entities[0].Model({
+        id: 1,
+        email: 'test@test.com',
+        subtotalPrice: 100,
+        utmSourceId: 10
+    });
+    expect(orm.getSqlUpdateParts(order)).toEqual({
+        clause: '"id" = $1, "email" = $2, "subtotal_price" = $3, "utm_source_id" = $4',
+        idVar: '$5',
+        values: [1, 'test@test.com', 100, 10, 1]
+    });
+});
+test('getMatchingParts', () => {
+    const orm = (0, index_1.create)({
+        entities: entities_1.entities,
+        db: { $config: { pgp: true } }
+    });
+    const order = new entities_1.entities[0].Model({
+        id: 1,
+        email: 'test@test.com',
+        subtotalPrice: 100,
+        utmSourceId: 10
+    });
+    expect(orm.getMatchingParts(order)).toEqual({
+        values: [1, 'test@test.com', 100, 10],
+        whereClause: '"order"."id" = $1 AND "order"."email" = $2 AND "order"."subtotal_price" = $3 AND "order"."utm_source_id" = $4'
+    });
+});
+test('getMatchingPartsObject', () => {
+    const orm = (0, index_1.create)({
+        entities: entities_1.entities,
+        db: { $config: { pgp: true } }
+    });
+    const order = new entities_1.entities[0].Model({
+        id: 1,
+        email: 'test@test.com',
+        subtotalPrice: 100,
+        utmSourceId: 10
+    });
+    expect(orm.getMatchingPartsObject(order)).toEqual({
+        values: {
+            1: 1,
+            2: 'test@test.com',
+            3: 100,
+            4: 10
+        },
+        whereClause: '"order"."id" = $(1) AND "order"."email" = $(2) AND "order"."subtotal_price" = $(3) AND "order"."utm_source_id" = $(4)'
+    });
+});
+test('getValueBySqlColumn', () => {
+    const orm = (0, index_1.create)({
+        entities: entities_1.entities,
+        db: { $config: { pgp: true } }
+    });
+    const order = new entities_1.entities[0].Model({
+        id: 1,
+        email: 'test@test.com',
+        subtotalPrice: 100,
+        utmSourceId: 10
+    });
+    expect(orm.getValueBySqlColumn(order, 'id')).toEqual(1);
+    expect(orm.getValueBySqlColumn(order, 'email')).toEqual('test@test.com');
+    expect(orm.getValueBySqlColumn(order, 'subtotal_price')).toEqual(100);
+    expect(orm.getValueBySqlColumn(order, 'utm_source_id')).toEqual(10);
+});
+test('getSqlColumnForPropertyName', () => {
+    const orm = (0, index_1.create)({
+        entities: entities_1.entities,
+        db: { $config: { pgp: true } }
+    });
+    const order = new entities_1.entities[0].Model({ id: 1 });
+    expect(orm.getSqlColumnForPropertyName(order, 'id')).toEqual('id');
+    expect(orm.getSqlColumnForPropertyName(order, 'utmSourceId')).toEqual('utm_source_id');
+    expect(orm.getSqlColumnForPropertyName(order, 'browserIP')).toEqual('browser_ip');
+});

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/dist/test-utils/order/entities.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.entities = void 0;
-const utm_source_1 = require("./models/utm-source");
 const order_1 = require("./models/order");
+const utm_source_1 = require("./models/utm-source");
 const line_item_1 = require("./models/line-item");
 const product_variant_1 = require("./models/product-variant");
 const product_1 = require("./models/product");
 exports.entities = [
-    utm_source_1.utmSourceEntity,
     order_1.orderEntity,
+    utm_source_1.utmSourceEntity,
     line_item_1.lineItemEntity,
     product_variant_1.productVariantEntity,
     product_1.productEntity

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

@@ -1,12 +1,12 @@
-import { utmSourceEntity } from './models/utm-source';
 import { orderEntity } from './models/order';
+import { utmSourceEntity } from './models/utm-source';
 import { lineItemEntity } from './models/line-item';
 import { productVariantEntity } from './models/product-variant';
 import { productEntity } from './models/product';
 
 export const entities = [
-  utmSourceEntity,
   orderEntity,
+  utmSourceEntity,
   lineItemEntity,
   productVariantEntity,
   productEntity

package/dist/test-utils/order/models/order.js

@@ -6,7 +6,7 @@ exports.tableName = 'order';
 exports.columns = [
     'id',
     'email',
-    'browser_ip',
+    { column: 'browser_ip', property: 'browserIP' },
     'browser_user_agent',
     'kujo_imported_date',
     'created_date',

package/dist/test-utils/order/models/order.ts

@@ -6,7 +6,7 @@ export const tableName: string = 'order';
 export const columns: IColumns = [
   'id',
   'email',
-  'browser_ip',
+  { column: 'browser_ip', property: 'browserIP' },
   'browser_user_agent',
   'kujo_imported_date',
   'created_date',

package/package.json

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