dbdocs 1.6.0 → 1.7.0

package/oclif.manifest.json

@@ -386,5 +386,5 @@
       ]
     }
   },
-  "version": "1.6.0"
+  "version": "1.7.0"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dbdocs",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "author": "@holistics",
   "bin": {
     "dbdocs": "./bin/run"
@@ -14,7 +14,7 @@
     "@dbml/core": "10.1.1",
     "@oclif/core": "1.26.2",
     "@oclif/plugin-help": "6.2.32",
-    "axios": "^1.18.1",
+    "axios": "^1.20.0",
     "chalk": "^3.0.0",
     "dotenv": "^8.2.0",
     "inquirer": "^12.9.4",

package/src/assets/callback-success.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>dbdocs CLI - Completing Authentication</title>
+    <title>dbdocs CLI - Authentication Successful</title>
     <style>
       * {
         margin: 0;
@@ -65,7 +65,7 @@
         </svg>
       </div>
 
-      <h1>Completing Authentication</h1>
+      <h1>Authentication Successful</h1>
 
       <p>You can close this window and return to your terminal to continue.</p>
     </div>

package/src/commands/build.js

@@ -36,7 +36,7 @@ async function enterOrgName (defaultOrgName) {
       name: 'orgName',
     },
   ]);
-  return answer.orgName || defaultOrgName;
+  return { orgName: answer.orgName || defaultOrgName, isUsingDefaultOrg: !answer.orgName };
 }
 
 async function enterProjectName () {
@@ -94,20 +94,23 @@ class BuildCommand extends Command {
         const message = rawMessage ? `You have syntax error(s) in ${path.basename(filepath)}\n${rawMessage}` : 'Something wrong :( Please try again.';
         throw new Error(message);
       }
-
-      if (!orgName) orgName = defaultOrgName;
+      let isUsingDefaultOrg = false;
+      if (!orgName) {
+        orgName = defaultOrgName;
+        isUsingDefaultOrg = true;
+      }
 
       let projectName = projectNameFromInput || projectNameFromDbml;
 
       // if project name is not defined yet, ask user to input the project name
       if (!projectName) {
         // ask the username to publish to
-        orgName = await enterOrgName(defaultOrgName);
+        ({ orgName, isUsingDefaultOrg } = await enterOrgName(defaultOrgName));
         while (!isValidName(orgName)) {
           // eslint-disable-next-line max-len
           spinner.warn('Invalid username! Username can only contain alphabets, numbers, space, "-" or "_", or leave it blank to publish to your personal account!');
           // eslint-disable-next-line no-await-in-loop
-          orgName = await enterOrgName(defaultOrgName);
+          ({ orgName, isUsingDefaultOrg } = await enterOrgName(defaultOrgName));
         }
         projectName = await enterProjectName();
       }
@@ -151,6 +154,9 @@ class BuildCommand extends Command {
           default:
             break;
         }
+        if (isUsingDefaultOrg) {
+          spinner.info(`No username specified, defaulting to: ${chalk.cyan(defaultOrgName)}`);
+        }
         spinner.succeed(`Done. Visit: ${chalk.cyan(getProjectUrl(vars.hostUrl, newProject.org.name, newProject.urlName))}\n`);
         if (shouldAskForFeedback()) {
           spinner.info(`Thanks for using dbdocs! We'd love to hear your feedback: ${chalk.cyan('https://form.jotform.com/200962053361448')}`);

package/src/utils/org.js

@@ -3,7 +3,11 @@ const { vars } = require('../vars');
 
 async function getOrg (authConfig) {
   const { data: { orgs } } = await axios.get(`${vars.apiUrl}/orgs`, authConfig);
-  return orgs[0];
+  const defaultOrg = orgs.find((org) => org.isDefault) || orgs[0];
+  if (!defaultOrg) {
+    throw new Error(`Your account has no workspace. Please visit ${vars.loginUrl}/workspace to create a workspace first and then try again.`);
+  }
+  return defaultOrg;
 }
 
 async function getAssociatedOrgs (authConfig) {