@rws-framework/db 3.3.8 → 3.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/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,7 +1,7 @@
 {
   "name": "@rws-framework/db",
   "private": false,
-  "version": "3.3.8",
+  "version": "3.4.1",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,12 +21,11 @@
     "crypto": "^1.0.1",
     "source-map-support": "^0.5.21",
     "tsconfig-paths": "^4.2.0",
-    "tsconfig-paths-webpack-plugin": "^4.1.0"    
+    "tsconfig-paths-webpack-plugin": "^4.1.0"
   },
   "devDependencies": {
     "@types/xml2js": "^0.4.14",
     "typescript": "^5.7.2"
-
   },
   "repository": {
     "type": "git",

package/src/decorators/InverseTimeSeries.ts

@@ -1,22 +1,22 @@
-import 'reflect-metadata';
-
-interface InverseTimeSeriesOpts{
-    timeSeriesModel: string
-    hydrationField: string
-  }
-  
-function InverseTimeSeries(timeSeriesModel: string, hydrationField: string) {
-
-    const metaOpts: InverseTimeSeriesOpts = {
-        timeSeriesModel: timeSeriesModel,
-        hydrationField: hydrationField
-    };
-
-
-    return function(target: any, key: string) {          
-        Reflect.defineMetadata(`InverseTimeSeries:${key}`, metaOpts, target);
-    };
-}
-
-export default InverseTimeSeries;
+import 'reflect-metadata';
+
+interface InverseTimeSeriesOpts{
+    timeSeriesModel: string
+    hydrationField: string
+  }
+  
+function InverseTimeSeries(timeSeriesModel: string, hydrationField: string) {
+
+    const metaOpts: InverseTimeSeriesOpts = {
+        timeSeriesModel: timeSeriesModel,
+        hydrationField: hydrationField
+    };
+
+
+    return function(target: any, key: string) {          
+        Reflect.defineMetadata(`InverseTimeSeries:${key}`, metaOpts, target);
+    };
+}
+
+export default InverseTimeSeries;
 export {InverseTimeSeriesOpts};

package/src/helper/DbHelper.ts

@@ -70,8 +70,8 @@ export class DbHelper {
      * @param dbUrl The database URL
      * @returns The base schema
      */
-    static generateBaseSchema(dbType: string, dbUrl: string): string {
-        return SchemaGenerator.generateBaseSchema(dbType, dbUrl);
+    static generateBaseSchema(dbType: string, dbUrl: string, output?: string, binaryTargets?: string[]): string {
+        return SchemaGenerator.generateBaseSchema(dbType, dbUrl, output, binaryTargets);
     }
 
     /**

package/src/helper/FieldsHelper.ts

@@ -1,35 +1,35 @@
-export class FieldsHelper {
-    private constructor(){
-        throw new Error(`Class ${this.constructor.name} cannot be instanced.`)
-    }
-    
-    static getAllClassFields(target: any): string[] {
-        // Get instance properties
-        const instanceFields = Object.getOwnPropertyNames(target.prototype);
-        
-        // Get static properties
-        const staticFields = Object.getOwnPropertyNames(target);
-        
-        // Get decorated properties using Reflect metadata if available
-        const decoratedFields = Reflect.getMetadataKeys(target.prototype) || [];
-        
-        // Combine all fields and remove duplicates and methods
-        const allFields = new Set([
-            ...instanceFields,
-            ...staticFields,
-            ...decoratedFields
-        ]);
-    
-        // Filter out constructor and methods
-        return Array.from(allFields).filter(field => {
-            // Remove constructor
-            if (field === 'constructor') return false;
-            
-            // Remove methods
-            const descriptor = Object.getOwnPropertyDescriptor(target.prototype, field);
-            if (descriptor && typeof descriptor.value === 'function') return false;
-            
-            return true;
-        });
-    };
+export class FieldsHelper {
+    private constructor(){
+        throw new Error(`Class ${this.constructor.name} cannot be instanced.`)
+    }
+    
+    static getAllClassFields(target: any): string[] {
+        // Get instance properties
+        const instanceFields = Object.getOwnPropertyNames(target.prototype);
+        
+        // Get static properties
+        const staticFields = Object.getOwnPropertyNames(target);
+        
+        // Get decorated properties using Reflect metadata if available
+        const decoratedFields = Reflect.getMetadataKeys(target.prototype) || [];
+        
+        // Combine all fields and remove duplicates and methods
+        const allFields = new Set([
+            ...instanceFields,
+            ...staticFields,
+            ...decoratedFields
+        ]);
+    
+        // Filter out constructor and methods
+        return Array.from(allFields).filter(field => {
+            // Remove constructor
+            if (field === 'constructor') return false;
+            
+            // Remove methods
+            const descriptor = Object.getOwnPropertyDescriptor(target.prototype, field);
+            if (descriptor && typeof descriptor.value === 'function') return false;
+            
+            return true;
+        });
+    };
 }

package/src/helper/db/schema-generator.ts

@@ -30,19 +30,26 @@ export class SchemaGenerator {
      * @param dbUrl The database URL
      * @returns The base schema
      */
-    static generateBaseSchema(dbType: string, dbUrl: string): string {
+    static generateBaseSchema(dbType: string, dbUrl: string, output?: string, binaryTargets?: string[]): string {
         process.env = { ...process.env, [this.dbUrlVarName]: dbUrl };
 
         return `generator client {
     provider = "prisma-client-js"
+    ${output ? `output = "${this.ospath(output)}"` : ''}
+    ${binaryTargets ? `binaryTargets = ${JSON.stringify(binaryTargets)}` : ''}
 }
 
 datasource db {
     provider = "${dbType}"
-    url = env("${this.dbUrlVarName}")
+    url = env("${this.dbUrlVarName}")    
 }`;
     }
 
+    private static ospath(outPath: string): string
+    {
+        return outPath.split('')[1] === ':' ? outPath.replace(/\\/g,'\\\\') : outPath
+    }
+
     /**
      * Generate model sections for the schema
      * @param model The model to generate a section for
@@ -356,8 +363,10 @@ datasource db {
     static async installPrisma(configService: IDbConfigHandler, dbService: DBService, leaveFile = false): Promise<void> {
         const dbUrl = configService.get('db_url');
         const dbType = configService.get('db_type') || 'mongodb';
+        const dbPrismaOutput = configService.get('db_prisma_output');
+        const dbPrismaBinaryTargets = configService.get('db_prisma_binary_targets');
 
-        let template: string = this.generateBaseSchema(dbType, dbUrl);
+        let template: string = this.generateBaseSchema(dbType, dbUrl, dbPrismaOutput, dbPrismaBinaryTargets);
 
         const dbModels: OpModelType<unknown>[] | null = configService.get('db_models');