@lang-tag/cli 0.13.1 → 0.15.0

package/index.cjs

@@ -9,6 +9,7 @@ const path = require("path");
 const globby = require("globby");
 const path$1 = require("pathe");
 const url = require("url");
+const namespaceCollector = require("./namespace-collector-DRnZvkDR.cjs");
 const process$1 = require("node:process");
 const acorn = require("acorn");
 const micromatch = require("micromatch");
@@ -80,31 +81,33 @@ class $LT_TagProcessor {
         while (i < fileContent.length && (fileContent[i] === " " || fileContent[i] === "\n" || fileContent[i] === "	")) {
           i++;
         }
-        if (i >= fileContent.length || fileContent[i] !== "{") {
-          currentIndex = matchStartIndex + 1;
-          continue;
-        }
-        braceCount = 1;
-        const secondParamStart = i;
-        i++;
-        while (i < fileContent.length && braceCount > 0) {
-          if (fileContent[i] === "{") braceCount++;
-          if (fileContent[i] === "}") braceCount--;
-          i++;
-        }
-        if (braceCount !== 0) {
-          currentIndex = matchStartIndex + 1;
-          continue;
-        }
-        parameter2Text = fileContent.substring(secondParamStart, i);
-        while (i < fileContent.length && (fileContent[i] === " " || fileContent[i] === "\n" || fileContent[i] === "	")) {
-          i++;
-        }
-        if (i < fileContent.length && fileContent[i] === ",") {
+        if (i >= fileContent.length || fileContent[i] === ")") ;
+        else if (fileContent[i] === "{") {
+          braceCount = 1;
+          const secondParamStart = i;
           i++;
+          while (i < fileContent.length && braceCount > 0) {
+            if (fileContent[i] === "{") braceCount++;
+            if (fileContent[i] === "}") braceCount--;
+            i++;
+          }
+          if (braceCount !== 0) {
+            currentIndex = matchStartIndex + 1;
+            continue;
+          }
+          parameter2Text = fileContent.substring(secondParamStart, i);
           while (i < fileContent.length && (fileContent[i] === " " || fileContent[i] === "\n" || fileContent[i] === "	")) {
             i++;
           }
+          if (i < fileContent.length && fileContent[i] === ",") {
+            i++;
+            while (i < fileContent.length && (fileContent[i] === " " || fileContent[i] === "\n" || fileContent[i] === "	")) {
+              i++;
+            }
+          }
+        } else {
+          currentIndex = matchStartIndex + 1;
+          continue;
         }
       } else if (fileContent[i] !== ")") {
         currentIndex = matchStartIndex + 1;
@@ -499,10 +502,13 @@ const CONFIG_FILE_NAME = ".lang-tag.config.js";
 const EXPORTS_FILE_NAME = ".lang-tag.exports.json";
 const LANG_TAG_DEFAULT_CONFIG = {
   tagName: "lang",
+  isLibrary: false,
   includes: ["src/**/*.{js,ts,jsx,tsx}"],
   excludes: ["node_modules", "dist", "build"],
-  outputDir: "locales/en",
+  localesDirectory: "locales",
+  baseLanguageCode: "en",
   collect: {
+    collector: new namespaceCollector.NamespaceCollector(),
     defaultNamespace: "common",
     ignoreConflictsWithMatchingValues: true,
     onCollectConfigFix: ({ config, langTagConfig }) => {
@@ -529,8 +535,6 @@ const LANG_TAG_DEFAULT_CONFIG = {
       actions.setExportName(`translations${exportIndex}`);
     }
   },
-  isLibrary: false,
-  language: "en",
   translationArgPosition: 1,
   onConfigGeneration: async (event) => {
   }
@@ -547,10 +551,10 @@ async function $LT_ReadConfig(projectPath) {
     }
     const userConfig = configModule.default || {};
     const tn = (userConfig.tagName || "").toLowerCase().replace(/[-_\s]/g, "");
-    if (tn.includes("langtag")) {
-      throw new Error('Custom tagName cannot include "langtag"! (It is not recommended for use with libraries)\n');
+    if (tn === "langtag" || tn === "lang-tag") {
+      throw new Error('Custom tagName cannot be "lang-tag" or "langtag"! (It is not recommended for use with libraries)\n');
     }
-    return {
+    const config = {
       ...LANG_TAG_DEFAULT_CONFIG,
       ...userConfig,
       import: {
@@ -562,39 +566,14 @@ async function $LT_ReadConfig(projectPath) {
         ...userConfig.collect
       }
     };
+    if (!config.collect.collector) {
+      throw new Error("Collector not found! (config.collect.collector)");
+    }
+    return config;
   } catch (error) {
     throw error;
   }
 }
-async function $LT_EnsureDirectoryExists(filePath) {
-  await promises.mkdir(filePath, { recursive: true });
-}
-async function $LT_RemoveDirectory(dirPath) {
-  try {
-    await promises.rm(dirPath, { recursive: true, force: true });
-  } catch (error) {
-  }
-}
-async function $LT_WriteJSON(filePath, data) {
-  await promises.writeFile(filePath, JSON.stringify(data, null, 2), "utf-8");
-}
-async function $LT_ReadJSON(filePath) {
-  const content = await promises.readFile(filePath, "utf-8");
-  return JSON.parse(content);
-}
-async function $LT_WriteFileWithDirs(filePath, content) {
-  const dir = path.dirname(filePath);
-  try {
-    await promises.mkdir(dir, { recursive: true });
-  } catch (error) {
-  }
-  await promises.writeFile(filePath, content, "utf-8");
-}
-async function $LT_ReadFileContent(relativeFilePath) {
-  const cwd = process.cwd();
-  const absolutePath = path.resolve(cwd, relativeFilePath);
-  return await promises.readFile(absolutePath, "utf-8");
-}
 function parseObjectAST(code) {
   const nodes = [];
   try {
@@ -807,7 +786,7 @@ function printLines(lines, startLineNumber, errorLines = /* @__PURE__ */ new Set
 }
 async function getLangTagCodeSection(tagInfo) {
   const { tag, relativeFilePath } = tagInfo;
-  const fileContent = await $LT_ReadFileContent(relativeFilePath);
+  const fileContent = await namespaceCollector.$LT_ReadFileContent(relativeFilePath);
   const fileLines = fileContent.split("\n");
   const startLine = tag.line;
   const endLine = tag.line + tag.fullMatch.split("\n").length - 1;
@@ -996,6 +975,8 @@ function $LT_CreateDefaultLogger(debugMode, translationArgPosition = 1) {
 async function $LT_GetCommandEssentials() {
   const config = await $LT_ReadConfig(process$1.cwd());
   const logger = $LT_CreateDefaultLogger(config.debug, config.translationArgPosition);
+  config.collect.collector.config = config;
+  config.collect.collector.logger = logger;
   return {
     config,
     logger
@@ -1058,36 +1039,26 @@ function deepMergeTranslations(target, source) {
   }
   return changed;
 }
-async function $LT_WriteToNamespaces({ config, namespaces, logger, clean }) {
-  const changedNamespaces = [];
-  if (clean) {
-    logger.info("Cleaning output directory...");
-    await $LT_RemoveDirectory(config.outputDir);
-  }
-  await $LT_EnsureDirectoryExists(config.outputDir);
-  for (let namespace of Object.keys(namespaces)) {
+async function $LT_WriteToCollections({ config, collections, logger, clean }) {
+  await config.collect.collector.preWrite(clean);
+  const changedCollections = [];
+  for (let namespace of Object.keys(collections)) {
     if (!namespace) {
       continue;
     }
-    const filePath = path$1.resolve(
-      process$1.cwd(),
-      config.outputDir,
-      namespace + ".json"
-    );
+    const filePath = await config.collect.collector.resolveCollectionFilePath(namespace);
     let originalJSON = {};
     try {
-      originalJSON = await $LT_ReadJSON(filePath);
+      originalJSON = await namespaceCollector.$LT_ReadJSON(filePath);
     } catch (e) {
-      if (!clean) {
-        logger.warn(`Original namespace file "{namespace}.json" not found. A new one will be created.`, { namespace });
-      }
+      await config.collect.collector.onMissingCollection(namespace);
     }
-    if (deepMergeTranslations(originalJSON, namespaces[namespace])) {
-      changedNamespaces.push(namespace);
-      await $LT_WriteJSON(filePath, originalJSON);
+    if (deepMergeTranslations(originalJSON, collections[namespace])) {
+      changedCollections.push(namespace);
+      await namespaceCollector.$LT_WriteJSON(filePath, originalJSON);
     }
   }
-  return changedNamespaces;
+  await config.collect.collector.postWrite(changedCollections);
 }
 async function $LT_CollectCandidateFilesWithTags(props) {
   const { config, logger } = props;
@@ -1118,7 +1089,7 @@ async function $LT_CollectCandidateFilesWithTags(props) {
   return candidates;
 }
 async function $LT_WriteAsExportFile({ config, logger, files }) {
-  const packageJson = await $LT_ReadJSON(path.resolve(process.cwd(), "package.json"));
+  const packageJson = await namespaceCollector.$LT_ReadJSON(path.resolve(process.cwd(), "package.json"));
   if (!packageJson) {
     throw new Error("package.json not found");
   }
@@ -1139,30 +1110,32 @@ async function $LT_WriteAsExportFile({ config, logger, files }) {
     };
   }
   const data = {
-    language: config.language,
+    language: config.baseLanguageCode,
     packageName: packageJson.name || "",
     files: langTagFiles
   };
-  await $LT_WriteJSON(EXPORTS_FILE_NAME, data);
+  await namespaceCollector.$LT_WriteJSON(EXPORTS_FILE_NAME, data);
   logger.success(`Written {file}`, { file: EXPORTS_FILE_NAME });
 }
-async function $LT_GroupTagsToNamespaces({ logger, files, config }) {
+async function $LT_GroupTagsToCollections({ logger, files, config }) {
   let totalTags = 0;
-  const namespaces = {};
-  function getTranslations(namespace) {
-    const namespaceTranslations = namespaces[namespace] || {};
-    if (!(namespace in namespaces)) {
-      namespaces[namespace] = namespaceTranslations;
+  const collections = {};
+  function getTranslationsCollection(namespace) {
+    const collectionName = config.collect.collector.aggregateCollection(namespace);
+    const collection = collections[collectionName] || {};
+    if (!(collectionName in collections)) {
+      collections[collectionName] = collection;
     }
-    return namespaceTranslations;
+    return collection;
   }
   const allConflicts = [];
   const existingValuesByNamespace = /* @__PURE__ */ new Map();
   for (const file of files) {
     totalTags += file.tags.length;
-    for (const tag of file.tags) {
+    for (const _tag of file.tags) {
+      const tag = config.collect.collector.transformTag(_tag);
       const tagConfig = tag.parameterConfig;
-      const namespaceTranslations = getTranslations(tagConfig.namespace);
+      const collection = getTranslationsCollection(tagConfig.namespace);
       let existingValues = existingValuesByNamespace.get(tagConfig.namespace);
       if (!existingValues) {
         existingValues = /* @__PURE__ */ new Map();
@@ -1205,7 +1178,7 @@ async function $LT_GroupTagsToNamespaces({ logger, files, config }) {
       };
       const target = await ensureNestedObject(
         tagConfig.path,
-        namespaceTranslations,
+        collection,
         valueTracker,
         addConflict
       );
@@ -1225,7 +1198,7 @@ async function $LT_GroupTagsToNamespaces({ logger, files, config }) {
     let shouldContinue = true;
     config.collect.onCollectFinish({
       totalTags,
-      namespaces,
+      namespaces: collections,
       conflicts: allConflicts,
       logger,
       exit() {
@@ -1236,11 +1209,11 @@ async function $LT_GroupTagsToNamespaces({ logger, files, config }) {
       throw new Error(`LangTagConflictResolution:Processing stopped due to collect finish handler`);
     }
   }
-  return namespaces;
+  return collections;
 }
-async function ensureNestedObject(path2, root, valueTracker, addConflict) {
-  if (!path2 || !path2.trim()) return root;
-  let current = root;
+async function ensureNestedObject(path2, rootCollection, valueTracker, addConflict) {
+  if (!path2 || !path2.trim()) return rootCollection;
+  let current = rootCollection;
   let currentPath = "";
   for (const key of path2.split(".")) {
     currentPath = currentPath ? `${currentPath}.${key}` : key;
@@ -1340,19 +1313,10 @@ async function $LT_CMD_Collect(options) {
     return;
   }
   try {
-    const namespaces = await $LT_GroupTagsToNamespaces({ logger, files, config });
+    const collections = await $LT_GroupTagsToCollections({ logger, files, config });
     const totalTags = files.reduce((sum, file) => sum + file.tags.length, 0);
     logger.debug("Found {totalTags} translation tags", { totalTags });
-    const changedNamespaces = await $LT_WriteToNamespaces({ config, namespaces, logger, clean: options?.clean });
-    if (!changedNamespaces?.length) {
-      logger.info("No changes were made based on the current configuration and files");
-      return;
-    }
-    const n = changedNamespaces.map((n2) => `"${n2}.json"`).join(", ");
-    logger.success("Updated namespaces {outputDir} ({namespaces})", {
-      outputDir: config.outputDir,
-      namespaces: n
-    });
+    await $LT_WriteToCollections({ config, collections, logger, clean: options?.clean });
   } catch (e) {
     const prefix = "LangTagConflictResolution:";
     if (e.message.startsWith(prefix)) {
@@ -1418,15 +1382,8 @@ async function handleFile(config, logger, cwdRelativeFilePath, event) {
   const absoluteFilePath = path.join(cwd, cwdRelativeFilePath);
   await checkAndRegenerateFileLangTags(config, logger, absoluteFilePath, cwdRelativeFilePath);
   const files = await $LT_CollectCandidateFilesWithTags({ filesToScan: [cwdRelativeFilePath], config, logger });
-  const namespaces = await $LT_GroupTagsToNamespaces({ logger, files, config });
-  const changedNamespaces = await $LT_WriteToNamespaces({ config, namespaces, logger });
-  if (changedNamespaces.length > 0) {
-    const n = changedNamespaces.map((n2) => `"${n2}.json"`).join(", ");
-    logger.success("Updated namespaces {outputDir} ({namespaces})", {
-      outputDir: config.outputDir,
-      namespaces: n
-    });
-  }
+  const namespaces = await $LT_GroupTagsToCollections({ logger, files, config });
+  await $LT_WriteToCollections({ config, collections: namespaces, logger });
 }
 async function detectModuleSystem() {
   const packageJsonPath = path.join(process.cwd(), "package.json");
@@ -1466,7 +1423,13 @@ const generationAlgorithm = pathBasedConfigGenerator({
     //         },
     //         admin: {
     //             '>': 'management', // rename "admin" to "management"
-    //             users: false       // ignore "users"
+    //             users: false       // ignore "users",
+    //             ui: {
+    //                 '>>': {        // 'redirect' - ignore everything, jump to 'ui' namespace and prefix all paths with 'admin'
+    //                     namespace: 'ui',
+    //                     pathPrefix: 'admin'
+    //                 }
+    //             }
     //         }
     //     }
     // }
@@ -1479,7 +1442,8 @@ const config = {
     isLibrary: false,
     includes: ['src/**/*.{js,ts,jsx,tsx}'],
     excludes: ['node_modules', 'dist', 'build', '**/*.test.ts'],
-    outputDir: 'public/locales/en',
+    localesDirectory: 'public/locales',
+    baseLanguageCode: 'en',
     onConfigGeneration: async event => {
         // We do not modify imported configurations
         if (event.isImportedLibrary) return;
@@ -1555,7 +1519,7 @@ async function $LT_ImportLibraries(config, logger) {
   const files = $LT_CollectNodeModulesExportFilePaths(logger);
   const generationFiles = {};
   for (const filePath of files) {
-    const exportData = await $LT_ReadJSON(filePath);
+    const exportData = await namespaceCollector.$LT_ReadJSON(filePath);
     for (let langTagFilePath in exportData.files) {
       const fileGenerationData = {};
       const matches = exportData.files[langTagFilePath].matches;
@@ -1608,7 +1572,7 @@ async function $LT_ImportLibraries(config, logger) {
     const content = `${config.import.tagImportPath}
 
 ${exports2}`;
-    await $LT_EnsureDirectoryExists(path$1.dirname(filePath));
+    await namespaceCollector.$LT_EnsureDirectoryExists(path$1.dirname(filePath));
     await promises.writeFile(filePath, content, "utf-8");
     logger.success('Imported node_modules file: "{fileName}"', { fileName });
   }
@@ -1616,7 +1580,7 @@ ${exports2}`;
 }
 async function $LT_ImportTranslations() {
   const { config, logger } = await $LT_GetCommandEssentials();
-  await $LT_EnsureDirectoryExists(config.import.dir);
+  await namespaceCollector.$LT_EnsureDirectoryExists(config.import.dir);
   logger.info("Importing translations from libraries...");
   await $LT_ImportLibraries(config, logger);
   logger.success("Successfully imported translations from libraries.");
@@ -1717,7 +1681,7 @@ async function $LT_CMD_InitTagFile(options = {}) {
     return;
   }
   try {
-    await $LT_WriteFileWithDirs(outputPath, renderedContent);
+    await namespaceCollector.$LT_WriteFileWithDirs(outputPath, renderedContent);
     logger.success("Lang-tag file created successfully: {outputPath}", { outputPath });
     logger.info("Next steps:");
     logger.info("1. Import the {tagName} function in your files:", { tagName: renderOptions.tagName });