@tangelo/tangelo-configuration-toolkit 1.12.1 → 1.14.0

package/.eslintrc.js

@@ -14,6 +14,7 @@ module.exports = {
     '_write': 'writable',
     '_info': 'writable',
     '_warn': 'writable',
+    '_formatDate': 'writable',
     '_error': 'writable',
     '_perf': 'writable',
     '_paths': 'writable',

package/LICENSE.md

@@ -1 +1 @@
-Copyright © 2020 Tangelo Software BV <info@tangelo-software.com>
+Copyright © 2020 Tangelo Software BV <mailto:info@tangelo-software.com>

package/README.md

@@ -64,4 +64,4 @@ For a new repository, using `tct build --init` also creates the repoconfig-file.
 The `build -x` commands set projects transformation scenarios and masterfiles in the oXygen project file with the following functionality:
 - Will try to preserve manually added entries in the transformation scenarios and masterfiles
 - Will remove non existing masterfiles or masterfiles that start with a '_'
-- No masterfiles / scenarios will be added if their path match with oXygens hidden directory patterns
+- No masterfiles / scenarios will be added if their path match with oXygens hidden directory patterns

package/bitbucket-pipelines.yml

@@ -0,0 +1,32 @@
+image: atlassian/default-image:4
+
+clone:
+  depth: full # SonarCloud scanner needs the full history to assign issues properly
+
+definitions:
+  caches:
+    sonar: ~/.sonar/cache # Caching SonarCloud artifacts will speed up your build
+  services:
+    docker:
+      memory: 2048 # For large file line code
+  steps:
+  - step: &build-test-sonarcloud
+      name: Build, test and analyze on SonarCloud
+      caches:
+        - sonar
+      script:
+        - pipe: sonarsource/sonarcloud-scan:1.4.0
+  - step: &check-quality-gate-sonarcloud
+      name: Check the Quality Gate on SonarCloud
+      script:
+        - pipe: sonarsource/sonarcloud-quality-gate:0.1.6
+
+pipelines:
+  branches:
+    master:
+      - step: *build-test-sonarcloud
+      - step: *check-quality-gate-sonarcloud
+  pull-requests:
+    '**':
+      - step: *build-test-sonarcloud
+      - step: *check-quality-gate-sonarcloud

package/index.js

@@ -24,7 +24,7 @@ global._write = (...msg) => {
 global._info = (msg, time = false) => {
   if (time) {
     const tzDiff  = new Date().getTimezoneOffset() * 60000;
-    const time    = new Date(Date.now() - tzDiff).toISOString().replace(/.*T(.*)\..*/g, '$1');
+    const time    = new Date(Date.now() - tzDiff).toISOString().match(/\d\d:\d\d:\d\d/)[0];
     msg = `[${time}] ${msg}`;
   }
   console.log(msg.lgreen);
@@ -44,6 +44,9 @@ global._perf = (t1) => {
   console.log(`\nExecution time: ${t2 - t1}ms`.blue);
 };
 
+global._formatDate = (date) => {
+  return date.toLocaleDateString('en-gb', {day: 'numeric', month: 'short', year: 'numeric', hour: '2-digit', minute: '2-digit'});
+};
 
 global._paths = {
   app: __dirname,

package/package.json

@@ -1,6 +1,9 @@
 {
   "name": "@tangelo/tangelo-configuration-toolkit",
-  "version": "1.12.1",
+  "version": "1.14.0",
+  "engines": {
+    "node": ">=14.0.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

@@ -64,9 +64,11 @@ module.exports = function cli () {
       aliases: ['g'],
       desc: 'Git repo actions (requires global git installation)',
       builder: {
-        init: {alias: 'i', desc: 'Initialize repository and add submodule', conflicts: ['r']},
-        reset: {alias: 'r', desc: 'Reset repository to last commit', conflicts: ['i']},
-        clone: {alias: 'c', desc: 'Clone a client repository and do basic setup'},
+        init: {alias: 'i', desc: 'Initialize repository and add submodule', conflicts: ['r', 'c', 'u']},
+        reset: {alias: 'r', desc: 'Reset repository to last commit', conflicts: ['i', 'c', 'u']},
+        clone: {alias: 'c', desc: 'Clone a client repository and do basic setup', conflicts: ['i', 'r', 'u']},
+        update: {alias: 'u', desc: 'Update repository or TDI submodule', conflicts: ['i', 'r', 'c']},
+        branch: {alias: 'b', desc: 'Pass tdi release branch, e.g. "5.4"', conflicts: ['i', 'r', 'c']}
       },
       handler: require('./modules/git')
     })
@@ -92,15 +94,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})
@@ -109,10 +113,13 @@ module.exports = function cli () {
     .example([
       ['$0 deploy --copy --server demo', 'Copy files to server "demo"'],
       ['$0 d -c -s demo', 'Same as above'],
-      ['$0 f -sb && $0 d -c', 'Compile schema and build Fonto, then deploy to default server']
+      ['$0 f -sb && $0 d -c', 'Compile schema and build Fonto, then deploy to default server'],
+      ['$0 git --update', 'Pull git repository and submodule to latest repository commit'],
+      ['$0 git --update tdi', 'Update TDI submodule to latest within current TDI branch'],
+      ['$0 git --update tdi --branch 5.4', 'Update TDI submodule to latest in specified branch']
     ])
     .check((argv, options) => {
-      const passedOpts  = Object.keys(argv).filter(k => !['_', '$0', 'server', 's', 'filter', 'f'].includes(k)); // also filter options with defaults
+      const passedOpts  = Object.keys(argv).filter(k => !['_', '$0', 'server', 's', 'filter', 'f', 'branch', 'b'].includes(k)); // also filter options with defaults
       const hasOpts     = Object.keys(options)[0];
       if (hasOpts && !passedOpts[0]) yargs.showHelp();
       return true;

package/src/lib/exec-git-command.js

@@ -1,14 +1,15 @@
 const {spawnSync} = require('child_process');
 
 
-module.exports = function execGitCommand(args, path, returnProperties = [], expectedStatus) {
+module.exports = function execGitCommand(args, path, returnProperties, expectedStatus) {
 
   const cmd = spawnSync('git', [args], {cwd: path, shell: true});
 
+  if (cmd.status !== 0) return {error: `${cmd.stderr}`};
   if (expectedStatus!=undefined) return cmd.status == expectedStatus;
 
   let retObj = (cmd.stdout||'').toString().trim().split(';');
-  if (returnProperties[0]) {
+  if (returnProperties?.[0]) {
     const o = {};
     retObj = (
       retObj.forEach((v, i) => {
@@ -21,6 +22,6 @@ module.exports = function execGitCommand(args, path, returnProperties = [], expe
       o
     );
   }
-  return retObj.length==1 ? retObj[0] : retObj;
+  return retObj.length === 1 ? retObj[0] : retObj;
 
 };

package/src/lib/get-repoconfig.js

@@ -16,7 +16,7 @@ module.exports = function getRepoconfig() {
       const ntName        = ntSqlInsert.match(/'([^']+)' name/)[1];
       const xpiDir        = ntSqlInsert.match(/'([^']+)' xsl_prep_inc/)[1];
 
-      const path_cmscustom  = xpiDir.replace(/\/[^/]+$/, '').split(/[/]/);
+      const path_cmscustom  = xpiDir.replace(/\/[^/]+$/, '').split(/\//);
       const path_dbconfig   = p.replace(/database\/config\/(.*)\/[^/]+/, '$1').split(/[/\\]/);
       const dnRegex         = [path_cmscustom[0].replace(/[_'"]/g, '.'), path_dbconfig[0].replace(/[_'"]/g, '.')].sort((a, b) => b.length - a.length).join('|');
       const customer_name   = (dtDisplayName.match(RegExp(dnRegex, 'i')) || dtDisplayName.split(/ (.+)/))[0];

package/src/lib/get-tdi-branch.js

@@ -0,0 +1,41 @@
+const execGitCommand = require('./exec-git-command');
+const path           = require('path');
+
+module.exports = function getTdiBranch(toBranchName) {
+  const tdiBranch = {};
+  let toBranch;
+  if (toBranchName) {
+    // Check if specified branch exists; we will update to this branch
+    toBranch = String(toBranchName).replace(/(?:release\/)?(\d+(?:\.[\dx]+)*)/, `release/$1`);
+    const branchExists = execGitCommand(`branch --remote`, path.join(_paths.repo, _paths.tdi)).match(`origin/${toBranch}`);
+    if (!branchExists) _error(`TDI branch "${toBranch}" does not exist. Note that TCT can only update to a release branch.`);
+  }
+
+  // Get the current TDI branch:
+
+  // Get remote release branches containing TDI HEAD commit
+  const releaseBranches = execGitCommand(`branch --all --contains ${_git.commitTdi.local().hash}`, path.join(_paths.repo, _paths.tdi)).match(/remotes\/origin\/release\/[^\s]+/gsm);
+  if (!releaseBranches || releaseBranches.error) _error(`Could not retrieve TDI release branches`);
+
+  // Get the first possible branch; prefer release/5.1 over release/5.2:
+  releaseBranches.sort((a, b) => a > b ? 1 : -1);
+
+  // Set branch name of firstBranch without 'remotes/origin/'
+  tdiBranch.name = releaseBranches[0].replace(/remotes\/origin\//g, '');
+
+  // In case of branch switch set from.name to the old branch and name to the new branch
+  if (toBranch) {
+    if (tdiBranch.name > toBranch) _error(`You cannot downgrade to a lower release branch with TCT.`);
+    tdiBranch.from = {name: tdiBranch.name};
+    tdiBranch.name = toBranch;
+
+    const branchHash = execGitCommand(`rev-parse origin/${toBranch}`, path.join(_paths.repo, _paths.tdi));
+    const commonAncestorHash = execGitCommand(`merge-base ${_git.commitTdi.local().hash} ${branchHash}`, path.join(_paths.repo, _paths.tdi));
+    const commonAncestorDate = execGitCommand(`show ${commonAncestorHash} --no-patch --format=%cd --date=iso-strict `, path.join(_paths.repo, _paths.tdi), ['date']).date;
+    tdiBranch.commonAncestor = {date: new Date(commonAncestorDate)};
+  }
+
+  // Get number of commits behind
+  tdiBranch.commitsBehind = execGitCommand(`rev-list HEAD...origin/${tdiBranch.name} --count`, path.join(_paths.repo, _paths.tdi));
+  return tdiBranch;
+};

package/src/lib/gulp-resolve-includes.js

@@ -15,8 +15,8 @@ const resolveImports = (fp, file) => {
         fs.readFileSync(xiPath).toString()
           .replace(/[\s\S]*?<x:config[^>]*>([\s\S]*?)<\/x:config>/, '$1')                 // only return contents of x:config element
           .replace(/<(\w+)\/>/g, '<$1></$1>')                                             // self-closing html tags can cause problems
-          .replace(/url="(\.\.\/)+pls\//g, 'url="#{plsservlet}')                          // replace relative references to plsservlet by bind (4.1 compatibility)
-          .replace(/url="(\.\.\/)+/g, 'url="#{cmspath}')                                  // replace relative references to cmspath by bind (4.1 compatibility)
+          .replace(/url="(?:\.\.\/)+pls\//g, 'url="#{plsservlet}')                        // replace relative references to plsservlet by bind (4.1 compatibility)
+          .replace(/url="(?:\.\.\/)+/g, 'url="#{cmspath}')                                // replace relative references to cmspath by bind (4.1 compatibility)
           .replace(/(<x:javascript\s+src=")([^#].*?)("\s*\/>)/g, (match, g1, g2, g3) => { // correct all javascript refs to paths relative to cmscustompath bind
             const newPath = path.resolve(fp.dir, path.resolve(path.dirname(xiPath), g2))
               .replace(/.*cmscustom./, '#{cmscustompath}')
@@ -54,6 +54,7 @@ const resolveIncludes = (fp, file) => {
       }
       catch (e) {
         console.log('Illegal reference to path: '.red + e.path);
+        return match;
       }
     });
   }

package/src/lib/package-update-check.js

@@ -2,18 +2,19 @@ const {compare}   = require('compare-versions');
 const exec        = require('util').promisify(require('child_process').exec);
 
 
-const doUpdateCheck = (package) => (
-  exec(`npm view -g ${_packages[package].name} version`)
+const doUpdateCheck = (pkg) => (
+  exec(`npm view -g ${_packages[pkg].name} version`)
     .then(r => {
       const versionAvailable = r.stdout.match(/([\d/.]+)/)[1];
-      if (!_packages[package].version) _warn(`${package} is not installed! Run ` + `npm i -g ${_packages[package].name}`.white);
-      else if (compare(_packages[package].version, versionAvailable, '<')) {
-        _appdata._update({[`updateCheck${package}`]: {executed: new Date(), versionAvailable}});
+      if (!_packages[pkg].version) _warn(`${pkg} is not installed! Run ` + `npm i -g ${_packages[pkg].name}`.white);
+      else if (compare(_packages[pkg].version, versionAvailable, '<')) {
+        _appdata._update({[`updateCheck${pkg}`]: {executed: new Date(), versionAvailable}});
         return versionAvailable;
       }
-      else _appdata._update({[`updateCheck${package}`]: {executed: new Date()}});
+      else _appdata._update({[`updateCheck${pkg}`]: {executed: new Date()}});
+      return;
     })
-    .catch(e => _warn(`Failed checking latest version of ${package}.`))
+    .catch(() => _warn(`Failed checking latest version of ${pkg}.`))
 );
 
 let checkUpdatesDone = false;
@@ -23,16 +24,16 @@ module.exports = function packageUpdateCheck () {
   if (!checkUpdatesDone) { // check if updatecheck has ran before because async calls below trigger beforeExit again
     checkUpdatesDone = true;
 
-    ['TCT'].forEach(p => {
-      const updateMsg = (va) => `| Update ${p} to ${va} | ` + `npm i -g ${_packages[p].name}`.white;
-      const {versionAvailable} = _appdata[`updateCheck${p}`] || {};
+    ['TCT'].forEach(pkg => {
+      const updateMsg = (va) => `| Update ${pkg} to ${va} | ` + `npm i -g ${_packages[pkg].name}`.white;
+      const {versionAvailable} = _appdata[`updateCheck${pkg}`] || {};
 
-      if (new Date() - new Date(_appdata[`updateCheck${p}`]?.executed || 0) > 1000*3600*24*7) { // check every week
-        doUpdateCheck(p).then(r => r && _warn(updateMsg(r)));
+      if (new Date() - new Date(_appdata[`updateCheck${pkg}`]?.executed || 0) > 1000*3600*24*7) { // check every week
+        doUpdateCheck(pkg).then(r => r && _warn(updateMsg(r)));
       }
       else if (versionAvailable) {
-        if (compare(_packages[p].version, versionAvailable, '<')) _warn(updateMsg(versionAvailable));
-        else _appdata._update({[`updateCheck${p}`]: {executed: new Date()}});
+        if (compare(_packages[pkg].version, versionAvailable, '<')) _warn(updateMsg(versionAvailable));
+        else _appdata._update({[`updateCheck${pkg}`]: {executed: new Date()}});
       }
     });
   }

package/src/lib/style-string-getters.js

@@ -9,5 +9,5 @@ for (const name in styles ) {
 }
 
 String.prototype.__defineGetter__('nostyle', function () {
-  return this.replace(/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g, '');
+  return this.replace(/[\u001b\u009b][[()#;?]*(?:\d{1,4}(?:;\d{0,4})*)?[0-9A-ORZcf-nqry=><]/g, '');
 });

package/src/modules/build/oxygen.js

@@ -59,7 +59,7 @@ const getTransformations = (config) => {
       // extract baseStrings from file
         const fileString = fs.readFileSync(f).toString();
         const baseStrings = fileString.match(RegExp(config.extracts.base, 'gm'));
-        
+
         if (fileString.replace(/\s|^prompt\s.*$/gm,'')!=='') {
           if (baseStrings) {
             baseStrings.forEach(s => {
@@ -156,9 +156,9 @@ const transformXprFile = (xprFiles) => {
 
 
 module.exports = function oxygen () {
-  // _info(`Set projects transformation scenarios and masterfiles in oXygen project file...`);
-  // _info(`- Will try to preserve manually added entries in the transformation scenarios and masterfiles`);
-  // _info(`- Will remove non existing masterfiles or masterfiles that start with a '_'\n`);
+  // Set projects transformation scenarios and masterfiles in oXygen project file
+  // - Will try to preserve manually added entries in the transformation scenarios and masterfiles
+  // - Will remove non existing masterfiles or masterfiles that start with a '_'
 
   if (!fs.existsSync(spConfigPath) || !fs.existsSync(sefFilePath)) {
     _error(`Cannot find required files in TDI submodule. Try updating TDI submodule.`);

package/src/modules/deploy/config.js

@@ -91,7 +91,7 @@ module.exports = {
     let transferPattern = path.join(_paths.apply, filter).toFws();
 
     // test if 'cmscustom/tdi' would be included, then add specifically, because following symlinks doesnt work with glob stars
-    const tdiIncRegex = /^(config\/)?(({\w*,?)?cmscustom(,?\w*})?\/|\*\/)?\*\*/;
+    const tdiIncRegex = /^(config\/)?((\{\w*,?)?cmscustom(,?\w*\})?\/|\*\/)?\*\*/;
     const tdiPattern  = tdiIncRegex.test(transferPattern) ? transferPattern.replace(tdiIncRegex, `${this.deliveryPack ? 'config/' : ''}cmscustom/tdi/**`) : 'nomatch';
 
     if (!transferPattern)

package/src/modules/deploy/execute.js

@@ -32,7 +32,7 @@ const remote = {
   do(sshI) {
     let executing = Math.min(this.queue.length, c.server.ftpConfig.parallel);
 
-    if (executing==0) { // close connection and return callback after last exec command
+    if (executing===0) { // close connection and return callback after last exec command
       sshI.dispose();
       _write();
     }
@@ -48,14 +48,14 @@ const remote = {
           else _info(command[1] || command[0], true);
 
           executing--;
-          if (executing==0) this.do(sshI);
+          if (executing===0) this.do(sshI);
         })
-        .catch(err => {
+        .catch(() => {
           _warn(`Server aborted connection. Retrying.`);
           this.queue.unshift(command);
 
           executing--;
-          if (executing==0) this.do(sshI);
+          if (executing===0) this.do(sshI);
         });
     });
   },
@@ -189,7 +189,7 @@ const transfer = (paths, lrServer) => {
       remote.process();
 
       if (lrServer) { // reload specific resources if files are all image or css, else reload page
-        const reloadPage = !files.every(f => /.(css|jpe?g|png|gif)$/i.test(f));
+        const reloadPage = !files.every(f => /.(?:css|jpe?g|png|gif)$/i.test(f));
         lrServer.changed({params: {files: reloadPage ? ['page'] : files}});
         _info(`${reloadPage ? 'Page' : 'Resources'} reloaded\n`);
       }

package/src/modules/deploy/index.js

@@ -90,7 +90,7 @@ module.exports = function deploy (argv) {
           if (!path.parse(filepath).base.match(/\.scss/)) {
             const rp  = c.getRemotePath(filepath);
             const msg = 'Removed: ' + rp.replace(c.server.remotedir, '').white;
-            if (c.localTransfer) del([rp], {force: true}).then(paths => _info(msg, true));
+            if (c.localTransfer) del([rp], {force: true}).then(() => _info(msg, true));
             else remote.add(`rm -rf "${rp}"`, msg).process();
           }
         }

package/src/modules/fonto/commands.js

@@ -38,7 +38,7 @@ const cmdExec = command => new Promise((resolve) => {
   });
   cp.stderr.setEncoding('utf8');
   cp.stderr.on('data', data => log(data.replace(/Browserslist: caniuse-lite .*/s, '')));
-  cp.on('close', code => {
+  cp.on('close', () => {
     _write();
     resolve();
   });
@@ -49,15 +49,15 @@ module.exports = {
 
   init ([fdt, fontoVersion]) {
     return new Promise((resolve, reject) => {
-        _info('Ensure symlink exists:');
-        fs.symlink(path.join('../../../tdi/fonto/packages-shared'), 'packages-shared', 'dir', err => {
-          if (err && err.code!='EEXIST') reject(err.code=='EPERM' ? 'Start your console as admin for symlink creation!' : err);
-          else _write('Done.\n');
-          resolve();
-        });
-      })
-      .then(() => cmdExec(`${fdt} editor upgrade --version ${fontoVersion} --non-interactive`))
-      .then(() => [fdt])
+      _info('Ensure symlink exists:');
+      fs.symlink(path.join('../../../tdi/fonto/packages-shared'), 'packages-shared', 'dir', err => {
+        if (err && err.code!='EEXIST') reject(err.code=='EPERM' ? 'Start your console as admin for symlink creation!' : err);
+        else _write('Done.\n');
+        resolve();
+      });
+    })
+    .then(() => cmdExec(`${fdt} editor upgrade --version ${fontoVersion} --non-interactive`))
+    .then(() => [fdt])
     ;
   },
 
@@ -77,7 +77,7 @@ module.exports = {
 
         // add dependency for sx-module to each package fonto-manifest.json
         // add schema packages in fonto.json to config/fonto-manifest.json
-        Object.entries(rootSchemas).forEach(([xsdPath, obj]) => {
+        Object.entries(rootSchemas).forEach(([, obj]) => {
           const pckPath = 'packages/' + obj.packageName;
           const pckFontoManifest = fs.readJsonSync(pckPath + '/fonto-manifest.json', {throws: false}) || {dependencies: {}};
           pckFontoManifest.dependencies['sx-module'] = 'packages/sx-module';
@@ -100,8 +100,8 @@ module.exports = {
         _info('Copying schema json files to build folders:');
         // deploy-watch copies schema's to server directly, so update local builds to keep integrity
         jsonPaths.forEach(jsonPath => {
-          fs.copySync(jsonPath, 'dev/assets/schemas/' + jsonPath.match(/[^//]*$/)[0]);
-          fs.copySync(jsonPath, 'dist/assets/schemas/' + jsonPath.match(/[^//]*$/)[0]);
+          fs.copySync(jsonPath, 'dev/assets/schemas/' + jsonPath.match(/[^/]*$/)[0]);
+          fs.copySync(jsonPath, 'dist/assets/schemas/' + jsonPath.match(/[^/]*$/)[0]);
         });
         _write('Done.\n');
       })
@@ -125,7 +125,7 @@ module.exports = {
 
       // execute "fdt elements" for each schema package, ignore default elements, and combine results
       const schemasPerElement = {};
-      Object.entries(rootSchemas).forEach(([path, obj]) => {
+      Object.entries(rootSchemas).forEach(([, obj]) => {
         const data            = execSync(`${fdt} elements --schema packages/${obj.packageName}/src/assets/schemas/${obj.packageName}.json -C name`, {encoding: 'UTF-8'});
         const elements        = data.replace(/(^.*?Name\*)|(Printed name\*.*$)/gs, '').split(/\s+/);
         const customElements  = [...new Set(elements)].filter(e => e && !ignoreElements.includes(e));
@@ -142,19 +142,19 @@ module.exports = {
     };
 
     return wws(
-        'searching',
-        findElements,
-        {
-          fdt,
-          rootSchemas: fs.readJsonSync('../schema/fonto.json').rootSchemas,
-          tdiXsdPath: path.join(_paths.repo, _paths.tdi, 'src/config/cmscustom/[customer]/[project]/schema/xsd/')
-        },
-        result => {
-          if (Array.isArray(result)) result.forEach(([e, s]) => _write(e, s, '\n'));
-          else _write(result, '\n');
-        }
-      )
-      .then(() => [fdt])
+      'searching',
+      findElements,
+      {
+        fdt,
+        rootSchemas: fs.readJsonSync('../schema/fonto.json').rootSchemas,
+        tdiXsdPath: path.join(_paths.repo, _paths.tdi, 'src/config/cmscustom/[customer]/[project]/schema/xsd/')
+      },
+      result => {
+        if (Array.isArray(result)) result.forEach(([e, s]) => _write(e, s, '\n'));
+        else _write(result, '\n');
+      }
+    )
+    .then(() => [fdt])
     ;
   },
 
@@ -174,7 +174,7 @@ module.exports = {
 
       // execute "fdt attributes" for each schema package, ignore default attributes, and combine results
       const schemasPerAttribute = {};
-      Object.entries(rootSchemas).forEach(([path, obj]) => {
+      Object.entries(rootSchemas).forEach(([, obj]) => {
         const data              = execSync(`${fdt} attributes --schema packages/${obj.packageName}/src/assets/schemas/${obj.packageName}.json`, {encoding: 'UTF-8'});
         const attributes        = data.replace(/(^.*?Default value\s+)|(\s+Printed name\*.*$)/gs, '').split(/\n\s+/).map(a => a.split(/\s+/)).map(a =>
           a[0] + (a[2]=='required' ? ' (required)' : '') + (a[3]=='-' ? ' (no default)' : '')
@@ -193,19 +193,19 @@ module.exports = {
     };
 
     return wws(
-        'searching',
-        findAttributes,
-        {
-          fdt,
-          rootSchemas: fs.readJsonSync('../schema/fonto.json').rootSchemas,
-          tdiXsdPath: path.join(_paths.repo, _paths.tdi, 'src/config/cmscustom/[customer]/[project]/schema/xsd/')
-        },
-        result => {
-          if (Array.isArray(result)) result.forEach(([e, s]) => _write(e, s, '\n'));
-          else _write(result, '\n');
-        }
-      )
-      .then(() => [fdt])
+      'searching',
+      findAttributes,
+      {
+        fdt,
+        rootSchemas: fs.readJsonSync('../schema/fonto.json').rootSchemas,
+        tdiXsdPath: path.join(_paths.repo, _paths.tdi, 'src/config/cmscustom/[customer]/[project]/schema/xsd/')
+      },
+      result => {
+        if (Array.isArray(result)) result.forEach(([e, s]) => _write(e, s, '\n'));
+        else _write(result, '\n');
+      }
+    )
+    .then(() => [fdt])
     ;
   },
 

package/src/modules/fonto/index.js

@@ -33,7 +33,7 @@ module.exports = function fonto (argv) {
     .map(p => ([p.replace('manifest.json', ''), fs.readJsonSync(p).sdkVersion.replace(/Nightlies.*/, 'nightly')])
   );
 
-  if (fontoPaths.length==0) _error('No Fonto instance found.');
+  if (fontoPaths.length===0) _error('No Fonto instance found.');
 
   let promiseChain = Promise.resolve(); // for sequentially executing commands for each fonto instance
 
@@ -47,27 +47,27 @@ module.exports = function fonto (argv) {
 
         // execute commands sequentially and in correct order
         return new Promise((resolve) => {
-            _info('Determining Fonto version:');
-            let fontoVersionNew = typeof argv.init == 'string' ? argv.init : fontoVersionCurrent;
-
-            if (fontoVersionNew == 'latest') {
-              const data = execSync(`${fdtCommand(fontoVersionCurrent)} editor versions`, {encoding: 'UTF-8'});
-              fontoVersionNew = data.match(/\d+\.\d+\.\d+/g).filter(v => allowedFontoVersionRegex.test(v))[0];
-            }
-            else if (!allowedFontoVersionRegex.test(fontoVersionNew)) {
-              _error(`Fonto version ${fontoVersionNew} is not compatible with the current TDI submodule commit!\nExecute: tct fonto --init latest`);
-            }
-
-            _write(fontoVersionNew+'\n');
-            return resolve([fdtCommand(fontoVersionNew), fontoVersionNew]);
-          })
-          .then(argv.init && commands.init)
-          .then(argv.schema && commands.schema)
-          .then(argv.elements && commands.elements)
-          .then(argv.attributes && commands.attributes)
-          .then(argv.localize && commands.localize)
-          .then(argv.build && commands.build)
-          .then(argv.run && commands.run)
+          _info('Determining Fonto version:');
+          let fontoVersionNew = typeof argv.init == 'string' ? argv.init : fontoVersionCurrent;
+
+          if (fontoVersionNew == 'latest') {
+            const data = execSync(`${fdtCommand(fontoVersionCurrent)} editor versions`, {encoding: 'UTF-8'});
+            fontoVersionNew = data.match(/\d+\.\d+\.\d+/g).filter(v => allowedFontoVersionRegex.test(v))[0];
+          }
+          else if (!allowedFontoVersionRegex.test(fontoVersionNew)) {
+            _error(`Fonto version ${fontoVersionNew} is not compatible with the current TDI submodule commit!\nExecute: tct fonto --init latest`);
+          }
+
+          _write(fontoVersionNew+'\n');
+          return resolve([fdtCommand(fontoVersionNew), fontoVersionNew]);
+        })
+        .then(argv.init && commands.init)
+        .then(argv.schema && commands.schema)
+        .then(argv.elements && commands.elements)
+        .then(argv.attributes && commands.attributes)
+        .then(argv.localize && commands.localize)
+        .then(argv.build && commands.build)
+        .then(argv.run && commands.run)
         ;
       });
   });

package/src/modules/git/index.js

@@ -2,7 +2,10 @@ const {execSync, spawn} = require('child_process');
 const {chdir}   = require('process');
 const inquirer  = require('inquirer');
 const path      = require('path');
+const fs        = require('fs-extra');
 
+const execGitCommand  = require('../../lib/exec-git-command');
+const getTdiBranch    = require('../../lib/get-tdi-branch');
 
 const cmdExec = commands => new Promise(resolve => {
   let promise = new Promise(resolve => resolve());
@@ -21,7 +24,7 @@ const cmdExec = commands => new Promise(resolve => {
       cp.stdout.on('data', log);
       cp.stderr.setEncoding('utf8');
       cp.stderr.on('data', log);
-      cp.on('close', code => {
+      cp.on('close', () => {
         if (!a[i+1] || a[i+1][1]) _write();
         resolve();
       });
@@ -33,6 +36,8 @@ const cmdExec = commands => new Promise(resolve => {
   });
 });
 
+const tdiMigrationFilePath  = path.join(_paths.repo, _paths.tdi, 'tct/git/tdiCommitsRequiringMigration.js');
+
 module.exports = function git (argv) {
 
   if (argv.init) {
@@ -112,4 +117,93 @@ module.exports = function git (argv) {
         throw e;
       });
   }
+
+  if (argv.update) {
+    const [update, tdiFromDateCustom, tdiToDateCustom] = `${argv.update}`.split(/\s/);
+
+    if (update === `tdi`) {
+
+      const tdiBranch = getTdiBranch(argv.branch);
+
+      if (tdiBranch.from) _info(`Current branch '${tdiBranch.from.name}' will be updated to '${tdiBranch.name}'\nCommon ancestor will be used in selecting TDI commits requiring migration: ${_formatDate(tdiBranch.commonAncestor.date)}`);
+      _info(`Branch ${tdiBranch.name} is ${tdiBranch.commitsBehind} commits behind.`);
+
+      // Set branch in .gitmodules file; This ensures submodule update will follow this branch to the latest commit
+      const setBranch = execGitCommand(`submodule set-branch -b ${tdiBranch.name} tangelo-default-implementation`, _paths.repo);
+      if (setBranch.error) _error(`Set branch failed: ${setBranch.error}`);
+
+      if (tdiBranch.commitsBehind > 0 || tdiFromDateCustom) {
+        // update submodule
+        const updateSubmoduleMsg = execGitCommand(`submodule update --remote`, _paths.repo);
+        if (updateSubmoduleMsg.error && !tdiFromDateCustom) _error(`Update submodule failed\n${updateSubmoduleMsg.error}`);
+
+        if (!tdiFromDateCustom) _info(`TDI submodule updated:\n${updateSubmoduleMsg}`);
+
+        // tdiMigrationFilePath should exist in latest commits of releases 5.3+; As we updated to the latest version this should work
+        if (fs.existsSync(tdiMigrationFilePath)) {
+          const migrations = require(tdiMigrationFilePath);
+          const fromTdiDate = tdiFromDateCustom ? new Date(tdiFromDateCustom) : (tdiBranch.commonAncestor) ? tdiBranch.commonAncestor.date: _git.commitTdi.local().date;
+          const toTdiDate = tdiToDateCustom ? new Date(tdiToDateCustom) : new Date(execGitCommand(`log -1 --format=%cd --date=iso-strict`, path.join(_paths.repo, _paths.tdi), ['date']).date);
+
+          _info(`TDI commits requiring migration between ${_formatDate(fromTdiDate)} and ${_formatDate(toTdiDate)}`);
+          // Filter the migrations that should be applied/considered; Also display older releases migrations
+          const migrationsFiltered = migrations
+            .filter((m) => m.releases.find((r) => {
+              const time = new Date(r.date).getTime();
+              return ((tdiBranch.from)
+                ? `release/${r.release}` == tdiBranch.name || (tdiBranch.from.name <= `release/${r.release}` && `release/${r.release}` < tdiBranch.name && (fromTdiDate.getTime() < time && time < toTdiDate.getTime()))
+                : `release/${r.release}` == tdiBranch.name && (fromTdiDate.getTime() < time && time < toTdiDate.getTime())
+              );
+            })
+            );
+
+          let relevantMigrationCount = 0;
+          // Apply callback for migrations
+          migrationsFiltered
+            .forEach((m) => {
+              const date = _formatDate(new Date(m.releases.filter((r) => tdiBranch.name >= `release/${r.release}`)[0].date));
+              relevantMigrationCount += (m.callback(date, relevantMigrationCount+1)) === 1 ? 1 : 0;
+            });
+
+          // Output message based on whether or not migrations are required
+          if (migrationsFiltered.length === 0) {
+            _write(`-- No commits require migrations --`);
+          } else {
+            _info(`\n${relevantMigrationCount} relevant migration(s) out of ${migrationsFiltered.length} migration(s) are shown.`);
+            _info(`See confluence page 'TDI commits requiring migration' for more detailed information`);
+          }
+
+        } else {
+          _error(`Cannot find required files in TDI submodule.`);
+        }
+      } else {
+        _info(`Your TDI submodule is already up to date`);
+      }
+    } else {
+      if (argv.branch) _warn(`Branch argument '${argv.branch}' is ignored for a repository update.`);
+
+      // Fetch all
+      _info(`Fetch all`);
+      const cmdFetch = execGitCommand('fetch -pf --all', path.join(_paths.repo));
+      if (cmdFetch.error) _warn(`Fetch failed\n${cmdFetch.error}`);
+
+      // pull repo
+      _info(`Pull repository`);
+      const cmdPull = execGitCommand(`pull`, _paths.repo);
+      if (cmdPull.error) _warn(`Pull failed\n${cmdPull.error}`);
+
+      _info(`Checked out at commit:`);
+      const repoLog = execGitCommand(`log -1 --format=%D;%H;%cd --date=iso-strict`, _paths.repo, ['tags', 'hash', 'date']);
+      _write(`${_formatDate(repoLog.date)} - ${repoLog.tags} - ${repoLog.hash}`);
+
+      _info(`Retrieve submodules that belong to this repo-commit`); // update submodule recursively (set to version that belongs to repo)
+      _write(execGitCommand(`submodule update --recursive`, path.join(_paths.repo)));
+      _info(`Submodule checked out at commit:`);
+      const tdiLog = execGitCommand(`log -1 --format=%D;%H;%cd --date=iso-strict`, path.join(_paths.repo, _paths.tdi), ['tags', 'hash', 'date']);
+      _write(`${_formatDate(tdiLog.date)} - ${tdiLog.tags} - ${tdiLog.hash}`);
+      const tdiBranch = getTdiBranch();
+
+      _info(`\nTDI branch ${tdiBranch.name} is ${tdiBranch.commitsBehind} commits behind.\nUpdate TDI to latest version with 'tct g -u tdi'`);
+    }
+  }
 };

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

@@ -1,10 +1,13 @@
-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 getTdiBranch    = require('../../lib/get-tdi-branch');
+const c               = require('../deploy/config');
+const {remote}        = require('../deploy/execute');
+
 
 const getGitInfo = () => {
   // Version info TDI submodule
@@ -16,30 +19,28 @@ const getGitInfo = () => {
   });
 
   // Fetch all
-  execGitCommand('fetch -pf --all', path.join(_paths.repo, _paths.tdi));
-
-  // Get branches containing TDI HEAD commit
-  const releaseBranches = execGitCommand(`branch --all --contains ${_git.commitTdi.local().hash}`, path.join(_paths.repo, _paths.tdi)).match(/release\/[^\s]+/gsm);
-  if (!releaseBranches) _error('Could not retrieve TDI release branches');
-  // Get the first possible branch; prefer release/5.1 over release/5.2:
-  releaseBranches.sort((a, b) => a.name > b.name ? 1 : -1);
-  const firstBranch = {name: releaseBranches[0]};
+  const cmdFetch = execGitCommand('fetch -pf --all', path.join(_paths.repo, _paths.tdi));
+  if (cmdFetch.error) _warn(`Fetch failed\n${cmdFetch.error}`);
+
+  // Set branch name of firstBranch without 'remotes/origin/'
+  const tdiBranch = getTdiBranch();
+
   // Get number of commits behind
-  firstBranch.commitsBehind = execGitCommand(`rev-list HEAD...origin/${firstBranch.name} --count`, path.join(_paths.repo, _paths.tdi));
+  tdiBranch.commitsBehind = execGitCommand(`rev-list HEAD...origin/${tdiBranch.name} --count`, path.join(_paths.repo, _paths.tdi));
 
   // Create table rows for TDI submodule info
   gitSubmoduleInfo.addRow({
     property: 'Commit date',
-    value: _git.commitTdi.local().date.toLocaleDateString('en-gb', {day: 'numeric', month: 'short', year: 'numeric', hour: '2-digit', minute: '2-digit'})
+    value: _formatDate(_git.commitTdi.local().date)
   });
-  if (firstBranch) {
+  if (tdiBranch) {
     gitSubmoduleInfo.addRow({
       property: 'Branch',
-      value: firstBranch.name
+      value: tdiBranch.name
     });
     gitSubmoduleInfo.addRow({
       property: 'Commits behind',
-      value: firstBranch.commitsBehind
+      value: tdiBranch.commitsBehind
     });
   } else {
     gitSubmoduleInfo.addRow({
@@ -52,9 +53,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 +117,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 +129,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);
+  }
+
+};

package/src/modules/migrate/index.js

@@ -62,7 +62,7 @@ module.exports = function migrate (argv) {
           if (p.path_dbconfig.join('/') != p.path_cmscustom.join('/')) projectFolders.push(p.path_cmscustom.join('/'));
         });
         // Set filter to chosen active documents
-        filter = projectFolders.length == 1 ? `**/${projectFolders}/**` : `**/{${projectFolders.join(',')}}/**`;
+        filter = projectFolders.length === 1 ? `**/${projectFolders}/**` : `**/{${projectFolders.join(',')}}/**`;
       }
 
       _info(`Filter applied: ${filter}`);

package/src/modules/migrate/steps.js

@@ -54,7 +54,7 @@ module.exports = function steps (step, dry, filter) {
       let filesModCount = 0;
       for (let i=0; i<20 && r.files[0]; i++) { // execute repeatedly for modified files only (with safety limit of 20)
         r.files = rif.sync(r).filter(f => f.hasChanged).map(f => f.file);
-        if (i==0) filesModCount = r.files.length; // save count only after first run (after this only subsets are processed)
+        if (i===0) filesModCount = r.files.length; // save count only after first run (after this only subsets are processed)
         if (dry) break;
       }
 

package/src/modules/sql/index.js

@@ -18,9 +18,9 @@ const checkLog = (logFilePath, remove=true) => {
   if (fs.existsSync(logFilePath)) {
     const logFile = fs.readFileSync(logFilePath).toString();
     // Check for ORA- error messages
-    if (logFile.match(RegExp(`ORA-`, 'gm'))) {
+    if (logFile.match(/ORA-/g)) {
       // Select each ORA- error message and up to 6 lines before (the lines before may not contain ORA- themselves)
-      const errors = logFile.match(RegExp(`((?![^\n]*ORA-)[^\n]*\n){0,6}ORA-[^\n\r]*`, `gms`));
+      const errors = logFile.match(/(?:(?![^\n]*ORA-)[^\n]*\n){0,6}ORA-[^\n\r]*/gms);
       _info(`${errors.length} error(s) during SQL script:\n`);
       // Print each error + lines before:
       errors.forEach((e, i) => {