util-helpers 4.10.2 → 4.11.1

package/esm/formatMoney.js

@@ -2,7 +2,7 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import { checkBoundary, scientificToNumber, isScientificNumber } from './utils/math.util';
 import isNaN from './utils/type/isNaN';
 import { trimLeftZero } from './utils/math.util';
-import { config } from './utils/config';
+import devWarn from './utils/devWarn';
 var reg = /^[+-]?\d*\.?\d*$/;
 /**
  * 检查数字或数字字符串
@@ -14,10 +14,7 @@ var reg = /^[+-]?\d*\.?\d*$/;
 
 function checkNumber(num) {
   if (!(reg.test(num) || isScientificNumber(num)) || isNaN(num) || typeof num !== 'number' && typeof num !== 'string' || num === '') {
-    if (!config.disableWarning) {
-      console.warn("".concat(num, " invalid parameter."));
-    }
-
+    devWarn("".concat(num, " invalid parameter."));
     return false;
   } // 数字超限如果不是是字符串，可能有异常
   // 如 1111111111111111111111 // => 1.1111111111111111e+21
@@ -153,12 +150,12 @@ var formatMoney = function formatMoney(num) {
   thousand = typeof thousand === 'string' ? thousand : ',';
   decimal = typeof decimal === 'string' ? decimal : '.'; // 转换数字字符串，支持科学记数法
 
-  var numStr = scientificToNumber(num) + ''; // 整数和小数部分
+  var strNum = scientificToNumber(num) + ''; // 整数和小数部分
 
-  var _numStr$split = numStr.split('.'),
-      _numStr$split2 = _slicedToArray(_numStr$split, 2),
-      intStr = _numStr$split2[0],
-      decStr = _numStr$split2[1];
+  var _strNum$split = strNum.split('.'),
+      _strNum$split2 = _slicedToArray(_strNum$split, 2),
+      intStr = _strNum$split2[0],
+      decStr = _strNum$split2[1];
 
   return symbol + formatInt(intStr, thousand) + formatDec(decStr, precision, decimal);
 };

package/esm/isBusinessLicense.js

@@ -24,8 +24,8 @@ function sumCheckCode(preCode) {
   } // 反模10计算
 
 
-  if (pj === 10 || pj === 1) {
-    retNum = 1;
+  if (pj === 1) {
+    retNum = 0;
   } else {
     retNum = 11 - pj;
   }
@@ -41,36 +41,37 @@ function sumCheckCode(preCode) {
  * @since 3.5.0
  * @param {*} value 要检测的值
  * @param {Object} [options] 配置项
- * @param {boolean} [options.loose=false] 宽松模式。如果为true，不校验校验位。
+ * @param {boolean} [options.checkCode=true] 是否校验最后一位校验码，如果为false，不校验校验位。
  * @returns {boolean} 值是否为营业执照号
  * @example
  *
  * isBusinessLicense('310115600985533');
  * // => true
  *
- * isBusinessLicense('3101156009');
- * // => false
- *
- * isBusinessLicense('3101156009', { loose: true });
- * // => false
- *
  * isBusinessLicense('310115600985535');
  * // => false
  *
- * isBusinessLicense('310115600985535', { loose: true });
+ * isBusinessLicense('310115600985535', { checkCode: false });
  * // => true
+ *
+ * isBusinessLicense('31011560098', { checkCode: false });
+ * // => false
  */
 
 
 function isBusinessLicense(value) {
-  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-      _ref$loose = _ref.loose,
-      loose = _ref$loose === void 0 ? false : _ref$loose;
-
-  var valueStr = normalizeString(value);
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var valueStr = normalizeString(value); // @ts-ignore
+  // TODO 下个版本废弃 loose
+
+  var _options$loose = options.loose,
+      loose = _options$loose === void 0 ? false : _options$loose,
+      _options$checkCode = options.checkCode,
+      cc = _options$checkCode === void 0 ? true : _options$checkCode;
+  var needCheckCode = !loose && cc;
   var passBaseRule = baseReg.test(valueStr); // 宽松模式 或 基础规则不通过直接返回
 
-  if (loose || !passBaseRule) {
+  if (!needCheckCode || !passBaseRule) {
     return passBaseRule;
   } // 前14位
 

package/esm/isChinese.js

@@ -18,14 +18,12 @@ var chineseDictionary = {
   chineseExtendF: "[\uD873\uDEB0-\uD87A\uDFE0]"
 };
 var looseChineseRegExp = chineseDictionary.chineseBasic + '+';
-var chineseRegExp = '^' + chineseDictionary.chineseBasic + '+$'; // eslint-disable-next-line no-prototype-builtins
+var chineseRegExp = '^' + chineseDictionary.chineseBasic + '+$';
+var chineseWithExtend = '(?:' + chineseDictionary.chineseBasic + '|' + chineseDictionary.chineseExtend + '|' + chineseDictionary.chineseExtendA + '|' + chineseDictionary.chineseExtendB + '|' + chineseDictionary.chineseExtendC + '|' + chineseDictionary.chineseExtendD + '|' + chineseDictionary.chineseExtendE + '|' + chineseDictionary.chineseExtendF + ')';
+var looseChineseExtendRegExp = chineseWithExtend + '+';
+var chineseExtendRegExp = '^' + chineseWithExtend + '+$'; // eslint-disable-next-line no-prototype-builtins
 
 var supportRegExpUnicode = RegExp.prototype.hasOwnProperty('unicode');
-
-if (supportRegExpUnicode) {
-  looseChineseRegExp = '(?:' + chineseDictionary.chineseBasic + '|' + chineseDictionary.chineseExtend + '|' + chineseDictionary.chineseExtendA + '|' + chineseDictionary.chineseExtendB + '|' + chineseDictionary.chineseExtendC + '|' + chineseDictionary.chineseExtendD + '|' + chineseDictionary.chineseExtendE + '|' + chineseDictionary.chineseExtendF + ')+';
-  chineseRegExp = '^(?:' + chineseDictionary.chineseBasic + '|' + chineseDictionary.chineseExtend + '|' + chineseDictionary.chineseExtendA + '|' + chineseDictionary.chineseExtendB + '|' + chineseDictionary.chineseExtendC + '|' + chineseDictionary.chineseExtendD + '|' + chineseDictionary.chineseExtendE + '|' + chineseDictionary.chineseExtendF + ')+$';
-}
 /**
  * 检测值是否为中文
  *
@@ -36,6 +34,7 @@ if (supportRegExpUnicode) {
  * @param {*} value 要检测的值
  * @param {Object} [options] 配置项
  * @param {boolean} [options.loose=false] 宽松模式。如果为true，只要包含中文即为true
+ * @param {boolean} [options.useExtend=false] 使用统一表意文字扩展A-F。注意：如果不支持 `RegExp.prototype.unicode`，扩展字符集将自动不生效，如IE浏览器。
  * @returns {boolean} 值是否为中文
  * @example
  *
@@ -46,22 +45,36 @@ if (supportRegExpUnicode) {
  * // => false
  *
  * // 宽松模式，只要包含中文即为true
- * isChinese('林A', {loose: true});
+ * isChinese('林A', { loose: true });
  * // => true
  *
- * isChinese('A林A', {loose: true});
+ * isChinese('A林A', { loose: true });
  * // => true
  *
+ * isChinese('𠮷');
+ * // => false
+ *
+ * // 使用中文扩展字符集，需要浏览器支持 RegExp.prototype.unicode 才生效。
+ * isChinese('𠮷', { useExtend: true });
+ * // => true
+ * isChinese('𠮷aa', { useExtend: true, loose: true });
+ * // => true
  */
 
-
 function isChinese(value) {
   var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
       _ref$loose = _ref.loose,
-      loose = _ref$loose === void 0 ? false : _ref$loose;
+      loose = _ref$loose === void 0 ? false : _ref$loose,
+      _ref$useExtend = _ref.useExtend,
+      useExtend = _ref$useExtend === void 0 ? false : _ref$useExtend;
 
   var valueStr = normalizeString(value);
-  var reg = new RegExp(loose ? looseChineseRegExp : chineseRegExp, supportRegExpUnicode ? 'u' : undefined);
+  var basicRegExp = loose ? looseChineseRegExp : chineseRegExp;
+  var extendRegExp = loose ? looseChineseExtendRegExp : chineseExtendRegExp;
+  var hasExtend = useExtend && supportRegExpUnicode;
+  var resultRegExp = hasExtend ? extendRegExp : basicRegExp;
+  var flag = hasExtend ? 'u' : undefined;
+  var reg = new RegExp(resultRegExp, flag);
   return reg.test(valueStr);
 }
 

package/esm/isSocialCreditCode.js

@@ -45,7 +45,7 @@ function sumCheckCode(preCode) {
  * @since 1.1.0
  * @param {*} value 要检测的值
  * @param {Object} [options] 配置项
- * @param {boolean} [options.loose=false] 宽松模式。如果为true，不校验校验位。
+ * @param {boolean} [options.checkCode=true] 是否校验最后一位校验码，如果为false，不校验校验位。
  * @returns {boolean} 值是否为统一社会信用代码
  * @example
  *
@@ -55,22 +55,29 @@ function sumCheckCode(preCode) {
  * isSocialCreditCode('91350100M000100Y4A');
  * // => false
  *
- * // 宽松模式，不校验校验位。所以也可以通过
- * isSocialCreditCode('91350100M000100Y4A', {loose: true});
+ * // 不校验校验位
+ * isSocialCreditCode('91350100M000100Y4A', { checkCode: false });
  * // => true
  *
+ * isSocialCreditCode('91350100M000100Y', { checkCode: false });
+ * // => false
+ *
  */
 
 
 function isSocialCreditCode(value) {
-  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-      _ref$loose = _ref.loose,
-      loose = _ref$loose === void 0 ? false : _ref$loose;
-
-  var valueStr = normalizeString(value);
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var valueStr = normalizeString(value); // @ts-ignore
+  // TODO 下个版本废弃 loose
+
+  var _options$loose = options.loose,
+      loose = _options$loose === void 0 ? false : _options$loose,
+      _options$checkCode = options.checkCode,
+      cc = _options$checkCode === void 0 ? true : _options$checkCode;
+  var needCheckCode = !loose && cc;
   var passBaseRule = baseReg.test(valueStr); // 宽松模式 或 基础规则不通过直接返回
 
-  if (loose || !passBaseRule) {
+  if (!needCheckCode || !passBaseRule) {
     return passBaseRule;
   } // 前17位
 

package/esm/numberToChinese.js

@@ -1,5 +1,5 @@
 import { checkBoundary } from './utils/math.util';
-import { config } from './utils/config'; // 简体
+import devWarn from './utils/devWarn'; // 简体
 
 var chnNumberChar = ['零', '一', '二', '三', '四', '五', '六', '七', '八', '九'];
 var chnUnitChar = ['', '十', '百', '千']; // 繁体
@@ -34,11 +34,11 @@ var unitSection;
  */
 
 function sectionToChinese(section) {
-  var str = '',
-      chnstr = '',
-      zero = false,
-      //zero为是否进行补零， 第一次进行取余由于为个位数，默认不补零
-  unitPos = 0;
+  var str = '';
+  var chnstr = '';
+  var zero = false; //zero为是否进行补零， 第一次进行取余由于为个位数，默认不补零
+
+  var unitPos = 0;
 
   while (section > 0) {
     // 对数字取余10，得到的数即为个位数
@@ -74,18 +74,18 @@ function sectionToChinese(section) {
 
 
 function convertInteger(num) {
-  num = Math.floor(num);
+  var numInt = Math.floor(num);
   var unitPos = 0;
-  var strIns = '',
-      chnStr = '';
+  var strIns = '';
+  var chnStr = '';
   var needZero = false;
 
-  if (num === 0) {
+  if (numInt === 0) {
     return numberChar[0];
   }
 
-  while (num > 0) {
-    var section = num % 10000;
+  while (numInt > 0) {
+    var section = numInt % 10000;
 
     if (needZero) {
       chnStr = numberChar[0] + chnStr;
@@ -95,7 +95,7 @@ function convertInteger(num) {
     strIns += section !== 0 ? unitSection[unitPos] : unitSection[0];
     chnStr = strIns + chnStr;
     needZero = section < 1000 && section > 0;
-    num = Math.floor(num / 10000);
+    numInt = Math.floor(numInt / 10000);
     unitPos++;
   }
 
@@ -110,12 +110,12 @@ function convertInteger(num) {
 
 
 function convertDecimal(num) {
-  var numStr = num + '';
-  var index = numStr.indexOf('.');
+  var strNum = num + '';
+  var index = strNum.indexOf('.');
   var ret = '';
 
   if (index > -1) {
-    var decimalStr = numStr.slice(index + 1);
+    var decimalStr = strNum.slice(index + 1);
     ret = mapNumberChar(parseInt(decimalStr));
   }
 
@@ -131,11 +131,11 @@ function convertDecimal(num) {
 
 
 function mapNumberChar(num) {
-  var numStr = num + '';
+  var strNum = num + '';
   var ret = '';
 
-  for (var i = 0, len = numStr.length; i < len; i++) {
-    ret += numberChar[parseInt(numStr[i])];
+  for (var i = 0, len = strNum.length; i < len; i++) {
+    ret += numberChar[parseInt(strNum[i])];
   }
 
   return ret;
@@ -200,19 +200,11 @@ function numberToChinese(num) {
       _ref$negative = _ref.negative,
       negative = _ref$negative === void 0 ? '负' : _ref$negative,
       _ref$unitConfig = _ref.unitConfig,
-      unitConfig = _ref$unitConfig === void 0 ? {
-    w: '万',
-    // '萬'
-    y: '亿' // '億'
-
-  } : _ref$unitConfig;
+      unitConfig = _ref$unitConfig === void 0 ? {} : _ref$unitConfig;
 
   // 非数字 或 NaN 不处理
   if (typeof num !== 'number' || isNaN(num)) {
-    if (!config.disableWarning) {
-      console.warn("\u53C2\u6570\u9519\u8BEF ".concat(num, "\uFF0C\u8BF7\u4F20\u5165\u6570\u5B57"));
-    }
-
+    devWarn("\u53C2\u6570\u9519\u8BEF ".concat(num, "\uFF0C\u8BF7\u4F20\u5165\u6570\u5B57"));
     return '';
   } // 超过安全数字提示
 
@@ -228,9 +220,10 @@ function numberToChinese(num) {
   } // 设置节点计数单位，万、亿、万亿
 
 
-  var defaultUnitWan = '万';
-  var defaultUnitYi = '亿';
-  unitSection = ['', unitConfig.w || defaultUnitWan, unitConfig.y || defaultUnitYi, unitConfig.w && unitConfig.y ? unitConfig.w + unitConfig.y : defaultUnitWan + defaultUnitYi]; // 设置0
+  var unitWan = (unitConfig === null || unitConfig === void 0 ? void 0 : unitConfig.w) || '万';
+  var unitYi = (unitConfig === null || unitConfig === void 0 ? void 0 : unitConfig.y) || '亿';
+  var unitWanYi = unitWan + unitYi;
+  unitSection = ['', unitWan, unitYi, unitWanYi]; // 设置0
 
   if (zero) {
     numberChar[0] = zero;
@@ -239,16 +232,17 @@ function numberToChinese(num) {
 
   var preStr = num < 0 ? negative : ''; // 整数和小数
 
-  var chnInteger, chnDecimal; // 处理整数
+  var chnInteger, chnDecimal;
+  var numAbs = Math.abs(num); // 处理整数
 
   if (unit) {
-    chnInteger = convertInteger(num);
+    chnInteger = convertInteger(numAbs);
   } else {
-    chnInteger = mapNumberChar(Math.floor(num));
+    chnInteger = mapNumberChar(Math.floor(numAbs));
   } // 处理小数
 
 
-  chnDecimal = convertDecimal(num);
+  chnDecimal = convertDecimal(numAbs);
   return chnDecimal ? "".concat(preStr).concat(chnInteger).concat(decimal).concat(chnDecimal) : "".concat(preStr).concat(chnInteger);
 }
 

package/esm/parseIdCard.js

@@ -108,33 +108,18 @@ function parseIdCard(id) {
    * @type {{ province: string, city: string, area: string, year: string, month: string, day: string, gender: string }}
    *
    */
+  // @ts-ignore
 
 
-  var origin = {
-    province: '',
-    city: '',
-    area: '',
-    year: '',
-    month: '',
-    day: '',
-    gender: ''
+  var origin = (info === null || info === void 0 ? void 0 : info.groups) || {
+    province: info[1],
+    city: info[2],
+    area: info[3],
+    year: info[4],
+    month: info[5],
+    day: info[6],
+    gender: info[7]
   };
-
-  if (info.groups) {
-    // @ts-ignore
-    origin = info.groups;
-  } else {
-    origin = {
-      province: info[1],
-      city: info[2],
-      area: info[3],
-      year: info[4],
-      month: info[5],
-      day: info[6],
-      gender: info[7]
-    };
-  }
-
   var province = Provinces.find(function (item) {
     return item[0] === origin.province;
   });

package/esm/replaceChar.js

@@ -1,3 +1,4 @@
+import normalizeString from './normalizeString';
 /**
  * 替换字符，应用场景如：脱敏
  *
@@ -44,9 +45,8 @@
  * // => 林**
  *
  */
-function replaceChar() {
-  var str = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
 
+function replaceChar(str) {
   var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
       _ref$start = _ref.start,
       start = _ref$start === void 0 ? 3 : _ref$start,
@@ -57,20 +57,21 @@ function replaceChar() {
       repeat = _ref.repeat,
       exclude = _ref.exclude;
 
-  var strLen = str.length; // 开始位置超过str长度
+  var realStr = normalizeString(str);
+  var strLen = realStr.length; // 开始位置超过str长度
 
   if (Math.abs(start) >= strLen) {
-    return str;
+    return realStr;
   }
 
   start = start >= 0 ? start : strLen + start;
   end = end >= 0 ? end : strLen + end; // 开始位置大于结束位置
 
   if (start >= end) {
-    return str;
+    return realStr;
   }
 
-  var middleStr = str.substring(start, end);
+  var middleStr = realStr.substring(start, end);
 
   if (exclude) {
     var reg = new RegExp("[^".concat(exclude, "]"), 'g');
@@ -80,7 +81,7 @@ function replaceChar() {
     middleStr = _char.repeat(repeat);
   }
 
-  return str.substring(0, start) + middleStr + str.substring(end);
+  return realStr.substring(0, start) + middleStr + realStr.substring(end);
 }
 
 export default replaceChar;

package/esm/round.js

@@ -1,5 +1,6 @@
 import divide from './divide';
 import times from './times';
+import { isNumber, isString, isNaN } from './utils/type';
 /**
  * 四舍五入，支持设置精度
  *
@@ -23,6 +24,13 @@ import times from './times';
 
 function round(num) {
   var precision = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+
+  // 兼容处理，如果参数为非数字或字符串时，直接返回
+  if ((!isNumber(num) || isNaN(num)) && !isString(num)) {
+    // @ts-ignore
+    return num;
+  }
+
   var base = Math.pow(10, precision);
   return divide(Math.round(times(num, base)), base);
 }

package/esm/utils/devWarn.js

@@ -0,0 +1,16 @@
+import { config } from './config';
+/**
+ * 打印警告信息
+ *
+ * @param  {any[]} args 打印的信息
+ */
+
+function devWarn() {
+  if (!config.disableWarning) {
+    var _console;
+
+    (_console = console).warn.apply(_console, arguments);
+  }
+}
+
+export default devWarn;

package/esm/utils/math.util.js

@@ -5,7 +5,7 @@
  * 问题示例：2.3 + 2.4 = 4.699999999999999，1.0 - 0.9 = 0.09999999999999998
  */
 import { MAX_SAFE_INTEGER, MIN_SAFE_INTEGER } from './constants';
-import { config } from './config';
+import devWarn from './devWarn';
 /**
  * 是否为科学计数法数字
  *
@@ -52,8 +52,10 @@ export function digitLength(num) {
  */
 
 export function float2Fixed(num) {
-  if (!isScientificNumber(num.toString())) {
-    return Number(num.toString().replace('.', ''));
+  var strNum = String(num);
+
+  if (!isScientificNumber(strNum)) {
+    return Number(strNum.replace('.', ''));
   }
 
   var dLen = digitLength(num);
@@ -67,9 +69,7 @@ export function float2Fixed(num) {
 
 export function checkBoundary(num) {
   if (+num > MAX_SAFE_INTEGER || +num < MIN_SAFE_INTEGER) {
-    if (!config.disableWarning) {
-      console.warn("".concat(num, " is beyond boundary when transfer to integer, the results may not be accurate"));
-    }
+    devWarn("".concat(num, " is beyond boundary when transfer to integer, the results may not be accurate"));
   }
 }
 /**
@@ -99,39 +99,62 @@ export function trimLeftZero(num) {
  *  2.小数点前边是0，小数点后十分位（包含十分位）之后连续零的个数大于等于6个
  *
  * @param {string | number} num 科学计数法数字
- * @returns {string} 转换后的数字字符串
+ * @returns {string | number} 转换后的数字字符串
  */
 
 export function scientificToNumber(num) {
-  if (isScientificNumber(num.toString())) {
-    var zero = '0';
-    var parts = String(num).toLowerCase().split('e');
-    var e = parts.pop(); // 存储指数
-    // @ts-ignore
+  var strNum = String(num);
 
-    var l = Math.abs(e); // 取绝对值，l-1就是0的个数
-    // @ts-ignore
+  if (!isScientificNumber(strNum)) {
+    return num;
+  }
+  /** @type string */
 
-    var sign = e / l; //判断正负
 
-    var coeff_array = parts[0].split('.'); // 将系数按照小数点拆分
-    //如果是小数
+  var ret;
+  var zero = '0';
+  var parts = strNum.toLowerCase().split('e');
+  var e = parts.pop(); // 存储指数
+  // @ts-ignore
 
-    if (sign === -1) {
-      //拼接字符串，如果是小数，拼接0和小数点
-      num = zero + '.' + new Array(l).join(zero) + coeff_array.join('');
-    } else {
-      var dec = coeff_array[1]; //如果是整数，将整数除第一位之外的非零数字计入位数，相应的减少0的个数
+  var l = Math.abs(e); // 取绝对值，l-1就是0的个数
+  // @ts-ignore
+
+  var sign = e / l; //判断正负
+
+  var coeff_array = parts[0].split('.'); // 将系数按照小数点拆分
+  // 如果是小数
+
+  if (sign === -1) {
+    // 整数部分
+    var intVal = trimLeftZero(coeff_array[0]); // 整数部分大于科学计数后面部分
+    // 如: 10e-1, 10.2e-1
 
-      if (l - dec.length < 0) {
-        num = trimLeftZero(coeff_array[0] + dec.substring(0, l)) + '.' + dec.substring(l);
-      } else {
-        //拼接字符串，如果是整数，不需要拼接小数点
-        num = coeff_array.join('') + new Array(l - dec.length + 1).join(zero);
+    if (intVal.length > l) {
+      var thanLen = intVal.length - l;
+      var dec = coeff_array[1] || '';
+      ret = intVal.slice(0, thanLen); // 处理 10e-1, 100e-1
+
+      if (intVal.slice(thanLen) !== '0' || dec) {
+        ret += '.' + intVal.slice(thanLen) + dec;
       }
+    } else {
+      // 整数部分小于等于科学计数后面部分
+      // 如: 1e-1, 0.2e-1, 1.2e-2, 1.2e-1
+      ret = zero + '.' + new Array(l - intVal.length + 1).join(zero) + coeff_array.join('');
     }
-  } // @ts-ignore
+  } else {
+    // 小数部分
+    var _dec = coeff_array[1] || ''; // 如果是整数，将整数除第一位之外的非零数字计入位数，相应的减少0的个数
 
 
-  return num;
+    if (l - _dec.length < 0) {
+      ret = trimLeftZero(coeff_array[0] + _dec.substring(0, l)) + '.' + _dec.substring(l);
+    } else {
+      // 拼接字符串，如果是整数，不需要拼接小数点
+      ret = coeff_array.join('') + new Array(l - _dec.length + 1).join(zero);
+    }
+  }
+
+  return trimLeftZero(ret);
 }