@lang-tag/cli 0.13.0 → 0.14.0

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

@@ -67,6 +67,12 @@ export interface PathBasedConfigGeneratorOptions {
      * Supports ignoring and renaming segments with special keys:
      * - `_`: when `false`, ignores the current segment but continues hierarchy
      * - `>`: renames the current segment to the specified value
+     * - `>>`: namespace redirect - jumps to a different namespace and continues processing remaining path segments
+     *   - String: `>>: 'namespace'` - redirects to specified namespace, remaining segments become path
+     *   - Object: `>>: { namespace: 'name', pathPrefix: 'prefix.' }` - redirects with optional path prefix
+     *   - Empty: `>>: ''` or `>>: null/undefined` - uses current segment as namespace
+     *   - Missing namespace: `>>: { pathPrefix: 'prefix.' }` - uses current segment as namespace with prefix
+     *   - Nested: deepest `>>` in hierarchy takes precedence
      * - Regular keys: nested rules or boolean/string for child segments
      *
      * @example
@@ -79,6 +85,25 @@ export interface PathBasedConfigGeneratorOptions {
      *     admin: {
      *       '>': 'management', // rename "admin" to "management"
      *       users: true        // keep "users" as is (does nothing)
+     *     },
+     *     layout: {
+     *       '>>': 'dashboard'  // redirect: everything below layout jumps to "dashboard" namespace
+     *     },
+     *     components: {
+     *       '>>': {           // redirect: jump to "ui" namespace with "components." path prefix
+     *         namespace: 'ui',
+     *         pathPrefix: 'components'
+     *       }
+     *     },
+     *     features: {
+     *       '>>': {           // redirect: use current segment as namespace with "feature." prefix
+     *         pathPrefix: 'feature.'
+     *       }
+     *     },
+     *     auth: {
+     *       '>>': '',         // redirect: use current segment as namespace
+     *       '>>': null,       // same as empty string
+     *       '>>': undefined   // same as empty string
      *     }
      *   }
      * }

package/algorithms/index.cjs

@@ -80,6 +80,8 @@ function pathBasedConfigGenerator(options = {}) {
       namespace = pathSegments[0];
       if (pathSegments.length > 1) {
         path$1 = pathSegments.slice(1).join(".");
+      } else {
+        path$1 = "";
       }
     } else {
       namespace = actualFallbackNamespace;
@@ -163,11 +165,69 @@ function applyStructuredIgnore(segments, structure) {
   }
   return result;
 }
+function addPathPrefixAndSegments(result, pathPrefix, remainingSegments) {
+  if (pathPrefix && remainingSegments.length > 0) {
+    const cleanPrefix = pathPrefix.endsWith(".") ? pathPrefix.slice(0, -1) : pathPrefix;
+    result.push(cleanPrefix, ...remainingSegments);
+  } else if (pathPrefix && remainingSegments.length === 0) {
+    const cleanPrefix = pathPrefix.endsWith(".") ? pathPrefix.slice(0, -1) : pathPrefix;
+    result.push(cleanPrefix);
+  } else if (remainingSegments.length > 0) {
+    result.push(...remainingSegments);
+  }
+}
+function processNamespaceRedirect(redirectRule, remainingSegments, options) {
+  const result = [];
+  if (redirectRule === null || redirectRule === void 0) {
+    if (options?.currentSegment !== void 0) {
+      if (!options.ignoreSelf) {
+        result.push(options.renameTo || options.currentSegment);
+      }
+    }
+    result.push(...remainingSegments);
+  } else if (typeof redirectRule === "string") {
+    if (redirectRule === "") {
+      if (options?.currentSegment !== void 0) {
+        if (!options.ignoreSelf) {
+          result.push(options.renameTo || options.currentSegment);
+        }
+      }
+      result.push(...remainingSegments);
+    } else {
+      result.push(redirectRule);
+      result.push(...remainingSegments);
+    }
+  } else if (typeof redirectRule === "object" && redirectRule !== null) {
+    const namespace = redirectRule.namespace;
+    const pathPrefix = redirectRule.pathPrefix || "";
+    if (namespace === void 0 || namespace === null || namespace === "") {
+      if (options?.currentSegment !== void 0) {
+        if (!options.ignoreSelf) {
+          result.push(options.renameTo || options.currentSegment);
+        }
+      }
+      addPathPrefixAndSegments(result, pathPrefix, remainingSegments);
+    } else {
+      result.push(namespace);
+      addPathPrefixAndSegments(result, pathPrefix, remainingSegments);
+    }
+  }
+  return result;
+}
 function applyPathRules(segments, structure) {
   const result = [];
   let currentStructure = structure;
+  let deepestRedirect = null;
   for (let i = 0; i < segments.length; i++) {
     const segment = segments[i];
+    if (">>" in currentStructure && (!deepestRedirect || !deepestRedirect.context)) {
+      const redirectRule = currentStructure[">>"];
+      const remainingSegments = segments.slice(i);
+      deepestRedirect = {
+        rule: redirectRule,
+        remainingSegments
+      };
+    }
     if (segment in currentStructure) {
       const rule = currentStructure[segment];
       if (rule === true) {
@@ -190,6 +250,22 @@ function applyPathRules(segments, structure) {
       } else if (typeof rule === "object" && rule !== null) {
         const ignoreSelf = rule["_"] === false;
         const renameTo = rule[">"];
+        const redirectRule = rule[">>"];
+        if (">>" in rule) {
+          const remainingSegments = segments.slice(i + 1);
+          const ruleWithoutRedirect = { ...rule };
+          delete ruleWithoutRedirect[">>"];
+          const processedRemaining = applyPathRules(remainingSegments, ruleWithoutRedirect);
+          deepestRedirect = {
+            rule: redirectRule,
+            remainingSegments: processedRemaining,
+            context: {
+              currentSegment: segment,
+              renameTo,
+              ignoreSelf
+            }
+          };
+        }
         if (!ignoreSelf) {
           if (typeof renameTo === "string") {
             result.push(renameTo);
@@ -204,6 +280,13 @@ function applyPathRules(segments, structure) {
     result.push(segment);
     currentStructure = structure;
   }
+  if (deepestRedirect) {
+    return processNamespaceRedirect(
+      deepestRedirect.rule,
+      deepestRedirect.remainingSegments,
+      deepestRedirect.context
+    );
+  }
   return result;
 }
 function applyCaseTransform(str, caseType) {

package/algorithms/index.js

@@ -61,6 +61,8 @@ function pathBasedConfigGenerator(options = {}) {
       namespace = pathSegments[0];
       if (pathSegments.length > 1) {
         path = pathSegments.slice(1).join(".");
+      } else {
+        path = "";
       }
     } else {
       namespace = actualFallbackNamespace;
@@ -144,11 +146,69 @@ function applyStructuredIgnore(segments, structure) {
   }
   return result;
 }
+function addPathPrefixAndSegments(result, pathPrefix, remainingSegments) {
+  if (pathPrefix && remainingSegments.length > 0) {
+    const cleanPrefix = pathPrefix.endsWith(".") ? pathPrefix.slice(0, -1) : pathPrefix;
+    result.push(cleanPrefix, ...remainingSegments);
+  } else if (pathPrefix && remainingSegments.length === 0) {
+    const cleanPrefix = pathPrefix.endsWith(".") ? pathPrefix.slice(0, -1) : pathPrefix;
+    result.push(cleanPrefix);
+  } else if (remainingSegments.length > 0) {
+    result.push(...remainingSegments);
+  }
+}
+function processNamespaceRedirect(redirectRule, remainingSegments, options) {
+  const result = [];
+  if (redirectRule === null || redirectRule === void 0) {
+    if (options?.currentSegment !== void 0) {
+      if (!options.ignoreSelf) {
+        result.push(options.renameTo || options.currentSegment);
+      }
+    }
+    result.push(...remainingSegments);
+  } else if (typeof redirectRule === "string") {
+    if (redirectRule === "") {
+      if (options?.currentSegment !== void 0) {
+        if (!options.ignoreSelf) {
+          result.push(options.renameTo || options.currentSegment);
+        }
+      }
+      result.push(...remainingSegments);
+    } else {
+      result.push(redirectRule);
+      result.push(...remainingSegments);
+    }
+  } else if (typeof redirectRule === "object" && redirectRule !== null) {
+    const namespace = redirectRule.namespace;
+    const pathPrefix = redirectRule.pathPrefix || "";
+    if (namespace === void 0 || namespace === null || namespace === "") {
+      if (options?.currentSegment !== void 0) {
+        if (!options.ignoreSelf) {
+          result.push(options.renameTo || options.currentSegment);
+        }
+      }
+      addPathPrefixAndSegments(result, pathPrefix, remainingSegments);
+    } else {
+      result.push(namespace);
+      addPathPrefixAndSegments(result, pathPrefix, remainingSegments);
+    }
+  }
+  return result;
+}
 function applyPathRules(segments, structure) {
   const result = [];
   let currentStructure = structure;
+  let deepestRedirect = null;
   for (let i = 0; i < segments.length; i++) {
     const segment = segments[i];
+    if (">>" in currentStructure && (!deepestRedirect || !deepestRedirect.context)) {
+      const redirectRule = currentStructure[">>"];
+      const remainingSegments = segments.slice(i);
+      deepestRedirect = {
+        rule: redirectRule,
+        remainingSegments
+      };
+    }
     if (segment in currentStructure) {
       const rule = currentStructure[segment];
       if (rule === true) {
@@ -171,6 +231,22 @@ function applyPathRules(segments, structure) {
       } else if (typeof rule === "object" && rule !== null) {
         const ignoreSelf = rule["_"] === false;
         const renameTo = rule[">"];
+        const redirectRule = rule[">>"];
+        if (">>" in rule) {
+          const remainingSegments = segments.slice(i + 1);
+          const ruleWithoutRedirect = { ...rule };
+          delete ruleWithoutRedirect[">>"];
+          const processedRemaining = applyPathRules(remainingSegments, ruleWithoutRedirect);
+          deepestRedirect = {
+            rule: redirectRule,
+            remainingSegments: processedRemaining,
+            context: {
+              currentSegment: segment,
+              renameTo,
+              ignoreSelf
+            }
+          };
+        }
         if (!ignoreSelf) {
           if (typeof renameTo === "string") {
             result.push(renameTo);
@@ -185,6 +261,13 @@ function applyPathRules(segments, structure) {
     result.push(segment);
     currentStructure = structure;
   }
+  if (deepestRedirect) {
+    return processNamespaceRedirect(
+      deepestRedirect.rule,
+      deepestRedirect.remainingSegments,
+      deepestRedirect.context
+    );
+  }
   return result;
 }
 function applyCaseTransform(str, caseType) {

package/config.d.ts

@@ -223,6 +223,8 @@ export interface LangTagCLIConflictResolutionEvent {
     exit(): void;
 }
 export interface LangTagCLICollectFinishEvent {
+    totalTags: number;
+    namespaces: Record<string, Record<string, any>>;
     conflicts: LangTagCLIConflict[];
     logger: LangTagCLILogger;
     /** Breaks translation collection process */

package/index.cjs

@@ -80,31 +80,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;
@@ -547,8 +549,8 @@ 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 {
       ...LANG_TAG_DEFAULT_CONFIG,
@@ -1224,6 +1226,8 @@ async function $LT_GroupTagsToNamespaces({ logger, files, config }) {
   if (config.collect?.onCollectFinish) {
     let shouldContinue = true;
     config.collect.onCollectFinish({
+      totalTags,
+      namespaces,
       conflicts: allConflicts,
       logger,
       exit() {
@@ -1469,7 +1473,7 @@ const generationAlgorithm = pathBasedConfigGenerator({
     //     }
     // }
 });
-const keeper = configKeeper();
+const keeper = configKeeper({ propertyName: 'keep' });
 
 /** @type {import('@lang-tag/cli/config').LangTagCLIConfig} */
 const config = {

package/index.js

@@ -60,31 +60,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;
@@ -527,8 +529,8 @@ 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 {
       ...LANG_TAG_DEFAULT_CONFIG,
@@ -1204,6 +1206,8 @@ async function $LT_GroupTagsToNamespaces({ logger, files, config }) {
   if (config.collect?.onCollectFinish) {
     let shouldContinue = true;
     config.collect.onCollectFinish({
+      totalTags,
+      namespaces,
       conflicts: allConflicts,
       logger,
       exit() {
@@ -1449,7 +1453,7 @@ const generationAlgorithm = pathBasedConfigGenerator({
     //     }
     // }
 });
-const keeper = configKeeper();
+const keeper = configKeeper({ propertyName: 'keep' });
 
 /** @type {import('@lang-tag/cli/config').LangTagCLIConfig} */
 const config = {

package/package.json

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

package/template/base-app.mustache

@@ -33,7 +33,6 @@ export function {{tagName}}{{#isTypeScript}}<T extends LangTagTranslations>{{/is
     //         transform: ({ path, params }) => t(path, params),
     //     });
     // };
-    // 
     // // SSR
     // const initT = async (language?: string) => {
     //     const { t } = await initTranslations({ language, namespaces: [namespace] });
@@ -51,22 +50,18 @@ export function {{tagName}}{{#isTypeScript}}<T extends LangTagTranslations>{{/is
         });
     };
 
-    const client = () => {
-        {{#isReact}}
-        return useMemo(() => createTranslations(), []);
-        {{/isReact}}
-        {{^isReact}}
-        return createTranslations();
-        {{/isReact}}
-    };
-
-    const server = () => {
-        return createTranslations();
-    };
-
     return {
-        client,
-        server,
+        client: () => {
+            {{#isReact}}
+            return useMemo(() => createTranslations(), []);
+            {{/isReact}}
+            {{^isReact}}
+            return createTranslations();
+            {{/isReact}}
+        },
+        server: () => {
+            return createTranslations();
+        },
         {{#isTypeScript}}
         Type: {} as CallableTranslations<T>,
         {{/isTypeScript}}

package/template/base-library.mustache

@@ -40,45 +40,36 @@ export function {{tagName}}<T extends LangTagTranslations>(
 
     {{#isReact}}
     const Context = createContext{{#isTypeScript}}<CallableTranslations<T> | null>{{/isTypeScript}}(null);
-
-    const useTranslations = () => {
-        const contextTranslations = useContext(Context);
-        return useMemo(() => createTranslationHelper(contextTranslations), [contextTranslations]);
-    };
-
-    const initTranslations = (translations{{#isTypeScript}}?: PartialFlexibleTranslations<T>{{/isTypeScript}}) => {
-        const normalized = useMemo(
-            () => translations ? normalizeTranslations(translations) : null,
-            [translations]
-        );
-
-        return useMemo(() => createTranslationHelper(normalized), [normalized]);
-    };
-
-    function Provider({translations, children}{{#isTypeScript}}: { translations?: PartialFlexibleTranslations<T>; children: ReactNode }{{/isTypeScript}}){{#isTypeScript}}: ReactNode{{/isTypeScript}} {
-        const normalized = useMemo(
-            () => translations ? normalizeTranslations(translations) : null,
-            [translations]
-        );
-
-        return <Context.Provider value={normalized}>{children}</Context.Provider>;
-    }
-    {{/isReact}}
-    {{^isReact}}
-    const initTranslations = (translations{{#isTypeScript}}?: PartialFlexibleTranslations<T>{{/isTypeScript}}) => {
-        const normalized = translations ? normalizeTranslations(translations) : null;
-        return createTranslationHelper(normalized);
-    };
     {{/isReact}}
 
     return {
         {{#isReact}}
-        useTranslations,
-        initTranslations,
-        Provider,
+        useTranslations: () => {
+            const contextTranslations = useContext(Context);
+            return useMemo(() => createTranslationHelper(contextTranslations), [contextTranslations]);
+        },
+        initTranslations: (translations{{#isTypeScript}}?: PartialFlexibleTranslations<T>{{/isTypeScript}}) => {
+            const normalized = useMemo(
+                () => translations ? normalizeTranslations(translations) : null,
+                [translations]
+            );
+
+            return useMemo(() => createTranslationHelper(normalized), [normalized]);
+        },
+        Provider({translations, children}{{#isTypeScript}}: { translations?: PartialFlexibleTranslations<T>; children: ReactNode }{{/isTypeScript}}){{#isTypeScript}}: ReactNode{{/isTypeScript}} {
+            const normalized = useMemo(
+                () => translations ? normalizeTranslations(translations) : null,
+                [translations]
+            );
+
+            return <Context.Provider value={normalized}>{children}</Context.Provider>;
+        },
         {{/isReact}}
         {{^isReact}}
-        initTranslations,
+        initTranslations: (translations{{#isTypeScript}}?: PartialFlexibleTranslations<T>{{/isTypeScript}}) => {
+            const normalized = translations ? normalizeTranslations(translations) : null;
+            return createTranslationHelper(normalized);
+        };,
         {{/isReact}}
         {{#isTypeScript}}
         InputType: {} as PartialFlexibleTranslations<T>,