@rws-framework/db 2.3.2 → 2.4.0

package/dist/types/ITimeSeries.js

@@ -1,2 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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);
 });

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;