@rws-framework/db 2.0.0 → 2.0.2

package/exec/console.js

@@ -15,6 +15,9 @@ 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(){
 
@@ -62,20 +65,11 @@ async function main()
             }
         }
 
+        await tsc();
+
         await rwsShell.runCommand(commandString, currentCwd);      
-        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);        
     }else{
         console.log(chalk.blue('[RWS CLI CACHE] Starting command from built CLI client.'));
     }    
@@ -83,8 +77,6 @@ async function main()
     let startSlice = hasRebuild ? -1 : paramsString.split(' ').length;
     let endSlice = hasRebuild ? -1 : null ;
 
-    console.log({startSlice, endSlice}, paramsString.split(' ').slice(0, startSlice))
-
     paramsString = [
         ...paramsString.split(' ').slice(0, startSlice), 
         currentCwd, 
@@ -96,6 +88,21 @@ async function main()
     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.'));

package/exec/src/cli.ts

@@ -41,7 +41,9 @@ class Config implements IDbConfigHandler {
     this.modelsDir = args[2];    
     this.cliExecRoot = args[3]; 
 
-    this.data.db_models = (await import('@V/index')).default;      
+    console.log({args})
+
+    // this.data.db_models = (await import('@V/index')).default;      
   }
 
   getModelsDir(): string

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rws-framework/db",
   "private": false,
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "",
   "main": "src/index.ts",
   "scripts": {},
@@ -32,5 +32,6 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/rws-framework/db.git"
-  }
+  },
+  "_rws": true
 }