pure-orm 4.0.0-1 → 4.0.0-4

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.js

@@ -10,7 +10,7 @@ const passion_1 = require("./models/passion");
 const recommendation_audience_1 = require("./models/recommendation-audience");
 const audience_1 = require("./models/audience");
 const orm = (0, index_1.create)({
-    getEntities: () => [
+    entities: [
         member_1.memberEntity,
         recommendation_1.recommendationEntity,
         brand_1.brandEntity,

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

@@ -8,7 +8,7 @@ import { passionEntity } from './models/passion';
 import { recommendationAudienceEntity } from './models/recommendation-audience';
 import { audienceEntity } from './models/audience';
 const orm = create({
-  getEntities: () => [
+  entities: [
     memberEntity,
     recommendationEntity,
     brandEntity,

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.js

@@ -4,7 +4,7 @@ const index_1 = require("../../src/index");
 const prompt_1 = require("./models/prompt");
 const member_1 = require("./models/member");
 const orm = (0, index_1.create)({
-    getEntities: () => [prompt_1.promptEntity, member_1.memberEntity],
+    entities: [prompt_1.promptEntity, member_1.memberEntity],
     db: void 0
 });
 exports.default = orm;

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

@@ -2,7 +2,7 @@ import { create } from '../../src/index';
 import { promptEntity } from './models/prompt';
 import { memberEntity } from './models/member';
 const orm = create({
-  getEntities: () => [promptEntity, memberEntity],
+  entities: [promptEntity, memberEntity],
   db: void 0
 });
 export default orm;

package/example/factories/orm.ts

@@ -4,7 +4,7 @@ import { personEntity } from '../models/person';
 import { jobEntity } from '../models/job';
 import { employerEntity } from '../models/employer';
 const orm = create({
-  getEntities: () => [personEntity, jobEntity, employerEntity],
+  entities: [personEntity, jobEntity, employerEntity],
   db
 });
 export default orm;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "pure-orm",
-  "version": "4.0.0-1",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "version": "4.0.0-4",
+  "main": "dist/src/index.js",
+  "types": "dist/src/index.d.ts",
   "engines": {
     "node": ">=6"
   },

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,19 +55,25 @@ export interface IEntityInternal<T extends IModel> {
 export type IEntitiesInternal<T extends IModel> = Array<IEntityInternal<T>>;
 
 export interface CreateOptions {
-  getEntities: () => IEntities<any>;
+  entities: IEntities<any>;
   db: any;
   logError?: (err: Error) => void;
 }
 
-export const create = ({ getEntities, db, logError }: CreateOptions) => {
-  const entities: IEntitiesInternal<any> = getEntities().map(
+export const create = ({
+  entities: externalEntities,
+  db,
+  logError
+}: CreateOptions) => {
+  const entities: IEntitiesInternal<any> = externalEntities.map(
     (d: IEntity<any>) => {
       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,

package/test-utils/blog/orm.ts

@@ -5,7 +5,7 @@ const { articleTagEntity } = require('./models/article_tag');
 const { tagEntity } = require('./models/tag');
 
 const orm = create({
-  getEntities: () => [articleEntity, personEntity, articleTagEntity, tagEntity],
+  entities: [articleEntity, personEntity, articleTagEntity, tagEntity],
   db: void 0
 });
 export default orm;

package/test-utils/five/orm.ts

@@ -5,7 +5,7 @@ import { parcelLineItemEntity } from './models/parcel-line-item';
 import { parcelEntity } from './models/parcel';
 import { parcelEventEntity } from './models/parcel-event';
 const orm = create({
-  getEntities: () => [
+  entities: [
     orderEntity,
     lineItemEntity,
     parcelLineItemEntity,

package/test-utils/nine/orm.ts

@@ -1,7 +1,7 @@
 import { create } from '../../src/index';
 import { featureSwitchEntity } from './models/feature-switch';
 const orm = create({
-  getEntities: () => [featureSwitchEntity],
+  entities: [featureSwitchEntity],
   db: void 0
 });
 export default orm;

package/test-utils/order/orm.ts

@@ -6,7 +6,7 @@ import { productVariantEntity } from './models/product-variant';
 import { productEntity } from './models/product';
 
 const orm = create({
-  getEntities: () => [
+  entities: [
     utmSourceEntity,
     orderEntity,
     lineItemEntity,

package/test-utils/order-more/orm.ts

@@ -21,7 +21,7 @@ import { parcelEntity } from './models/parcel';
 import { parcelEventEntity } from './models/parcel-event';
 
 const orm = create({
-  getEntities: () => [
+  entities: [
     inventoryLevelEntity,
     actualProductVariantEntity,
     productVariantEntity,

package/test-utils/six/orm.ts

@@ -5,7 +5,7 @@ import { lineItemEntity } from './models/line-item';
 import { orderEntity } from './models/order';
 import { customerEntity } from './models/customer';
 const orm = create({
-  getEntities: () => [
+  entities: [
     parcelEntity,
     parcelLineItemEntity,
     lineItemEntity,

package/test-utils/thirteen/orm.ts

@@ -8,7 +8,7 @@ import { passionEntity } from './models/passion';
 import { recommendationAudienceEntity } from './models/recommendation-audience';
 import { audienceEntity } from './models/audience';
 const orm = create({
-  getEntities: () => [
+  entities: [
     memberEntity,
     recommendationEntity,
     brandEntity,

package/test-utils/twelve/orm.ts

@@ -2,7 +2,7 @@ import { create } from '../../src/index';
 import { promptEntity } from './models/prompt';
 import { memberEntity } from './models/member';
 const orm = create({
-  getEntities: () => [promptEntity, memberEntity],
+  entities: [promptEntity, memberEntity],
   db: void 0
 });
 export default orm;