@cheetah.js/orm 0.1.0 → 0.1.2

package/dist/entry.d.ts

@@ -0,0 +1,2 @@
+import { Cheetah } from '@cheetah.js/core';
+export declare const CheetahOrm: Cheetah;

package/dist/entry.js

@@ -0,0 +1,6 @@
+import { Cheetah } from '@cheetah.js/core';
+import { Orm } from './orm';
+import { OrmService } from './orm.service';
+import { EntityStorage } from './domain/entities';
+export const CheetahOrm = new Cheetah({ exports: [Orm, OrmService, EntityStorage] });
+//# sourceMappingURL=entry.js.map

package/dist/entry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"entry.js","sourceRoot":"","sources":["../src/entry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,OAAO,CAAC,EAAC,OAAO,EAAE,CAAC,GAAG,EAAE,UAAU,EAAE,aAAa,CAAC,EAAC,CAAC,CAAA"}

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-import { Cheetah } from '@cheetah.js/core';
 export * from './decorators/entity.decorator';
 export * from './decorators/property.decorator';
 export * from './decorators/primary-key.decorator';
@@ -10,4 +9,4 @@ export * from './domain/base-entity';
 export * from './driver/pg-driver';
 export * from './utils';
 export * from './driver/driver.interface';
-export declare const CheetahOrm: Cheetah;
+export * from './entry';

package/dist/index.js

@@ -1,6 +1,3 @@
-import { Cheetah } from '@cheetah.js/core';
-import { OrmService } from '@cheetah.js/orm/orm.service';
-import { EntityStorage } from '@cheetah.js/orm/domain/entities';
 export * from './decorators/entity.decorator';
 export * from './decorators/property.decorator';
 export * from './decorators/primary-key.decorator';
@@ -12,5 +9,5 @@ export * from './domain/base-entity';
 export * from './driver/pg-driver';
 export * from './utils';
 export * from './driver/driver.interface';
-export const CheetahOrm = new Cheetah({ exports: [OrmService, EntityStorage] });
+export * from './entry';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAEhE,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,oCAAoC,CAAC;AACnD,cAAc,iCAAiC,CAAC;AAChD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,OAAO,CAAA;AACrB,cAAc,eAAe,CAAA;AAC7B,cAAc,sBAAsB,CAAA;AACpC,cAAc,oBAAoB,CAAA;AAClC,cAAc,SAAS,CAAA;AACvB,cAAc,2BAA2B,CAAA;AAEzC,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,OAAO,CAAC,EAAC,OAAO,EAAE,CAAC,UAAU,EAAE,aAAa,CAAC,EAAC,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,oCAAoC,CAAC;AACnD,cAAc,iCAAiC,CAAC;AAChD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,OAAO,CAAA;AACrB,cAAc,eAAe,CAAA;AAC7B,cAAc,sBAAsB,CAAA;AACpC,cAAc,oBAAoB,CAAA;AAClC,cAAc,SAAS,CAAA;AACvB,cAAc,2BAA2B,CAAA;AACzC,cAAc,SAAS,CAAA"}

package/dist/migration/migrator.d.ts

@@ -1,7 +1,7 @@
 import 'reflect-metadata';
 import { ConnectionSettings } from '@cheetah.js/orm/driver/driver.interface';
 import { Orm } from '@cheetah.js/orm';
-import { EntityStorage } from '@cheetah.js/orm/domain/entities';
+import { EntityStorage } from '../domain/entities';
 export declare class Migrator {
     config: ConnectionSettings<any>;
     orm: Orm<any>;

package/dist/migration/migrator.js

@@ -2,7 +2,7 @@ import 'reflect-metadata';
 import { globby } from 'globby';
 import { Orm, OrmService } from '@cheetah.js/orm';
 import { InjectorService, LoggerService } from '@cheetah.js/core';
-import { EntityStorage } from '@cheetah.js/orm/domain/entities';
+import { EntityStorage } from '../domain/entities';
 import * as path from 'path';
 import * as fs from 'fs';
 import { DiffCalculator } from './diff-calculator';
@@ -23,13 +23,12 @@ export class Migrator {
                 await import(path);
             }
         }
-        this.orm = new Orm(this.config, new LoggerService(new InjectorService()));
-        await this.orm.connect();
+        this.orm = new Orm(new LoggerService(new InjectorService()));
+        this.entities = new EntityStorage();
+        const serv = new OrmService(this.orm, this.entities);
+        await serv.onInit(this.config);
     }
     async initMigration() {
-        this.entities = new EntityStorage();
-        const serv = new OrmService(this.entities);
-        serv.onInit();
         const snapshotBd = await this.snapshotBd();
         const snapshotEntities = await this.snapshotEntities();
         const calculator = new DiffCalculator(this.entities);

package/dist/migration/migrator.js.map

@@ -1 +1 @@
-{"version":3,"file":"migrator.js","sourceRoot":"","sources":["../../src/migration/migrator.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAE1B,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,MAAM,OAAO,QAAQ;IAKnB;QAFA,aAAQ,GAAkB,IAAI,aAAa,EAAE,CAAC;IAG9C,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,WAAmB,OAAO,CAAC,GAAG,EAAE;QACnD,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,CAAC,mBAAmB,CAAC,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAC,CAAC,CAAA;QAElF,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;SAC1C;QAED,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACtC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC;QAE7B,IAAI,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,QAAQ,EAAE;YAC5C,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAC,CAAC,CAAA;YACjF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBACxB,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC;aACpB;SACF;QAED,IAAI,CAAC,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,aAAa,CAAC,IAAI,eAAe,EAAE,CAAC,CAAC,CAAC;QAC1E,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,IAAI,CAAC,QAAQ,GAAG,IAAI,aAAa,EAAE,CAAC;QACpC,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC1C,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QAC3C,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACvD,MAAM,UAAU,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAErD,OAAO,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IACvD,CAAC;IAEO,KAAK,CAAC,UAAU;QACtB,MAAM,QAAQ,GAAG,EAAE,CAAA;QACnB,KAAK,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE;YAC/C,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACpE,IAAI,CAAC,EAAE,EAAE;gBACP,SAAS;aACV;YACD,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;SAClB;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEO,KAAK,CAAC,gBAAgB;QAC5B,MAAM,QAAQ,GAAG,EAAE,CAAA;QACnB,KAAK,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE;YAC/C,QAAQ,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;SACpD;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAGD,KAAK,CAAC,eAAe,CAAC,YAA2B,IAAI;QACnD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QACxC,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,qBAAqB,CAAC,CAAC;QACxG,MAAM,iBAAiB,GAAG,CAAC,SAAS,IAAI,aAAa,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC;QAChH,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,CAAC;QAE3E,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE;YACtC,EAAE,CAAC,SAAS,CAAC,kBAAkB,EAAE,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC,CAAC;SACrD;QAED,IAAI,eAAe,GAAa,EAAE,CAAC;QAEnC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YACvB,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC;YACtC,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;YAEhC,IAAI,SAAS,CAAC,QAAQ,EAAE;gBACtB,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,KAAK,OAAO,CAAC,CAAC;gBACrF,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC;gBACtF,MAAM,GAAG,GAAG,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;gBAElF,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,yBAAyB,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;gBAEpG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;oBACxB,OAAO,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,SAAS,OAAO,CAAC,CAAC;gBACjG,CAAC,CAAC,CAAC;gBAEH,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;oBACpB,OAAO,CAAC,UAAU,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,CAAC,EAAE;wBAC5C,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,0BAA0B,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;oBAC3G,CAAC,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;gBAEH,eAAe,GAAG,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;gBACtE,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;oBACxB,IAAI,OAAO,CAAC,WAAW,EAAE;wBACvB,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;4BAClC,IAAI,KAAK,CAAC,UAAU,EAAE;gCACpB,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;6BACxF;wBACH,CAAC,CAAC,CAAC;qBACJ;gBACH,CAAC,CAAC,CAAA;gBACF,OAAO;aACR;YAED,gCAAgC;YAChC,MAAM,aAAa,GAAG,IAAI,GAAG,EAAqB,CAAC;YAEnD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBAC7C,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;gBAEhC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;oBAC/B,aAAa,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;iBAChC;gBAED,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YAC5C,CAAC,CAAC,CAAC;YAEH,4CAA4C;YAC5C,aAAa,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE;gBAC1C,MAAM,mBAAmB,GAAa,EAAE,CAAC;gBAEzC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;oBACzB,QAAQ,OAAO,CAAC,UAAU,EAAE;wBAC1B,KAAK,QAAQ;4BACV,IAAI,CAAC,GAAG,CAAC,cAAkC,CAAC,YAAY,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,mBAAmB,CAAC,CAAC;4BACpH,MAAM;wBACR,KAAK,QAAQ;4BACV,IAAI,CAAC,GAAG,CAAC,cAAkC,CAAC,aAAa,CAAC,mBAAmB,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;4BAC5G,MAAM;wBACR,KAAK,OAAO;4BACV,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,mBAAmB,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;4BAClF,MAAM;wBACR,KAAK,OAAO;4BACV,IAAI,OAAO,CAAC,WAAW,EAAE;gCACvB,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;oCAClC,qDAAqD;oCACrD,IAAI,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE;wCAC7E,OAAO;qCACR;oCAED,IAAI,IAAI,CAAC,iBAAiB,CAAC,eAAe,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE;wCACvD,OAAO;qCACR;oCAED,IAAI,KAAK,CAAC,UAAU,EAAE;wCACpB,mBAAmB,CAAC,IAAI,CAAE,IAAI,CAAC,GAAG,CAAC,cAAkC,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;qCACjH;yCAAM;wCACL,mBAAmB,CAAC,IAAI,CAAE,IAAI,CAAC,GAAG,CAAC,cAAkC,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;qCAC/G;gCACH,CAAC,CAAC,CAAC;6BACJ;4BACD,MAAM;wBACR,2DAA2D;qBAC5D;gBACH,CAAC,CAAC,CAAC;gBAEH,gDAAgD;gBAChD,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE;oBAClC,eAAe,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;iBACtD;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,gBAAgB,GAAG,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEpD,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;YACjC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;YACnC,OAAO;SACR;aAAM;YACL,EAAE,CAAC,aAAa,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,CAAC;YAEtD,OAAO,CAAC,GAAG,CAAC,2BAA2B,iBAAiB,EAAE,CAAC,CAAC;SAC7D;IACH,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,cAAc,GAAG,oBAAoB,CAAC;QAC5C,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,qBAAqB,CAAC,CAAC;QACxG,MAAM,cAAc,GAAG,EAAE;aACtB,WAAW,CAAC,kBAAkB,CAAC;aAC/B,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;aACrC,IAAI,EAAE,CAAC;QAEV,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;YAC/B,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;YACxC,OAAO;SACR;QAED,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,+BAA+B,cAAc,0EAA0E,CAAC,CAAC;QAC5J,wBAAwB;QACxB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,kBAAkB,cAAc,kCAAkC,CAAC,CAAC;QAC9H,MAAM,aAAa,GAAG,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC9D,MAAM,kBAAkB,GAAG,cAAc,CAAC,OAAO,CAAC,aAAa,EAAE,cAAc,IAAI,EAAE,CAAC,CAAC;QACvF,MAAM,mBAAmB,GAAG,cAAc,CAAC,KAAK,CAAC,kBAAkB,GAAG,CAAC,CAAC,CAAC;QAEzE,IAAI,mBAAmB,CAAC,MAAM,KAAK,CAAC,EAAE;YACpC,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;YACtC,OAAO;SACR;QAED,KAAK,MAAM,aAAa,IAAI,mBAAmB,EAAE;YAC/C,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC;YACvE,MAAM,gBAAgB,GAAG,EAAE,CAAC,YAAY,CAAC,iBAAiB,EAAE,EAAC,QAAQ,EAAE,OAAO,EAAC,CAAC,CAAC;YACjF,MAAM,eAAe,GAAG,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAEzF,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE;gBAC5C,MAAM,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;aAC1D;YAED,MAAM,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,gBAAgB,cAAc,iCAAiC,aAAa,KAAK,CAAC,CAAC;YAE5H,OAAO,CAAC,GAAG,CAAC,uBAAuB,aAAa,EAAE,CAAC,CAAC;SACrD;IACH,CAAC;IAEO,kBAAkB,CAAC,OAAgB,EAAE,eAAyB,EAAE,MAA0B,EAAE,SAAiB,EAAE,OAAe;QACpI,IAAI,OAAO,CAAC,OAAO,EAAE;YACnB,eAAe,CAAC,IAAI,CAAG,IAAI,CAAC,GAAG,CAAC,cAAkC,CAAC,iBAAiB,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;SAC5H;QAED,IAAI,OAAO,CAAC,UAAU,EAAE;YACtB,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,KAAK,SAAS,EAAE;gBAC5C,eAAe,CAAC,IAAI,CAAE,IAAI,CAAC,GAAG,CAAC,cAAkC,CAAC,+BAA+B,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;aACzI;YAED,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,KAAK,SAAS,EAAE;gBAC5C,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE;oBAC9B,eAAe,CAAC,IAAI,CAAE,IAAI,CAAC,GAAG,CAAC,cAAkC,CAAC,kCAAkC,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;iBAC5I;qBAAM;oBACL,eAAe,CAAC,IAAI,CAAE,IAAI,CAAC,GAAG,CAAC,cAAkC,CAAC,iBAAiB,CAAC,EAAC,IAAI,EAAE,GAAG,SAAS,OAAO,EAAC,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;iBACtI;aACF;YAED,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,eAAe,EAAE,GAAG,SAAS,IAAI,OAAO,MAAM,CAAC,EAAE;gBACtH,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE;oBAC7B,eAAe,CAAC,IAAI,CAAE,IAAI,CAAC,GAAG,CAAC,cAAkC,CAAC,sBAAsB,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;iBACvH;qBAAM;oBACL,eAAe,CAAC,IAAI,CAAE,IAAI,CAAC,GAAG,CAAC,cAAkC,CAAC,iBAAiB,CAAC,EAAC,IAAI,EAAE,GAAG,SAAS,IAAI,OAAO,MAAM,EAAC,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;iBAChJ;aACF;YAED,IAAG,OAAO,CAAC,UAAU,CAAC,QAAQ,KAAK,SAAS,EAAE;gBAC5C,IAAI,OAAO,CAAC,UAAU,CAAC,QAAQ,EAAE;oBAC/B,eAAe,CAAC,IAAI,CAAE,IAAI,CAAC,GAAG,CAAC,cAAkC,CAAC,gCAAgC,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;iBAC1I;qBAAM;oBACL,eAAe,CAAC,IAAI,CAAE,IAAI,CAAC,GAAG,CAAC,cAAkC,CAAC,mCAAmC,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;iBAC7I;aACF;YAED,IAAI,OAAO,CAAC,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE;gBAChD,IAAI,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;oBAC/C,eAAe,CAAC,IAAI,CAAE,IAAI,CAAC,GAAG,CAAC,cAAkC,CAAC,iBAAiB,CAAC,EAAC,IAAI,EAAE,GAAG,SAAS,IAAI,OAAO,KAAK,EAAC,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;iBAC/I;gBAED,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;oBAC1C,eAAe,CAAC,IAAI,CAAE,IAAI,CAAC,GAAG,CAAC,cAAkC,CAAC,0BAA0B,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,CAAA;gBAC/H,CAAC,CAAC,CAAC;aACJ;YACD,qDAAqD;SACtD;IACH,CAAC;IAEO,iBAAiB,CAAC,eAAyB,EAAE,CAAS;QAC5D,OAAO,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7D,CAAC;CACF"}
+{"version":3,"file":"migrator.js","sourceRoot":"","sources":["../../src/migration/migrator.ts"],"names":[],"mappings":"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"}

package/dist/orm.d.ts

@@ -2,12 +2,13 @@ import { ConnectionSettings, DriverInterface } from './driver/driver.interface';
 import { LoggerService } from '@cheetah.js/core';
 import { SqlBuilder } from './SqlBuilder';
 export declare class Orm<T extends DriverInterface = DriverInterface> {
-    connection: ConnectionSettings<T>;
     logger: LoggerService;
     driverInstance: T;
     static instance: Orm<any>;
+    connection: ConnectionSettings<T>;
+    constructor(logger: LoggerService);
     static getInstance(): Orm<any>;
-    constructor(connection: ConnectionSettings<T>, logger: LoggerService);
+    setConnection(connection: ConnectionSettings<T>): void;
     createQueryBuilder<Model>(model: new () => Model): SqlBuilder<Model>;
     connect(): Promise<void>;
     disconnect(): Promise<void>;

package/dist/orm.js

@@ -1,14 +1,27 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var Orm_1;
+import { LoggerService, Service } from '@cheetah.js/core';
 import { SqlBuilder } from './SqlBuilder';
-export class Orm {
+let Orm = Orm_1 = class Orm {
+    constructor(logger) {
+        this.logger = logger;
+        // Orm.instance = this
+    }
     static getInstance() {
-        return Orm.instance;
+        return Orm_1.instance;
     }
-    constructor(connection, logger) {
+    setConnection(connection) {
         this.connection = connection;
-        this.logger = logger;
         // @ts-ignore
         this.driverInstance = new this.connection.driver(connection);
-        Orm.instance = this;
     }
     createQueryBuilder(model) {
         return new SqlBuilder(model);
@@ -19,5 +32,10 @@ export class Orm {
     disconnect() {
         return this.driverInstance.disconnect();
     }
-}
+};
+Orm = Orm_1 = __decorate([
+    Service(),
+    __metadata("design:paramtypes", [LoggerService])
+], Orm);
+export { Orm };
 //# sourceMappingURL=orm.js.map

package/dist/orm.js.map

@@ -1 +1 @@
-{"version":3,"file":"orm.js","sourceRoot":"","sources":["../src/orm.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,OAAO,GAAG;IAId,MAAM,CAAC,WAAW;QAChB,OAAO,GAAG,CAAC,QAAQ,CAAA;IACrB,CAAC;IAED,YAAmB,UAAiC,EAAS,MAAqB;QAA/D,eAAU,GAAV,UAAU,CAAuB;QAAS,WAAM,GAAN,MAAM,CAAe;QAChF,aAAa;QACb,IAAI,CAAC,cAAc,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QAC5D,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAA;IACrB,CAAC;IAED,kBAAkB,CAAQ,KAAqB;QAC7C,OAAO,IAAI,UAAU,CAAQ,KAAK,CAAC,CAAA;IACrC,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAA;IACtC,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,CAAA;IACzC,CAAC;CACF"}
+{"version":3,"file":"orm.js","sourceRoot":"","sources":["../src/orm.ts"],"names":[],"mappings":";;;;;;;;;;AACA,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAGnC,IAAM,GAAG,WAAT,MAAM,GAAG;IAKd,YAAmB,MAAqB;QAArB,WAAM,GAAN,MAAM,CAAe;QACtC,sBAAsB;IACxB,CAAC;IAED,MAAM,CAAC,WAAW;QAChB,OAAO,KAAG,CAAC,QAAQ,CAAA;IACrB,CAAC;IAEM,aAAa,CAAC,UAAiC;QACpD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,aAAa;QACb,IAAI,CAAC,cAAc,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IAC9D,CAAC;IAED,kBAAkB,CAAQ,KAAqB;QAC7C,OAAO,IAAI,UAAU,CAAQ,KAAK,CAAC,CAAA;IACrC,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAA;IACtC,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,CAAA;IACzC,CAAC;CACF,CAAA;AA9BY,GAAG;IADf,OAAO,EAAE;qCAMmB,aAAa;GAL7B,GAAG,CA8Bf"}

package/dist/orm.service.d.ts

@@ -1,8 +1,10 @@
 import { EntityStorage } from './domain/entities';
+import { Orm } from './orm';
 export declare class OrmService {
+    private orm;
     private storage;
     private allEntities;
-    constructor(storage: EntityStorage, entityFile?: string | undefined);
-    onInit(): Promise<void>;
+    constructor(orm: Orm, storage: EntityStorage, entityFile?: string);
+    onInit(customConfig?: any): Promise<void>;
     private getSourceFilePaths;
 }

package/dist/orm.service.js

@@ -12,8 +12,10 @@ import { EntityStorage } from './domain/entities';
 import { ENTITIES, PROPERTIES_METADATA, PROPERTIES_RELATIONS } from './constants';
 import { globbySync } from 'globby';
 import { Project, SyntaxKind } from 'ts-morph';
+import { Orm } from './orm';
 let OrmService = class OrmService {
-    constructor(storage, entityFile = undefined) {
+    constructor(orm, storage, entityFile) {
+        this.orm = orm;
         this.storage = storage;
         this.allEntities = new Map();
         console.log('Preparing entities...');
@@ -51,13 +53,16 @@ let OrmService = class OrmService {
             });
         });
     }
-    async onInit() {
+    async onInit(customConfig = {}) {
         const configFile = globbySync('cheetah.config.ts', { absolute: true });
         if (configFile.length === 0) {
             console.log('No config file found!');
             return;
         }
         const config = await import(configFile[0]);
+        const setConfig = Object.keys(customConfig).length > 0 ? customConfig : config.default;
+        this.orm.setConnection(setConfig);
+        await this.orm.connect();
         if (typeof config.default.entities === 'string') {
             const files = globbySync([config.default.entities, '!node_modules'], { gitignore: true, absolute: true });
             for (const file of files) {
@@ -104,12 +109,12 @@ let OrmService = class OrmService {
 __decorate([
     OnApplicationInit(),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
+    __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)
 ], OrmService.prototype, "onInit", null);
 OrmService = __decorate([
     Service(),
-    __metadata("design:paramtypes", [EntityStorage, Object])
+    __metadata("design:paramtypes", [Orm, EntityStorage, String])
 ], OrmService);
 export { OrmService };
 //# sourceMappingURL=orm.service.js.map

package/dist/orm.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"orm.service.js","sourceRoot":"","sources":["../src/orm.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"orm.service.js","sourceRoot":"","sources":["../src/orm.service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cheetah.js/orm",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "A simple ORM for Cheetah.js",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/src/entry.ts

@@ -0,0 +1,6 @@
+import { Cheetah } from '@cheetah.js/core';
+import { Orm } from './orm';
+import { OrmService } from './orm.service';
+import { EntityStorage } from './domain/entities';
+
+export const CheetahOrm = new Cheetah({exports: [Orm, OrmService, EntityStorage]})

package/src/index.ts

@@ -1,7 +1,3 @@
-import { Cheetah } from '@cheetah.js/core';
-import { OrmService } from '@cheetah.js/orm/orm.service';
-import { EntityStorage } from '@cheetah.js/orm/domain/entities';
-
 export * from './decorators/entity.decorator';
 export * from './decorators/property.decorator';
 export * from './decorators/primary-key.decorator';
@@ -13,5 +9,4 @@ export * from './domain/base-entity'
 export * from './driver/pg-driver'
 export * from './utils'
 export * from './driver/driver.interface'
-
-export const CheetahOrm = new Cheetah({exports: [OrmService, EntityStorage]})
+export * from './entry'

package/src/migration/migrator.ts

@@ -3,7 +3,7 @@ import { ColDiff, ConnectionSettings, DriverInterface, SnapshotTable } from '@ch
 import { globby } from 'globby'
 import { Orm, OrmService } from '@cheetah.js/orm';
 import { InjectorService, LoggerService } from '@cheetah.js/core';
-import { EntityStorage } from '@cheetah.js/orm/domain/entities';
+import { EntityStorage } from '../domain/entities';
 import * as path from 'path';
 import * as fs from 'fs';
 import { DiffCalculator } from './diff-calculator';
@@ -33,14 +33,13 @@ export class Migrator {
       }
     }
 
-    this.orm = new Orm(this.config, new LoggerService(new InjectorService()));
-    await this.orm.connect();
+    this.orm = new Orm(new LoggerService(new InjectorService()));
+    this.entities = new EntityStorage();
+    const serv = new OrmService(this.orm, this.entities)
+    await serv.onInit(this.config);
   }
 
   async initMigration() {
-    this.entities = new EntityStorage();
-    const serv = new OrmService(this.entities)
-    serv.onInit();
     const snapshotBd = await this.snapshotBd();
     const snapshotEntities = await this.snapshotEntities();
     const calculator = new DiffCalculator(this.entities);

package/src/orm.service.ts

@@ -3,14 +3,13 @@ import { EntityStorage, Property } from './domain/entities';
 import { ENTITIES, PROPERTIES_METADATA, PROPERTIES_RELATIONS } from './constants';
 import { globbySync } from 'globby';
 import { Project, SyntaxKind } from 'ts-morph';
-import { Orm } from '@cheetah.js/orm/orm';
-import { ConnectionSettings } from '@cheetah.js/orm/driver/driver.interface';
+import { Orm } from './orm';
 
 @Service()
 export class OrmService {
   private allEntities = new Map<string, { nullables: string[], defaults: { [key: string]: any } }>();
 
-  constructor(private storage: EntityStorage, entityFile: string | undefined = undefined) {
+  constructor(private orm: Orm, private storage: EntityStorage, entityFile?: string) {
     console.log('Preparing entities...')
     const files = new Project({skipLoadingLibFiles: true}).addSourceFilesAtPaths(entityFile ?? this.getSourceFilePaths())
     files.forEach(file => {
@@ -52,13 +51,19 @@ export class OrmService {
   }
 
   @OnApplicationInit()
-  async onInit() {
+  async onInit(customConfig: any = {}) {
+
     const configFile = globbySync('cheetah.config.ts', {absolute: true});
     if (configFile.length === 0) {
       console.log('No config file found!')
       return;
     }
+
     const config = await import(configFile[0]);
+    const setConfig = Object.keys(customConfig).length > 0 ? customConfig :  config.default;
+
+    this.orm.setConnection(setConfig);
+    await this.orm.connect();
 
     if (typeof config.default.entities === 'string') {
       const files = globbySync([config.default.entities, '!node_modules'], {gitignore: true, absolute: true})

package/src/orm.ts

@@ -1,19 +1,25 @@
-import { ConnectionSettings, DriverInterface, InstanceOf } from './driver/driver.interface';
-import { LoggerService } from '@cheetah.js/core';
+import { ConnectionSettings, DriverInterface } from './driver/driver.interface';
+import { LoggerService, Service } from '@cheetah.js/core';
 import { SqlBuilder } from './SqlBuilder';
 
+@Service()
 export class Orm<T extends DriverInterface = DriverInterface> {
   driverInstance: T;
   static instance: Orm<any>
+  public connection: ConnectionSettings<T>
 
-  static getInstance() {
+  constructor(public logger: LoggerService) {
+    Orm.instance = this
+  }
+
+  static getInstance(): Orm<any> {
     return Orm.instance
   }
 
-  constructor(public connection: ConnectionSettings<T>, public logger: LoggerService) {
+  public setConnection(connection: ConnectionSettings<T>) {
+    this.connection = connection
     // @ts-ignore
     this.driverInstance = new this.connection.driver(connection)
-    Orm.instance = this
   }
 
   createQueryBuilder<Model>(model: new() => Model): SqlBuilder<Model> {

package/test/node-database.ts

@@ -9,18 +9,16 @@ export let app: Orm<PgDriver>
 export const mockLogger = spyOn(loggerInstance, 'debug')
 
 export async function startDatabase(entityFile: string | undefined = undefined, logger: LoggerService = loggerInstance) {
-  const service = new OrmService(new EntityStorage(), entityFile)
-  app = new Orm({
+  app = new Orm(logger)
+  const service = new OrmService(app, new EntityStorage(), entityFile)
+  await service.onInit({
     host: 'localhost',
     port: 5432,
     database: 'postgres',
     username: 'postgres',
     password: 'postgres',
     driver: PgDriver,
-  }, logger)
-  service.onInit()
-
-  await app.connect()
+  })
 }
 
 export async function purgeDatabase(schema: string = 'public') {

package/test/migration/.sql

@@ -1,5 +0,0 @@
-CREATE TABLE "public"."user" ("id" numeric(11) NOT NULL PRIMARY KEY UNIQUE,"email" character varying(255) NOT NULL);
-CREATE INDEX "id_email_index" ON "public"."user" ("id", "email");
-CREATE INDEX "email_index" ON "public"."user" ("email");
-CREATE TABLE "public"."address" ("id" numeric(11) NOT NULL PRIMARY KEY UNIQUE,"user" numeric(11) NOT NULL);
-ALTER TABLE "public"."address" ADD CONSTRAINT "address_user_fk" FOREIGN KEY ("user") REFERENCES "user" ("id");