pure-orm 4.0.0-3 → 4.0.0-6

package/dist/test-utils/six/models/line-item.d.ts

@@ -14,7 +14,7 @@ export declare class LineItems implements ICollection<LineItem> {
 }
 export declare const lineItemEntity: {
     tableName: string;
-    columns: IColumns;
+    columns: import("../../../src/factory").IColumn[];
     Model: typeof LineItem;
     Collection: typeof LineItems;
 };

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

@@ -14,7 +14,7 @@ export declare class Orders implements ICollection<Order> {
 }
 export declare const orderEntity: {
     tableName: string;
-    columns: IColumns;
+    columns: import("../../../src/factory").IColumn[];
     Model: typeof Order;
     Collection: typeof Orders;
 };

package/dist/test-utils/six/models/parcel-line-item.d.ts

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

package/dist/test-utils/six/models/parcel.d.ts

@@ -11,7 +11,7 @@ export declare class Parcels implements ICollection<Parcel> {
 }
 export declare const parcelEntity: {
     tableName: string;
-    columns: IColumns;
+    columns: import("../../../src/factory").IColumn[];
     Model: typeof Parcel;
     Collection: typeof Parcels;
 };

package/dist/test-utils/six/orm.d.ts

@@ -1,9 +1,9 @@
 declare const orm: {
     nestClump: (clump: import("../../src/factory").IModel[][]) => object;
     clumpIntoGroups: (processed: import("../../src/factory").IModel[][]) => import("../../src/factory").IModel[][][];
-    mapToBos: (objectified: any) => any[];
+    mapToBos: (objectified: any) => import("../../src/factory").IModel[];
     objectifyDatabaseResult: (result: object) => any;
-    createFromDatabase: <T extends import("../../src/factory").ICollection<import("../../src/factory").IModel>>(_result: object | object[]) => T | undefined;
+    createFromDatabase: <T extends import("../../src/factory").ICollection<import("../../src/factory").IModel>>(_result: any) => T | undefined;
     createOneFromDatabase: <T_1 extends import("../../src/factory").IModel>(_result: any) => T_1;
     createOneOrNoneFromDatabase: <T_2 extends import("../../src/factory").IModel>(_result: any) => void | T_2;
     createManyFromDatabase: <T_3 extends import("../../src/factory").ICollection<import("../../src/factory").IModel>>(_result: any) => T_3;
@@ -43,5 +43,6 @@ declare const orm: {
     getAnyMatching: <T_14 extends import("../../src/factory").ICollection<import("../../src/factory").IModel>>(model: import("../../src/factory").IModel) => void | T_14;
     getAllMatching: <T_15 extends import("../../src/factory").ICollection<import("../../src/factory").IModel>>(model: import("../../src/factory").IModel) => T_15;
     tables: any;
+    db: any;
 };
 export default orm;

package/dist/test-utils/thirteen/models/audience.d.ts

@@ -11,7 +11,7 @@ export declare class Audiences implements ICollection<Audience> {
 }
 export declare const audienceEntity: {
     tableName: string;
-    columns: IColumns;
+    columns: import("../../../src/factory").IColumn[];
     Model: typeof Audience;
     Collection: typeof Audiences;
 };

package/dist/test-utils/thirteen/models/brand.d.ts

@@ -11,7 +11,7 @@ export declare class Brands implements ICollection<Brand> {
 }
 export declare const brandEntity: {
     tableName: string;
-    columns: IColumns;
+    columns: import("../../../src/factory").IColumn[];
     Model: typeof Brand;
     Collection: typeof Brands;
 };

package/dist/test-utils/thirteen/models/category.d.ts

@@ -11,7 +11,7 @@ export declare class Categories implements ICollection<Category> {
 }
 export declare const categoryEntity: {
     tableName: string;
-    columns: IColumns;
+    columns: import("../../../src/factory").IColumn[];
     Model: typeof Category;
     Collection: typeof Categories;
 };

package/dist/test-utils/thirteen/models/member.d.ts

@@ -11,7 +11,7 @@ export declare class Members implements ICollection<Member> {
 }
 export declare const memberEntity: {
     tableName: string;
-    columns: IColumns;
+    columns: import("../../../src/factory").IColumn[];
     Model: typeof Member;
     Collection: typeof Members;
 };

package/dist/test-utils/thirteen/models/passion.d.ts

@@ -11,7 +11,7 @@ export declare class Passions implements ICollection<Passion> {
 }
 export declare const passionEntity: {
     tableName: string;
-    columns: IColumns;
+    columns: import("../../../src/factory").IColumn[];
     Model: typeof Passion;
     Collection: typeof Passions;
 };

package/dist/test-utils/thirteen/models/product.d.ts

@@ -14,7 +14,7 @@ export declare class Products implements ICollection<Product> {
 }
 export declare const productEntity: {
     tableName: string;
-    columns: IColumns;
+    columns: import("../../../src/factory").IColumn[];
     Model: typeof Product;
     Collection: typeof Products;
 };

package/dist/test-utils/thirteen/models/recommendation-audience.d.ts

@@ -17,7 +17,7 @@ export declare class RecommendationAudiences implements ICollection<Recommendati
 }
 export declare const recommendationAudienceEntity: {
     tableName: string;
-    columns: IColumns;
+    columns: import("../../../src/factory").IColumn[];
     Model: typeof RecommendationAudience;
     Collection: typeof RecommendationAudiences;
 };

package/dist/test-utils/thirteen/models/recommendation.d.ts

@@ -26,7 +26,7 @@ export declare class Recommendations implements ICollection<Recommendation> {
 }
 export declare const recommendationEntity: {
     tableName: string;
-    columns: IColumns;
+    columns: import("../../../src/factory").IColumn[];
     Model: typeof Recommendation;
     Collection: typeof Recommendations;
 };

package/dist/test-utils/thirteen/orm.d.ts

@@ -1,9 +1,9 @@
 declare const orm: {
     nestClump: (clump: import("../../src/factory").IModel[][]) => object;
     clumpIntoGroups: (processed: import("../../src/factory").IModel[][]) => import("../../src/factory").IModel[][][];
-    mapToBos: (objectified: any) => any[];
+    mapToBos: (objectified: any) => import("../../src/factory").IModel[];
     objectifyDatabaseResult: (result: object) => any;
-    createFromDatabase: <T extends import("../../src/factory").ICollection<import("../../src/factory").IModel>>(_result: object | object[]) => T | undefined;
+    createFromDatabase: <T extends import("../../src/factory").ICollection<import("../../src/factory").IModel>>(_result: any) => T | undefined;
     createOneFromDatabase: <T_1 extends import("../../src/factory").IModel>(_result: any) => T_1;
     createOneOrNoneFromDatabase: <T_2 extends import("../../src/factory").IModel>(_result: any) => void | T_2;
     createManyFromDatabase: <T_3 extends import("../../src/factory").ICollection<import("../../src/factory").IModel>>(_result: any) => T_3;
@@ -43,5 +43,6 @@ declare const orm: {
     getAnyMatching: <T_14 extends import("../../src/factory").ICollection<import("../../src/factory").IModel>>(model: import("../../src/factory").IModel) => void | T_14;
     getAllMatching: <T_15 extends import("../../src/factory").ICollection<import("../../src/factory").IModel>>(model: import("../../src/factory").IModel) => T_15;
     tables: any;
+    db: any;
 };
 export default orm;

package/dist/test-utils/twelve/models/member.d.ts

@@ -11,7 +11,7 @@ export declare class Members implements ICollection<Member> {
 }
 export declare const memberEntity: {
     tableName: string;
-    columns: IColumns;
+    columns: import("../../../src/factory").IColumn[];
     Model: typeof Member;
     Collection: typeof Members;
 };

package/dist/test-utils/twelve/models/prompt.d.ts

@@ -16,7 +16,7 @@ export declare class Prompts implements ICollection<Prompt> {
 }
 export declare const promptEntity: {
     tableName: string;
-    columns: IColumns;
+    columns: import("../../../src/factory").IColumn[];
     Model: typeof Prompt;
     Collection: typeof Prompts;
 };

package/dist/test-utils/twelve/orm.d.ts

@@ -1,9 +1,9 @@
 declare const orm: {
     nestClump: (clump: import("../../src/factory").IModel[][]) => object;
     clumpIntoGroups: (processed: import("../../src/factory").IModel[][]) => import("../../src/factory").IModel[][][];
-    mapToBos: (objectified: any) => any[];
+    mapToBos: (objectified: any) => import("../../src/factory").IModel[];
     objectifyDatabaseResult: (result: object) => any;
-    createFromDatabase: <T extends import("../../src/factory").ICollection<import("../../src/factory").IModel>>(_result: object | object[]) => T | undefined;
+    createFromDatabase: <T extends import("../../src/factory").ICollection<import("../../src/factory").IModel>>(_result: any) => T | undefined;
     createOneFromDatabase: <T_1 extends import("../../src/factory").IModel>(_result: any) => T_1;
     createOneOrNoneFromDatabase: <T_2 extends import("../../src/factory").IModel>(_result: any) => void | T_2;
     createManyFromDatabase: <T_3 extends import("../../src/factory").ICollection<import("../../src/factory").IModel>>(_result: any) => T_3;
@@ -43,5 +43,6 @@ declare const orm: {
     getAnyMatching: <T_14 extends import("../../src/factory").ICollection<import("../../src/factory").IModel>>(model: import("../../src/factory").IModel) => void | T_14;
     getAllMatching: <T_15 extends import("../../src/factory").ICollection<import("../../src/factory").IModel>>(model: import("../../src/factory").IModel) => T_15;
     tables: any;
+    db: any;
 };
 export default orm;

package/package.json

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

package/src/factory.spec.ts

@@ -1030,19 +1030,19 @@ test('Bo#parseFromDatabase 13', () => {
 
 test('orm.tables', () => {
   expect(Object.keys(ormA.tables).length).toEqual(5);
-  expect(ormA.tables.utmSource).toEqual(
+  expect(ormA.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(ormA.tables.order).toEqual(
+  expect(ormA.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(ormA.tables.lineItem).toEqual(
+  expect(ormA.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(ormA.tables.productVariant).toEqual(
+  expect(ormA.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(ormA.tables.product).toEqual(
+  expect(ormA.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/src/factory.ts

@@ -7,7 +7,7 @@ export interface IColumnData {
   primaryKey?: boolean;
 }
 export type IColumn = IColumnData | string;
-export type IColumns = Array<IColumn>;
+export type IColumns = Array<IColumn> | (() => Array<IColumn>);
 
 export interface IColumnInternalData {
   column: string;
@@ -55,7 +55,7 @@ export interface IEntityInternal<T extends IModel> {
 export type IEntitiesInternal<T extends IModel> = Array<IEntityInternal<T>>;
 
 export interface CreateOptions {
-  entities: IEntities<any>;
+  entities: IEntities<IModel>;
   db: any;
   logError?: (err: Error) => void;
 }
@@ -65,13 +65,15 @@ export const create = ({
   db,
   logError
 }: CreateOptions) => {
-  const entities: IEntitiesInternal<any> = externalEntities.map(
-    (d: IEntity<any>) => {
+  const entities: IEntitiesInternal<IModel> = externalEntities.map(
+    (d: IEntity<IModel>) => {
       const tableName = d.tableName;
       const displayName = d.displayName || camelCase(d.tableName);
       const collectionDisplayName =
         d.collectionDisplayName || `${displayName}s`;
-      const columns = d.columns.map((d: IColumn) => {
+      const columns = (
+        typeof d.columns === 'function' ? d.columns() : d.columns
+      ).map((d: IColumn) => {
         if (typeof d === 'string') {
           return {
             column: d,
@@ -144,7 +146,7 @@ export const create = ({
     }
   );
 
-  const getEntityByTableName = (tableName: string): IEntityInternal<any> => {
+  const getEntityByTableName = (tableName: string): IEntityInternal<IModel> => {
     const entity = entities.find((data) => data.tableName == tableName);
     if (!entity) {
       throw new Error(`Could not find entity for table ${tableName}`);
@@ -152,7 +154,7 @@ export const create = ({
     return entity;
   };
 
-  const getEntityByModel = (model: IModel): IEntityInternal<any> => {
+  const getEntityByModel = (model: IModel): IEntityInternal<IModel> => {
     const entity = entities.find((data) => data.Model == model.constructor);
     if (!entity) {
       throw new Error(`Could not find entity for class ${model.constructor}`);
@@ -377,6 +379,9 @@ export const create = ({
     return Object.keys(result).reduce((obj: any, text: string) => {
       const tableName = text.split('#')[0];
       const column = text.split('#')[1];
+      if (!tableName || !column) {
+        throw new Error('Column names must be namespaced to table');
+      }
       obj[tableName] = obj[tableName] || {};
       obj[tableName][column] = result[text as keyof typeof result];
       return obj;
@@ -384,8 +389,11 @@ export const create = ({
   };
 
   const createFromDatabase = <T extends ICollection<IModel>>(
-    _result: Array<object> | object
+    _result: any
   ): T | undefined => {
+    if (!_result || !_result.length) {
+      return void 0;
+    }
     const result = Array.isArray(_result) ? _result : [_result];
     const objectified = result.map(objectifyDatabaseResult);
     const boified = objectified.map(mapToBos);
@@ -412,9 +420,6 @@ export const create = ({
   const createOneOrNoneFromDatabase = <T extends IModel>(
     _result: any
   ): T | void => {
-    if (!_result) {
-      return _result;
-    }
     const collection = createFromDatabase(_result);
     if (collection && collection.models.length > 1) {
       throw Error('Got more than one.');
@@ -729,9 +734,14 @@ export const create = ({
     getOneOrNoneMatching,
     getAnyMatching,
     getAllMatching,
-    tables: entities.reduce((accum: any, data: IEntityInternal<any>) => {
-      accum[data.displayName] = data.selectColumnsClause;
+    // tables property for access to select columns clause string
+    tables: entities.reduce((accum: any, data: IEntityInternal<IModel>) => {
+      accum[data.displayName] = {
+        columns: data.selectColumnsClause
+      };
       return accum;
-    }, {})
+    }, {}),
+    // provide direct access to db
+    db
   };
 };