@tangelo/tangelo-configuration-toolkit 1.12.1 → 1.13.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tangelo/tangelo-configuration-toolkit",
-  "version": "1.12.1",
+  "version": "1.13.0",
   "description": "Tangelo Configuration Toolkit is a command-line toolkit which offers support for developing a Tangelo configuration.",
   "bin": {
     "tct": "bin/index.js",

package/src/cli.js

@@ -92,15 +92,17 @@ module.exports = function cli () {
         remove: {alias: 'r', desc: 'Remove project configuration', conflicts: ['i', 'c', 'g']}
       },
       handler: require('./modules/sql')
-    }).command({
-      command: 'versions',
-      aliases: ['v'],
-      desc: 'Show version information',
+    })
+    .command({
+      command: 'info',
+      aliases: ['i'],
+      desc: 'Show project information',
       builder: {
-        find: {alias: 'f', desc: `Find all version information          [choices: "sort-project"(default),"sort-type"]`},
+        doctypes: {alias: 'd', desc: `List document-types information`},
+        versions: {alias: 'v', desc: `Find all version information, sorted by project or type`, choices: ['project', 'type'], conflicts: ['d']},
         server: {alias: 's', desc: 'Pass server name (set in config file)', default: _appconfig.defaultServer}
       },
-      handler: require('./modules/version')
+      handler: require('./modules/info')
     })
     .recommendCommands()
     .option('config', {alias: 'c', desc: 'Show loaded appconfig', global: false})

package/src/modules/{version → info}/index.js

@@ -1,10 +1,12 @@
-const fs                   = require('fs-extra');
-const globby               = require('globby');
-const path                 = require('path');
-const {Table}              = require('console-table-printer');
-const execGitCommand       = require('../../lib/exec-git-command');
-const c                    = require('../deploy/config');
-const {remote}             = require('../deploy/execute');
+const fs      = require('fs-extra');
+const globby  = require('globby');
+const path    = require('path');
+const {Table} = require('console-table-printer');
+
+const execGitCommand  = require('../../lib/exec-git-command');
+const c               = require('../deploy/config');
+const {remote}        = require('../deploy/execute');
+
 
 const getGitInfo = () => {
   // Version info TDI submodule
@@ -52,9 +54,8 @@ const getGitInfo = () => {
   gitSubmoduleInfo.printTable();
 };
 
-const getFileExtractInfo = (argv) => {
+const getFileExtractInfo = (sorting) => {
   // version info miscellaneous
-  const sorting = argv.find.toString().includes('sort-type') ? 'type' : 'project';
   const projects = new Set;
   const types = new Set;
   const versionInfoConfigPath  = path.join(_paths.repo, _paths.tdi, 'tct/version/versionInfo.js');
@@ -117,8 +118,8 @@ const getFileExtractInfo = (argv) => {
           color: 'yellow'
         });
       });
-    } else
-    if (sorting=='type') {
+    }
+    else if (sorting=='type') {
       types.forEach(t => {
         versionInfo.addRow({ // Add empty row after type
           path: '',
@@ -129,30 +130,73 @@ const getFileExtractInfo = (argv) => {
       });
     }
     versionInfo.printTable();
-  } else {
+  }
+  else {
     _warn('Version info of miscellaneous items cannot be extracted:\nCannot find required files in TDI submodule. Try updating TDI submodule.');
   }
 };
 
-const getServerInfo = (argv) => {
+const getServerInfo = (server) => {
   // Remote server info
   // common setup
   _write();
-  c.setServer(argv.server);
+  c.setServer(server);
 
   if (!c.envDev) {
     _info(`Remote version info for '${c.server.ftpConfig.host}':\n`);
     remote.add('sudo ~root/scripts/version.sh', '').process();
-  } else {
+  }
+  else {
     _info('For development environments no server version information is available. Check rancher / database for this information.\nAdd the --server option with a non-dev environment to see version information for that server.');
   }
 };
 
-module.exports = function version (argv) {
-  _info('Version information of this git repository\n');
 
-  getGitInfo(argv);
-  getFileExtractInfo(argv);
-  getServerInfo(argv);
+module.exports = function info (argv) {
+
+  if (argv.doctypes) {
+    _info('Document type information for this git repository\n');
 
-};
+    const doctypesInfo = new Table({
+      columns: [
+        {name: 'id', alignment: 'right'},
+        {name: 'name', alignment: 'left'},
+        {name: 'paths', alignment: 'left'}
+      ],
+    });
+
+    globby
+      .sync(_paths.repo + '/database/config/**/txd_document_types.sql')
+      .forEach((p, i, a) => {
+        fs.readFileSync(p).toString().match(/select([\s\S]+?)from\s+dual/gmi)
+          .forEach((dtRow, i, a) => {
+            const ntSqlInsert = fs.readFileSync(p.replace('txd_document_types', 'txd_node_types')).toString().match(/select(.*?)from\s+dual/s)[1];
+            const id      = dtRow.match(/(\d+) id/)?.[1];
+            const name    = dtRow.match(/'([^']+)' display_name/)?.[1];
+            const dbPath  = p.match(/(database\/config\/(:?.*)\/)txd_document_types.sql/i)?.[1];
+            const prPath  = ntSqlInsert.match(/'([^']+)' xsl_prep_inc/)[1].replace('prepare_xincludes.xsl','');
+
+            doctypesInfo.addRows([
+              {id, name, paths: 'config/cmscustom/'+ prPath},
+              {paths: dbPath}
+            ]);
+
+            if (i!==a.length-1) doctypesInfo.addRow({});
+          });
+
+        if (i!==a.length-1) doctypesInfo.addRow({});
+      });
+
+
+    doctypesInfo.printTable();
+  }
+
+  if (argv.versions) {
+    _info('Version information for this git repository\n');
+
+    getGitInfo();
+    getFileExtractInfo(argv.versions);
+    getServerInfo(argv.server);
+  }
+
+};