@rws-framework/db 2.3.2 → 2.4.0

package/exec/src/cli.ts

@@ -1,73 +1,74 @@
-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();
+  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.0",
+  "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
+}

package/src/decorators/InverseRelation.ts

@@ -1,37 +1,37 @@
-import 'reflect-metadata';
-import { RWSModel, OpModelType } from '../models/_model';
-
-interface InverseRelationOpts{
-    key: string,
-    inversionModel: OpModelType<RWSModel<any>>,
-    foreignKey: string,
-    singular?: boolean    
-    relationName?: string
-  }
-
-  function InverseRelation(inversionModel: () => OpModelType<RWSModel<any>>, sourceModel: () => OpModelType<RWSModel<any>>, relationOptions: Partial<InverseRelationOpts> = null) {    
-    return function(target: any, key: string) {             
-        const metadataPromise = Promise.resolve().then(() => {
-            const model = inversionModel();
-            const source = sourceModel();
-    
-            const metaOpts: InverseRelationOpts = {
-                ...relationOptions,
-                key,
-                inversionModel: model,
-                foreignKey: relationOptions && relationOptions.foreignKey ? relationOptions.foreignKey : `${source._collection}_id`
-            };             
-    
-            return metaOpts;
-        });
-
-        // Store both the promise and the key information
-        Reflect.defineMetadata(`InverseRelation:${key}`, {
-            promise: metadataPromise,
-            key
-        }, target);
-    };
-}
-
-export default InverseRelation;
+import 'reflect-metadata';
+import { RWSModel, OpModelType } from '../models/_model';
+
+interface InverseRelationOpts{
+    key: string,
+    inversionModel: OpModelType<RWSModel<any>>,
+    foreignKey: string,
+    singular?: boolean    
+    relationName?: string
+  }
+
+  function InverseRelation(inversionModel: () => OpModelType<RWSModel<any>>, sourceModel: () => OpModelType<RWSModel<any>>, relationOptions: Partial<InverseRelationOpts> = null) {    
+    return function(target: any, key: string) {             
+        const metadataPromise = Promise.resolve().then(() => {
+            const model = inversionModel();
+            const source = sourceModel();
+    
+            const metaOpts: InverseRelationOpts = {
+                ...relationOptions,
+                key,
+                inversionModel: model,
+                foreignKey: relationOptions && relationOptions.foreignKey ? relationOptions.foreignKey : `${source._collection}_id`
+            };             
+    
+            return metaOpts;
+        });
+
+        // Store both the promise and the key information
+        Reflect.defineMetadata(`InverseRelation:${key}`, {
+            promise: metadataPromise,
+            key
+        }, target);
+    };
+}
+
+export default InverseRelation;
 export {InverseRelationOpts};

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/decorators/RWSCollection.ts

@@ -1,28 +1,28 @@
-import { OpModelType } from "../models/_model";
-
-export interface IRWSCollectionOpts {
-    relations?: {
-        [key: string]: boolean
-    },
-    ignored_keys?: string[]
-}
-
-export interface IRWSCollectionMeta {
-    collectionName: string,
-    options?: IRWSCollectionOpts
-}
-
-  
-export function RWSCollection(collectionName: string, options?: IRWSCollectionOpts) {
-    const metaOpts: IRWSCollectionMeta = { collectionName, options };
-    return function(target: OpModelType<any>) {     
-        target._collection = collectionName;
-        if(options && options.relations){
-            target._RELATIONS = options.relations;
-        }
-        if(options && options.ignored_keys){
-            target._CUT_KEYS = options.ignored_keys;
-        }
-        Reflect.defineMetadata(`RWSCollection`, metaOpts, target);
-    };
+import { OpModelType } from "../models/_model";
+
+export interface IRWSCollectionOpts {
+    relations?: {
+        [key: string]: boolean
+    },
+    ignored_keys?: string[]
+}
+
+export interface IRWSCollectionMeta {
+    collectionName: string,
+    options?: IRWSCollectionOpts
+}
+
+  
+export function RWSCollection(collectionName: string, options?: IRWSCollectionOpts) {
+    const metaOpts: IRWSCollectionMeta = { collectionName, options };
+    return function(target: OpModelType<any>) {     
+        target._collection = collectionName;
+        if(options && options.relations){
+            target._RELATIONS = options.relations;
+        }
+        if(options && options.ignored_keys){
+            target._CUT_KEYS = options.ignored_keys;
+        }
+        Reflect.defineMetadata(`RWSCollection`, metaOpts, target);
+    };
 } 

package/src/decorators/Relation.ts

@@ -1,48 +1,48 @@
-import 'reflect-metadata';
-import { RWSModel, OpModelType } from '../models/_model';
-
-type CascadingSetup = 'Cascade' | 'Restrict' | 'NoAction' | 'SetNull';
-
-interface IRelationOpts {
-    required?: boolean
-    key: string
-    relationField: string
-    relatedToField?: string
-    relatedTo: OpModelType<RWSModel<any>>
-    many?: boolean
-    embed?: boolean
-    cascade: {
-        onDelete: CascadingSetup,
-        onUpdate: CascadingSetup
-    }
-}
-
-const _DEFAULTS: Partial<IRelationOpts> = { required: false, many: false, embed: false, cascade: { onDelete: 'SetNull', onUpdate: 'Cascade' }};
-  
-function Relation(theModel: () => OpModelType<RWSModel<any>>, relationOptions: Partial<IRelationOpts> = _DEFAULTS) {
-    return function(target: any, key: string) {     
-        // Store the promise in metadata immediately
-        const metadataPromise = Promise.resolve().then(() => {
-            const relatedTo = theModel();
-
-            const metaOpts: IRelationOpts = {
-                ...relationOptions, 
-                cascade: relationOptions.cascade || _DEFAULTS.cascade,
-                relatedTo,
-                relationField: relationOptions.relationField ? relationOptions.relationField : relatedTo._collection + '_id',
-                key
-            };                                        
-            return metaOpts;
-        });
-
-        // Store both the promise and the key information
-        Reflect.defineMetadata(`Relation:${key}`, {
-            promise: metadataPromise,
-            key
-        }, target);
-    };
-}
-
-
-export default Relation;
+import 'reflect-metadata';
+import { RWSModel, OpModelType } from '../models/_model';
+
+type CascadingSetup = 'Cascade' | 'Restrict' | 'NoAction' | 'SetNull';
+
+interface IRelationOpts {
+    required?: boolean
+    key: string
+    relationField: string
+    relatedToField?: string
+    relatedTo: OpModelType<RWSModel<any>>
+    many?: boolean
+    embed?: boolean
+    cascade: {
+        onDelete: CascadingSetup,
+        onUpdate: CascadingSetup
+    }
+}
+
+const _DEFAULTS: Partial<IRelationOpts> = { required: false, many: false, embed: false, cascade: { onDelete: 'SetNull', onUpdate: 'Cascade' }};
+  
+function Relation(theModel: () => OpModelType<RWSModel<any>>, relationOptions: Partial<IRelationOpts> = _DEFAULTS) {
+    return function(target: any, key: string) {     
+        // Store the promise in metadata immediately
+        const metadataPromise = Promise.resolve().then(() => {
+            const relatedTo = theModel();
+
+            const metaOpts: IRelationOpts = {
+                ...relationOptions, 
+                cascade: relationOptions.cascade || _DEFAULTS.cascade,
+                relatedTo,
+                relationField: relationOptions.relationField ? relationOptions.relationField : relatedTo._collection + '_id',
+                key
+            };                                        
+            return metaOpts;
+        });
+
+        // Store both the promise and the key information
+        Reflect.defineMetadata(`Relation:${key}`, {
+            promise: metadataPromise,
+            key
+        }, target);
+    };
+}
+
+
+export default Relation;
 export {IRelationOpts};