@lang-tag/cli 0.10.0 → 0.10.1

package/README.md

@@ -1,4 +1,4 @@
-# Lang-tag: Component-Colocated Translation Management / Translation Engine Proxy
+# Lang-tag CLI
 
 A professional solution for managing translations in modern JavaScript/TypeScript projects, especially those using component-based architectures. `lang-tag` simplifies internationalization by allowing you to define translation keys directly within the components where they are used. Translations become local, callable function objects with full TypeScript support, IntelliSense, and compile-time safety.
 

package/config.d.ts

@@ -98,9 +98,12 @@ export interface LangTagCLIConfig {
      * A function called for each found lang tag before processing.
      * Allows dynamic modification of the tag's configuration (namespace, path, etc.)
      * based on the file path or other context.
-     * If it returns `undefined`, the tag's configuration is not automatically generated or updated.
+     *
+     * Changes made inside this function are **applied only if you explicitly call**
+     * `event.save(configuration)`. Returning a value or modifying the event object
+     * without calling `save()` will **not** update the configuration.
      */
-    onConfigGeneration: (params: LangTagCLIOnConfigGenerationParams) => LangTagTranslationsConfig | undefined;
+    onConfigGeneration: (event: LangTagCLIConfigGenerationEvent) => Promise<void>;
     debug?: boolean;
 }
 /**
@@ -131,19 +134,6 @@ export interface LangTagCLIOnImportActions {
     /** Sets the configuration for the currently imported tag. */
     setConfig: (config: LangTagTranslationsConfig) => void;
 }
-/**
- * Parameters passed to the `onConfigGeneration` configuration function.
- */
-export interface LangTagCLIOnConfigGenerationParams {
-    /** The absolute path to the source file being processed. */
-    fullPath: string;
-    /** The path of the source file relative to the project root (where the command was invoked). */
-    path: string;
-    /** True if the file being processed is located within the configured library import directory (`config.import.dir`). */
-    isImportedLibrary: boolean;
-    /** The configuration object extracted from the lang tag's options argument (e.g., `{ namespace: 'common', path: 'my.path' }`). */
-    config: LangTagTranslationsConfig;
-}
 type Validity = 'ok' | 'invalid-param-1' | 'invalid-param-2' | 'translations-not-found';
 export interface LangTagCLIProcessedTag {
     fullMatch: string;
@@ -171,6 +161,21 @@ export interface LangTagCLIConflict {
     tagB: LangTagCLITagConflictInfo;
     conflictType: 'path_overwrite' | 'type_mismatch';
 }
+export interface LangTagCLIConfigGenerationEvent {
+    /** The absolute path to the source file being processed. */
+    absolutePath: string;
+    /** The path of the source file relative to the project root (where the command was invoked). */
+    relativePath: string;
+    /** True if the file being processed is located within the configured library import directory (`config.import.dir`). */
+    isImportedLibrary: boolean;
+    /** The configuration object extracted from the lang tag's options argument (e.g., `{ namespace: 'common', path: 'my.path' }`). */
+    config: LangTagTranslationsConfig | undefined;
+    /**
+     * Tells CLI to replace tag configuration
+     * undefined = means configuration will be removed
+     **/
+    save(config: LangTagTranslationsConfig | undefined): void;
+}
 export interface LangTagCLICollectConfigFixEvent {
     config: LangTagTranslationsConfig;
     langTagConfig: LangTagCLIConfig;

package/index.cjs

@@ -43,6 +43,7 @@ class $LT_TagProcessor {
     const optionalVariableAssignment = `(?:\\s*(\\w+)\\s*=\\s*)?`;
     const matches = [];
     let currentIndex = 0;
+    const skipRanges = this.buildSkipRanges(fileContent);
     const startPattern = new RegExp(`${optionalVariableAssignment}${tagName}\\(\\s*\\{`, "g");
     while (true) {
       startPattern.lastIndex = currentIndex;
@@ -50,6 +51,10 @@ class $LT_TagProcessor {
       if (!startMatch) break;
       const matchStartIndex = startMatch.index;
       const variableName = startMatch[1] || void 0;
+      if (this.isInSkipRange(matchStartIndex, skipRanges)) {
+        currentIndex = matchStartIndex + 1;
+        continue;
+      }
       let braceCount = 1;
       let i = matchStartIndex + startMatch[0].length;
       while (i < fileContent.length && braceCount > 0) {
@@ -115,17 +120,29 @@ class $LT_TagProcessor {
       let validity = "ok";
       let parameter1 = void 0;
       let parameter2 = void 0;
+      if (this.hasTemplateInterpolation(parameter1Text) || parameter2Text && this.hasTemplateInterpolation(parameter2Text)) {
+        currentIndex = matchStartIndex + 1;
+        continue;
+      }
       try {
         parameter1 = JSON5.parse(parameter1Text);
         if (parameter2Text) {
           try {
             parameter2 = JSON5.parse(parameter2Text);
           } catch (error) {
-            validity = "invalid-param-2";
+            try {
+              parameter2 = JSON5.parse(this.escapeNewlinesInStrings(parameter2Text));
+            } catch {
+              validity = "invalid-param-2";
+            }
           }
         }
       } catch (error) {
-        validity = "invalid-param-1";
+        try {
+          parameter1 = JSON5.parse(this.escapeNewlinesInStrings(parameter1Text));
+        } catch {
+          validity = "invalid-param-1";
+        }
       }
       let parameterTranslations = this.config.translationArgPosition === 1 ? parameter1 : parameter2;
       let parameterConfig = this.config.translationArgPosition === 1 ? parameter2 : parameter1;
@@ -191,6 +208,180 @@ class $LT_TagProcessor {
     });
     return fileContent;
   }
+  buildSkipRanges(fileContent) {
+    const ranges = [];
+    let i = 0;
+    while (i < fileContent.length) {
+      const char = fileContent[i];
+      const nextChar = fileContent[i + 1];
+      if (char === "/" && nextChar === "/") {
+        const start = i;
+        i += 2;
+        while (i < fileContent.length && fileContent[i] !== "\n") {
+          i++;
+        }
+        ranges.push([start, i]);
+        continue;
+      }
+      if (char === "/" && nextChar === "*") {
+        const start = i;
+        i += 2;
+        while (i < fileContent.length - 1) {
+          if (fileContent[i] === "*" && fileContent[i + 1] === "/") {
+            i += 2;
+            break;
+          }
+          i++;
+        }
+        ranges.push([start, i]);
+        continue;
+      }
+      if (char === "'") {
+        const start = i;
+        i++;
+        while (i < fileContent.length) {
+          if (fileContent[i] === "\\") {
+            i += 2;
+            continue;
+          }
+          if (fileContent[i] === "'") {
+            i++;
+            break;
+          }
+          i++;
+        }
+        ranges.push([start, i]);
+        continue;
+      }
+      if (char === '"') {
+        const start = i;
+        i++;
+        while (i < fileContent.length) {
+          if (fileContent[i] === "\\") {
+            i += 2;
+            continue;
+          }
+          if (fileContent[i] === '"') {
+            i++;
+            break;
+          }
+          i++;
+        }
+        ranges.push([start, i]);
+        continue;
+      }
+      if (char === "`") {
+        const start = i;
+        i++;
+        while (i < fileContent.length) {
+          if (fileContent[i] === "\\") {
+            i += 2;
+            continue;
+          }
+          if (fileContent[i] === "`") {
+            i++;
+            break;
+          }
+          i++;
+        }
+        ranges.push([start, i]);
+        continue;
+      }
+      i++;
+    }
+    return ranges;
+  }
+  isInSkipRange(position, skipRanges) {
+    for (const [start, end] of skipRanges) {
+      if (position >= start && position < end) {
+        return true;
+      }
+    }
+    return false;
+  }
+  hasTemplateInterpolation(text) {
+    let i = 0;
+    while (i < text.length) {
+      if (text[i] === "`") {
+        i++;
+        while (i < text.length) {
+          if (text[i] === "\\") {
+            i += 2;
+            continue;
+          }
+          if (text[i] === "$" && text[i + 1] === "{") {
+            return true;
+          }
+          if (text[i] === "`") {
+            i++;
+            break;
+          }
+          i++;
+        }
+        continue;
+      }
+      i++;
+    }
+    return false;
+  }
+  escapeNewlinesInStrings(text) {
+    let result = "";
+    let i = 0;
+    while (i < text.length) {
+      const char = text[i];
+      if (char === '"') {
+        result += char;
+        i++;
+        while (i < text.length) {
+          if (text[i] === "\\") {
+            result += text[i] + text[i + 1];
+            i += 2;
+            continue;
+          }
+          if (text[i] === "\n") {
+            result += "\\n";
+            i++;
+            continue;
+          }
+          if (text[i] === '"') {
+            result += text[i];
+            i++;
+            break;
+          }
+          result += text[i];
+          i++;
+        }
+        continue;
+      }
+      if (char === "'") {
+        result += char;
+        i++;
+        while (i < text.length) {
+          if (text[i] === "\\") {
+            result += text[i] + text[i + 1];
+            i += 2;
+            continue;
+          }
+          if (text[i] === "\n") {
+            result += "\\n";
+            i++;
+            continue;
+          }
+          if (text[i] === "'") {
+            result += text[i];
+            i++;
+            break;
+          }
+          result += text[i];
+          i++;
+        }
+        continue;
+      }
+      result += char;
+      i++;
+    }
+    return result;
+  }
 }
 function getLineAndColumn(text, matchIndex) {
   const lines = text.slice(0, matchIndex).split("\n");
@@ -247,13 +438,19 @@ async function checkAndRegenerateFileLangTags(config, logger, file, path$12) {
   }
   const replacements = [];
   for (let tag of tags) {
-    const newConfig = config.onConfigGeneration({
+    let newConfig = void 0;
+    let shouldUpdate = false;
+    await config.onConfigGeneration({
       config: tag.parameterConfig,
-      fullPath: file,
-      path: path$12,
-      isImportedLibrary: path$12.startsWith(libraryImportsDir)
+      absolutePath: file,
+      relativePath: path$12,
+      isImportedLibrary: path$12.startsWith(libraryImportsDir),
+      save: (updatedConfig) => {
+        newConfig = updatedConfig;
+        shouldUpdate = true;
+      }
     });
-    if (newConfig === void 0) {
+    if (!shouldUpdate) {
       continue;
     }
     if (JSON5.stringify(tag.parameterConfig) !== JSON5.stringify(newConfig)) {
@@ -304,7 +501,8 @@ const LANG_TAG_DEFAULT_CONFIG = {
   isLibrary: false,
   language: "en",
   translationArgPosition: 1,
-  onConfigGeneration: (params) => void 0
+  onConfigGeneration: async (event) => {
+  }
 };
 async function $LT_ReadConfig(projectPath) {
   const configPath = path$1.resolve(projectPath, CONFIG_FILE_NAME);
@@ -1099,6 +1297,11 @@ async function $LT_CMD_Collect(options) {
   const { config, logger } = await $LT_GetCommandEssentials();
   logger.info("Collecting translations from source files...");
   const files = await $LT_CollectCandidateFilesWithTags({ config, logger });
+  if (config.debug) {
+    for (let file of files) {
+      logger.debug("Found {count} translations tags inside: {file}", { count: file.tags.length, file: file.relativeFilePath });
+    }
+  }
   if (config.isLibrary) {
     await $LT_WriteAsExportFile({ config, logger, files });
     return;
@@ -1224,16 +1427,17 @@ const config = {
     includes: ['src/**/*.{js,ts,jsx,tsx}'],
     excludes: ['node_modules', 'dist', 'build', '**/*.test.ts'],
     outputDir: 'public/locales/en',
-    onConfigGeneration: (params) => {
+    onConfigGeneration: async event => {
         // We do not modify imported configurations
-        if (params.isImportedLibrary) return undefined;
-
-        //if (!params.config.path) {
-        //    params.config.path = 'test';
-        //    params.config.namespace = 'testNamespace';
-        //}
+        if (event.isImportedLibrary) return;
 
-        return undefined
+        // const config = event.config || {};
+        //
+        // if (!config.path) {
+        //     config.path = 'test';
+        //     config.namespace = 'testNamespace';
+        //     event.save(config);
+        // }
     },
     collect: {
         defaultNamespace: 'common',

package/index.js

@@ -23,6 +23,7 @@ class $LT_TagProcessor {
     const optionalVariableAssignment = `(?:\\s*(\\w+)\\s*=\\s*)?`;
     const matches = [];
     let currentIndex = 0;
+    const skipRanges = this.buildSkipRanges(fileContent);
     const startPattern = new RegExp(`${optionalVariableAssignment}${tagName}\\(\\s*\\{`, "g");
     while (true) {
       startPattern.lastIndex = currentIndex;
@@ -30,6 +31,10 @@ class $LT_TagProcessor {
       if (!startMatch) break;
       const matchStartIndex = startMatch.index;
       const variableName = startMatch[1] || void 0;
+      if (this.isInSkipRange(matchStartIndex, skipRanges)) {
+        currentIndex = matchStartIndex + 1;
+        continue;
+      }
       let braceCount = 1;
       let i = matchStartIndex + startMatch[0].length;
       while (i < fileContent.length && braceCount > 0) {
@@ -95,17 +100,29 @@ class $LT_TagProcessor {
       let validity = "ok";
       let parameter1 = void 0;
       let parameter2 = void 0;
+      if (this.hasTemplateInterpolation(parameter1Text) || parameter2Text && this.hasTemplateInterpolation(parameter2Text)) {
+        currentIndex = matchStartIndex + 1;
+        continue;
+      }
       try {
         parameter1 = JSON5.parse(parameter1Text);
         if (parameter2Text) {
           try {
             parameter2 = JSON5.parse(parameter2Text);
           } catch (error) {
-            validity = "invalid-param-2";
+            try {
+              parameter2 = JSON5.parse(this.escapeNewlinesInStrings(parameter2Text));
+            } catch {
+              validity = "invalid-param-2";
+            }
           }
         }
       } catch (error) {
-        validity = "invalid-param-1";
+        try {
+          parameter1 = JSON5.parse(this.escapeNewlinesInStrings(parameter1Text));
+        } catch {
+          validity = "invalid-param-1";
+        }
       }
       let parameterTranslations = this.config.translationArgPosition === 1 ? parameter1 : parameter2;
       let parameterConfig = this.config.translationArgPosition === 1 ? parameter2 : parameter1;
@@ -171,6 +188,180 @@ class $LT_TagProcessor {
     });
     return fileContent;
   }
+  buildSkipRanges(fileContent) {
+    const ranges = [];
+    let i = 0;
+    while (i < fileContent.length) {
+      const char = fileContent[i];
+      const nextChar = fileContent[i + 1];
+      if (char === "/" && nextChar === "/") {
+        const start = i;
+        i += 2;
+        while (i < fileContent.length && fileContent[i] !== "\n") {
+          i++;
+        }
+        ranges.push([start, i]);
+        continue;
+      }
+      if (char === "/" && nextChar === "*") {
+        const start = i;
+        i += 2;
+        while (i < fileContent.length - 1) {
+          if (fileContent[i] === "*" && fileContent[i + 1] === "/") {
+            i += 2;
+            break;
+          }
+          i++;
+        }
+        ranges.push([start, i]);
+        continue;
+      }
+      if (char === "'") {
+        const start = i;
+        i++;
+        while (i < fileContent.length) {
+          if (fileContent[i] === "\\") {
+            i += 2;
+            continue;
+          }
+          if (fileContent[i] === "'") {
+            i++;
+            break;
+          }
+          i++;
+        }
+        ranges.push([start, i]);
+        continue;
+      }
+      if (char === '"') {
+        const start = i;
+        i++;
+        while (i < fileContent.length) {
+          if (fileContent[i] === "\\") {
+            i += 2;
+            continue;
+          }
+          if (fileContent[i] === '"') {
+            i++;
+            break;
+          }
+          i++;
+        }
+        ranges.push([start, i]);
+        continue;
+      }
+      if (char === "`") {
+        const start = i;
+        i++;
+        while (i < fileContent.length) {
+          if (fileContent[i] === "\\") {
+            i += 2;
+            continue;
+          }
+          if (fileContent[i] === "`") {
+            i++;
+            break;
+          }
+          i++;
+        }
+        ranges.push([start, i]);
+        continue;
+      }
+      i++;
+    }
+    return ranges;
+  }
+  isInSkipRange(position, skipRanges) {
+    for (const [start, end] of skipRanges) {
+      if (position >= start && position < end) {
+        return true;
+      }
+    }
+    return false;
+  }
+  hasTemplateInterpolation(text) {
+    let i = 0;
+    while (i < text.length) {
+      if (text[i] === "`") {
+        i++;
+        while (i < text.length) {
+          if (text[i] === "\\") {
+            i += 2;
+            continue;
+          }
+          if (text[i] === "$" && text[i + 1] === "{") {
+            return true;
+          }
+          if (text[i] === "`") {
+            i++;
+            break;
+          }
+          i++;
+        }
+        continue;
+      }
+      i++;
+    }
+    return false;
+  }
+  escapeNewlinesInStrings(text) {
+    let result = "";
+    let i = 0;
+    while (i < text.length) {
+      const char = text[i];
+      if (char === '"') {
+        result += char;
+        i++;
+        while (i < text.length) {
+          if (text[i] === "\\") {
+            result += text[i] + text[i + 1];
+            i += 2;
+            continue;
+          }
+          if (text[i] === "\n") {
+            result += "\\n";
+            i++;
+            continue;
+          }
+          if (text[i] === '"') {
+            result += text[i];
+            i++;
+            break;
+          }
+          result += text[i];
+          i++;
+        }
+        continue;
+      }
+      if (char === "'") {
+        result += char;
+        i++;
+        while (i < text.length) {
+          if (text[i] === "\\") {
+            result += text[i] + text[i + 1];
+            i += 2;
+            continue;
+          }
+          if (text[i] === "\n") {
+            result += "\\n";
+            i++;
+            continue;
+          }
+          if (text[i] === "'") {
+            result += text[i];
+            i++;
+            break;
+          }
+          result += text[i];
+          i++;
+        }
+        continue;
+      }
+      result += char;
+      i++;
+    }
+    return result;
+  }
 }
 function getLineAndColumn(text, matchIndex) {
   const lines = text.slice(0, matchIndex).split("\n");
@@ -227,13 +418,19 @@ async function checkAndRegenerateFileLangTags(config, logger, file, path2) {
   }
   const replacements = [];
   for (let tag of tags) {
-    const newConfig = config.onConfigGeneration({
+    let newConfig = void 0;
+    let shouldUpdate = false;
+    await config.onConfigGeneration({
       config: tag.parameterConfig,
-      fullPath: file,
-      path: path2,
-      isImportedLibrary: path2.startsWith(libraryImportsDir)
+      absolutePath: file,
+      relativePath: path2,
+      isImportedLibrary: path2.startsWith(libraryImportsDir),
+      save: (updatedConfig) => {
+        newConfig = updatedConfig;
+        shouldUpdate = true;
+      }
     });
-    if (newConfig === void 0) {
+    if (!shouldUpdate) {
       continue;
     }
     if (JSON5.stringify(tag.parameterConfig) !== JSON5.stringify(newConfig)) {
@@ -284,7 +481,8 @@ const LANG_TAG_DEFAULT_CONFIG = {
   isLibrary: false,
   language: "en",
   translationArgPosition: 1,
-  onConfigGeneration: (params) => void 0
+  onConfigGeneration: async (event) => {
+  }
 };
 async function $LT_ReadConfig(projectPath) {
   const configPath = resolve(projectPath, CONFIG_FILE_NAME);
@@ -1079,6 +1277,11 @@ async function $LT_CMD_Collect(options) {
   const { config, logger } = await $LT_GetCommandEssentials();
   logger.info("Collecting translations from source files...");
   const files = await $LT_CollectCandidateFilesWithTags({ config, logger });
+  if (config.debug) {
+    for (let file of files) {
+      logger.debug("Found {count} translations tags inside: {file}", { count: file.tags.length, file: file.relativeFilePath });
+    }
+  }
   if (config.isLibrary) {
     await $LT_WriteAsExportFile({ config, logger, files });
     return;
@@ -1204,16 +1407,17 @@ const config = {
     includes: ['src/**/*.{js,ts,jsx,tsx}'],
     excludes: ['node_modules', 'dist', 'build', '**/*.test.ts'],
     outputDir: 'public/locales/en',
-    onConfigGeneration: (params) => {
+    onConfigGeneration: async event => {
         // We do not modify imported configurations
-        if (params.isImportedLibrary) return undefined;
-
-        //if (!params.config.path) {
-        //    params.config.path = 'test';
-        //    params.config.namespace = 'testNamespace';
-        //}
+        if (event.isImportedLibrary) return;
 
-        return undefined
+        // const config = event.config || {};
+        //
+        // if (!config.path) {
+        //     config.path = 'test';
+        //     config.namespace = 'testNamespace';
+        //     event.save(config);
+        // }
     },
     collect: {
         defaultNamespace: 'common',

package/package.json

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