@lang-tag/cli 0.12.0 → 0.12.2

package/algorithms/config-generation/config-keeper.d.ts

@@ -10,6 +10,20 @@ export interface ConfigKeeperOptions {
      * ```
      */
     propertyName?: string;
+    /**
+     * When true, ensures the keep property is always placed at the end of the configuration object.
+     * This improves readability by keeping metadata properties separate from core config.
+     * @default true
+     * @example
+     * ```tsx
+     * // With keepPropertyAtEnd: true
+     * { namespace: 'common', path: 'button', keep: 'namespace' }
+     *
+     * // With keepPropertyAtEnd: false
+     * // Order is not guaranteed
+     * ```
+     */
+    keepPropertyAtEnd?: boolean;
 }
 /**
  * Creates a config keeper algorithm that preserves original configuration values

package/algorithms/config-generation/path-based-config-generator.d.ts

@@ -24,17 +24,24 @@ export interface PathBasedConfigGeneratorOptions {
      */
     ignoreDirectories?: string[];
     /**
-     * When true, automatically extracts root directory names from the config.includes patterns
-     * and adds them to the ignoreDirectories list.
+     * When true, automatically removes the root directory from the path if it matches
+     * one of the root directories extracted from config.includes patterns.
+     * Unlike ignoreDirectories, this only removes the FIRST occurrence if the path starts with it.
      *
      * @default false
      *
      * @example
      * // With includes: ['src/**\/*.{js,ts,jsx,tsx}']
-     * // Automatically ignores: ['src']
+     * // Path: 'src/components/Button.tsx' → removes root 'src' → 'components/Button.tsx'
      *
-     * // With includes: ['(src|app)/**\/*.{js,ts,jsx,tsx}', 'components/**\/*.{jsx,tsx}']
-     * // Automatically ignores: ['src', 'app', 'components']
+     * // With includes: ['app/**\/*.{js,ts,jsx,tsx}', 'components/**\/*.{jsx,tsx}']
+     * // Path: 'app/dashboard/components/utils.tsx' → removes root 'app' → 'dashboard/components/utils.tsx'
+     * // Note: 'components' in the middle is NOT removed (only root occurrences)
+     *
+     * // With includes: ['(src|app)/**\/*.{js,ts,jsx,tsx}']
+     * // Extracts root directories: ['src', 'app']
+     * // Path: 'src/features/auth.tsx' → removes root 'src' → 'features/auth.tsx'
+     * // Path: 'app/pages/home.tsx' → removes root 'app' → 'pages/home.tsx'
      */
     ignoreIncludesRootDirectories?: boolean;
     /**

package/algorithms/index.cjs

@@ -36,11 +36,6 @@ function pathBasedConfigGenerator(options = {}) {
   return async (event) => {
     const { relativePath, langTagConfig } = event;
     const actualFallbackNamespace = fallbackNamespace ?? langTagConfig.collect?.defaultNamespace;
-    let finalIgnoreDirectories = [...ignoreDirectories];
-    if (ignoreIncludesRootDirectories && langTagConfig.includes) {
-      const extractedDirectories = extractRootDirectoriesFromIncludes(langTagConfig.includes);
-      finalIgnoreDirectories = [.../* @__PURE__ */ new Set([...finalIgnoreDirectories, ...extractedDirectories])];
-    }
     let pathSegments = relativePath.split(path.sep).filter(Boolean);
     if (pathSegments.length === 0) {
       return;
@@ -59,8 +54,14 @@ function pathBasedConfigGenerator(options = {}) {
       }
       return segment;
     }).filter((seg) => seg !== null);
+    if (ignoreIncludesRootDirectories && langTagConfig.includes && pathSegments.length > 0) {
+      const extractedDirectories = extractRootDirectoriesFromIncludes(langTagConfig.includes);
+      if (extractedDirectories.includes(pathSegments[0])) {
+        pathSegments = pathSegments.slice(1);
+      }
+    }
     pathSegments = applyStructuredIgnore(pathSegments, ignoreStructured);
-    pathSegments = pathSegments.filter((seg) => !finalIgnoreDirectories.includes(seg));
+    pathSegments = pathSegments.filter((seg) => !ignoreDirectories.includes(seg));
     let namespace;
     let path$1;
     if (pathSegments.length >= 1) {
@@ -84,13 +85,22 @@ function pathBasedConfigGenerator(options = {}) {
       const transformedParts = pathParts.map((part) => applyCaseTransform(part, pathCase));
       path$1 = transformedParts.join(".");
     }
-    const newConfig = {};
+    const newConfig = event.config ? { ...event.config } : {};
     if (clearOnDefaultNamespace && namespace === actualFallbackNamespace) {
       if (path$1) {
         newConfig.path = path$1;
+        delete newConfig.namespace;
       } else {
-        event.save(null, TRIGGER_NAME$1);
-        return;
+        const hasOtherProperties = event.config && Object.keys(event.config).some(
+          (key) => key !== "namespace" && key !== "path"
+        );
+        if (!hasOtherProperties) {
+          event.save(null, TRIGGER_NAME$1);
+          return;
+        } else {
+          delete newConfig.namespace;
+          delete newConfig.path;
+        }
       }
     } else {
       if (namespace) {
@@ -98,6 +108,8 @@ function pathBasedConfigGenerator(options = {}) {
       }
       if (path$1) {
         newConfig.path = path$1;
+      } else {
+        delete newConfig.path;
       }
     }
     if (Object.keys(newConfig).length > 0) {
@@ -160,6 +172,7 @@ function extractRootDirectoriesFromIncludes(includes) {
 const TRIGGER_NAME = "config-keeper";
 function configKeeper(options = {}) {
   const propertyName = options.propertyName ?? "keep";
+  const keepPropertyAtEnd = options.keepPropertyAtEnd ?? true;
   return async (event) => {
     if (!event.isSaved) {
       return;
@@ -182,14 +195,38 @@ function configKeeper(options = {}) {
     } else {
       restoredConfig = { ...event.savedConfig };
     }
-    if ((keepMode === "namespace" || keepMode === "both") && event.config.namespace !== void 0) {
-      restoredConfig.namespace = event.config.namespace;
+    let needsSave = false;
+    const restorePropertyIfNeeded = (propertyKey) => {
+      if (!event.config) return;
+      const shouldRestore = (keepMode === propertyKey || keepMode === "both") && event.config[propertyKey] !== void 0;
+      if (shouldRestore && restoredConfig[propertyKey] !== event.config[propertyKey]) {
+        restoredConfig[propertyKey] = event.config[propertyKey];
+        needsSave = true;
+      }
+    };
+    restorePropertyIfNeeded("namespace");
+    restorePropertyIfNeeded("path");
+    const keepPropertyExistedBefore = event.savedConfig && event.savedConfig[propertyName] !== void 0;
+    if (!keepPropertyExistedBefore) {
+      needsSave = true;
+    }
+    if (keepPropertyAtEnd && event.savedConfig && !needsSave) {
+      const savedKeys = Object.keys(event.savedConfig);
+      const keepIndex = savedKeys.indexOf(propertyName);
+      const isKeepAtEnd = keepIndex === savedKeys.length - 1;
+      if (!isKeepAtEnd && keepIndex !== -1) {
+        needsSave = true;
+      }
+    }
+    if (!needsSave) {
+      return;
     }
-    if ((keepMode === "path" || keepMode === "both") && event.config.path !== void 0) {
-      restoredConfig.path = event.config.path;
+    const finalConfig = { ...restoredConfig };
+    if (keepPropertyAtEnd) {
+      delete finalConfig[propertyName];
     }
-    restoredConfig[propertyName] = keepMode;
-    event.save(restoredConfig, TRIGGER_NAME);
+    finalConfig[propertyName] = keepMode;
+    event.save(finalConfig, TRIGGER_NAME);
   };
 }
 exports.configKeeper = configKeeper;

package/algorithms/index.js

@@ -17,11 +17,6 @@ function pathBasedConfigGenerator(options = {}) {
   return async (event) => {
     const { relativePath, langTagConfig } = event;
     const actualFallbackNamespace = fallbackNamespace ?? langTagConfig.collect?.defaultNamespace;
-    let finalIgnoreDirectories = [...ignoreDirectories];
-    if (ignoreIncludesRootDirectories && langTagConfig.includes) {
-      const extractedDirectories = extractRootDirectoriesFromIncludes(langTagConfig.includes);
-      finalIgnoreDirectories = [.../* @__PURE__ */ new Set([...finalIgnoreDirectories, ...extractedDirectories])];
-    }
     let pathSegments = relativePath.split(sep).filter(Boolean);
     if (pathSegments.length === 0) {
       return;
@@ -40,8 +35,14 @@ function pathBasedConfigGenerator(options = {}) {
       }
       return segment;
     }).filter((seg) => seg !== null);
+    if (ignoreIncludesRootDirectories && langTagConfig.includes && pathSegments.length > 0) {
+      const extractedDirectories = extractRootDirectoriesFromIncludes(langTagConfig.includes);
+      if (extractedDirectories.includes(pathSegments[0])) {
+        pathSegments = pathSegments.slice(1);
+      }
+    }
     pathSegments = applyStructuredIgnore(pathSegments, ignoreStructured);
-    pathSegments = pathSegments.filter((seg) => !finalIgnoreDirectories.includes(seg));
+    pathSegments = pathSegments.filter((seg) => !ignoreDirectories.includes(seg));
     let namespace;
     let path;
     if (pathSegments.length >= 1) {
@@ -65,13 +66,22 @@ function pathBasedConfigGenerator(options = {}) {
       const transformedParts = pathParts.map((part) => applyCaseTransform(part, pathCase));
       path = transformedParts.join(".");
     }
-    const newConfig = {};
+    const newConfig = event.config ? { ...event.config } : {};
     if (clearOnDefaultNamespace && namespace === actualFallbackNamespace) {
       if (path) {
         newConfig.path = path;
+        delete newConfig.namespace;
       } else {
-        event.save(null, TRIGGER_NAME$1);
-        return;
+        const hasOtherProperties = event.config && Object.keys(event.config).some(
+          (key) => key !== "namespace" && key !== "path"
+        );
+        if (!hasOtherProperties) {
+          event.save(null, TRIGGER_NAME$1);
+          return;
+        } else {
+          delete newConfig.namespace;
+          delete newConfig.path;
+        }
       }
     } else {
       if (namespace) {
@@ -79,6 +89,8 @@ function pathBasedConfigGenerator(options = {}) {
       }
       if (path) {
         newConfig.path = path;
+      } else {
+        delete newConfig.path;
       }
     }
     if (Object.keys(newConfig).length > 0) {
@@ -141,6 +153,7 @@ function extractRootDirectoriesFromIncludes(includes) {
 const TRIGGER_NAME = "config-keeper";
 function configKeeper(options = {}) {
   const propertyName = options.propertyName ?? "keep";
+  const keepPropertyAtEnd = options.keepPropertyAtEnd ?? true;
   return async (event) => {
     if (!event.isSaved) {
       return;
@@ -163,14 +176,38 @@ function configKeeper(options = {}) {
     } else {
       restoredConfig = { ...event.savedConfig };
     }
-    if ((keepMode === "namespace" || keepMode === "both") && event.config.namespace !== void 0) {
-      restoredConfig.namespace = event.config.namespace;
+    let needsSave = false;
+    const restorePropertyIfNeeded = (propertyKey) => {
+      if (!event.config) return;
+      const shouldRestore = (keepMode === propertyKey || keepMode === "both") && event.config[propertyKey] !== void 0;
+      if (shouldRestore && restoredConfig[propertyKey] !== event.config[propertyKey]) {
+        restoredConfig[propertyKey] = event.config[propertyKey];
+        needsSave = true;
+      }
+    };
+    restorePropertyIfNeeded("namespace");
+    restorePropertyIfNeeded("path");
+    const keepPropertyExistedBefore = event.savedConfig && event.savedConfig[propertyName] !== void 0;
+    if (!keepPropertyExistedBefore) {
+      needsSave = true;
+    }
+    if (keepPropertyAtEnd && event.savedConfig && !needsSave) {
+      const savedKeys = Object.keys(event.savedConfig);
+      const keepIndex = savedKeys.indexOf(propertyName);
+      const isKeepAtEnd = keepIndex === savedKeys.length - 1;
+      if (!isKeepAtEnd && keepIndex !== -1) {
+        needsSave = true;
+      }
+    }
+    if (!needsSave) {
+      return;
     }
-    if ((keepMode === "path" || keepMode === "both") && event.config.path !== void 0) {
-      restoredConfig.path = event.config.path;
+    const finalConfig = { ...restoredConfig };
+    if (keepPropertyAtEnd) {
+      delete finalConfig[propertyName];
     }
-    restoredConfig[propertyName] = keepMode;
-    event.save(restoredConfig, TRIGGER_NAME);
+    finalConfig[propertyName] = keepMode;
+    event.save(finalConfig, TRIGGER_NAME);
   };
 }
 export {

package/index.cjs

@@ -173,7 +173,7 @@ class $LT_TagProcessor {
       }
       const tag = R.tag;
       let newTranslationsString = R.translations;
-      if (!newTranslationsString) newTranslationsString = this.config.translationArgPosition === 1 ? tag.parameter1Text : tag.parameter2Text;
+      if (!newTranslationsString) newTranslationsString = this.config.translationArgPosition === 1 ? tag.parameter1Text : tag.parameter2Text || "{}";
       else if (typeof newTranslationsString !== "string") newTranslationsString = JSON5.stringify(newTranslationsString);
       if (!newTranslationsString) throw new Error("Tag must have translations provided!");
       try {
@@ -191,6 +191,9 @@ class $LT_TagProcessor {
           throw new Error(`Tag config is invalid object! Config: ${newConfigString}`);
         }
       }
+      if (newConfigString === null && this.config.translationArgPosition === 2) {
+        newConfigString = "{}";
+      }
       const arg1 = this.config.translationArgPosition === 1 ? newTranslationsString : newConfigString;
       const arg2 = this.config.translationArgPosition === 1 ? newConfigString : newTranslationsString;
       let tagFunction = `${this.config.tagName}(${arg1}`;
@@ -512,7 +515,7 @@ const LANG_TAG_DEFAULT_CONFIG = {
       await event.logger.conflict(event.conflict, true);
     },
     onCollectFinish: (event) => {
-      event.exit();
+      if (event.conflicts.length) event.exit();
     }
   },
   import: {
@@ -1215,18 +1218,18 @@ async function $LT_GroupTagsToNamespaces({ logger, files, config }) {
   }
   if (allConflicts.length > 0) {
     logger.warn(`Found ${allConflicts.length} conflicts.`);
-    if (config.collect?.onCollectFinish) {
-      let shouldContinue = true;
-      config.collect.onCollectFinish({
-        conflicts: allConflicts,
-        logger,
-        exit() {
-          shouldContinue = false;
-        }
-      });
-      if (!shouldContinue) {
-        throw new Error(`LangTagConflictResolution:Processing stopped due to collect finish handler`);
+  }
+  if (config.collect?.onCollectFinish) {
+    let shouldContinue = true;
+    config.collect.onCollectFinish({
+      conflicts: allConflicts,
+      logger,
+      exit() {
+        shouldContinue = false;
       }
+    });
+    if (!shouldContinue) {
+      throw new Error(`LangTagConflictResolution:Processing stopped due to collect finish handler`);
     }
   }
   return namespaces;
@@ -1478,7 +1481,7 @@ const config = {
             // Call event.exit(); to terminate the process upon the first conflict
         },
         onCollectFinish: event => {
-            event.exit(); // Stop the process to avoid merging on conflict
+            if (event.conflicts.length) event.exit(); // Stop the process to avoid merging on conflict
         }
     },
     translationArgPosition: 1,

package/index.js

@@ -153,7 +153,7 @@ class $LT_TagProcessor {
       }
       const tag = R.tag;
       let newTranslationsString = R.translations;
-      if (!newTranslationsString) newTranslationsString = this.config.translationArgPosition === 1 ? tag.parameter1Text : tag.parameter2Text;
+      if (!newTranslationsString) newTranslationsString = this.config.translationArgPosition === 1 ? tag.parameter1Text : tag.parameter2Text || "{}";
       else if (typeof newTranslationsString !== "string") newTranslationsString = JSON5.stringify(newTranslationsString);
       if (!newTranslationsString) throw new Error("Tag must have translations provided!");
       try {
@@ -171,6 +171,9 @@ class $LT_TagProcessor {
           throw new Error(`Tag config is invalid object! Config: ${newConfigString}`);
         }
       }
+      if (newConfigString === null && this.config.translationArgPosition === 2) {
+        newConfigString = "{}";
+      }
       const arg1 = this.config.translationArgPosition === 1 ? newTranslationsString : newConfigString;
       const arg2 = this.config.translationArgPosition === 1 ? newConfigString : newTranslationsString;
       let tagFunction = `${this.config.tagName}(${arg1}`;
@@ -492,7 +495,7 @@ const LANG_TAG_DEFAULT_CONFIG = {
       await event.logger.conflict(event.conflict, true);
     },
     onCollectFinish: (event) => {
-      event.exit();
+      if (event.conflicts.length) event.exit();
     }
   },
   import: {
@@ -1195,18 +1198,18 @@ async function $LT_GroupTagsToNamespaces({ logger, files, config }) {
   }
   if (allConflicts.length > 0) {
     logger.warn(`Found ${allConflicts.length} conflicts.`);
-    if (config.collect?.onCollectFinish) {
-      let shouldContinue = true;
-      config.collect.onCollectFinish({
-        conflicts: allConflicts,
-        logger,
-        exit() {
-          shouldContinue = false;
-        }
-      });
-      if (!shouldContinue) {
-        throw new Error(`LangTagConflictResolution:Processing stopped due to collect finish handler`);
+  }
+  if (config.collect?.onCollectFinish) {
+    let shouldContinue = true;
+    config.collect.onCollectFinish({
+      conflicts: allConflicts,
+      logger,
+      exit() {
+        shouldContinue = false;
       }
+    });
+    if (!shouldContinue) {
+      throw new Error(`LangTagConflictResolution:Processing stopped due to collect finish handler`);
     }
   }
   return namespaces;
@@ -1458,7 +1461,7 @@ const config = {
             // Call event.exit(); to terminate the process upon the first conflict
         },
         onCollectFinish: event => {
-            event.exit(); // Stop the process to avoid merging on conflict
+            if (event.conflicts.length) event.exit(); // Stop the process to avoid merging on conflict
         }
     },
     translationArgPosition: 1,

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@lang-tag/cli",
-  "version": "0.12.0",
+  "version": "0.12.2",
   "type": "module",
   "publishConfig": {
     "access": "public"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/TheTonsOfCode/lang-tag"
+    "url": "https://github.com/TheTonsOfCode/lang-tag-cli"
   },
   "author": "TheTonsOfCode",
   "license": "MIT",

package/template/base-app.mustache

@@ -10,7 +10,7 @@ import {
 import { createCallableTranslations } from 'lang-tag';
 {{/isTypeScript}}
 {{#isReact}}
-import { ReactNode, useMemo } from 'react';
+import React, { ReactNode, useMemo } from 'react';
 {{/isReact}}
 
 {{#isTypeScript}}

package/template/base-library.mustache

@@ -13,7 +13,7 @@ import {
 import { createCallableTranslations, normalizeTranslations, lookupTranslation } from 'lang-tag';
 {{/isTypeScript}}
 {{#isReact}}
-import {
+import React, {
     createContext,
     useContext,
     useMemo,

package/template/placeholder.mustache

@@ -49,7 +49,12 @@ export function processPlaceholders(
         return parts.join('');
     }
 
-    return parts{{#isTypeScript}} as unknown as string{{/isTypeScript}};
+    return parts.map((part, index) => {
+        if (React.isValidElement(part)) {
+            return React.cloneElement(part, { key: index });
+        }
+        return React.createElement(React.Fragment, { key: index }, part);
+    }){{#isTypeScript}} as unknown as string{{/isTypeScript}};
 }
 {{/isReact}}