@yuuvis/client-cli 19.3.1 → 19.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yuuvis/client-cli",
-  "version": "19.3.1",
+  "version": "19.3.3",
   "main": "index.js",
   "schematics": "./schematics/factories/collection.json",
   "bin": {

package/schematics/files/_scripts/i18n-collect.js

@@ -6,16 +6,19 @@ function traverseDirectory(currentPath, i18nFolders, excludeList) {
     const entryPath = path.join(currentPath, entry);
     const isDirectory = fs.statSync(entryPath).isDirectory();
     if (isDirectory) {
-      if (entry === 'i18n' && !excludeList.some((exclude) => entryPath.includes(exclude))) {
-        i18nFolders.push(entryPath);
-      } else {
-        traverseDirectory(entryPath, i18nFolders, excludeList);
-      }
+      entry === 'i18n' && !excludeList.some((exclude) => entryPath.includes(exclude))
+        ? i18nFolders.push(entryPath)
+        : traverseDirectory(entryPath, i18nFolders, excludeList);
     }
   });
   return i18nFolders;
 }
-function findI18nFolders(base, excludeList) {
+function findI18nFolders(base, excludeList = []) {
+  // Normalize base to absolute paths for comparison
+  base = base.split('/').reduce((acc, part) => path.join(acc, part), '');
+  // Normalize excludeList entries to absolute paths for comparison
+  excludeList = excludeList.map((exclude) => exclude.split('/').reduce((acc, part) => path.join(acc, part), ''));
+
   let i18nFolders = [];
   if (fs.existsSync(base)) {
     i18nFolders = traverseDirectory(base, i18nFolders, excludeList);
@@ -27,15 +30,14 @@ function groupFilesByLanguageCode(files) {
     const match = file.match(/^([a-z]{2})\.json$/);
     if (match) {
       const lang = match[1];
-      if (!acc[lang])
-        acc[lang] = [];
+      if (!acc[lang]) acc[lang] = [];
       acc[lang].push(path.join(dir, file));
     }
     return acc;
   }, {});
 }
-async function copyTo(directories, outputDir) {
-  const files = directories.flatMap((dir) => fs.readdirSync(dir).map((file) => ({ dir, file })));
+async function copyTo(srcDirectories, outputDir) {
+  const files = srcDirectories.flatMap((dir) => fs.readdirSync(dir).map((file) => ({ dir, file })));
   // Group files by language code
   const languageFiles = groupFilesByLanguageCode(files);
   // Merge files for each language
@@ -44,16 +46,22 @@ async function copyTo(directories, outputDir) {
       const data = fs.existsSync(filePath) ? JSON.parse(fs.readFileSync(filePath, 'utf-8')) : {};
       return { ...acc, ...data };
     }, {});
+    const sortedMergedData = Object.keys(mergedData)
+      .sort()
+      .reduce((sortedObj, key) => {
+        sortedObj[key] = mergedData[key];
+        return sortedObj;
+      }, {});
     if (!fs.existsSync(outputDir)) {
       fs.mkdirSync(outputDir, { recursive: true });
     }
     const outputFilePath = path.join(outputDir, `${lang}.json`);
-    fs.writeFileSync(outputFilePath, JSON.stringify(mergedData, null, 2), 'utf-8');
+    fs.writeFileSync(outputFilePath, JSON.stringify(sortedMergedData, null, 2), 'utf-8');
     console.log(`Merged ${lang} files into ${outputFilePath}`);
   }
 }
-(() => {
-  const externalFolders = findI18nFolders('./node_modules/@yuuvis', ['schematics',]);
+function copyExternalLibs() {
+  const externalFolders = findI18nFolders('./node_modules/@yuuvis', ['schematics']);
   // copy external libs translations to i18n-external
   const externalOutputDir = path.join('.', 'i18n-external');
   copyTo(externalFolders, externalOutputDir).catch(console.error);
@@ -66,9 +74,11 @@ async function copyTo(directories, outputDir) {
       .filter((file) => file !== 'en.json')
       .forEach((file) => {
         const langFilePath = path.join(externalOutputDir, file);
-        const srcLangfile = JSON.parse(fs.readFileSync(langFilePath, {
-          encoding: 'utf-8',
-        }));
+        const srcLangfile = JSON.parse(
+          fs.readFileSync(langFilePath, {
+            encoding: 'utf-8'
+          }
+        ));
         const targetLangFile = {};
         refKeys.forEach((k) => {
           targetLangFile[k] = srcLangfile[k] || '';
@@ -76,8 +86,12 @@ async function copyTo(directories, outputDir) {
         fs.writeFileSync(langFilePath, JSON.stringify(targetLangFile, null, 2));
       });
   }
+  return externalOutputDir;
+}
+(() => {
   const outputDir = path.join('.', 'src', 'assets', '_yuuvis', 'i18n');
-  const localFolders = findI18nFolders('./projects', []);
+  const externalOutputDir = copyExternalLibs();
+  const localFolders = findI18nFolders('./projects');
   const clientFolders = findI18nFolders('./src', ['assets/_yuuvis']);
   copyTo([...localFolders, ...clientFolders, externalOutputDir], outputDir).catch(console.error);
 })();