mythix 2.8.6 → 2.8.8

package/package.json

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

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

@@ -108,42 +108,25 @@ function nodeRequestHandler(routeName, requestOptions) {
       response.on('end', function() {
         response.rawBody = response.body = responseData;
 
+        if (response.statusCode > 399) {
+          var error = new Error(response.statusText);
+          error.response = response;
+
+          reject(error);
+          return;
+        }
+
         try {
           var contentType = response.headers['content-type'];
 
           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);
         }
@@ -215,7 +198,7 @@ function browserRequestHandler(routeName, requestOptions) {
         if (typeof requestOptions.responseHandler === 'function')
           return requestOptions.responseHandler(response);
 
-        if (!response.ok) {
+        if (!response.ok || response.statusCode > 399) {
           var error = new Error(response.statusText);
           error.response = response;
 
@@ -226,34 +209,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;