mythix 2.8.5 → 2.8.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix",
-  "version": "2.8.5",
+  "version": "2.8.7",
   "description": "Mythix is a NodeJS web-app framework",
   "main": "src/index",
   "scripts": {

package/src/cli/deploy-command.js

@@ -499,6 +499,9 @@ module.exports = defineCommand('deploy', ({ Parent }) => {
       }
 
       let commandString = commands.map((command) => {
+        if (!command)
+          return;
+
         if (Nife.isEmpty(command.args))
           return `${this.sudo(deployConfig)}${command.command}`;
 
@@ -510,7 +513,7 @@ module.exports = defineCommand('deploy', ({ Parent }) => {
         };
 
         return `${this.sudo(deployConfig, command.sudo)}${command.command} ${command.args.map(escapeArgument).join(' ')}`;
-      }).join(' && ');
+      }).filter(Boolean).join(' && ');
 
       if (options && Nife.isNotEmpty(options.sshArgs))
         args = args.concat(options.sshArgs);
@@ -576,11 +579,10 @@ module.exports = defineCommand('deploy', ({ Parent }) => {
         relativeConfigPath,
       } = deployConfig;
 
-      if (relativeConfigPath) {
-        await this.executeRemoteCommands(target, deployConfig, [
-          { command: 'mkdir', args: [ '-p', this.joinUnixPath(decodeURIComponent(target.pathname), 'shared') ] },
-        ]);
-      }
+      await this.executeRemoteCommands(target, deployConfig, [
+        { command: 'mkdir', args: [ '-p', this.joinUnixPath(decodeURIComponent(target.pathname)) ] },
+        (relativeConfigPath) && { command: 'mkdir', args: [ '-p', this.joinUnixPath(decodeURIComponent(target.pathname), 'shared') ] },
+      ]);
     }
 
     async allRemotesDeploy(deployConfig) {

package/src/controllers/generate-client-api-interface.js

@@ -113,37 +113,12 @@ function nodeRequestHandler(routeName, requestOptions) {
 
           if (contentType && contentType.match(/application\/json/i)) {
             var data = JSON.parse(responseData.toString('utf8'));
-
-            Object.defineProperties(data, {
-              '__response': {
-                writable:     true,
-                enumerable:   false,
-                configurable: true,
-                value:        response,
-              },
-              '__statusCode': {
-                writable:     true,
-                enumerable:   false,
-                configurable: true,
-                value:        response.status,
-              },
-              '__statusText': {
-                writable:     true,
-                enumerable:   false,
-                configurable: true,
-                value:        response.statusText,
-              },
-            });
-
             response.body = data;
-
-            resolve(data);
           } else if (contentType && contentType.match(/text\/(plain|html)/)) {
             response.body = responseData.toString('utf8');
-            resolve(response.body);
-          } else {
-            resolve(response);
           }
+
+          resolve(response);
         } catch (error) {
           return reject(error);
         }
@@ -226,34 +201,12 @@ function browserRequestHandler(routeName, requestOptions) {
         var contentType = response.headers.get('Content-Type');
         if (contentType && contentType.match(/application\/json/i)) {
           var data = response.json();
-
-          Object.defineProperties(data, {
-            '__response': {
-              writable:     true,
-              enumerable:   false,
-              configurable: true,
-              value:        response,
-            },
-            '__statusCode': {
-              writable:     true,
-              enumerable:   false,
-              configurable: true,
-              value:        response.status,
-            },
-            '__statusText': {
-              writable:     true,
-              enumerable:   false,
-              configurable: true,
-              value:        response.statusText,
-            },
-          });
-
-          resolve(data);
+          response.body = data;
         } else if (contentType && contentType.match(/text\/(plain|html)/i)) {
-          resolve(response.text());
-        } else {
-          resolve(response);
+          response.body = response.text();
         }
+
+        resolve(response);
       },
       function(error) {
         reject(error);

package/src/utils/file-utils.js

@@ -27,7 +27,7 @@ function walkDir(rootPath, _options, _callback, _allFiles, _depth) {
 
     if (typeof filterFunc === 'function' && !filterFunc(fullFileName, fileName, stats, rootPath, depth))
       continue;
-    else if (filterFunc instanceof RegExp && !filterFunc.match(fullFileName))
+    else if (filterFunc instanceof RegExp && !fullFileName.match(filterFunc))
       continue;