@tangelo/tangelo-configuration-toolkit 1.16.0 → 1.17.0

package/package.json

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

package/src/cli.js

@@ -88,7 +88,7 @@ module.exports = function cli () {
       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: '**'}
+        filter: {alias: 'f', desc: 'Pass glob filter (only used for applicable steps)'}
       },
       handler: require('./modules/migrate')
     })

package/src/modules/fonto/commands.js

@@ -1,5 +1,7 @@
+const del     = require('del');
 const {exec}  = require('child_process');
 const fs      = require('fs-extra');
+const globby  = require('globby');
 const gulp    = require('gulp');
 const g_print = require('gulp-print');
 const path    = require('path');
@@ -219,15 +221,27 @@ module.exports = {
     ;
 
     _info(`Ensure ${messagesFile} exists:`);
-    if (!fs.existsSync(messagesFile)) fs.outputJsonSync(messagesFile, [], {spaces: 2});
+    if (!fs.existsSync(messagesFile)) fs.outputJsonSync(messagesFile, []);
+    _write('Done.\n');
+
+    _info('Make temporary copies of json files:');
+    const attrCfgTmpFiles = globby.sync('packages/*/src/!(messages.|operations-)*.json');
+    attrCfgTmpFiles.forEach((p, i, a) => {
+      _write(p);
+      a[i] = path.join(path.dirname(p), 'operations-' + path.basename(p));
+      fs.copyFileSync(p, a[i]);
+    });
+    _write();
 
     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(() => {
-        _info('Remove template file:');
-        fs.unlinkSync(templateFile);
-        _write('Done.\n');
+        _info('Cleanup temp files:');
+        return del([templateFile, ...attrCfgTmpFiles]);
       })
+      .then(() => _write('Done.\n'))
       .then(() => [fdt])
     ;
   },

package/src/modules/git/index.js

@@ -130,6 +130,7 @@ module.exports = function git (argv) {
         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);
 
@@ -138,7 +139,7 @@ module.exports = function git (argv) {
         // 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: _git.commitTdi.local().date;
+          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)}`);

package/src/modules/migrate/index.js

@@ -6,8 +6,6 @@ const path      = require('path');
 module.exports = function migrate (argv) {
   if (_isPre51()) _error('This command only works when using branch release/5.1 and up.');
 
-  let filter = path.join(_paths.apply, argv.filter).toFws(); // Default set filter with filter added to the command argument -f
-
   const scripts =
     globby
       .sync(_paths.tdi + '/tct/migrate/*.js')
@@ -37,12 +35,12 @@ module.exports = function migrate (argv) {
       when: !(cmdlScript) // Only show choice for migration when no script is set in commandline
     }, {
       message: 'Choose filter: ', name: 'filter', type: 'list', pageSize: 5, loop: false,
-      choices: [{name: `- All`, value: argv.filter}, {name: '- Choose active projects', value: 'projects'}],
-      when: argv.filter === '**' // Only show this message if no custom filter was added to the command argument -f
+      choices: [{name: `- All`, value: '**'}, {name: '- Choose active projects', value: 'projects'}],
+      when: !argv.filter // Only show this message if no custom filter was added to the command argument -f
     }, {
       message: 'Choose active projects: ', name: 'projects', type: 'checkbox', validate: v => !!v[0],
       choices: _repoconfig.map(p => ({name: `${p.customer_name} ${p.project_name}`, value: p})),
-      when: (a) => a.filter === 'projects' // Only show this message if 'Choose active projects' was chosen previously
+      when: a => a.filter === 'projects' // Only show this message if 'Choose active projects' was chosen previously
     }])
     .then(a => {
       _write();
@@ -53,6 +51,8 @@ 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
+
       if (a.filter === 'projects' && _repoconfig.length > a.projects.length) {
       // push paths of chosen active documents to projectFolders (only if not all projects are chosen)
         const projectFolders = [];