@lingui/core 5.3.2 → 5.3.3

package/dist/index.cjs

@@ -1,6 +1,5 @@
 'use strict';
 
-const unraw = require('unraw');
 const compileMessage = require('@lingui/message-utils/compileMessage');
 
 const isString = (s) => typeof s === "string";
@@ -109,7 +108,23 @@ const formats = {
   time: time
 };
 
-const UNICODE_REGEX = /\\u[a-fA-F0-9]{4}|\\x[a-fA-F0-9]{2}/;
+const ESCAPE_SEQUENCE_REGEX = /\\u[a-fA-F0-9]{4}|\\x[a-fA-F0-9]{2}/;
+const decodeEscapeSequences = (str) => {
+  return str.replace(
+    // Same pattern but with capturing groups for extracting values during replacement
+    /\\u([a-fA-F0-9]{4})|\\x([a-fA-F0-9]{2})/g,
+    (_, unicode, hex) => {
+      if (unicode) {
+        const codePoint = parseInt(unicode, 16);
+        return String.fromCharCode(codePoint);
+      } else {
+        const codePoint = parseInt(hex, 16);
+        return String.fromCharCode(codePoint);
+      }
+    }
+  );
+};
+
 const OCTOTHORPE_PH = "%__lingui_octothorpe__%";
 const getDefaultFormats = (locale, passedLocales, formats = {}) => {
   const locales = passedLocales || locale;
@@ -186,8 +201,8 @@ function interpolate(translation, locale, locales) {
       }, "");
     };
     const result = formatMessage(translation);
-    if (isString(result) && UNICODE_REGEX.test(result)) {
-      return unraw.unraw(result);
+    if (isString(result) && ESCAPE_SEQUENCE_REGEX.test(result)) {
+      return decodeEscapeSequences(result);
     }
     if (isString(result))
       return result;
@@ -395,8 +410,8 @@ Please compile your catalog first.
 `);
       }
     }
-    if (isString(translation) && UNICODE_REGEX.test(translation))
-      return JSON.parse(`"${translation}"`);
+    if (isString(translation) && ESCAPE_SEQUENCE_REGEX.test(translation))
+      return decodeEscapeSequences(translation);
     if (isString(translation))
       return translation;
     return interpolate(

package/dist/index.mjs

@@ -1,4 +1,3 @@
-import { unraw } from 'unraw';
 import { compileMessage } from '@lingui/message-utils/compileMessage';
 
 const isString = (s) => typeof s === "string";
@@ -107,7 +106,23 @@ const formats = {
   time: time
 };
 
-const UNICODE_REGEX = /\\u[a-fA-F0-9]{4}|\\x[a-fA-F0-9]{2}/;
+const ESCAPE_SEQUENCE_REGEX = /\\u[a-fA-F0-9]{4}|\\x[a-fA-F0-9]{2}/;
+const decodeEscapeSequences = (str) => {
+  return str.replace(
+    // Same pattern but with capturing groups for extracting values during replacement
+    /\\u([a-fA-F0-9]{4})|\\x([a-fA-F0-9]{2})/g,
+    (_, unicode, hex) => {
+      if (unicode) {
+        const codePoint = parseInt(unicode, 16);
+        return String.fromCharCode(codePoint);
+      } else {
+        const codePoint = parseInt(hex, 16);
+        return String.fromCharCode(codePoint);
+      }
+    }
+  );
+};
+
 const OCTOTHORPE_PH = "%__lingui_octothorpe__%";
 const getDefaultFormats = (locale, passedLocales, formats = {}) => {
   const locales = passedLocales || locale;
@@ -184,8 +199,8 @@ function interpolate(translation, locale, locales) {
       }, "");
     };
     const result = formatMessage(translation);
-    if (isString(result) && UNICODE_REGEX.test(result)) {
-      return unraw(result);
+    if (isString(result) && ESCAPE_SEQUENCE_REGEX.test(result)) {
+      return decodeEscapeSequences(result);
     }
     if (isString(result))
       return result;
@@ -393,8 +408,8 @@ Please compile your catalog first.
 `);
       }
     }
-    if (isString(translation) && UNICODE_REGEX.test(translation))
-      return JSON.parse(`"${translation}"`);
+    if (isString(translation) && ESCAPE_SEQUENCE_REGEX.test(translation))
+      return decodeEscapeSequences(translation);
     if (isString(translation))
       return translation;
     return interpolate(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/core",
-  "version": "5.3.2",
+  "version": "5.3.3",
   "sideEffects": false,
   "description": "I18n tools for javascript",
   "main": "./dist/index.cjs",
@@ -26,7 +26,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/lingui/js-lingui.git"
+    "url": "git+https://github.com/lingui/js-lingui.git",
+    "directory": "packages/core"
   },
   "bugs": {
     "url": "https://github.com/lingui/js-lingui/issues"
@@ -60,15 +61,14 @@
   ],
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@lingui/message-utils": "5.3.2",
-    "unraw": "^3.0.0"
+    "@lingui/message-utils": "5.3.3"
   },
   "devDependencies": {
     "@lingui/jest-mocks": "*",
     "unbuild": "2.0.0"
   },
   "peerDependencies": {
-    "@lingui/babel-plugin-lingui-macro": "5.3.2",
+    "@lingui/babel-plugin-lingui-macro": "5.3.3",
     "babel-plugin-macros": "2 || 3"
   },
   "peerDependenciesMeta": {
@@ -79,5 +79,5 @@
       "optional": true
     }
   },
-  "gitHead": "37f40ec18928b357c07a228947b2bf071e92449e"
+  "gitHead": "f8dc4af3d9110f53613bb1b2fb303d6751e7a7b1"
 }