mythix 2.8.18 → 2.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix",
-  "version": "2.8.18",
+  "version": "2.9.1",
   "description": "Mythix is a NodeJS web-app framework",
   "main": "src/index",
   "scripts": {
@@ -35,7 +35,7 @@
     "form-data": "^4.0.0",
     "luxon": "^3.1.0",
     "micromatch": "^4.0.5",
-    "mythix-orm": "^1.8.3",
+    "mythix-orm": "^1.10.2",
     "nife": "^1.12.1",
     "prompts": "^2.4.2"
   }

package/src/cli/cli-utils.js

@@ -78,6 +78,17 @@ class CommandBase {
         });
 
         childProcess.on('error', (error) => {
+          if (options && options.ignoreExitCode) {
+            resolve({
+              stdout: Buffer.concat(output).toString('utf8'),
+              stderr: Buffer.concat(errors).toString('utf8'),
+              code:   0,
+              error,
+            });
+
+            return;
+          }
+
           reject({
             stdout: Buffer.concat(output).toString('utf8'),
             stderr: Buffer.concat(errors).toString('utf8'),

package/src/cli/deploy-command.js

@@ -26,10 +26,14 @@ module.exports = defineCommand('deploy', ({ Parent }) => {
           '@title':       'Deploy your application to the specified target',
           '--dry-run':    'Show what would be deployed without actually deploying',
           '--no-cleanup': 'File prep in the temporary file location will not be cleaned up after processing',
+          '--direct':     'Skip source control, and deploy the project as-is',
+          '--branch':     'Specify branch to deploy (overrides configuration for specified environment)',
         },
         runner: ({ $, Types }) => {
           $('--dry-run', Types.BOOLEAN());
           $('--no-cleanup', Types.BOOLEAN());
+          $('--direct', Types.BOOLEAN());
+          $('--branch', Types.STRING());
 
           return $(
             /[\w-]+/,
@@ -64,6 +68,10 @@ module.exports = defineCommand('deploy', ({ Parent }) => {
       try {
         return await super.spawnCommand(command, args, options);
       } catch (error) {
+        console.error('Error with command: ', { dryRun, command, args, options }, error);
+        if (error.stderr)
+          console.error(error.stderr);
+
         if (error instanceof Error)
           throw error;
 
@@ -229,6 +237,7 @@ module.exports = defineCommand('deploy', ({ Parent }) => {
     async cloneProject(deployConfig) {
       let {
         git,
+        directDeploy,
         tempLocation,
         rootPath,
       } = deployConfig;
@@ -242,7 +251,7 @@ module.exports = defineCommand('deploy', ({ Parent }) => {
 
       let targetPath = Path.join(tempLocation, 'project');
 
-      if (!repository) {
+      if (directDeploy || !repository) {
         let copyCommand;
 
         if (process.platform === 'win32') {
@@ -833,6 +842,8 @@ module.exports = defineCommand('deploy', ({ Parent }) => {
             throw new Error(`Bad "uri" specified for "targets[${index}]": "${rawURI}". No "pathname" found.`);
         });
 
+        deployConfig.directDeploy = args.direct;
+        deployConfig.branchOverride = (Nife.isNotEmpty(args.branch)) ? args.branch : undefined;
         deployConfig.dryRun = args.dryRun;
         deployConfig.version = this.getRevisionNumber();
 
@@ -845,7 +856,7 @@ module.exports = defineCommand('deploy', ({ Parent }) => {
         if (appOptions.configPath)
           deployConfig.relativeConfigPath = appOptions.configPath.substring(deployConfig.rootPath.length).replace(/^[/\\.]+/, '').replace(/[/\\]+$/, '');
 
-        let git = deployConfig.git || {};
+        let { git } = deployConfig;
         if (git.useGitIgnore) {
           let gitIgnorePath = Path.resolve(deployConfig.rootPath, '.gitignore');
           try {
@@ -898,7 +909,7 @@ module.exports = defineCommand('deploy', ({ Parent }) => {
       try {
         deployConfig = await this.loadDeployConfig(args);
       } catch (error) {
-        console.error(error.message);
+        console.error(error);
         return 1;
       }
 
@@ -940,9 +951,21 @@ module.exports = defineCommand('deploy', ({ Parent }) => {
         console.log(`    -> ${target.uri}`);
       }
 
-      if (Nife.isEmpty(branch)) {
+      if (!deployConfig.directDeploy && Nife.isEmpty(branch)) {
         console.log('');
         console.log('  !!!WARNING!!! "branch" is not set in your deploy configuration. The current file structure will be deployed "as-is". It is highly recommended that you set a "branch" in your deploy configuration.');
+      } else if (deployConfig.directDeploy) {
+        console.log('');
+        console.log('  !!!NOTICE!!! "--direct" argument was specified. Deploying project as-is, bypassing source-control.');
+      }
+
+      if (!deployConfig.directDeploy && !Nife.isEmpty(branch) && deployConfig.branchOverride) {
+        console.log('');
+        console.log(`  !!!NOTICE!!! "--branch" argument was specified. Overriding config branch "${branch}" and using branch "${deployConfig.branchOverride}" instead.`);
+
+        branch = deployConfig.branchOverride;
+        if (git)
+          git.branch = deployConfig.branchOverride;
       }
 
       console.log('');
@@ -953,7 +976,7 @@ module.exports = defineCommand('deploy', ({ Parent }) => {
         this.mkdirSync(false, tempLocation);
         this.mkdirSync(false, Path.join(tempLocation, deployConfig.version));
 
-        if (Nife.isNotEmpty(branch) && Nife.isEmpty(repository)) {
+        if (!deployConfig.directDeploy && (Nife.isNotEmpty(branch) && Nife.isEmpty(repository))) {
           repository = await this.getRepositoryURL(remoteName);
           if (git)
             git.repository = repository;

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

@@ -163,15 +163,22 @@ function browserRequestHandler(routeName, requestOptions) {
     var data        = requestOptions.data;
     var extraConfig = {};
     var headers     = Object.assign(Utils.keysToLowerCase(this.defaultHeaders || {}), Utils.keysToLowerCase(requestOptions.headers || {}));
+    var isFormData  = (data && (data instanceof FormData || data.constructor.name === 'FormData'));
 
     if (data) {
       if (!method.match(/^(GET|HEAD)$/i)) {
-        if ((headers['content-type'] || '').match(/application\/json/i))
-          data = JSON.stringify(data);
+        if (isFormData) {
+          extraConfig = {
+            body: data,
+          };
+        } else {
+          if ((headers['content-type'] || '').match(/application\/json/i))
+            data = JSON.stringify(data);
 
-        extraConfig = {
-          body: data,
-        };
+          extraConfig = {
+            body: data,
+          };
+        }
       } else {
         var queryString = Utils.dataToQueryString(data);
         if (queryString)
@@ -193,6 +200,8 @@ function browserRequestHandler(routeName, requestOptions) {
     );
 
     delete options.data;
+    if (isFormData && options.headers)
+      delete options.headers['content-type'];
 
     globalScope.fetch(url, Utils.cleanObjectProperties(options)).then(
       async function(response) {

package/src/models/model.js

@@ -49,7 +49,7 @@ class Model extends _Model {
   }
 
   static _getConnection(_connection) {
-    let connection = _Model._getConnection.call(this, _connection);
+    let connection = super._getConnection(_connection);
     if (connection)
       return connection;