pure-orm 4.0.0-5 → 4.0.0-8

package/dist/src/{factory.spec.js → core.spec.js}

@@ -1,16 +1,15 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const orm_1 = __importDefault(require("../test-utils/order/orm"));
-const orm_2 = __importDefault(require("../test-utils/blog/orm"));
-const orm_3 = __importDefault(require("../test-utils/order-more/orm"));
-const orm_4 = __importDefault(require("../test-utils/nine/orm"));
-const orm_5 = __importDefault(require("../test-utils/five/orm"));
-const orm_6 = __importDefault(require("../test-utils/six/orm"));
-const orm_7 = __importDefault(require("../test-utils/twelve/orm"));
-const orm_8 = __importDefault(require("../test-utils/thirteen/orm"));
+/* eslint-disable max-len */
+const core_1 = require("./core");
+const entities_1 = require("../test-utils/order/entities");
+const entities_2 = require("../test-utils/blog/entities");
+const entities_3 = require("../test-utils/order-more/entities");
+const entities_4 = require("../test-utils/nine/entities");
+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 article_1 = require("../test-utils/blog/models/article");
 const two = require('../test-utils/two/results');
 const three = require('../test-utils/three/results');
@@ -25,8 +24,9 @@ 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');
-test('Bo#parseFromDatabase where multiple rows reduce to one nested object (with all one-to-one or one-to-many tables)', () => {
-    const order = orm_1.default.createOneFromDatabase(one);
+test('createOneFromDatabase where 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 });
+    const order = core.createOneFromDatabase(one);
     expect(Array.isArray(order)).toBe(false);
     expect(order === null || order === void 0 ? void 0 : order.id).toEqual(3866);
     expect(order === null || order === void 0 ? void 0 : order.utmSource.id).toEqual(6);
@@ -50,8 +50,9 @@ test('Bo#parseFromDatabase where multiple rows reduce to one nested object (with
     expect(order.lineItems.models[5].productVariant.id).toEqual(308);
     expect(order.lineItems.models[5].productVariant.product.id).toEqual(3);
 });
-test('Bo#parseFromDatabase where multiple rows reduce to one nested object (with many-to-many tables)', () => {
-    const article = orm_2.default.createOneFromDatabase(two);
+test('createOneFromDatabase where multiple rows reduce to one nested object (with many-to-many tables)', () => {
+    const core = (0, core_1.createCore)({ entities: entities_2.entities });
+    const article = core.createOneFromDatabase(two);
     expect(Array.isArray(article)).toBe(false);
     expect(article.id).toEqual(14);
     expect(article.person.id).toEqual(8);
@@ -77,8 +78,9 @@ test('Bo#parseFromDatabase where multiple rows reduce to one nested object (with
     expect(article.articleTags.models[9].id).toEqual(45);
     expect(article.articleTags.models[9].tag.id).toEqual(16);
 });
-test('Bo#parseFromDatabase where multiple rows reduce to many rows with nested objects (with many-to-many tables)', () => {
-    const articles = orm_2.default.createFromDatabase(three);
+test('createFromDatabase where multiple rows reduce to many rows with nested objects (with many-to-many tables)', () => {
+    const core = (0, core_1.createCore)({ entities: entities_2.entities });
+    const articles = core.createFromDatabase(three);
     expect(Array.isArray(articles.models)).toBe(true);
     expect(articles instanceof article_1.Articles).toBe(true);
     expect(articles.models.length).toEqual(2);
@@ -124,8 +126,9 @@ test('Bo#parseFromDatabase where multiple rows reduce to many rows with nested o
 // productVariantImages append to it, instead of each productVariantImage
 // living on its own productVariant (which would keep overwriting itself
 // on the actualProductVariant node).
-test('Bo#parseFromDatabase where node is already seen', () => {
-    const inventoryLevels = orm_3.default.createFromDatabase(four);
+test('createFromDatabase where node is already seen', () => {
+    const core = (0, core_1.createCore)({ entities: entities_3.entities });
+    const inventoryLevels = core.createFromDatabase(four);
     expect(inventoryLevels).toBeDefined();
     const first = inventoryLevels === null || inventoryLevels === void 0 ? void 0 : inventoryLevels.models[0];
     expect(first === null || first === void 0 ? void 0 : first.id).toEqual(15);
@@ -185,8 +188,9 @@ test('Bo#parseFromDatabase where node is already seen', () => {
 // the two relevant line items of the one relevant order. This test should
 // be doing that, but since code coverage all-around isn't great and I already
 // had this fuller json dump from production, I just used it all - YOLO.
-test('Bo#parseFromDatabase where a deeply nested models property was misbehaving', () => {
-    const orders = orm_5.default.createFromDatabase(five);
+test('createFromDatabase where a deeply nested models property was misbehaving', () => {
+    const core = (0, core_1.createCore)({ entities: entities_5.entities });
+    const orders = core.createFromDatabase(five);
     // The assertion that failed when the bug was present
     expect(orders === null || orders === void 0 ? void 0 : orders.models[0].lineItems.models[1].parcelLineItems.models[0].parcel.parcelEvents.models.length).toEqual(2);
     // Lots of other assertions that are unrelated and shouldn't be here except
@@ -227,8 +231,9 @@ test('Bo#parseFromDatabase where a deeply nested models property was misbehaving
 //    [MISSING ORDER]
 // Issue occcurs in nestClump
 // Problem only surfaced when custom was included
-test('Bo#parseOneFromDatabase where a deeply nested models property was misbehaving', () => {
-    const parcel = orm_6.default.createOneFromDatabase(six);
+test('createOneFromDatabase where a deeply nested models property was misbehaving', () => {
+    const core = (0, core_1.createCore)({ entities: entities_6.entities });
+    const parcel = core.createOneFromDatabase(six);
     // The assertion that failed when the bug was present
     expect(parcel.parcelLineItems.models[1].lineItem.order).toBeDefined();
     // Lots of other assertions that are unrelated and shouldn't be here except
@@ -260,8 +265,9 @@ test('Bo#parseOneFromDatabase where a deeply nested models property was misbehav
 //   ProductVariant(2)
 //    Color
 // Issue occcurs in nestClump
-test('Bo#parseOneFromDatabase where a deeply nested models property was attaching to wrong parent', () => {
-    const inventoryLevel = orm_3.default.createOneFromDatabase(seven);
+test('createOneFromDatabase where a deeply nested models property was attaching to wrong parent', () => {
+    const core = (0, core_1.createCore)({ entities: entities_3.entities });
+    const inventoryLevel = core.createOneFromDatabase(seven);
     // The assertion that failed when the bug was present
     expect(inventoryLevel.actualProductVariant.productVariants.models[1]).toBeDefined();
     // Lots of other assertions that are unrelated and shouldn't be here except
@@ -298,8 +304,9 @@ test('Bo#parseOneFromDatabase where a deeply nested models property was attachin
 //    ProductVariant(2)
 //     Product
 // Issue occcurs in nestClump
-test('Bo#parseOneFromDatabase where a deeply nested models property was attaching to wrong parent 2', () => {
-    const shipments = orm_3.default.createFromDatabase(eight);
+test('createFromDatabase where a deeply nested models property was attaching to wrong parent 2', () => {
+    const core = (0, core_1.createCore)({ entities: entities_3.entities });
+    const shipments = core.createFromDatabase(eight);
     // The assertion that failed when the bug was present
     expect(shipments === null || shipments === void 0 ? void 0 : shipments.models[0].shipmentActualProductVariants.models[1].actualProductVariant.productVariants).toBeDefined();
     // IN ADDITION TO ABOVE ASSERTION and helpful test description of what is
@@ -354,11 +361,12 @@ test('Bo#parseOneFromDatabase where a deeply nested models property was attachin
 });
 // Issue occcurs in nestClump
 // Problem is with only top level nodes
-test('Bo#parseFromDatabase with just top level nodes', () => {
+test('createFromDatabase with just top level nodes', () => {
+    const core = (0, core_1.createCore)({ entities: entities_4.entities });
     let featureSwitches;
     try {
         // This failed when the bug was present
-        featureSwitches = orm_4.default.createFromDatabase(nine);
+        featureSwitches = core.createFromDatabase(nine);
     }
     catch (e) {
         expect(e).not.toBeDefined();
@@ -374,11 +382,12 @@ test('Bo#parseFromDatabase with just top level nodes', () => {
 // Problem is when oldest parent is an empty join record and is not included
 // which results in the oldest parent search returning -1 and parent heirarchy
 // is thus messed up.
-test('Bo#parseFromDatabase 10', () => {
+test('createFromDatabase 10', () => {
+    const core = (0, core_1.createCore)({ entities: entities_3.entities });
     let orders;
     try {
         // This failed when the bug was present
-        orders = orm_3.default.createFromDatabase(ten);
+        orders = core.createFromDatabase(ten);
     }
     catch (e) {
         expect(e).not.toBeDefined();
@@ -495,11 +504,12 @@ test('Bo#parseFromDatabase 10', () => {
 });
 // Issue occcurs in nestClump
 // Problem from early returning not logging bo so parent hierarcy was missing it
-test('Bo#parseFromDatabase 11', () => {
+test('createFromDatabase 11', () => {
+    const core = (0, core_1.createCore)({ entities: entities_3.entities });
     let orders;
     try {
         // This failed when the bug was present
-        orders = orm_3.default.createFromDatabase(eleven);
+        orders = core.createFromDatabase(eleven);
     }
     catch (e) {
         expect(e).not.toBeDefined();
@@ -508,11 +518,12 @@ test('Bo#parseFromDatabase 11', () => {
 });
 // Issue occcurs in nestClump
 // Problem when a table references another model twice (two columns)
-test('Bo#parseFromDatabase 12', () => {
+test('createFromDatabase 12', () => {
+    const core = (0, core_1.createCore)({ entities: entities_7.entities });
     let prompt;
     try {
         // This failed when the bug was present
-        prompt = orm_7.default.createFromDatabase(twelve);
+        prompt = core.createFromDatabase(twelve);
     }
     catch (e) {
         expect(e).not.toBeDefined();
@@ -535,8 +546,9 @@ test('Bo#parseFromDatabase 12', () => {
 //  Recommendations[4]
 //   Brand
 //   Passion
-test('Bo#parseFromDatabase 13', () => {
-    const members = orm_8.default.createFromDatabase(thirteen);
+test('createFromDatabase 13', () => {
+    const core = (0, core_1.createCore)({ entities: entities_8.entities });
+    const members = core.createFromDatabase(thirteen);
     const member = members === null || members === void 0 ? void 0 : members.models[0];
     expect(member === null || member === void 0 ? void 0 : member.recommendations.models.length).toEqual(4);
     expect(member === null || member === void 0 ? void 0 : member.recommendations.models[0].brand.id).toEqual(2);
@@ -557,10 +569,11 @@ test('Bo#parseFromDatabase 13', () => {
     expect(member === null || member === void 0 ? void 0 : member.recommendations.models[3].recommendationAudiences.models[0].audience.id).toEqual(1);
 });
 test('orm.tables', () => {
-    expect(Object.keys(orm_1.default.tables).length).toEqual(5);
-    expect(orm_1.default.tables.utmSource.columns).toEqual('"utm_source".id as "utm_source#id", "utm_source".value as "utm_source#value", "utm_source".label as "utm_source#label", "utm_source".internal as "utm_source#internal"');
-    expect(orm_1.default.tables.order.columns).toEqual('"order".id as "order#id", "order".email as "order#email", "order".browser_ip as "order#browser_ip", "order".browser_user_agent as "order#browser_user_agent", "order".kujo_imported_date as "order#kujo_imported_date", "order".created_date as "order#created_date", "order".cancel_reason as "order#cancel_reason", "order".cancelled_date as "order#cancelled_date", "order".closed_date as "order#closed_date", "order".processed_date as "order#processed_date", "order".updated_date as "order#updated_date", "order".note as "order#note", "order".subtotal_price as "order#subtotal_price", "order".taxes_included as "order#taxes_included", "order".total_discounts as "order#total_discounts", "order".total_price as "order#total_price", "order".total_tax as "order#total_tax", "order".total_weight as "order#total_weight", "order".order_status_url as "order#order_status_url", "order".utm_source_id as "order#utm_source_id", "order".utm_medium_id as "order#utm_medium_id", "order".utm_campaign as "order#utm_campaign", "order".utm_content as "order#utm_content", "order".utm_term as "order#utm_term"');
-    expect(orm_1.default.tables.lineItem.columns).toEqual('"line_item".id as "line_item#id", "line_item".product_variant_id as "line_item#product_variant_id", "line_item".order_id as "line_item#order_id", "line_item".fulfillment_status_id as "line_item#fulfillment_status_id", "line_item".fulfillable_quantity as "line_item#fulfillable_quantity", "line_item".fulfillment_service as "line_item#fulfillment_service", "line_item".grams as "line_item#grams", "line_item".price as "line_item#price", "line_item".quantity as "line_item#quantity", "line_item".requires_shipping as "line_item#requires_shipping", "line_item".taxable as "line_item#taxable", "line_item".total_discount as "line_item#total_discount"');
-    expect(orm_1.default.tables.productVariant.columns).toEqual('"product_variant".id as "product_variant#id", "product_variant".product_id as "product_variant#product_id", "product_variant".actual_product_variant_id as "product_variant#actual_product_variant_id", "product_variant".color_id as "product_variant#color_id", "product_variant".gender_id as "product_variant#gender_id", "product_variant".size_id as "product_variant#size_id", "product_variant".barcode as "product_variant#barcode", "product_variant".price as "product_variant#price", "product_variant".compare_at_price as "product_variant#compare_at_price", "product_variant".created_date as "product_variant#created_date", "product_variant".updated_date as "product_variant#updated_date", "product_variant".grams as "product_variant#grams", "product_variant".requires_shipping as "product_variant#requires_shipping"');
-    expect(orm_1.default.tables.product.columns).toEqual('"product".id as "product#id", "product".vendor_id as "product#vendor_id", "product".value as "product#value", "product".label as "product#label", "product".product_type as "product#product_type", "product".created_date as "product#created_date", "product".updated_date as "product#updated_date", "product".published_date as "product#published_date", "product".category as "product#category"');
+    const core = (0, core_1.createCore)({ entities: entities_1.entities });
+    expect(Object.keys(core.tables).length).toEqual(5);
+    expect(core.tables.utmSource.columns).toEqual('"utm_source".id as "utm_source#id", "utm_source".value as "utm_source#value", "utm_source".label as "utm_source#label", "utm_source".internal as "utm_source#internal"');
+    expect(core.tables.order.columns).toEqual('"order".id as "order#id", "order".email as "order#email", "order".browser_ip as "order#browser_ip", "order".browser_user_agent as "order#browser_user_agent", "order".kujo_imported_date as "order#kujo_imported_date", "order".created_date as "order#created_date", "order".cancel_reason as "order#cancel_reason", "order".cancelled_date as "order#cancelled_date", "order".closed_date as "order#closed_date", "order".processed_date as "order#processed_date", "order".updated_date as "order#updated_date", "order".note as "order#note", "order".subtotal_price as "order#subtotal_price", "order".taxes_included as "order#taxes_included", "order".total_discounts as "order#total_discounts", "order".total_price as "order#total_price", "order".total_tax as "order#total_tax", "order".total_weight as "order#total_weight", "order".order_status_url as "order#order_status_url", "order".utm_source_id as "order#utm_source_id", "order".utm_medium_id as "order#utm_medium_id", "order".utm_campaign as "order#utm_campaign", "order".utm_content as "order#utm_content", "order".utm_term as "order#utm_term"');
+    expect(core.tables.lineItem.columns).toEqual('"line_item".id as "line_item#id", "line_item".product_variant_id as "line_item#product_variant_id", "line_item".order_id as "line_item#order_id", "line_item".fulfillment_status_id as "line_item#fulfillment_status_id", "line_item".fulfillable_quantity as "line_item#fulfillable_quantity", "line_item".fulfillment_service as "line_item#fulfillment_service", "line_item".grams as "line_item#grams", "line_item".price as "line_item#price", "line_item".quantity as "line_item#quantity", "line_item".requires_shipping as "line_item#requires_shipping", "line_item".taxable as "line_item#taxable", "line_item".total_discount as "line_item#total_discount"');
+    expect(core.tables.productVariant.columns).toEqual('"product_variant".id as "product_variant#id", "product_variant".product_id as "product_variant#product_id", "product_variant".actual_product_variant_id as "product_variant#actual_product_variant_id", "product_variant".color_id as "product_variant#color_id", "product_variant".gender_id as "product_variant#gender_id", "product_variant".size_id as "product_variant#size_id", "product_variant".barcode as "product_variant#barcode", "product_variant".price as "product_variant#price", "product_variant".compare_at_price as "product_variant#compare_at_price", "product_variant".created_date as "product_variant#created_date", "product_variant".updated_date as "product_variant#updated_date", "product_variant".grams as "product_variant#grams", "product_variant".requires_shipping as "product_variant#requires_shipping"');
+    expect(core.tables.product.columns).toEqual('"product".id as "product#id", "product".vendor_id as "product#vendor_id", "product".value as "product#value", "product".label as "product#label", "product".product_type as "product#product_type", "product".created_date as "product#created_date", "product".updated_date as "product#updated_date", "product".published_date as "product#published_date", "product".category as "product#category"');
 });

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

@@ -0,0 +1,13 @@
+import { ICore, IModel, ICollection } from '../core';
+export interface ICreateForDriverOptions {
+    core: ICore;
+    db: any;
+    logError?: (err: Error) => never;
+}
+export interface ICoreIntegratedDriver extends ICore {
+    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;
+    any: <T extends ICollection<IModel>>(query: string, values?: object, errorHandler?: (err: Error) => never) => T | void;
+    none: (query: string, values?: object, errorHandler?: (err: Error) => never) => void;
+}

package/dist/src/driver-integrations/index.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -0,0 +1,2 @@
+import { ICreateForDriverOptions, ICoreIntegratedDriver } from './index';
+export declare const createForPGP: ({ core, db, logError }: ICreateForDriverOptions) => ICoreIntegratedDriver;

package/dist/src/driver-integrations/pgp.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createForPGP = void 0;
+const createForPGP = ({ core, db, logError }) => {
+    const defaultErrorHandler = (err) => {
+        if (!(err.name === 'QueryResultError')) {
+            if (logError) {
+                logError(err);
+            }
+        }
+        throw err;
+    };
+    /* ------------------------------------------------------------------------*/
+    /* Query functions --------------------------------------------------------*/
+    /* ------------------------------------------------------------------------*/
+    const one = (query, values, errorHandler = defaultErrorHandler) => {
+        return db
+            .many(query, values)
+            .then((rows) => core.createOneFromDatabase(rows))
+            .catch(errorHandler);
+    };
+    const oneOrNone = (query, values, errorHandler = defaultErrorHandler) => {
+        return db
+            .any(query, values)
+            .then((rows) => core.createOneOrNoneFromDatabase(rows))
+            .catch(errorHandler);
+    };
+    const many = (query, values, errorHandler = defaultErrorHandler) => {
+        return db
+            .any(query, values)
+            .then((rows) => core.createManyFromDatabase(rows))
+            .catch(errorHandler);
+    };
+    const any = (query, values, errorHandler = defaultErrorHandler) => {
+        return db
+            .result(query, values)
+            .then((result) => core.createAnyFromDatabase(result.rows, result.fields[0].name.split('#')[0]))
+            .catch(errorHandler);
+    };
+    const none = (query, values, errorHandler = defaultErrorHandler) => {
+        return db
+            .none(query, values)
+            .then(() => null)
+            .catch(errorHandler);
+    };
+    return Object.assign({}, core, {
+        // Query Functions
+        one,
+        oneOrNone,
+        many,
+        any,
+        none,
+        // provide direct access to db
+        db
+    });
+};
+exports.createForPGP = createForPGP;

package/dist/src/index.d.ts

@@ -1 +1,2 @@
-export { create, CreateOptions, IModel, IModelClass, ICollection, IColumns } from './factory';
+export { createCore, ICreateCoreOptions, ICore, IModel, IModelClass, ICollection, IColumns } from './core';
+export { create, ICreateOptions, IPureORM } from './orm';

package/dist/src/index.js

@@ -1,5 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.create = void 0;
-var factory_1 = require("./factory");
-Object.defineProperty(exports, "create", { enumerable: true, get: function () { return factory_1.create; } });
+exports.create = exports.createCore = void 0;
+var core_1 = require("./core");
+Object.defineProperty(exports, "createCore", { enumerable: true, get: function () { return core_1.createCore; } });
+var orm_1 = require("./orm");
+Object.defineProperty(exports, "create", { enumerable: true, get: function () { return orm_1.create; } });

package/dist/src/orm.d.ts

@@ -0,0 +1,20 @@
+import { IModel, ICollection, IEntities } from './core';
+import { ICoreIntegratedDriver } from './driver-integrations/index';
+export interface ICreateOptions {
+    entities: IEntities<IModel>;
+    db: any;
+    logError?: (err: Error) => never;
+}
+export interface IPureORM extends ICoreIntegratedDriver {
+    getMatching: <T extends IModel>(model: T) => T;
+    getOneOrNoneMatching: <T extends IModel>(model: T) => T | void;
+    getAnyMatching: <T extends ICollection<IModel>>(model: IModel) => T | void;
+    getAllMatching: <T extends ICollection<IModel>>(model: IModel) => T;
+    create: <T extends IModel>(model: T) => T;
+    update: <T extends IModel>(model: T, options: {
+        on: string;
+    }) => T;
+    delete: <T extends IModel>(model: T) => void;
+    deleteMatching: <T extends IModel>(model: T) => void;
+}
+export declare const create: ({ entities: externalEntities, db, logError }: ICreateOptions) => IPureORM;

package/dist/src/orm.js

@@ -0,0 +1,190 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.create = void 0;
+const core_1 = require("./core");
+const pgp_1 = require("./driver-integrations/pgp");
+const create = ({ entities: externalEntities, db, logError }) => {
+    const core = (0, core_1.createCore)({ entities: externalEntities });
+    let orm;
+    if (db.$config.pgp) {
+        orm = (0, pgp_1.createForPGP)({ core, db, logError });
+    }
+    else {
+        throw new Error(`You're database driver is not yet supported. You can make a PR to add it, or use the \`createCore\` export which doesn't try to abstract over the database driver, and instead you pass the results of the database driver queries to it.`);
+    }
+    /* ------------------------------------------------------------------------*/
+    /* Helper Utilities for CRUD functions ------------------------------------*/
+    /* ------------------------------------------------------------------------*/
+    const getSqlInsertParts = (model) => {
+        const columns = orm
+            .getEntityByModel(model)
+            .columnNames.filter((column, index) => model[orm.getEntityByModel(model).propertyNames[index]] !== void 0)
+            .map((col) => `"${col}"`)
+            .join(', ');
+        const values = orm
+            .getEntityByModel(model)
+            .propertyNames.map((property) => model[property])
+            .filter((value) => value !== void 0);
+        const valuesVar = values.map((value, index) => `$${index + 1}`);
+        return { columns, values, valuesVar };
+    };
+    const getSqlUpdateParts = (model, on = 'id') => {
+        const clauseArray = orm
+            .getEntityByModel(model)
+            .columnNames.filter((sqlColumn, index) => model[orm.getEntityByModel(model).propertyNames[index]] !== void 0)
+            .map((sqlColumn, index) => `"${sqlColumn}" = $${index + 1}`);
+        const clause = clauseArray.join(', ');
+        const idVar = `$${clauseArray.length + 1}`;
+        const _values = orm
+            .getEntityByModel(model)
+            .propertyNames.map((property) => model[property])
+            .filter((value) => value !== void 0);
+        const values = [..._values, model[on]];
+        return { clause, idVar, values };
+    };
+    const getMatchingParts = (model) => {
+        const whereClause = orm
+            .getEntityByModel(model)
+            .propertyNames.map((property, index) => model[property] != null
+            ? `"${orm.getEntityByModel(model).tableName}"."${orm.getEntityByModel(model).columnNames[index]}"`
+            : null)
+            .filter((x) => x != null)
+            .map((x, i) => `${x} = $${i + 1}`)
+            .join(' AND ');
+        const values = orm
+            .getEntityByModel(model)
+            .propertyNames.map((property) => model[property] != null
+            ? model[property]
+            : null)
+            .filter((x) => x != null);
+        return { whereClause, values };
+    };
+    // This one returns an object, which allows it to be more versatile.
+    // To-do: make this one even better and use it instead of the one above.
+    const getMatchingPartsObject = (model) => {
+        const whereClause = orm
+            .getEntityByModel(model)
+            .propertyNames.map((property, index) => model[property] != null
+            ? `"${orm.getEntityByModel(model).tableName}"."${orm.getEntityByModel(model).columnNames[index]}"`
+            : null)
+            .filter((x) => x != null)
+            .map((x, i) => `${x} = $(${i + 1})`)
+            .join(' AND ');
+        const values = orm
+            .getEntityByModel(model)
+            .propertyNames.map((property) => model[property] != null
+            ? model[property]
+            : null)
+            .filter((x) => x != null)
+            .reduce((accum, val, index) => Object.assign({}, accum, { [index + 1]: val }), {});
+        return { whereClause, values };
+    };
+    const getNewWith = (model, sqlColumns, values) => {
+        const Constructor = model.constructor;
+        const modelKeys = sqlColumns.map((key) => orm.getEntityByModel(model).propertyNames[orm.getEntityByModel(model).columnNames.indexOf(key)]);
+        const modelData = modelKeys.reduce((data, key, index) => {
+            data[key] = values[index];
+            return data;
+        }, {});
+        return new Constructor(modelData);
+    };
+    const getValueBySqlColumn = (model, sqlColumn) => {
+        return model[orm.getEntityByModel(model).propertyNames[orm.getEntityByModel(model).columnNames.indexOf(sqlColumn)]];
+    };
+    /* ------------------------------------------------------------------------*/
+    /* Built-in basic CRUD functions ------------------------------------------*/
+    /* ------------------------------------------------------------------------*/
+    // Standard create
+    const create = (model) => {
+        const { columns, values, valuesVar } = getSqlInsertParts(model);
+        const query = `
+      INSERT INTO "${orm.getEntityByModel(model).tableName}" ( ${columns} )
+      VALUES ( ${valuesVar} )
+      RETURNING ${orm.getEntityByModel(model).selectColumnsClause};
+    `;
+        return orm.one(query, values);
+    };
+    // Standard update
+    const update = (model, { on = 'id' } = {}) => {
+        const { clause, idVar, values } = getSqlUpdateParts(model, on);
+        const query = `
+      UPDATE "${orm.getEntityByModel(model).tableName}"
+      SET ${clause}
+      WHERE "${orm.getEntityByModel(model).tableName}".${on} = ${idVar}
+      RETURNING ${orm.getEntityByModel(model).selectColumnsClause};
+    `;
+        return orm.one(query, values);
+    };
+    // Standard delete
+    const _delete = (model) => {
+        const id = model.id;
+        const query = `
+      DELETE FROM "${orm.getEntityByModel(model).tableName}"
+      WHERE "${orm.getEntityByModel(model).tableName}".id = $(id)
+    `;
+        return orm.none(query, { id });
+    };
+    const deleteMatching = (model) => {
+        const { whereClause, values } = getMatchingParts(model);
+        const query = `
+      DELETE FROM "${orm.getEntityByModel(model).tableName}"
+      WHERE ${whereClause};
+    `;
+        return orm.none(query, values);
+    };
+    const getMatching = (model) => {
+        const { whereClause, values } = getMatchingParts(model);
+        const query = `
+      SELECT ${orm.getEntityByModel(model).selectColumnsClause}
+      FROM "${orm.getEntityByModel(model).tableName}"
+      WHERE ${whereClause};
+    `;
+        return orm.one(query, values);
+    };
+    const getOneOrNoneMatching = (model) => {
+        const { whereClause, values } = getMatchingParts(model);
+        const query = `
+      SELECT ${orm.getEntityByModel(model).selectColumnsClause}
+      FROM "${orm.getEntityByModel(model).tableName}"
+      WHERE ${whereClause};
+    `;
+        return orm.oneOrNone(query, values);
+    };
+    const getAnyMatching = (model) => {
+        const { whereClause, values } = getMatchingParts(model);
+        const query = `
+      SELECT ${orm.getEntityByModel(model).selectColumnsClause}
+      FROM "${orm.getEntityByModel(model).tableName}"
+      WHERE ${whereClause};
+    `;
+        return orm.any(query, values);
+    };
+    const getAllMatching = (model) => {
+        const { whereClause, values } = getMatchingParts(model);
+        const query = `
+      SELECT ${orm.getEntityByModel(model).selectColumnsClause}
+      FROM "${orm.getEntityByModel(model).tableName}"
+      WHERE ${whereClause};
+    `;
+        return orm.many(query, values);
+    };
+    return Object.assign({}, orm, {
+        // Built-in basic CRUD functions
+        create,
+        update,
+        delete: _delete,
+        deleteMatching,
+        getMatching,
+        getOneOrNoneMatching,
+        getAnyMatching,
+        getAllMatching,
+        // Helper Utility functions
+        getSqlInsertParts,
+        getSqlUpdateParts,
+        getMatchingParts,
+        getMatchingPartsObject,
+        getNewWith,
+        getValueBySqlColumn
+    });
+};
+exports.create = create;

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

@@ -0,0 +1 @@
+export declare const entities: any[];

package/dist/test-utils/blog/{orm.js → entities.js}

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const { create } = require('../../src/index');
+exports.entities = void 0;
 const { articleEntity } = require('./models/article');
 const { personEntity } = require('./models/person');
 const { articleTagEntity } = require('./models/article_tag');
 const { tagEntity } = require('./models/tag');
-const orm = create({
-    entities: [articleEntity, personEntity, articleTagEntity, tagEntity],
-    db: void 0
-});
-exports.default = orm;
+exports.entities = [
+    articleEntity,
+    personEntity,
+    articleTagEntity,
+    tagEntity
+];

package/dist/test-utils/blog/{orm.ts → entities.ts}

@@ -1,11 +1,11 @@
-const { create } = require('../../src/index');
 const { articleEntity } = require('./models/article');
 const { personEntity } = require('./models/person');
 const { articleTagEntity } = require('./models/article_tag');
 const { tagEntity } = require('./models/tag');
 
-const orm = create({
-  entities: [articleEntity, personEntity, articleTagEntity, tagEntity],
-  db: void 0
-});
-export default orm;
+export const entities = [
+  articleEntity,
+  personEntity,
+  articleTagEntity,
+  tagEntity
+];

package/dist/test-utils/blog/models/article.d.ts

@@ -24,7 +24,7 @@ export declare class Articles implements ICollection<Article> {
 }
 export declare const articleEntity: {
     tableName: string;
-    columns: import("../../../src/factory").IColumn[];
+    columns: import("../../../src/core").IColumn[];
     Model: typeof Article;
     Collection: typeof Articles;
 };

package/dist/test-utils/blog/models/article_tag.d.ts

@@ -17,7 +17,7 @@ export declare class ArticleTags implements ICollection<ArticleTag> {
 }
 export declare const articleTagEntity: {
     tableName: string;
-    columns: import("../../../src/factory").IColumn[];
+    columns: import("../../../src/core").IColumn[];
     Model: typeof ArticleTag;
     Collection: typeof ArticleTags;
 };

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

@@ -36,7 +36,7 @@ export declare class Persons implements ICollection<Person> {
 }
 export declare const personEntity: {
     tableName: string;
-    columns: import("../../../src/factory").IColumn[];
+    columns: import("../../../src/core").IColumn[];
     Model: typeof Person;
     Collection: typeof Persons;
 };

package/dist/test-utils/blog/models/tag.d.ts

@@ -13,7 +13,7 @@ export declare class Tags implements ICollection<Tag> {
 }
 export declare const tagEntity: {
     tableName: string;
-    columns: import("../../../src/factory").IColumn[];
+    columns: import("../../../src/core").IColumn[];
     Model: typeof Tag;
     Collection: typeof Tags;
 };

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

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