@planarcat/js-toolkit 1.5.5 → 1.5.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +13 -0
- package/dist/date/formatDate.d.ts +1 -1
- package/dist/date/formatDate.d.ts.map +1 -1
- package/dist/date/formatDate.js +19 -20
- package/dist/date/formatDate.js.map +1 -1
- package/dist/object/toFormattedNumberString.d.ts.map +1 -1
- package/dist/object/toFormattedNumberString.js +118 -106
- package/dist/object/toFormattedNumberString.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -248,6 +248,19 @@ npm run test:coverage
|
|
|
248
248
|
|
|
249
249
|
## 更新日志
|
|
250
250
|
|
|
251
|
+
### v1.5.6
|
|
252
|
+
|
|
253
|
+
- ✨ 优化了 `toFormattedNumberString` 函数的内部实现，将内部函数提取到外部
|
|
254
|
+
- ✨ 统一了变量命名规范，根据转化进度命名：converted、preProcessed、formatted
|
|
255
|
+
- ✨ 新增测试用例，验证预处理函数和后缀函数的组合使用
|
|
256
|
+
- ✨ 提高了代码的可读性和可维护性
|
|
257
|
+
|
|
258
|
+
### v1.5.5
|
|
259
|
+
|
|
260
|
+
- ✨ 修复了测试文件中的未使用变量警告
|
|
261
|
+
- ✨ 优化了代码注释，删除了重复的不必要说明
|
|
262
|
+
- ✨ 提高了代码的简洁性和可维护性
|
|
263
|
+
|
|
251
264
|
### v1.5.3
|
|
252
265
|
|
|
253
266
|
- ✨ 增强了 `toFormattedNumberString` 函数，为 `preProcessor`、`prefix` 和 `suffix` 函数更新了参数顺序
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formatDate.d.ts","sourceRoot":"","sources":["../../src/date/formatDate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"formatDate.d.ts","sourceRoot":"","sources":["../../src/date/formatDate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAoD7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,iBAAS,UAAU,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,GAAE,MAA8B,EAAE,OAAO,GAAE,OAAO,CAAC,iBAAiB,CAAM,GAAG,MAAM,CAkFjI;AAED,eAAe,UAAU,CAAC"}
|
package/dist/date/formatDate.js
CHANGED
|
@@ -11,7 +11,7 @@ function safeParseDate(input) {
|
|
|
11
11
|
if (input instanceof Date && !isNaN(input.getTime())) {
|
|
12
12
|
return input;
|
|
13
13
|
}
|
|
14
|
-
if (typeof input ===
|
|
14
|
+
if (typeof input === 'string' || typeof input === 'number') {
|
|
15
15
|
const date = new Date(input);
|
|
16
16
|
if (!isNaN(date.getTime())) {
|
|
17
17
|
return date;
|
|
@@ -42,9 +42,8 @@ function getWeekNumber(date) {
|
|
|
42
42
|
* @internal
|
|
43
43
|
*/
|
|
44
44
|
function getLocalizedWeekday(weekday, options) {
|
|
45
|
-
const lang = options.locale?.split(
|
|
46
|
-
return
|
|
47
|
-
constants_1.WEEKDAY_MAP.zh[weekday]);
|
|
45
|
+
const lang = options.locale?.split('-')[0] || 'zh';
|
|
46
|
+
return constants_1.WEEKDAY_MAP[lang]?.[weekday] || constants_1.WEEKDAY_MAP.zh[weekday];
|
|
48
47
|
}
|
|
49
48
|
/**
|
|
50
49
|
* 格式化日期对象
|
|
@@ -83,7 +82,7 @@ function getLocalizedWeekday(weekday, options) {
|
|
|
83
82
|
* // 返回: "第4季度"
|
|
84
83
|
* ```
|
|
85
84
|
*/
|
|
86
|
-
function formatDate(input, formatStr =
|
|
85
|
+
function formatDate(input, formatStr = 'YYYY-MM-DD HH:mm:ss', options = {}) {
|
|
87
86
|
const date = safeParseDate(input);
|
|
88
87
|
const mergedOptions = { ...constants_1.DEFAULT_DATE_FORMAT_OPTIONS, ...options };
|
|
89
88
|
// 获取日期各部分
|
|
@@ -99,39 +98,39 @@ function formatDate(input, formatStr = "YYYY-MM-DD HH:mm:ss", options = {}) {
|
|
|
99
98
|
const weekNumber = getWeekNumber(date);
|
|
100
99
|
// 12小时制
|
|
101
100
|
const hours12 = hours % 12 || 12;
|
|
102
|
-
const ampm = hours < 12 ?
|
|
101
|
+
const ampm = hours < 12 ? 'AM' : 'PM';
|
|
103
102
|
const ampmLower = ampm.toLowerCase();
|
|
104
103
|
// 1. 首先处理完整的单词标记（如 timestamp）
|
|
105
104
|
let result = formatStr;
|
|
106
105
|
// 优先替换 timestamp，避免被拆解
|
|
107
|
-
if (result.includes(
|
|
106
|
+
if (result.includes('timestamp')) {
|
|
108
107
|
result = result.replace(/timestamp/g, date.getTime().toString());
|
|
109
108
|
}
|
|
110
109
|
// 2. 应用自定义格式化器（优先级最高）
|
|
111
110
|
if (mergedOptions.customFormatters) {
|
|
112
111
|
Object.entries(mergedOptions.customFormatters).forEach(([token, formatter]) => {
|
|
113
|
-
const escapedToken = token.replace(/[.*+?^${}()|[\]\\]/g,
|
|
114
|
-
const regex = new RegExp(`(?<![a-zA-Z0-9])${escapedToken}(?![a-zA-Z0-9])`,
|
|
112
|
+
const escapedToken = token.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
113
|
+
const regex = new RegExp(`(?<![a-zA-Z0-9])${escapedToken}(?![a-zA-Z0-9])`, 'g');
|
|
115
114
|
result = result.replace(regex, formatter(date));
|
|
116
115
|
});
|
|
117
116
|
}
|
|
118
117
|
// 3. 替换多字符标记（2-4个字符）
|
|
119
118
|
const multiCharReplacements = {
|
|
120
|
-
YYYY: year.toString().padStart(4,
|
|
119
|
+
YYYY: year.toString().padStart(4, '0'),
|
|
121
120
|
YY: year.toString().slice(-2),
|
|
122
|
-
MM: month.toString().padStart(2,
|
|
123
|
-
DD: day.toString().padStart(2,
|
|
124
|
-
HH: hours.toString().padStart(2,
|
|
125
|
-
hh: hours12.toString().padStart(2,
|
|
126
|
-
mm: minutes.toString().padStart(2,
|
|
127
|
-
ss: seconds.toString().padStart(2,
|
|
128
|
-
SSS: milliseconds.toString().padStart(3,
|
|
129
|
-
WW: weekNumber.toString().padStart(2,
|
|
121
|
+
MM: month.toString().padStart(2, '0'),
|
|
122
|
+
DD: day.toString().padStart(2, '0'),
|
|
123
|
+
HH: hours.toString().padStart(2, '0'),
|
|
124
|
+
hh: hours12.toString().padStart(2, '0'),
|
|
125
|
+
mm: minutes.toString().padStart(2, '0'),
|
|
126
|
+
ss: seconds.toString().padStart(2, '0'),
|
|
127
|
+
SSS: milliseconds.toString().padStart(3, '0'),
|
|
128
|
+
WW: weekNumber.toString().padStart(2, '0'),
|
|
130
129
|
dd: getLocalizedWeekday(weekday, mergedOptions),
|
|
131
130
|
};
|
|
132
131
|
Object.entries(multiCharReplacements).forEach(([token, value]) => {
|
|
133
132
|
// 使用单词边界或字符串边界来确保精确匹配
|
|
134
|
-
const regex = new RegExp(`\\b${token}\\b|${token}(?![a-zA-Z0-9])`,
|
|
133
|
+
const regex = new RegExp(`\\b${token}\\b|${token}(?![a-zA-Z0-9])`, 'g');
|
|
135
134
|
result = result.replace(regex, value);
|
|
136
135
|
});
|
|
137
136
|
// 4. 替换单字符标记（使用更精确的匹配）
|
|
@@ -151,7 +150,7 @@ function formatDate(input, formatStr = "YYYY-MM-DD HH:mm:ss", options = {}) {
|
|
|
151
150
|
};
|
|
152
151
|
Object.entries(singleCharReplacements).forEach(([token, value]) => {
|
|
153
152
|
// 单字符需要更精确的匹配：前面是边界或特定字符，后面不是相同字符
|
|
154
|
-
const regex = new RegExp(`(?<![a-zA-Z0-9])${token}(?![a-zA-Z0-9])`,
|
|
153
|
+
const regex = new RegExp(`(?<![a-zA-Z0-9])${token}(?![a-zA-Z0-9])`, 'g');
|
|
155
154
|
result = result.replace(regex, value);
|
|
156
155
|
});
|
|
157
156
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formatDate.js","sourceRoot":"","sources":["../../src/date/formatDate.ts"],"names":[],"mappings":";;AACA,kDAA8E;AAE9E;;;;;GAKG;AACH,SAAS,aAAa,CAAC,KAAgB;
|
|
1
|
+
{"version":3,"file":"formatDate.js","sourceRoot":"","sources":["../../src/date/formatDate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toFormattedNumberString.d.ts","sourceRoot":"","sources":["../../src/object/toFormattedNumberString.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"toFormattedNumberString.d.ts","sourceRoot":"","sources":["../../src/object/toFormattedNumberString.ts"],"names":[],"mappings":"AAmNA,iBAAS,uBAAuB,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,EAAE,OAAO,iBAAiB,EAAE,8BAA8B,GAAG,MAAM,EAAE,CAAC;AAElI,iBAAS,uBAAuB,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,iBAAiB,EAAE,8BAA8B,GAAG,MAAM,CAAC;AAkB9H,eAAe,uBAAuB,CAAC"}
|
|
@@ -63,121 +63,133 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
63
63
|
* ```
|
|
64
64
|
*/
|
|
65
65
|
const toFormattedNumber_1 = __importDefault(require("./toFormattedNumber"));
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
66
|
+
/**
|
|
67
|
+
* 检查字符串是否包含数字
|
|
68
|
+
* @param str - 要检查的字符串
|
|
69
|
+
* @returns 是否包含数字
|
|
70
|
+
*/
|
|
71
|
+
function hasNumbers(str) {
|
|
72
|
+
return /\d/.test(str);
|
|
73
|
+
}
|
|
74
|
+
/**
|
|
75
|
+
* 添加前缀和后缀
|
|
76
|
+
* @param prefix - 前缀
|
|
77
|
+
* @param suffix - 后缀
|
|
78
|
+
* @param formatted - 格式化后的字符串
|
|
79
|
+
* @param converted - 转化后的数字
|
|
80
|
+
* @param original - 原始对象
|
|
81
|
+
* @returns 添加了前缀后缀的字符串
|
|
82
|
+
*/
|
|
83
|
+
function addPrefixSuffix(prefix, suffix, formatted, converted, original) {
|
|
84
|
+
let processedPrefix;
|
|
85
|
+
if (typeof prefix === 'function') {
|
|
86
|
+
processedPrefix = prefix(original, converted, formatted);
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
processedPrefix = prefix;
|
|
90
|
+
}
|
|
91
|
+
let processedSuffix;
|
|
92
|
+
if (typeof suffix === 'function') {
|
|
93
|
+
processedSuffix = suffix(original, converted, formatted);
|
|
94
|
+
}
|
|
95
|
+
else {
|
|
96
|
+
processedSuffix = suffix;
|
|
97
|
+
}
|
|
98
|
+
return `${processedPrefix}${formatted}${processedSuffix}`;
|
|
99
|
+
}
|
|
100
|
+
/**
|
|
101
|
+
* 将单个数字转换为格式化字符串
|
|
102
|
+
* @param converted - 原始对象转化为数字后的结果
|
|
103
|
+
* @param original - 原始对象
|
|
104
|
+
* @param options - 格式化选项
|
|
105
|
+
* @returns 格式化后的字符串
|
|
106
|
+
*/
|
|
107
|
+
function format(converted, original, options) {
|
|
108
|
+
const { decimalPlaces, zeroValue, localized, preProcessor, prefix, suffix } = options;
|
|
109
|
+
// 处理0情况
|
|
110
|
+
if (converted === 0) {
|
|
111
|
+
return addPrefixSuffix(prefix, suffix, zeroValue, converted, original);
|
|
112
|
+
}
|
|
113
|
+
// 应用预处理函数
|
|
114
|
+
const preProcessed = preProcessor ? preProcessor(original, converted) : converted;
|
|
115
|
+
// 格式化数字为字符串
|
|
116
|
+
let formatted;
|
|
117
|
+
if (localized) {
|
|
118
|
+
// 使用本地化格式
|
|
119
|
+
if (decimalPlaces === true) {
|
|
120
|
+
// 保留所有小数位
|
|
121
|
+
formatted = preProcessed.toLocaleString();
|
|
90
122
|
}
|
|
91
123
|
else {
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
* 将单个数字转换为格式化字符串
|
|
98
|
-
* @param converted - 转化后的数字
|
|
99
|
-
* @param original - 原始对象
|
|
100
|
-
* @returns 格式化后的字符串
|
|
101
|
-
*/
|
|
102
|
-
const convertNumberToString = (converted, original) => {
|
|
103
|
-
// 处理0情况
|
|
104
|
-
if (converted === 0) {
|
|
105
|
-
return addPrefixSuffix(prefix, suffix, zeroValue, converted, original);
|
|
124
|
+
// 保留指定小数位，不够时补0
|
|
125
|
+
formatted = preProcessed.toLocaleString(undefined, {
|
|
126
|
+
minimumFractionDigits: decimalPlaces,
|
|
127
|
+
maximumFractionDigits: decimalPlaces,
|
|
128
|
+
});
|
|
106
129
|
}
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
//
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
if (decimalPlaces === true) {
|
|
114
|
-
// 保留所有小数位
|
|
115
|
-
strNum = processedNum.toLocaleString();
|
|
116
|
-
}
|
|
117
|
-
else {
|
|
118
|
-
// 保留指定小数位，不够时补0
|
|
119
|
-
strNum = processedNum.toLocaleString(undefined, {
|
|
120
|
-
minimumFractionDigits: decimalPlaces,
|
|
121
|
-
maximumFractionDigits: decimalPlaces,
|
|
122
|
-
});
|
|
123
|
-
}
|
|
130
|
+
}
|
|
131
|
+
else {
|
|
132
|
+
// 使用非本地化格式
|
|
133
|
+
if (decimalPlaces === true) {
|
|
134
|
+
// 保留所有小数位
|
|
135
|
+
formatted = preProcessed.toString();
|
|
124
136
|
}
|
|
125
137
|
else {
|
|
126
|
-
//
|
|
127
|
-
|
|
128
|
-
// 保留所有小数位
|
|
129
|
-
strNum = processedNum.toString();
|
|
130
|
-
}
|
|
131
|
-
else {
|
|
132
|
-
// 保留指定小数位，不够时补0
|
|
133
|
-
strNum = processedNum.toFixed(decimalPlaces);
|
|
134
|
-
}
|
|
138
|
+
// 保留指定小数位，不够时补0
|
|
139
|
+
formatted = preProcessed.toFixed(decimalPlaces);
|
|
135
140
|
}
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
141
|
+
}
|
|
142
|
+
// 添加前缀和后缀
|
|
143
|
+
return addPrefixSuffix(prefix, suffix, formatted, converted, original);
|
|
144
|
+
}
|
|
145
|
+
/**
|
|
146
|
+
* 递归处理值，转换为格式化字符串
|
|
147
|
+
* @param value - 要处理的值
|
|
148
|
+
* @param original - 原始对象或数组元素
|
|
149
|
+
* @param options - 格式化选项
|
|
150
|
+
* @returns 格式化后的字符串或字符串数组
|
|
151
|
+
*/
|
|
152
|
+
function processValue(value, original, options) {
|
|
153
|
+
const { decimalPlaces, zeroValue, nanValue, prefix, suffix } = options;
|
|
154
|
+
if (Array.isArray(value)) {
|
|
155
|
+
// 递归处理数组
|
|
156
|
+
return value.map((item, _index) => processValue(item, item, options));
|
|
157
|
+
}
|
|
158
|
+
else {
|
|
159
|
+
// 检查是否为无数字的字符串
|
|
160
|
+
if (typeof value === 'string' && !hasNumbers(value)) {
|
|
161
|
+
// 无数字的字符串返回0
|
|
162
|
+
return addPrefixSuffix(prefix, suffix, zeroValue, 0, original);
|
|
157
163
|
}
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
nanValue: NaN,
|
|
169
|
-
});
|
|
170
|
-
// 检查是否为NaN
|
|
171
|
-
if (isNaN(num)) {
|
|
172
|
-
// 其他NaN情况，使用nanValue
|
|
173
|
-
return addPrefixSuffix(prefix, suffix, nanValue, num, original);
|
|
174
|
-
}
|
|
175
|
-
// 正常数字转换
|
|
176
|
-
return convertNumberToString(num, original);
|
|
164
|
+
// 对于其他类型，首先将输入转换为数字
|
|
165
|
+
// 注意：toFormattedNumber对于单个值会返回number类型
|
|
166
|
+
const converted = (0, toFormattedNumber_1.default)(value, {
|
|
167
|
+
decimalPlaces,
|
|
168
|
+
nanValue: NaN,
|
|
169
|
+
});
|
|
170
|
+
// 检查是否为NaN
|
|
171
|
+
if (isNaN(converted)) {
|
|
172
|
+
// 其他NaN情况，使用nanValue
|
|
173
|
+
return addPrefixSuffix(prefix, suffix, nanValue, converted, original);
|
|
177
174
|
}
|
|
178
|
-
|
|
175
|
+
// 正常数字转换
|
|
176
|
+
return format(converted, original, options);
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
// 主函数实现
|
|
180
|
+
function toFormattedNumberString(object, options) {
|
|
181
|
+
// 解构并设置默认值
|
|
182
|
+
const { decimalPlaces = true, nanValue = 'NaN', zeroValue = '0', localized, preProcessor, prefix = '', suffix = '' } = options || {};
|
|
179
183
|
// 处理输入值
|
|
180
|
-
return processValue(object
|
|
184
|
+
return processValue(object, object, {
|
|
185
|
+
decimalPlaces,
|
|
186
|
+
zeroValue,
|
|
187
|
+
nanValue,
|
|
188
|
+
localized,
|
|
189
|
+
preProcessor,
|
|
190
|
+
prefix,
|
|
191
|
+
suffix,
|
|
192
|
+
});
|
|
181
193
|
}
|
|
182
194
|
exports.default = toFormattedNumberString;
|
|
183
195
|
//# sourceMappingURL=toFormattedNumberString.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toFormattedNumberString.js","sourceRoot":"","sources":["../../src/object/toFormattedNumberString.ts"],"names":[],"mappings":";;;;;AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0DG;AACH,4EAAoD;
|
|
1
|
+
{"version":3,"file":"toFormattedNumberString.js","sourceRoot":"","sources":["../../src/object/toFormattedNumberString.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED