@tangelo/tangelo-configuration-toolkit 1.23.1 → 1.24.0

package/package.json

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

package/src/lib/get-repoconfig.js

@@ -12,7 +12,7 @@ module.exports = function getRepoconfig(repoPath) {
 
       const dtDisplayName = dtSqlInsert.match(/'([^']+)' display_name/)[1];
       const ntName        = ntSqlInsert.match(/'([^']+)' name/)[1];
-      const xpiDir        = ntSqlInsert.match(/'([^']+)' xsl_prep_inc/)[1];
+      const xpiDir        = ntSqlInsert.match(/'([^']+)' xsl_prep_inc/)?.[1] ?? dtSqlInsert.match(/'([^']+)' xsl_xincludes/)[1];
 
       const path_cmscustom  = xpiDir.replace(/\/[^/]+$/, '').split(/\//);
       const path_dbconfig   = p.replace(/.*\/database\/config\/(.*)\/[^/]+/, '$1').split(/[/\\]/);

package/src/modules/deploy/execute.js

@@ -123,6 +123,7 @@ module.exports = function transfer (paths, {watch, lrServer} = {}) {
     .pipe(shF.restore)
     .pipe(g_plumber.stop())
     .pipe(g_replace(c.replaceStrings))
+    .pipe(through2.obj(combineTranslations))
     .pipe(through2.obj((file, enc, cb) => {
       file.originalRelativePath = file.relative; // original path needed for sftp.fastPut
       file.path = file.path.replace(/(fonto).(?:dev|dist|packages.sx-shell-.+src)(.+)/, '$1$2'); // change destination path for fonto build files
@@ -143,4 +144,35 @@ module.exports = function transfer (paths, {watch, lrServer} = {}) {
 
       if (c.deliveryPack) createDeliveryPack();
     });
-};
+};
+
+// Combine custom translations/resource bundle with tdi translations
+async function combineTranslations(file, enc, cb) {
+  const isTranslationFile = file.basename.match(/custom-UI-text.*\.properties/);
+
+  // Ignore non-translation files
+  if (!isTranslationFile) return cb(null, file);
+
+  // Remove tdi translations from pipe
+  if (file.path.match(/tdi/)) return cb();
+
+  // Get language from file name
+  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`;
+  let tdiTranslations;
+  try {
+    tdiTranslations = await fs.readFile(tdiTranslationPath, enc);
+  }
+  catch {
+    // If tdi translation file does not exist (<5.8), leave custom translations unchanged
+    return cb(null, file);
+  }
+
+  // Combine file content
+  const separator = `# Contents of ${tdiTranslationPath}`;
+  const newText = [file.contents, separator, tdiTranslations].join('\n');
+  file.contents = Buffer.from(newText);
+  return cb(null, file);
+}

package/src/modules/fonto/index.js

@@ -54,7 +54,7 @@ module.exports = function fonto (argv) {
             const data = execSync(`${fdtCommand(fontoVersionCurrent)} editor versions`, {encoding: 'UTF-8'});
             fontoVersionNew = data.match(/\d+\.\d+\.\d+/g).find(v => allowedFontoVersionRegex.test(v));
           }
-          else if (!allowedFontoVersionRegex.test(fontoVersionNew)) {
+          else if (fontoVersionNew !== 'nightly' && !allowedFontoVersionRegex.test(fontoVersionNew)) {
             _error(`Fonto version ${fontoVersionNew} is not compatible with the current TDI submodule commit!\nExecute: ${'tct fonto --init latest'.cyan}`);
           }
 

package/src/modules/info/index.js

@@ -172,7 +172,8 @@ module.exports = function info (argv) {
             const id      = dtRow.match(/(\d+) id/)?.[1];
             const name    = dtRow.match(/'([^']+)' display_name/)?.[1];
             const dbPath  = p.match(/(database\/config\/(:?.*)\/)txd_document_types.sql/i)?.[1];
-            const prPath  = ntSqlInsert.match(/'([^']+)' xsl_prep_inc/)[1].replace('prepare_xincludes.xsl', '');
+            const xincl   = ntSqlInsert.match(/'([^']+)' xsl_prep_inc/)?.[1] ??  dtRow.match(/'([^']+)' xsl_xincludes/)[1];
+            const prPath  = xincl.replace('prepare_xincludes.xsl', '');
 
             doctypesInfo.addRows([
               {id, name, paths: 'config/cmscustom/'+ prPath},

package/src/modules/migrate/steps.js

@@ -7,7 +7,7 @@ const rif       = require('replace-in-file');
 
 class PathSearcher {
   #filter;
-  #ignorePaths = [_paths.tdi + '/**', 'config/cmscustom/tdi/**'];
+  #ignorePaths = [_paths.tdi + '/**', 'config/cmscustom/tdi/**', '**/node_modules/**', '**/fonto/packages_shared/**', '**/fonto/platform/**'];
   constructor (filter, ignoreProjectPaths) {
     this.#filter = filter;
     this.#ignorePaths.push(...ignoreProjectPaths);