@tangelo/tangelo-configuration-toolkit 1.17.0 → 1.18.0

package/README.md

@@ -60,3 +60,35 @@ The `build -x` commands set projects transformation scenarios and masterfiles in
 - 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
+
+
+## Debug
+
+Save this in the root of your local clone as `tct-dev.cmd`:
+
+```
+@ECHO off
+SETLOCAL
+CALL :find_dp0
+
+IF EXIST "%dp0%\node.exe" (
+  SET "_prog=%dp0%\node.exe"
+) ELSE (
+  SET "_prog=node"
+  SET PATHEXT=%PATHEXT:;.JS;=;%
+)
+
+"%_prog%"  "%dp0%\index.js" %*
+ENDLOCAL
+EXIT /b %errorlevel%
+:find_dp0
+SET dp0=%~dp0
+EXIT
+```
+
+Then:
+
+- open a 'Javascript Debug Terminal' in VSCode
+- jump to a customer folder ( you can use `tan-cust` for this)
+- set a breakpoint
+- type (for instance): `tct-dev d -c`

package/index.js

@@ -1,3 +1,5 @@
+global._appStartTime = new Date();
+
 require('./src/lib/style-string-getters');
 
 String.prototype.toFws = function(){
@@ -12,6 +14,7 @@ const homedir     = require('os').homedir();
 const path        = require('path');
 
 const execGitCommand = require('./src/lib/exec-git-command');
+const memoize = require('./src/lib/memoize');
 
 
 const appname = 'tangelo-configuration-toolkit';
@@ -50,6 +53,9 @@ global._formatDate = date =>
 ;
 
 
+global._devmode = !__dirname.includes('node_modules');
+
+
 global._packages = {
   TCT: {name: '@tangelo/tangelo-configuration-toolkit', version: require('./package.json')?.version},
   FDT: {name: '@fontoxml/fontoxml-development-tools'}
@@ -76,15 +82,6 @@ if (!_appdata.npmPath) {
 }
 
 
-if (!fs.existsSync(_paths.appconfig)) { // try to find old appconfig (TCT-162 => remove code block in next version)
-  fs.ensureDirSync(_paths.apphome);
-  const oldPathAppconfig = findUp.sync(appname+'-appconfig.json');
-  if (oldPathAppconfig) {
-    fs.renameSync(oldPathAppconfig, _paths.appconfig);
-    _info(`${appname}-appconfig.json moved to ${_paths.apphome}`);
-  }
-}
-
 global._appconfig = { // default appconfig if file not found
   'sharedConfigPath': path.join(homedir, 'Dropbox (Tangelo Software)/Product Distribution/tooling'),
   'servers': [],
@@ -105,6 +102,9 @@ catch({code, message}) {
 }
 
 
+global._repoconfig = require('./src/lib/get-repoconfig')(_paths.repo);
+
+
 _appconfig.sharedConfigPath = path.resolve(_paths.appconfig, '..', _appconfig.sharedConfigPath || '', appname+'-appconfig.json');
 _appconfig.shared = fs.readJsonSync(_appconfig.sharedConfigPath, {throws: false}) || {};
 
@@ -114,49 +114,20 @@ global._git = {
     if (!_appdata.gitUser) _appdata._update({gitUser: execGitCommand(`config --get user.email`, _paths.repo)});
     return _appdata.gitUser;
   },
-  commitLocal (clearcache) {
-    if (clearcache) delete this.cache;
-    this.cache ??= execGitCommand(`log -1 --format=%D;%H;%cd --date=iso-strict`, _paths.repo, ['branch', 'hash', 'date']);
-    return this.cache;
-  },
-  commitRemote () {
-    this.cache ??= execGitCommand('log -1 --format=%cd --date=iso-strict origin/'+_git.commitLocal().branch, _paths.repo, ['date']);
-    return this.cache;
-  },
+  commitLocal: memoize(() => execGitCommand(`log -1 --format=%D;%H;%cd --date=iso-strict`, _paths.repo, ['branch', 'hash', 'date'])),
+  commitRemote: memoize(() => execGitCommand('log -1 --format=%cd --date=iso-strict origin/' + _git.commitLocal().branch, _paths.repo, ['date'])),
   commitTdi: {
-    local (clearcache) {
-      if (clearcache) delete this.cache;
-      this.cache ??= execGitCommand(`log -1 --format=%D;%H;%cd --date=iso-strict`, path.join(_paths.repo, _paths.tdi), ['tags', 'hash', 'date']);
-      return this.cache;
-    },
-    after (commitHash) {
-      this['cache-'+commitHash] ??= execGitCommand(`merge-base --is-ancestor ${commitHash} ${_git.commitTdi.local().hash}`, path.join(_paths.repo, _paths.tdi), null, 0);
-      return this['cache-'+commitHash];
-    },
+    local: memoize(() => execGitCommand(`log -1 --format=%D;%H;%cd --date=iso-strict`, path.join(_paths.repo, _paths.tdi), ['tags', 'hash', 'date'])),
+    after: memoize(commitHash => execGitCommand(`merge-base --is-ancestor ${commitHash} ${_git.commitTdi.local().hash}`, path.join(_paths.repo, _paths.tdi), null, 0)),
     fontoVersions: [ // latest commits first
       {commitHash: 'e599766', regex: /^7\.1[45]\./},
       {commitHash: '77b8ea9', regex: /^7\.14\./}, // 7.14.x
       {commitHash: '8066c44', regex: /^7\.13\./}, // 7.13.x
       {commitHash: 'a2b2d4e', regex: /^7\.12\./}  // 7.12.x
-    ],
-    stopUsingRepoconfigFile: '1f12bff' // release/5.1 10-05-2021
+    ]
   }
 };
 
-
-if (_git.commitTdi.after(_git.commitTdi.stopUsingRepoconfigFile)) {
-  global._repoconfig = require('./src/lib/get-repoconfig')(_paths.repo);
-}
-else {
-  try { global._repoconfig = fs.existsSync(_paths.repoconfig) && fs.readJsonSync(_paths.repoconfig) || {}; }
-  catch ({message}) { _error('Error in '+message); }
-  global._repoconfig.update = obj => {
-    global._repoconfig = Object.assign(_repoconfig, obj);
-    fs.writeJsonSync(_paths.repoconfig, _repoconfig, {spaces: 2});
-  };
-}
-
-
 global._tdiSubmoduleExists = () => fs.existsSync(path.join(_paths.repo, _paths.tdi));
 global._isPre42 = () => fs.existsSync(path.join(_paths.repo, _paths.tdi, 'create_new_project')); // folder changed in 4.2
 global._isPre51 = () => !fs.existsSync(path.join(_paths.repo, _paths.tdi, 'src')); // folder changed in 5.1 (check new folder because old one could still exist after branch switch)
@@ -175,7 +146,7 @@ global._modulesTdi = {
     this.depsUpToDate = true;
   },
   require(module) {
-    this.ensureDepsUpToDate();
+    if (path.extname(module) !== '.json') this.ensureDepsUpToDate();
     _info(`Loading ${path.join(_paths.tdi, 'tct', module)}\n`);
     try {
       return require(path.join(this.absolutePathTdi, 'tct', module));
@@ -198,7 +169,9 @@ process.on('beforeExit', () => {
     fs.writeJsonSync(_paths.appdata, _appdata, {spaces: 2});
   }
 
+  if (_devmode) _perf(_appStartTime); // output execution time in dev mode
+
 });
 
 
-require('./src/cli.js')();
+require('./src/cli.js')();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tangelo/tangelo-configuration-toolkit",
-  "version": "1.17.0",
+  "version": "1.18.0",
   "engines": {
     "node": ">=14.0.0"
   },

package/src/cli.js

@@ -34,7 +34,6 @@ module.exports = function cli () {
         init: {alias: 'i', desc: 'Create repository content structure', conflicts: ['p', 's', 'c']},
         project: {alias: 'p', desc: 'Create project configuration', conflicts: ['i', 's', 'c']},
         symlinks: {alias: 's', desc: 'Recreate symlinks to TDI', conflicts: ['p', 'i', 'c']},
-        config: {alias: 'c', desc: 'Create repo-config file', conflicts: ['p', 'i', 's'], hidden: true},
         oxygen: {alias: 'x', desc: 'Create or update oXygen project file (.xpr)', conflicts: ['p', 'i', 'c']}
       },
       handler: require('./modules/build')
@@ -76,8 +75,9 @@ module.exports = function cli () {
         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']}
+        'update-repo': {alias: 'ur', desc: 'Update repository', conflicts: ['i', 'r', 'c']},
+        'update-submodule': {alias: 'us', desc: 'Update TDI submodule, optionally pass release branch (without "release/")', conflicts: ['i', 'r', 'c']},
+        dates: {alias: 'd', desc: '[hidden] Use i.c.w. update-submodule, pass 2 dates in format dd-mm-yyyy', conflicts: ['i', 'r', 'c'], implies: 'update-submodule', requiresArg: true, array: true, hidden: !_devmode}
       },
       handler: require('./modules/git')
     })
@@ -123,9 +123,9 @@ module.exports = function cli () {
       ['$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 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']
+      ['$0 git --update-repo', 'Pull git repository and submodule to latest repository commit'],
+      ['$0 git --update-submodule', 'Update TDI submodule to latest within current TDI branch'],
+      ['$0 git --update-submodule 5.4', 'Update TDI submodule to latest in specified branch']
     ])
     .check((argv, options) => {
       const nonDefaultOptions = Object.keys(options.key).filter(o => !Object.keys(options.default).includes(o));
@@ -133,7 +133,7 @@ module.exports = function cli () {
       else throw new Error('Pass a non-default option');
     })
     .strict()
-    .wrap(100)
+    .wrap(120)
     .parse()
   ;
 

package/src/lib/get-repoconfig.js

@@ -4,11 +4,9 @@ const globby  = require('globby');
 
 module.exports = function getRepoconfig(repoPath) {
 
-  const repoconfig = [];
-
-  globby
+  return globby
     .sync('database/config/**/txd_document_types.sql', {cwd: repoPath, absolute: true})
-    .forEach(p => {
+    .map(p => {
       const dtSqlInsert = fs.readFileSync(p).toString().match(/select(.*?)from/s)[1];
       const ntSqlInsert = fs.readFileSync(p.replace('txd_document_types', 'txd_node_types')).toString().match(/select(.*?)from/s)[1];
 
@@ -21,7 +19,7 @@ module.exports = function getRepoconfig(repoPath) {
       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];
 
-      repoconfig.push({
+      return {
         customer_name,
         customer_abbr: ntName.split('_')[0],
         project_name: dtDisplayName.split(RegExp(customer_name.replace(/(\W)/g, '\\$1')))[1].trim() || '',
@@ -29,9 +27,7 @@ module.exports = function getRepoconfig(repoPath) {
         path_cmscustom,
         path_dbconfig,
         id_range: dtSqlInsert.match(/(\d+)\d{3} id/)[1]
-      });
+      };
     });
 
-  return repoconfig;
-
 };

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

@@ -2,22 +2,24 @@ const execGitCommand = require('./exec-git-command');
 const path           = require('path');
 
 module.exports = function getTdiBranch(toBranchName) {
+  const tdiPath = path.join(_paths.repo, _paths.tdi);
   const tdiBranch = {};
+
   // Fetch all
   _info(`Fetch TDI submodule`);
-  const cmdFetch = execGitCommand('fetch -pf --all', path.join(_paths.repo, _paths.tdi));
+  const cmdFetch = execGitCommand('fetch -pf --all', tdiPath);
   if (cmdFetch.error) _warn(`Fetch failed\n${cmdFetch.error}`);
 
   let toBranch;
   if (toBranchName) {
     // Check if specified branch exists; we will update to this branch
     toBranch = String(toBranchName).replace(/(?:release\/)?(\d+(?:\.[\dxt]+)*)/, `release/$1`);
-    const branchExists = execGitCommand(`branch --remote`, path.join(_paths.repo, _paths.tdi)).match(`origin/${toBranch}`);
+    const branchExists = execGitCommand(`branch --remote`, tdiPath).match(`origin/${toBranch}`);
     if (!branchExists) _error(`TDI branch "${toBranch}" does not exist. Note that TCT can only update to a release 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);
+  const releaseBranches = execGitCommand(`branch --all --contains ${_git.commitTdi.local().hash}`, tdiPath).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:
@@ -32,13 +34,13 @@ module.exports = function getTdiBranch(toBranchName) {
     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;
+    const branchHash = execGitCommand(`rev-parse origin/${toBranch}`, tdiPath);
+    const commonAncestorHash = execGitCommand(`merge-base ${_git.commitTdi.local().hash} ${branchHash}`, tdiPath);
+    const commonAncestorDate = execGitCommand(`show ${commonAncestorHash} --no-patch --format=%cd --date=iso-strict `, tdiPath, ['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));
+  tdiBranch.commitsBehind = execGitCommand(`rev-list HEAD...origin/${tdiBranch.name} --count`, tdiPath);
   return tdiBranch;
 };

package/src/lib/gulp-batch-replace-with-filter.js

@@ -4,15 +4,15 @@ const es = require('event-stream'), minimatch = require('minimatch'), istextorbi
 
 const execReplace = (c, s, r) => Buffer.from(s instanceof RegExp ? String(c).replace(s, r) : String(c).split(s).join(r));
 
-module.exports = (arr) => {
+module.exports = arr => {
   return es.map((file, callback) => {
     if(file.contents instanceof Buffer) {
-      arr.forEach(e => {
+      for (const e of arr) {
         // exec if no glob is passed or if glob matches, and it's a text file
         if ((!e[2] || minimatch(file.path, e[2])) && istextorbinary.isText(file.path, file)) {
           file.contents = execReplace(file.contents, e[0], e[1]);
         }
-      });
+      }
     }
     callback(null, file);
   });

package/src/lib/memoize.js

@@ -0,0 +1,28 @@
+/**
+ * Memoizes a function by caching its results based on the arguments.
+ * @param {Function} fn - The function to be memoized.
+ * @returns {Function} - The memoized function.
+ */
+module.exports = function memoize(fn) {
+  let cache = {};
+
+  /**
+   * The memoized function that caches the results of the original function based on its arguments.
+   * @param {...*} args - The arguments to be passed to the original function.
+   * @returns {*} - The result of the original function.
+   */
+  const cachedfn = (...args) => {
+    const key = JSON.stringify(args);
+    cache[key] ??= fn(...args);
+    return cache[key];
+  };
+
+  /**
+   * Clears the cache of the memoized function.
+   */
+  cachedfn.clear = () => {
+    cache = {};
+  };
+
+  return cachedfn;
+};

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

@@ -28,7 +28,7 @@ module.exports = function packageUpdateCheck () {
       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${pkg}`]?.executed || 0) > 1000*3600*24*7) { // check every week
+      if (new Date() - new Date(_appdata[`updateCheck${pkg}`]?.executed || 0) > 1000*3600*24*1) { // check every day
         doUpdateCheck(pkg).then(r => r && _warn(updateMsg(r)));
       }
       else if (versionAvailable) {

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

@@ -3,13 +3,16 @@
 const styles = {bold: 1, underline: 4, black: 30, red: 31, green: 32, yellow: 33, blue: 34, magenta: 35, cyan: 36, white: 37, lblack: 90, lred: 91, lgreen: 92, lyellow: 93, lblue: 94, lmagenta: 95, lcyan: 96, lwhite: 97};
 
 for (const name in styles ) {
-  const style = styles[name];
-
-  String.prototype.__defineGetter__(name, function () {
-    return `\x1b[${style}m${this}\x1b[0m`;
+  Object.defineProperty(String.prototype, name, {
+    get () {
+      const _this = this.replace(/\x1b\[0m/g, `\x1b[${styles[name]}m`); // replace reset control with color for supporting multiple colors in string
+      return `\x1b[${styles[name]}m${_this}\x1b[0m`;
+    }
   });
 }
 
-String.prototype.__defineGetter__('nostyle', function () {
-  return this.replace(/[\u001b\u009b][[()#;?]*(?:\d{1,4}(?:;\d{0,4})*)?[0-9A-ORZcf-nqry=><]/g, '');
+Object.defineProperty(String.prototype, 'nostyle', {
+  get () {
+    return this.replace(/[\u001b\u009b][[()#;?]*(?:\d{1,4}(?:;\d{0,4})*)?[0-9A-ORZcf-nqry=><]/g, '');
+  }
 });

package/src/modules/build/index.js

@@ -70,43 +70,5 @@ module.exports = function build (argv) {
     createSymlinks();
   }
 
-  if (argv.config) {
-    if (_git.commitTdi.after(_git.commitTdi.stopUsingRepoconfigFile)) _error('This option only works for older repo\'s using a repoconfig file.');
-
-    inquirer
-      .prompt([{message: 'Be sure paths for projects are [customer]/[project]. Continue?', name: 'confirm', type: 'confirm'}])
-      .then(({confirm}) => {
-        if (!confirm) return;
-
-        const customer = {}, projects = [];
-
-        globby
-          .sync('database/config/**/txd_document_types.sql')
-          .forEach(p => {
-            const dtSqlInsert = fs.readFileSync(p).toString().match(/select(.*?)from/s)[1];
-            const ntSqlInsert = fs.readFileSync(p.replace('txd_document_types', 'txd_node_types')).toString().match(/select(.*?)from/s)[1];
-
-            const dtDisplayName = dtSqlInsert.match(/'([^']+)' display_name/)[1];
-            const ntName        = ntSqlInsert.match(/'([^']+)' name/)[1];
-            const xpiDir        = ntSqlInsert.match(/'([^']+)' xsl_prep_inc/)[1];
-
-            customer.name     = dtDisplayName.split(/ (.+)/)[0];
-            customer.abbr     = ntName.split('_')[0];
-            customer.dirname  = xpiDir.split('/')[0];
-
-            projects.push({
-              name: dtDisplayName.split(/ (.+)/)[1],
-              abbr: ntName.split('_')[1],
-              dirname: xpiDir.split('/')[1],
-              idrange: dtSqlInsert.match(/(\d+)\d{3} id/)[1]
-            });
-          });
-
-        _repoconfig.update({customer, projects, applink: 'None'});
-
-        _write(`\nFile '${_paths.repoconfig}' has been created.`);
-      });
-  }
-
   if (argv.oxygen) oxygen(argv.oxygen);
 };

package/src/modules/deploy/config.js

@@ -3,141 +3,136 @@ const objMerge  = require('object-assign-deep');
 const path      = require('path');
 
 
-module.exports = {
-
-  getRemotePath (...arr) {
-    const fp = path.join(this.server.remotedir, ...arr);
-    return this.server.remotedir.match(/:/) ? fp : fp.toFws();
-  },
-
-  setServer (server) {
-    if (!server) _error('No server was passed.');
-
-    let serverConfigs = [];
-
-    // find server in local config
-    if (_appconfig.servers)
-      serverConfigs = _appconfig.servers.filter(obj =>
-        obj.name == server || (obj.domains && obj.domains.find(d => d.startsWith(server)))
-      );
-
-    // if nothing found, find server in shared config
-    if (!serverConfigs[0] && _appconfig.shared.servers)
-      serverConfigs = _appconfig.shared.servers.filter(obj =>
-        obj.name == server || (obj.domains && obj.domains.find(d => d.startsWith(server)))
-      );
-
-    // complement configs with defaults and filter domains
-    serverConfigs = serverConfigs.map(obj =>
-      objMerge(
-        {config: {}}, // make sure key is present
-        _appconfig.shared.serverDefaults, // override with shared defaults
-        _appconfig.serverDefaults, obj, //  override with local defaults
-        {domains: (obj.domains||[]).filter(d => obj.name == server || d.startsWith(server))} // make sure key is present and filter for domain (if not matched for name)
-      )
-    );
+function getRemotePath (...arr) {
+  const fp = path.join(this.server.remotedir, ...arr);
+  return this.server.remotedir.includes(':') ? fp : fp.toFws();
+}
+
+
+function setServer (searchString) {
+  if (!searchString) _error('No server was passed.');
+
+  const stringsToArrays = stringOrArray => [stringOrArray].flat();
+  const filterDomains = domain => domain[0].startsWith(searchString) || domain.slice(1).includes(searchString);
+  const filterServerConfigs = (arr, cfg) => {
+    if (cfg.domains) cfg.domains = cfg.domains.map(stringsToArrays).filter(filterDomains);
+    if (cfg.name === searchString || cfg.domains?.[0]) arr.push(cfg);
+    return arr;
+  };
+
+  // find server in local config and filter domains
+  let serverConfigs = _appconfig.servers?.reduce(filterServerConfigs, []);
+  // if nothing found, find server in shared config and filter domains
+  if (!serverConfigs?.[0]) serverConfigs = _appconfig.shared.servers?.reduce(filterServerConfigs, []);
+
+  // abort if no config is found, or if multiple configs or domains are found for server
+  if (!serverConfigs?.[0]) _error(`No config found for "${searchString}".`);
+  if (serverConfigs.length > 1 || serverConfigs[0].domains?.length > 1) {
+    const matches = serverConfigs.map(obj => obj.name === searchString ? obj.name : obj.domains);
+    const matchesFlatten = matches.flat().map(stringsToArrays).map(m => m[0] + (m[1] ? ` [${m.slice(1).join(', ')}]` : '')).join(', ');
+    _error(`Passed server name "${searchString}" gives multiple results:\n${matchesFlatten}`);
+  }
 
-    // abort if no config is found, or multiple configs, or multiple domains, are found for server
-    if (!serverConfigs[0]) _error(`No config found for "${server}".`);
-    if (serverConfigs.length > 1 || serverConfigs[0].domains.length > 1) {
-      const matches = serverConfigs.map(obj => obj.name == server ? obj.name : obj.domains.filter(d => d.startsWith(server)));
-      _error(`Passed server name "${server}" gives multiple results:\n${matches.flat().join(', ')}`);
-    }
-
-    // compose final server config in usable format
-    const [serverConfig] = serverConfigs;
-    this.server = {
-      remotedir: serverConfig.config.remotedir,
-      ftpConfig: {
-        host: serverConfig.domains[0],
-        port: serverConfig.config.port,
-        parallel: serverConfig.config.parallel,
-        username: serverConfig.config.username,
-        agent: process.platform=='win32' ? 'pageant' : process.env.SSH_AUTH_SOCK,
-        agentForward: process.platform!='win32',
-        readyTimeout: 15000,
-        retries: 1
-      }
+  // complement serverconfig with defaults
+  const serverConfig = objMerge(
+    {config: {}, domains: [[]]}, // make sure keys are present
+    _appconfig.shared.serverDefaults, // override with shared defaults
+    _appconfig.serverDefaults, // override with local defaults
+    serverConfigs[0]
+  );
+
+  // compose final server config in usable format
+  const {config, domains: [[host]], mode} = serverConfig;
+
+  this.server = {remotedir: config.remotedir};
+
+  if (host) {
+    const {parallel, port, username} = config;
+    if (!(port && parallel && username)) _error('Config is incomplete!');
+    this.server.ftpConfig = {
+      host, port, parallel, username,
+      agent: process.platform === 'win32' ? 'pageant' : process.env.SSH_AUTH_SOCK,
+      agentForward: process.platform !== 'win32',
+      readyTimeout: 15000,
+      retries: 1
     };
+  }
+
+  if (mode === 'delivery-pack') {
+    const dateStr = new Date().toISOString().replace(/(.*)T(\d+):(\d+):(\d+).*/g, '$1_$2$3$4');
+    this.deliveryPackName = `tangelo-config-delivery-pack_${_paths.repo.split(/[\\/]/).pop()}_${dateStr}`;
+    this.server.remotedir += '/' + this.deliveryPackName; // output to temp folder
+    this.deliveryPack = true;
+  }
+
+  this.envDev = !host && !this.deliveryPack || /\.dev\.tangelo\.nl$/.test(host);
+}
+
+
+function prepareForCopy (filter) {
+  const {remotedir, ftpConfig} = this.server;
+  if (!path.isAbsolute(remotedir)) _error('"remotedir" must contain an absolute path!');
+
+  this.giPatterns = !fs.existsSync('.gitignore') ? [] :
+    fs.readFileSync('.gitignore').toString()
+      .trim()
+      .replace(/^#.+/gm, '') // remove comments
+      .split(/\s+/) // split on lines
+      .filter(p => !p.match(/(^database\/)|(\/tdi)|(\/fonto)/)) // filter paths that should be copied
+      .map(p => '!' + (p.match(/^config/) ? p : '**/' + p.split('**/').pop()) + (p.match(/\/$/) ? '**' : '')) // negate expressions, remove base dir, suffix folders with **
+  ;
+
+  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 tdiPattern  = tdiIncRegex.test(transferPattern) ? transferPattern.replace(tdiIncRegex, `${this.deliveryPack ? 'config/' : ''}cmscustom/tdi/**`) : 'nomatch';
+
+  if (!transferPattern)
+    _error('Invalid glob expression passed!');
+  else if (this.deliveryPack && transferPattern.startsWith('*'))
+    transferPattern = `{config,database,${_paths.tdi}/src/database/tdi}/${transferPattern}`;
+  else if (!this.deliveryPack) {
+    // for normal deployment to server, set config-dir so no other files in repo are unintentionally transferred
+    transferPattern = transferPattern.replace(/^config\/|^\//, '');
+    try { process.chdir('config'); }
+    catch(e) { _error('No config dir present!'); }
+  }
+
+  this.transferPatterns = [transferPattern, tdiPattern, ...this.giPatterns, '!**/*.crdownload']; // ignore patterns must come last
+
+  if (this.deliveryPack && transferPattern.includes(_paths.tdi)) this.transferPatterns.push(`${_paths.tdi}/src/database/create*.sql`); // create(_exists).sql is called by tdi install
+
+  // add time parameters to all xopus requests to overcome cache
+  const ts = new Date().toISOString().replace(/[-:]/g, '').substring(0, 15);
+  this.replaceStrings = [
+    [/((xsd|xsl|src|iconsrc)="[^"?]+)"/g, `$1?_=${ts}"`, '**/xopus/xml/*'],
+    [/(schemaLocation="[^"?]+)"/g, `$1?_=${ts}"`, '**/xopus/xsd/*'],
+    [/(href="[^"?]+.xsl)"/g, `$1?_=${ts}"`, '**/xopus/xsl/*']
+  ];
+  // depending on env, enable debug mode and change track functionality
+  if (this.envDev) {
+    this.transferPatterns.push('!ldap.xml');
+    this.replaceStrings.push(
+      ['debug.on=false', 'debug.on=true', '**/util.js'],
+      ['debugMode>false', 'debugMode>true', '**/xopus/xml/*'],
+      ['allowAccept>false', 'allowAccept>true', '**/xopus/xml/*'],
+      ['allowReject>false', 'allowReject>true', '**/xopus/xml/*'],
+      [/(id="generateSampleText" available=")false/, '$1true', '**/xopus/xml/*']
+    );
+  }
+  else this.replaceStrings.push(['debugMode>true', 'debugMode>false', '**/xopus/xml/*']);
+
+  _info(`Branch: ${_git.commitLocal().branch}`);
+  _info(`Source: ${path.join(process.cwd(), transferPattern)}`);
+  _info(`Server: ${ftpConfig ? `${ftpConfig.host}:${ftpConfig.port}` : 'local'}`);
+  _info(`Target: ${this.getRemotePath(transferPattern)}`);
+  _write();
 
-    const {ftpConfig} = this.server;
-
-    if (ftpConfig.host && !(ftpConfig.port && ftpConfig.parallel && ftpConfig.username)) _error('Config is incomplete!');
-
-    this.localTransfer  = !ftpConfig.host;
-    this.deliveryPack   = serverConfig.mode == 'delivery-pack';
-    this.envDev         = this.localTransfer && !this.deliveryPack || /\.dev\.tangelo\.nl$/.test(ftpConfig.host);
-
-    if (this.deliveryPack) {
-      const dateStr = new Date().toISOString().replace(/(.*)T(\d+):(\d+):(\d+).*/g, '$1_$2$3$4');
-      this.deliveryPackName = `tangelo-config-delivery-pack_${_paths.repo.split(/[\\/]/).pop()}_${dateStr}`;
-      this.server.remotedir += '/' + this.deliveryPackName; // output to temp folder
-    }
-  },
-
-  prepareForCopy (filter) {
-    const {remotedir, ftpConfig} = this.server;
-    if (!path.isAbsolute(remotedir)) _error('"remotedir" must contain an absolute path!');
-
-    this.giPatterns = !fs.existsSync('.gitignore') ? [] :
-      fs.readFileSync('.gitignore').toString()
-        .trim()
-        .replace(/^#.+/gm, '') // remove comments
-        .split(/\s+/) // split on lines
-        .filter(p => !p.match(/(^database\/)|(\/tdi)|(\/fonto)/)) // filter paths that should be copied
-        .map(p => '!' + (p.match(/^config/) ? p : '**/' + p.split('**/').pop()) + (p.match(/\/$/) ? '**' : '')) // negate expressions, remove base dir, suffix folders with **
-    ;
-
-    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 tdiPattern  = tdiIncRegex.test(transferPattern) ? transferPattern.replace(tdiIncRegex, `${this.deliveryPack ? 'config/' : ''}cmscustom/tdi/**`) : 'nomatch';
-
-    if (!transferPattern)
-      _error('Invalid glob expression passed!');
-    else if (this.deliveryPack && transferPattern.startsWith('*'))
-      transferPattern = `{config,database,${_paths.tdi}/src/database/tdi}/${transferPattern}`;
-    else if (!this.deliveryPack) {
-      // for normal deployment to server, set config-dir so no other files in repo are unintentionally transferred
-      transferPattern = transferPattern.replace(/^config\/|^\//, '');
-      try { process.chdir('config'); }
-      catch(e) { _error('No config dir present!'); }
-    }
-
-    this.transferPatterns = [transferPattern, tdiPattern, ...this.giPatterns, '!**/*.crdownload']; // ignore patterns must come last
-
-    if (this.deliveryPack && transferPattern.includes(_paths.tdi)) this.transferPatterns.push(`${_paths.tdi}/src/database/create*.sql`); // create(_exists).sql is called by tdi install
-
-    // add time parameters to all xopus requests to overcome cache
-    const ts = new Date().toISOString().replace(/[-:]/g, '').substring(0, 15);
-    this.replaceStrings = [
-      [/((xsd|xsl|src|iconsrc)="[^"?]+)"/g, `$1?_=${ts}"`, '**/xopus/xml/*'],
-      [/(schemaLocation="[^"?]+)"/g, `$1?_=${ts}"`, '**/xopus/xsd/*'],
-      [/(href="[^"?]+.xsl)"/g, `$1?_=${ts}"`, '**/xopus/xsl/*']
-    ];
-    // depending on env, enable debug mode and change track functionality
-    if (this.envDev) {
-      this.transferPatterns.push('!ldap.xml');
-      this.replaceStrings.push(
-        ['debug.on=false', 'debug.on=true', '**/util.js'],
-        ['debugMode>false', 'debugMode>true', '**/xopus/xml/*'],
-        ['allowAccept>false', 'allowAccept>true', '**/xopus/xml/*'],
-        ['allowReject>false', 'allowReject>true', '**/xopus/xml/*'],
-        [/(id="generateSampleText" available=")false/, '$1true', '**/xopus/xml/*']
-      );
-    }
-    else this.replaceStrings.push(['debugMode>true', 'debugMode>false', '**/xopus/xml/*']);
-
-    _info(`Branch: ${_git.commitLocal().branch}`);
-    _info(`Source: ${path.join(process.cwd(), transferPattern)}`);
-    _info(`Server: ${ftpConfig.host ? `${ftpConfig.host}:${ftpConfig.port}` : 'local'}`);
-    _info(`Target: ${this.getRemotePath(transferPattern)}`);
-    _write();
-
-    if (_git.commitLocal().date < _git.commitRemote().date) {
-      _warn(`You're not deploying from the most recent git commit!\n`);
-    }
+  if (_git.commitLocal().date < _git.commitRemote().date) {
+    _warn(`You're not deploying from the most recent git commit!\n`);
   }
+}
+
 
-};
+module.exports = {getRemotePath, setServer, prepareForCopy};

package/src/modules/deploy/execute.js

@@ -149,7 +149,7 @@ const transfer = (paths, lrServer) => {
   });
 
   // disable file logging for ftp (gulp-sftp does it already)
-  g_print.setLogFunction((filepath) => c.localTransfer ? _write(filepath.nostyle) : null);
+  g_print.setLogFunction(filepath => c.server.ftpConfig ? null : _write(filepath.nostyle));
 
   _info('Start transferring', true);
 
@@ -181,7 +181,7 @@ const transfer = (paths, lrServer) => {
       cb(null, file);
     }))
     .pipe(g_print.default())
-    .pipe(c.localTransfer ? gulp.dest(c.server.remotedir) : g_sftp(c.server.ftpConfig, c.server.remotedir))
+    .pipe(c.server.ftpConfig ? g_sftp(c.server.ftpConfig, c.server.remotedir) : gulp.dest(c.server.remotedir))
     .on('end', () => {
       _info('Finished transferring\n', true);
       if (fontoPaths.outdated[0]) _warn(`Fonto build files in the following folders were outdated and therefore skipped:\n  ${fontoPaths.outdated.map(v => v.slice(0, -1)).join('\n  ')}`);

package/src/modules/deploy/index.js

@@ -16,8 +16,8 @@ module.exports = function deploy (argv) {
   c.setServer(argv.server);
   c.prepareForCopy(argv.filter);
 
-  if (!c.localTransfer) {
-    c.server.ftpConfig.eventPut = (file) => {
+  if (c.server.ftpConfig) {
+    c.server.ftpConfig.eventPut = file => {
       _write(file.destination.replace(c.server.remotedir, ''));
       if      (path.extname(file.destination)=='.sh')
         remote.add('chmod 755 '+file.destination, 'Permissions set: '+file.destination);
@@ -64,7 +64,7 @@ module.exports = function deploy (argv) {
     };
 
     // check connection
-    if (!c.localTransfer) {
+    if (c.server.ftpConfig) {
       const sftp = new sftpClient();
       sftp.connect(c.server.ftpConfig).then(() => sftp.end()).catch(err => _error(`Could not connect to server${err ? ': '+err.message : ''}`));
     }
@@ -77,7 +77,7 @@ module.exports = function deploy (argv) {
         // the "dist" folder isn't watched properly: it does not detect "assets" anymore after building once
           !/cmscustom.+fonto[\\/]/.test(filepath) ||
             /fonto[\\/]dist[\\/]/.test(filepath) ||
-            (/fonto[\\/]dev[\\/]/.test(filepath) && c.envDev) ||
+            (/fonto[\\/]dev[\\/]/.test(filepath)) ||
             /fonto[\\/]packages[\\/]sx-shell-.*?[\\/]assets[\\/]schemas[\\/]/.test(filepath)
         )
         ) {
@@ -90,8 +90,8 @@ 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(() => _info(msg, true));
-            else remote.add(`rm -rf "${rp}"`, msg).process();
+            if (c.server.ftpConfig) remote.add(`rm -rf "${rp}"`, msg).process();
+            else del([rp], {force: true}).then(() => _info(msg, true));
           }
         }
       });

package/src/modules/fonto/commands.js

@@ -235,8 +235,15 @@ module.exports = {
 
     return cmdExec(`${fdt} localization extract ${templateFile} --paths ` + packagesDirs)
       .then(() => cmdExec(`${fdt} localization update ${messagesFile} ${templateFile}`))
-      .then(() => fs.readFile(messagesFile, {encoding: 'UTF-8'}))
-      .then(data => fs.outputFile(messagesFile, data.replace(/src\/operations-_/g, 'src/_'))) // remove "operations-" prefix from meta[.file]
+      .then(() => fs.readJson(messagesFile))
+      .then(data => // compress meta object into string array "refs" and remove "operations-" prefix from paths
+        data.map(msg => {
+          msg.refs = msg.meta.map(r => Object.values(r).join(':').replace(/src\/operations-_/, 'src/_'));
+          delete msg.meta;
+          return msg;
+        })
+      )
+      .then(data => fs.outputJson(messagesFile, data, {spaces: 2}))
       .then(() => {
         _info('Cleanup temp files:');
         return del([templateFile, ...attrCfgTmpFiles]);
@@ -272,7 +279,7 @@ module.exports = {
           });
         _write('Done.\n');
       })
-      .then(() => cmdExec(`${fdt} editor run --write-to-disk`))
+      .then(() => cmdExec(`${fdt} editor run --port 8888 --write-to-disk`))
     ;
   }
 

package/src/modules/fonto/index.js

@@ -53,7 +53,7 @@ module.exports = function fonto (argv) {
             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`);
+            _error(`Fonto version ${fontoVersionNew} is not compatible with the current TDI submodule commit!\nExecute: ${'tct fonto --init latest'.cyan}`);
           }
 
           _write(fontoVersionNew+'\n');

package/src/modules/git/index.js

@@ -1,4 +1,6 @@
 const {execSync, spawn} = require('child_process');
+const fs                = require('fs-extra');
+const globby            = require('globby');
 const inquirer          = require('inquirer');
 const path              = require('path');
 
@@ -36,172 +38,189 @@ const cmdExec = commands => new Promise(resolve => {
 });
 
 
-module.exports = function git (argv) {
+function init () {
+  const remoteTdiUrl = `${_paths.gitremote}/${_paths.tdi}.git`;
+  let branches;
+
+  try { branches = execSync('git ls-remote --heads ' + remoteTdiUrl, {encoding: 'UTF-8'}); }
+  catch (e) { _error(' '); } // execSync already prints an error to the console
+
+  branches = branches
+    .match(/refs\/heads\/\S+/g)
+    .map(s => s.replace('refs/heads/', ''))
+    .sort((a, b) => {
+      const aRelease = /^release\//.test(a), bRelease = /^release\//.test(b);
+      if (aRelease && bRelease) return a > b ? -1 : 1;
+      if (aRelease) return -1;
+      if (bRelease) return 1;
+      return a > b ? 1 : -1;
+    })
+  ;
+  inquirer
+    .prompt([{
+      message: 'Choose a branch for TDI submodule: ', name: 'branch', type: 'list',
+      choices: branches, pageSize: 3, loop: false
+    }])
+    .then(a => {
+      _write();
+      cmdExec([
+        ['git init', 'Initialize repo:'],
+        [`git remote add origin ${_paths.gitremote.replace(/\//, ':')}/${path.basename(process.cwd()).replace(/\W/, '-')}.git`],
+        [`git submodule add -b ${a.branch} ${remoteTdiUrl}`, 'Add TDI submodule:'],
+        ['git commit -m "added tdi submodule"', 'Commit:']
+      ])
+        .then(() => {
+          _info(`Next steps:
+        1. Go to https://bitbucket.org/repo/create?workspace=tangelosoftware and create a repository named "${path.basename(process.cwd()).replace(/\W/, '-')}", with options for including README/.gitignore disabled.
+        2. Open this folder in Sourcetree (ctrl+O), and push master branch to origin.
+      `.replace(/^\s{8}/gm, ''));
+        });
+    });
+}
+
+
+function reset () {
+  _info('Reset and clean repo:');
+  cmdExec([
+    ['git reset --hard'],
+    ['git clean -f -d']
+  ]);
+}
+
+
+function clone ({clone: repoName}) {
+
+  if (typeof repoName !== 'string') _error('Pass a repository name!');
+
+  _info('Clone a client repository and do basic project initialization');
+  cmdExec([
+    // Clone repository
+    ['git clone git@bitbucket.org:tangelosoftware/' + repoName + '.git']
+  ])
+    .then(() => {
+      // Change directory for the next commands, it should have the same name as the clone argument from commandline at this point
+      process.chdir('./' + repoName);
+      cmdExec([
+      // Retrieve TDI submodule for this client
+        ['git submodule update --init', 'Fetch submodules such as TDI'],
+        // Create symlinks for TDI
+        ['tct b -s', 'Create TDI symlinks'],
+        // Create Oxygen project file and set name equal to repo name
+        [`tct b -x ${repoName}`, 'Create Oxygen project file'],
+      ]);
+    })
+    .catch(e => {throw e;})
+  ;
+}
+
+
+/**
+ * Updates the repository to the latest commit.
+ * Checks the version of the Fonto instances and warns if there are changes.
+ */
+function updateRepo () {
+  const readFontoVersionFromFile = relPath => fs.readJSONSync(path.join(_paths.repo, 'config/cmscustom', relPath)).sdkVersion;
+  const fontoLocations = globby.sync('*/*/fonto/manifest.json', {cwd: path.join(_paths.repo, 'config/cmscustom')});
+  const fontoVersions = {};
+  fontoLocations.forEach(p => {fontoVersions[p] = readFontoVersionFromFile(p);});
+
+  _info(`Fetch all`);
+  const cmdFetch = execGitCommand('fetch -pf --all', _paths.repo);
+  if (cmdFetch.error) _warn(`Fetch failed\n${cmdFetch.error}`);
+
+  _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 = _git.commitLocal();
+  _write([_formatDate(repoLog.date), repoLog.tags, repoLog.hash].filter(v=>v).join(' - '));
+
+  if (fontoLocations.find(p => fontoVersions[p] !== readFontoVersionFromFile(p))) _warn(`\nChanges in Fonto instance versions have been pulled. Therefore you must execute ${'tct fonto --init'.cyan} before building and deploying Fonto.`);
+
+  _info(`\nRetrieve submodules that belong to this repo-commit`); // update submodule recursively (set to version that belongs to repo)
+  _write(execGitCommand(`submodule update --recursive`, _paths.repo));
+  _info(`Submodule checked out at commit:`);
+  const tdiLog = _git.commitTdi.local();
+  _write([_formatDate(tdiLog.date), tdiLog.tags, tdiLog.hash].filter(v=>v).join(' - '));
+
+  const tdiBranch = getTdiBranch();
+  _info(`\nTDI branch ${tdiBranch.name} is ${tdiBranch.commitsBehind} commits behind.\nUpdate TDI submodule to latest version with ${'tct git --update-submodule'.cyan}`);
+}
+
+
+/**
+ * Updates a submodule in a Git repository. Allows for custom date ranges (for testing) and branch upgrades, and applies migrations to the repository if necessary.
+ *
+ * @param {string[]} options.dates - An array of two strings representing the start and end dates for the custom date range.
+ * @param {string} options.updateSubmodule - The target branch name for the submodule update.
+ */
+function updateSubmodule({dates = [], updateSubmodule: toBranchName}) {
+  const [dateCustomFrom, dateCustomTo] = dates;
+  const branch = getTdiBranch(typeof toBranchName !== 'boolean' && toBranchName);
+  const branchUpgrade = branch.from ? branch.from.name < branch.name : false;
+
+  if (branchUpgrade) _info(`Current branch '${branch.from.name}' will be updated to '${branch.name}'\nCommon ancestor will be used in selecting TDI commits requiring migration: ${_formatDate(branch.commonAncestor.date)}`);
+  _info(`Branch ${branch.name} is ${branch.commitsBehind} commits behind.\n`);
+
+  // Set branch in .gitmodules file; This ensures submodule update will follow this branch to the latest commit
+  const setBranch = execGitCommand(`submodule set-branch -b ${branch.name} tangelo-default-implementation`, _paths.repo);
+  if (setBranch.error) _error(`Set branch failed: ${setBranch.error}`);
+
+  if (branch.commitsBehind > 0 || dateCustomFrom) {
+    const dateBeforeUpdate = _git.commitTdi.local().date;
+
+    // update submodule
+    const updateSubmoduleMsg = execGitCommand(`submodule update --remote`, _paths.repo);
+    if (updateSubmoduleMsg.error) _error(`Update submodule failed\n${updateSubmoduleMsg.error}`);
+    if (updateSubmoduleMsg) _info(`TDI submodule updated:\n${updateSubmoduleMsg}\n`);
+
+    // tdiMigrationFilePath should exist in latest commits of releases 5.3+; As we updated to the latest version this should work
+    const migrations = _modulesTdi.require('git/tdiCommitsRequiringMigration.js');
+    const fromDate = dateCustomFrom ? new Date(dateCustomFrom) : branch.commonAncestor?.date ?? dateBeforeUpdate;
+    const toDate = dateCustomTo ? new Date(dateCustomTo) : new Date();
+
+    _info(`TDI commits requiring migration between ${_formatDate(fromDate)} and ${_formatDate(toDate)}`);
+    // Filter the migrations that should be applied/considered; Also display older releases migrations
+    // For a branch upgrade, all the migrations need to be executed from the beginning of the target branch, not just within the given date range
+    const migrationsFiltered = migrations.filter(m => m.releases.find(r => {
+      const withinDateRange = fromDate < new Date(r.date) && new Date(r.date) < toDate;
+      const isTargetBranch = `release/${r.release}` === branch.name;
+      return branchUpgrade ?
+        isTargetBranch || (branch.from.name <= `release/${r.release}` && `release/${r.release}` < branch.name && withinDateRange) :
+        isTargetBranch && withinDateRange
+      ;
+    }));
 
-  if (argv.init) {
-    const remoteTdiUrl = `${_paths.gitremote}/${_paths.tdi}.git`;
-    let branches;
-
-    try { branches = execSync('git ls-remote --heads ' + remoteTdiUrl, {encoding: 'UTF-8'}); }
-    catch (e) { _error(' '); } // execSync already prints an error to the console
-
-    branches = branches
-      .match(/refs\/heads\/\S+/g)
-      .map(s => s.replace('refs/heads/', ''))
-      .sort((a, b) => {
-        const aRelease = /^release\//.test(a), bRelease = /^release\//.test(b);
-        if (aRelease && bRelease) return a > b ? -1 : 1;
-        if (aRelease) return -1;
-        if (bRelease) return 1;
-        return a > b ? 1 : -1;
-      })
-    ;
-    inquirer
-      .prompt([{
-        message: 'Choose a branch for TDI submodule: ', name: 'branch', type: 'list',
-        choices: branches, pageSize: 3, loop: false
-      }])
-      .then(a => {
-        _write();
-        cmdExec([
-          ['git init', 'Initialize repo:'],
-          [`git remote add origin ${_paths.gitremote.replace(/\//, ':')}/${path.basename(process.cwd()).replace(/\W/, '-')}.git`],
-          [`git submodule add -b ${a.branch} ${remoteTdiUrl}`, 'Add TDI submodule:'],
-          ['git commit -m "added tdi submodule"', 'Commit:']
-        ])
-          .then(() => {
-            _info(`Next steps:
-          1. Go to https://bitbucket.org/repo/create?workspace=tangelosoftware and create a repository named "${path.basename(process.cwd()).replace(/\W/, '-')}", with options for including README/.gitignore disabled.
-          2. Open this folder in Sourcetree (ctrl+O), and push master branch to origin.
-        `.replace(/^\s{8}/gm, ''));
-          });
+    let relevantMigrationCount = 0;
+    // Apply callback for migrations
+    migrationsFiltered
+      .sort((a, b) => Date(a.releases[0].date) > Date(b.releases[0].date) ? 1 : -1)
+      .forEach(m => {
+        const date = _formatDate(new Date(m.releases.filter(r => branch.name >= `release/${r.release}`)[0].date));
+        relevantMigrationCount += m.callback(date, relevantMigrationCount+1) === 1 ? 1 : 0;
       });
-  }
-
-  if (argv.reset) {
-    _info('Reset and clean repo:');
-    cmdExec([
-      ['git reset --hard'],
-      ['git clean -f -d']
-    ]);
-  }
-
-  if (argv.clone) {
-    if (typeof argv.clone !== 'string') _error('Pass a repository name!');
-
-    _info('Clone a client repository and do basic project initialization');
-    cmdExec([
-      // Clone repository
-      ['git clone git@bitbucket.org:tangelosoftware/' + argv.clone + '.git']
-    ])
-      .then(() => {
-        // Change directory for the next commands, it should have the same name as the clone argument from commandline at this point
-        process.chdir('./' + argv.clone);
-        cmdExec([
-        // Retrieve TDI submodule for this client
-          ['git submodule update --init', 'Fetch submodules such as TDI'],
-          // Create symlinks for TDI
-          ['tct b -s', 'Create TDI symlinks'],
-          // Create Oxygen project file and set name equal to repo name
-          [`tct b -x ${argv.clone}`, 'Create Oxygen project file'],
-        ]);
-      })
-      .catch(e => {throw e;})
-    ;
-  }
 
-  if (argv.update) {
-    const [update, tdiFromDateCustom, tdiToDateCustom] = `${argv.update}`.split(/\s/);
-
-    if (update === `tdi`) {
-
-      const tdiBranch = getTdiBranch(argv.branch);
-      const tdiBranchUpgrade = tdiBranch.from ? (tdiBranch.from.name < tdiBranch.name) : false;
-
-      if (tdiBranchUpgrade) _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}`);
-
-        const tdiDateBeforeUpdate = _git.commitTdi.local().date;
-        // update local TDI commit data
-        _git.commitTdi.local(true);
-
-        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
-        const migrations = _modulesTdi.require('git/tdiCommitsRequiringMigration.js');
-        if (migrations) {
-          const fromTdiDate = tdiFromDateCustom ? new Date(tdiFromDateCustom) : (tdiBranch.commonAncestor) ? tdiBranch.commonAncestor.date: tdiDateBeforeUpdate;
-          const toTdiDate = tdiToDateCustom ? new Date(tdiToDateCustom) : new 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 ((tdiBranchUpgrade)
-                ? `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
-            .sort((a, b) => Date(a.releases[0].date)>Date(b.releases[0].date)?1:-1)
-            .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`);
-      }
+    // Output message based on whether or not migrations are required
+    if (migrationsFiltered.length === 0) {
+      _write(`-- No commits require migrations --`);
     } 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 = _git.commitLocal(true);
-      _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 = _git.commitTdi.local(true);
-      _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'`);
+      _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 (https://tangelo-software.atlassian.net/wiki/x/qQnE)`);
     }
+
+  } else {
+    _info(`Your TDI submodule is already up to date`);
   }
+}
+
+
+module.exports = function git (argv) {
+
+  if (argv.init) init();
+  if (argv.reset) reset();
+  if (argv.clone) clone(argv);
+  if (argv.updateRepo) updateRepo();
+  if (argv.updateSubmodule) updateSubmodule(argv);
+
 };

package/src/modules/migrate/index.js

@@ -51,7 +51,7 @@ module.exports = function migrate (argv) {
         a.script = cmdlScript.value;
       }
 
-      let filter = path.join(_paths.apply, argv.filter).toFws(); // Default set filter with filter added to the command argument -f
+      let filter = path.join(_paths.apply, argv.filter??'**').toFws(); // Default set filter with filter added to the command argument -f
 
       if (a.filter === 'projects' && _repoconfig.length > a.projects.length) {
       // push paths of chosen active documents to projectFolders (only if not all projects are chosen)