@rws-framework/db 2.2.3 → 2.2.5

package/dist/helper/DbHelper.js

@@ -9,7 +9,7 @@ const chalk_1 = __importDefault(require("chalk"));
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const _model_1 = require("../models/_model");
-const TimeSeriesModel_1 = __importDefault(require("../models/TimeSeriesModel"));
+const TimeSeriesModel_1 = __importDefault(require("../models/core/TimeSeriesModel"));
 const log = console.log;
 const workspaceRoot = console_1.rwsPath.findRootWorkspacePath();
 const moduleDir = path_1.default.resolve(workspaceRoot, 'node_modules', '@rws-framework', 'db');

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { DBService } from "./services/DBService";
 import { RWSModel, OpModelType } from "./models/_model";
-import TimeSeriesModel from './models/TimeSeriesModel';
+import TimeSeriesModel from './models/core/TimeSeriesModel';
 import { InverseRelation, Relation, TrackType, InverseTimeSeries, IMetaOpts } from './decorators';
 import { DbHelper } from './helper/DbHelper';
 import { FieldsHelper } from './helper/FieldsHelper';

package/dist/index.js

@@ -8,7 +8,7 @@ const DBService_1 = require("./services/DBService");
 Object.defineProperty(exports, "DBService", { enumerable: true, get: function () { return DBService_1.DBService; } });
 const _model_1 = require("./models/_model");
 Object.defineProperty(exports, "RWSModel", { enumerable: true, get: function () { return _model_1.RWSModel; } });
-const TimeSeriesModel_1 = __importDefault(require("./models/TimeSeriesModel"));
+const TimeSeriesModel_1 = __importDefault(require("./models/core/TimeSeriesModel"));
 exports.TimeSeriesModel = TimeSeriesModel_1.default;
 const decorators_1 = require("./decorators");
 Object.defineProperty(exports, "InverseRelation", { enumerable: true, get: function () { return decorators_1.InverseRelation; } });

package/dist/models/_model.d.ts

@@ -2,4 +2,5 @@
  * @deprecated This file is deprecated. Import from 'models' directory instead.
  */
 import { IModel, IRWSModelServices, OpModelType, RelationBindType, RelOneMetaType, RelManyMetaType, RWSModel, TrackType, IMetaOpts } from './index';
-export { IModel, IRWSModelServices, OpModelType, RelationBindType, RelOneMetaType, RelManyMetaType, RWSModel, TrackType, IMetaOpts };
+export { RWSModel, TrackType };
+export type { IModel, IRWSModelServices, OpModelType, RelationBindType, RelOneMetaType, RelManyMetaType, IMetaOpts };

package/dist/models/core/RWSModel.d.ts

@@ -61,5 +61,6 @@ declare class RWSModel<ChildClass> implements IModel {
     private checkRelEnabled;
     static setServices(services: IRWSModelServices): void;
     getDb(): DBService;
+    static getDb(): DBService;
 }
 export { RWSModel };

package/dist/models/core/RWSModel.js

@@ -361,6 +361,9 @@ class RWSModel {
     getDb() {
         return this.services.dbService;
     }
+    static getDb() {
+        return this.services.dbService;
+    }
 }
 exports.RWSModel = RWSModel;
 RWSModel.services = {};

package/dist/models/core/TimeSeriesModel.d.ts

@@ -1,5 +1,5 @@
 import { RWSModel } from './RWSModel';
-export default class TimeSeriesModel<ChildClass> extends RWSModel<TimeSeriesModel<ChildClass>> {
+export default class TimeSeriesModel<T> extends RWSModel<T> {
     value: number;
     timestamp: Date;
     params: any;

package/dist/models/interfaces/IModel.d.ts

@@ -4,6 +4,7 @@ export interface IModel {
     [key: string]: any;
     id: string | null;
     save: () => void;
+    getDb: () => DBService;
     getCollection: () => string | null;
     configService?: IDbConfigHandler;
     dbService?: DBService;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rws-framework/db",
   "private": false,
-  "version": "2.2.3",
+  "version": "2.2.5",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/helper/DbHelper.ts

@@ -5,7 +5,7 @@ import fs from 'fs';
 
 import { IDbConfigHandler } from '../types/DbConfigHandler';
 import { IMetaOpts, OpModelType, RWSModel } from '../models/_model';
-import TimeSeriesModel from '../models/TimeSeriesModel';
+import TimeSeriesModel from '../models/core/TimeSeriesModel';
 import { DBService } from '../services/DBService';
 import { IRelationOpts } from '../decorators/Relation';
 import { InverseRelationOpts } from '../decorators/InverseRelation';

package/src/index.ts

@@ -1,6 +1,6 @@
 import { DBService } from "./services/DBService";
 import { RWSModel, OpModelType } from "./models/_model";
-import TimeSeriesModel from './models/TimeSeriesModel';
+import TimeSeriesModel from './models/core/TimeSeriesModel';
 import { InverseRelation, Relation, TrackType, InverseTimeSeries, IMetaOpts } from './decorators';
 
 import { DbHelper } from './helper/DbHelper';

package/src/models/_model.ts

@@ -15,13 +15,16 @@ import {
 } from './index';
 
 export {
+    RWSModel,
+    TrackType
+};
+
+export type {
     IModel,
     IRWSModelServices,
     OpModelType,
     RelationBindType,
     RelOneMetaType,
-    RelManyMetaType,
-    RWSModel,
-    TrackType,
+    RelManyMetaType,    
     IMetaOpts
-};
+};

package/src/models/core/RWSModel.ts

@@ -477,6 +477,11 @@ class RWSModel<ChildClass> implements IModel {
     {
         return this.services.dbService;
     }
+
+    public static getDb(): DBService
+    {
+        return this.services.dbService;
+    }
 }
 
 export { RWSModel };

package/src/models/core/TimeSeriesModel.ts

@@ -1,7 +1,7 @@
 import { RWSModel } from './RWSModel';
 import { TrackType } from '../../decorators';
 
-export default class TimeSeriesModel<ChildClass> extends RWSModel<TimeSeriesModel<ChildClass>> {
+export default class TimeSeriesModel<T> extends RWSModel<T> {
     @TrackType(Number) value: number;
 
     @TrackType(Date) timestamp: Date;

package/src/models/interfaces/IModel.ts

@@ -5,6 +5,7 @@ export interface IModel {
     [key: string]: any;
     id: string | null;
     save: () => void;
+    getDb: () => DBService;
     getCollection: () => string | null;
     configService?: IDbConfigHandler;
     dbService?: DBService;

package/src/models/TimeSeriesModel.ts

@@ -1,18 +0,0 @@
-import { RWSModel, TrackType } from './_model';
-
-export default class TimeSeriesModel<ChildClass> extends RWSModel<TimeSeriesModel<ChildClass>>{
-    @TrackType(Number) value: number;
-
-    @TrackType(Date) timestamp: Date;
-    
-    @TrackType(Object)
-        params: any;
-
-    constructor(data?: any) {    
-        super(data);
-
-        if(!this.timestamp) {
-            this.timestamp = new Date();
-        }
-    }
-}