@rws-framework/db 2.2.10 → 2.3.0

package/dist/decorators/TrackType.d.ts

@@ -2,6 +2,7 @@ import 'reflect-metadata';
 import { OpModelType } from '../models/interfaces/OpModelType';
 interface ITrackerOpts {
     required?: boolean;
+    isArray?: boolean;
     relationField?: string;
     relatedToField?: string;
     relatedTo?: OpModelType<any>;
@@ -11,6 +12,8 @@ interface ITrackerOpts {
 interface IMetaOpts extends ITrackerOpts {
     type: any;
     tags: string[];
+    required: boolean;
+    isArray: boolean;
 }
 declare function TrackType(type: any, opts?: ITrackerOpts | null, tags?: string[]): (target: any, key: string) => void;
 export default TrackType;

package/dist/decorators/TrackType.js

@@ -4,11 +4,16 @@ require("reflect-metadata");
 function TrackType(type, opts = null, tags = []) {
     if (!opts) {
         opts = {
-            required: false
+            required: false,
+            isArray: false
         };
     }
+    else if (opts === null || opts === void 0 ? void 0 : opts.isArray) {
+        opts.isArray = false;
+    }
     const required = opts.required;
-    const metaOpts = { type, tags, required };
+    const isArray = opts.isArray;
+    const metaOpts = { type, tags, required, isArray };
     if (opts.relatedToField && opts.relatedTo) {
         metaOpts.relatedToField = opts.relatedToField;
         metaOpts.relatedTo = opts.relatedTo;

package/dist/helper/DbHelper.d.ts

@@ -1,8 +1,8 @@
 import { IDbConfigHandler } from '../types/DbConfigHandler';
-import { OpModelType } from '../models/_model';
+import { IMetaOpts, OpModelType } from '../models/_model';
 import { DBService } from '../services/DBService';
 export declare class DbHelper {
     static installPrisma(configService: IDbConfigHandler, dbService: DBService, leaveFile?: boolean): Promise<void>;
     static generateModelSections(model: OpModelType<any>): Promise<string>;
-    static toConfigCase(modelType: any): string;
+    static toConfigCase(modelType: IMetaOpts): string;
 }

package/dist/helper/DbHelper.js

@@ -69,7 +69,7 @@ class DbHelper {
         section += '\tid String @map("_id") @id @default(auto()) @db.ObjectId\n';
         for (const key in modelMetadatas) {
             const modelMetadata = modelMetadatas[key].metadata;
-            const requiredString = modelMetadata.required ? '' : '?';
+            let requiredString = modelMetadata.required ? '' : '?';
             const annotationType = modelMetadatas[key].annotationType;
             if (key === 'id') {
                 continue;
@@ -105,6 +105,9 @@ class DbHelper {
             }
             else if (annotationType === 'TrackType') {
                 const tags = modelMetadata.tags.map((item) => '@' + item);
+                if (modelMetadata.isArray || modelMetadata.type.name === 'Array') {
+                    requiredString = '';
+                }
                 section += `\t${key} ${DbHelper.toConfigCase(modelMetadata)}${requiredString} ${tags.join(' ')}\n`;
             }
         }
@@ -113,22 +116,26 @@ class DbHelper {
     }
     static toConfigCase(modelType) {
         const type = modelType.type;
-        const input = type.name;
+        let input = type.name;
         if (input == 'Number') {
-            return 'Int';
+            input = 'Int';
         }
         if (input == 'Object') {
-            return 'Json';
+            input = 'Json';
         }
         if (input == 'Date') {
-            return 'DateTime';
+            input = 'DateTime';
         }
         if (input == 'Array') {
-            return 'Json';
+            input = 'Json[]';
         }
         const firstChar = input.charAt(0).toUpperCase();
         const restOfString = input.slice(1);
-        return firstChar + restOfString;
+        let resultField = firstChar + restOfString;
+        if (modelType.isArray) {
+            resultField += '[]';
+        }
+        return resultField;
     }
 }
 exports.DbHelper = DbHelper;

package/dist/services/DBService.d.ts

@@ -1,4 +1,4 @@
-import { Collection, MongoClient } from 'mongodb';
+import { Collection, Db, MongoClient } from 'mongodb';
 import { ITimeSeries } from '../types/ITimeSeries';
 import { IModel } from '../models/interfaces/IModel';
 import { IDbConfigHandler } from '../types/DbConfigHandler';
@@ -16,8 +16,8 @@ declare class DBService {
     private connectToDB;
     reconnect(opts?: IDBClientCreate): void;
     static baseClientConstruct(dbUrl: string): MongoClient;
-    private createBaseMongoClient;
-    private createBaseMongoClientDB;
+    createBaseMongoClient(): Promise<MongoClient>;
+    createBaseMongoClientDB(): Promise<[MongoClient, Db]>;
     cloneDatabase(source: string, target: string): Promise<void>;
     watchCollection(collectionName: string, preRun: () => void): Promise<any>;
     insert(data: any, collection: string, isTimeSeries?: boolean): Promise<any>;

package/dist/services/DBService.js

@@ -60,7 +60,7 @@ class DBService {
         var _a;
         const dbName = ((_a = this.opts) === null || _a === void 0 ? void 0 : _a.dbName) || this.configService.get('mongo_db');
         const client = await this.createBaseMongoClient();
-        return client.db(dbName);
+        return [client, client.db(dbName)];
     }
     async cloneDatabase(source, target) {
         const client = await this.createBaseMongoClient();
@@ -77,7 +77,7 @@ class DBService {
         await client.close();
     }
     async watchCollection(collectionName, preRun) {
-        const db = await this.createBaseMongoClientDB();
+        const [client, db] = await this.createBaseMongoClientDB();
         const collection = db.collection(collectionName);
         const changeStream = collection.watch();
         return new Promise((resolve) => {
@@ -91,7 +91,7 @@ class DBService {
         let result = data;
         // Insert time-series data outside of the transaction
         if (isTimeSeries) {
-            const db = await this.createBaseMongoClientDB();
+            const [client, db] = await this.createBaseMongoClientDB();
             const collectionHandler = db.collection(collection);
             const insert = await collectionHandler.insertOne(data);
             result = await this.findOneBy(collection, { id: insert.insertedId.toString() });
@@ -168,7 +168,7 @@ class DBService {
     }
     async createTimeSeriesCollection(collection_name) {
         try {
-            const db = await this.createBaseMongoClientDB();
+            const [client, db] = await this.createBaseMongoClientDB();
             // Create a time series collection
             const options = {
                 timeseries: {

package/package.json

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

package/src/decorators/TrackType.ts

@@ -3,7 +3,8 @@ import { OpModelType } from '../models/interfaces/OpModelType';
 
 interface ITrackerOpts{
     required?: boolean,
-    relationField?: string
+    isArray?: boolean,
+    relationField?: string,
     relatedToField?: string,
     relatedTo?: OpModelType<any>,
     inversionModel?: OpModelType<any>,
@@ -12,19 +13,25 @@ interface ITrackerOpts{
   
   interface IMetaOpts extends ITrackerOpts{
     type: any,
-    tags: string[]
+    tags: string[],
+    required: boolean,
+    isArray: boolean
   }
   
 function TrackType(type: any, opts: ITrackerOpts | null = null, tags: string[] = []) {
     if(!opts){
         opts = {
-            required: false
+            required: false,
+            isArray: false
         };
+    }else if(opts?.isArray){
+        opts.isArray = false;
     }
   
     const required = opts.required;
+    const isArray = opts.isArray;
   
-    const metaOpts: IMetaOpts = {type, tags, required};
+    const metaOpts: IMetaOpts = {type, tags, required, isArray};
   
     if(opts.relatedToField && opts.relatedTo){
         metaOpts.relatedToField = opts.relatedToField;      

package/src/helper/DbHelper.ts

@@ -92,7 +92,7 @@ export class DbHelper {
      
         for (const key in modelMetadatas) {
             const modelMetadata = modelMetadatas[key].metadata;            
-            const requiredString = modelMetadata.required ? '' : '?';  
+            let requiredString = modelMetadata.required ? '' : '?';  
             const annotationType: string = modelMetadatas[key].annotationType;
     
             if(key === 'id'){
@@ -131,7 +131,10 @@ export class DbHelper {
             } else if (annotationType === 'InverseTimeSeries'){        
                 section += `\t${key} String[] @db.ObjectId\n`;      
             } else if (annotationType === 'TrackType'){        
-                const tags: string[] = modelMetadata.tags.map((item: string) => '@' + item);          
+                const tags: string[] = modelMetadata.tags.map((item: string) => '@' + item);   
+                if(modelMetadata.isArray || modelMetadata.type.name === 'Array'){
+                    requiredString = '';
+                }       
                 section += `\t${key} ${DbHelper.toConfigCase(modelMetadata)}${requiredString} ${tags.join(' ')}\n`;
             }
         }
@@ -140,29 +143,34 @@ export class DbHelper {
         return section;
     }
     
-    static toConfigCase(modelType: any): string {
+    static toConfigCase(modelType: IMetaOpts): string {
         const type = modelType.type;
-        const input = type.name;  
+        let input = type.name;        
     
         if(input == 'Number'){
-            return 'Int';
+            input = 'Int';
         }
     
         if(input == 'Object'){
-            return 'Json';
+            input = 'Json';
         }
     
         if(input == 'Date'){
-            return 'DateTime';
+            input = 'DateTime';
         }
 
         if(input == 'Array'){
-            return 'Json';
+            input = 'Json[]';
         }
     
-    
         const firstChar = input.charAt(0).toUpperCase();
         const restOfString = input.slice(1);
-        return firstChar + restOfString;
+        let resultField = firstChar + restOfString;
+
+        if(modelType.isArray){
+            resultField += '[]';
+        }
+
+        return resultField;
     }
 }

package/src/services/DBService.ts

@@ -63,7 +63,7 @@ class DBService {
         return client;
     }
 
-    private async createBaseMongoClient(): Promise<MongoClient>
+    public async createBaseMongoClient(): Promise<MongoClient>
     {
         const dbUrl = this.opts?.dbUrl || this.configService.get('mongo_url');
         const client = DBService.baseClientConstruct(dbUrl);
@@ -74,11 +74,11 @@ class DBService {
 
     }
 
-    private async createBaseMongoClientDB(): Promise<Db>
+    public async createBaseMongoClientDB(): Promise<[MongoClient, Db]>
     {
         const dbName = this.opts?.dbName || this.configService.get('mongo_db');
         const client = await this.createBaseMongoClient();
-        return client.db(dbName);
+        return [client, client.db(dbName)];
     }
 
     public async cloneDatabase(source: string, target: string): Promise<void> {
@@ -102,7 +102,7 @@ class DBService {
 
     async watchCollection(collectionName: string, preRun: () => void): Promise<any>
     {    
-        const db = await this.createBaseMongoClientDB();
+        const [client, db] = await this.createBaseMongoClientDB();
         const collection = db.collection(collectionName);
 
         const changeStream = collection.watch();    
@@ -121,7 +121,7 @@ class DBService {
         // Insert time-series data outside of the transaction
 
         if(isTimeSeries){
-            const db = await this.createBaseMongoClientDB();
+            const [client, db] = await this.createBaseMongoClientDB();
             const collectionHandler = db.collection(collection);
       
             const insert = await collectionHandler.insertOne(data);
@@ -237,7 +237,7 @@ class DBService {
     async createTimeSeriesCollection(collection_name: string): Promise<Collection<ITimeSeries>>
     {    
         try {    
-            const db = await this.createBaseMongoClientDB();
+            const [client, db] = await this.createBaseMongoClientDB();
 
             // Create a time series collection
             const options = {