@nimpl/i18n 0.0.0-experimental-0b32faf → 0.0.0-experimental-47e75fe

package/ClientTranslation.d.ts

@@ -1,10 +1,9 @@
 import React from "react";
 import { type I18nOptions } from "./types";
+import { type TranslationProps } from "./lib/Translation";
 type ClientTranslationProps = {
     term: string;
-    components?: {
-        [key: string]: React.ReactElement;
-    };
+    components?: TranslationProps["components"];
     query?: I18nOptions["query"];
     removeUnusedQueries?: I18nOptions["removeUnusedQueries"];
 };

package/ServerTranslation.d.ts

@@ -1,10 +1,9 @@
 import React from "react";
 import { type I18nOptions } from "./types";
+import { type TranslationProps } from "./lib/Translation";
 type ServerTranslationProps = {
     term: string;
-    components?: {
-        [key: string]: React.ReactElement;
-    };
+    components?: TranslationProps["components"];
     query?: I18nOptions["query"];
     removeUnusedQueries?: I18nOptions["removeUnusedQueries"];
     language?: string;

package/dist/lib/Translation.js

@@ -5,25 +5,59 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = __importDefault(require("react"));
+const parseTag = (tag) => {
+    const isSelfClosing = tag.endsWith("/>");
+    const isClosing = tag[1] === "/";
+    const start = isClosing ? 2 : 1;
+    const end = isSelfClosing
+        ? tag.indexOf(" ") !== -1 && tag.indexOf(" ") < tag.length - 2
+            ? tag.indexOf(" ")
+            : tag.length - 2
+        : tag.length - 1;
+    return {
+        name: tag.slice(start, end),
+        type: isSelfClosing ? "self" : isClosing ? "close" : "open",
+    };
+};
+const splitByTags = (text) => {
+    const parts = [];
+    const tags = [];
+    let current = "";
+    let i = 0;
+    while (i < text.length) {
+        if (text[i] === "<") {
+            const closeIndex = text.indexOf(">", i);
+            if (closeIndex !== -1) {
+                parts.push(current);
+                current = "";
+                tags.push(text.slice(i, closeIndex + 1));
+                i = closeIndex + 1;
+                continue;
+            }
+        }
+        current += text[i];
+        i++;
+    }
+    parts.push(current);
+    return { parts, tags };
+};
 const Translation = ({ term, text, components }) => {
-    const parts = text
-        .split(/<\/?[a-zA-Z0-9]+>|<[a-zA-Z0-9]+ ?\/>/gm)
-        .map((el, i) => react_1.default.createElement(react_1.default.Fragment, { key: `p-${i}` }, el));
+    const { parts: textParts, tags } = splitByTags(text);
+    const parts = textParts.map((el, i) => react_1.default.createElement(react_1.default.Fragment, { key: `p-${i}` }, el));
     if (components) {
-        const tags = text.match(/<\/?[a-zA-Z0-9]+>|<[a-zA-Z0-9]+ ?\/>/gm);
         const openedTags = [];
-        tags?.forEach((tag, tagIndex) => {
-            const tagName = tag.match(/[a-zA-Z0-9]+/)[0];
-            if (tag.match(/<[a-zA-Z0-9]+ ?\/>/)) {
-                const component = components[tagName];
-                if (component) {
-                    parts.splice(tagIndex + 1, 1, react_1.default.cloneElement(component, { key: `c-${tagIndex}` }, component.props.children));
+        tags.forEach((tag, tagIndex) => {
+            const { name: tagName, type: tagType } = parseTag(tag);
+            if (tagType === "self") {
+                const Component = components[tagName];
+                if (Component) {
+                    parts.splice(tagIndex + 1, 1, react_1.default.createElement(Component, { key: `c-${tagIndex}` }));
                 }
                 else {
                     console.warn(`Unknown component for term "${term}" - ${tagName}`);
                 }
             }
-            else if (tag.match(/<\/[a-zA-Z0-9]+>/)) {
+            else if (tagType === "close") {
                 const openedTagIndex = openedTags.findIndex((i) => i.tag === tagName);
                 if (openedTagIndex !== -1) {
                     const lastOpenedIndex = openedTags.length - 1 - openedTagIndex;
@@ -31,13 +65,15 @@ const Translation = ({ term, text, components }) => {
                     for (let i = openedTagsLength; i > lastOpenedIndex; i--) {
                         const targetIndex = i - 1;
                         const targetTag = openedTags[targetIndex];
-                        const component = components[targetTag.tag];
-                        if (component) {
+                        const Component = components[targetTag.tag];
+                        if (Component) {
                             const children = parts
                                 .slice(targetTag.position + 1, tagIndex + 1)
-                                .filter((c) => Boolean(c && typeof c === "object" && "props" in c && c.props.children));
-                            parts.splice(targetTag.position + 1, // parts на 1 больше
-                            tagIndex - targetTag.position, react_1.default.cloneElement(component, { key: `${tagIndex}-${targetIndex}` }, children.length ? children : component.props.children));
+                                .filter((child) => Boolean(child &&
+                                typeof child === "object" &&
+                                "props" in child &&
+                                child.props.children));
+                            parts.splice(targetTag.position + 1, tagIndex - targetTag.position, react_1.default.createElement(Component, { key: `${tagIndex}-${targetIndex}` }, children));
                         }
                         else {
                             console.warn(`Unknown component for term "${term}" - ${targetTag}`);

package/dist/lib/injectQuery.js

@@ -1,17 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const injectQuery = ({ text, query, removeUnusedQueries }) => {
-    const newText = text.replace(/{{([a-zA-Z0-9_-]+)}}/gm, (matched, g1) => {
-        if (query[g1]) {
-            return query[g1].toString();
+    let result = "";
+    let i = 0;
+    while (i < text.length) {
+        if (text[i] === "{" && text[i + 1] === "{") {
+            const closeIndex = text.indexOf("}}", i + 2);
+            if (closeIndex !== -1) {
+                const key = text.slice(i + 2, closeIndex);
+                const value = query[key];
+                if (value !== undefined) {
+                    result += value.toString();
+                }
+                else {
+                    console.warn(`Query key "${key}" not found in options for "${text}"`);
+                    if (!removeUnusedQueries) {
+                        result += text.slice(i, closeIndex + 2);
+                    }
+                }
+                i = closeIndex + 2;
+                continue;
+            }
         }
-        if (removeUnusedQueries) {
-            return "";
-        }
-        else {
-            return matched;
-        }
-    });
-    return newText;
+        result += text[i];
+        i++;
+    }
+    return result;
 };
 exports.default = injectQuery;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nimpl/i18n",
-  "version": "0.0.0-experimental-0b32faf",
+  "version": "0.0.0-experimental-47e75fe",
   "description": "i18n library for working with translations in server and client components",
   "exports": {
     "./ClientTranslation": {