dbdocs 0.6.1 → 0.6.4

package/README.md

@@ -19,7 +19,7 @@ $ npm install -g dbdocs
 $ dbdocs COMMAND
 running command...
 $ dbdocs (-v|--version|version)
-dbdocs/0.6.1 darwin-x64 node-v15.10.0
+dbdocs/0.6.2 darwin-x64 node-v15.10.0
 $ dbdocs --help [COMMAND]
 USAGE
   $ dbdocs COMMAND
@@ -35,7 +35,9 @@ USAGE
 * [`dbdocs ls`](#dbdocs-ls)
 * [`dbdocs password`](#dbdocs-password)
 * [`dbdocs remove [PROJECT_NAME]`](#dbdocs-remove-project_name)
+* [`dbdocs rename`](#dbdocs-rename)
 * [`dbdocs token`](#dbdocs-token)
+* [`dbdocs validate [FILEPATH]`](#dbdocs-validate-filepath)
 
 ## `dbdocs build [FILEPATH]`
 
@@ -129,6 +131,19 @@ USAGE
 ARGUMENTS
   PROJECT_NAME  name of the project which you want to remove
 ```
+
+## `dbdocs rename`
+
+change your username
+
+```
+USAGE
+  $ dbdocs rename
+
+DESCRIPTION
+  change your username and your default organization name
+```
+
 ## `dbdocs token`
 
 generate or revoke your authentication token
@@ -141,4 +156,16 @@ OPTIONS
   -g, --generate  generate authentication token
   -r, --revoke    revoke authentication token
 ```
+
+## `dbdocs validate [FILEPATH]`
+
+validate docs content
+
+```
+USAGE
+  $ dbdocs validate [FILEPATH]
+
+ARGUMENTS
+  FILEPATH  dbml file path
+```
 <!-- commandsstop -->

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"0.6.1","commands":{"build":{"id":"build","description":"build docs","pluginName":"dbdocs","pluginType":"core","aliases":[],"flags":{"project":{"name":"project","type":"option","description":"project name"},"password":{"name":"password","type":"option","char":"p","description":"password for project"}},"args":[{"name":"filepath","description":"dbml file path"}]},"login":{"id":"login","description":"login to dbdocs\nlogin with your dbdocs credentials\n","pluginName":"dbdocs","pluginType":"core","aliases":[],"flags":{},"args":[]},"logout":{"id":"logout","description":"logout\nclears local login credentials\n","pluginName":"dbdocs","pluginType":"core","aliases":[],"flags":{},"args":[]},"ls":{"id":"ls","description":"list projects","pluginName":"dbdocs","pluginType":"core","aliases":[],"flags":{},"args":[]},"password":{"id":"password","description":"set password for your project or remove password","pluginName":"dbdocs","pluginType":"core","aliases":[],"flags":{"project":{"name":"project","type":"option","char":"p","description":"project name","helpValue":"project name"},"set":{"name":"set","type":"option","char":"s","description":"password for your project","helpValue":"password"},"remove":{"name":"remove","type":"boolean","char":"r","description":"remove password from your project","allowNo":false}},"args":[]},"remove":{"id":"remove","description":"remove docs","pluginName":"dbdocs","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"project_name","description":"name of the project which you want to remove"}]},"token":{"id":"token","description":"generate or revoke your authentication token","pluginName":"dbdocs","pluginType":"core","aliases":[],"flags":{"generate":{"name":"generate","type":"boolean","char":"g","description":"generate authentication token","allowNo":false},"revoke":{"name":"revoke","type":"boolean","char":"r","description":"revoke authentication token","allowNo":false}},"args":[]}}}
+{"version":"0.6.4","commands":{"build":{"id":"build","description":"build docs","pluginName":"dbdocs","pluginType":"core","aliases":[],"flags":{"project":{"name":"project","type":"option","description":"project name"},"password":{"name":"password","type":"option","char":"p","description":"password for project"}},"args":[{"name":"filepath","description":"dbml file path"}]},"login":{"id":"login","description":"login to dbdocs\nlogin with your dbdocs credentials\n","pluginName":"dbdocs","pluginType":"core","aliases":[],"flags":{},"args":[]},"logout":{"id":"logout","description":"logout\nclears local login credentials\n","pluginName":"dbdocs","pluginType":"core","aliases":[],"flags":{},"args":[]},"ls":{"id":"ls","description":"list projects","pluginName":"dbdocs","pluginType":"core","aliases":[],"flags":{},"args":[]},"password":{"id":"password","description":"set password for your project or remove password","pluginName":"dbdocs","pluginType":"core","aliases":[],"flags":{"project":{"name":"project","type":"option","char":"p","description":"project name","helpValue":"project name"},"set":{"name":"set","type":"option","char":"s","description":"password for your project","helpValue":"password"},"remove":{"name":"remove","type":"boolean","char":"r","description":"remove password from your project","allowNo":false}},"args":[]},"remove":{"id":"remove","description":"remove docs","pluginName":"dbdocs","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"project_name","description":"name of the project which you want to remove"}]},"rename":{"id":"rename","description":"change your username","pluginName":"dbdocs","pluginType":"core","aliases":[],"flags":{},"args":[]},"token":{"id":"token","description":"generate or revoke your authentication token","pluginName":"dbdocs","pluginType":"core","aliases":[],"flags":{"generate":{"name":"generate","type":"boolean","char":"g","description":"generate authentication token","allowNo":false},"revoke":{"name":"revoke","type":"boolean","char":"r","description":"revoke authentication token","allowNo":false}},"args":[]},"validate":{"id":"validate","description":"validate docs content","pluginName":"dbdocs","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"filepath","description":"dbml file path"}]}}}

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "dbdocs",
-  "version": "0.6.1",
+  "version": "0.6.4",
   "author": "@holistics",
   "bin": {
     "dbdocs": "./bin/run"
   },
   "dependencies": {
+    "@dbml/core": "^2.4.2",
     "@oclif/command": "^1",
     "@oclif/config": "^1",
     "@oclif/plugin-help": "^2",
@@ -51,6 +52,9 @@
       "init": [
         "./src/hooks/init/checkUpdate",
         "./src/hooks/init/loadEnv"
+      ],
+      "prerun":[
+        "./src/hooks/prerun/checkVersion"
       ]
     }
   },

package/src/commands/build.js

@@ -10,14 +10,7 @@ const verifyToken = require('../utils/verifyToken');
 const { getOrg } = require('../utils/org');
 const { shouldAskForFeedback } = require('../utils/feedback');
 const { isValidName } = require('../validators/projectName');
-
-async function validate (content) {
-  const res = await axios.post(`${vars.apiUrl}/parse`, {
-    content,
-  });
-
-  return res.data.model;
-}
+const parse = require('../utils/parse');
 
 async function build (project, authConfig) {
   const res = await axios.post(`${vars.apiUrl}/projects`, project, authConfig);
@@ -57,20 +50,16 @@ class BuildCommand extends Command {
       // validate dbml syntax, get project name if it's already defined in the file
       spinner.text = 'Parsing file content';
       spinner.start();
+      let model = null;
       try {
-        const model = await validate(content);
+        model = await parse(content);
         if (!project) {
-          project = model.database['1'].name;
+          project = model.name;
         }
         spinner.succeed('Parsing file content');
-      } catch (err) {
-        let message = err.message || 'Something wrong :( Please try again.';
-        if (err.response) {
-          const { error } = err.response.data;
-          if (error.name === 'SyntaxError') {
-            message = `You have syntax error in ${path.basename(filepath)} line ${error.location.start.line} column ${error.location.start.column}. ${error.message}`;
-          }
-        }
+      } catch (error) {
+        if (!error.location) throw error;
+        const message = `You have syntax error in ${path.basename(filepath)} line ${error.location.start.line} column ${error.location.start.column}. ${error.message}`;
         throw new Error(message);
       }
 
@@ -95,6 +84,7 @@ class BuildCommand extends Command {
           doc: {
             content,
           },
+          shallowSchema: model.schemas,
         }, authConfig);
         if (!newProject.isPublic) {
           if (isCreated || password) {

package/src/commands/rename.js

@@ -0,0 +1,88 @@
+const { Command } = require('@oclif/command');
+const inquirer = require('inquirer');
+const axios = require('axios');
+const ora = require('ora');
+const { vars } = require('../vars');
+const { isValidUserName } = require('../validators/userName');
+const verifyToken = require('../utils/verifyToken');
+
+async function enterUserName () {
+  const answer = await inquirer.prompt([
+    {
+      message: 'Please input your new username: ',
+      name: 'newUserName',
+    },
+  ]);
+  return answer.newUserName;
+}
+
+async function validateAndUpdateUserName (spinner, authConfig, command) {
+  let newUserName = await enterUserName();
+
+  while (!isValidUserName(newUserName)) {
+    spinner.warn('Invalid username! Username can only contain alphabets, numbers, "-" or "_" and can not be blanked!');
+    newUserName = await enterUserName();
+  }
+
+  try {
+    const { data: { user, hasRevokedToken } } = await axios.put(`${vars.apiUrl}/account/rename`, { newUserName }, authConfig);
+    return { user, hasRevokedToken };
+  } catch (err) {
+    const { error } = err.response.data;
+    const warningNames = ['UserNameNotChange', 'UserNameExisted'];
+    if (warningNames.includes(error.name)) {
+      spinner.warn(error.message);
+    } else {
+      command.error(error.message);
+    }
+    return { user: null, hasRevokedToken: null };
+  }
+}
+
+class RenameCommand extends Command {
+  async run () {
+    const spinner = ora({});
+    try {
+      const authConfig = await verifyToken();
+
+      this.warn('After renaming, your authentication token (if exists) will be revoked. Please re-generate a new one!');
+      this.warn('You may need to re-login your account on the dbdocs web app for the best user experience.');
+
+      let { user, hasRevokedToken } = await validateAndUpdateUserName(spinner, authConfig, this);
+      while (!user) {
+        ({ user, hasRevokedToken } = await validateAndUpdateUserName(spinner, authConfig, this));
+      }
+      if (hasRevokedToken) {
+        spinner.succeed('Rename successfully and your access token has been revoked, please generate a new one!');
+      } else {
+        spinner.succeed('Rename successfully!');
+      }
+    } catch (err) {
+      if (spinner.isSpinning) {
+        spinner.fail();
+      }
+      let message = err.message || 'Something wrong :( Please try again.';
+      if (err.response) {
+        const { error } = err.response.data;
+        switch (error.name) {
+          case 'TokenExpiredError':
+            message = 'Your token has expired. Please login again.';
+            break;
+
+          case 'InvalidAuthToken':
+            message = 'Invalid token. Please login again.';
+            break;
+
+          default:
+            message = error.message;
+            break;
+        }
+      }
+      this.error(message);
+    }
+  }
+}
+
+RenameCommand.description = 'change your username';
+
+module.exports = RenameCommand;

package/src/commands/validate.js

@@ -0,0 +1,43 @@
+const { Command, flags } = require('@oclif/command');
+const fs = require('fs');
+const path = require('path');
+const ora = require('ora');
+const parse = require('../utils/parse');
+
+class ValidateCommand extends Command {
+  async run () {
+    const spinner = ora({});
+    let filepath = null;
+    try {
+      const { args } = this.parse(ValidateCommand);
+      filepath = args.filepath;
+      let content = '';
+      content = fs.readFileSync(path.resolve(process.cwd(), filepath), 'utf-8');
+
+      spinner.text = 'Validating file content';
+      spinner.start();
+
+      await parse(content);
+      spinner.succeed('Validating file content');
+      spinner.succeed('Done. Parse succeeded without errors.');
+    } catch (error) {
+      let message = error.message || 'Something wrong :( Please try again.';
+      if (filepath && error.location) message = `You have syntax error in ${path.basename(filepath)} line ${error.location.start.line} column ${error.location.start.column}. ${error.message}`;
+      if (spinner.isSpinning) {
+        spinner.fail(`Failed: ${message}`);
+      } else {
+        this.error(message);
+      }
+    }
+  }
+}
+
+ValidateCommand.description = 'validate docs content';
+
+ValidateCommand.flags = {};
+
+ValidateCommand.args = [
+  { name: 'filepath', description: 'dbml file path' },
+];
+
+module.exports = ValidateCommand;

package/src/hooks/prerun/checkVersion.js

@@ -0,0 +1,20 @@
+const { getVersion, getPackageVersion, compareVersion } = require('./helper');
+
+module.exports = async function () {
+  let shouldExit = false;
+  try {
+    const localVersion = getPackageVersion();
+    const remoteVersion = await getVersion();
+    const mustUpgrade = compareVersion(localVersion, remoteVersion.required) === -1;
+    if (mustUpgrade) {
+      shouldExit = true;
+      this.error('Your CLI version is no longer supported, please upgrade with "npm i -g dbdocs"');
+    }
+    const shouldUpgrade = compareVersion(localVersion, remoteVersion.current) === -1;
+    if (shouldUpgrade) this.warn('A new version is available, use "npm i -g dbdocs" to upgrade to the latest version');
+  } catch (err) {
+    const message = err.message || 'Something goes wrong when checking version';
+    if (shouldExit) this.error(message);
+    this.warn(message);
+  }
+};

package/src/hooks/prerun/helper.js

@@ -0,0 +1,37 @@
+const axios = require('axios');
+const { vars } = require('../../vars');
+const pkg = require('../../../package.json');
+
+const getVersion = async () => {
+  const res = await axios.get(`${vars.apiUrl}/version/cli`);
+  return res.data;
+};
+const getPackageVersion = () => {
+  const ver = pkg.version;
+  const [major, minor, patch] = ver.split('.');
+  return { major, minor, patch };
+};
+
+/**
+ * @param {{major: number, minor: number, patch: number}} a: version to compare
+ * @param {{major: number, minor: number, patch: number}} b: version to compare to
+ * @returns {number}
+ * 0: a = b;
+ * 1: a > b;
+ * -1: a < b;
+ */
+const compareVersion = (a, b) => {
+  if (a.major > b.major) return 1;
+  if (a.major < b.major) return -1;
+  if (a.minor > b.minor) return 1;
+  if (a.minor < b.minor) return -1;
+  if (a.patch > b.patch) return 1;
+  if (a.patch < b.patch) return -1;
+  return 0;
+};
+
+module.exports = {
+  getVersion,
+  getPackageVersion,
+  compareVersion,
+};

package/src/user_data.json

@@ -1 +1 @@
-{"BUILD_COUNT":2}
+{"BUILD_COUNT":1}

package/src/utils/parse.js

@@ -0,0 +1,18 @@
+const { Worker } = require('worker_threads');
+
+const parse = (content) => {
+  return new Promise((resolve, reject) => {
+    const workerPath = `${__dirname}/parserWorker.js`;
+
+    const worker = new Worker(workerPath, {
+      workerData: { content },
+    });
+    worker.on('message', resolve);
+    worker.on('error', reject);
+    worker.on('exit', (code) => {
+      if (code !== 0) reject(new Error(`Worker stopped with exit code ${code}`));
+    });
+  });
+};
+
+module.exports = parse;

package/src/utils/parserWorker.js

@@ -0,0 +1,20 @@
+const { parentPort, workerData } = require("worker_threads");
+const { Parser } = require("@dbml/core");
+
+function parse (content) {
+  const databaseObject = Parser.parse(content, 'dbml');
+  const schemas = databaseObject.schemas.map((schema) => {
+    return {
+      name: schema.name,
+      tables: schema.tables.map((table) => table.name),
+    };
+  });
+  return {
+    name: databaseObject.name,
+    schemas,
+  };
+}
+
+const { content } = workerData;
+const result = parse(content);
+parentPort.postMessage(result);

package/src/validators/userName.js

@@ -0,0 +1,6 @@
+const pattern = /^[a-z\d](?:[a-z\d]|-(?=[a-z\d])){0,38}$/i;
+const isValidUserName = (userName) => pattern.test(userName);
+
+module.exports = {
+  isValidUserName,
+};