@rws-framework/db 2.1.9 → 2.1.11

package/README.md

@@ -10,34 +10,38 @@ import User from "./User";
 
 export const models = [ User, ApiKey];
 ```
-
-
 ## Example user model
 
 ```typescript
-    import { RWSannotations, RWSModel } from '@rws-framework/server';
+    import { TrackType, InverseRelation, RWSCollection, RWSModel } from '@rws-framework/db';
 
-import IUser from './interfaces/IUser';
-import 'reflect-metadata';
+    import IUser from './interfaces/IUser';
+    import 'reflect-metadata';
 
-import ApiKey from './ApiKey';
-import IApiKey from './interfaces/IApiKey';
-const { RWSTrackType, InverseRelation } = RWSannotations.modelAnnotations;
+    import ApiKey from './ApiKey';
+    import IApiKey from './interfaces/IApiKey';
 
+@RWSCollection('users', { 
+    relations: {
+        transcriptions: true,
+        apiKeys: true
+    },
+    ignored_keys: ['passwd']
+})
 class User extends RWSModel<User> implements IUser {
-    @RWSTrackType(String)
+    @TrackType(String)
     username: string;
 
-    @RWSTrackType(String) // Can also handle Object and Number
+    @TrackType(String) // Can also handle Object and Number
     passwd: string;
 
-    @RWSTrackType(Boolean)
+    @TrackType(Boolean)
     active: boolean;
 
-    @RWSTrackType(Date, { required: true })
+    @TrackType(Date, { required: true })
     created_at: Date;
   
-    @RWSTrackType(Date)
+    @TrackType(Date)
     updated_at: Date;
 
     /**
@@ -47,25 +51,12 @@ class User extends RWSModel<User> implements IUser {
     @InverseRelation(() => ApiKey, () => User)
     apiKeys: IApiKey[];
 
-    static _collection = 'user';
-
-    static _RELATIONS = {
-        transcriptions: true,
-        apiKeys: true
-    };
-
-    static _CUT_KEYS = ['passwd'];
-
     constructor(data?: IUser) {   
         super(data);    
 
         if(!this.created_at){
             this.created_at = new Date();
         }      
-    }    
-
-    addMessage(message: string){
-        this.messages.push(message);
     }
 }
 

package/dist/helper/DbHelper.js

@@ -51,9 +51,10 @@ class DbHelper {
             fs_1.default.writeFileSync(schemaPath, template);
             process.env.DB_URL = dbUrl;
             const endPrisma = 'npx prisma';
-            const clientPath = path_1.default.join(console_1.rwsPath.findRootWorkspacePath(), 'node_modules', '.prisma', 'client');
+            // console.log({cwd: process.cwd()})
+            // const clientPath = path.join(rwsPath.findRootWorkspacePath(), 'node_modules', '.prisma', 'client');
             await console_1.rwsShell.runCommand(`${endPrisma} generate --schema=${schemaPath}`, process.cwd());
-            leaveFile = true;
+            leaveFile = false;
             log(chalk_1.default.green('[RWS Init]') + ' prisma schema generated from ', schemaPath);
             if (!leaveFile) {
                 fs_1.default.unlinkSync(schemaPath);

package/dist/models/_model.d.ts

@@ -73,7 +73,7 @@ declare class RWSModel<ChildClass> implements IModel {
     static checkForInclusionWithThrow(this: OpModelType<any>, checkModelType: string): void;
     checkForInclusion(): boolean;
     static checkForInclusion(this: OpModelType<any>, checkModelType: string): boolean;
-    protected _fill(data: any): RWSModel<ChildClass>;
+    _fill(data: any): RWSModel<ChildClass>;
     protected hasRelation(key: string): boolean;
     protected bindRelation(key: string, relatedModel: RWSModel<any>): RelationBindType;
     _asyncFill(data: any, fullDataMode?: boolean, allowRelations?: boolean): Promise<ChildClass>;

package/dist/models/_model.js

@@ -119,7 +119,6 @@ class RWSModel {
         });
         const seriesHydrationfields = [];
         if (allowRelations) {
-            // Handle many-to-many relations
             for (const key in relManyData) {
                 if (!fullDataMode && this.constructor._CUT_KEYS.includes(key)) {
                     continue;
@@ -135,7 +134,6 @@ class RWSModel {
                     });
                 }
             }
-            // Handle one-to-one relations
             for (const key in relOneData) {
                 if (!fullDataMode && this.constructor._CUT_KEYS.includes(key)) {
                     continue;

package/dist/services/DBService.d.ts

@@ -13,6 +13,7 @@ declare class DBService {
     private connected;
     constructor(configService: IDbConfigHandler);
     private connectToDB;
+    reconnect(opts?: IDBClientCreate): void;
     private createBaseMongoClient;
     private createBaseMongoClientDB;
     cloneDatabase(source: string, target: string): Promise<void>;

package/dist/services/DBService.js

@@ -42,6 +42,9 @@ class DBService {
             throw new Error('PRISMA CONNECTION ERROR');
         }
     }
+    reconnect(opts = null) {
+        this.connectToDB(opts);
+    }
     async createBaseMongoClient() {
         var _a;
         const dbUrl = ((_a = this.opts) === null || _a === void 0 ? void 0 : _a.dbUrl) || this.configService.get('mongo_url');

package/package.json

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

package/src/helper/DbHelper.ts

@@ -68,10 +68,11 @@ export class DbHelper {
             process.env.DB_URL = dbUrl;
             const endPrisma = 'npx prisma';
 
-            const clientPath = path.join(rwsPath.findRootWorkspacePath(), 'node_modules', '.prisma', 'client');
+            // console.log({cwd: process.cwd()})
+            // const clientPath = path.join(rwsPath.findRootWorkspacePath(), 'node_modules', '.prisma', 'client');
             await rwsShell.runCommand(`${endPrisma} generate --schema=${schemaPath}`, process.cwd());  
 
-            leaveFile = true;
+            leaveFile = false;
             log(chalk.green('[RWS Init]') + ' prisma schema generated from ', schemaPath);
 
             if(!leaveFile){

package/src/models/_model.ts

@@ -1,4 +1,4 @@
-import {DBService} from '../services/DBService';
+import {DBService, IDBClientCreate} from '../services/DBService';
 import { IRWSModel } from '../types/IRWSModel';
 import { IDbConfigHandler } from '../types/DbConfigHandler';
 
@@ -59,7 +59,7 @@ export interface OpModelType<ChildClass> {
     getRelationOneMeta(model: any, classFields: string[]): Promise<RelOneMetaType<IRWSModel>>;
     getRelationManyMeta(model: any, classFields: string[]): Promise<RelManyMetaType<IRWSModel>>;
     getCollection(): string;
-    setServices(services: IRWSModelServices): void;
+    setServices(services: IRWSModelServices): void;    
 }
 
 class RWSModel<ChildClass> implements IModel{
@@ -118,7 +118,7 @@ class RWSModel<ChildClass> implements IModel{
         }) !== undefined;
     }
 
-    protected _fill(data: any): RWSModel<ChildClass>{
+    _fill(data: any): RWSModel<ChildClass>{
         for (const key in data) {
             if (data.hasOwnProperty(key)) {   
               
@@ -170,7 +170,6 @@ class RWSModel<ChildClass> implements IModel{
         const seriesHydrationfields: string[] = []; 
         
         if (allowRelations) {
-            // Handle many-to-many relations
             for (const key in relManyData) { 
                 if(!fullDataMode && (this as any).constructor._CUT_KEYS.includes(key)){
                     continue;
@@ -188,8 +187,7 @@ class RWSModel<ChildClass> implements IModel{
                     });    
                 }                                
             }
-            
-            // Handle one-to-one relations
+  
             for (const key in relOneData) {      
                 if(!fullDataMode && (this as any).constructor._CUT_KEYS.includes(key)){
                     continue;

package/src/services/DBService.ts

@@ -50,6 +50,11 @@ class DBService {
         }
     }
 
+    reconnect(opts: IDBClientCreate = null)
+    {
+        this.connectToDB(opts);
+    }
+
     private async createBaseMongoClient(): Promise<MongoClient>
     {
         const dbUrl = this.opts?.dbUrl || this.configService.get('mongo_url');