@lang-tag/cli 0.15.0 → 0.16.0

package/index.cjs

@@ -9,8 +9,9 @@ const path = require("path");
 const globby = require("globby");
 const path$1 = require("pathe");
 const url = require("url");
-const namespaceCollector = require("./namespace-collector-DRnZvkDR.cjs");
+require("case");
 const process$1 = require("node:process");
+const flexibleImportAlgorithm = require("./flexible-import-algorithm-Fa-l4jWj.cjs");
 const acorn = require("acorn");
 const micromatch = require("micromatch");
 const chokidar = require("chokidar");
@@ -499,7 +500,7 @@ function isConfigSame(c1, c2) {
   return false;
 }
 const CONFIG_FILE_NAME = ".lang-tag.config.js";
-const EXPORTS_FILE_NAME = ".lang-tag.exports.json";
+const EXPORTS_FILE_NAME = "lang-tags.json";
 const LANG_TAG_DEFAULT_CONFIG = {
   tagName: "lang",
   isLibrary: false,
@@ -508,7 +509,7 @@ const LANG_TAG_DEFAULT_CONFIG = {
   localesDirectory: "locales",
   baseLanguageCode: "en",
   collect: {
-    collector: new namespaceCollector.NamespaceCollector(),
+    collector: new flexibleImportAlgorithm.NamespaceCollector(),
     defaultNamespace: "common",
     ignoreConflictsWithMatchingValues: true,
     onCollectConfigFix: ({ config, langTagConfig }) => {
@@ -528,12 +529,18 @@ const LANG_TAG_DEFAULT_CONFIG = {
   import: {
     dir: "src/lang-libraries",
     tagImportPath: 'import { lang } from "@/my-lang-tag-path"',
-    onImport: ({ importedRelativePath, fileGenerationData }, actions) => {
-      const exportIndex = (fileGenerationData.index || 0) + 1;
-      fileGenerationData.index = exportIndex;
-      actions.setFile(path$1.basename(importedRelativePath));
-      actions.setExportName(`translations${exportIndex}`);
-    }
+    onImport: flexibleImportAlgorithm.flexibleImportAlgorithm({
+      filePath: {
+        includePackageInPath: true
+      }
+    })
+    // onImport: ({importedRelativePath, fileGenerationData}: LangTagCLIOnImportParams, actions)=> {
+    //     const exportIndex = (fileGenerationData.index || 0) + 1;
+    //     fileGenerationData.index = exportIndex;
+    //
+    //     actions.setFile(path.basename(importedRelativePath));
+    //     actions.setExportName(`translations${exportIndex}`);
+    // }
   },
   translationArgPosition: 1,
   onConfigGeneration: async (event) => {
@@ -786,7 +793,7 @@ function printLines(lines, startLineNumber, errorLines = /* @__PURE__ */ new Set
 }
 async function getLangTagCodeSection(tagInfo) {
   const { tag, relativeFilePath } = tagInfo;
-  const fileContent = await namespaceCollector.$LT_ReadFileContent(relativeFilePath);
+  const fileContent = await flexibleImportAlgorithm.$LT_ReadFileContent(relativeFilePath);
   const fileLines = fileContent.split("\n");
   const startLine = tag.line;
   const endLine = tag.line + tag.fullMatch.split("\n").length - 1;
@@ -1042,20 +1049,20 @@ function deepMergeTranslations(target, source) {
 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) {
+  for (let collectionName of Object.keys(collections)) {
+    if (!collectionName) {
       continue;
     }
-    const filePath = await config.collect.collector.resolveCollectionFilePath(namespace);
+    const filePath = await config.collect.collector.resolveCollectionFilePath(collectionName);
     let originalJSON = {};
     try {
-      originalJSON = await namespaceCollector.$LT_ReadJSON(filePath);
+      originalJSON = await flexibleImportAlgorithm.$LT_ReadJSON(filePath);
     } catch (e) {
-      await config.collect.collector.onMissingCollection(namespace);
+      await config.collect.collector.onMissingCollection(collectionName);
     }
-    if (deepMergeTranslations(originalJSON, collections[namespace])) {
-      changedCollections.push(namespace);
-      await namespaceCollector.$LT_WriteJSON(filePath, originalJSON);
+    if (deepMergeTranslations(originalJSON, collections[collectionName])) {
+      changedCollections.push(collectionName);
+      await flexibleImportAlgorithm.$LT_WriteJSON(filePath, originalJSON);
     }
   }
   await config.collect.collector.postWrite(changedCollections);
@@ -1089,32 +1096,22 @@ async function $LT_CollectCandidateFilesWithTags(props) {
   return candidates;
 }
 async function $LT_WriteAsExportFile({ config, logger, files }) {
-  const packageJson = await namespaceCollector.$LT_ReadJSON(path.resolve(process.cwd(), "package.json"));
+  const packageJson = await flexibleImportAlgorithm.$LT_ReadJSON(path.resolve(process.cwd(), "package.json"));
   if (!packageJson) {
     throw new Error("package.json not found");
   }
-  const langTagFiles = {};
-  for (const file of files) {
-    langTagFiles[file.relativeFilePath] = {
-      matches: file.tags.map((tag) => {
-        let T = config.translationArgPosition === 1 ? tag.parameter1Text : tag.parameter2Text;
-        let C = config.translationArgPosition === 1 ? tag.parameter2Text : tag.parameter1Text;
-        if (!T) T = "{}";
-        if (!C) C = "{}";
-        return {
-          translations: T,
-          config: C,
-          variableName: tag.variableName
-        };
-      })
-    };
-  }
-  const data = {
-    language: config.baseLanguageCode,
-    packageName: packageJson.name || "",
-    files: langTagFiles
+  const exportData = {
+    baseLanguageCode: config.baseLanguageCode,
+    files: files.map(({ relativeFilePath, tags }) => ({
+      relativeFilePath,
+      tags: tags.map((tag) => ({
+        variableName: tag.variableName,
+        config: tag.parameterConfig,
+        translations: tag.parameterTranslations
+      }))
+    }))
   };
-  await namespaceCollector.$LT_WriteJSON(EXPORTS_FILE_NAME, data);
+  await promises.writeFile(EXPORTS_FILE_NAME, JSON.stringify(exportData), "utf-8");
   logger.success(`Written {file}`, { file: EXPORTS_FILE_NAME });
 }
 async function $LT_GroupTagsToCollections({ logger, files, config }) {
@@ -1485,115 +1482,189 @@ async function $LT_CMD_InitConfig() {
     logger.error(error?.message);
   }
 }
-function $LT_CollectNodeModulesExportFilePaths(logger) {
+async function $LT_CollectExportFiles(logger) {
   const nodeModulesPath = path$1.join(process$1.cwd(), "node_modules");
   if (!fs.existsSync(nodeModulesPath)) {
     logger.error('"node_modules" directory not found');
     return [];
   }
-  function findExportJson(dir, depth = 0, maxDepth = 3) {
-    if (depth > maxDepth) return [];
-    let results = [];
-    try {
-      const files = fs.readdirSync(dir);
-      for (const file of files) {
-        const fullPath = path$1.join(dir, file);
-        const stat = fs.statSync(fullPath);
-        if (stat.isDirectory()) {
-          results = results.concat(findExportJson(fullPath, depth + 1, maxDepth));
-        } else if (file === EXPORTS_FILE_NAME) {
-          results.push(fullPath);
-        }
+  const results = [];
+  try {
+    const exportFiles = await globby.globby([
+      `node_modules/**/${EXPORTS_FILE_NAME}`
+    ], {
+      cwd: process$1.cwd(),
+      onlyFiles: true,
+      ignore: ["**/node_modules/**/node_modules/**"],
+      deep: 4
+    });
+    for (const exportFile of exportFiles) {
+      const fullExportPath = path$1.resolve(exportFile);
+      const packageJsonPath = findPackageJsonForExport(fullExportPath, nodeModulesPath);
+      if (packageJsonPath) {
+        results.push({
+          exportPath: fullExportPath,
+          packageJsonPath
+        });
+      } else {
+        logger.warn("Found export file but could not match package.json: {exportPath}", {
+          exportPath: fullExportPath
+        });
       }
-    } catch (error) {
-      logger.error('Error reading directory "{dir}": {error}', {
-        dir,
-        error: String(error)
-      });
     }
-    return results;
+    logger.debug("Found {count} export files with matching package.json in node_modules", {
+      count: results.length
+    });
+  } catch (error) {
+    logger.error("Error scanning node_modules with globby: {error}", {
+      error: String(error)
+    });
   }
-  return findExportJson(nodeModulesPath);
+  return results;
 }
-async function $LT_ImportLibraries(config, logger) {
-  const files = $LT_CollectNodeModulesExportFilePaths(logger);
-  const generationFiles = {};
-  for (const filePath of files) {
-    const exportData = await namespaceCollector.$LT_ReadJSON(filePath);
-    for (let langTagFilePath in exportData.files) {
-      const fileGenerationData = {};
-      const matches = exportData.files[langTagFilePath].matches;
-      for (let match of matches) {
-        let parsedTranslations = typeof match.translations === "string" ? JSON5.parse(match.translations) : match.translations;
-        let parsedConfig = typeof match.config === "string" ? JSON5.parse(match.config) : match.config === void 0 ? {} : match.config;
-        let file = langTagFilePath;
-        let exportName = match.variableName || "";
-        config.import.onImport({
-          packageName: exportData.packageName,
-          importedRelativePath: langTagFilePath,
-          originalExportName: match.variableName,
-          translations: parsedTranslations,
-          config: parsedConfig,
-          fileGenerationData
-        }, {
-          setFile: (f) => {
-            file = f;
-          },
-          setExportName: (name) => {
-            exportName = name;
-          },
-          setConfig: (newConfig) => {
-            parsedConfig = newConfig;
-          }
-        });
-        if (!file || !exportName) {
-          throw new Error(`[lang-tag] onImport did not set fileName or exportName for package: ${exportData.packageName}, file: '${file}' (original: '${langTagFilePath}'), exportName: '${exportName}' (original: ${match.variableName})`);
-        }
-        let exports2 = generationFiles[file];
-        if (!exports2) {
-          exports2 = {};
-          generationFiles[file] = exports2;
-        }
-        const param1 = config.translationArgPosition === 1 ? parsedTranslations : parsedConfig;
-        const param2 = config.translationArgPosition === 1 ? parsedConfig : parsedTranslations;
-        exports2[exportName] = `${config.tagName}(${JSON5.stringify(param1, void 0, 4)}, ${JSON5.stringify(param2, void 0, 4)})`;
+function findPackageJsonForExport(exportPath, nodeModulesPath) {
+  const relativePath = path$1.relative(nodeModulesPath, exportPath);
+  const pathParts = relativePath.split(path$1.sep);
+  if (pathParts.length < 2) {
+    return null;
+  }
+  if (pathParts[0].startsWith("@")) {
+    if (pathParts.length >= 3) {
+      const packageDir = path$1.join(nodeModulesPath, pathParts[0], pathParts[1]);
+      const packageJsonPath = path$1.join(packageDir, "package.json");
+      if (fs.existsSync(packageJsonPath)) {
+        return packageJsonPath;
       }
     }
+  } else {
+    const packageDir = path$1.join(nodeModulesPath, pathParts[0]);
+    const packageJsonPath = path$1.join(packageDir, "package.json");
+    if (fs.existsSync(packageJsonPath)) {
+      return packageJsonPath;
+    }
   }
-  for (let fileName of Object.keys(generationFiles)) {
+  return null;
+}
+const __filename$1 = url.fileURLToPath(typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("index.cjs", document.baseURI).href);
+const __dirname$1 = path.dirname(__filename$1);
+const templatePath = path.join(__dirname$1, "templates", "import", "imported-tag.mustache");
+const template = fs.readFileSync(templatePath, "utf-8");
+function renderTemplate$1(data) {
+  return mustache.render(template, data, {}, { escape: (text) => text });
+}
+async function generateImportFiles(config, logger, importManager) {
+  const importedFiles = importManager.getImportedFiles();
+  for (const importedFile of importedFiles) {
     const filePath = path$1.resolve(
       process__namespace.cwd(),
       config.import.dir,
-      fileName
+      importedFile.pathRelativeToImportDir
     );
-    const exports2 = Object.entries(generationFiles[fileName]).map(([name, tag]) => {
-      return `export const ${name} = ${tag};`;
-    }).join("\n\n");
-    const content = `${config.import.tagImportPath}
-
-${exports2}`;
-    await namespaceCollector.$LT_EnsureDirectoryExists(path$1.dirname(filePath));
+    const processedExports = importedFile.tags.map((tag) => {
+      const parameter1 = config.translationArgPosition === 1 ? tag.translations : tag.config;
+      const parameter2 = config.translationArgPosition === 1 ? tag.config : tag.translations;
+      const hasParameter2 = parameter2 !== null && parameter2 !== void 0 && (typeof parameter2 !== "object" || Object.keys(parameter2).length > 0);
+      return {
+        name: tag.variableName,
+        parameter1: JSON5.stringify(parameter1, void 0, 4),
+        parameter2: hasParameter2 ? JSON5.stringify(parameter2, void 0, 4) : null,
+        hasParameter2,
+        config: {
+          tagName: config.tagName
+        }
+      };
+    });
+    const templateData = {
+      tagImportPath: config.import.tagImportPath,
+      exports: processedExports
+    };
+    const content = renderTemplate$1(templateData);
+    await flexibleImportAlgorithm.$LT_EnsureDirectoryExists(path.dirname(filePath));
     await promises.writeFile(filePath, content, "utf-8");
-    logger.success('Imported node_modules file: "{fileName}"', { fileName });
+    logger.success('Created tag file: "{file}"', { file: importedFile.pathRelativeToImportDir });
+  }
+}
+class ImportManager {
+  importedFiles = [];
+  constructor() {
+    this.importedFiles = [];
+  }
+  importTag(pathRelativeToImportDir, tag) {
+    if (!pathRelativeToImportDir) {
+      throw new Error(`pathRelativeToImportDir required, got: ${pathRelativeToImportDir}`);
+    }
+    if (!tag?.variableName) {
+      throw new Error(`tag.variableName required, got: ${tag?.variableName}`);
+    }
+    if (!this.isValidJavaScriptIdentifier(tag.variableName)) {
+      throw new Error(`Invalid JavaScript identifier: "${tag.variableName}". Variable names must start with a letter, underscore, or dollar sign, and contain only letters, digits, underscores, and dollar signs.`);
+    }
+    if (tag.translations == null) {
+      throw new Error(`tag.translations required`);
+    }
+    let importedFile = this.importedFiles.find(
+      (file) => file.pathRelativeToImportDir === pathRelativeToImportDir
+    );
+    if (importedFile) {
+      const duplicateTag = importedFile.tags.find(
+        (existingTag) => existingTag.variableName === tag.variableName
+      );
+      if (duplicateTag) {
+        throw new Error(`Duplicate variable name "${tag.variableName}" in file "${pathRelativeToImportDir}". Variable names must be unique within the same file.`);
+      }
+    }
+    if (!importedFile) {
+      importedFile = { pathRelativeToImportDir, tags: [] };
+      this.importedFiles.push(importedFile);
+    }
+    importedFile.tags.push(tag);
+  }
+  getImportedFiles() {
+    return [...this.importedFiles];
+  }
+  getImportedFilesCount() {
+    return this.importedFiles.length;
   }
+  hasImportedFiles() {
+    return this.importedFiles.length > 0;
+  }
+  isValidJavaScriptIdentifier(name) {
+    return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(name);
+  }
+}
+async function $LT_ImportLibraries(config, logger) {
+  const exportFiles = await $LT_CollectExportFiles(logger);
+  const importManager = new ImportManager();
+  let exports2 = [];
+  for (const { exportPath, packageJsonPath } of exportFiles) {
+    const exportData = await flexibleImportAlgorithm.$LT_ReadJSON(exportPath);
+    const packageJSON = await flexibleImportAlgorithm.$LT_ReadJSON(packageJsonPath);
+    exports2.push({ packageJSON, exportData });
+  }
+  config.import.onImport({ exports: exports2, importManager, logger, langTagConfig: config });
+  if (!importManager.hasImportedFiles()) {
+    logger.warn("No tags were imported from any library files");
+    return;
+  }
+  await generateImportFiles(config, logger, importManager);
   if (config.import.onImportFinish) config.import.onImportFinish();
 }
 async function $LT_ImportTranslations() {
   const { config, logger } = await $LT_GetCommandEssentials();
-  await namespaceCollector.$LT_EnsureDirectoryExists(config.import.dir);
+  await flexibleImportAlgorithm.$LT_EnsureDirectoryExists(config.import.dir);
   logger.info("Importing translations from libraries...");
   await $LT_ImportLibraries(config, logger);
   logger.success("Successfully imported translations from libraries.");
 }
-function renderTemplate(template, data) {
-  return mustache.render(template, data, {}, { escape: (text) => text });
+function renderTemplate(template2, data) {
+  return mustache.render(template2, data, {}, { escape: (text) => text });
 }
 function loadTemplate(templateName) {
-  const __filename = url.fileURLToPath(typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("index.cjs", document.baseURI).href);
-  const __dirname = path.dirname(__filename);
-  const templatePath = path.join(__dirname, "template", `${templateName}.mustache`);
+  const __filename2 = url.fileURLToPath(typeof document === "undefined" ? require("url").pathToFileURL(__filename2).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("index.cjs", document.baseURI).href);
+  const __dirname = path.dirname(__filename2);
+  const templatePath2 = path.join(__dirname, "templates", "tag", `${templateName}.mustache`);
   try {
-    return fs.readFileSync(templatePath, "utf-8");
+    return fs.readFileSync(templatePath2, "utf-8");
   } catch (error) {
     throw new Error(`Failed to load template ${templateName}: ${error}`);
   }
@@ -1681,7 +1752,7 @@ async function $LT_CMD_InitTagFile(options = {}) {
     return;
   }
   try {
-    await namespaceCollector.$LT_WriteFileWithDirs(outputPath, renderedContent);
+    await flexibleImportAlgorithm.$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 });