binhend 1.5.14 → 1.5.16

package/bin/commands/create-frontend.js

@@ -10,6 +10,8 @@ module.exports = (args) => {
 
         console.log('[BINHEND][CLI] Generate front-end structure:', destinationPath);
         fs.cpSync(sourcePath, destinationPath, {recursive: true});
+
+        // TODO logic adding excluded directories to .gitignore
     }
     catch (error) {
         console.error('[BINHEND][CLI] Error generating front-end structure!');

package/bin/commands/test-project.js

@@ -3,8 +3,18 @@ const runCommand = require('../utils/cmdRun');
 const cwdJoin = require('../utils/cwdJoin');
 
 module.exports = (args) => {
-    // var projectFolder = args.shift() || './';
-    // var scriptPath = cwdJoin(projectFolder, 'test/test.js');
-    var testFolder = cwdJoin(projectFolder, 'test');
-    runCommand(`cd ${testFolder} & node test.js`);
+    var projectFolder = args.shift() || './',
+
+    testFolder = cwdJoin(projectFolder, 'test'),
+
+    options = { cwd: testFolder },
+
+    npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+
+    console.log(`[BINHEND][CLI] Setup testing environment: ${testFolder}`);
+    runCommand(npm, ['install'], options).done(() => {
+        
+        console.log(`[BINHEND][CLI] Start testing: ${testFolder}`);
+        runCommand('node', ['test.js'].concat(args), options);
+    });
 };

package/bin/templates/frontend/build.js

@@ -2,7 +2,7 @@ const { Binh } = require('binhend');
 
 const app = new Binh();
 
-app.config('config.js', afterLoadedConfigs); // import module from path './config.js' to run and load configs
+app.config('config/config.js', afterLoadedConfigs); // import module from path './config/config.js' to run and load configs
 
 function afterLoadedConfigs(configs) {
     const options = {

package/bin/templates/frontend/{config.js → config/config.js}

@@ -1,6 +1,6 @@
 const path = require('path');
 
 module.exports = function(loader) {
-    loader.file(path.join(__dirname, '.env'));
+    loader.file(path.join(__dirname, 'default.env'));
     loader.cli();
 };

package/bin/templates/frontend/test/karma.conf.js

@@ -1,8 +1,8 @@
 module.exports = function(config) {
-
-    const SCRIPT_INCLUDED_PATTERN = 'build/web/**/*.js';
+    const BUILD_PATH = 'build/web';
+    const SCRIPT_INCLUDED_PATTERN = `${BUILD_PATH}/**/*.js`;
     const TEST_INCLUDED_PATTERN = '../src/**/*.test.js';
-    const TEST_EXCLUDED_PATTERN = 'build/web/**/*.test.js';
+    const TEST_EXCLUDED_PATTERN = `${BUILD_PATH}/**/*.test.js`;
 
     config.set({
         frameworks: ['mocha', 'chai'], // Use Mocha and Chai for testing
@@ -30,7 +30,7 @@ module.exports = function(config) {
             require('./binhend-preprocessor')
         ],
         binhend: {
-            rootPath: require('path').resolve(__dirname, 'web').replace(/\\/g, '/')
+            rootPath: require('path').resolve(__dirname, BUILD_PATH).replace(/\\/g, '/')
         },
 
         mochaReporter: { // Configure Mocha reporter options

package/bin/templates/frontend/test/package.json

@@ -4,7 +4,7 @@
   "description": "",
   "author": "",
   "license": "UNLICENSED",
-  "main": "index.js",
+  "main": "test.js",
   "devDependencies": {
     "chai": "^4.3.7",
     "karma": "^6.4.3",
@@ -20,6 +20,6 @@
     "npm": ">=8.15.0"
   },
   "scripts": {
-    "test": "npm i & node index.js"
+    "test": "npm i & node test.js"
   }
 }

package/bin/utils/cmdRun.js

@@ -1,26 +1,32 @@
 
 const { spawn } = require('child_process');
 
-function print(data) {
+function printOut(data) {
     process.stdout.write(`${data}`);
 }
 
-function printErr(fullCommand, error) {
-    process.stdout.write(`[BINHEND][CLI] Error executing command: ${fullCommand}\n`);
-    process.stdout.write(`${error}`);
+function printError(error) {
+    process.stderr.write(`${error}`);
 }
 
 module.exports = function() {
-    const command = arguments[0], args = arguments[1] || [],
-    fullCommand = `${command} ${args.join(' ')}`,
-
-    printError = printErr.bind(null, fullCommand),
+    var ref = {}, onClosed = () => {},
 
     child = spawn.apply(null, arguments);
 
-    child.stdout.on('data', print);
+    child.stdout.on('data', printOut);
 
     child.stderr.on('data', printError);
 
     child.on('error', printError);
-};
+
+    child.on('close', (code) => {
+        onClosed(code);
+    });
+
+    ref.done = (callback) => {
+        onClosed = callback instanceof Function ? callback : () => {};
+    };
+
+    return ref;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "binhend",
-  "version": "1.5.14",
+  "version": "1.5.16",
   "description": "",
   "main": "index.js",
   "author": "Nguyen Duc Binh",