@tangelo/tangelo-configuration-toolkit 1.24.0 → 1.24.2

package/package.json

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

package/src/lib/gulp-tcl-config.js

@@ -29,8 +29,8 @@ module.exports = function() {
         const tclConfig = new TclConfig(tclFileDir, createAddToStreamFn(this));
         tclConfig.outputJson(path.resolve(tclFileDir, 'fonto/assets'));
         tclConfig.outputCss(path.resolve(tclFileDir, 'fonto'));
-        const esefCssDir = path.resolve(tclFileDir, 'export/esef/esef_out/css');
-        if (fs.existsSync(esefCssDir)) tclConfig.outputCss(esefCssDir);
+        const xbrlCssDir = path.resolve(tclFileDir, 'export/xbrl/xbrl_out/css');
+        if (fs.existsSync(xbrlCssDir)) tclConfig.outputCss(xbrlCssDir);
       }
       cb();
     }

package/src/lib/tcl-config.js

@@ -91,7 +91,7 @@ module.exports = class TclConfig {
   outputCss(dir) {
     if (this.#tclFileExists) {
       const filepath = path.join(dir, TclConfig.#TCL_CSS_FILE_NAME);
-      const moduleName = dir.includes('esef') ? 'ESEF' : 'FONTO';
+      const moduleName = dir.includes('xbrl') ? 'XBRL' : 'FONTO';
       this.#outputFn(filepath, this.#getCss(moduleName));
       this.modifyFontoHtml(dir);
     }

package/src/modules/deploy/execute.js

@@ -4,6 +4,7 @@ const fs              = require('fs-extra');
 const globby          = require('globby');
 const gulp            = require('gulp');
 const g_tcl           = require('../../lib/gulp-tcl-config');
+const path            = require('path');
 const through2        = require('through2');
 const {spawnSync}     = require('child_process');
 
@@ -35,6 +36,8 @@ const createDeliveryPack = () => { // create install scripts if necessary, zip o
   });
 
   if (dbiSql[0]) { // complete and output sql script
+
+    const checkVersion = fs.existsSync(path.join(_paths.tdi, 'src/database/tdi/scripts/_check_version.sql')) ? '@@tangelo-default-implementation/src/database/tdi/scripts/_check_version.sql' : '';
     dbiSql.unshift(
       `accept l_tns       char prompt 'Database TNS name : '`,
       `accept l_pw_tancms char prompt 'TANCMS password   : '`,
@@ -43,6 +46,7 @@ const createDeliveryPack = () => { // create install scripts if necessary, zip o
       'prompt ',
       'connect tancms/&l_pw_tancms@&l_tns',
       'prompt ',
+      `${checkVersion}`,
       'set verify off define off'
     );
     dbiSql.push('prompt ', 'pause Press ENTER to exit', 'exit');
@@ -160,7 +164,11 @@ async function combineTranslations(file, enc, cb) {
   const language = file.basename.match(/custom-UI-text(_.+?)?\.properties/)[1] ?? '';
 
   // Read matching tdi translation file
-  const tdiTranslationPath = `cmscustom/tdi/custom-UI-text/custom-UI-text${language}.properties`;
+  const tdiTranslationPath = path.join(
+    // Current working directory can be either repo root for delivery pack or config folder otherwise, so adjust path accordingly
+    file.cwd.split(path.sep).pop() == 'config' ? '' : 'config', 
+    `cmscustom/tdi/custom-UI-text/custom-UI-text${language}.properties`
+  );
   let tdiTranslations;
   try {
     tdiTranslations = await fs.readFile(tdiTranslationPath, enc);

package/src/modules/git/index.js

@@ -3,6 +3,7 @@ const fs                = require('fs-extra');
 const globby            = require('globby');
 const inquirer          = require('inquirer');
 const path              = require('path');
+const {compare}         = require('compare-versions');
 
 const execGitCommand  = require('../../lib/exec-git-command');
 const getTdiBranch    = require('../../lib/get-tdi-branch');
@@ -202,17 +203,23 @@ function updateSubmodule({dates = [], updateSubmodule: releaseBranchName}) {
     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();
+    const fromVersion = branch.from?.name?.replace('release/', '');
+    const toVersion = branch.name.replace('release/', '');
 
     _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 (branchUpgrade) {
+        // For branch upgrades, include all migrations for versions newer than the current one, and include new migrations for the current version
+        const isTargetBranch = compare(r.release, toVersion, '<=') && compare(r.release, fromVersion, '>');
+        return isTargetBranch || (r.release === fromVersion && withinDateRange);
+      } else {
+        // For non-branch upgrades, only include new migrations for the current branch
+        return r.release === toVersion && withinDateRange;
+      }
     }));
 
     let relevantMigrationCount = 0;

package/src/modules/sql/index.js

@@ -2,7 +2,7 @@ const {execSync}  = require('child_process');
 const fs          = require('fs-extra');
 const globby      = require('globby');
 const inquirer    = require('inquirer');
-
+const path        = require('path');
 
 const runSqlScript = (path, db, un, pw) => {
   const connect = db ? `${un}/${pw}@${db}` : '/nolog';
@@ -72,6 +72,13 @@ module.exports = function sql (argv) {
           const script = [`define l_env = ${a.pw=='tancms' ? 'dev' : 'prd'}`, 'set verify off define off'];
 
           script.push(`spool install-config.log`);
+
+          if (fs.existsSync(path.join(_paths.tdi, 'src/database/tdi/scripts/_check_version.sql'))) {
+            script.push(`whenever sqlerror exit sql.sqlcode`);
+            script.push(`@@../../tangelo-default-implementation/src/database/tdi/scripts/_check_version.sql`);
+            script.push(`whenever sqlerror continue`);
+          }
+
           a.projects.forEach(p => {
             const dir = p.path_dbconfig ? p.path_dbconfig.join('/') : (_repoconfig.customer.dirname+'/'+p.dirname);
             script.push('prompt ', `prompt Loading configuration for: ${p.name}`);