diff --git a/packages/runtime/babel.config.js b/packages/runtime/babel.config.js deleted file mode 100644 index 811a129..0000000 --- a/packages/runtime/babel.config.js +++ /dev/null @@ -1,25 +0,0 @@ -module.exports = { - "presets": [ - [ - "@babel/preset-env", - { - "useBuiltIns": "usage", - "debug": false, - "modules": false, - "corejs":{ - "version":"3.27.1", - "proposals": true - } - } - ] - ], - "plugins": [ - [ - "@babel/plugin-transform-runtime", - { - "corejs":3, - "proposals": true - } - ] - ] - } \ No newline at end of file diff --git a/packages/runtime/datatypes/chinese.js b/packages/runtime/datatypes/chinese.js deleted file mode 100644 index dabe1b1..0000000 --- a/packages/runtime/datatypes/chinese.js +++ /dev/null @@ -1,129 +0,0 @@ -/** - * - * 处理中文数字和货币相关 - * - */ - -const { isNumber } = require('../utils') -const { FlexFormatter,Formatter } = require('../formatter') - -const CN_DATETIME_UNITS = ["年","季度","月","周","日","小时","分钟","秒","毫秒","微秒"] -const CN_WEEK_DAYS = ["星期日","星期一","星期二","星期三","星期四","星期五","星期六"] -const CN_SHORT_WEEK_DAYS =["周日","周一","周二","周三","周四","周五","周六"] -const CN_MONTH_NAMES= ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"] -const CN_SHORT_MONTH_NAMES = ["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"] - -const CN_NUMBER_DIGITS = ["零", "一", "二", "三", "四", "五", "六", "七", "八", "九"] -const CN_NUMBER_UNITS = ['', '十', '百', '千', '万', '十', '百', '千', '亿', '十', '百', '千', '兆', '十', '百', '千', '京', '十', '百', '千', '垓'] -const CN_NUMBER_BIG_DIGITS = ["零", '壹', '貳', '參', '肆', '伍', '陸', '柒', '捌', '玖'] -const CN_NUMBER_BIG_UNITS = ['', '拾', '佰', '仟', '萬', '拾', '佰', '仟', '億', '拾', '佰', '仟', '兆', '拾', '佰', '仟', '京', '拾', '佰', '仟', '垓'] - -/** - * - * 将数字转换为中文数字 - * - * 注意会忽略掉小数点后面的数字 - * - * @param {*} value 数字 - * @param {*} isBig 是否大写数字 - * @returns - */ - function toChineseNumber(value,isBig) { - if(!isNumber(value)) return value; - let [wholeValue,decimalValue] = String(value).split(".") // 处理小数点 - const DIGITS = isBig ? CN_NUMBER_BIG_DIGITS : CN_NUMBER_DIGITS - const UNITS = isBig ? CN_NUMBER_BIG_UNITS : CN_NUMBER_UNITS - let result = '' - if(wholeValue.length==1) return DIGITS[parseInt(wholeValue)] - for(let i=wholeValue.length-1; i>=0; i--){ - let bit = parseInt(wholeValue[i]) - let digit = DIGITS[bit] - let unit = UNITS[wholeValue.length-i-1] - if(bit==0){ - let preBit =i< wholeValue.length ? parseInt(wholeValue[i+1]) : null// 上一位 - let isKeyBits = ((wholeValue.length-i-1) % 4)==0 - if(preBit && preBit!=0 && !isKeyBits) result = "零" + result - if(isKeyBits) result = UNITS[wholeValue.length-i-1] + result - }else{ - result=`${digit}${unit}` + result - } - } - if(isBig){ - result = result.replace("垓京","垓") - .replace("京兆","京") - .replace("兆億","兆") - .replace("億萬","億") - .replace("萬仟","萬") - }else{ - result = result.replace("垓京","垓") - .replace("京兆","京") - .replace("兆亿","兆") - .replace("亿万","亿") - .replace("万千","万") - if(result.startsWith("一十")) result=result.substring(1) - } - return result // 中文数字忽略小数部分 - } - -function toChineseBigNumber(value) { - return toChineseNumber(value,true) -} - -const chineseNumberFormatter = Formatter((value,isBig,$config)=>{ - return toChineseNumber(value,isBig,$config) - },{ - params:["isBig"] -}) - - /** - * 转换为中文大写货币 - * @param {*} value - * @param {*} division 分割符号位数,3代表每3个数字添加一个,号 - * @param {*} prefix 前缀 - * @param {*} suffix 后缀 - * @param {*} showWhole 显示 - */ -function toChineseCurrency(value,{big,prefix,unit,suffix}={},$config){ - let [wholeValue,decimalValue] = String(value).split(".") - let result - if(big){ - result = toChineseBigNumber(wholeValue)+unit - }else{ - result = toChineseNumber(wholeValue)+unit - } - if(decimalValue){ - if(decimalValue[0]) { - let bit0 = parseInt(decimalValue[0]) - result =result+ (big ? CN_NUMBER_BIG_DIGITS[bit0] : CN_NUMBER_DIGITS[bit0])+"角" - } - if(decimalValue[1]){ - let bit1 = parseInt(decimalValue[1]) - result =result+ (big ? CN_NUMBER_BIG_DIGITS[bit1] : CN_NUMBER_DIGITS[bit1])+"分" - } - } - return prefix+result+suffix -} - -const rmbFormater = FlexFormatter((value,params,$config)=>{ - return toChineseCurrency(value,params,$config) -},{ - params:["big","prefix","unit","suffix"], - configKey:"rmb" -}) - -module.exports ={ - toChineseCurrency, - toChineseNumber, - toChineseBigNumber, - rmbFormater, - chineseNumberFormatter, - CN_DATETIME_UNITS, - CN_WEEK_DAYS, - CN_SHORT_WEEK_DAYS, - CN_MONTH_NAMES, - CN_SHORT_MONTH_NAMES, - CN_NUMBER_DIGITS, - CN_NUMBER_UNITS, - CN_NUMBER_BIG_DIGITS, - CN_NUMBER_BIG_UNITS -} \ No newline at end of file diff --git a/packages/runtime/datatypes/datetime.js b/packages/runtime/datatypes/datetime.js deleted file mode 100644 index a435e79..0000000 --- a/packages/runtime/datatypes/datetime.js +++ /dev/null @@ -1,256 +0,0 @@ -/** - -处理日期时间相关 - -*/ -const { isFunction,replaceAll,toDate } = require('../utils') -const { Formatter } = require('../formatter'); - -/** - * 获取一天中的时间段 - * @param {*} hour 小时，取值0-23 - * @param {*} options - * @returns - */ -function getTimeSlot(hour,caseStyle = 0){ - if(hour<0 && hour>23) hour = 0 - const timeSlots = this.timeSlots - const slots = [0,...timeSlots.slots,24] - let slotIndex = slots.findIndex(v=>v>hour) - 1 - return caseStyle == 0 ? timeSlots.lowerCases[slotIndex] : timeSlots.upperCases[slotIndex] -} - -/** - * 根据模板格式化日期时间 - * - - YY 18 年，两位数 - YYYY 2018 年，四位数 - M 1-12 月，从1开始 - MM 01-12 月，两位数字 - MMM Jan-Dec 月，英文缩写 - D 1-31 日 - DD 01-31 日，两位数 - H 0-23 24小时 - HH 00-23 24小时，两位数 - h 1-12 12小时 - hh 01-12 12小时，两位数 - m 0-59 分钟 - mm 00-59 分钟，两位数 - s 0-59 秒 - ss 00-59 秒，两位数 - S 0-9 毫秒（百），一位数 - SS 00-99 毫秒（十），两位数 - SSS 000-999 毫秒，三位数 - Z -05:00 UTC偏移 - ZZ -0500 UTC偏移，两位数 - A AM / PM 上/下午，大写 - a am / pm 上/下午，小写 - Do 1st... 31st 月份的日期与序号 - t 小写时间段，如am,pm - T 大写时间段段，如上午、中午、下午 - - - * 重点： this-->当前格化器的配置参数 - * - * 因此可以通过this.month.long来读取长格式模板 - * - * - * @param {*} value - * @param {*} template - * @param {Boolean} onlyTime 仅格式化时间 - * @param {*} options = {month:[<短月份名称>,<短月份名称>],timeSlots:{}} - * @returns - */ -function formatDatetime(value,template="YYYY/MM/DD HH:mm:ss",onlyTime=false){ - const $config = this.datetime// this->指向的是当前语言的格式化化器配置 - const v = toDate(value) - const hour = v.getHours(),Hour = String(hour).padStart(2, "0") - const hour12 = hour > 12 ? hour - 12 : hour ,Hour12 = String(hour12).padStart(2, "0") - const minute = String(v.getMinutes()),second = String(v.getSeconds()),millisecond=String(v.getMilliseconds()) - let vars = [ - ["HH", Hour], // 00-23 24小时，两位数 - ["H", hour], // 0-23 24小时 - ["hh", Hour12], // 01-12 12小时，两位数 - ["h", hour12], // 1-12 12小时 - ["mm", minute.padStart(2, "0")], // 00-59 分钟，两位数 - ["m", minute], // 0-59 分钟 - ["ss", second.padStart(2, "0")], // 00-59 秒，两位数 - ["s", second], // 0-59 秒 - ["SSS", millisecond], // 000-999 毫秒，三位数 - ["A", hour > 12 ? "PM" : "AM"], // AM / PM 上/下午，大写 - ["a", hour > 12 ? "pm" : "am"], // am / pm 上/下午，小写 - ["t", getTimeSlot.call($config,hour,0)], // 小写时间段，如上午、中午、下午 - ["T", getTimeSlot.call($config,hour,1)], // 大写时间段，如上午、中午、下午 - ] - if(!onlyTime){ - const year =String(v.getFullYear()),month = v.getMonth(),weekday=v.getDay(),day=String(v.getDate()) - vars.push(...[ - ["YYYY", year], // 2018 年，四位数 - ["YY", year.substring(2)], // 18年，两位数 - ["MMM", $config.month.short[month]], // Jan-Dec月，缩写 - ["MM", String(month+1).padStart(2, "0")], // 01-12月，两位数字 - ["M", month+1], // 1-12 月，从1开始 - ["DD", day.padStart(2, "0")], // 01-31 日，两位数 - ["D", day], // 1-31 日 - ["d",weekday], // 0-6 一周中的一天，星期天是 0 - ["dd",$config.weekday.short[weekday]], // Su-Sa 最简写的星期几 - ["ddd",$config.weekday.short[weekday]], // Sun-Sat 简写的星期几 - ["dddd",$config.weekday.long[weekday]], // Sunday-Saturday 星期几，英文全称 - ]) - } - let result = template - vars.forEach(([k,v])=>result = replaceAll(result,k,v)) - return result -} -/** - * 只格式化时间 - * @param {*} value - * @param {*} template - * @returns - */ -function formatTime(value,template="HH:mm:ss"){ - return formatDatetime.call(this,value,template,true) -} - - -/** - * 该类型的格式化器具有以下特点： - * - * 1. 接受一个format参数， - * 2. format参数取值可以是若干预设的值，如long,short等，也可能是一个模板字符串 - * 3. 当format值时，如果定义在$config[configKey]里面，代表了$config[configKey][format]是一个模板字符串 - * 4. 如果!(format in $config[configKey])，则代表format值是一个模板字符串 - * 5. 如果format in presets, 则要求presets[format ]是一个(value)=>{....}，直接返回 - * - **/ -function createDateTimeFormatter(options={},transformer){ - let opts = Object.assign({presets:{}},options) - return Formatter(function(value,format,$config){ - if((format in opts.presets) && isFunction(opts.presets[format])){ - return opts.presets[format](value) - }else if((format in $config)){ - format = $config[format] - }else if(format == "number"){ - return value - } - try{// this指向的是activeFormatter.$config - return format==null ? value : transformer.call(this,value,format) - }catch(e){ - return value - } - },opts) -} - - -/** - * 日期格式化器 - * - format取值：local,long,short,iso,gmt,utc,<模板字符串> - * - 默认值由$config.datetime.date.format指定 - */ - const dateFormatter = createDateTimeFormatter({ - normalize: toDate, - params : ["format"], - configKey: "datetime.date", - presets : { - local: value=>value.toLocaleString(), - iso : value=>value.toISOString(), - utc : value=>value.toUTCString(), - gmt : value=>value.toGMTString() - } -},formatDatetime) - - -/** - * 季度格式化器 - * - format: long,short,number - * - 默认值是 short - */ -const quarterFormatter = createDateTimeFormatter({ - normalize : value=>{ - const month = value.getMonth() + 1 - return Math.floor( ( month % 3 == 0 ? ( month / 3 ) : (month / 3 + 1 ) )) - }, - params : ["format"], - configKey: "datetime.quarter" -},(quarter,format)=>format[quarter-1]) - -/** - * 月份格式化器 - * - format: long,short,number - * - 默认值是 short - */ -const monthFormatter = createDateTimeFormatter({ - normalize: value=> value.getMonth() + 1, - params : ["format"], - configKey: "datetime.month" -},(month,format)=>format[month-1]) - -/** - * 周格式化器 - * - format: long,short,number - * - 默认值是 long - */ -const weekdayFormatter = createDateTimeFormatter({ - normalize: value=> value.getDay(), - params : ["format"], - configKey: "datetime.weekday" -},(day,format)=>format[day]) - -/** - * 时间格式化器 - * - format取值：local,long,short,timestamp,<模板字符串> - * - 默认值由$config.datetime.time.format指定 - */ - const timeFormatter = createDateTimeFormatter({ - normalize : toDate, - params : ["format"], - configKey : "datetime.time", - presets : { - local : value=>value.toLocaleTimeString(), - timestamp: value=>value.getTime() - } -},formatTime) - -/** - * 返回相对于rel的时间 - * @param {*} value - * @param {*} baseTime 基准时间，默认是相对现在 - */ -// 对应:秒,分钟,小时,天,周,月,年的毫秒数,月取30天，年取365天概数 -const TIME_SECTIONS = [1000,60000,3600000,86400000,604800000,2592000000,31536000000,Number.MAX_SAFE_INTEGER] -const relativeTimeFormatter = Formatter((value,baseTime,$config)=>{ - const { units,now,before,base = Date.now() , after } = $config - let ms = value.getTime() - let msBase = (baseTime instanceof Date) ? baseTime.getTime() : toDate(base).getTime() - let msDiff = ms - msBase - let msIndex = TIME_SECTIONS.findIndex(x=>Math.abs(msDiff) < x) - 1 - if(msIndex < 0) msIndex = 0 - if(msIndex > TIME_SECTIONS.length-1 ) msIndex = TIME_SECTIONS.length-1 - if(msDiff==0){ - return now - }else if(msDiff<0){// 之前 - let result = parseInt(Math.abs(msDiff) / TIME_SECTIONS[msIndex]) - return before.replace("{value}",result).replace("{unit}",units[msIndex]) - }else{// 之后 - let result = parseInt(Math.abs(msDiff) / TIME_SECTIONS[msIndex]) - return after.replace("{value}",result).replace("{unit}",units[msIndex]) - } -},{ - normalize:toDate, - params:["base"], - configKey:"datetime.relativeTime" -}) - -module.exports = { - toDate, - formatTime, - formatDatetime, - createDateTimeFormatter, - relativeTimeFormatter, - dateFormatter, - quarterFormatter, - monthFormatter, - weekdayFormatter, - timeFormatter -} \ No newline at end of file diff --git a/packages/runtime/eventemitter.js b/packages/runtime/eventemitter.js deleted file mode 100644 index 6e69a6d..0000000 --- a/packages/runtime/eventemitter.js +++ /dev/null @@ -1,31 +0,0 @@ -/** -* -* 简单的事件触发器 -* -*/ -module.exports = class EventEmitter{ - constructor(){ - this._callbacks = [] - } - on(callback){ - if(this._callbacks.includes(callback)) return - this._callbacks.push(callback) - } - off(callback){ - for(let i=0;icb(...args))) - }else{ - await Promise.all(this._callbacks.map(cb=>cb(...args))) - } - } -} \ No newline at end of file diff --git a/packages/runtime/formatter.js b/packages/runtime/formatter.js deleted file mode 100644 index de6b6b4..0000000 --- a/packages/runtime/formatter.js +++ /dev/null @@ -1,359 +0,0 @@ -/** - * - * 解析格式化器 - * - * 解析{ varname | formater(...params) }中的params部分 - * - * - * - */ - - -const { getByPath,isNumber,isFunction,isPlainObject,escapeRegexpStr,safeParseJson } = require("./utils") - -/** -使用正则表达式对原始文本内容进行解析匹配后得到的便以处理的数组 - -formatters="| aaa(1,1) | bbb " - -统一解析为 - -[ - [aaa,[1,1]], // [<格式化器名称>,[args,...]] - [<格式化器名称>,[<参数>,<参数>,...]] -] - -formatters="| aaa(1,1,"dddd") | bbb " - -特别注意： -- 目前对参数采用简单的split(",")来解析，因此如果参数中包括了逗号等会影响解析的字符时，可能导致错误 -例如aaa(1,1,"dd,,dd")形式的参数 -在此场景下基本够用了，如果需要支持更复杂的参数解析，可以后续考虑使用正则表达式来解析 -- 如果参数是{},[]，则尝试解决为对象和数组，但是里面的内容无法支持复杂和嵌套数据类型 - -@param {String} formatters - -@returns [ [<格式化器名称>,[<参数>,<参数>,...],[<格式化器名称>,[<参数>,<参数>,...]],...] -*/ -function parseFormatters(formatters) { - if (!formatters) return []; - // 1. 先解析为 ["aaa()","bbb"]形式 - let result = formatters.trim().substring(1).trim().split("|").map((r) => r.trim()); - // 2. 解析格式化器参数 - return result.map((formatter) => { - if (formatter == "") return null; - let firstIndex = formatter.indexOf("("); - let lastIndex = formatter.lastIndexOf(")"); - if (firstIndex !== -1 && lastIndex !== -1) { //参数的格式化器 - // 带参数的格式化器: 取括号中的参数字符串部分 - const strParams = formatter.substring(firstIndex + 1, lastIndex).trim(); - // 解析出格式化的参数数组 - let params = parseFormaterParams(strParams); - // 返回[<格式化器名称>,[<参数>,<参数>,...] - return [formatter.substring(0, firstIndex), params]; - } else { // 不带参数的格式化器 - return [formatter, []]; - } - }).filter((formatter) => Array.isArray(formatter)); -} - - - /** - * 生成可以解析指定标签的正则表达式 - * - * getNestingParamsRegex() -- 能解析{}和[] - * getNestingParamsRegex(["",""]), - * - * @param {...any} tags - * @returns - */ -function getNestingParamsRegex(...tags){ - if(tags.length==0){ - tags.push(["{","}"]) - tags.push(["[","]"]) - } - const tagsRegexs = tags.map(([beginTag,endTag])=>{ - return `(${escapeRegexpStr(beginTag)}1%.*?%1${escapeRegexpStr(endTag)})` - }) - return formatterNestingParamsRegex.replace("__TAG_REGEXP__",tagsRegexs.length > 0 ? tagsRegexs.join("|")+"|" : "") -} - - /** - * - * 遍历字符串中的 beginTag和endTag,添加辅助序号 - * - * @param {*} str - * @param {*} beginTag - * @param {*} endTag - * @returns - */ - function addTagFlags(str,beginTag="{",endTag="}"){ - let i = 0 - let flagIndex = 0 - while(i0){ - str = str.substring(0,i) + `%${flagIndex}` + str.substring(i) - } - i+= endTag.length + String(flagIndex).length +1 - flagIndex-- - continue - } - i++ - } - return str - } - - /** - * 增加标签组辅助标识 - * - * addTagHelperFlags("sss",["
","
"] - * - * @param {*} str - * @param {...any} tags 默认已包括{},[] - */ - function addTagHelperFlags(str,...tags){ - if(tags.length==0){ - tags.push(["{","}"]) - tags.push(["[","]"]) - } - tags.forEach(tag=>{ - if(str.includes(tag[0]) && str.includes(tag[1])){ - str = addTagFlags(str,...tag) - } - }) - return str - } - - function removeTagFlags(str,beginTag,endTag){ - const regexs = [ - [beginTag,new RegExp(escapeRegexpStr(beginTag)+"\\d+%")], - [endTag,new RegExp("%\\d+"+escapeRegexpStr(endTag))] - ] - regexs.forEach(([tag,regex])=>{ - let matched - while ((matched = regex.exec(str)) !== null) { - if (matched.index === regex.lastIndex) regex.lastIndex++; - str = str.replace(regex,tag) - } - }) - return str - } - - function removeTagHelperFlags(str,...tags){ - if(tags.length==0){ - tags.push(["{","}"]) - tags.push(["[","]"]) - } - tags.forEach(([beginTag,endTag])=>{ - if(str.includes(beginTag) && str.includes(endTag)){ - str = removeTagFlags(str,beginTag,endTag) - } - }) - return str - } - -// 提取匹配("a",1,2,'b',{..},[...]),不足：当{}嵌套时无法有效匹配 -// const formatterParamsRegex = /((([\'\"])(.*?)\3)|(\{.*?\})|(\[.*?\])|([\d]+\.?[\d]?)|((true|false|null)(?=[,\b\s]))|([\w\.]+)|((?<=,)\s*(?=,)))(?<=\s*[,\)]?\s*)/g; - -// 支持解析嵌套的{}和[]参数， 前提是：字符串需要经addTagHelperFlags操作后，会在{}[]等位置添加辅助字符 -// 解析嵌套的{}和[]参数基本原理：在{}[]等位置添加辅助字符，然后使用正则表达式匹配，匹配到的字符串中包含辅助字符，然后再去除辅助字符 -const formatterNestingParamsRegex = String.raw`((([\'\"])(.*?)\3))|__TAG_REGEXP__([\d]+\.?[\d]?)|((true|false|null)(?=[,\b\s]))|([\w\.]+)|((?<=,)\s*(?=,))(?<=\s*[,\)]?\s*)` - -/** - * 解析格式化器的参数,即解析使用,分割的函数参数 - * - * 采用正则表达式解析 - * 支持number,boolean,null,String,{},[]的参数，可以识别嵌套的{}和[] - * - * @param {*} strParams 格式化器参数字符串，即formater(<...参数....>)括号里面的参数，使用,分割 - * @returns {Array} 返回参数值数组 [] - */ - function parseFormaterParams(strParams) { - let params = []; - let matched; - // 1. 预处理： 处理{}和[]嵌套问题,增加嵌套标识 - strParams = addTagHelperFlags(strParams) - try{ - let regex =new RegExp(getNestingParamsRegex(),"g") - while ((matched = regex.exec(strParams)) !== null) { - // 这对于避免零宽度匹配的无限循环是必要的 - if (matched.index === regex.lastIndex) { - regex.lastIndex++; - } - let value = matched[0] - if(value.trim()==''){ - value = null - }else if((value.startsWith("'") && value.endsWith("'")) || (value.startsWith('"') && value.endsWith('"'))){ - value = value.substring(1,value.length-1) - value = removeTagHelperFlags(value) - }else if((value.startsWith("{") && value.endsWith("}")) || (value.startsWith('[') && value.endsWith(']'))){ - try{ - value = removeTagHelperFlags(value) - value = safeParseJson(value) - }catch{} - }else if(["true","false","null"].includes(value)){ - value = JSON.parse(value) - }else if(isNumber(value)){ - value = parseFloat(value) - }else{ - value = removeTagHelperFlags(String(value)) - } - params.push(value) - } - }catch{ - - } - return params -} -/** - * 创建格式化器 - * - * 格式化器是一个普通的函数，具有以下特点： - * - * - 函数第一个参数是上一上格式化器的输出 - * - 支持0-N个简单类型的入参 - * - 可以是定参，也可以变参 - * - 格式化器可以在格式化器的$config参数指定一个键值来配置不同语言时的参数 - * - * "currency":createFormatter((value,prefix,suffix, division ,precision,$config)=>{ - * // 无论在格式化入参数是多少个，经过处理后在此得到prefix,suffix, division ,precision参数已经是经过处理后的参数 - * 依次读取格式化器的参数合并： - * - 创建格式化时的defaultParams参数 - * - 从当前激活格式化器的$config中读取配置参数 - * - 在t函数后传入参数 - * 比如currency格式化器支持4参数，其入参顺序是prefix,suffix, division ,precision - * 那么在t函数中可以使用以下五种入参数方式 - * {value | currency } //prefix=undefined,suffix=undefined, division=undefined ,precision=undefined - * {value | currency(prefix) } - * {value | currency(prefix,suffix) } - * {value | currency(prefix,suffix,division) } - * {value | currency(prefix,suffix,division,precision)} - * - * 经过createFormatter处理后，会从当前激活格式化器的$config中读取prefix,suffix, division ,precision参数作为默认参数 - * 然后t函数中的参数会覆盖默认参数，优先级更高 - * }, - * { - * unit:"$", - * prefix, - * suffix, - * division, - * precision - * }, - * { - * normalize:value=>{...}, - * params:["prefix","suffix", "division" ,"precision"] // 声明参数顺序 - * configKey:"currency" // 声明特定语言下的配置在$config.currency - * } - * ) - * - * @param {*} fn - * @param {*} options 配置参数 - * @param {*} defaultParams 可选默认值 - * @returns - */ - function createFormatter(fn,options={},defaultParams={}){ - let opts = Object.assign({ - normalize : null, // 对输入值进行规范化处理，如进行时间格式化时，为了提高更好的兼容性，支持数字时间戳/字符串/Date等，需要对输入值进行处理，如强制类型转换等 - params : null, // 可选的，声明参数顺序，如果是变参的，则需要传入null - configKey : null // 声明该格式化器在$config中的路径，支持简单的使用.的路径语法 - },options) - - // 最后一个参数是传入activeFormatterConfig参数 - // 并且格式化器的this指向的是activeFormatterConfig - const $formatter = function(value,...args){ - let finalValue = value - // 1. 输入值规范处理，主要是进行类型转换，确保输入的数据类型及相关格式的正确性，提高数据容错性 - if(isFunction(opts.normalize)){ - try{ - finalValue = opts.normalize(finalValue) - }catch{} - } - // 2. 读取activeFormatterConfig - let activeFormatterConfigs = args.length>0 ? args[args.length-1] : {} - if(!isPlainObject( activeFormatterConfigs)) activeFormatterConfigs ={} - // 3. 从当前语言的激活语言中读取配置参数 - const formatterConfig =Object.assign({},defaultParams,getByPath(activeFormatterConfigs,opts.configKey,{})) - let finalArgs - if(opts.params==null){// 如果格式化器支持变参，则需要指定params=null - finalArgs = args.slice(0,args.length-1) - }else{ // 具有固定的参数个数 - finalArgs = opts.params.map(param=>{ - let paramValue = getByPath(formatterConfig,param,undefined) - return isFunction(paramValue) ? paramValue(finalValue) : paramValue - }) - // 4. 将翻译函数执行格式化器时传入的参数覆盖默认参数 - for(let i =0; i}) } - * - * 请参阅currencyFormatter用法 - * - * @param {*} fn - * @param {*} options - * @param {*} defaultParams - */ -const createFlexFormatter = function(fn,options={},defaultParams={}){ - const $flexFormatter = Formatter(function(value,...args){ - // 1. 最后一个参数是格式化器的参数,不同语言不一样 - let $config = args[args.length-1] - // 2. 从语言配置中读取默认参数 - let finalParams = options.params.reduce((r,name) =>{ - r[name] = $config[name]==undefined ? defaultParams[name] : $config[name] - return r - } ,{}) - // 3. 从格式化器中传入的参数具有最高优先级，覆盖默认参数 - if(args.length==2 && isPlainObject(args[0])){ // 一个参数且是{} - Object.assign(finalParams,{format:"custom"},args[0]) - }else{ // 位置参数,如果是空则代表 - for(let i=0; i - export interface VoerkaI18nLanguagePack { - [key: string]: VoerkaI18nILanguageMessages - } - export interface VoerkaI18nManagerSettings { - debug?: boolean - defaultLanguage: string - activeLanguage: string - formatters: VoerkI18nFormatters - languages: VoerkaI18nLanguage[] - } - - export class VoerkaI18nManager { - constructor(settings: VoerkaI18nManagerSettings) - get settings(): Required // 配置参数 - get scopes(): VoerkaI18nScope[] // 注册的报有i18nScope实例q - get activeLanguage(): string // 当前激活语言名称 - get defaultLanguage(): string // 默认语言名称 - get languages(): VoerkaI18nSupportedLanguages // 支持的语言列表 - get formatters(): VoerkI18nFormatters // 内置格式化器{*:{$config,$types,...},zh:{$config,$types,...},en:{$config,$types,...}} - get defaultMessageLoader(): VoerkI18nLoader // 默认语言包加载器 - // 通过默认加载器加载文件 - loadMessagesFromDefaultLoader(newLanguage: string, scope: VoerkaI18nScope): Promise - change(language: string): Promise - register(scope: VoerkaI18nScope): Promise - registerFormatter(name: string, formatter: VoerkI18nFormatter, options?: { language: string | string[] }): void - registerDefaultLoader(fn: VoerkI18nLoader): void - refresh(): Promise - } - - export type Voerkai18nIdMap = Record - - export interface VoerkaI18nLanguage { - name: string - title?: string - default?: boolean - fallback?: string - } - - - - export type VoerkI18nFormatter = (value: string, ...args: any[]) => string - export type VoerkI18nFormatterConfigs = Record - - export type VoerkI18nFormatters = Record - $config?: Record - } & { - [key: string]: VoerkI18nFormatter - }) | (() => Promise)> - - export type VoerkI18nLoader = () => Awaited> - export interface VoerkI18nLoaders { - [key: string]: VoerkI18nLoader - } - - export interface VoerkaVoerkaI18nScopeOptions { - id?: string - debug?: boolean - languages: VoerkaI18nLanguage[] - defaultLanguage: string // 默认语言名称 - activeLanguage: string // 当前语言名称 - default: VoerkaI18nILanguageMessages // 默认语言包 - messages: VoerkaI18nILanguageMessages // 当前语言包 - idMap: Voerkai18nIdMap // 消息id映射列表 - formatters: VoerkI18nFormatters // 当前作用域的格式化函数列表{: {$types,$config,[格式化器名称]: () => {},[格式化器名称]: () => {}}} - loaders: VoerkI18nLoaders; // 异步加载语言文件的函数列表 - } - - export var VoerkaI18n: VoerkaI18nManager -} - -export type TranslateMessageVars = number | boolean | string | Function | Date -export interface VoerkaI18nTranslate { - (message: string, ...args: TranslateMessageVars[]): string - (message: string, vars?: Record): string -} -export interface VoerkaI18nSupportedLanguages { - [key: string]: VoerkaI18nLanguage -} -export class VoerkaI18nScope { - constructor(options: VoerkaVoerkaI18nScopeOptions, callback?: Function) - get id(): string // 作用域唯一id - get debug(): boolean // 调试开关 - get defaultLanguage(): string // 默认语言名称 - get activeLanguage(): string // 默认语言名称 - get default(): VoerkaI18nILanguageMessages // 默认语言包 - get messages(): VoerkaI18nILanguageMessages // 当前语言包 - get idMap(): Voerkai18nIdMap // 消息id映射列表 - get languages(): VoerkaI18nSupportedLanguages // 当前作用域支持的语言列表[{name,title,fallback}] - get loaders(): VoerkI18nLoaders // 异步加载语言文件的函数列表 - get global(): VoerkaI18nManager // 引用全局VoerkaI18n配置，注册后自动引用 - get formatters(): VoerkI18nFormatters // 当前作用域的所有格式化器定义 {<语言名称>: {$types,$config,[格式化器名称]: () = >{},[格式化器名称]: () => {}}} - get activeFormatters(): VoerkI18nFormatters // 当前作用域激活的格式化器定义 {$types,$config,[格式化器名称]: () = >{},[格式化器名称]: () = >{}} - get activeFormatterConfig(): VoerkI18nFormatterConfigs // 当前格式化器合并后的配置参数，参数已经合并了全局格式化器中的参数 - get t(): VoerkaI18nTranslate - get translate(): VoerkaI18nTranslate - /** - * 在全局注册作用域当前作用域 - * @param {*} callback 注册成功后的回调 - */ - register(callback: Function): void - /** - * 注册格式化器 - */ - registerFormatter(name: string, formatter: VoerkI18nFormatter, { language, global }: { language: string | string[], global: boolean }): void - /** - * 注册多种格式化器 - */ - registerFormatters(formatters: VoerkI18nFormatters, asGlobal?: boolean): void - /** - * 注册默认文本信息加载器 - */ - registerDefaultLoader(fn: Function): void - /** - * 获取指定语言信息 - * @param {*} language - * @returns - */ - getLanguage(language: string): VoerkaI18nILanguageMessages - hasLanguage(language: string): boolean - refresh(newLanguage: string): Promise - on(): void - off(): void - offAll(): void - change(language: string): Promise -} -export type VoerkI18nFormatterConfigs = Record -// 翻译函数 -export var translate: { - (message: string, ...args: (string | Function)[]): string - (message: string, vars?: Record): string -} -export interface CreateFormatterOptions { - normalize?: (value: any) => any // 对输入值进行规范化处理，如进行时间格式化时，为了提高更好的兼容性，支持数字时间戳/字符串/Date等，需要对输入值进行处理，如强制类型转换等 - params?: string[] | null // 可选的，声明参数顺序，如果是变参的，则需要传入null - configKey?: string // 声明该格式化器在$config中的路径，支持简单的使用.的路径语法 -} - -export type Primitive = string | number | boolean | null | undefined - -export interface FormatterDefine { - (this: VoerkI18nFormatterConfigs, value: any, ...args: Primitive[]): string - (this: VoerkI18nFormatterConfigs, value: any, arg1: Primitive, $config: VoerkI18nFormatterConfigs): string - (this: VoerkI18nFormatterConfigs, value: any, arg1: Primitive, arg2: Primitive, $config: VoerkI18nFormatterConfigs): string - (this: VoerkI18nFormatterConfigs, value: any, arg1: Primitive, arg2: Primitive, arg3: Primitive, $config: VoerkI18nFormatterConfigs): string - configurable?: boolean -} -// 创建格式化器 -export type CreateFormatterType = (fn: Function, options: CreateFormatterOptions, defaultParams: Record) => FormatterDefine -export var createFormatter: CreateFormatterType -export var Formatter: CreateFormatterType - -export type CreateFlexFormatterType = (fn: Function, options: CreateFormatterOptions, defaultParams: Record) => FormatterDefine -export var createFlexFormatter: CreateFlexFormatterType -export var FlexFormatter: CreateFlexFormatterType -export var getDataTypeName: (value: any) => string -export var toDate: (value: any) => Date | number -export var toNumber: (value: any, defaultValue: number) => number -export var toBoolean: (value: any) => boolean - diff --git a/packages/runtime/package.json b/packages/runtime/package.json index f5131a7..e2b0544 100644 --- a/packages/runtime/package.json +++ b/packages/runtime/package.json @@ -21,9 +21,11 @@ "author": "wxzhang", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.20.7", "@babel/runtime-corejs3": "latest", "core-js": "^3.27.1", - "@babel/runtime": "^7.20.7" + "flex-tools": "^1.0.72", + "string.prototype.replaceall": "^1.0.7" }, "devDependencies": { "@babel/cli": "^7.17.6", @@ -38,7 +40,8 @@ "jest": "^27.5.1", "rollup": "^2.69.0", "rollup-plugin-clear": "^2.0.7", - "rollup-plugin-terser": "^7.0.2" + "rollup-plugin-terser": "^7.0.2", + "vitest": "^0.29.8" }, "lastPublish": "2023-03-30T08:53:24+08:00" } \ No newline at end of file diff --git a/packages/runtime/rollup.config.js b/packages/runtime/rollup.config.js deleted file mode 100644 index 37472fb..0000000 --- a/packages/runtime/rollup.config.js +++ /dev/null @@ -1,38 +0,0 @@ - -import clear from 'rollup-plugin-clear' -import commonjs from '@rollup/plugin-commonjs'; -// import resolve from "@rollup/plugin-node-resolve"; -import { terser } from "rollup-plugin-terser"; -import { babel } from '@rollup/plugin-babel'; - -export default [ - { - input: './index.js', - output: [ - { - file: 'dist/index.esm.js', - format:"esm", - exports:"default", - esModule:"if-default-prop", - sourcemap:true - }, - { - file: 'dist/index.cjs', - exports:"default", - format:"cjs", - sourcemap:true - } - ], - plugins: [ - //resolve(), - commonjs(), - babel({ - babelHelpers:"runtime", - exclude: 'node_modules/**' - }), - clear({targets:["dist"]}), - // terser() - ], - external:["@babel/runtime"] - } -] \ No newline at end of file diff --git a/packages/runtime/src/__tests__/index.test.ts b/packages/runtime/src/__tests__/index.test.ts new file mode 100644 index 0000000..e69de29 diff --git a/packages/runtime/src/datatypes/chinese.ts b/packages/runtime/src/datatypes/chinese.ts new file mode 100644 index 0000000..c614225 --- /dev/null +++ b/packages/runtime/src/datatypes/chinese.ts @@ -0,0 +1,25 @@ +/** + * + * 处理中文数字和货币相关 + * + */ + + +import { FlexFormatter, Formatter } from '../formatter' +import { toChineseNumber } from "flex-tools/chinese/toChineseNumber" +import { toChineseCurrency } from "flex-tools/chinese/toChineseCurrency" + + +export const chineseNumberFormatter = Formatter((value: number, isBig: boolean, $config: any) => { + return toChineseNumber(value, isBig) +}, { + params: ["isBig"] +}) + + +export const rmbFormater = FlexFormatter((value:number | string, params : any, $config:any) => { + return toChineseCurrency(value, params, $config) +}, { + params: ["big", "prefix", "unit", "suffix"], + configKey: "rmb" +}) diff --git a/packages/runtime/datatypes/currency.js b/packages/runtime/src/datatypes/currency.ts similarity index 84% rename from packages/runtime/datatypes/currency.js rename to packages/runtime/src/datatypes/currency.ts index 537c498..55bee97 100644 --- a/packages/runtime/datatypes/currency.js +++ b/packages/runtime/src/datatypes/currency.ts @@ -4,8 +4,11 @@ * */ -const { isNumber, toNumber, getByPath } = require('../utils') -const { FlexFormatter } = require("../formatter") +import { toNumber } from '../utils' +import { get as getByPath } from "flex-tools/object/get" +import { isNumber } from "flex-tools/typecheck/isNumber" +import { FlexFormatter } from "../formatter" + /** * 为字符串按bits位添加一个, @@ -13,7 +16,7 @@ const { FlexFormatter } = require("../formatter") * @param {*} bits * @returns */ -function addSplitChars(str,bits=3){ +function addSplitChars(str:string,bits:number=3){ let regexp = new RegExp(String.raw`(?!^)(?=(\d{${bits}})+$)`,"g") let r = str.replace(regexp,",") if(r.startsWith(",")) r = r.substring(1) @@ -33,7 +36,7 @@ function addSplitChars(str,bits=3){ * @param {*} format 格式模块板字符串 * @returns */ - function toCurrency(value,params={},$config={}){ +export function toCurrency(value:string|number ,params:Record={},$config={}){ let {symbol="",division=3,prefix="",precision=2,suffix="",unit=0,radix=3,format="{symbol}{value}{unit}"} = params // 1. 分离出整数和小数部分 @@ -47,7 +50,7 @@ function addSplitChars(str,bits=3){ // 不足位数时补零 if(wholeDigits.length{ + +/** + * 货币格式化器 + */ +export const currencyFormatter = FlexFormatter((value:string | number,params:Record={},$config:any)=>{ // format可以取预设值的名称，如long,short等 if(params.format in $config){ params.format = $config[params.format] @@ -99,8 +106,4 @@ const currencyFormatter = FlexFormatter((value,params={},$config)=>{ unit:0 // 小数点精度控制,0代表不控制 }) - -module.exports = { - toCurrency, - currencyFormatter -} \ No newline at end of file + \ No newline at end of file diff --git a/packages/runtime/src/datatypes/datetime.ts b/packages/runtime/src/datatypes/datetime.ts new file mode 100644 index 0000000..cb62300 --- /dev/null +++ b/packages/runtime/src/datatypes/datetime.ts @@ -0,0 +1,133 @@ +/** + +处理日期时间相关 + +*/ +const { isFunction,replaceAll,toDate } = require('../utils') +const { Formatter } = require('../formatter'); +import { formatDateTime } from "flex-tools/misc/formatDateTime" +import { relativeTime } from "flex-tools/misc/relativeTime" +import { assignObject } from "flex-tools/object/assignObject" + + + +function formatTime(value:number ,template="HH:mm:ss"){ + return formatDateTime(value,template,{ + + }) +} + + +/** + * 该类型的格式化器具有以下特点： + * + * 1. 接受一个format参数， + * 2. format参数取值可以是若干预设的值，如long,short等，也可能是一个模板字符串 + * 3. 当format值时，如果定义在$config[configKey]里面，代表了$config[configKey][format]是一个模板字符串 + * 4. 如果!(format in $config[configKey])，则代表format值是一个模板字符串 + * 5. 如果format in presets, 则要求presets[format ]是一个(value)=>{....}，直接返回 + * + **/ +export type FormatterTransformer = (value:any,format:string)=>string +export function createDateTimeFormatter(options={},transformer:FormatterTransformer){ + let opts = assignObject({presets:{}},options) + return Formatter(function(value,format,$config){ + if((format in opts.presets) && isFunction(opts.presets[format])){ + return opts.presets[format](value) + }else if((format in $config)){ + format = $config[format] + }else if(format == "number"){ + return value + } + try{// this指向的是activeFormatter.$config + return format==null ? value : transformer.call(this,value,format) + }catch(e){ + return value + } + },opts) +} + + +/** + * 日期格式化器 + * - format取值：local,long,short,iso,gmt,utc,<模板字符串> + * - 默认值由$config.datetime.date.format指定 + */ + const dateFormatter = createDateTimeFormatter({ + normalize: toDate, + params : ["format"], + configKey: "datetime.date", + presets : { + local: value=>value.toLocaleString(), + iso : value=>value.toISOString(), + utc : value=>value.toUTCString(), + gmt : value=>value.toGMTString() + } +},formatDatetime) + + +/** + * 季度格式化器 + * - format: long,short,number + * - 默认值是 short + */ +const quarterFormatter = createDateTimeFormatter({ + normalize : value=>{ + const month = value.getMonth() + 1 + return Math.floor( ( month % 3 == 0 ? ( month / 3 ) : (month / 3 + 1 ) )) + }, + params : ["format"], + configKey: "datetime.quarter" +},(quarter,format)=>format[quarter-1]) + +/** + * 月份格式化器 + * - format: long,short,number + * - 默认值是 short + */ +const monthFormatter = createDateTimeFormatter({ + normalize: (value:Date)=> value.getMonth() + 1, + params : ["format"], + configKey: "datetime.month" +},(month,format)=>format[month-1]) + +/** + * 周格式化器 + * - format: long,short,number + * - 默认值是 long + */ +const weekdayFormatter = createDateTimeFormatter({ + normalize: (value:Date)=> value.getDay(), + params : ["format"], + configKey: "datetime.weekday" +},(day,format)=>format[day]) + +/** + * 时间格式化器 + * - format取值：local,long,short,timestamp,<模板字符串> + * - 默认值由$config.datetime.time.format指定 + */ + const timeFormatter = createDateTimeFormatter({ + normalize : toDate, + params : ["format"], + configKey : "datetime.time", + presets : { + local : (value:Date)=>value.toLocaleTimeString(), + timestamp: (value:Date)=>value.getTime() + } +},formatTime) + +/** + * 返回相对于rel的时间 + * @param {*} value + * @param {*} baseTime 基准时间，默认是相对现在 + */ +const relativeTimeFormatter = Formatter((value:Date,baseTime:Date,$config:any)=>{ + //const { units,now,before,base = Date.now() , after } = $config + return relativeTime(value, $config) +},{ + normalize:toDate, + params:["base"], + configKey:"datetime.relativeTime" +}) + \ No newline at end of file diff --git a/packages/runtime/datatypes/numeric.js b/packages/runtime/src/datatypes/numeric.ts similarity index 92% rename from packages/runtime/datatypes/numeric.js rename to packages/runtime/src/datatypes/numeric.ts index cdf80a4..58be0d3 100644 --- a/packages/runtime/datatypes/numeric.js +++ b/packages/runtime/src/datatypes/numeric.ts @@ -20,8 +20,4 @@ const numberFormartter = Formatter(function(value,precision,division,$config){ configKey: "number" }) - - -module.exports = { - numberFormartter -} \ No newline at end of file + \ No newline at end of file diff --git a/packages/runtime/src/eventemitter.ts b/packages/runtime/src/eventemitter.ts new file mode 100644 index 0000000..e5d97fb --- /dev/null +++ b/packages/runtime/src/eventemitter.ts @@ -0,0 +1,32 @@ +/** +* +* 简单的事件触发器 +* +*/ +export class EventEmitter{ + #callbacks:Function[] + constructor(){ + this.#callbacks = [] + } + on(callback:Function){ + if(this.#callbacks.includes(callback)) return + this.#callbacks.push(callback) + } + off(callback:Function){ + for(let i=0;icb(...args))) + }else{ + await Promise.all(this.#callbacks.map(cb=>cb(...args))) + } + } +} \ No newline at end of file diff --git a/packages/runtime/src/formatter.ts b/packages/runtime/src/formatter.ts new file mode 100644 index 0000000..1398381 --- /dev/null +++ b/packages/runtime/src/formatter.ts @@ -0,0 +1,366 @@ +/** + * + * 解析格式化器 + * + * 解析{ varname | formater(...params) }中的params部分 + * + * + * + */ + + +import { escapeRegexpStr } from "./utils" +import { get as getByPath } from "flex-tools/object/get" +import { isNumber } from "flex-tools/typecheck/isNumber" +import { isFunction } from "flex-tools/typecheck/isFunction" +import { isPlainObject } from "flex-tools/typecheck/isPlainObject" +import { safeParseJson } from "flex-tools/object/safeParseJson" +import { assignObject } from "flex-tools/object/assignObject" + +/** +使用正则表达式对原始文本内容进行解析匹配后得到的便以处理的数组 + +formatters="| aaa(1,1) | bbb " + +统一解析为 + +[ + [aaa,[1,1]], // [<格式化器名称>,[args,...]] + [<格式化器名称>,[<参数>,<参数>,...]] +] + +formatters="| aaa(1,1,"dddd") | bbb " + +特别注意： +- 目前对参数采用简单的split(",")来解析，因此如果参数中包括了逗号等会影响解析的字符时，可能导致错误 +例如aaa(1,1,"dd,,dd")形式的参数 +在此场景下基本够用了，如果需要支持更复杂的参数解析，可以后续考虑使用正则表达式来解析 +- 如果参数是{},[]，则尝试解决为对象和数组，但是里面的内容无法支持复杂和嵌套数据类型 + +@param {String} formatters + +@returns [ [<格式化器名称>,[<参数>,<参数>,...],[<格式化器名称>,[<参数>,<参数>,...]],...] +*/ + +//@returns [ [<格式化器名称>,[<参数>,<参数>,...],[<格式化器名称>,[<参数>,<参数>,...]],...] +export type FormatterDefines = ([string, string[]])[] +export function parseFormatters(formatters: string): FormatterDefines { + if (!formatters) return []; + // 1. 先解析为 ["aaa()","bbb"]形式 + let result = formatters.trim().substring(1).trim().split("|").map((r) => r.trim()); + // 2. 解析格式化器参数 + return result.map((formatter: string) => { + if (formatter == "") return null; + let firstIndex = formatter.indexOf("("); + let lastIndex = formatter.lastIndexOf(")"); + if (firstIndex !== -1 && lastIndex !== -1) { //参数的格式化器 + // 带参数的格式化器: 取括号中的参数字符串部分 + const strParams = formatter.substring(firstIndex + 1, lastIndex).trim(); + // 解析出格式化的参数数组 + let params = parseFormaterParams(strParams); + // 返回[<格式化器名称>,[<参数>,<参数>,...] + return [formatter.substring(0, firstIndex), params]; + } else { // 不带参数的格式化器 + return [formatter, []]; + } + }).filter((formatter) => Array.isArray(formatter)) as FormatterDefines +} + + +/** + * 生成可以解析指定标签的正则表达式 + * + * getNestingParamsRegex() -- 能解析{}和[] + * getNestingParamsRegex(["",""]), + * + * @param {...any} tags + * @returns + */ +function getNestingParamsRegex(...tags: ([string, string])[]) { + if (tags.length == 0) { + tags.push(["{", "}"]) + tags.push(["[", "]"]) + } + const tagsRegexs = tags.map(([beginTag, endTag]) => { + return `(${escapeRegexpStr(beginTag)}1%.*?%1${escapeRegexpStr(endTag)})` + }) + return formatterNestingParamsRegex.replace("__TAG_REGEXP__", tagsRegexs.length > 0 ? tagsRegexs.join("|") + "|" : "") +} + +/** + * + * 遍历字符串中的 beginTag和endTag,添加辅助序号 + * + * @param {*} str + * @param {*} beginTag + * @param {*} endTag + * @returns + */ +function addTagFlags(str: string, beginTag = "{", endTag = "}") { + let i = 0 + let flagIndex = 0 + while (i < str.length) { + let beginChars = str.slice(i, i + beginTag.length) + let endChars = str.slice(i, i + endTag.length) + if (beginChars == beginTag) { + flagIndex++ + str = str.substring(0, i + beginTag.length) + `${flagIndex}%` + str.substring(i + beginTag.length) + i += beginTag.length + String(flagIndex).length + 1 + continue + } + if (endChars == endTag) { + if (flagIndex > 0) { + str = str.substring(0, i) + `%${flagIndex}` + str.substring(i) + } + i += endTag.length + String(flagIndex).length + 1 + flagIndex-- + continue + } + i++ + } + return str +} + +// 指
成对标签 +export type TagPair = [string, string] +/** + * 增加标签组辅助标识 + * + * addTagHelperFlags("sss",["
","
"] + * + * @param {*} str + * @param {...any} tags 默认已包括{},[] + */ +function addTagHelperFlags(str: string, ...tags: TagPair[]) { + if (tags.length == 0) { + tags.push(["{", "}"]) + tags.push(["[", "]"]) + } + tags.forEach(tag => { + if (str.includes(tag[0]) && str.includes(tag[1])) { + str = addTagFlags(str, ...tag) + } + }) + return str +} + +function removeTagFlags(str: string, beginTag: string, endTag: string) { + const regexs:([string,RegExp])[] = [ + [beginTag, new RegExp(escapeRegexpStr(beginTag) + "\\d+%")], + [endTag, new RegExp("%\\d+" + escapeRegexpStr(endTag))] + ] + regexs.forEach(([tag, regex]) => { + let matched + while ((matched = regex.exec(str)) !== null) { + if (matched.index === regex.lastIndex) regex.lastIndex++; + str = str.replace(regex, tag) + } + }) + return str +} + +function removeTagHelperFlags(str: string, ...tags: TagPair[]) { + if (tags.length == 0) { + tags.push(["{", "}"]) + tags.push(["[", "]"]) + } + tags.forEach(([beginTag, endTag]) => { + if (str.includes(beginTag) && str.includes(endTag)) { + str = removeTagFlags(str, beginTag, endTag) + } + }) + return str +} + +// 提取匹配("a",1,2,'b',{..},[...]),不足：当{}嵌套时无法有效匹配 +// const formatterParamsRegex = /((([\'\"])(.*?)\3)|(\{.*?\})|(\[.*?\])|([\d]+\.?[\d]?)|((true|false|null)(?=[,\b\s]))|([\w\.]+)|((?<=,)\s*(?=,)))(?<=\s*[,\)]?\s*)/g; + +// 支持解析嵌套的{}和[]参数， 前提是：字符串需要经addTagHelperFlags操作后，会在{}[]等位置添加辅助字符 +// 解析嵌套的{}和[]参数基本原理：在{}[]等位置添加辅助字符，然后使用正则表达式匹配，匹配到的字符串中包含辅助字符，然后再去除辅助字符 +const formatterNestingParamsRegex = String.raw`((([\'\"])(.*?)\3))|__TAG_REGEXP__([\d]+\.?[\d]?)|((true|false|null)(?=[,\b\s]))|([\w\.]+)|((?<=,)\s*(?=,))(?<=\s*[,\)]?\s*)` + +/** + * 解析格式化器的参数,即解析使用,分割的函数参数 + * + * 采用正则表达式解析 + * 支持number,boolean,null,String,{},[]的参数，可以识别嵌套的{}和[] + * + * @param {*} strParams 格式化器参数字符串，即formater(<...参数....>)括号里面的参数，使用,分割 + * @returns {Array} 返回参数值数组 [] + */ +function parseFormaterParams(strParams: string): any[] { + let params = []; + let matched; + // 1. 预处理： 处理{}和[]嵌套问题,增加嵌套标识 + strParams = addTagHelperFlags(strParams) + try { + let regex = new RegExp(getNestingParamsRegex(), "g") + while ((matched = regex.exec(strParams)) !== null) { + // 这对于避免零宽度匹配的无限循环是必要的 + if (matched.index === regex.lastIndex) { + regex.lastIndex++; + } + let value: any = matched[0] + if (value.trim() == '') { + value = null + } else if ((value.startsWith("'") && value.endsWith("'")) || (value.startsWith('"') && value.endsWith('"'))) { + value = value.substring(1, value.length - 1) + value = removeTagHelperFlags(value) + } else if ((value.startsWith("{") && value.endsWith("}")) || (value.startsWith('[') && value.endsWith(']'))) { + try { + value = removeTagHelperFlags(value) + value = safeParseJson(value) + } catch { } + } else if (["true", "false", "null"].includes(value)) { + value = JSON.parse(value) + } else if (isNumber(value)) { + value = parseFloat(value) + } else { + value = removeTagHelperFlags(String(value)) + } + params.push(value) + } + } catch { } + return params +} +/** + * 创建格式化器 + * + * 格式化器是一个普通的函数，具有以下特点： + * + * - 函数第一个参数是上一上格式化器的输出 + * - 支持0-N个简单类型的入参 + * - 可以是定参，也可以变参 + * - 格式化器可以在格式化器的$config参数指定一个键值来配置不同语言时的参数 + * + * "currency":createFormatter((value,prefix,suffix, division ,precision,$config)=>{ + * // 无论在格式化入参数是多少个，经过处理后在此得到prefix,suffix, division ,precision参数已经是经过处理后的参数 + * 依次读取格式化器的参数合并： + * - 创建格式化时的defaultParams参数 + * - 从当前激活格式化器的$config中读取配置参数 + * - 在t函数后传入参数 + * 比如currency格式化器支持4参数，其入参顺序是prefix,suffix, division ,precision + * 那么在t函数中可以使用以下五种入参数方式 + * {value | currency } //prefix=undefined,suffix=undefined, division=undefined ,precision=undefined + * {value | currency(prefix) } + * {value | currency(prefix,suffix) } + * {value | currency(prefix,suffix,division) } + * {value | currency(prefix,suffix,division,precision)} + * + * 经过createFormatter处理后，会从当前激活格式化器的$config中读取prefix,suffix, division ,precision参数作为默认参数 + * 然后t函数中的参数会覆盖默认参数，优先级更高 + * }, + * { + * unit:"$", + * prefix, + * suffix, + * division, + * precision + * }, + * { + * normalize:value=>{...}, + * params:["prefix","suffix", "division" ,"precision"] // 声明参数顺序 + * configKey:"currency" // 声明特定语言下的配置在$config.currency + * } + * ) + * + * @param {*} fn + * @param {*} options 配置参数 + * @param {*} defaultParams 可选默认值 + * @returns + */ +export type Formatter = (this: any, value: string, ...args: any[]) => string +export interface FormatterOptions { + normalize?: (value: string) => string // 对输入值进行规范化处理，如进行时间格式化时，为了提高更好的兼容性，支持数字时间戳/字符串/Date等，需要对输入值进行处理，如强制类型转换等 + params?: Record, // 可选的，声明参数顺序，如果是变参的，则需要传入null + configKey?: string // 声明该格式化器在$config中的路径，支持简单的使用.的路径语法 +} + +export function createFormatter(fn: Formatter, options?: FormatterOptions, defaultParams?: Record) { + let opts = assignObject({ + normalize: null, // 对输入值进行规范化处理，如进行时间格式化时，为了提高更好的兼容性，支持数字时间戳/字符串/Date等，需要对输入值进行处理，如强制类型转换等 + params: null, // 可选的，声明参数顺序，如果是变参的，则需要传入null + configKey: null // 声明该格式化器在$config中的路径，支持简单的使用.的路径语法 + }, options) + + // 最后一个参数是传入activeFormatterConfig参数 + // 并且格式化器的this指向的是activeFormatterConfig + const $formatter = function (this: any, value: string, ...args: any[]) { + let finalValue = value + // 1. 输入值规范处理，主要是进行类型转换，确保输入的数据类型及相关格式的正确性，提高数据容错性 + if (isFunction(opts.normalize)) { + try { + finalValue = opts.normalize(finalValue) + } catch { } + } + // 2. 读取activeFormatterConfig + let activeFormatterConfigs = args.length > 0 ? args[args.length - 1] : {} + if (!isPlainObject(activeFormatterConfigs)) activeFormatterConfigs = {} + // 3. 从当前语言的激活语言中读取配置参数 + const formatterConfig = assignObject({}, defaultParams, getByPath(activeFormatterConfigs, opts.configKey, { defaultValue: {} })) + let finalArgs + if (opts.params == null) {// 如果格式化器支持变参，则需要指定params=null + finalArgs = args.slice(0, args.length - 1) + } else { // 具有固定的参数个数 + finalArgs = opts.params.map((param: string) => { + let paramValue = getByPath(formatterConfig, param, undefined) + return isFunction(paramValue) ? paramValue(finalValue) : paramValue + }) + // 4. 将翻译函数执行格式化器时传入的参数覆盖默认参数 + for (let i = 0; i < finalArgs.length; i++) { + if (i == args.length - 1) break // 最后一参数是配置 + if (args[i] !== undefined) finalArgs[i] = args[i] + } + } + return fn.call(this, finalValue, ...finalArgs, formatterConfig) + } + $formatter.configurable = true + return $formatter +} + +/** + * 创建支持弹性参数的格式化器 + * 弹性参数指的是该格式式化器支持两种传参数形式: + * - 位置参数： { value | format(a,b,c,d,e) } + * - 对象参数： { value | format({a,b,c,e}) } + * + * 弹性参数的目的是只需要位置参数中的第N参数时，简化传参 + * 例： + * 上例中，我们只需要传入e参数，则不得不使用{ value | format(,,,,e) } + * 弹性参数允许使用 { value | format({e:}) } + * + * 请参阅currencyFormatter用法 + * + * @param {*} fn + * @param {*} options + * @param {*} defaultParams + */ +export const createFlexFormatter = function (fn: Formatter, options: FormatterOptions, defaultParams?: Record) { + const opts = assignObject({ + params: {} + }, options) + const $flexFormatter = Formatter(function (this: any, value: string, ...args: string[]) { + // 1. 最后一个参数总是代表格式化器的参数,不同语言不一样 + let $config = args[args.length - 1] as unknown as Record + // 2. 从语言配置中读取默认参数 + let finalParams = (options.params || {}).reduce((r: Record, name: string) => { + r[name] = $config[name] == undefined ? (defaultParams || {})[name] : $config[name] + return r + }, {}) + // 3. 从格式化器中传入的参数具有最高优先级，覆盖默认参数 + if (args.length == 2 && isPlainObject(args[0])) { // 一个参数且是{} + Object.assign(finalParams, { format: "custom" }, args[0]) + } else { // 位置参数,如果是空则代表 + for (let i = 0; i < args.length - 1; i++) { + if (args[i] !== undefined) finalParams[opts.params[i]] = args[i] + } + } + return fn.call(this, value, finalParams, $config) + }, { ...options, params: null }) // 变参工式化器需要指定params=null + return $flexFormatter +} + + + +export const FlexFormatter = createFlexFormatter + diff --git a/packages/runtime/formatters/default.js b/packages/runtime/src/formatters/default.ts similarity index 100% rename from packages/runtime/formatters/default.js rename to packages/runtime/src/formatters/default.ts diff --git a/packages/runtime/formatters/en.js b/packages/runtime/src/formatters/en.ts similarity index 95% rename from packages/runtime/formatters/en.js rename to packages/runtime/src/formatters/en.ts index a48f41a..4dd9010 100644 --- a/packages/runtime/formatters/en.js +++ b/packages/runtime/src/formatters/en.ts @@ -2,12 +2,12 @@ * 日期时间格式化器 * */ + -const { isFunction,isPlainObject} = require("../utils") -const { Formatter } = require("../formatter") -const { dateFormatter,quarterFormatter,monthFormatter,weekdayFormatter,timeFormatter,relativeTimeFormatter } = require("../datatypes/datetime") -const { numberFormartter } = require("../datatypes/numeric") -const { currencyFormatter } = require("../datatypes/currency") +import { Formatter } fom "../formatter" +import { dateFormatter,quarterFormatter,monthFormatter,weekdayFormatter,timeFormatter,relativeTimeFormatter } from "../datatypes/datetime" +import { numberFormartter } from "../datatypes/numeric" +import { currencyFormatter } from "../datatypes/currency" @@ -70,7 +70,7 @@ const { currencyFormatter } = require("../datatypes/currency") // }) -module.exports = { +export default { // 配置参数 $config:{ datetime : { diff --git a/packages/runtime/formatters/index.js b/packages/runtime/src/formatters/index.ts similarity index 52% rename from packages/runtime/formatters/index.js rename to packages/runtime/src/formatters/index.ts index e04ff83..cdb6c3c 100644 --- a/packages/runtime/formatters/index.js +++ b/packages/runtime/src/formatters/index.ts @@ -3,14 +3,14 @@ * 被注册到全局语言管理器 */ -const enFormatters = require("./en") -const zhFormatters = require("./zh") -const defaultFormatters = require("./default") - -module.exports = { +import enFormatters from "./en" +import zhFormatters from "./zh" +import defaultFormatters from "./default" + +export default { "*":{ ...enFormatters, ...defaultFormatters }, zh:zhFormatters -} \ No newline at end of file +} diff --git a/packages/runtime/formatters/zh.js b/packages/runtime/src/formatters/zh.ts similarity index 100% rename from packages/runtime/formatters/zh.js rename to packages/runtime/src/formatters/zh.ts diff --git a/packages/runtime/src/index.ts b/packages/runtime/src/index.ts new file mode 100644 index 0000000..50ee6a8 --- /dev/null +++ b/packages/runtime/src/index.ts @@ -0,0 +1,8 @@ +import replaceAll from "string.prototype.replaceall" +replaceAll.shim() + +export * from "./types" +export * from "./manager" +export * from "./scope" +export * from "./formatter" +export * from "./utils" \ No newline at end of file diff --git a/packages/runtime/interpolate.js b/packages/runtime/src/interpolate.ts similarity index 96% rename from packages/runtime/interpolate.js rename to packages/runtime/src/interpolate.ts index 2724175..10565e9 100644 --- a/packages/runtime/interpolate.js +++ b/packages/runtime/src/interpolate.ts @@ -28,8 +28,12 @@ * */ -const { getDataTypeName,isPlainObject,isFunction,replaceAll } = require("./utils"); -const { parseFormatters } = require("./formatter") +import { getDataTypeName } from "./utils" +import { isNumber } from "flex-tools/typecheck/isNumber" +import { isPlainObject } from "flex-tools/typecheck/isPlainObject" +import { isFunction } from "flex-tools/typecheck/isFunction" +import { parseFormatters } from "./formatter" +import { VoerkaI18nScope } from "./scope" // 用来提取字符里面的插值变量参数 , 支持管道符 { var | formatter | formatter } // 支持参数： { var | formatter(x,x,..) | formatter } @@ -100,7 +104,7 @@ function getInterpolatedVars(str) { * @param {Boolean} replaceAll 是否替换所有插值变量，当使用命名插值时应置为true，当使用位置插值时应置为false * @returns 返回替换后的字符串 */ -function forEachInterpolatedVars(str, replacer, options = {}) { +function forEachInterpolatedVars(str:string, replacer, options = {}) { let result = str, matched; let opts = Object.assign({replaceAll: true },options); varWithPipeRegexp.lastIndex = 0; @@ -134,7 +138,7 @@ function forEachInterpolatedVars(str, replacer, options = {}) { * @param {*} scope * @param {*} activeLanguage */ -function resetScopeCache(scope, activeLanguage = null) { +function resetScopeCache(scope:VoerkaI18nScope, activeLanguage:string | null) { scope.$cache = { activeLanguage, typedFormatters: {}, formatters: {} }; } @@ -201,7 +205,7 @@ function getDataTypeDefaultFormatter(scope, activeLanguage, dataType) { * @param {*} name 格式化器名称 * @returns {Function} 格式化函数 */ -function getFormatter(scope, activeLanguage, name) { +function getFormatter(scope:VoerkaI18nScope, activeLanguage:string, name:string) { // 1. 从缓存中直接读取： 缓存格式化器引用，避免重复检索 if (!scope.$cache) resetScopeCache(scope); if (scope.$cache.activeLanguage === activeLanguage) { @@ -422,7 +426,7 @@ function getFormattedValue(scope, activeLanguage, formatters, value, template) { * @param {*} template * @returns */ -function replaceInterpolatedVars(template, ...args) { +export function replaceInterpolatedVars(this:VoerkaI18nScope,template:string, ...args:any[]) { const scope = this; // 当前激活语言 const activeLanguage = scope.global.activeLanguage; diff --git a/packages/runtime/index.js b/packages/runtime/src/manager.ts similarity index 62% rename from packages/runtime/index.js rename to packages/runtime/src/manager.ts index dc4fdeb..67eba33 100644 --- a/packages/runtime/index.js +++ b/packages/runtime/src/manager.ts @@ -1,11 +1,10 @@ -const {DataTypes,getDataTypeName,isFunction,deepMerge,toBoolean} = require("./utils") -const {createFormatter,Formatter,FlexFormatter,createFlexFormatter} = require("./formatter") -const { toDate } = require("./datatypes/datetime") -const { toNumber } = require("./datatypes/numeric") -const EventEmitter = require("./eventemitter") -const inlineFormatters = require("./formatters") -const VoerkaI18nScope = require("./scope") -const { translate } = require("./translate") +import { isFunction } from "flex-tools/typecheck/isFunction" +import { deepMerge } from "flex-tools/object/deepMerge" +import {DataTypes} from "./utils" +import { EventEmitter } from "./eventemitter" +import inlineFormatters from "./formatters" +import { VoerkaI18nLanguage, VoerkaI18nScope, VoerkaI18nFormatters, VoerkI18nMessageLoader, VoerkaI18nFormatter } from "./scope" + // 默认语言配置 const defaultLanguageSettings = { @@ -17,8 +16,15 @@ const defaultLanguageSettings = { {name:"zh",title:"中文",default:true}, {name:"en",title:"英文"} ] -} +} as VoerkaI18nManagerOptions +export interface VoerkaI18nManagerOptions { + debug?: boolean + defaultLanguage: string + activeLanguage: string + formatters: VoerkaI18nFormatters + languages: VoerkaI18nLanguage[] +} /** * 多语言管理类 * @@ -34,37 +40,43 @@ const defaultLanguageSettings = { * VoerkaI18n.off("change",(language)=>{}) * * */ - class VoerkaI18nManager extends EventEmitter{ - constructor(settings={}){ + +export class VoerkaI18nManager extends EventEmitter{ + static instance?:VoerkaI18nManager + #options?:Required + #scopes:VoerkaI18nScope[] = [] + #defaultMessageLoader?:VoerkI18nMessageLoader + constructor(options?:VoerkaI18nManagerOptions){ super() - if(VoerkaI18nManager.instance!=null){ + if(VoerkaI18nManager.instance){ return VoerkaI18nManager.instance; } VoerkaI18nManager.instance = this; - this._settings = deepMerge(defaultLanguageSettings,settings) - this._scopes=[] // 保存VoerkaI18nScope实例 - this._defaultMessageLoader = null // 默认语言包加载器 + this.#options = deepMerge(defaultLanguageSettings,options) as Required + this.#scopes=[] // 保存VoerkaI18nScope实例 } - get settings(){ return this._settings } // 配置参数 - get scopes(){ return this._scopes } // 注册的报有VoerkaI18nScope实例q - get activeLanguage(){ return this._settings.activeLanguage} // 当前激活语言 名称 - get defaultLanguage(){ return this._settings.defaultLanguage} // 默认语言名称 - get languages(){ return this._settings.languages} // 支持的语言列表 - get formatters(){ return this._settings.formatters } // 内置格式化器{*:{$config,$types,...},zh:{$config,$types,...},en:{$config,$types,...}} - get defaultMessageLoader(){ return this._defaultMessageLoader} // 默认语言包加载器 + get debug(){return this.#options!.debug} + get options(){ return this.#options! } // 配置参数 + get scopes(){ return this.#scopes } // 注册的报有VoerkaI18nScope实例q + get activeLanguage(){ return this.#options!.activeLanguage} // 当前激活语言 名称 + get defaultLanguage(){ return this.#options!.defaultLanguage} // 默认语言名称 + get languages(){ return this.#options!.languages} // 支持的语言列表 + get formatters(){ return this.#options!.formatters } // 内置格式化器{*:{$config,$types,...},zh:{$config,$types,...},en:{$config,$types,...}} + get defaultMessageLoader(){ return this.#defaultMessageLoader} // 默认语言包加载器 // 通过默认加载器加载文件 - async loadMessagesFromDefaultLoader(newLanguage,scope){ - if(!isFunction(this._defaultMessageLoader)) return //throw new Error("No default message loader specified") - return await this._defaultMessageLoader.call(scope,newLanguage,scope) + async loadMessagesFromDefaultLoader(newLanguage:string,scope:VoerkaI18nScope){ + if(this.#defaultMessageLoader && isFunction(this.#defaultMessageLoader)){ + return await this.#defaultMessageLoader.call(scope,newLanguage,scope) + } } /** * 切换语言 */ - async change(language){ - if(this.languages.findIndex(lang=>lang.name === language)!==-1 || isFunction(this._defaultMessageLoader)){ + async change(language:string){ + if(this.languages.findIndex(lang=>lang.name === language)!==-1 || isFunction(this.#defaultMessageLoader)){ await this._refreshScopes(language) // 通知所有作用域刷新到对应的语言包 - this._settings.activeLanguage = language + this.#options!.activeLanguage = language await this.emit(language) // 触发语言切换事件 return language }else{ @@ -75,9 +87,9 @@ const defaultLanguageSettings = { * 当切换语言时调用此方法来加载更新语言包 * @param {*} newLanguage */ - async _refreshScopes(newLanguage){ + async _refreshScopes(newLanguage:string){ try{ - const scopeRefreshers = this._scopes.map(scope=>{ + const scopeRefreshers = this.#scopes.map(scope=>{ return scope.refresh(newLanguage) }) if(Promise.allSettled){ @@ -85,7 +97,7 @@ const defaultLanguageSettings = { }else{ await Promise.all(scopeRefreshers) } - }catch(e){ + }catch(e:any){ console.warn("Error while refreshing i18n scopes:",e.message) } } @@ -98,11 +110,11 @@ const defaultLanguageSettings = { * * @param {*} scope */ - async register(scope){ + async register(scope:VoerkaI18nScope){ if(!(scope instanceof VoerkaI18nScope)){ throw new TypeError("Scope must be an instance of VoerkaI18nScope") } - this._scopes.push(scope) + this.#scopes.push(scope) await scope.refresh(this.activeLanguage) } /** @@ -119,16 +131,15 @@ const defaultLanguageSettings = { * @param {*} formatter language : 声明该格式化器适用语言 - isGlobal : 注册到全局 */ - registerFormatter(name,formatter,{language="*"}={}){ + registerFormatter(name:string,formatter:VoerkaI18nFormatter,{language="*"}:{language:string | string[] | '*'}){ if(!isFunction(formatter) || typeof(name)!=="string"){ throw new TypeError("Formatter must be a function") } language = Array.isArray(language) ? language : (language ? language.split(",") : []) language.forEach(lng=>{ if(DataTypes.includes(name)){ - this.formatters[lng].$types[name] = formatter + this.formatters[lng].$types![name] = formatter }else{ this.formatters[lng][name] = formatter } @@ -137,37 +148,23 @@ const defaultLanguageSettings = { /** * 注册默认文本信息加载器 */ - registerDefaultLoader(fn){ + registerDefaultLoader(fn:VoerkI18nMessageLoader){ if(!isFunction(fn)) throw new Error("The default loader must be a async function or promise returned") - this._defaultMessageLoader = fn + this.#defaultMessageLoader = fn this.refresh() } async refresh(){ try{ - let requests = this._scopes.map(scope=>scope.refresh()) + let requests = this.#scopes.map(scope=>scope.refresh()) if(Promise.allSettled){ await Promise.allSettled(requests) }else{ await Promise.all(requests) } - }catch(e){ - if(this._debug) console.error(`Error while refresh voerkai18n scopes:${e.message}`) + }catch(e:any){ + if(this.debug) console.error(`Error while refresh voerkai18n scopes:${e.message}`) } } } - -module.exports ={ - toDate, - toNumber, - toBoolean, - deepMerge, - VoerkaI18nManager, - translate, - VoerkaI18nScope, - createFormatter, - Formatter, - createFlexFormatter, - FlexFormatter, - getDataTypeName -} \ No newline at end of file + \ No newline at end of file diff --git a/packages/runtime/scope.js b/packages/runtime/src/scope.ts similarity index 59% rename from packages/runtime/scope.js rename to packages/runtime/src/scope.ts index bd5b408..5992497 100644 --- a/packages/runtime/scope.js +++ b/packages/runtime/src/scope.ts @@ -1,23 +1,55 @@ -const { DataTypes,isPlainObject, isFunction, getByPath, deepMixin,deepClone } = require("./utils"); -const { translate } = require("./translate") +import { DataTypes } from "./utils" +import { isPlainObject } from "flex-tools/typecheck/isPlainObject" +import { isFunction } from "flex-tools/typecheck/isFunction" +import { deepClone } from "flex-tools/object/deepClone" +import { get as getByPath } from "flex-tools/object/get" +import { translate } from "./translate" +import { deepMerge } from "flex-tools/object/deepMerge" +import { assignObject } from "flex-tools/object/assignObject" +import type {VoerkaI18nManager } from "./manager" +import type { VoerkaI18nFormatterConfigs, VoerkaI18nFormatters, Voerkai18nIdMap, VoerkaI18nLanguage, VoerkaI18nLanguageMessages, VoerkaI18nLanguagePack, VoerkaI18nScopeCache, VoerkaI18nTranslate, VoerkI18nLoaders } from "./types" -module.exports = class VoerkaI18nScope { - constructor(options = {}, callback) { - this._id = options.id || Date.now().toString() + parseInt(Math.random() * 1000); - this._debug = options.debug == undefined ? process && process.env && process.env.NODE_ENV === "development" : options.debug; // 当出错时是否在控制台台输出错误信息 - this._languages = options.languages; // 当前作用域支持的语言列表 - this._defaultLanguage = options.defaultLanguage || "zh"; // 默认语言名称 - this._activeLanguage = options.activeLanguage; // 当前语言名称 - this._default = options.default; // 默认语言包 - this._messages = options.messages; // 当前语言包 - this._idMap = options.idMap; // 消息id映射列表 - this._formatters = options.formatters; // 当前作用域的格式化函数列表{: {$types,$config,[格式化器名称]: () => {},[格式化器名称]: () => {}}} - this._loaders = options.loaders; // 异步加载语言文件的函数列表 - this._global = null; // 引用全局VoerkaI18n配置，注册后自动引用 - this._patchMessages = {}; // 语言包补丁信息{: {....},:{....}} - this._refreshing = false; // 正在加载语言包标识 +export interface VoerkaI18nScopeOptions { + id?: string + debug?: boolean + languages: VoerkaI18nLanguage[] // 当前作用域支持的语言列表 + defaultLanguage: string // 默认语言名称 + activeLanguage: string // 当前语言名称 + default: VoerkaI18nLanguageMessages // 默认语言包 + messages: VoerkaI18nLanguageMessages // 当前语言包 + idMap: Voerkai18nIdMap // 消息id映射列表 + formatters: VoerkaI18nFormatters // 当前作用域的格式化函数列表{: {$types,$config,[格式化器名称]: () => {},[格式化器名称]: () => {}}} + loaders: VoerkI18nLoaders; // 异步加载语言文件的函数列表 +} + +export class VoerkaI18nScope { + #options:Required + #global:VoerkaI18nManager // 引用全局VoerkaI18nManager配置，注册后自动引用 + #refreshing:boolean = false + #patchMessages:VoerkaI18nLanguagePack = {} + #t:VoerkaI18nTranslate + #activeFormatters:VoerkaI18nFormatters ={} + #activeFormatterConfig: VoerkaI18nFormatterConfigs={} + #cache:VoerkaI18nScopeCache ={} + #messages:VoerkaI18nLanguageMessages + constructor(options:VoerkaI18nScopeOptions, callback:Function) { + this.#options = assignObject({ + id : Date.now().toString() + parseInt(String(Math.random() * 1000)), + debug : false, + languages : {}, // 当前作用域支持的语言列表 + defaultLanguage: "zh", // 默认语言名称 + activeLanguage : "zh", // 当前语言名称 + default : {}, // 默认语言包 + messages : {}, // 当前语言包 + idMap : {}, // 消息id映射列表 + formatters : {}, // 当前作用域的格式化函数列表{: {$types,$config,[格式化器名称]: () => {},[格式化器名称]: () => {}}} + loaders : {} // 异步加载语言文件的函数列表 + },options) as Required + + this.#patchMessages = {}; // 语言包补丁信息{: {....},:{....}} + this.#refreshing = false; // 正在加载语言包标识 // 用来缓存格式化器的引用，当使用格式化器时可以直接引用，减少检索遍历 - this.$cache = { + this.#cache = { activeLanguage : null, typedFormatters: {}, formatters : {}, @@ -27,53 +59,49 @@ module.exports = class VoerkaI18nScope { if (!globalThis.VoerkaI18n) { const { VoerkaI18nManager } = require("./"); globalThis.VoerkaI18n = new VoerkaI18nManager({ - debug : this._debug, - defaultLanguage: this._defaultLanguage, - activeLanguage : this._activeLanguage, + debug : this.debug, + defaultLanguage: this.defaultLanguage, + activeLanguage : this.activeLanguage, languages : options.languages, }); } - this._t = translate.bind(this) - this._global = globalThis.VoerkaI18n; + this.#t = translate.bind(this) + this.#global = globalThis.VoerkaI18n as unknown as VoerkaI18nManager; this._initFormatters(this.activeLanguage) // 初始化活动的格式化器 this._mergePatchedMessages(); // 从本地缓存中读取并合并补丁语言包 - this._patch(this._messages, this.activeLanguage); // 延后执行补丁命令，该命令会向远程下载补丁包 + this._patch(this.messages, this.activeLanguage); // 延后执行补丁命令，该命令会向远程下载补丁包 this.register(callback); // 在全局注册作用域 } - get id() {return this._id;} // 作用域唯一id - get debug() {return this._debug;} // 调试开关 - get defaultLanguage() {return this._defaultLanguage;} // 默认语言名称 - get activeLanguage() {return this._global.activeLanguage;} // 默认语言名称 - get default() {return this._default;} // 默认语言包 - get messages() {return this._messages; } // 当前语言包 - get idMap() {return this._idMap;} // 消息id映射列表 - get languages() {return this._languages;} // 当前作用域支持的语言列表[{name,title,fallback}] - get loaders() { return this._loaders;} // 异步加载语言文件的函数列表 - get global() { return this._global;} // 引用全局VoerkaI18n配置，注册后自动引用 - get formatters() { return this._formatters;} // 当前作用域的所有格式化器定义 {<语言名称>: {$types,$config,[格式化器名称]: () = >{},[格式化器名称]: () => {}}} - get activeFormatters() {return this._activeFormatters} // 当前作用域激活的格式化器定义 {$types,$config,[格式化器名称]: () = >{},[格式化器名称]: () = >{}} - get activeFormatterConfig(){return this._activeFormatterConfig} // 当前格式化器合并后的配置参数，参数已经合并了全局格式化器中的参数 - get translate(){return this._t} - get t(){return this._t} + get id() {return this.#options.id;} // 作用域唯一id + get debug() {return this.#options.debug;} // 调试开关 + get defaultLanguage() {return this.#options.defaultLanguage;} // 默认语言名称 + get activeLanguage() {return this.#global.activeLanguage;} // 默认语言名称 + get default() {return this.#options.default;} // 默认语言包 + get messages() {return this.#options.messages; } // 当前语言包 + get idMap() {return this.#options.idMap;} // 消息id映射列表 + get languages() {return this.#options.languages;} // 当前作用域支持的语言列表[{name,title,fallback}] + get loaders() { return this.#options.loaders;} // 异步加载语言文件的函数列表 + get global() { return this.#global;} // 引用全局VoerkaI18n配置，注册后自动引用 + get formatters() { return this.#options.formatters;} // 当前作用域的所有格式化器定义 {<语言名称>: {$types,$config,[格式化器名称]: () = >{},[格式化器名称]: () => {}}} + get activeFormatters() {return this.#activeFormatters} // 当前作用域激活的格式化器定义 {$types,$config,[格式化器名称]: () = >{},[格式化器名称]: () = >{}} + get activeFormatterConfig(){return this.#activeFormatterConfig} // 当前格式化器合并后的配置参数，参数已经合并了全局格式化器中的参数 + get cache(){return this.#cache } + get translate(){return this.#t} + get t(){return this.#t} + /** * 对输入的语言配置进行处理 * - 将en配置为默认回退语言 */ _initiLanguages(){ - if(!Array.isArray(this._languages)){ + if(!Array.isArray(this.languages)){ console.warn("[VoerkaI18n] 无效的语言配置") - this._languages = [ - { - name: "zh", - title: "中文" - }, - { - name: "en", - title: "英文" - } + this.#options.languages = [ + {name: "zh",title: "中文"}, + {name: "en",title: "英文"} ] } - Object.entries(this._languages).forEach(([name,language])=>{ + Object.entries(this.languages).forEach(([name,language])=>{ if(!language.fallback) language.fallback = "en" }) } @@ -82,7 +110,7 @@ module.exports = class VoerkaI18nScope { * 在全局注册作用域当前作用域 * @param {*} callback 注册成功后的回调 */ - register(callback) { + register(callback:Function) { if (!isFunction(callback)) callback = () => {}; this.global.register(this).then(callback).catch(callback); } @@ -103,7 +131,7 @@ module.exports = class VoerkaI18nScope { 语言名称，语言名称数组，或者使用,分割的语言名称字符串 asGlobal : 注册到全局 */ - registerFormatter(name, formatter, { language = "*", global : asGlobal } = {}) { + registerFormatter(name:string, formatter:VoerkaI18nFormatter, { language = "*", global : asGlobal } = {}) { if (!isFunction(formatter) || typeof name !== "string") { throw new TypeError("Formatter must be a function"); } @@ -128,7 +156,7 @@ module.exports = class VoerkaI18nScope { * @param {*} formatters ={"*",zh:{...},en:{...}} * @returns */ - registerFormatters(formatters,asGlobal=false) { + registerFormatters(formatters:VoerkaI18nFormatters,asGlobal=false) { Object.entries(formatters).forEach(([language,fns])=>{ Object.entries(fns).forEach(([name,formatter])=>{ this.registerFormatter(name,formatter,{language,global:asGlobal}) @@ -138,27 +166,27 @@ module.exports = class VoerkaI18nScope { /** * 初始化格式化器 * 激活和默认语言的格式化器采用静态导入的形式，而没有采用异步块的形式，这是为了确保首次加载时的能马上读取，而不能采用延迟加载方式 - * _activeFormatters={$config:{...},$types:{...},[格式化器名称]:()=>{...},[格式化器名称]:()=>{...},...}} + * #activeFormatters={$config:{...},$types:{...},[格式化器名称]:()=>{...},[格式化器名称]:()=>{...},...}} */ - _initFormatters(newLanguage){ + private _initFormatters(newLanguage:string){ // 全局格式化器，用来注册到全局 - Object.entries(this._formatters).forEach(([langName,formatters])=>{ + Object.entries(this.formatters).forEach(([langName,formatters])=>{ if(formatters.global===true){ this.registerFormatters({[langName]:formatters},true) }else if(isPlainObject(formatters.global)){ this.registerFormatters({[langName]:formatters.global},true) } }) - this._activeFormatters = {} + this.activeFormatters = {} try { if (newLanguage in this._formatters) { - this._activeFormatters = this._formatters[newLanguage]; + this.#activeFormatters = this._formatters[newLanguage]; } else { - if (this._debug) console.warn(`Not initialize <${newLanguage}> formatters.`); + if (this.debug) console.warn(`Not initialize <${newLanguage}> formatters.`); } this._generateFormatterConfig(newLanguage) } catch (e) { - if (this._debug) console.error(`Error while initialize ${newLanguage} formatters: ${e.message}`); + if (this.debug) console.error(`Error while initialize ${newLanguage} formatters: ${e.message}`); } } @@ -174,22 +202,22 @@ module.exports = class VoerkaI18nScope { * * @param {*} language */ - async _changeFormatters(newLanguage) { + async _changeFormatters(newLanguage:string) { try { - if (newLanguage in this._formatters) { - let loader = this._formatters[newLanguage]; + if (newLanguage in this.formatters) { + let loader = this.formatters[newLanguage]; if (isPlainObject(loader)) { - this._activeFormatters = loader; + this.#activeFormatters = loader as unknown as VoerkaI18nFormatters; } else if (isFunction(loader)) { - this._activeFormatters = (await loader()).default; + this.#activeFormatters = (await (loader as Function).call(this)).default; } // 合并生成格式化器的配置参数,当执行格式化器时该参数将被传递给格式化器 this._generateFormatterConfig(newLanguage) } else { - if (this._debug) console.warn(`Not configured <${newLanguage}> formatters.`); + if (this.debug) console.warn(`Not configured <${newLanguage}> formatters.`); } - } catch (e) { - if (this._debug) console.error(`Error loading ${newLanguage} formatters: ${e.message}`); + } catch (e:any) { + if (this.debug) console.error(`Error loading ${newLanguage} formatters: ${e.message}`); } } /** @@ -198,25 +226,25 @@ module.exports = class VoerkaI18nScope { * - global.formatters[language].$config * - scope.activeFormatters.$config 当前优先 */ - _generateFormatterConfig(language){ + _generateFormatterConfig(language:string){ try{ const fallbackLanguage = this.getLanguage(language).fallback; let configSources = [ - getByPath(this._global.formatters,`${fallbackLanguage}.$config`,{}), - getByPath(this._global.formatters,"*.$config",{}), - getByPath(this._formatters,`${fallbackLanguage}.$config`,{}), + getByPath(this.#global.formatters,`${fallbackLanguage}.$config`,{}), + getByPath(this.#global.formatters,"*.$config",{}), + getByPath(this.formatters,`${fallbackLanguage}.$config`,{}), getByPath(this._formatter,"*.$config",{}), - getByPath(this._global.formatters,`${language}.$config`,{}), - getByPath(this._activeFormatters,"$config",{}) + getByPath(this.#global.formatters,`${language}.$config`,{}), + getByPath(this.#activeFormatters,"$config",{}) ] - return this._activeFormatterConfig = configSources.reduce((finalConfig, config)=>{ - if(isPlainObject(config)) deepMixin(finalConfig,config) + return this.#activeFormatterConfig = configSources.reduce((finalConfig, config)=>{ + if(isPlainObject(config)) deepMerge(finalConfig,config,{newObject:false}) return finalConfig - },deepClone(getByPath(this._global.formatters,`*.$config`,{}))) + },deepClone(getByPath(this.#global.formatters,`*.$config`,{}))) }catch(e){ if(this.debug) console.error(`Error while generate <${language}> formatter options: `,e) - return this._activeFormatters.$config || {} + return this.#activeFormatters.$config || {} } } @@ -224,7 +252,7 @@ module.exports = class VoerkaI18nScope { * 注册默认文本信息加载器 * @param {Function} 必须是异步函数或者是返回Promise */ - registerDefaultLoader(fn) { + registerDefaultLoader(fn:Function) { this.global.registerDefaultLoader(fn); } /** @@ -232,37 +260,37 @@ module.exports = class VoerkaI18nScope { * @param {*} language * @returns */ - getLanguage(language) { - let index = this._languages.findIndex((lng) => lng.name == language); - if (index !== -1) return this._languages[index]; + getLanguage(language:string) { + let index = this.languages.findIndex((lng) => lng.name == language); + if (index !== -1) return this.languages[index]; } /** * 返回是否存在指定的语言 * @param {*} language 语言名称 * @returns */ - hasLanguage(language) { - return this._languages.indexOf((lang) => lang.name == language) !== -1; + hasLanguage(language:string) { + return this.languages.indexOf((lang:VoerkaI18nLanguage) => lang.name == language) !== -1; } /** * 回退到默认语言 */ _fallback() { - this._messages = this._default; - this._activeLanguage = this.defaultLanguage; + this.#options.messages = this.default; + this.#options.activeLanguage = this.defaultLanguage; } /** * 刷新当前语言包 * @param {*} newLanguage */ - async refresh(newLanguage) { - this._refreshing = true; + async refresh(newLanguage?:string) { + this.#refreshing = true; if (!newLanguage) newLanguage = this.activeLanguage; // 默认语言：由于默认语言采用静态加载方式而不是异步块,因此只需要简单的替换即可 if (newLanguage === this.defaultLanguage) { - this._messages = this._default; - await this._patch(this._messages, newLanguage); // 异步补丁 + this.#options.messages = this.default; + await this._patch(this.#options.messages, newLanguage); // 异步补丁 await this._changeFormatters(newLanguage); return; } @@ -303,10 +331,10 @@ module.exports = class VoerkaI18nScope { } } catch (e) { - if (this._debug) console.warn(`Error while loading language <${newLanguage}> on i18nScope(${this.id}): ${e.message}`); + if (this.debug) console.warn(`Error while loading language <${newLanguage}> on i18nScope(${this.id}): ${e.message}`); this._fallback(); } finally { - this._refreshing = false; + this.#refreshing = false; } } /** @@ -327,7 +355,7 @@ module.exports = class VoerkaI18nScope { this._savePatchedMessages(pachedMessages, newLanguage); } } catch (e) { - if (this._debug) console.error(`Error while loading <${newLanguage}> patch messages from remote:`,e); + if (this.debug) console.error(`Error while loading <${newLanguage}> patch messages from remote:`,e); } } /** @@ -363,7 +391,7 @@ module.exports = class VoerkaI18nScope { globalThis.localStorage.setItem(`voerkai18n_${this.id}_${language}_patched_messages`,JSON.stringify(messages)); } } catch (e) { - if (this.$cache._debug) console.error("Error while save voerkai18n patched messages:",e); + if (this.cache._debug) console.error("Error while save voerkai18n patched messages:",e); } } /** @@ -379,10 +407,10 @@ module.exports = class VoerkaI18nScope { } } // 以下方法引用全局VoerkaI18n实例的方法 - on() {return this._global.on(...arguments); } - off() {return this._global.off(...arguments); } - offAll() {return this._global.offAll(...arguments);} + on() {return this.#global.on(...arguments); } + off() {return this.#global.off(...arguments); } + offAll() {return this.#global.offAll(...arguments);} async change(language) { - await this._global.change(language); + await this.#global.change(language); } }; diff --git a/packages/runtime/translate.js b/packages/runtime/src/translate.ts similarity index 85% rename from packages/runtime/translate.js rename to packages/runtime/src/translate.ts index ffaa8d0..ed5892b 100644 --- a/packages/runtime/translate.js +++ b/packages/runtime/src/translate.ts @@ -1,5 +1,10 @@ -const {isNumber,isPlainObject,isFunction} = require("./utils") -const { replaceInterpolatedVars } = require("./interpolate") +import { isNumber } from "flex-tools/typecheck/isNumber" +import { isPlainObject } from "flex-tools/typecheck/isPlainObject" +import { isFunction } from "flex-tools/typecheck/isFunction" +import { replaceInterpolatedVars } from "./interpolate" +import type { VoerkaI18nScope } from "./scope" + + /** * 当传入的翻译内容不是一个字符串时，进行默认的转换 * @@ -10,7 +15,7 @@ const { replaceInterpolatedVars } = require("./interpolate") * @param {*} value * @returns */ - function transformToString(value){ + function transformToString(value:any){ let result = value try{ if(isFunction(result)) result = value() @@ -34,7 +39,7 @@ const { replaceInterpolatedVars } = require("./interpolate") * @param {*} content * @returns */ - function isMessageId(content){ + function isMessageId(content:string){ return isNumber(content) } /** @@ -43,7 +48,7 @@ const { replaceInterpolatedVars } = require("./interpolate") * @param {*} messages 复数形式的文本内容 = [<=0时的内容>，<=1时的内容>，<=2时的内容>,...] * @param {*} value */ -function getPluraMessage(messages,value){ +function getPluraMessage(messages:any,value:number){ try{ if(Array.isArray(messages)){ return messages.length > value ? messages[value] : messages[messages.length-1] @@ -67,27 +72,28 @@ function getPluraMessage(messages,value){ * this===scope 当前绑定的scope * */ -function translate(message) { +export function translate(this:VoerkaI18nScope,message:string,...args:any[]) { const scope = this const activeLanguage = scope.global.activeLanguage - let content = message + let content:string = message let vars=[] // 插值变量列表 let pluralVars= [] // 复数变量 let pluraValue = null // 复数值 - if(!typeof(message)==="string") return message + if(!(typeof(message)==="string")) return message try{ // 1. 预处理变量: 复数变量保存至pluralVars中 , 变量如果是Function则调用 if(arguments.length === 2 && isPlainObject(arguments[1])){ + const dictVars:Record={} Object.entries(arguments[1]).forEach(([name,value])=>{ - if(isFunction(value)){ + if(typeof(value)=="function"){ try{ - vars[name] = value() + dictVars[name] = value() }catch(e){ - vars[name] = value + dictVars[name] = value } } // 以$开头的视为复数变量 - if(name.startsWith("$") && typeof(vars[name])==="number") pluralVars.push(name) + if(name.startsWith("$") && typeof(dictVars[name])==="number") pluralVars.push(name) }) vars = [arguments[1]] }else if(arguments.length >= 2){ @@ -141,9 +147,4 @@ function translate(message) { return content // 出错则返回原始文本 } } - - - -module.exports = { - translate -} \ No newline at end of file + \ No newline at end of file diff --git a/packages/runtime/src/types.ts b/packages/runtime/src/types.ts new file mode 100644 index 0000000..a3a1646 --- /dev/null +++ b/packages/runtime/src/types.ts @@ -0,0 +1,137 @@ +import type { VoerkaI18nManager } from "./manager" +import type { VoerkaI18nScope } from "./scope" + +declare global { + export var VoerkaI18n: VoerkaI18nManager +} + + + + +export type VoerkaI18nLanguageMessages = Record +export interface VoerkaI18nLanguagePack { + [language: string]: VoerkaI18nLanguageMessages +} + +export type Voerkai18nIdMap = Record + +export interface VoerkaI18nLanguage { + name: string + title?: string + default?: boolean + fallback?: string +} + + +export type VoerkaI18nFormatter = (value: string, ...args: any[]) => string +export type VoerkaI18nFormatterConfigs = Record + +export type VoerkaI18nFormatters = Record + $config?: Record +} & { + [key: string]: VoerkaI18nFormatter +})> //| (() => Promise)> + +export type VoerkI18nLoader = () => Awaited> +export interface VoerkI18nLoaders { + [key: string]: VoerkI18nLoader +} +export type VoerkI18nMessageLoader = (this:VoerkaI18nScope,newLanguage:string,scope:VoerkaI18nScope)=>Promise + +export interface VoerkaI18nScopeCache{ + activeLanguage? : null, + typedFormatters?: {}, + formatters? : {}, +} +export type TranslateMessageVars = number | boolean | string | Function | Date +export interface VoerkaI18nTranslate { + (message: string, ...args: TranslateMessageVars[]): string + (message: string, vars?: Record): string +} +export interface VoerkaI18nSupportedLanguages { + [key: string]: VoerkaI18nLanguage +} + + +// export class VoerkaI18nScope { +// constructor(options: VoerkaI18nScopeOptions, callback?: Function) +// get id(): string // 作用域唯一id +// get debug(): boolean // 调试开关 +// get defaultLanguage(): string // 默认语言名称 +// get activeLanguage(): string // 默认语言名称 +// get default(): VoerkaI18nLanguageMessages // 默认语言包 +// get messages(): VoerkaI18nLanguageMessages // 当前语言包 +// get idMap(): Voerkai18nIdMap // 消息id映射列表 +// get languages(): VoerkaI18nSupportedLanguages // 当前作用域支持的语言列表[{name,title,fallback}] +// get loaders(): VoerkI18nLoaders // 异步加载语言文件的函数列表 +// get global(): VoerkaI18nManager // 引用全局VoerkaI18n配置，注册后自动引用 +// get formatters(): VoerkI18nFormatters // 当前作用域的所有格式化器定义 {<语言名称>: {$types,$config,[格式化器名称]: () = >{},[格式化器名称]: () => {}}} +// get activeFormatters(): VoerkI18nFormatters // 当前作用域激活的格式化器定义 {$types,$config,[格式化器名称]: () = >{},[格式化器名称]: () = >{}} +// get activeFormatterConfig(): VoerkI18nFormatterConfigs // 当前格式化器合并后的配置参数，参数已经合并了全局格式化器中的参数 +// get t(): VoerkaI18nTranslate +// get translate(): VoerkaI18nTranslate +// /** +// * 在全局注册作用域当前作用域 +// * @param {*} callback 注册成功后的回调 +// */ +// register(callback: Function): void +// /** +// * 注册格式化器 +// */ +// registerFormatter(name: string, formatter: VoerkI18nFormatter, { language, global }: { language: string | string[], global: boolean }): void +// /** +// * 注册多种格式化器 +// */ +// registerFormatters(formatters: VoerkI18nFormatters, asGlobal?: boolean): void +// /** +// * 注册默认文本信息加载器 +// */ +// registerDefaultLoader(fn: Function): void +// /** +// * 获取指定语言信息 +// * @param {*} language +// * @returns +// */ +// getLanguage(language: string): VoerkaI18nLanguageMessages +// hasLanguage(language: string): boolean +// refresh(newLanguage: string): Promise +// on(): void +// off(): void +// offAll(): void +// change(language: string): Promise +// } +export type VoerkI18nFormatterConfigs = Record +// 翻译函数 +export var translate: { + (message: string, ...args: (string | Function)[]): string + (message: string, vars?: Record): string +} +export interface CreateFormatterOptions { + normalize?: (value: any) => any // 对输入值进行规范化处理，如进行时间格式化时，为了提高更好的兼容性，支持数字时间戳/字符串/Date等，需要对输入值进行处理，如强制类型转换等 + params?: string[] | null // 可选的，声明参数顺序，如果是变参的，则需要传入null + configKey?: string // 声明该格式化器在$config中的路径，支持简单的使用.的路径语法 +} + +export type Primitive = string | number | boolean | null | undefined + +export interface FormatterDefine { + (this: VoerkI18nFormatterConfigs, value: any, ...args: Primitive[]): string + (this: VoerkI18nFormatterConfigs, value: any, arg1: Primitive, $config: VoerkI18nFormatterConfigs): string + (this: VoerkI18nFormatterConfigs, value: any, arg1: Primitive, arg2: Primitive, $config: VoerkI18nFormatterConfigs): string + (this: VoerkI18nFormatterConfigs, value: any, arg1: Primitive, arg2: Primitive, arg3: Primitive, $config: VoerkI18nFormatterConfigs): string + configurable?: boolean +} +// 创建格式化器 +export type CreateFormatterType = (fn: Function, options: CreateFormatterOptions, defaultParams: Record) => FormatterDefine +export var createFormatter: CreateFormatterType +export var Formatter: CreateFormatterType + +export type CreateFlexFormatterType = (fn: Function, options: CreateFormatterOptions, defaultParams: Record) => FormatterDefine +export var createFlexFormatter: CreateFlexFormatterType +export var FlexFormatter: CreateFlexFormatterType +export var getDataTypeName: (value: any) => string +export var toDate: (value: any) => Date | number +export var toNumber: (value: any, defaultValue: number) => number +export var toBoolean: (value: any) => boolean + diff --git a/packages/runtime/src/utils.ts b/packages/runtime/src/utils.ts new file mode 100644 index 0000000..ff36bd5 --- /dev/null +++ b/packages/runtime/src/utils.ts @@ -0,0 +1,72 @@ +import { isNumber } from "flex-tools/typecheck/isNumber" + +/** + * 获取指定变量类型名称 + * getDataTypeName(1) == Number + * getDataTypeName("") == String + * getDataTypeName(null) == Null + * getDataTypeName(undefined) == Undefined + * getDataTypeName(new Date()) == Date + * getDataTypeName(new Error()) == Error + * + * @param {*} v + * @returns + */ +export function getDataTypeName(v:any):string{ + if (v === null) return 'Null' + if (v === undefined) return 'Undefined' + if(typeof(v)==="function") return "Function" + return v.constructor && v.constructor.name; +}; + + + /** + * 当需要采用正则表达式进行字符串替换时，需要对字符串进行转义 + * + * 比如 str = "I am {username}" + * replace(new RegExp(str),"Tom") !=== I am Tom + * + * 因为{}是正则表达式元字符，需要转义成 "\{username\}" + * + * replace(new RegExp(escapeRegexpStr(str)),"Tom") + * + * + * @param {*} str + * @returns + */ + export function escapeRegexpStr(str:string):string{ + return str.replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1") + } + +export const DataTypes = ["String","Number","Boolean","Object","Array","Function","Error","Symbol","RegExp","Date","Null","Undefined","Set","Map","WeakSet","WeakMap"] + +/** + * 转换为数字类型 + */ +export function toNumber(value:any,defualt=0):number { + try { + if (isNumber(value)) { + return parseFloat(value) + } else { + return defualt + } + } catch { + return value + } +} + +/** + * 将值转换为Date类型 + * @param {*} value + */ +export function toDate(value:any) { + try { + return value instanceof Date ? value : new Date(value) + } catch { + return parseInt(value) + } +} + +export function toBoolean(value:any){ + return !!value +} diff --git a/packages/runtime/tsconfig.json b/packages/runtime/tsconfig.json new file mode 100644 index 0000000..5f1d70e --- /dev/null +++ b/packages/runtime/tsconfig.json @@ -0,0 +1,106 @@ +{ + "compilerOptions": { + /* Visit https://aka.ms/tsconfig to read more about this file */ + /* Projects */ + // "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */ + // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ + // "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */ + // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */ + // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ + // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ + //"suppressImplicitAnyIndexErrors":true, + /* Language and Environment */ + "target": "ES2015", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ + // "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ + // "jsx": "preserve", /* Specify what JSX code is generated. */ + "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */ + "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */ + // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */ + // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ + // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */ + // "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */ + // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ + // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ + // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ + //"moduleResolution": "node16", + /* Modules */ + "module": "commonjs", /* Specify what module code is generated. */ + // "baseUrl": ".", + // "rootDir": "./src", + // "outDir": "./dist", + // "paths": { + // }, + "rootDir": "./src", /* Specify the root folder within your source files. */ + // "moduleResolution": "node", /* Specify how TypeScript looks up a file from a given module specifier. */ + //"baseUrl": "./dist", /* Specify the base directory to resolve non-relative module names. */ + //"paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ + //"rootDirs": ["src"], /* Allow multiple folders to be treated as one when resolving modules. */ + // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ + // "types": [], /* Specify type package names to be included without being referenced in a source file. */ + // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ + // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ + // "resolveJsonModule": true, /* Enable importing .json files. */ + // "noResolve": true, /* Disallow 'import's, 'require's or ''s from expanding the number of files TypeScript should add to a project. */ + /* JavaScript Support */ + // "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */ + // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ + // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */ + /* Emit */ + // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ + // "declarationMap": true, /* Create sourcemaps for d.ts files. */ + // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ + // "sourceMap": true, /* Create source map files for emitted JavaScript files. */ + // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ + // "outDir": "./dist", /* Specify an output folder for all emitted files. */ + // "removeComments": true, /* Disable emitting comments. */ + // "noEmit": true, /* Disable emitting files from a compilation. */ + // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ + // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */ + // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ + // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ + // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ + // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ + // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ + // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ + // "newLine": "crlf", /* Set the newline character for emitting files. */ + // "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */ + // "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */ + // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ + // "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */ + // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ + // "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */ + /* Interop Constraints */ + // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ + // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ + "esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */ + // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ + "forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */ + /* Type Checking */ + "strict": true, /* Enable all strict type-checking options. */ + // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */ + // "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */ + // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ + // "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */ + // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ + // "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */ + // "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */ + // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ + // "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */ + // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */ + // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ + // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ + // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ + // "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */ + // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ + // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */ + // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ + // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ + /* Completeness */ + // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ + "skipLibCheck": true, /* Skip type checking all .d.ts files. */ + + }, + "include":[ + "src" + ] +} \ No newline at end of file diff --git a/packages/runtime/utils.js b/packages/runtime/utils.js deleted file mode 100644 index 6b6924e..0000000 --- a/packages/runtime/utils.js +++ /dev/null @@ -1,279 +0,0 @@ - -/** - * 判断是否是JSON对象 - * @param {*} obj - * @returns - */ - function isPlainObject(obj){ - if (typeof obj !== 'object' || obj === null) return false; - var proto = Object.getPrototypeOf(obj); - if (proto === null) return true; - var baseProto = proto; - - while (Object.getPrototypeOf(baseProto) !== null) { - baseProto = Object.getPrototypeOf(baseProto); - } - return proto === baseProto; -} - -/** - * 判断值是否是一个数字 - * @param {*} value - * @returns - */ - function isNumber(value){ - if(value==undefined) return false - if(typeof(value)=='number') return true - if(typeof(value)!='string') return false - try{ - if(value.includes(".")){ - let v = parseFloat(value) - if(value.endsWith(".")){ - return !isNaN(v) && String(v).length===value.length-1 - }else{ - return !isNaN(v) && String(v).length===value.length - } - }else{ - let v = parseInt(value) - return !isNaN(v) && String(v).length===value.length - } - }catch{ - return false - } -} -function isFunction(fn){ - return typeof fn === "function" -} -/** - * 当value= null || undefined || "" || [] || {} 时返回true - * @param {*} value - * @returns - */ -function isNothing(value){ - if(["boolean","function"].includes(typeof(value))) return false - if(value=="") return true - if(value==undefined) return true - if(Array.isArray(value) && value.length==0) return true - if(typeof(value)=="object" && Object.keys(value).length==0) return true - return false -} - -/** - * 深度合并对象 - * - * 注意： - * - 不会对数组成员进行再次遍历 - * - 不能处理循环引入 - * - * @param {*} toObj - * @param {*} formObj - * @param {*} options - * array : 数组合并策略，0-替换，1-合并，2-去重合并 - * mixin : 是否采用混入方式来，=false, 则会创建新对象并返回 - */ -function deepMerge(toObj,formObj,options={}){ - let results = options.mixin ? toObj : Object.assign({},toObj) - Object.entries(formObj).forEach(([key,value])=>{ - if(key in results){ - if(typeof value === "object" && value !== null){ - if(Array.isArray(value)){ - if(options.array === 1){//合并 - results[key] = [...results[key],...value] - }else if(options.array === 2){//去重合并 - results[key] = [...new Set([...results[key],...value])] - }else{ //默认： 替换 - results[key] = value - } - }else{ - results[key] = deepMerge(results[key],value,options) - } - }else{ - results[key] = value - } - }else{ - results[key] = value - } - }) - return results -} - -function deepMixin(toObj,formObj,options={}){ - return deepMerge(toObj,formObj,{...options,mixin:true}) -} - -/** - * 获取指定变量类型名称 - * getDataTypeName(1) == Number - * getDataTypeName("") == String - * getDataTypeName(null) == Null - * getDataTypeName(undefined) == Undefined - * getDataTypeName(new Date()) == Date - * getDataTypeName(new Error()) == Error - * - * @param {*} v - * @returns - */ - function getDataTypeName(v){ - if (v === null) return 'Null' - if (v === undefined) return 'Undefined' - if(typeof(v)==="function") return "Function" - return v.constructor && v.constructor.name; -}; - - - -/** - * 根据路径获取指定值 - * 只支持简单的.分割路径 - * getByPath({a:{b:1}},"a.b") == 1 - * getByPath({a:{b:1}},"a.c",2) == 2 - * - * @param {*} obj - * @param {*} path 使用.分割的路径 - * @param {*} defaultValue 默认值 - * @returns - */ -function getByPath(obj,path,defaultValue){ - if(typeof(obj)!="object" || typeof(path)!="string") return defaultValue - let paths = path.split(".") - let cur = obj - for(let key of paths){ - if(typeof(cur)=="object" && (key in cur) ){ - cur = cur[key] - }else{ - return defaultValue - } - } - return cur -} -function deepClone(obj){ - if(obj==undefined) return obj - if (['string',"number","boolean","function","undefined"].includes(typeof(obj))){ - return obj - }else if(Array.isArray(obj)){ - return obj.map(item => deepClone(item)) - }else if(typeof(obj)=="object"){ - let results = {} - Object.entries(obj).forEach(([key,value])=>{ - results[key] = deepClone(value) - }) - return results - }else{ - return obj - } -} - - -/** - * 替换所有字符串 - * 低版本ES未提供replaceAll,此函数用来替代 - * @param {*} str - * @param {*} findValue - * @param {*} replaceValue - */ -function replaceAll(str,findValue,replaceValue){ - if(typeof(str)!=="string" || findValue=="" || findValue==replaceValue) return str - try{ - return str.replace(new RegExp(escapeRegexpStr(findValue),"g"),replaceValue) - }catch{} - return str -} -/** - * 使用正则表达式解析非标JOSN - * - */ - - const bastardJsonKeyRegex = /(?(?<=:\s*)(\'.*?\')+)|(?(([\w\u4e00-\u9fa5])|(\'.*?\'))+(?=\s*\:))/g - - /** - * 当需要采用正则表达式进行字符串替换时，需要对字符串进行转义 - * - * 比如 str = "I am {username}" - * replace(new RegExp(str),"Tom") !=== I am Tom - * - * 因为{}是正则表达式元字符，需要转义成 "\{username\}" - * - * replace(new RegExp(escapeRegexpStr(str)),"Tom") - * - * - * @param {*} str - * @returns - */ - function escapeRegexpStr(str){ - return str.replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1") - } -/** - * 解析非标的JSON字符串为{} - * 非标的JSON字符串指的是： - * - key没有使用使用""包裹 - * - 字符串value没有使用""包裹 - * - * @param {*} str - * @returns - */ -function safeParseJson(str){ - let matched; - while ((matched = bastardJsonKeyRegex.exec(str)) !== null) { - if (matched.index === bastardJsonKeyRegex.lastIndex) { - bastardJsonKeyRegex.lastIndex++; - } - let item = matched[0] - if(item.startsWith("'") && item.endsWith("'")){ - item = item.substring(1,item.length-1) - } - const findValue = matched.groups.key ? new RegExp( escapeRegexpStr(matched[0]) + "\s*:") : new RegExp(":\s*" + escapeRegexpStr(matched[0])) - const replaceTo = matched.groups.key ? `"${item}":` : `: "${item}"` - str = str.replace(findValue,replaceTo) - } - return JSON.parse(str) -} -const DataTypes = ["String","Number","Boolean","Object","Array","Function","Error","Symbol","RegExp","Date","Null","Undefined","Set","Map","WeakSet","WeakMap"] -/** - * 转换为数字类型 - */ - function toNumber(value,defualt=0) { - try { - if (isNumber(value)) { - return parseFloat(value) - } else { - return defualt - } - } catch { - return value - } -} - -/** - * 将值转换为Date类型 - * @param {*} value - */ - function toDate(value) { - try { - return value instanceof Date ? value : new Date(value) - } catch { - return parseInt(value) - } -} - -function toBoolean(value){ - return !!value -} - -module.exports ={ - DataTypes, - isPlainObject, - isFunction, - isNumber, - isNothing, - toNumber, - toDate, - toBoolean, - deepClone, - deepMerge, - deepMixin, - replaceAll, - getByPath, - getDataTypeName, - escapeRegexpStr, - safeParseJson -} \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bae94ea..e244813 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -79,6 +79,9 @@ importers: devDependencies: '@voerkai18n/cli': link:../../cli + packages/apps/nodejs: + specifiers: {} + packages/apps/react-cra-app: specifiers: '@craco/craco': ^7.0.0 @@ -274,14 +277,19 @@ importers: '@rollup/plugin-node-resolve': ^13.1.3 core-js: ^3.27.1 deepmerge: ^4.2.2 + flex-tools: ^1.0.72 jest: ^27.5.1 rollup: ^2.69.0 rollup-plugin-clear: ^2.0.7 rollup-plugin-terser: ^7.0.2 + string.prototype.replaceall: ^1.0.7 + vitest: ^0.29.8 dependencies: '@babel/runtime': 7.20.7 '@babel/runtime-corejs3': 7.21.0 core-js: 3.27.1 + flex-tools: 1.0.72 + string.prototype.replaceall: 1.0.7 devDependencies: '@babel/cli': 7.18.10_@babel+core@7.18.10 '@babel/core': 7.18.10 @@ -295,6 +303,7 @@ importers: rollup: 2.77.2 rollup-plugin-clear: 2.0.7 rollup-plugin-terser: 7.0.2_rollup@2.77.2 + vitest: 0.29.8 packages/utils: specifiers: @@ -438,7 +447,7 @@ packages: resolution: {integrity: sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.20.7 + '@babel/types': 7.21.4 '@jridgewell/gen-mapping': 0.3.2 jsesc: 2.5.2 @@ -446,14 +455,14 @@ packages: resolution: {integrity: sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.20.7 + '@babel/types': 7.18.10 /@babel/helper-builder-binary-assignment-operator-visitor/7.18.9: resolution: {integrity: sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==} engines: {node: '>=6.9.0'} dependencies: '@babel/helper-explode-assignable-expression': 7.18.6 - '@babel/types': 7.20.7 + '@babel/types': 7.18.10 /@babel/helper-compilation-targets/7.18.9_@babel+core@7.18.10: resolution: {integrity: sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==} @@ -542,20 +551,20 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/template': 7.18.10 - '@babel/types': 7.20.7 + '@babel/types': 7.18.10 /@babel/helper-function-name/7.19.0: resolution: {integrity: sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==} engines: {node: '>=6.9.0'} dependencies: '@babel/template': 7.20.7 - '@babel/types': 7.20.7 + '@babel/types': 7.21.4 /@babel/helper-hoist-variables/7.18.6: resolution: {integrity: sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.20.7 + '@babel/types': 7.18.10 /@babel/helper-member-expression-to-functions/7.18.9: resolution: {integrity: sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==} @@ -567,7 +576,7 @@ packages: resolution: {integrity: sha512-9J0CxJLq315fEdi4s7xK5TQaNYjZw+nDVpVqr1axNGKzdrdwYBD5b4uKv3n75aABG0rCCTK8Im8Ww7eYfMrZgw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.20.7 + '@babel/types': 7.21.4 /@babel/helper-module-imports/7.18.6: resolution: {integrity: sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==} @@ -594,7 +603,7 @@ packages: resolution: {integrity: sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.20.7 + '@babel/types': 7.18.10 /@babel/helper-plugin-utils/7.18.9: resolution: {integrity: sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w==} @@ -614,7 +623,7 @@ packages: '@babel/helper-annotate-as-pure': 7.18.6 '@babel/helper-environment-visitor': 7.18.9 '@babel/helper-wrap-function': 7.18.10 - '@babel/types': 7.20.7 + '@babel/types': 7.18.10 transitivePeerDependencies: - supports-color @@ -626,7 +635,7 @@ packages: '@babel/helper-member-expression-to-functions': 7.18.9 '@babel/helper-optimise-call-expression': 7.18.6 '@babel/traverse': 7.18.10 - '@babel/types': 7.20.7 + '@babel/types': 7.18.10 transitivePeerDependencies: - supports-color @@ -639,7 +648,7 @@ packages: '@babel/helper-optimise-call-expression': 7.18.6 '@babel/template': 7.20.7 '@babel/traverse': 7.20.13 - '@babel/types': 7.20.7 + '@babel/types': 7.21.4 transitivePeerDependencies: - supports-color @@ -647,25 +656,25 @@ packages: resolution: {integrity: sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.20.7 + '@babel/types': 7.18.10 /@babel/helper-skip-transparent-expression-wrappers/7.18.9: resolution: {integrity: sha512-imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.20.7 + '@babel/types': 7.18.10 /@babel/helper-skip-transparent-expression-wrappers/7.20.0: resolution: {integrity: sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.20.7 + '@babel/types': 7.21.4 /@babel/helper-split-export-declaration/7.18.6: resolution: {integrity: sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.20.7 + '@babel/types': 7.18.10 /@babel/helper-string-parser/7.18.10: resolution: {integrity: sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==} @@ -728,7 +737,14 @@ packages: engines: {node: '>=6.0.0'} hasBin: true dependencies: - '@babel/types': 7.20.7 + '@babel/types': 7.18.10 + + /@babel/parser/7.21.4: + resolution: {integrity: sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==} + engines: {node: '>=6.0.0'} + hasBin: true + dependencies: + '@babel/types': 7.21.4 /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/7.18.6_@babel+core@7.18.10: resolution: {integrity: sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==} @@ -1433,7 +1449,7 @@ packages: '@babel/helper-module-imports': 7.18.6 '@babel/helper-plugin-utils': 7.18.9 '@babel/plugin-syntax-jsx': 7.18.6_@babel+core@7.18.10 - '@babel/types': 7.20.7 + '@babel/types': 7.21.4 /@babel/plugin-transform-react-pure-annotations/7.18.6_@babel+core@7.18.10: resolution: {integrity: sha512-I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ==} @@ -1690,14 +1706,6 @@ packages: regenerator-runtime: 0.13.9 dev: true - /@babel/runtime-corejs3/7.20.13: - resolution: {integrity: sha512-p39/6rmY9uvlzRiLZBIB3G9/EBr66LBMcYm7fIDeSBNdRjF2AGD3rFZucUyAgGHC2N+7DdLvVi33uTjSE44FIw==} - engines: {node: '>=6.9.0'} - dependencies: - core-js-pure: 3.29.1 - regenerator-runtime: 0.13.11 - dev: true - /@babel/runtime-corejs3/7.20.7: resolution: {integrity: sha512-jr9lCZ4RbRQmCR28Q8U8Fu49zvFqLxTY9AMOUz+iyMohMoAgpEcVxY+wJNay99oXOpOcCTODkk70NDN2aaJEeg==} engines: {node: '>=6.9.0'} @@ -1751,8 +1759,8 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/code-frame': 7.18.6 - '@babel/parser': 7.20.13 - '@babel/types': 7.20.7 + '@babel/parser': 7.21.4 + '@babel/types': 7.21.4 /@babel/traverse/7.18.10: resolution: {integrity: sha512-J7ycxg0/K9XCtLyHf0cz2DqDihonJeIo+z+HEdRe9YuT8TY4A66i+Ab2/xZCEW7Ro60bPCBBfqqboHSamoV3+g==} @@ -1781,8 +1789,8 @@ packages: '@babel/helper-function-name': 7.19.0 '@babel/helper-hoist-variables': 7.18.6 '@babel/helper-split-export-declaration': 7.18.6 - '@babel/parser': 7.20.13 - '@babel/types': 7.20.7 + '@babel/parser': 7.21.4 + '@babel/types': 7.21.4 debug: 4.3.4 globals: 11.12.0 transitivePeerDependencies: @@ -1804,6 +1812,14 @@ packages: '@babel/helper-validator-identifier': 7.19.1 to-fast-properties: 2.0.0 + /@babel/types/7.21.4: + resolution: {integrity: sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-string-parser': 7.19.4 + '@babel/helper-validator-identifier': 7.19.1 + to-fast-properties: 2.0.0 + /@bcoe/v8-coverage/0.2.3: resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==} @@ -2835,7 +2851,7 @@ packages: resolution: {integrity: sha512-cAaR/CAiZRB8GP32N+1jocovUtvlj0+e65TB50/6Lcime+EA49m/8l+P2ko+XPJ4dw3xaPS3jOL4F2X4KWxoeQ==} engines: {node: '>=10'} dependencies: - '@babel/types': 7.20.7 + '@babel/types': 7.21.4 /@svgr/plugin-jsx/5.5.0: resolution: {integrity: sha512-V/wVh33j12hGh05IDg8GpIUXbjAPnTdPTKuP4VNLggnwaHMPNQNae2pRnyTAILWCQdz5GyMqtO488g7CKM8CBA==} @@ -2954,8 +2970,8 @@ packages: /@types/babel__core/7.1.19: resolution: {integrity: sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==} dependencies: - '@babel/parser': 7.20.13 - '@babel/types': 7.20.7 + '@babel/parser': 7.21.4 + '@babel/types': 7.21.4 '@types/babel__generator': 7.6.4 '@types/babel__template': 7.4.1 '@types/babel__traverse': 7.17.1 @@ -2963,18 +2979,18 @@ packages: /@types/babel__generator/7.6.4: resolution: {integrity: sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==} dependencies: - '@babel/types': 7.20.7 + '@babel/types': 7.21.4 /@types/babel__template/7.4.1: resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==} dependencies: - '@babel/parser': 7.20.13 - '@babel/types': 7.20.7 + '@babel/parser': 7.21.4 + '@babel/types': 7.21.4 /@types/babel__traverse/7.17.1: resolution: {integrity: sha512-kVzjari1s2YVi77D3w1yuvohV2idweYXMCDzqBiVNN63TcDWrIlTVOYpqVrvbbyOE/IyzBoTKF0fdnLPEORFxA==} dependencies: - '@babel/types': 7.20.7 + '@babel/types': 7.21.4 /@types/body-parser/1.19.2: resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==} @@ -2987,6 +3003,16 @@ packages: dependencies: '@types/node': 18.6.3 + /@types/chai-subset/1.3.3: + resolution: {integrity: sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw==} + dependencies: + '@types/chai': 4.3.4 + dev: true + + /@types/chai/4.3.4: + resolution: {integrity: sha512-KnRanxnpfpjUTqTCXslZSEdLfXExwgNxYPdiO2WGUj8+HDjFi8R3k5RVKPeSCzLjCcshCAtVO2QBbVuAV4kTnw==} + dev: true + /@types/connect-history-api-fallback/1.3.5: resolution: {integrity: sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==} dependencies: @@ -3185,7 +3211,7 @@ packages: dependencies: '@types/prop-types': 15.7.5 '@types/scheduler': 0.16.2 - csstype: 3.1.0 + csstype: 3.1.1 dev: true /@types/react/18.0.15: @@ -3193,7 +3219,7 @@ packages: dependencies: '@types/prop-types': 15.7.5 '@types/scheduler': 0.16.2 - csstype: 3.1.0 + csstype: 3.1.1 /@types/resolve/1.17.1: resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==} @@ -3853,6 +3879,37 @@ packages: vue: 3.2.45 dev: true + /@vitest/expect/0.29.8: + resolution: {integrity: sha512-xlcVXn5I5oTq6NiZSY3ykyWixBxr5mG8HYtjvpgg6KaqHm0mvhX18xuwl5YGxIRNt/A5jidd7CWcNHrSvgaQqQ==} + dependencies: + '@vitest/spy': 0.29.8 + '@vitest/utils': 0.29.8 + chai: 4.3.7 + dev: true + + /@vitest/runner/0.29.8: + resolution: {integrity: sha512-FzdhnRDwEr/A3Oo1jtIk/B952BBvP32n1ObMEb23oEJNO+qO5cBet6M2XWIDQmA7BDKGKvmhUf2naXyp/2JEwQ==} + dependencies: + '@vitest/utils': 0.29.8 + p-limit: 4.0.0 + pathe: 1.1.0 + dev: true + + /@vitest/spy/0.29.8: + resolution: {integrity: sha512-VdjBe9w34vOMl5I5mYEzNX8inTxrZ+tYUVk9jxaZJmHFwmDFC/GV3KBFTA/JKswr3XHvZL+FE/yq5EVhb6pSAw==} + dependencies: + tinyspy: 1.1.1 + dev: true + + /@vitest/utils/0.29.8: + resolution: {integrity: sha512-qGzuf3vrTbnoY+RjjVVIBYfuWMjn3UMUqyQtdGNZ6ZIIyte7B37exj6LaVkrZiUTvzSadVvO/tJm8AEgbGCBPg==} + dependencies: + cli-truncate: 3.1.0 + diff: 5.1.0 + loupe: 2.3.6 + pretty-format: 27.5.1 + dev: true + /@volar/language-core/1.0.24: resolution: {integrity: sha512-vTN+alJiWwK0Pax6POqrmevbtFW2dXhjwWiW/MW4f48eDYPLdyURWcr8TixO7EN/nHsUBj2udT7igFKPtjyAKg==} dependencies: @@ -3895,7 +3952,7 @@ packages: /@vue/compiler-core/3.2.37: resolution: {integrity: sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==} dependencies: - '@babel/parser': 7.20.13 + '@babel/parser': 7.21.4 '@vue/shared': 3.2.37 estree-walker: 2.0.2 source-map: 0.6.1 @@ -3903,7 +3960,7 @@ packages: /@vue/compiler-core/3.2.45: resolution: {integrity: sha512-rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A==} dependencies: - '@babel/parser': 7.20.13 + '@babel/parser': 7.21.4 '@vue/shared': 3.2.45 estree-walker: 2.0.2 source-map: 0.6.1 @@ -3911,7 +3968,7 @@ packages: /@vue/compiler-core/3.2.47: resolution: {integrity: sha512-p4D7FDnQb7+YJmO2iPEv0SQNeNzcbHdGByJDsT4lynf63AFkOTFN07HsiRSvjGo0QrxR/o3d0hUyNCUnBU2Tig==} dependencies: - '@babel/parser': 7.20.13 + '@babel/parser': 7.21.4 '@vue/shared': 3.2.47 estree-walker: 2.0.2 source-map: 0.6.1 @@ -3937,7 +3994,7 @@ packages: /@vue/compiler-sfc/3.2.37: resolution: {integrity: sha512-+7i/2+9LYlpqDv+KTtWhOZH+pa8/HnX/905MdVmAcI/mPQOBwkHHIzrsEsucyOIZQYMkXUiTkmZq5am/NyXKkg==} dependencies: - '@babel/parser': 7.20.13 + '@babel/parser': 7.21.4 '@vue/compiler-core': 3.2.37 '@vue/compiler-dom': 3.2.37 '@vue/compiler-ssr': 3.2.37 @@ -3951,7 +4008,7 @@ packages: /@vue/compiler-sfc/3.2.45: resolution: {integrity: sha512-1jXDuWah1ggsnSAOGsec8cFjT/K6TMZ0sPL3o3d84Ft2AYZi2jWJgRMjw4iaK0rBfA89L5gw427H4n1RZQBu6Q==} dependencies: - '@babel/parser': 7.20.13 + '@babel/parser': 7.21.4 '@vue/compiler-core': 3.2.45 '@vue/compiler-dom': 3.2.45 '@vue/compiler-ssr': 3.2.45 @@ -3965,7 +4022,7 @@ packages: /@vue/compiler-sfc/3.2.47: resolution: {integrity: sha512-rog05W+2IFfxjMcFw10tM9+f7i/+FFpZJJ5XHX72NP9eC2uRD+42M3pYcQqDXVYoj74kHMSEdQ/WmCjt8JFksQ==} dependencies: - '@babel/parser': 7.20.13 + '@babel/parser': 7.21.4 '@vue/compiler-core': 3.2.47 '@vue/compiler-dom': 3.2.47 '@vue/compiler-ssr': 3.2.47 @@ -4001,7 +4058,7 @@ packages: /@vue/reactivity-transform/3.2.37: resolution: {integrity: sha512-IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg==} dependencies: - '@babel/parser': 7.20.13 + '@babel/parser': 7.21.4 '@vue/compiler-core': 3.2.37 '@vue/shared': 3.2.37 estree-walker: 2.0.2 @@ -4010,7 +4067,7 @@ packages: /@vue/reactivity-transform/3.2.45: resolution: {integrity: sha512-BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ==} dependencies: - '@babel/parser': 7.20.13 + '@babel/parser': 7.21.4 '@vue/compiler-core': 3.2.45 '@vue/shared': 3.2.45 estree-walker: 2.0.2 @@ -4019,7 +4076,7 @@ packages: /@vue/reactivity-transform/3.2.47: resolution: {integrity: sha512-m8lGXw8rdnPVVIdIFhf0LeQ/ixyHkH5plYuS83yop5n7ggVJU+z5v0zecwEnX7fa7HNLBhh2qngJJkxpwEEmYA==} dependencies: - '@babel/parser': 7.20.13 + '@babel/parser': 7.21.4 '@vue/compiler-core': 3.2.47 '@vue/shared': 3.2.47 estree-walker: 2.0.2 @@ -4064,21 +4121,21 @@ packages: dependencies: '@vue/runtime-core': 3.2.37 '@vue/shared': 3.2.37 - csstype: 2.6.20 + csstype: 2.6.21 /@vue/runtime-dom/3.2.45: resolution: {integrity: sha512-cy88YpfP5Ue2bDBbj75Cb4bIEZUMM/mAkDMfqDTpUYVgTf/kuQ2VQ8LebuZ8k6EudgH8pYhsGWHlY0lcxlvTwA==} dependencies: '@vue/runtime-core': 3.2.45 '@vue/shared': 3.2.45 - csstype: 2.6.20 + csstype: 2.6.21 /@vue/runtime-dom/3.2.47: resolution: {integrity: sha512-ArXrFTjS6TsDei4qwNvgrdmHtD930KgSKGhS5M+j8QxXrDJYLqYw4RRcDy1bz1m1wMmb6j+zGLifdVHtkXA7gA==} dependencies: '@vue/runtime-core': 3.2.47 '@vue/shared': 3.2.47 - csstype: 2.6.20 + csstype: 2.6.21 dev: false /@vue/server-renderer/3.2.37_vue@3.2.37: @@ -4292,6 +4349,11 @@ packages: engines: {node: '>=0.4.0'} hasBin: true + /acorn/8.8.2: + resolution: {integrity: sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==} + engines: {node: '>=0.4.0'} + hasBin: true + /address/1.2.2: resolution: {integrity: sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==} engines: {node: '>= 10.0.0'} @@ -4460,6 +4522,11 @@ packages: resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==} engines: {node: '>=10'} + /ansi-styles/6.2.1: + resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==} + engines: {node: '>=12'} + dev: true + /ansi-wrap/0.1.0: resolution: {integrity: sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==} engines: {node: '>=0.10.0'} @@ -4666,6 +4733,10 @@ packages: util: 0.10.3 dev: true + /assertion-error/1.1.0: + resolution: {integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==} + dev: true + /assign-symbols/1.0.0: resolution: {integrity: sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==} engines: {node: '>=0.10.0'} @@ -4745,7 +4816,7 @@ packages: normalize-range: 0.1.2 num2fraction: 1.2.2 picocolors: 0.2.1 - postcss: 7.0.39 + postcss: 7.0.32 postcss-value-parser: 4.2.0 dev: true @@ -4976,7 +5047,7 @@ packages: engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@babel/template': 7.18.10 - '@babel/types': 7.20.7 + '@babel/types': 7.21.4 '@types/babel__core': 7.1.19 '@types/babel__traverse': 7.17.1 @@ -5733,6 +5804,11 @@ packages: resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==} engines: {node: '>= 0.8'} + /cac/6.7.14: + resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==} + engines: {node: '>=8'} + dev: true + /cacache/10.0.4: resolution: {integrity: sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==} dependencies: @@ -5874,6 +5950,19 @@ packages: resolution: {integrity: sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==} dev: true + /chai/4.3.7: + resolution: {integrity: sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==} + engines: {node: '>=4'} + dependencies: + assertion-error: 1.1.0 + check-error: 1.0.2 + deep-eql: 4.1.3 + get-func-name: 2.0.0 + loupe: 2.3.6 + pathval: 1.1.1 + type-detect: 4.0.8 + dev: true + /chalk/1.1.3: resolution: {integrity: sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==} engines: {node: '>=0.10.0'} @@ -5940,6 +6029,10 @@ packages: resolution: {integrity: sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=} dev: false + /check-error/1.0.2: + resolution: {integrity: sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==} + dev: true + /check-types/11.2.2: resolution: {integrity: sha512-HBiYvXvn9Z70Z88XKjz3AEKd4HJhBXsa3j7xFnITAzoS8+q6eIGi8qDB8FKPBAjtuxjI/zFpwuiCb8oDtKOYrA==} @@ -6073,6 +6166,14 @@ packages: engines: {node: '>=6'} dev: true + /cli-truncate/3.1.0: + resolution: {integrity: sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + dependencies: + slice-ansi: 5.0.0 + string-width: 5.1.2 + dev: true + /cli-width/2.2.1: resolution: {integrity: sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==} dev: true @@ -6600,7 +6701,7 @@ packages: engines: {node: '>=6.0.0'} hasBin: true dependencies: - postcss: 7.0.39 + postcss: 7.0.32 dev: true /css-blank-pseudo/3.0.3_postcss@8.4.21: @@ -6626,7 +6727,7 @@ packages: engines: {node: '>=6.0.0'} hasBin: true dependencies: - postcss: 7.0.39 + postcss: 7.0.32 postcss-selector-parser: 5.0.0 dev: true @@ -6688,7 +6789,7 @@ packages: engines: {node: '>=6.0.0'} hasBin: true dependencies: - postcss: 7.0.39 + postcss: 7.0.32 dev: true /css-prefers-color-scheme/6.0.3_postcss@8.4.21: @@ -6838,11 +6939,11 @@ packages: dependencies: cssom: 0.3.8 - /csstype/2.6.20: - resolution: {integrity: sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==} + /csstype/2.6.21: + resolution: {integrity: sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==} - /csstype/3.1.0: - resolution: {integrity: sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==} + /csstype/3.1.1: + resolution: {integrity: sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==} /cwd/0.9.1: resolution: {integrity: sha512-4+0D+ojEasdLndYX4Cqff057I/Jp6ysXpwKkdLQLnZxV8f6IYZmZtTP5uqD91a/kWqejoc0sSqK4u8wpTKCh8A==} @@ -6947,6 +7048,13 @@ packages: /dedent/0.7.0: resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==} + /deep-eql/4.1.3: + resolution: {integrity: sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==} + engines: {node: '>=6'} + dependencies: + type-detect: 4.0.8 + dev: true + /deep-equal/2.2.0: resolution: {integrity: sha512-RdpzE0Hv4lhowpIUKKMJfeH6C1pXdtT1/it80ubgWqwI3qpuxUBpC1S4hnHg+zjnuOoDkzUtUCEEkG+XG5l3Mw==} dependencies: @@ -7115,6 +7223,11 @@ packages: engines: {node: '>=0.3.1'} dev: true + /diff/5.1.0: + resolution: {integrity: sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==} + engines: {node: '>=0.3.1'} + dev: true + /diffie-hellman/5.0.3: resolution: {integrity: sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==} dependencies: @@ -7295,6 +7408,10 @@ packages: is-plain-object: 2.0.4 object.defaults: 1.1.0 + /eastasianwidth/0.2.0: + resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} + dev: true + /editions/2.3.1: resolution: {integrity: sha512-ptGvkwTvGdGfC0hfhKg0MT+TRLRKGtUiWGBInxOm5pz7ssADezahjCUaYuZ8Dr+C05FW0AECIIPt4WBxVINEhA==} engines: {node: '>=0.8'} @@ -8633,17 +8750,12 @@ packages: deprecated: flatten is deprecated in favor of utility frameworks such as lodash. dev: true - /flex-tools/1.0.58: - resolution: {integrity: sha512-mn/LpPSDS0QcD62Yb0NpYTYWbtxsUA4FdPQOLDTG2GIAEorCHzJ4MkmZvIun/saVSnqju3h3JR0YwOqH/eV2aA==} - dependencies: - lodash: 4.17.21 - dev: true - - /flex-tools/1.0.65: - resolution: {integrity: sha512-Yliq5N7hVPI/+jY29PnQQ7BPoNDX6gkg8rq6RBAdO86dZUvPa+DoQyIIzhrVO1MgYaw/T9OtiAEsVgOtWE0r2w==} + /flex-tools/1.0.72: + resolution: {integrity: sha512-yZm0xElNPQCQcAgNCXOebbp1bfB6L/WunVVif71nsD1ZkbnGtNyhVrGyvssJOzn3GExBBr30O+bnsVo7HslbjQ==} dependencies: fs-extra: 11.1.1 shelljs: 0.8.5 + string.prototype.replaceall: 1.0.7 /flush-write-stream/1.1.1: resolution: {integrity: sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==} @@ -8884,6 +8996,10 @@ packages: resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==} engines: {node: 6.* || 8.* || >= 10.*} + /get-func-name/2.0.0: + resolution: {integrity: sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==} + dev: true + /get-intrinsic/1.2.0: resolution: {integrity: sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==} dependencies: @@ -10055,6 +10171,11 @@ packages: resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==} engines: {node: '>=8'} + /is-fullwidth-code-point/4.0.0: + resolution: {integrity: sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==} + engines: {node: '>=12'} + dev: true + /is-generator-fn/2.1.0: resolution: {integrity: sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==} engines: {node: '>=6'} @@ -10337,7 +10458,7 @@ packages: engines: {node: '>=8'} dependencies: '@babel/core': 7.18.10 - '@babel/parser': 7.20.13 + '@babel/parser': 7.21.4 '@istanbuljs/schema': 0.1.3 istanbul-lib-coverage: 3.2.0 semver: 6.3.0 @@ -10804,7 +10925,7 @@ packages: '@babel/generator': 7.18.10 '@babel/plugin-syntax-typescript': 7.18.6_@babel+core@7.18.10 '@babel/traverse': 7.18.10 - '@babel/types': 7.20.7 + '@babel/types': 7.21.4 '@jest/transform': 27.5.1 '@jest/types': 27.5.1 '@types/babel__traverse': 7.17.1 @@ -10994,7 +11115,7 @@ packages: optional: true dependencies: abab: 2.0.6 - acorn: 8.8.0 + acorn: 8.8.2 acorn-globals: 6.0.0 cssom: 0.4.4 cssstyle: 2.3.0 @@ -11064,6 +11185,10 @@ packages: engines: {node: '>=6'} hasBin: true + /jsonc-parser/3.2.0: + resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==} + dev: true + /jsonfile/3.0.1: resolution: {integrity: sha512-oBko6ZHlubVB5mRFkur5vgYR1UyqX+S6Y/oCfLhqNdcc2fYFlDpIoNc7AfKS1KOGcnNAkvsr0grLck9ANM815w==} optionalDependencies: @@ -11081,7 +11206,7 @@ packages: dependencies: universalify: 2.0.0 optionalDependencies: - graceful-fs: 4.2.11 + graceful-fs: 4.2.10 /jsonpointer/5.0.1: resolution: {integrity: sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==} @@ -11264,6 +11389,11 @@ packages: resolution: {integrity: sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==} engines: {node: '>= 12.13.0'} + /local-pkg/0.4.3: + resolution: {integrity: sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==} + engines: {node: '>=14'} + dev: true + /locate-path/3.0.0: resolution: {integrity: sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==} engines: {node: '>=6'} @@ -11323,11 +11453,11 @@ packages: /logsets/1.0.39: resolution: {integrity: sha512-/AL9mc3MOEhCMmRP6mh9BpwqMVjR9OA8ULxiYKPha7Za8DBWGnDvGNuk7LC3fmhSZm2GWy2EVE7ayLq3rLsYnA==} dependencies: - '@babel/runtime-corejs3': 7.20.13 + '@babel/runtime-corejs3': 7.21.0 ansicolor: 1.1.100 core-js: 3.27.1 deepmerge: 4.2.2 - flex-tools: 1.0.58 + flex-tools: 1.0.72 dev: true /logsets/1.0.42: @@ -11336,7 +11466,7 @@ packages: '@babel/runtime-corejs3': 7.21.0 ansicolor: 1.1.100 core-js: 3.29.1 - flex-tools: 1.0.65 + flex-tools: 1.0.72 /longest-streak/2.0.4: resolution: {integrity: sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==} @@ -11348,6 +11478,12 @@ packages: dependencies: js-tokens: 4.0.0 + /loupe/2.3.6: + resolution: {integrity: sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==} + dependencies: + get-func-name: 2.0.0 + dev: true + /lower-case/1.1.4: resolution: {integrity: sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==} dev: false @@ -11906,6 +12042,15 @@ packages: dependencies: minimist: 1.2.6 + /mlly/1.2.0: + resolution: {integrity: sha512-+c7A3CV0KGdKcylsI6khWyts/CYrGTrRVo4R/I7u/cUsy0Conxa6LUhiEzVKIw14lc2L5aiO4+SeVe4TeGRKww==} + dependencies: + acorn: 8.8.2 + pathe: 1.1.0 + pkg-types: 1.0.2 + ufo: 1.1.1 + dev: true + /move-concurrently/1.0.1: resolution: {integrity: sha512-hdrFxZOycD/g6A6SoI2bB5NA/5NEqD0569+S47WZhPvm46sD50ZHdYaFmnua5lndde9rCHGjmfK7Z8BuCt/PcQ==} dependencies: @@ -11963,8 +12108,8 @@ packages: resolution: {integrity: sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==} dev: true - /nanoid/3.3.4: - resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==} + /nanoid/3.3.6: + resolution: {integrity: sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true @@ -12438,6 +12583,13 @@ packages: dependencies: yocto-queue: 0.1.0 + /p-limit/4.0.0: + resolution: {integrity: sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + dependencies: + yocto-queue: 1.0.0 + dev: true + /p-locate/3.0.0: resolution: {integrity: sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==} engines: {node: '>=6'} @@ -12701,6 +12853,14 @@ packages: resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} engines: {node: '>=8'} + /pathe/1.1.0: + resolution: {integrity: sha512-ODbEPR0KKHqECXW1GoxdDb+AZvULmXjVPy4rt+pGo2+TnjJTIPJQSVS6N63n8T2Ip+syHhbn52OewKicV0373w==} + dev: true + + /pathval/1.1.1: + resolution: {integrity: sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==} + dev: true + /pbkdf2/3.1.2: resolution: {integrity: sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==} engines: {node: '>=0.12'} @@ -12758,6 +12918,14 @@ packages: dependencies: find-up: 4.1.0 + /pkg-types/1.0.2: + resolution: {integrity: sha512-hM58GKXOcj8WTqUXnsQyJYXdeAPbythQgEF3nTcEo+nkD49chjQ9IKm/QJy9xf6JakXptz86h7ecP2024rrLaQ==} + dependencies: + jsonc-parser: 3.2.0 + mlly: 1.2.0 + pathe: 1.1.0 + dev: true + /pkg-up/3.1.0: resolution: {integrity: sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==} engines: {node: '>=8'} @@ -12777,7 +12945,7 @@ packages: /postcss-attribute-case-insensitive/4.0.2: resolution: {integrity: sha512-clkFxk/9pcdb4Vkn0hAHq3YnxBQ2p0CGD1dy24jN+reBck+EWxMbxSUqN4Yj7t0w8csl87K6p0gxBe1utkJsYA==} dependencies: - postcss: 7.0.39 + postcss: 7.0.32 postcss-selector-parser: 6.0.10 dev: true @@ -12822,7 +12990,7 @@ packages: resolution: {integrity: sha512-ZBARCypjEDofW4P6IdPVTLhDNXPRn8T2s1zHbZidW6rPaaZvcnCS2soYFIQJrMZSxiePJ2XIYTlcb2ztr/eT2g==} engines: {node: '>=6.0.0'} dependencies: - postcss: 7.0.39 + postcss: 7.0.32 postcss-values-parser: 2.0.1 dev: true @@ -12840,7 +13008,7 @@ packages: engines: {node: '>=6.0.0'} dependencies: '@csstools/convert-colors': 1.4.0 - postcss: 7.0.39 + postcss: 7.0.32 postcss-values-parser: 2.0.1 dev: true @@ -12848,7 +13016,7 @@ packages: resolution: {integrity: sha512-PF4GDel8q3kkreVXKLAGNpHKilXsZ6xuu+mOQMHWHLPNyjiUBOr75sp5ZKJfmv1MCus5/DWUGcK9hm6qHEnXYw==} engines: {node: '>=6.0.0'} dependencies: - postcss: 7.0.39 + postcss: 7.0.32 postcss-values-parser: 2.0.1 dev: true @@ -12866,7 +13034,7 @@ packages: engines: {node: '>=6.0.0'} dependencies: '@csstools/convert-colors': 1.4.0 - postcss: 7.0.39 + postcss: 7.0.32 postcss-values-parser: 2.0.1 dev: true @@ -12874,7 +13042,7 @@ packages: resolution: {integrity: sha512-aAe3OhkS6qJXBbqzvZth2Au4V3KieR5sRQ4ptb2b2O8wgvB3SJBsdG+jsn2BZbbwekDG8nTfcCNKcSfe/lEy8g==} engines: {node: '>=6.0.0'} dependencies: - postcss: 7.0.39 + postcss: 7.0.32 postcss-values-parser: 2.0.1 dev: true @@ -12913,7 +13081,7 @@ packages: resolution: {integrity: sha512-c9s5iX0Ge15o00HKbuRuTqNndsJUbaXdiNsksnVH8H4gdc+zbLzr/UasOwNG6CTDpLFekVY4672eWdiiWu2GUg==} engines: {node: '>=6.0.0'} dependencies: - postcss: 7.0.39 + postcss: 7.0.32 dev: true /postcss-custom-media/8.0.2_postcss@8.4.21: @@ -12938,7 +13106,7 @@ packages: resolution: {integrity: sha512-nm+o0eLdYqdnJ5abAJeXp4CEU1c1k+eB2yMCvhgzsds/e0umabFrN6HoTy/8Q4K5ilxERdl/JD1LO5ANoYBeMA==} engines: {node: '>=6.0.0'} dependencies: - postcss: 7.0.39 + postcss: 7.0.32 postcss-values-parser: 2.0.1 dev: true @@ -12946,7 +13114,7 @@ packages: resolution: {integrity: sha512-DSGDhqinCqXqlS4R7KGxL1OSycd1lydugJ1ky4iRXPHdBRiozyMHrdu0H3o7qNOCiZwySZTUI5MV0T8QhCLu+w==} engines: {node: '>=6.0.0'} dependencies: - postcss: 7.0.39 + postcss: 7.0.32 postcss-selector-parser: 5.0.0 dev: true @@ -12963,7 +13131,7 @@ packages: resolution: {integrity: sha512-3pm4oq8HYWMZePJY+5ANriPs3P07q+LW6FAdTlkFH2XqDdP4HeeJYMOzn0HYLhRSjBO3fhiqSwwU9xEULSrPgw==} engines: {node: '>=4.0.0'} dependencies: - postcss: 7.0.39 + postcss: 7.0.32 postcss-selector-parser: 5.0.0 dev: true @@ -13012,7 +13180,7 @@ packages: resolution: {integrity: sha512-G+nV8EnQq25fOI8CH/B6krEohGWnF5+3A6H/+JEpOncu5dCnkS1QQ6+ct3Jkaepw1NGVqqOZH6lqrm244mCftA==} engines: {node: '>=6.0.0'} dependencies: - postcss: 7.0.39 + postcss: 7.0.32 postcss-values-parser: 2.0.1 dev: true @@ -13030,7 +13198,7 @@ packages: resolution: {integrity: sha512-rwac4BuZlITeUbiBq60h/xbLzXY43qOsIErngWa4l7Mt+RaSkT7QBjXVGTcBHupykkblHMDrBFh30zchYPaOUw==} engines: {node: '>=6.0.0'} dependencies: - postcss: 7.0.39 + postcss: 7.0.32 postcss-values-parser: 2.0.1 dev: true @@ -13046,7 +13214,7 @@ packages: /postcss-flexbugs-fixes/4.2.1: resolution: {integrity: sha512-9SiofaZ9CWpQWxOwRh1b/r85KD5y7GgvsNt1056k6OYLvWUun0czCvogfJgylC22uJTwW1KzY3Gz65NZRlvoiQ==} dependencies: - postcss: 7.0.39 + postcss: 7.0.32 dev: true /postcss-flexbugs-fixes/5.0.2_postcss@8.4.21: @@ -13060,7 +13228,7 @@ packages: resolution: {integrity: sha512-Z5CkWBw0+idJHSV6+Bgf2peDOFf/x4o+vX/pwcNYrWpXFrSfTkQ3JQ1ojrq9yS+upnAlNRHeg8uEwFTgorjI8g==} engines: {node: '>=6.0.0'} dependencies: - postcss: 7.0.39 + postcss: 7.0.32 dev: true /postcss-focus-visible/6.0.4_postcss@8.4.21: @@ -13076,7 +13244,7 @@ packages: resolution: {integrity: sha512-W0APui8jQeBKbCGZudW37EeMCjDeVxKgiYfIIEo8Bdh5SpB9sxds/Iq8SEuzS0Q4YFOlG7EPFulbbxujpkrV2w==} engines: {node: '>=6.0.0'} dependencies: - postcss: 7.0.39 + postcss: 7.0.32 dev: true /postcss-focus-within/5.0.4_postcss@8.4.21: @@ -13091,7 +13259,7 @@ packages: /postcss-font-variant/4.0.1: resolution: {integrity: sha512-I3ADQSTNtLTTd8uxZhtSOrTCQ9G4qUVKPjHiDk0bV75QSxXjVWiJVJ2VLdspGUi9fbW9BcjKJoRvxAH1pckqmA==} dependencies: - postcss: 7.0.39 + postcss: 7.0.32 dev: true /postcss-font-variant/5.0.0_postcss@8.4.21: @@ -13105,7 +13273,7 @@ packages: resolution: {integrity: sha512-QZSqDaMgXCHuHTEzMsS2KfVDOq7ZFiknSpkrPJY6jmxbugUPTuSzs/vuE5I3zv0WAS+3vhrlqhijiprnuQfzmg==} engines: {node: '>=6.0.0'} dependencies: - postcss: 7.0.39 + postcss: 7.0.32 dev: true /postcss-gap-properties/3.0.5_postcss@8.4.21: @@ -13120,7 +13288,7 @@ packages: resolution: {integrity: sha512-oPTcFFip5LZy8Y/whto91L9xdRHCWEMs3e1MdJxhgt4jy2WYXfhkng59fH5qLXSCPN8k4n94p1Czrfe5IOkKUw==} engines: {node: '>=6.0.0'} dependencies: - postcss: 7.0.39 + postcss: 7.0.32 postcss-values-parser: 2.0.1 dev: true @@ -13147,7 +13315,7 @@ packages: /postcss-initial/3.0.4: resolution: {integrity: sha512-3RLn6DIpMsK1l5UUy9jxQvoDeUN4gP939tDcKUHD/kM8SGSKbFAnvkpFpj3Bhtz3HGk1jWY5ZNWX6mPta5M9fg==} dependencies: - postcss: 7.0.39 + postcss: 7.0.32 dev: true /postcss-initial/4.0.1_postcss@8.4.21: @@ -13178,7 +13346,7 @@ packages: engines: {node: '>=6.0.0'} dependencies: '@csstools/convert-colors': 1.4.0 - postcss: 7.0.39 + postcss: 7.0.32 postcss-values-parser: 2.0.1 dev: true @@ -13221,7 +13389,7 @@ packages: engines: {node: '>= 6'} dependencies: loader-utils: 1.4.0 - postcss: 7.0.39 + postcss: 7.0.32 postcss-load-config: 2.1.2 schema-utils: 1.0.0 dev: true @@ -13243,7 +13411,7 @@ packages: resolution: {integrity: sha512-1SUKdJc2vuMOmeItqGuNaC+N8MzBWFWEkAnRnLpFYj1tGGa7NqyVBujfRtgNa2gXR+6RkGUiB2O5Vmh7E2RmiA==} engines: {node: '>=6.0.0'} dependencies: - postcss: 7.0.39 + postcss: 7.0.32 dev: true /postcss-logical/5.0.4_postcss@8.4.21: @@ -13258,7 +13426,7 @@ packages: resolution: {integrity: sha512-fo9moya6qyxsjbFAYl97qKO9gyre3qvbMnkOZeZwlsW6XYFsvs2DMGDlchVLfAd8LHPZDxivu/+qW2SMQeTHBw==} engines: {node: '>=6.0.0'} dependencies: - postcss: 7.0.39 + postcss: 7.0.32 dev: true /postcss-media-minmax/5.0.0_postcss@8.4.21: @@ -13391,7 +13559,7 @@ packages: resolution: {integrity: sha512-FrorPb0H3nuVq0Sff7W2rnc3SmIcruVC6YwpcS+k687VxyxO33iE1amna7wHuRVzM8vfiYofXSBHNAZ3QhLvYg==} engines: {node: '>=6.0.0'} dependencies: - postcss: 7.0.39 + postcss: 7.0.32 dev: true /postcss-normalize-charset/5.1.0_postcss@8.4.21: @@ -13511,7 +13679,7 @@ packages: resolution: {integrity: sha512-aK0fHc9CBNx8jbzMYhshZcEv8LtYnBIRYQD5i7w/K/wS9c2+0NSR6B3OVMu5y0hBHYLcMGjfU+dmWYNKH0I85g==} engines: {node: '>=6.0.0'} dependencies: - postcss: 7.0.39 + postcss: 7.0.32 dev: true /postcss-overflow-shorthand/3.0.4_postcss@8.4.21: @@ -13526,7 +13694,7 @@ packages: /postcss-page-break/2.0.0: resolution: {integrity: sha512-tkpTSrLpfLfD9HvgOlJuigLuk39wVTbbd8RKcy8/ugV2bNBUW3xU+AIqyxhDrQr1VUj1RmyJrBn1YWrqUm9zAQ==} dependencies: - postcss: 7.0.39 + postcss: 7.0.32 dev: true /postcss-page-break/3.0.4_postcss@8.4.21: @@ -13540,7 +13708,7 @@ packages: resolution: {integrity: sha512-Zb6byCSLkgRKLODj/5mQugyuj9bvAAw9LqJJjgwz5cYryGeXfFZfSXoP1UfveccFmeq0b/2xxwcTEVScnqGxBg==} engines: {node: '>=6.0.0'} dependencies: - postcss: 7.0.39 + postcss: 7.0.32 postcss-values-parser: 2.0.1 dev: true @@ -13564,7 +13732,7 @@ packages: css-has-pseudo: 0.10.0 css-prefers-color-scheme: 3.1.1 cssdb: 4.4.0 - postcss: 7.0.39 + postcss: 7.0.32 postcss-attribute-case-insensitive: 4.0.2 postcss-color-functional-notation: 2.0.1 postcss-color-gray: 5.0.0 @@ -13657,7 +13825,7 @@ packages: resolution: {integrity: sha512-lgXW9sYJdLqtmw23otOzrtbDXofUdfYzNm4PIpNE322/swES3VU9XlXHeJS46zT2onFO7V1QFdD4Q9LiZj8mew==} engines: {node: '>=6.0.0'} dependencies: - postcss: 7.0.39 + postcss: 7.0.32 postcss-selector-parser: 5.0.0 dev: true @@ -13692,7 +13860,7 @@ packages: /postcss-replace-overflow-wrap/3.0.0: resolution: {integrity: sha512-2T5hcEHArDT6X9+9dVSPQdo7QHzG4XKclFT8rU5TzJPDN7RIRTbO9c4drUISOVemLj03aezStHCR2AIcr8XLpw==} dependencies: - postcss: 7.0.39 + postcss: 7.0.32 dev: true /postcss-replace-overflow-wrap/4.0.0_postcss@8.4.21: @@ -13706,21 +13874,21 @@ packages: resolution: {integrity: sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==} engines: {node: '>=6.0.0'} dependencies: - postcss: 7.0.39 + postcss: 7.0.32 dev: true /postcss-selector-matches/4.0.0: resolution: {integrity: sha512-LgsHwQR/EsRYSqlwdGzeaPKVT0Ml7LAT6E75T8W8xLJY62CE4S/l03BWIt3jT8Taq22kXP08s2SfTSzaraoPww==} dependencies: balanced-match: 1.0.2 - postcss: 7.0.39 + postcss: 7.0.32 dev: true /postcss-selector-not/4.0.1: resolution: {integrity: sha512-YolvBgInEK5/79C+bdFMyzqTg6pkYqDbzZIST/PDMqa/o3qtXenD05apBG2jLgT0/BQ77d4U2UK12jWpilqMAQ==} dependencies: balanced-match: 1.0.2 - postcss: 7.0.39 + postcss: 7.0.32 dev: true /postcss-selector-not/6.0.1_postcss@8.4.21: @@ -13799,7 +13967,7 @@ packages: resolution: {integrity: sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==} engines: {node: ^10 || ^12 || >=14} dependencies: - nanoid: 3.3.4 + nanoid: 3.3.6 picocolors: 1.0.0 source-map-js: 1.0.2 dev: true @@ -13808,7 +13976,7 @@ packages: resolution: {integrity: sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==} engines: {node: ^10 || ^12 || >=14} dependencies: - nanoid: 3.3.4 + nanoid: 3.3.6 picocolors: 1.0.0 source-map-js: 1.0.2 @@ -15461,6 +15629,10 @@ packages: get-intrinsic: 1.2.0 object-inspect: 1.12.2 + /siginfo/2.0.0: + resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==} + dev: true + /signal-exit/3.0.7: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} @@ -15504,6 +15676,14 @@ packages: engines: {node: '>=6'} dev: true + /slice-ansi/5.0.0: + resolution: {integrity: sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==} + engines: {node: '>=12'} + dependencies: + ansi-styles: 6.2.1 + is-fullwidth-code-point: 4.0.0 + dev: true + /smart-buffer/1.1.15: resolution: {integrity: sha512-1+8bxygjTsNfvQe0/0pNBesTOlSHtOeG6b6LYbvsZCCHDKYZ40zcQo6YTnZBWrBSLWOCbrHljLdEmGMYebu7aQ==} engines: {node: '>= 0.10.15', npm: '>= 1.3.5'} @@ -15726,6 +15906,10 @@ packages: dependencies: escape-string-regexp: 2.0.0 + /stackback/0.0.2: + resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==} + dev: true + /stackframe/1.3.4: resolution: {integrity: sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==} @@ -15744,6 +15928,10 @@ packages: resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==} engines: {node: '>= 0.8'} + /std-env/3.3.2: + resolution: {integrity: sha512-uUZI65yrV2Qva5gqE0+A7uVAvO40iPo6jGhs7s8keRfHCmtg+uB2X6EiLGCI9IgL1J17xGhvoOqSz79lzICPTA==} + dev: true + /stop-iteration-iterator/1.0.0: resolution: {integrity: sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==} engines: {node: '>= 0.4'} @@ -15831,6 +16019,15 @@ packages: is-fullwidth-code-point: 3.0.0 strip-ansi: 6.0.1 + /string-width/5.1.2: + resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==} + engines: {node: '>=12'} + dependencies: + eastasianwidth: 0.2.0 + emoji-regex: 9.2.2 + strip-ansi: 7.0.1 + dev: true + /string.prototype.matchall/4.0.8: resolution: {integrity: sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==} dependencies: @@ -15852,7 +16049,6 @@ packages: get-intrinsic: 1.2.0 has-symbols: 1.0.3 is-regex: 1.1.4 - dev: false /string.prototype.trimend/1.0.6: resolution: {integrity: sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==} @@ -15974,6 +16170,12 @@ packages: resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} engines: {node: '>=8'} + /strip-literal/1.0.1: + resolution: {integrity: sha512-QZTsipNpa2Ppr6v1AmJHESqJ3Uz247MUS0OjrnnZjFAvEoWqxuyFuXn2xLgMtRnijJShAa1HL0gtJyUs7u7n3Q==} + dependencies: + acorn: 8.8.2 + dev: true + /style-loader/3.3.1_webpack@5.75.0: resolution: {integrity: sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==} engines: {node: '>= 12.13.0'} @@ -16214,7 +16416,7 @@ packages: engines: {node: '>=10'} hasBin: true dependencies: - acorn: 8.8.0 + acorn: 8.8.2 commander: 2.20.3 source-map: 0.7.4 source-map-support: 0.5.21 @@ -16288,6 +16490,20 @@ packages: resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==} dev: true + /tinybench/2.4.0: + resolution: {integrity: sha512-iyziEiyFxX4kyxSp+MtY1oCH/lvjH3PxFN8PGCDeqcZWAJ/i+9y+nL85w99PxVzrIvew/GSkSbDYtiGVa85Afg==} + dev: true + + /tinypool/0.4.0: + resolution: {integrity: sha512-2ksntHOKf893wSAH4z/+JbPpi92esw8Gn9N2deXX+B0EO92hexAVI9GIZZPx7P5aYo5KULfeOSt3kMOmSOy6uA==} + engines: {node: '>=14.0.0'} + dev: true + + /tinyspy/1.1.1: + resolution: {integrity: sha512-UVq5AXt/gQlti7oxoIg5oi/9r0WpF7DGEVwXgqWSMmyN16+e3tl5lIvTaOpJ3TAtu5xFzWccFRM4R5NaWHF+4g==} + engines: {node: '>=14.0.0'} + dev: true + /tmp/0.0.33: resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==} engines: {node: '>=0.6.0'} @@ -16516,6 +16732,10 @@ packages: resolution: {integrity: sha512-boAm74ubXHY7KJQZLlXrtMz52qFvpsbOxDcZOnw/Wf+LS4Mmyu7JxmzD4tDLtUQtmZECypJ0FrCz4QIe6dvKRA==} dev: true + /ufo/1.1.1: + resolution: {integrity: sha512-MvlCc4GHrmZdAllBc0iUDowff36Q9Ndw/UzqmEKyrfSzokTd9ZCy1i+IIk5hrYKkjoYVQyNbrw7/F8XJ2rEwTg==} + dev: true + /uglify-js/3.4.10: resolution: {integrity: sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==} engines: {node: '>=0.8.0'} @@ -16918,7 +17138,7 @@ packages: dependencies: fs-mkdirp-stream: 1.0.0 glob-stream: 6.1.0 - graceful-fs: 4.2.10 + graceful-fs: 4.2.11 is-valid-glob: 1.0.0 lazystream: 1.0.1 lead: 1.0.0 @@ -16957,6 +17177,27 @@ packages: remove-trailing-separator: 1.1.0 replace-ext: 1.0.1 + /vite-node/0.29.8_@types+node@18.6.3: + resolution: {integrity: sha512-b6OtCXfk65L6SElVM20q5G546yu10/kNrhg08afEoWlFRJXFq9/6glsvSVY+aI6YeC1tu2TtAqI2jHEQmOmsFw==} + engines: {node: '>=v14.16.0'} + hasBin: true + dependencies: + cac: 6.7.14 + debug: 4.3.4 + mlly: 1.2.0 + pathe: 1.1.0 + picocolors: 1.0.0 + vite: 4.0.4_@types+node@18.6.3 + transitivePeerDependencies: + - '@types/node' + - less + - sass + - stylus + - sugarss + - supports-color + - terser + dev: true + /vite-plugin-inspect/0.4.3_vite@2.9.14: resolution: {integrity: sha512-lj3oWnReRUwMHB7k8ZD8o6E27/OSn+8ua+tOftxuS39aM6Z9MG7m5r1CMlxMwEwdTM/wnQr0aH22Y2IX3e+++w==} engines: {node: '>=14'} @@ -17049,6 +17290,104 @@ packages: fsevents: 2.3.2 dev: true + /vite/4.0.4_@types+node@18.6.3: + resolution: {integrity: sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==} + engines: {node: ^14.18.0 || >=16.0.0} + hasBin: true + peerDependencies: + '@types/node': '>= 14' + less: '*' + sass: '*' + stylus: '*' + sugarss: '*' + terser: ^5.4.0 + peerDependenciesMeta: + '@types/node': + optional: true + less: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + dependencies: + '@types/node': 18.6.3 + esbuild: 0.16.17 + postcss: 8.4.21 + resolve: 1.22.1 + rollup: 3.10.0 + optionalDependencies: + fsevents: 2.3.2 + dev: true + + /vitest/0.29.8: + resolution: {integrity: sha512-JIAVi2GK5cvA6awGpH0HvH/gEG9PZ0a/WoxdiV3PmqK+3CjQMf8c+J/Vhv4mdZ2nRyXFw66sAg6qz7VNkaHfDQ==} + engines: {node: '>=v14.16.0'} + hasBin: true + peerDependencies: + '@edge-runtime/vm': '*' + '@vitest/browser': '*' + '@vitest/ui': '*' + happy-dom: '*' + jsdom: '*' + playwright: '*' + safaridriver: '*' + webdriverio: '*' + peerDependenciesMeta: + '@edge-runtime/vm': + optional: true + '@vitest/browser': + optional: true + '@vitest/ui': + optional: true + happy-dom: + optional: true + jsdom: + optional: true + playwright: + optional: true + safaridriver: + optional: true + webdriverio: + optional: true + dependencies: + '@types/chai': 4.3.4 + '@types/chai-subset': 1.3.3 + '@types/node': 18.6.3 + '@vitest/expect': 0.29.8 + '@vitest/runner': 0.29.8 + '@vitest/spy': 0.29.8 + '@vitest/utils': 0.29.8 + acorn: 8.8.2 + acorn-walk: 8.2.0 + cac: 6.7.14 + chai: 4.3.7 + debug: 4.3.4 + local-pkg: 0.4.3 + pathe: 1.1.0 + picocolors: 1.0.0 + source-map: 0.6.1 + std-env: 3.3.2 + strip-literal: 1.0.1 + tinybench: 2.4.0 + tinypool: 0.4.0 + tinyspy: 1.1.1 + vite: 4.0.4_@types+node@18.6.3 + vite-node: 0.29.8_@types+node@18.6.3 + why-is-node-running: 2.2.2 + transitivePeerDependencies: + - less + - sass + - stylus + - sugarss + - supports-color + - terser + dev: true + /vm-browserify/1.1.2: resolution: {integrity: sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==} dev: true @@ -17385,6 +17724,15 @@ packages: dependencies: isexe: 2.0.0 + /why-is-node-running/2.2.2: + resolution: {integrity: sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==} + engines: {node: '>=8'} + hasBin: true + dependencies: + siginfo: 2.0.0 + stackback: 0.0.2 + dev: true + /wicked-good-xpath/1.3.0: resolution: {integrity: sha512-Gd9+TUn5nXdwj/hFsPVx5cuHHiF5Bwuc30jZ4+ronF1qHK5O7HD0sgmXWSEgwKquT3ClLoKPVbO6qGwVwLzvAw==} dev: true @@ -17712,6 +18060,11 @@ packages: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} engines: {node: '>=10'} + /yocto-queue/1.0.0: + resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==} + engines: {node: '>=12.20'} + dev: true + /yorkie/2.0.0: resolution: {integrity: sha512-jcKpkthap6x63MB4TxwCyuIGkV0oYP/YRyuQU5UO0Yz/E/ZAu+653/uov+phdmO54n6BcvFRyyt0RRrWdN2mpw==} engines: {node: '>=4'}