@rws-framework/db 2.3.2 → 2.4.1

package/exec/db.rws.webpack.config.js

@@ -1,168 +1,168 @@
-const path = require('path');
-const chalk = require('chalk');
-const webpackFilters = require('./webpackFilters');
-const webpack = require('webpack');
-const { rwsPath } = require('@rws-framework/console');
-// Get CLI arguments
-const args = process.argv.slice(2);
-const fs = require('fs');
-const appRootPath = args[4] || process.cwd();
-const modelsDir = args[5] || '';
-
-const internalCwd = process.cwd()
-const rootPackageNodeModules = path.resolve(rwsPath.findRootWorkspacePath(), 'node_modules');
-const thisPackage = path.resolve(__dirname, '..');
-const WEBPACK_PLUGINS = [new webpack.optimize.ModuleConcatenationPlugin()];
-
-const modules_setup = [rootPackageNodeModules, appRootPath];
-const isDev = true;
-
-function prettyLog(data){
-  for(const key of Object.keys(data)){
-    const valObject = data[key];
-
-    console.log(`${chalk.yellow('[Log]')} ${chalk.blue(key)}:`, valObject)
-  }
-}
-
-
-
-const mainEntry = './' + path.relative(appRootPath, path.join(internalCwd, '/src/cli.ts'));
-const vPath = path.relative(__dirname, path.join(__dirname, '../build/vendors'));
-
-prettyLog({ buildPaths:{
-  thisPackage,
-  rootPackageNodeModules,
-  appRootPath,
-  internalCwd,
-  vPath  
-}});
-
-if(!fs.existsSync(path.join(appRootPath, modelsDir, 'index.ts'))){
-  console.log(`${chalk.red('[RWS Structure Error] ')} ${chalk.blue(`
-    No index.ts in "${path.join(appRootPath, modelsDir)}"\n
-    RWS DB requires "index.ts" that has default export with array of your models:\n
-
-    ${chalk.blue('import')} RWSModel${chalk.blue(',')} OpModelType ${chalk.blue('from')}  ${chalk.green('./src/models/user.model.ts')}${chalk.blue(';')}
-
-    RWSModel<ModelDataInterface> is instance type and
-    OpModelType<ModelDataInterface> is type for static methods that navigate through db to populate instanced models.`)}\n
-     
-    Example: \n
-
-    ${chalk.blue('import')} User ${chalk.blue('from')} ${chalk.green('\'./src/models/user.model.ts\'')}${chalk.blue(';')}
-    ${chalk.blue('import')} ApiKey ${chalk.blue('from')} ${chalk.green('\'./src/models/apiKey.model.ts\'')}${chalk.blue(';')}
-
-    ${chalk.blue('export')} default ${chalk.magenta('[')}
-      User${chalk.blue(',')}
-      ApiKey
-    ${chalk.magenta(']')}${chalk.blue(';')}
-  `);
-
-  throw new Error("Build stopped.")
-}
-
-const cfgExport = {
-  context: appRootPath,
-  entry: mainEntry,
-  mode: isDev ? 'development' : 'production',
-  target: 'node',
-  devtool: isDev ? 'source-map' : false,
-  output: {
-    path: path.resolve(internalCwd, 'build'), // Resolve output path relative to config directory
-    filename: '[name].cli.rws.js',
-    sourceMapFilename: '[file].map',
-    chunkFilename: "[name].chunk.js",
-    libraryTarget: 'commonjs2',
-    clean: false
-  },
-  resolve: {
-    extensions: ['.ts', '.js'],
-    modules: modules_setup,
-    alias: {       
-      '@V': vPath,
-      'src': path.resolve(appRootPath, 'src'), // Add explicit resolution for src directory
-    },    
-    fallback: {
-      "kerberos": false,
-      "mongodb-client-encryption": false
-    }
-  },
-  module: {
-    rules: [
-      {
-        test: /\.(ts)$/,
-        use: [                       
-          {
-            loader: 'ts-loader',
-            options: {
-              transpileOnly: true,
-              configFile: path.resolve(__dirname, 'tsconfig.json'),
-              compilerOptions: {
-                outDir: path.resolve(internalCwd, 'build'),       
-              }             
-            }
-          }
-        ],
-        include: [
-          path.resolve(appRootPath),
-          path.resolve(thisPackage),
-          path.resolve(rootPackageNodeModules, '@rws-framework')                
-        ],
-        exclude: [
-          /node_modules\/(?!(@rws-framework)\/).*/,
-          /\.d\.ts$/
-        ]
-      },       
-      {
-        test: /\.node$/,
-        use: 'node-loader',
-      }        
-    ],
-  },
-  plugins: [
-    ...WEBPACK_PLUGINS,
-    new webpack.DefinePlugin({
-      'process.env.APP_ROOT': JSON.stringify(appRootPath),
-      'process.env.DB_CLI': JSON.stringify(1)
-    }),
-    new webpack.IgnorePlugin({
-      resourceRegExp: /^kerberos$/,
-    }),
-    new webpack.NormalModuleReplacementPlugin(
-      /.*\/build\/Debug\/kerberos\.node$/,
-      '@rws-framework/db/src/empty.js'
-    )
-  ],
-  ignoreWarnings: webpackFilters,
-  optimization: {      
-    minimize: false
-  },
-  experiments: {
-    topLevelAwait: true, // Enable top-level await if needed
-  }  
-  // stats: 'verbose'
-
-};
-
-cfgExport.externals = {
-  '@nestjs/common': 'commonjs @nestjs/common',
-  '@nestjs/core': 'commonjs @nestjs/core',  
-  '@nestjs/config': 'commonjs @nestjs/config',  
-  '@anthropic-ai/sdk': 'commonjs @anthropic-ai/sdk',
-  '@zip.js/zip.js': 'commonjs @zip.js/zip.js',
-  'mongodb-client-encryption': 'commonjs mongodb-client-encryption',
-  'uuid': 'commonjs uuid',
-  'source-map-support': 'commonjs source-map-support'
-};
-
-cfgExport.plugins.push(
-  new webpack.BannerPlugin({
-    banner: 'require("source-map-support").install();',
-    raw: true
-  })
-);
-
-// console.log('Final config', cfgExport);
-
-module.exports = cfgExport;
+const path = require('path');
+const chalk = require('chalk');
+const webpackFilters = require('./webpackFilters');
+const webpack = require('webpack');
+const { rwsPath } = require('@rws-framework/console');
+// Get CLI arguments
+const args = process.argv.slice(2);
+const fs = require('fs');
+const appRootPath = args[4] || process.cwd();
+const modelsDir = args[5] || '';
+
+const internalCwd = process.cwd()
+const rootPackageNodeModules = path.resolve(rwsPath.findRootWorkspacePath(), 'node_modules');
+const thisPackage = path.resolve(__dirname, '..');
+const WEBPACK_PLUGINS = [new webpack.optimize.ModuleConcatenationPlugin()];
+
+const modules_setup = [rootPackageNodeModules, appRootPath];
+const isDev = true;
+
+function prettyLog(data){
+  for(const key of Object.keys(data)){
+    const valObject = data[key];
+
+    console.log(`${chalk.yellow('[Log]')} ${chalk.blue(key)}:`, valObject)
+  }
+}
+
+
+
+const mainEntry = './' + path.relative(appRootPath, path.join(internalCwd, '/src/cli.ts'));
+const vPath = path.relative(__dirname, path.join(__dirname, '../build/vendors'));
+
+prettyLog({ buildPaths:{
+  thisPackage,
+  rootPackageNodeModules,
+  appRootPath,
+  internalCwd,
+  vPath  
+}});
+
+if(!fs.existsSync(path.join(appRootPath, modelsDir, 'index.ts'))){
+  console.log(`${chalk.red('[RWS Structure Error] ')} ${chalk.blue(`
+    No index.ts in "${path.join(appRootPath, modelsDir)}"\n
+    RWS DB requires "index.ts" that has default export with array of your models:\n
+
+    ${chalk.blue('import')} RWSModel${chalk.blue(',')} OpModelType ${chalk.blue('from')}  ${chalk.green('./src/models/user.model.ts')}${chalk.blue(';')}
+
+    RWSModel<ModelDataInterface> is instance type and
+    OpModelType<ModelDataInterface> is type for static methods that navigate through db to populate instanced models.`)}\n
+     
+    Example: \n
+
+    ${chalk.blue('import')} User ${chalk.blue('from')} ${chalk.green('\'./src/models/user.model.ts\'')}${chalk.blue(';')}
+    ${chalk.blue('import')} ApiKey ${chalk.blue('from')} ${chalk.green('\'./src/models/apiKey.model.ts\'')}${chalk.blue(';')}
+
+    ${chalk.blue('export')} default ${chalk.magenta('[')}
+      User${chalk.blue(',')}
+      ApiKey
+    ${chalk.magenta(']')}${chalk.blue(';')}
+  `);
+
+  throw new Error("Build stopped.")
+}
+
+const cfgExport = {
+  context: appRootPath,
+  entry: mainEntry,
+  mode: isDev ? 'development' : 'production',
+  target: 'node',
+  devtool: isDev ? 'source-map' : false,
+  output: {
+    path: path.resolve(internalCwd, 'build'), // Resolve output path relative to config directory
+    filename: '[name].cli.rws.js',
+    sourceMapFilename: '[file].map',
+    chunkFilename: "[name].chunk.js",
+    libraryTarget: 'commonjs2',
+    clean: false
+  },
+  resolve: {
+    extensions: ['.ts', '.js'],
+    modules: modules_setup,
+    alias: {       
+      '@V': vPath,
+      'src': path.resolve(appRootPath, 'src'), // Add explicit resolution for src directory
+    },    
+    fallback: {
+      "kerberos": false,
+      "mongodb-client-encryption": false
+    }
+  },
+  module: {
+    rules: [
+      {
+        test: /\.(ts)$/,
+        use: [                       
+          {
+            loader: 'ts-loader',
+            options: {
+              transpileOnly: true,
+              configFile: path.resolve(__dirname, 'tsconfig.json'),
+              compilerOptions: {
+                outDir: path.resolve(internalCwd, 'build'),       
+              }             
+            }
+          }
+        ],
+        include: [
+          path.resolve(appRootPath),
+          path.resolve(thisPackage),
+          path.resolve(rootPackageNodeModules, '@rws-framework')                
+        ],
+        exclude: [
+          /node_modules\/(?!(@rws-framework)\/).*/,
+          /\.d\.ts$/
+        ]
+      },       
+      {
+        test: /\.node$/,
+        use: 'node-loader',
+      }        
+    ],
+  },
+  plugins: [
+    ...WEBPACK_PLUGINS,
+    new webpack.DefinePlugin({
+      'process.env.APP_ROOT': JSON.stringify(appRootPath),
+      'process.env.DB_CLI': JSON.stringify(1)
+    }),
+    new webpack.IgnorePlugin({
+      resourceRegExp: /^kerberos$/,
+    }),
+    new webpack.NormalModuleReplacementPlugin(
+      /.*\/build\/Debug\/kerberos\.node$/,
+      '@rws-framework/db/src/empty.js'
+    )
+  ],
+  ignoreWarnings: webpackFilters,
+  optimization: {      
+    minimize: false
+  },
+  experiments: {
+    topLevelAwait: true, // Enable top-level await if needed
+  }  
+  // stats: 'verbose'
+
+};
+
+cfgExport.externals = {
+  '@nestjs/common': 'commonjs @nestjs/common',
+  '@nestjs/core': 'commonjs @nestjs/core',  
+  '@nestjs/config': 'commonjs @nestjs/config',  
+  '@anthropic-ai/sdk': 'commonjs @anthropic-ai/sdk',
+  '@zip.js/zip.js': 'commonjs @zip.js/zip.js',
+  'mongodb-client-encryption': 'commonjs mongodb-client-encryption',
+  'uuid': 'commonjs uuid',
+  'source-map-support': 'commonjs source-map-support'
+};
+
+cfgExport.plugins.push(
+  new webpack.BannerPlugin({
+    banner: 'require("source-map-support").install();',
+    raw: true
+  })
+);
+
+// console.log('Final config', cfgExport);
+
+module.exports = cfgExport;

package/exec/src/cli.ts

@@ -1,73 +1,75 @@
-import 'reflect-metadata';
-
-const args: string[] = process.argv.slice(2).filter(cmd => cmd !== '--rebuild');
-import fs from 'fs';
-import path from 'path';
-import { DbHelper, DBService, OpModelType, RWSModel } from '../../src';
-import { IDbConfigHandler, IDbConfigParams } from '../../src/types/DbConfigHandler';
-import chalk from 'chalk';
-
-class Config implements IDbConfigHandler {
-  private data: IDbConfigParams = {
-    db_models: [],
-    mongo_db: null,
-    mongo_url: null
-  };
-
-  private modelsDir: string;
-  private cliExecRoot: string;
-  private static _instance: Config = null;
-
-  private constructor(){}
-
-  static async getInstance(): Promise<Config>
-  {
-    if(!this._instance){
-      this._instance = new Config();
-    }    
-
-    await this._instance.fill();
-
-    return this._instance;
-  }
-
-  
-  async fill(): Promise<void>
-  {
-    this.data.mongo_url = args[0];
-    this.data.mongo_db = args[1];    
-    
-
-    this.modelsDir = args[2];    
-    this.cliExecRoot = args[3]; 
-
-    console.log({args})
-
-    // this.data.db_models = (await import('@V/index')).default;      
-  }
-
-  getModelsDir(): string
-  {
-    return this.modelsDir
-  }
-
-  getCliExecRoot(): string
-  {
-    return this.cliExecRoot
-  }
-
-  get<K extends keyof IDbConfigParams>(key: K): IDbConfigParams[K] {
-    return this.data[key];  
-  }
-}
-
-async function main(): Promise<void>
-{
-  console.log('INSTALL PRISMA');
-  const cfg = await Config.getInstance();
-  DbHelper.installPrisma(cfg, new DBService(cfg), false);
-}
-
-console.log(chalk.bgGreen('[RWS DB CLI] Starting systems...'));
-
-main();
+import 'reflect-metadata';
+
+const args: string[] = process.argv.slice(2).filter(cmd => cmd !== '--rebuild');
+import fs from 'fs';
+import path from 'path';
+import { DbHelper, DBService, OpModelType, RWSModel } from '../../src';
+import { IDbConfigHandler, IDbConfigParams } from '../../src/types/DbConfigHandler';
+import chalk from 'chalk';
+
+class Config implements IDbConfigHandler {
+  private data: IDbConfigParams = {
+    db_models: [],
+    mongo_db: null,
+    mongo_url: null
+  };
+
+  private modelsDir: string;
+  private cliExecRoot: string;
+  private static _instance: Config = null;
+
+  private constructor(){}
+
+  static async getInstance(): Promise<Config>
+  {
+    if(!this._instance){
+      this._instance = new Config();
+    }    
+
+    await this._instance.fill();
+
+    return this._instance;
+  }
+
+  
+  async fill(): Promise<void>
+  {
+    this.data.db_url = args[0];
+    this.data.db_name = args[1];    
+    this.data.db_type = args[2];
+    
+
+    this.modelsDir = args[3];    
+    this.cliExecRoot = args[4]; 
+
+    console.log({args})
+
+    // this.data.db_models = (await import('@V/index')).default;      
+  }
+
+  getModelsDir(): string
+  {
+    return this.modelsDir
+  }
+
+  getCliExecRoot(): string
+  {
+    return this.cliExecRoot
+  }
+
+  get<K extends keyof IDbConfigParams>(key: K): IDbConfigParams[K] {
+    return this.data[key];  
+  }
+}
+
+async function main(): Promise<void>
+{
+  console.log('INSTALL PRISMA');
+  const cfg = await Config.getInstance();
+  process.env.PRISMA_DB_URL = cfg.get('db_url');
+  DbHelper.installPrisma(cfg, new DBService(cfg), false);
+}
+
+console.log(chalk.bgGreen('[RWS DB CLI] Starting systems...'));
+
+main();

package/exec/tsconfig.json

@@ -1,32 +1,32 @@
-{
-  "compilerOptions": {  
-    "baseUrl": "./",  
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
-    "emitDeclarationOnly": false,
-    "target": "ES2018",
-    "module": "commonjs",
-    "moduleResolution": "node",
-    "strict": true,
-    "skipLibCheck": true,
-    "esModuleInterop": true,
-    "resolveJsonModule": true,    
-    "strictNullChecks": false,
-    "allowSyntheticDefaultImports": true,
-    "sourceMap": true,
-    "declaration": true, 
-    "outDir": "build/vendors",
-    "preserveWatchOutput": true,
-    "allowJs": true,
-    "paths": {
-      "@V/*": ["./build/vendors/*"]      
-    }
-  },
-  "include": [
-    "src/cli.ts",
-    "../src/*"    
-  ],
-  "exclude": [  
-    "node_modules"  
-  ]
-}
+{
+  "compilerOptions": {  
+    "baseUrl": "./",  
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "emitDeclarationOnly": false,
+    "target": "ES2018",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "strict": true,
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "resolveJsonModule": true,    
+    "strictNullChecks": false,
+    "allowSyntheticDefaultImports": true,
+    "sourceMap": true,
+    "declaration": true, 
+    "outDir": "build/vendors",
+    "preserveWatchOutput": true,
+    "allowJs": true,
+    "paths": {
+      "@V/*": ["./build/vendors/*"]      
+    }
+  },
+  "include": [
+    "src/cli.ts",
+    "../src/*"    
+  ],
+  "exclude": [  
+    "node_modules"  
+  ]
+}

package/exec/webpackFilters.js

@@ -1,18 +1,18 @@
-module.exports = [
-    /aws-crt/,
-    /express\/lib\/view/,
-    /mongodb-client-encryption\/lib\/providers\/gcp/,
-    /mongodb/,
-    /nest-commander/,
-    /snappy/,
-    /mongodb-js\/zstd/,
-    /puppeteer/,
-    /kerberos/,
-    /@zip\.js\/zip.js/,
-    /Module not found: Error: Can't resolve 'fsevents' in/,
-    /Critical dependency: the request of a dependency is an expression/,
-    /Module not found: Error: Can't resolve 'aws4'/,
-    /Critical dependency: require function is used in a way in which dependencies cannot be statically extracted/,
-    /Can't resolve .* in '.*kerberos.*'/,
-    /Can't resolve .* in '.*mongodb-client-encryption.*'/
+module.exports = [
+    /aws-crt/,
+    /express\/lib\/view/,
+    /mongodb-client-encryption\/lib\/providers\/gcp/,
+    /mongodb/,
+    /nest-commander/,
+    /snappy/,
+    /mongodb-js\/zstd/,
+    /puppeteer/,
+    /kerberos/,
+    /@zip\.js\/zip.js/,
+    /Module not found: Error: Can't resolve 'fsevents' in/,
+    /Critical dependency: the request of a dependency is an expression/,
+    /Module not found: Error: Can't resolve 'aws4'/,
+    /Critical dependency: require function is used in a way in which dependencies cannot be statically extracted/,
+    /Can't resolve .* in '.*kerberos.*'/,
+    /Can't resolve .* in '.*mongodb-client-encryption.*'/
 ];

package/package.json

@@ -1,36 +1,36 @@
-{
-  "name": "@rws-framework/db",
-  "private": false,
-  "version": "2.3.2",
-  "description": "",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "scripts": {},
-  "author": "papablack",
-  "license": "ISC",
-  "bin": {
-    "rws-db": "./exec/console.js"
-  },
-  "dependencies": {
-    "@rws-framework/console": "*",
-    "@prisma/client": "^5.1.1",
-    "@mongodb-js/zstd": "^1.2.0",
-    "mongodb": "^6.8.1",
-    "mongodb-client-encryption": "^6.1.1",
-    "xml2js": "^0.6.2",
-    "crypto": "^1.0.1",
-    "source-map-support": "^0.5.21",
-    "tsconfig-paths": "^4.2.0",
-    "tsconfig-paths-webpack-plugin": "^4.1.0"    
-  },
-  "devDependencies": {
-    "@types/xml2js": "^0.4.14",
-    "typescript": "^5.7.2"
-
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/rws-framework/db.git"
-  },
-  "_rws": true
-}
+{
+  "name": "@rws-framework/db",
+  "private": false,
+  "version": "2.4.1",
+  "description": "",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "scripts": {},
+  "author": "papablack",
+  "license": "ISC",
+  "bin": {
+    "rws-db": "./exec/console.js"
+  },
+  "dependencies": {
+    "@rws-framework/console": "*",
+    "@prisma/client": "^5.1.1",
+    "@mongodb-js/zstd": "^1.2.0",
+    "mongodb": "^6.8.1",
+    "mongodb-client-encryption": "^6.1.1",
+    "xml2js": "^0.6.2",
+    "crypto": "^1.0.1",
+    "source-map-support": "^0.5.21",
+    "tsconfig-paths": "^4.2.0",
+    "tsconfig-paths-webpack-plugin": "^4.1.0"    
+  },
+  "devDependencies": {
+    "@types/xml2js": "^0.4.14",
+    "typescript": "^5.7.2"
+
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/rws-framework/db.git"
+  },
+  "_rws": true
+}