@lang-tag/cli 0.18.0 → 0.19.0

package/algorithms/index.cjs

@@ -35,7 +35,7 @@ function applyCaseTransform(str, caseType) {
 }
 class DictionaryCollector extends namespaceCollector.TranslationsCollector {
   constructor(options = {
-    appendNamespaceToPath: false
+    appendNamespaceToPath: true
   }) {
     super();
     this.options = options;

package/algorithms/index.js

@@ -17,7 +17,7 @@ function applyCaseTransform(str, caseType) {
 }
 class DictionaryCollector extends TranslationsCollector {
   constructor(options = {
-    appendNamespaceToPath: false
+    appendNamespaceToPath: true
   }) {
     super();
     this.options = options;

package/index.cjs

@@ -102,22 +102,83 @@ class $LT_TagProcessor {
     const matches = [];
     let currentIndex = 0;
     const skipRanges = this.buildSkipRanges(fileContent);
-    const startPattern = new RegExp(
-      `${optionalVariableAssignment}${tagName}\\(\\s*\\{`,
+    const tagNamePattern = new RegExp(
+      `${optionalVariableAssignment}${tagName}`,
       "g"
     );
     while (true) {
-      startPattern.lastIndex = currentIndex;
-      const startMatch = startPattern.exec(fileContent);
-      if (!startMatch) break;
-      const matchStartIndex = startMatch.index;
-      const variableName = startMatch[1] || void 0;
+      tagNamePattern.lastIndex = currentIndex;
+      const tagNameMatch = tagNamePattern.exec(fileContent);
+      if (!tagNameMatch) break;
+      const tagNameStartIndex = tagNameMatch.index;
+      const variableName = tagNameMatch[1] || void 0;
+      if (this.isInSkipRange(tagNameStartIndex, skipRanges)) {
+        currentIndex = tagNameStartIndex + 1;
+        continue;
+      }
+      let i = tagNameStartIndex + tagNameMatch[0].length;
+      let genericType = void 0;
+      let matchStartIndex = tagNameStartIndex;
+      while (i < fileContent.length && /\s/.test(fileContent[i])) {
+        i++;
+      }
+      if (i < fileContent.length && fileContent[i] === "<") {
+        const genericStart = i;
+        let angleCount = 1;
+        i++;
+        while (i < fileContent.length && angleCount > 0) {
+          const char = fileContent[i];
+          if (char === "<") angleCount++;
+          else if (char === ">") angleCount--;
+          else if ((char === '"' || char === "'" || char === "`") && !this.isInSkipRange(i, skipRanges)) {
+            i++;
+            while (i < fileContent.length) {
+              if (fileContent[i] === "\\") {
+                i += 2;
+                continue;
+              }
+              if (fileContent[i] === char) {
+                i++;
+                break;
+              }
+              i++;
+            }
+            continue;
+          }
+          i++;
+        }
+        if (angleCount === 0) {
+          genericType = fileContent.substring(genericStart + 1, i - 1).trim();
+          matchStartIndex = tagNameStartIndex;
+        } else {
+          currentIndex = tagNameStartIndex + 1;
+          continue;
+        }
+      } else {
+        matchStartIndex = tagNameStartIndex;
+      }
+      while (i < fileContent.length && /\s/.test(fileContent[i])) {
+        i++;
+      }
+      if (i >= fileContent.length || fileContent[i] !== "(" || i + 1 >= fileContent.length) {
+        currentIndex = tagNameStartIndex + 1;
+        continue;
+      }
+      i++;
+      while (i < fileContent.length && /\s/.test(fileContent[i])) {
+        i++;
+      }
+      if (i >= fileContent.length || fileContent[i] !== "{") {
+        currentIndex = tagNameStartIndex + 1;
+        continue;
+      }
+      const braceStartIndex = i;
       if (this.isInSkipRange(matchStartIndex, skipRanges)) {
         currentIndex = matchStartIndex + 1;
         continue;
       }
       let braceCount = 1;
-      let i = matchStartIndex + startMatch[0].length;
+      i++;
       while (i < fileContent.length && braceCount > 0) {
         if (fileContent[i] === "{") braceCount++;
         if (fileContent[i] === "}") braceCount--;
@@ -127,10 +188,7 @@ class $LT_TagProcessor {
         currentIndex = matchStartIndex + 1;
         continue;
       }
-      let parameter1Text = fileContent.substring(
-        matchStartIndex + startMatch[0].length - 1,
-        i
-      );
+      let parameter1Text = fileContent.substring(braceStartIndex, i);
       let parameter2Text;
       while (i < fileContent.length && (fileContent[i] === " " || fileContent[i] === "\n" || fileContent[i] === "	")) {
         i++;
@@ -225,6 +283,7 @@ class $LT_TagProcessor {
       matches.push({
         fullMatch,
         variableName,
+        genericType,
         parameter1Text,
         parameter2Text,
         parameterTranslations,
@@ -278,7 +337,8 @@ class $LT_TagProcessor {
       }
       const arg1 = this.config.translationArgPosition === 1 ? newTranslationsString : newConfigString;
       const arg2 = this.config.translationArgPosition === 1 ? newConfigString : newTranslationsString;
-      let tagFunction = `${this.config.tagName}(${arg1}`;
+      const genericTypePart = tag.genericType ? `<${tag.genericType}>` : "";
+      let tagFunction = `${this.config.tagName}${genericTypePart}(${arg1}`;
       if (arg2) tagFunction += `, ${arg2}`;
       tagFunction += ")";
       if (tag.variableName)
@@ -1581,9 +1641,11 @@ async function generateImportFiles(config, logger, importManager) {
     const content = renderTemplate$2(templateData);
     await $LT_EnsureDirectoryExists(path.dirname(filePath));
     await promises.writeFile(filePath, content, "utf-8");
+    const encodedFilePath = encodeURI(filePath);
     logger.success('Created tag file: "{file}"', {
       file: importedFile.pathRelativeToImportDir
     });
+    logger.debug(" └── link: file://{path}", { path: encodedFilePath });
   }
 }
 class ImportManager {
@@ -1661,12 +1723,12 @@ async function $LT_ImportLibraries(config, logger) {
     logger.warn("No tags were imported from any library files");
     return;
   }
+  await $LT_EnsureDirectoryExists(config.import.dir);
   await generateImportFiles(config, logger, importManager);
   if (config.import.onImportFinish) config.import.onImportFinish();
 }
 async function $LT_ImportTranslations() {
   const { config, logger } = await $LT_GetCommandEssentials();
-  await $LT_EnsureDirectoryExists(config.import.dir);
   logger.info("Importing translations from libraries...");
   await $LT_ImportLibraries(config, logger);
   logger.success("Successfully imported translations from libraries.");
@@ -1722,6 +1784,28 @@ function detectProjectDirectories() {
   }
   return detectedFolders.length > 0 ? detectedFolders.sort() : ["src", "app"];
 }
+function getDefaultAnswers() {
+  return {
+    projectType: "project",
+    tagName: "lang",
+    collectorType: "namespace",
+    namespaceOptions: {
+      modifyNamespaceOptions: false,
+      defaultNamespace: "common"
+    },
+    localesDirectory: "public/locales",
+    configGeneration: {
+      enabled: true,
+      useAlgorithm: "path-based",
+      keepVariables: true
+    },
+    importLibraries: true,
+    interfereWithCollection: false,
+    includeDirectories: ["src"],
+    baseLanguageCode: "en",
+    addCommentGuides: false
+  };
+}
 async function askProjectSetupQuestions() {
   const projectType = await select({
     message: "Is this a project or a library?",
@@ -1975,7 +2059,7 @@ async function detectModuleSystem() {
     return "cjs";
   }
 }
-async function $LT_CMD_InitConfig() {
+async function $LT_CMD_InitConfig(options = {}) {
   const logger = $LT_CreateDefaultLogger();
   if (fs.existsSync(CONFIG_FILE_NAME)) {
     logger.error(
@@ -1987,7 +2071,10 @@ async function $LT_CMD_InitConfig() {
   logger.info("Welcome to Lang Tag CLI Setup!");
   console.log("");
   try {
-    const answers = await askProjectSetupQuestions();
+    const answers = options.yes ? getDefaultAnswers() : await askProjectSetupQuestions();
+    if (options.yes) {
+      logger.info("Using default configuration (--yes flag detected)...");
+    }
     const moduleSystem = await detectModuleSystem();
     const configContent = renderConfigTemplate({
       answers,
@@ -2003,13 +2090,13 @@ async function $LT_CMD_InitConfig() {
       configFile: CONFIG_FILE_NAME
     });
     logger.info(
-      "  2. Since you have installed all basic libraries (React, TypeScript, etc.)"
+      "  2. Ensure all dependencies are installed (TypeScript, React, etc.),"
     );
     logger.info(
-      "     and the initialized basic tag is based on what you use in your project,"
+      '     then run "npx lang-tag init-tag" to generate an initial tag'
     );
     logger.info(
-      '     we recommend using "npx lang-tag init-tag" to generate an initial version of the tag'
+      "     (the tag will be based on what libraries you have in your project)"
     );
     logger.info(
       "  3. Use your tag in the project under the include directories"
@@ -2358,7 +2445,7 @@ function createCli() {
   commander.program.command("watch").alias("w").description(
     "Watch for changes in source files and automatically collect translations"
   ).action($LT_WatchTranslations);
-  commander.program.command("init").description("Initialize project with default configuration").action($LT_CMD_InitConfig);
+  commander.program.command("init").description("Initialize project with default configuration").option("-y, --yes", "Skip prompts and use default configuration").action($LT_CMD_InitConfig);
   commander.program.command("init-tag").description("Initialize a new lang-tag function file").option(
     "-n, --name <name>",
     "Name of the tag function (default: from config)"

package/index.js

@@ -82,22 +82,83 @@ class $LT_TagProcessor {
     const matches = [];
     let currentIndex = 0;
     const skipRanges = this.buildSkipRanges(fileContent);
-    const startPattern = new RegExp(
-      `${optionalVariableAssignment}${tagName}\\(\\s*\\{`,
+    const tagNamePattern = new RegExp(
+      `${optionalVariableAssignment}${tagName}`,
       "g"
     );
     while (true) {
-      startPattern.lastIndex = currentIndex;
-      const startMatch = startPattern.exec(fileContent);
-      if (!startMatch) break;
-      const matchStartIndex = startMatch.index;
-      const variableName = startMatch[1] || void 0;
+      tagNamePattern.lastIndex = currentIndex;
+      const tagNameMatch = tagNamePattern.exec(fileContent);
+      if (!tagNameMatch) break;
+      const tagNameStartIndex = tagNameMatch.index;
+      const variableName = tagNameMatch[1] || void 0;
+      if (this.isInSkipRange(tagNameStartIndex, skipRanges)) {
+        currentIndex = tagNameStartIndex + 1;
+        continue;
+      }
+      let i = tagNameStartIndex + tagNameMatch[0].length;
+      let genericType = void 0;
+      let matchStartIndex = tagNameStartIndex;
+      while (i < fileContent.length && /\s/.test(fileContent[i])) {
+        i++;
+      }
+      if (i < fileContent.length && fileContent[i] === "<") {
+        const genericStart = i;
+        let angleCount = 1;
+        i++;
+        while (i < fileContent.length && angleCount > 0) {
+          const char = fileContent[i];
+          if (char === "<") angleCount++;
+          else if (char === ">") angleCount--;
+          else if ((char === '"' || char === "'" || char === "`") && !this.isInSkipRange(i, skipRanges)) {
+            i++;
+            while (i < fileContent.length) {
+              if (fileContent[i] === "\\") {
+                i += 2;
+                continue;
+              }
+              if (fileContent[i] === char) {
+                i++;
+                break;
+              }
+              i++;
+            }
+            continue;
+          }
+          i++;
+        }
+        if (angleCount === 0) {
+          genericType = fileContent.substring(genericStart + 1, i - 1).trim();
+          matchStartIndex = tagNameStartIndex;
+        } else {
+          currentIndex = tagNameStartIndex + 1;
+          continue;
+        }
+      } else {
+        matchStartIndex = tagNameStartIndex;
+      }
+      while (i < fileContent.length && /\s/.test(fileContent[i])) {
+        i++;
+      }
+      if (i >= fileContent.length || fileContent[i] !== "(" || i + 1 >= fileContent.length) {
+        currentIndex = tagNameStartIndex + 1;
+        continue;
+      }
+      i++;
+      while (i < fileContent.length && /\s/.test(fileContent[i])) {
+        i++;
+      }
+      if (i >= fileContent.length || fileContent[i] !== "{") {
+        currentIndex = tagNameStartIndex + 1;
+        continue;
+      }
+      const braceStartIndex = i;
       if (this.isInSkipRange(matchStartIndex, skipRanges)) {
         currentIndex = matchStartIndex + 1;
         continue;
       }
       let braceCount = 1;
-      let i = matchStartIndex + startMatch[0].length;
+      i++;
       while (i < fileContent.length && braceCount > 0) {
         if (fileContent[i] === "{") braceCount++;
         if (fileContent[i] === "}") braceCount--;
@@ -107,10 +168,7 @@ class $LT_TagProcessor {
         currentIndex = matchStartIndex + 1;
         continue;
       }
-      let parameter1Text = fileContent.substring(
-        matchStartIndex + startMatch[0].length - 1,
-        i
-      );
+      let parameter1Text = fileContent.substring(braceStartIndex, i);
       let parameter2Text;
       while (i < fileContent.length && (fileContent[i] === " " || fileContent[i] === "\n" || fileContent[i] === "	")) {
         i++;
@@ -205,6 +263,7 @@ class $LT_TagProcessor {
       matches.push({
         fullMatch,
         variableName,
+        genericType,
         parameter1Text,
         parameter2Text,
         parameterTranslations,
@@ -258,7 +317,8 @@ class $LT_TagProcessor {
       }
       const arg1 = this.config.translationArgPosition === 1 ? newTranslationsString : newConfigString;
       const arg2 = this.config.translationArgPosition === 1 ? newConfigString : newTranslationsString;
-      let tagFunction = `${this.config.tagName}(${arg1}`;
+      const genericTypePart = tag.genericType ? `<${tag.genericType}>` : "";
+      let tagFunction = `${this.config.tagName}${genericTypePart}(${arg1}`;
       if (arg2) tagFunction += `, ${arg2}`;
       tagFunction += ")";
       if (tag.variableName)
@@ -1561,9 +1621,11 @@ async function generateImportFiles(config, logger, importManager) {
     const content = renderTemplate$2(templateData);
     await $LT_EnsureDirectoryExists(dirname(filePath));
     await writeFile(filePath, content, "utf-8");
+    const encodedFilePath = encodeURI(filePath);
     logger.success('Created tag file: "{file}"', {
       file: importedFile.pathRelativeToImportDir
     });
+    logger.debug(" └── link: file://{path}", { path: encodedFilePath });
   }
 }
 class ImportManager {
@@ -1641,12 +1703,12 @@ async function $LT_ImportLibraries(config, logger) {
     logger.warn("No tags were imported from any library files");
     return;
   }
+  await $LT_EnsureDirectoryExists(config.import.dir);
   await generateImportFiles(config, logger, importManager);
   if (config.import.onImportFinish) config.import.onImportFinish();
 }
 async function $LT_ImportTranslations() {
   const { config, logger } = await $LT_GetCommandEssentials();
-  await $LT_EnsureDirectoryExists(config.import.dir);
   logger.info("Importing translations from libraries...");
   await $LT_ImportLibraries(config, logger);
   logger.success("Successfully imported translations from libraries.");
@@ -1702,6 +1764,28 @@ function detectProjectDirectories() {
   }
   return detectedFolders.length > 0 ? detectedFolders.sort() : ["src", "app"];
 }
+function getDefaultAnswers() {
+  return {
+    projectType: "project",
+    tagName: "lang",
+    collectorType: "namespace",
+    namespaceOptions: {
+      modifyNamespaceOptions: false,
+      defaultNamespace: "common"
+    },
+    localesDirectory: "public/locales",
+    configGeneration: {
+      enabled: true,
+      useAlgorithm: "path-based",
+      keepVariables: true
+    },
+    importLibraries: true,
+    interfereWithCollection: false,
+    includeDirectories: ["src"],
+    baseLanguageCode: "en",
+    addCommentGuides: false
+  };
+}
 async function askProjectSetupQuestions() {
   const projectType = await select({
     message: "Is this a project or a library?",
@@ -1955,7 +2039,7 @@ async function detectModuleSystem() {
     return "cjs";
   }
 }
-async function $LT_CMD_InitConfig() {
+async function $LT_CMD_InitConfig(options = {}) {
   const logger = $LT_CreateDefaultLogger();
   if (existsSync(CONFIG_FILE_NAME)) {
     logger.error(
@@ -1967,7 +2051,10 @@ async function $LT_CMD_InitConfig() {
   logger.info("Welcome to Lang Tag CLI Setup!");
   console.log("");
   try {
-    const answers = await askProjectSetupQuestions();
+    const answers = options.yes ? getDefaultAnswers() : await askProjectSetupQuestions();
+    if (options.yes) {
+      logger.info("Using default configuration (--yes flag detected)...");
+    }
     const moduleSystem = await detectModuleSystem();
     const configContent = renderConfigTemplate({
       answers,
@@ -1983,13 +2070,13 @@ async function $LT_CMD_InitConfig() {
       configFile: CONFIG_FILE_NAME
     });
     logger.info(
-      "  2. Since you have installed all basic libraries (React, TypeScript, etc.)"
+      "  2. Ensure all dependencies are installed (TypeScript, React, etc.),"
     );
     logger.info(
-      "     and the initialized basic tag is based on what you use in your project,"
+      '     then run "npx lang-tag init-tag" to generate an initial tag'
     );
     logger.info(
-      '     we recommend using "npx lang-tag init-tag" to generate an initial version of the tag'
+      "     (the tag will be based on what libraries you have in your project)"
     );
     logger.info(
       "  3. Use your tag in the project under the include directories"
@@ -2338,7 +2425,7 @@ function createCli() {
   program.command("watch").alias("w").description(
     "Watch for changes in source files and automatically collect translations"
   ).action($LT_WatchTranslations);
-  program.command("init").description("Initialize project with default configuration").action($LT_CMD_InitConfig);
+  program.command("init").description("Initialize project with default configuration").option("-y, --yes", "Skip prompts and use default configuration").action($LT_CMD_InitConfig);
   program.command("init-tag").description("Initialize a new lang-tag function file").option(
     "-n, --name <name>",
     "Name of the tag function (default: from config)"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lang-tag/cli",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "type": "module",
   "publishConfig": {
     "access": "public"

package/type.d.ts

@@ -144,6 +144,8 @@ export interface LangTagCLIProcessedTag {
     parameterTranslations: any;
     parameterConfig?: any;
     variableName?: string;
+    /** Generic type parameter if present (e.g., "ValidationTranslations" from "lang<ValidationTranslations>(...)") */
+    genericType?: string;
     /** Character index in the whole text where the match starts */
     index: number;
     /** Line number (1-based) where the match was found */