@chaoswise/intl 2.1.3 → 2.1.5

package/lib/index.js

@@ -25,5 +25,5 @@ _Object$defineProperty(exports, "useIntl", {
 });
 var _useIntl = _interopRequireDefault(require("./useIntl"));
 var _context = _interopRequireDefault(require("./useIntl/context"));
-var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
+var _reactIntlUniversal = _interopRequireDefault(require("./react-intl-universal"));
 _reactIntlUniversal["default"].options.escapeHtml = false;

package/lib/react-intl-universal/ReactIntlUniversal.js

@@ -0,0 +1,329 @@
+"use strict";
+
+var _typeof = require("@babel/runtime-corejs3/helpers/typeof");
+var _WeakMap = require("@babel/runtime-corejs3/core-js-stable/weak-map");
+var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
+var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor");
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
+_Object$defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
+var _assign = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/assign"));
+var _indexOf = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/index-of"));
+var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/promise"));
+var _urlSearchParams = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/url-search-params"));
+var _reduce = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/reduce"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/createClass"));
+var _react = _interopRequireDefault(require("react"));
+var _intlMessageformat = _interopRequireDefault(require("intl-messageformat"));
+var _escapeHtml = _interopRequireDefault(require("escape-html"));
+var _cookie = _interopRequireDefault(require("cookie"));
+var _invariant = _interopRequireDefault(require("invariant"));
+var constants = _interopRequireWildcard(require("./constants"));
+var _lodash = _interopRequireDefault(require("lodash.merge"));
+function _getRequireWildcardCache(e) { if ("function" != typeof _WeakMap) return null; var r = new _WeakMap(), t = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = _Object$defineProperty && _Object$getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? _Object$getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? _Object$defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+String.prototype.defaultMessage = String.prototype.d = function (msg) {
+  return this || msg || "";
+};
+var ReactIntlUniversal = /*#__PURE__*/function () {
+  function ReactIntlUniversal() {
+    (0, _classCallCheck2["default"])(this, ReactIntlUniversal);
+    this.options = {
+      currentLocale: null,
+      // Current locale such as 'en-US'
+      locales: {},
+      // app locale data like {"en-US":{"key1":"value1"},"zh-CN":{"key1":"值1"}}
+      warningHandler: function warn() {
+        var _console;
+        (_console = console).warn.apply(_console, arguments);
+      },
+      // ability to accumulate missing messages using third party services
+      escapeHtml: true,
+      // disable escape html in variable mode
+      fallbackLocale: null,
+      // Locale to use if a key is not found in the current locale
+      debug: false,
+      // If debugger mode is on, the message will be wrapped by a span
+      dataKey: 'data-i18n-key' // If debugger mode is on, the message will be wrapped by a span with this data key
+    };
+  }
+
+  /**
+   * Get the formatted message by key
+   * @param {string} key The string representing key in locale data file
+   * @param {Object} variables Variables in message
+   * @returns {string} message
+   */
+  (0, _createClass2["default"])(ReactIntlUniversal, [{
+    key: "_getFormattedMessage",
+    value: function _getFormattedMessage(key, variables) {
+      if (this.options.intlGetHook) {
+        try {
+          this.options.intlGetHook(key, this.options.currentLocale);
+        } catch (e) {
+          console.log('intl get hook error: ', e);
+        }
+      }
+      (0, _invariant["default"])(key, "key is required");
+      var _this$options = this.options,
+        locales = _this$options.locales,
+        currentLocale = _this$options.currentLocale,
+        formats = _this$options.formats;
+
+      // 1. check if the locale data and key exists
+      if (!locales || !locales[currentLocale]) {
+        var errorMsg = "react-intl-universal locales data \"".concat(currentLocale, "\" not exists.");
+        if (!currentLocale) {
+          errorMsg += ' More info: https://github.com/alibaba/react-intl-universal/issues/144#issuecomment-1345193138';
+        }
+        this.options.warningHandler(errorMsg);
+        return "";
+      }
+      var msg = this.getDescendantProp(locales[currentLocale], key);
+      if (msg == null) {
+        if (this.options.fallbackLocale) {
+          msg = this.getDescendantProp(locales[this.options.fallbackLocale], key);
+          if (msg == null) {
+            var _context, _context2;
+            this.options.warningHandler((0, _concat["default"])(_context = (0, _concat["default"])(_context2 = "react-intl-universal key \"".concat(key, "\" not defined in ")).call(_context2, currentLocale, " or the fallback locale, ")).call(_context, this.options.fallbackLocale));
+            return "";
+          }
+        } else {
+          var _context3;
+          this.options.warningHandler((0, _concat["default"])(_context3 = "react-intl-universal key \"".concat(key, "\" not defined in ")).call(_context3, currentLocale));
+          return "";
+        }
+      }
+      // Fixed 处理翻译为空串的时候显示.d()中默认翻译的情况
+      if (msg == "") {
+        var nullStr = new String("");
+        nullStr.defaultMessage = nullStr.d = function () {
+          return "";
+        };
+        return nullStr;
+      }
+
+      // 2. handle security issue for variables
+      if (variables) {
+        variables = (0, _assign["default"])({}, variables);
+        // HTML message with variables. Escape it to avoid XSS attack.
+        for (var i in variables) {
+          var value = variables[i];
+          if (this.options.escapeHtml === true && (typeof value === "string" || value instanceof String) && (0, _indexOf["default"])(value).call(value, "<") >= 0) {
+            value = (0, _escapeHtml["default"])(value);
+          }
+          variables[i] = value;
+        }
+      }
+
+      // 3. resolve variables
+      try {
+        var finalMsg;
+        if (variables) {
+          // format message with variables
+          var msgFormatter = new _intlMessageformat["default"](msg, currentLocale, formats);
+          finalMsg = msgFormatter.format(variables);
+        } else {
+          // no variables, just return the message
+          finalMsg = msg;
+        }
+        return finalMsg;
+      } catch (err) {
+        this.options.warningHandler("react-intl-universal format message failed for key='".concat(key, "'."), err.message);
+        return msg;
+      }
+    }
+
+    /**
+     * Get the formatted message by key
+     * @param {string} key The string representing key in locale data file
+     * @param {Object} [variables] Variables in message
+     * @returns {string} message
+     */
+  }, {
+    key: "get",
+    value: function get(key, variables) {
+      var msg = this._getFormattedMessage(key, variables);
+      return this.options.debug ? this._getSpanElementMessage(key, msg) : msg;
+    }
+
+    /**
+     * Get the formatted html message by key.
+     * @param {string} key The string representing key in locale data file
+     * @param {Object} [variables] Variables in message
+     * @returns {React.ReactElement} html message
+    */
+  }, {
+    key: "getHTML",
+    value: function getHTML(key, variables) {
+      var msg = this._getFormattedMessage(key, variables);
+      if (msg) {
+        return this._getSpanElementMessage(key, msg);
+      }
+      return "";
+    }
+
+    /**
+     * As same as get(...) API
+     * @param {Object} options
+     * @param {string} options.id
+     * @param {string} options.defaultMessage
+     * @param {Object} variables Variables in message
+     * @returns {string} message
+    */
+  }, {
+    key: "formatMessage",
+    value: function formatMessage(messageDescriptor, variables) {
+      var id = messageDescriptor.id,
+        defaultMessage = messageDescriptor.defaultMessage;
+      return this.get(id, variables).defaultMessage(defaultMessage);
+    }
+
+    /**
+     * As same as getHTML(...) API
+     * @param {Object} options
+     * @param {string} options.id
+     * @param {React.Element} options.defaultMessage
+     * @param {Object} variables Variables in message
+     * @returns {React.Element} message
+    */
+  }, {
+    key: "formatHTMLMessage",
+    value: function formatHTMLMessage(messageDescriptor, variables) {
+      var id = messageDescriptor.id,
+        defaultMessage = messageDescriptor.defaultMessage;
+      return this.getHTML(id, variables).defaultMessage(defaultMessage);
+    }
+
+    /**
+     * Helper: determine user's locale via URL, cookie, localStorage, and browser's language.
+     * You may not need this API, if you have other rules to determine user's locale.
+     * @param {string} options.urlLocaleKey URL's query Key to determine locale. Example: if URL=http://localhost?lang=en-US, then set it 'lang'
+     * @param {string} options.cookieLocaleKey Cookie's Key to determine locale. Example: if cookie=lang:en-US, then set it 'lang'
+     * @param {string} options.localStorageLocaleKey LocalStorage's Key to determine locale such as 'lang'
+     * @returns {string} determined locale such as 'en-US'
+     */
+  }, {
+    key: "determineLocale",
+    value: function determineLocale() {
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      return this.getLocaleFromURL(options) || this.getLocaleFromCookie(options) || this.getLocaleFromLocalStorage(options) || this.getLocaleFromBrowser();
+    }
+
+    /**
+     * Initialize properties and load CLDR locale data according to currentLocale
+     * @param {Object} options
+     * @param {string} options.currentLocale Current locale such as 'en-US'
+     * @param {any} options.locales App locale data like {"en-US":{"key1":"value1"},"zh-CN":{"key1":"值1"}}
+     * @param {boolean} [options.debug] debug mode
+     * @returns {Promise}
+     */
+  }, {
+    key: "init",
+    value: function init() {
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      (0, _invariant["default"])(options.currentLocale, "options.currentLocale is required");
+      (0, _invariant["default"])(options.locales, "options.locales is required");
+      (0, _assign["default"])(this.options, options);
+      this.options.formats = (0, _assign["default"])({}, this.options.formats, constants.defaultFormats);
+      return new _promise["default"](function (resolve, reject) {
+        // init() will not load external common locale data anymore.
+        // But, it still return a Promise for backward compatibility.
+        resolve();
+      });
+    }
+
+    /**
+     * Get the inital options
+     */
+  }, {
+    key: "getInitOptions",
+    value: function getInitOptions() {
+      return this.options;
+    }
+
+    /**
+     * Load more locales after init
+     */
+  }, {
+    key: "load",
+    value: function load(locales) {
+      (0, _lodash["default"])(this.options.locales, locales);
+    }
+  }, {
+    key: "getLocaleFromCookie",
+    value: function getLocaleFromCookie(options) {
+      var cookieLocaleKey = options.cookieLocaleKey;
+      if (cookieLocaleKey) {
+        var params = _cookie["default"].parse(document.cookie);
+        return params && params[cookieLocaleKey];
+      }
+    }
+  }, {
+    key: "getLocaleFromLocalStorage",
+    value: function getLocaleFromLocalStorage(options) {
+      var localStorageLocaleKey = options.localStorageLocaleKey;
+      if (localStorageLocaleKey && window.localStorage) {
+        return localStorage.getItem(localStorageLocaleKey);
+      }
+    }
+  }, {
+    key: "getLocaleFromURL",
+    value: function getLocaleFromURL(options) {
+      var urlLocaleKey = options.urlLocaleKey;
+      if (urlLocaleKey) {
+        var query = location.search.split("?");
+        if (query.length >= 2) {
+          var params = new _urlSearchParams["default"](query[1]);
+          if (params.has(urlLocaleKey)) {
+            return params.get(urlLocaleKey);
+          }
+        }
+      }
+    }
+  }, {
+    key: "getDescendantProp",
+    value: function getDescendantProp(locale, key) {
+      var _context4;
+      if (locale[key]) {
+        return locale[key];
+      }
+      var msg = (0, _reduce["default"])(_context4 = key.split(".")).call(_context4, function (a, b) {
+        return a != undefined ? a[b] : a;
+      }, locale);
+      return msg;
+    }
+  }, {
+    key: "getLocaleFromBrowser",
+    value: function getLocaleFromBrowser() {
+      return navigator.language || navigator.userLanguage;
+    }
+  }, {
+    key: "_getSpanElementMessage",
+    value: function _getSpanElementMessage(key, msg) {
+      var options = {
+        dangerouslySetInnerHTML: {
+          __html: msg
+        }
+      };
+      if (this.options.debug) {
+        options[this.options.dataKey] = key;
+      }
+      var el = _react["default"].createElement('span', options);
+      // when key exists, it should still return element if there's defaultMessage() after getHTML()
+      var defaultMessage = function defaultMessage() {
+        return el;
+      };
+      return (0, _assign["default"])({
+        defaultMessage: defaultMessage,
+        d: defaultMessage
+      }, el);
+    }
+  }]);
+  return ReactIntlUniversal;
+}();
+var _default = exports["default"] = ReactIntlUniversal;

package/lib/react-intl-universal/constants.js

@@ -0,0 +1,22 @@
+"use strict";
+
+var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
+_Object$defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.defaultFormats = void 0;
+/**
+ * Currency code list
+ * https://www.currency-iso.org/en/home/tables/table-a1.html
+ */
+var currency = ["AFN", "EUR", "ALL", "DZD", "USD", "AOA", "XCD", "ARS", "AMD", "AWG", "AUD", "AZN", "BSD", "BHD", "BDT", "BBD", "BYN", "BZD", "XOF", "BMD", "INR", "BTN", "BOB", "BOV", "BAM", "BWP", "NOK", "BRL", "BND", "BGN", "BIF", "CVE", "KHR", "XAF", "CAD", "KYD", "CLP", "CLF", "CNY", "COP", "COU", "KMF", "CDF", "NZD", "CRC", "HRK", "CUP", "CUC", "ANG", "CZK", "DKK", "DJF", "DOP", "EGP", "SVC", "ERN", "ETB", "FKP", "FJD", "XPF", "GMD", "GEL", "GHS", "GIP", "GTQ", "GBP", "GNF", "GYD", "HTG", "HNL", "HKD", "HUF", "ISK", "IDR", "XDR", "IRR", "IQD", "ILS", "JMD", "JPY", "JOD", "KZT", "KES", "KPW", "KRW", "KWD", "KGS", "LAK", "LBP", "LSL", "ZAR", "LRD", "LYD", "CHF", "MOP", "MKD", "MGA", "MWK", "MYR", "MVR", "MRO", "MUR", "XUA", "MXN", "MXV", "MDL", "MNT", "MAD", "MZN", "MMK", "NAD", "NPR", "NIO", "NGN", "OMR", "PKR", "PAB", "PGK", "PYG", "PEN", "PHP", "PLN", "QAR", "RON", "RUB", "RWF", "SHP", "WST", "STD", "SAR", "RSD", "SCR", "SLL", "SGD", "XSU", "SBD", "SOS", "SSP", "LKR", "SDG", "SRD", "SZL", "SEK", "CHE", "CHW", "SYP", "TWD", "TJS", "TZS", "THB", "TOP", "TTD", "TND", "TRY", "TMT", "UGX", "UAH", "AED", "USN", "UYU", "UYI", "UZS", "VUV", "VEF", "VND", "YER", "ZMW", "ZWL", "XBA", "XBB", "XBC", "XBD", "XTS", "XXX", "XAU", "XPD", "XPT", "XAG"];
+var numberFormat = {};
+for (var i = 0; i < currency.length; i++) {
+  numberFormat[currency[i]] = {
+    style: 'currency',
+    currency: currency[i]
+  };
+}
+var defaultFormats = exports.defaultFormats = {
+  number: numberFormat
+};

package/lib/react-intl-universal/index.js

@@ -0,0 +1,35 @@
+"use strict";
+
+var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
+_Object$defineProperty(exports, "__esModule", {
+  value: true
+});
+_Object$defineProperty(exports, "ReactIntlUniversal", {
+  enumerable: true,
+  get: function get() {
+    return _ReactIntlUniversal["default"];
+  }
+});
+exports.load = exports.init = exports.getLocaleFromURL = exports.getLocaleFromLocalStorage = exports.getLocaleFromCookie = exports.getLocaleFromBrowser = exports.getInitOptions = exports.getHTML = exports.getDescendantProp = exports.get = exports.formatMessage = exports.formatHTMLMessage = exports.determineLocale = exports["default"] = void 0;
+var _bind = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/bind"));
+var _ReactIntlUniversal = _interopRequireDefault(require("./ReactIntlUniversal"));
+var _context, _context2, _context3, _context4, _context5, _context6, _context7, _context8, _context9, _context10, _context11, _context12, _context13;
+var defaultInstance = exports["default"] = new _ReactIntlUniversal["default"]();
+// resolved by CommonJS module loader
+defaultInstance.ReactIntlUniversal = _ReactIntlUniversal["default"];
+// react pattern: https://github.com/facebook/react/blob/main/packages/react/src/React.js
+var get = exports.get = (0, _bind["default"])(_context = defaultInstance.get).call(_context, defaultInstance);
+var getHTML = exports.getHTML = (0, _bind["default"])(_context2 = defaultInstance.getHTML).call(_context2, defaultInstance);
+var formatMessage = exports.formatMessage = (0, _bind["default"])(_context3 = defaultInstance.formatMessage).call(_context3, defaultInstance);
+var formatHTMLMessage = exports.formatHTMLMessage = (0, _bind["default"])(_context4 = defaultInstance.formatHTMLMessage).call(_context4, defaultInstance);
+var determineLocale = exports.determineLocale = (0, _bind["default"])(_context5 = defaultInstance.determineLocale).call(_context5, defaultInstance);
+var init = exports.init = (0, _bind["default"])(_context6 = defaultInstance.init).call(_context6, defaultInstance);
+var getInitOptions = exports.getInitOptions = (0, _bind["default"])(_context7 = defaultInstance.getInitOptions).call(_context7, defaultInstance);
+var load = exports.load = (0, _bind["default"])(_context8 = defaultInstance.load).call(_context8, defaultInstance);
+var getLocaleFromCookie = exports.getLocaleFromCookie = (0, _bind["default"])(_context9 = defaultInstance.getLocaleFromCookie).call(_context9, defaultInstance);
+var getLocaleFromLocalStorage = exports.getLocaleFromLocalStorage = (0, _bind["default"])(_context10 = defaultInstance.getLocaleFromLocalStorage).call(_context10, defaultInstance);
+var getLocaleFromURL = exports.getLocaleFromURL = (0, _bind["default"])(_context11 = defaultInstance.getLocaleFromURL).call(_context11, defaultInstance);
+var getDescendantProp = exports.getDescendantProp = (0, _bind["default"])(_context12 = defaultInstance.getDescendantProp).call(_context12, defaultInstance);
+var getLocaleFromBrowser = exports.getLocaleFromBrowser = (0, _bind["default"])(_context13 = defaultInstance.getLocaleFromBrowser).call(_context13, defaultInstance);
+// resolved by ECMAScript module loader

package/lib/useIntl/index.js

@@ -8,7 +8,7 @@ _Object$defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
 var _react = require("react");
-var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
+var _reactIntlUniversal = _interopRequireDefault(require("../react-intl-universal"));
 var _useForceUpdate = _interopRequireDefault(require("./use-force-update"));
 var _context = _interopRequireDefault(require("./context"));
 var useIntl = function useIntl() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chaoswise/intl",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "author": "cloudwiser",
   "description": "intl",
   "main": "lib/index.js",
@@ -68,12 +68,18 @@
     "babel-plugin-macros": "^3.1.0",
     "babel-plugin-polyfill-corejs3": "^0.5.2",
     "chalk": "^2.4.1",
+    "cookie": "^0.3.1",
+    "escape-html": "^1.0.3",
     "glob": "^8.0.3",
     "gulp": "^4.0.2",
     "gulp-babel": "^8.0.0",
     "gulp-connect": "^5.7.0",
     "gulp-jsdoc3": "^3.0.0",
     "gulp-typescript": "^5.0.1",
+    "intl-messageformat": "^7.8.4",
+    "invariant": "^2.2.2",
+    "lodash.merge": "^4.6.2",
+    "object-keys": "^1.0.11",
     "prettier": "^2.8.1",
     "react-intl-universal": "^2.6.11",
     "uuid": "^9.0.0",
@@ -84,5 +90,5 @@
     "react-dom": "^16.13.1"
   },
   "license": "MIT",
-  "gitHead": "422bbd1a0545e50a6e8a6e41240536bbc5274e20"
+  "gitHead": "67bc8e208c0563dd1ce3d8508eb1c043970b0a95"
 }