@tangelo/tangelo-configuration-toolkit 1.11.2 → 1.12.1

package/.eslintrc.js

@@ -0,0 +1,46 @@
+module.exports = {
+  'env': {
+    'browser': true,
+    'commonjs': true,
+    'es2021': true
+  },
+  'extends': 'eslint:recommended',
+  'overrides': [],
+  'parserOptions': {'ecmaVersion': 'latest'},
+  'globals': {
+    'process': 'readonly',
+    'Buffer': 'readonly',
+    '__dirname': 'readonly',
+    '_write': 'writable',
+    '_info': 'writable',
+    '_warn': 'writable',
+    '_error': 'writable',
+    '_perf': 'writable',
+    '_paths': 'writable',
+    '_appdata': 'writable',
+    '_packages': 'writable',
+    '_appconfig': 'writable',
+    '_git': 'writable',
+    '_repoconfig': 'writable',
+    '_tdiSubmoduleExists': 'writable',
+    '_isPre42': 'writable',
+    '_isPre51': 'writable'
+  },
+  'rules': {
+    'no-var': ['error'],
+    'indent': ['error', 2],
+    'quotes': [
+      'error',
+      'single',
+      {'avoidEscape': true, 'allowTemplateLiterals': true}
+    ],
+    'semi': ['error', 'always'],
+    'comma-style': ['error', 'last'],
+    'array-bracket-spacing': ['error', 'never'],
+    'object-curly-spacing': ['error', 'never'],
+    'key-spacing': ['error'],
+    'comma-spacing': ['error'],
+    'rest-spread-spacing': ['error', 'never'],
+    'spaced-comment': ['error', 'always'],
+  }
+};

package/.pre-commit-config.yaml

@@ -0,0 +1,36 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+
+repos:
+
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v3.2.0
+  hooks:
+  - id: trailing-whitespace
+  - id: check-json
+  - id: check-xml
+  - id: check-merge-conflict # checks for files that contain merge conflict strings
+  - id: check-added-large-files
+    args: [--maxkb=100]
+
+- repo: https://github.com/pre-commit/pygrep-hooks
+  rev: v1.9.0
+  hooks:
+  - id: text-unicode-replacement-char # forbid files which have a UTF-8 Unicode replacement character
+
+- repo: https://github.com/crate-ci/typos
+  rev: v1.12.14
+  hooks:
+  - id: typos # spell checker
+
+- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
+  rev: v2.4.0
+  hooks:
+  - id: pretty-format-yaml
+    args: [--autofix, --indent, '2']
+
+- repo: https://github.com/pre-commit/mirrors-eslint
+  rev: v8.28.0
+  hooks:
+  - id: eslint # javascript linter and formatter
+    args: [--fix]

package/README.md

@@ -1,67 +1,67 @@
-# tangelo-configuration-toolkit
-
-Tangelo Configuration Toolkit is a command-line toolkit which offers support for developing a Tangelo configuration.
-
-## Installation
-
-The toolkit requires [NPM](https://www.npmjs.com/get-npm) on [Node.js®](https://nodejs.org/) (at least version 14.x). An active or maintenance LTS release is recommended. After installing Node.js, you can install the latest version of the Tangelo Configuration Toolkit globally on your system using the following command:
-
-    npm i -g @tangelo/tangelo-configuration-toolkit
-
-## Usage
-
-Get help for the available commands and see version:
-
-    tangelo-configuration-toolkit
-
-Get help for a specific command, detailing all its arguments:
-
-    tangelo-configuration-toolkit <command>
-
-Use the `tct` shorthand instead of `tangelo-configuration-toolkit`:
-
-    tct <command>
-
-## Config
-
-### Global
-
-The `deploy` command requires server connection information. So you'll have to create a configuration file named `tangelo-configuration-toolkit-appconfig.json` in which such information can be stored. This file will be searched for in an ancestor directory of the current working directory.
-
-The contents looks like this (all properties are optional):
-
-    {
-      "sharedConfigPath": "absolute/or/relative/path/to/folder/containing/shared/config",
-      "servers": [{
-        "config": {
-          "port": 22,
-          "parallel": 4,
-          "username": "username",
-          "remotedir": "/absolute/path/to/tangelo/config/folder/on/server"
-        },
-        "domains": ["domain.name.com"],
-        "name": "name-for-local-deploy"
-      }],
-      "serverDefaults": {
-        "config": {
-          ...
-        }
-      }
-      "defaultServer": "can be set to the name of e.g. your favorite dev server",
-      "defaultDatabase": "can be set to the tnsname of e.g. your favorite dev server"
-    }
-
-When passing a server name, `tct` will look for a full match with a name or a partial match (the start) with a domain.
-
-### Repo
-
-The `build` and `sql` commands make use of a configuration file in the repository named `tangelo-configuration-toolkit-repoconfig.json`. This contains information about the customer projects.
-
-For a new repository, using `tct build --init` also creates the repoconfig-file. For existing projects not having the repoconfig-file, you can use `tct build --config` to generate it.
-
-### oXygen
-
-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 '_'
+# tangelo-configuration-toolkit
+
+Tangelo Configuration Toolkit is a command-line toolkit which offers support for developing a Tangelo configuration.
+
+## Installation
+
+The toolkit requires [NPM](https://www.npmjs.com/get-npm) on [Node.js®](https://nodejs.org/) (at least version 14.x). An active or maintenance LTS release is recommended. After installing Node.js, you can install the latest version of the Tangelo Configuration Toolkit globally on your system using the following command:
+
+    npm i -g @tangelo/tangelo-configuration-toolkit
+
+## Usage
+
+Get help for the available commands and see version:
+
+    tangelo-configuration-toolkit
+
+Get help for a specific command, detailing all its arguments:
+
+    tangelo-configuration-toolkit <command>
+
+Use the `tct` shorthand instead of `tangelo-configuration-toolkit`:
+
+    tct <command>
+
+## Config
+
+### Global
+
+The `deploy` command requires server connection information. So you'll have to create a configuration file named `tangelo-configuration-toolkit-appconfig.json` in which such information can be stored. This file will be searched for in an ancestor directory of the current working directory.
+
+The contents looks like this (all properties are optional):
+
+    {
+      "sharedConfigPath": "absolute/or/relative/path/to/folder/containing/shared/config",
+      "servers": [{
+        "config": {
+          "port": 22,
+          "parallel": 4,
+          "username": "username",
+          "remotedir": "/absolute/path/to/tangelo/config/folder/on/server"
+        },
+        "domains": ["domain.name.com"],
+        "name": "name-for-local-deploy"
+      }],
+      "serverDefaults": {
+        "config": {
+          ...
+        }
+      }
+      "defaultServer": "can be set to the name of e.g. your favorite dev server",
+      "defaultDatabase": "can be set to the tnsname of e.g. your favorite dev server"
+    }
+
+When passing a server name, `tct` will look for a full match with a name or a partial match (the start) with a domain.
+
+### Repo
+
+The `build` and `sql` commands make use of a configuration file in the repository named `tangelo-configuration-toolkit-repoconfig.json`. This contains information about the customer projects.
+
+For a new repository, using `tct build --init` also creates the repoconfig-file. For existing projects not having the repoconfig-file, you can use `tct build --config` to generate it.
+
+### oXygen
+
+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

package/bin/index.js

@@ -1,3 +1,3 @@
-#!/usr/bin/env node
-
+#!/usr/bin/env node
+
 require('..');

package/index.js

@@ -21,7 +21,7 @@ global._write = (...msg) => {
   console.log(msg.join(' ').replace(/^/gm, '  ')); // indent each line
 };
 
-global._info  = (msg, time = false) => {
+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');
@@ -66,23 +66,36 @@ if (!_appdata.npmPath) {
 global._packages = {
   TCT: {name: '@tangelo/tangelo-configuration-toolkit', version: require('./package.json')?.version},
   FDT: {name: '@fontoxml/fontoxml-development-tools'}
-}
-_packages.FDT.version = fs.readJsonSync(path.join(_appdata.npmPath, 'node_modules', _packages.FDT.name, 'package.json'), {throws: false})?.version;
+};
 
 try { global._appconfig = _paths.appconfig && fs.readJsonSync(_paths.appconfig) || {}; }
 catch({message}) { _error('Error in '+message); }
 
 _appconfig.sharedConfigPath = path.resolve(_paths.appconfig || '', '..', _appconfig.sharedConfigPath || '', appname+'-appconfig.json');
-_appconfig.shared           = fs.readJsonSync(_appconfig.sharedConfigPath, {throws: false}) || {};
+_appconfig.shared = fs.readJsonSync(_appconfig.sharedConfigPath, {throws: false}) || {};
 
 
 global._git = {
-  user: execGitCommand(`config --get user.email`, _paths.repo),
-  commitLocal: execGitCommand(`log -1 --format=%D;%H;%cd --date=iso-strict`, _paths.repo, ['branch', 'hash', 'date']),
-  commitLocalTdi: {
-    ...execGitCommand(`log -1 --format=%D;%H;%cd --date=iso-strict`, path.join(_paths.repo, _paths.tdi),['tags', 'hash', 'date']),
+  user () {
+    if (!_appdata.gitUser) _appdata._update({gitUser: execGitCommand(`config --get user.email`, _paths.repo)});
+    return _appdata.gitUser;
+  },
+  commitLocal () {
+    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;
+  },
+  commitTdi: {
+    local () {
+      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) {
-      return execGitCommand(`merge-base --is-ancestor ${commitHash} ${this.hash}`, path.join(_paths.repo, _paths.tdi), null, 0);
+      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];
     },
     fontoVersions: [ // latest commits first
       {commitHash: 'e599766', regex: /^7\.1[45]\./},
@@ -93,17 +106,16 @@ global._git = {
     stopUsingRepoconfigFile: '1f12bff' // release/5.1 10-05-2021
   }
 };
-_git.commitRemote = execGitCommand('log -1 --format=%cd --date=iso-strict origin/'+_git.commitLocal.branch, _paths.repo, ['date']);
 
 
-if (_git.commitLocalTdi.after(_git.commitLocalTdi.stopUsingRepoconfigFile)) {
+if (_git.commitTdi.after(_git.commitTdi.stopUsingRepoconfigFile)) {
   global._repoconfig = require('./src/lib/get-repoconfig')();
 }
 else {
   try { global._repoconfig = fs.existsSync(_paths.repoconfig) && fs.readJsonSync(_paths.repoconfig) || {}; }
-  catch({message}) { _error('Error in '+message); }
-  _repoconfig.update = obj => {
-    _repoconfig = Object.assign(_repoconfig, obj);
+  catch ({message}) { _error('Error in '+message); }
+  global._repoconfig.update = obj => {
+    global._repoconfig = Object.assign(_repoconfig, obj);
     fs.writeJsonSync(_paths.repoconfig, _repoconfig, {spaces: 2});
   };
 }
@@ -114,7 +126,6 @@ global._isPre42 = fs.existsSync(path.join(_paths.repo, _paths.tdi, 'create_new_p
 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)
 
 
-
 process.on('beforeExit', () => {
   _write(); // print empty line before and after update check
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tangelo/tangelo-configuration-toolkit",
-  "version": "1.11.2",
+  "version": "1.12.1",
   "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

@@ -9,116 +9,116 @@ module.exports = function cli () {
   const txtVersion  = `v${_packages.TCT.version}`.lblack;
 
   const {argv} = yargs
-  .scriptName('tct')
-  .usage(`${txtTitle} ${txtVersion}\n\nUsage: $0 <command> [options]`)
-  .middleware(argv => { // executes before command handlers
-    if (!(['git', 'g'].includes(argv._[0]) && (argv.init || argv.clone))) {
-      if (!_paths.repo) _error('This command can only be used inside a customer git repo!');
-      process.chdir(_paths.repo);
-    }
-  })
-  .command({
-    command: 'build',
-    aliases: ['b'],
-    desc: 'Build the customer repository',
-    builder: {
-      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: _git.commitLocalTdi.after(_git.commitLocalTdi.stopUsingRepoconfigFile)},
-      oxygen: {alias: 'x', desc: 'Create or update oXygen project file (.xpr)', conflicts: ['p', 'i', 'c']}
-    },
-    handler: require('./modules/build')
-  })
-  .command({
-    command: 'deploy',
-    aliases: ['d'],
-    desc: 'Copy configuration to server',
-    builder: {
-      test: {alias: 't', desc: 'Test what files qualify for copy', conflicts: ['c', 'w', 'l']},
-      copy: {alias: 'c', desc: 'Copy files', conflicts: ['t', 'w', 'l']},
-      watch: {alias: 'w', desc: 'Watch files for copy on change', conflicts: ['t', 'c', 'l']},
-      live: {alias: 'l', desc: 'Watch files for copy on change, and reload webpage', conflicts: ['t', 'c', 'w']},
-      server: {alias: 's', desc: 'Pass server name (set in config file)', default: _appconfig.defaultServer},
-      filter: {alias: 'f', desc: 'Pass glob filter', default: '**'}
-    },
-    handler: require('./modules/deploy')
-  })
-  .command({
-    command: 'fonto',
-    aliases: ['f'],
-    desc: 'Setting up the Fonto editor',
-    builder: {
-      init: {alias: 'i', desc: `Initialize editor (optionally pass version number or 'latest')`},
-      schema: {alias: 's', desc: 'Compile schemas to json'},
-      elements: {alias: 'e', desc: 'List schema elements not having a default configuration'},
-      attributes: {alias: 'a', desc: 'List schema attributes not having a default configuration'},
-      localize: {alias: 'l', desc: 'Update localization file'},
-      build: {alias: 'b', desc: 'Build the editor instance'},
-      run: {alias: 'r', desc: 'Start editor instance on localhost and watch changes'}
-    },
-    handler: require('./modules/fonto')
-  })
-  .command({
-    command: 'git',
-    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'},
-    },
-    handler: require('./modules/git')
-  })
-  .command({
-    command: 'migrate',
-    aliases: ['m'],
-    desc: 'Execute migration scripts on configuration files',
-    builder: {
-      execute: {alias: 'e', desc: 'Execute migration'},
-      dry: {alias: 'd', desc: 'Dry run (does not persist changes)'},
-      filter: {alias: 'f', desc: 'Pass glob filter (only used for applicable steps)', default: '**'}
-    },
-    handler: require('./modules/migrate')
-  })
-  .command({
-    command: 'sql',
-    aliases: ['s'],
-    desc: 'Execute sql scripts',
-    builder: {
-      install: {alias: 'i', desc: 'Install TDI schema and custom schema'},
-      configure: {alias: 'c', desc: 'Load configuration for projects'},
-      generate: {alias: 'g', desc: 'Generate configuration scripts for a project', conflicts: ['i', 'c', 'r']},
-      remove: {alias: 'r', desc: 'Remove project configuration', conflicts: ['i', 'c', 'g']}
-    },
-    handler: require('./modules/sql')
-  }).command({
-    command: 'versions',
-    aliases: ['v'],
-    desc: 'Show version information',
-    builder: {
-      find: {alias: 'f', desc: `Find all version information          [choices: "sort-project"(default),"sort-type"]`},
-      server: {alias: 's', desc: 'Pass server name (set in config file)', default: _appconfig.defaultServer}
-    },
-    handler: require('./modules/version')
-  })
-  .recommendCommands()
-  .option('config', {alias: 'c', desc: 'Show loaded appconfig', global: false})
-  .version(false)
-  .help(false)
-  .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']
-  ])
-  .check((argv, options) => {
-    const passedOpts  = Object.keys(argv).filter(k => !['_', '$0', 'server', 's', 'filter', 'f'].includes(k)); // also filter options with defaults
-    const hasOpts     = Object.keys(options)[0];
-    if (hasOpts && !passedOpts[0]) yargs.showHelp();
-    return true;
-  })
-  .strict()
-  .wrap(100)
+    .scriptName('tct')
+    .usage(`${txtTitle} ${txtVersion}\n\nUsage: $0 <command> [options]`)
+    .middleware(argv => { // executes before command handlers
+      if (!(['git', 'g'].includes(argv._[0]) && (argv.init || argv.clone))) {
+        if (!_paths.repo) _error('This command can only be used inside a customer git repo!');
+        process.chdir(_paths.repo);
+      }
+    })
+    .command({
+      command: 'build',
+      aliases: ['b'],
+      desc: 'Build the customer repository',
+      builder: {
+        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')
+    })
+    .command({
+      command: 'deploy',
+      aliases: ['d'],
+      desc: 'Copy configuration to server',
+      builder: {
+        test: {alias: 't', desc: 'Test what files qualify for copy', conflicts: ['c', 'w', 'l']},
+        copy: {alias: 'c', desc: 'Copy files', conflicts: ['t', 'w', 'l']},
+        watch: {alias: 'w', desc: 'Watch files for copy on change', conflicts: ['t', 'c', 'l']},
+        live: {alias: 'l', desc: 'Watch files for copy on change, and reload webpage', conflicts: ['t', 'c', 'w']},
+        server: {alias: 's', desc: 'Pass server name (set in config file)', default: _appconfig.defaultServer},
+        filter: {alias: 'f', desc: 'Pass glob filter', default: '**'}
+      },
+      handler: require('./modules/deploy')
+    })
+    .command({
+      command: 'fonto',
+      aliases: ['f'],
+      desc: 'Setting up the Fonto editor',
+      builder: {
+        init: {alias: 'i', desc: `Initialize editor (optionally pass version number or 'latest')`},
+        schema: {alias: 's', desc: 'Compile schemas to json'},
+        elements: {alias: 'e', desc: 'List schema elements not having a default configuration'},
+        attributes: {alias: 'a', desc: 'List schema attributes not having a default configuration'},
+        localize: {alias: 'l', desc: 'Update localization file'},
+        build: {alias: 'b', desc: 'Build the editor instance'},
+        run: {alias: 'r', desc: 'Start editor instance on localhost and watch changes'}
+      },
+      handler: require('./modules/fonto')
+    })
+    .command({
+      command: 'git',
+      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'},
+      },
+      handler: require('./modules/git')
+    })
+    .command({
+      command: 'migrate',
+      aliases: ['m'],
+      desc: 'Execute migration scripts on configuration files',
+      builder: {
+        execute: {alias: 'e', desc: 'Execute migration'},
+        dry: {alias: 'd', desc: 'Dry run (does not persist changes)'},
+        filter: {alias: 'f', desc: 'Pass glob filter (only used for applicable steps)', default: '**'}
+      },
+      handler: require('./modules/migrate')
+    })
+    .command({
+      command: 'sql',
+      aliases: ['s'],
+      desc: 'Execute sql scripts',
+      builder: {
+        install: {alias: 'i', desc: 'Install TDI schema and custom schema'},
+        configure: {alias: 'c', desc: 'Load configuration for projects'},
+        generate: {alias: 'g', desc: 'Generate configuration scripts for a project', conflicts: ['i', 'c', 'r']},
+        remove: {alias: 'r', desc: 'Remove project configuration', conflicts: ['i', 'c', 'g']}
+      },
+      handler: require('./modules/sql')
+    }).command({
+      command: 'versions',
+      aliases: ['v'],
+      desc: 'Show version information',
+      builder: {
+        find: {alias: 'f', desc: `Find all version information          [choices: "sort-project"(default),"sort-type"]`},
+        server: {alias: 's', desc: 'Pass server name (set in config file)', default: _appconfig.defaultServer}
+      },
+      handler: require('./modules/version')
+    })
+    .recommendCommands()
+    .option('config', {alias: 'c', desc: 'Show loaded appconfig', global: false})
+    .version(false)
+    .help(false)
+    .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']
+    ])
+    .check((argv, options) => {
+      const passedOpts  = Object.keys(argv).filter(k => !['_', '$0', 'server', 's', 'filter', 'f'].includes(k)); // also filter options with defaults
+      const hasOpts     = Object.keys(options)[0];
+      if (hasOpts && !passedOpts[0]) yargs.showHelp();
+      return true;
+    })
+    .strict()
+    .wrap(100)
   ;
 
 
@@ -132,4 +132,4 @@ module.exports = function cli () {
 
   }
 
-}
+};

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

@@ -9,17 +9,17 @@ module.exports = function execGitCommand(args, path, returnProperties = [], expe
 
   let retObj = (cmd.stdout||'').toString().trim().split(';');
   if (returnProperties[0]) {
+    const o = {};
     retObj = (
-      o = {},
-      retObj.forEach((v,i) => {
+      retObj.forEach((v, i) => {
         o[returnProperties[i]] =
           returnProperties[i] == 'date' ? new Date(v) :
-          returnProperties[i] == 'branch' ? v.replace(/HEAD -> ([^,]+).*/, '$1') :
-          v
+            returnProperties[i] == 'branch' ? v.replace(/HEAD -> ([^,]+).*/, '$1') :
+              v
         ;
       }),
       o
-    )
+    );
   }
   return retObj.length==1 ? retObj[0] : retObj;
 

package/src/lib/get-repoconfig.js

@@ -7,30 +7,30 @@ module.exports = function getRepoconfig() {
   const repoconfig = [];
 
   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];
-
-    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];
-
-    repoconfig.push({
-      customer_name,
-      customer_abbr: ntName.split('_')[0],
-      project_name: dtDisplayName.split(RegExp(customer_name.replace(/(\W)/g, '\\$1')))[1].trim() || '',
-      project_abbr: ntName.split('_')[1],
-      path_cmscustom,
-      path_dbconfig,
-      id_range: dtSqlInsert.match(/(\d+)\d{3} id/)[1]
+    .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];
+
+      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];
+
+      repoconfig.push({
+        customer_name,
+        customer_abbr: ntName.split('_')[0],
+        project_name: dtDisplayName.split(RegExp(customer_name.replace(/(\W)/g, '\\$1')))[1].trim() || '',
+        project_abbr: ntName.split('_')[1],
+        path_cmscustom,
+        path_dbconfig,
+        id_range: dtSqlInsert.match(/(\d+)\d{3} id/)[1]
+      });
     });
-  });
 
   return repoconfig;