@formatjs/cli 5.1.1 → 5.1.3

package/bin/formatjs

@@ -150564,7 +150564,7 @@ var require_interpolate_name = __commonJS({
       }
       let url = filename;
       if (content) {
-        url = url.replace(/\[(?:([^:\]]+):)?(?:hash|contenthash)(?::([a-z]+\d*))?(?::(\d+))?\]/gi, (_, hashType, digestType, maxLength) => getHashDigest(content, hashType, digestType, parseInt(maxLength, 10)));
+        url = url.replace(/\[(?:([^:\]]+):)?(?:hash|contenthash)(?::([a-z]+\d*[a-z]*))?(?::(\d+))?\]/gi, (_, hashType, digestType, maxLength) => getHashDigest(content, hashType, digestType, parseInt(maxLength, 10)));
       }
       url = url.replace(/\[ext\]/gi, () => ext).replace(/\[name\]/gi, () => basename2).replace(/\[path\]/gi, () => directory).replace(/\[folder\]/gi, () => folder).replace(/\[query\]/gi, () => query);
       if (regExp && loaderContext.resourcePath) {
@@ -154535,9 +154535,9 @@ var require_printer = __commonJS({
     }
     exports.printAST = printAST2;
     function doPrintAST(ast, isInPlural) {
-      var printedNodes = ast.map(function(el) {
+      var printedNodes = ast.map(function(el, i) {
         if ((0, types_1.isLiteralElement)(el)) {
-          return printLiteralElement(el, isInPlural);
+          return printLiteralElement(el, isInPlural, i === 0, i === ast.length - 1);
         }
         if ((0, types_1.isArgumentElement)(el)) {
           return printArgumentElement(el);
@@ -154567,9 +154567,16 @@ var require_printer = __commonJS({
     function printEscapedMessage(message) {
       return message.replace(/([{}](?:.*[{}])?)/su, "'$1'");
     }
-    function printLiteralElement(_a, isInPlural) {
+    function printLiteralElement(_a, isInPlural, isFirstEl, isLastEl) {
       var value = _a.value;
-      var escaped = printEscapedMessage(value);
+      var escaped = value;
+      if (!isFirstEl && escaped[0] === "'") {
+        escaped = "''".concat(escaped.slice(1));
+      }
+      if (!isLastEl && escaped[escaped.length - 1] === "'") {
+        escaped = "".concat(escaped.slice(0, escaped.length - 1), "''");
+      }
+      escaped = printEscapedMessage(escaped);
       return isInPlural ? escaped.replace("#", "'#'") : escaped;
     }
     function printArgumentElement(_a) {
@@ -154636,7 +154643,7 @@ var require_manipulator = __commonJS({
       if (Array.isArray(obj)) {
         return tslib_1.__spreadArray([], obj.map(cloneDeep), true);
       }
-      if (typeof obj === "object") {
+      if (obj !== null && typeof obj === "object") {
         return Object.keys(obj).reduce(function(cloned, k) {
           cloned[k] = cloneDeep(obj[k]);
           return cloned;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formatjs/cli",
-  "version": "5.1.1",
+  "version": "5.1.3",
   "description": "A CLI for formatjs.",
   "keywords": [
     "intl",
@@ -33,7 +33,7 @@
     "url": "https://github.com/formatjs/formatjs/issues"
   },
   "devDependencies": {
-    "@formatjs/cli-lib": "5.1.1"
+    "@formatjs/cli-lib": "5.1.3"
   },
   "peerDependencies": {
     "@vue/compiler-sfc": "^3.2.34"