@rws-framework/db 2.3.2 → 2.4.1

package/dist/helper/DbHelper.js

@@ -14,14 +14,14 @@ const workspaceRoot = console_1.rwsPath.findRootWorkspacePath();
 const moduleDir = path_1.default.resolve(workspaceRoot, 'node_modules', '@rws-framework', 'db');
 class DbHelper {
     static async installPrisma(configService, dbService, leaveFile = false) {
-        const dbUrl = configService.get('mongo_url');
-        const dbType = 'mongodb';
-        let template = `generator client {\n
-        provider = "prisma-client-js"\n
+        const dbUrl = configService.get('db_url');
+        const dbType = configService.get('db_type') || 'mongodb';
+        let template = `generator client {\n
+        provider = "prisma-client-js"\n
     }\n\n`;
-        template += `\ndatasource db {\n
-        provider = "${dbType}"\n
-        url = env("DATABASE_URL")\n    
+        template += `\ndatasource db {\n
+        provider = "${dbType}"\n
+        url = env("PRISMA_DB_URL")\n
     }\n\n`;
         const dbModels = configService.get('db_models');
         if (dbModels) {

package/dist/models/TimeSeriesModel.d.ts

@@ -1,7 +1,7 @@
-import { RWSModel } from './_model';
-export default class TimeSeriesModel<ChildClass> extends RWSModel<TimeSeriesModel<ChildClass>> {
-    value: number;
-    timestamp: Date;
-    params: any;
-    constructor(data?: any);
-}
+import { RWSModel } from './_model';
+export default class TimeSeriesModel<ChildClass> extends RWSModel<TimeSeriesModel<ChildClass>> {
+    value: number;
+    timestamp: Date;
+    params: any;
+    constructor(data?: any);
+}

package/dist/models/TimeSeriesModel.js

@@ -1,33 +1,33 @@
-"use strict";
-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);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const _model_1 = require("./_model");
-class TimeSeriesModel extends _model_1.RWSModel {
-    constructor(data) {
-        super(data);
-        if (!this.timestamp) {
-            this.timestamp = new Date();
-        }
-    }
-}
-exports.default = TimeSeriesModel;
-__decorate([
-    (0, _model_1.TrackType)(Number),
-    __metadata("design:type", Number)
-], TimeSeriesModel.prototype, "value", void 0);
-__decorate([
-    (0, _model_1.TrackType)(Date),
-    __metadata("design:type", Date)
-], TimeSeriesModel.prototype, "timestamp", void 0);
-__decorate([
-    (0, _model_1.TrackType)(Object),
-    __metadata("design:type", Object)
-], TimeSeriesModel.prototype, "params", void 0);
+"use strict";
+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);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const _model_1 = require("./_model");
+class TimeSeriesModel extends _model_1.RWSModel {
+    constructor(data) {
+        super(data);
+        if (!this.timestamp) {
+            this.timestamp = new Date();
+        }
+    }
+}
+exports.default = TimeSeriesModel;
+__decorate([
+    (0, _model_1.TrackType)(Number),
+    __metadata("design:type", Number)
+], TimeSeriesModel.prototype, "value", void 0);
+__decorate([
+    (0, _model_1.TrackType)(Date),
+    __metadata("design:type", Date)
+], TimeSeriesModel.prototype, "timestamp", void 0);
+__decorate([
+    (0, _model_1.TrackType)(Object),
+    __metadata("design:type", Object)
+], TimeSeriesModel.prototype, "params", void 0);

package/dist/services/DBService.d.ts

@@ -2,7 +2,7 @@ import { Collection, Db, MongoClient } from 'mongodb';
 import { ITimeSeries } from '../types/ITimeSeries';
 import { IModel } from '../models/interfaces/IModel';
 import { IDbConfigHandler } from '../types/DbConfigHandler';
-import { IPaginationParams } from 'src/types/FindParams';
+import { IPaginationParams } from '../types/FindParams';
 interface IDBClientCreate {
     dbUrl?: string;
     dbName?: string;

package/dist/services/DBService.js

@@ -19,8 +19,8 @@ class DBService {
         }
         else {
             this.opts = {
-                dbUrl: this.configService.get('mongo_url'),
-                dbName: this.configService.get('mongo_db'),
+                dbUrl: this.configService.get('db_url'),
+                dbName: this.configService.get('db_name'),
             };
         }
         if (!this.opts.dbUrl) {
@@ -51,14 +51,14 @@ class DBService {
     }
     async createBaseMongoClient() {
         var _a;
-        const dbUrl = ((_a = this.opts) === null || _a === void 0 ? void 0 : _a.dbUrl) || this.configService.get('mongo_url');
+        const dbUrl = ((_a = this.opts) === null || _a === void 0 ? void 0 : _a.dbUrl) || this.configService.get('db_url');
         const client = DBService.baseClientConstruct(dbUrl);
         await client.connect();
         return client;
     }
     async createBaseMongoClientDB() {
         var _a;
-        const dbName = ((_a = this.opts) === null || _a === void 0 ? void 0 : _a.dbName) || this.configService.get('mongo_db');
+        const dbName = ((_a = this.opts) === null || _a === void 0 ? void 0 : _a.dbName) || this.configService.get('db_name');
         const client = await this.createBaseMongoClient();
         return [client, client.db(dbName)];
     }
@@ -152,11 +152,11 @@ class DBService {
     }
     async collectionExists(collection_name) {
         var _a;
-        const dbUrl = ((_a = this.opts) === null || _a === void 0 ? void 0 : _a.dbUrl) || this.configService.get('mongo_url');
+        const dbUrl = ((_a = this.opts) === null || _a === void 0 ? void 0 : _a.dbUrl) || this.configService.get('db_url');
         const client = new mongodb_1.MongoClient(dbUrl);
         try {
             await client.connect();
-            const db = client.db(this.configService.get('mongo_db'));
+            const db = client.db(this.configService.get('db_name'));
             const collections = await db.listCollections().toArray();
             const existingCollectionNames = collections.map((collection) => collection.name);
             return existingCollectionNames.includes(collection_name);

package/dist/types/DbConfigHandler.d.ts

@@ -1,7 +1,8 @@
 import { OpModelType } from "../models/interfaces/OpModelType";
 export interface IDbConfigParams {
-    mongo_url?: string;
-    mongo_db?: string;
+    db_url?: string;
+    db_name?: string;
+    db_type?: string;
     db_models?: OpModelType<any>[];
 }
 export interface IDbConfigHandler {

package/exec/console.js

@@ -1,111 +1,111 @@
-#!/usr/bin/env node
-
-const { rwsShell, rwsPath } = require('@rws-framework/console');
-const chalk = require('chalk');
-const crypto = require('crypto');
-const path = require('path');
-const fs = require('fs');
-
-const params = process.argv.splice(2);
-let paramsString = params.length ? (' ' + params.join(' ')) : '';
-
-const appRoot = process.cwd();
-const rwsCliConfigDir = path.resolve(appRoot, 'node_modules', '.rws', 'cli');
-const getCachedPath = (key) => path.resolve(rwsCliConfigDir, key);
-
-const currentCwd = path.resolve(__dirname);
-
-console.log({params})
-
-
-const commandString = `npx webpack --config db.rws.webpack.config.js --output-path ./build ${process.cwd()} ${params[2]}`;
-function needsCacheWarming(){
-
-    if(!fs.existsSync(getCachedPath('paths')) || !fs.existsSync(getCachedPath('checksum'))){
-        return true;
-    }
-    
-    const fileList = fs.readFileSync(getCachedPath('paths'), 'utf-8').split('\n');    
-
-    if(fileList.length){
-        const fileContents = [];
-        for(const filePath of fileList){
-            if(fs.existsSync(filePath)){
-                fileContents.push(fs.readFileSync(filePath, 'utf-8'));
-            }
-        }
-        const finalMD5 = crypto.createHash('md5').update(fileContents.join('\n')).digest('hex');
-        const cachedMD5 = fs.readFileSync(getCachedPath('checksum'), 'utf-8');
-
-        if(finalMD5 === cachedMD5){            
-            return false;
-        }
-    }        
-
-    return true;
-}
-
-async function main()
-{
-    const hasRebuild = paramsString.split(' ').pop().indexOf('--rebuild') > -1;
-    const doWarmCache = needsCacheWarming() || hasRebuild;  
-    
-    if(!((params[0] || false) && (params[1] || false) && (params[2] || false))){
-        throw new Error(`CLI command MUST have 3 parameters: {DB_URL, DB_NAME, MODELS_DIR}`);
-    }
-
-    if(doWarmCache){
-        console.log(chalk.yellow('[RWS DB CLI] Building CLI client...'));
-
-        const cacheTypes = ['paths', 'checksum'];
-
-        for(const type of cacheTypes){
-            if(fs.existsSync(getCachedPath(type))){
-                fs.unlinkSync(getCachedPath(type));
-            }
-        }
-
-        await tsc();
-
-        await rwsShell.runCommand(commandString, currentCwd);      
-       
-        
-    }else{
-        console.log(chalk.blue('[RWS CLI CACHE] Starting command from built CLI client.'));
-    }    
-
-    let startSlice = hasRebuild ? -1 : paramsString.split(' ').length;
-    let endSlice = hasRebuild ? -1 : null ;
-
-    paramsString = [
-        ...paramsString.split(' ').slice(0, startSlice), 
-        currentCwd, 
-        endSlice ? 
-            paramsString.split(' ').at(endSlice) 
-        : null
-    ].filter((item) => item !== null).join(' ');
-
-    await rwsShell.runCommand(`node ${path.join(currentCwd, 'build', 'main.cli.rws.js')}${paramsString}`, process.cwd());
-}
-
-async function tsc (){
-    const tempConfigContent = {
-        "extends": "./tsconfig.json",
-        "include": [
-            path.join(process.cwd(), params[2], 'index.ts')
-        ],           
-    };
-            
-    const tempConfigPath = path.join(currentCwd, '.tmp.gitignore.json');
-    fs.writeFileSync(tempConfigPath, JSON.stringify(tempConfigContent, null, 2));
-    
-    
-    await rwsShell.runCommand(`tsc -p ${tempConfigPath}`, currentCwd);                
-    fs.unlinkSync(tempConfigPath);        
-}
-
-main().then((data) => {
-    console.log(chalk.green('[RWS DB CLI] Command complete.'));
-}).catch((e) => {
-    console.error(e.message);
+#!/usr/bin/env node
+
+const { rwsShell, rwsPath } = require('@rws-framework/console');
+const chalk = require('chalk');
+const crypto = require('crypto');
+const path = require('path');
+const fs = require('fs');
+
+const params = process.argv.splice(2);
+let paramsString = params.length ? (' ' + params.join(' ')) : '';
+
+const appRoot = process.cwd();
+const rwsCliConfigDir = path.resolve(appRoot, 'node_modules', '.rws', 'cli');
+const getCachedPath = (key) => path.resolve(rwsCliConfigDir, key);
+
+const currentCwd = path.resolve(__dirname);
+
+console.log({params})
+
+
+const commandString = `npx webpack --config db.rws.webpack.config.js --output-path ./build ${process.cwd()} ${params[2]}`;
+function needsCacheWarming(){
+
+    if(!fs.existsSync(getCachedPath('paths')) || !fs.existsSync(getCachedPath('checksum'))){
+        return true;
+    }
+    
+    const fileList = fs.readFileSync(getCachedPath('paths'), 'utf-8').split('\n');    
+
+    if(fileList.length){
+        const fileContents = [];
+        for(const filePath of fileList){
+            if(fs.existsSync(filePath)){
+                fileContents.push(fs.readFileSync(filePath, 'utf-8'));
+            }
+        }
+        const finalMD5 = crypto.createHash('md5').update(fileContents.join('\n')).digest('hex');
+        const cachedMD5 = fs.readFileSync(getCachedPath('checksum'), 'utf-8');
+
+        if(finalMD5 === cachedMD5){            
+            return false;
+        }
+    }        
+
+    return true;
+}
+
+async function main()
+{
+    const hasRebuild = paramsString.split(' ').pop().indexOf('--rebuild') > -1;
+    const doWarmCache = needsCacheWarming() || hasRebuild;  
+    
+    if(!((params[0] || false) && (params[1] || false) && (params[2] || false))){
+        throw new Error(`CLI command MUST have 3 parameters: {DB_URL, DB_NAME, MODELS_DIR}`);
+    }
+
+    if(doWarmCache){
+        console.log(chalk.yellow('[RWS DB CLI] Building CLI client...'));
+
+        const cacheTypes = ['paths', 'checksum'];
+
+        for(const type of cacheTypes){
+            if(fs.existsSync(getCachedPath(type))){
+                fs.unlinkSync(getCachedPath(type));
+            }
+        }
+
+        await tsc();
+
+        await rwsShell.runCommand(commandString, currentCwd);      
+       
+        
+    }else{
+        console.log(chalk.blue('[RWS CLI CACHE] Starting command from built CLI client.'));
+    }    
+
+    let startSlice = hasRebuild ? -1 : paramsString.split(' ').length;
+    let endSlice = hasRebuild ? -1 : null ;
+
+    paramsString = [
+        ...paramsString.split(' ').slice(0, startSlice), 
+        currentCwd, 
+        endSlice ? 
+            paramsString.split(' ').at(endSlice) 
+        : null
+    ].filter((item) => item !== null).join(' ');
+
+    await rwsShell.runCommand(`node ${path.join(currentCwd, 'build', 'main.cli.rws.js')}${paramsString}`, process.cwd());
+}
+
+async function tsc (){
+    const tempConfigContent = {
+        "extends": "./tsconfig.json",
+        "include": [
+            path.join(process.cwd(), params[2], 'index.ts')
+        ],           
+    };
+            
+    const tempConfigPath = path.join(currentCwd, '.tmp.gitignore.json');
+    fs.writeFileSync(tempConfigPath, JSON.stringify(tempConfigContent, null, 2));
+    
+    
+    await rwsShell.runCommand(`tsc -p ${tempConfigPath}`, currentCwd);                
+    fs.unlinkSync(tempConfigPath);        
+}
+
+main().then((data) => {
+    console.log(chalk.green('[RWS DB CLI] Command complete.'));
+}).catch((e) => {
+    console.error(e.message);
 });