|
@@ -1,3 +1,4 @@
|
|
|
|
|
+"use strict";
|
|
|
var __defProp = Object.defineProperty;
|
|
var __defProp = Object.defineProperty;
|
|
|
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
|
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
@@ -71,17 +72,17 @@ function arrayToString(input) {
|
|
|
__name(arrayToString, "arrayToString");
|
|
__name(arrayToString, "arrayToString");
|
|
|
|
|
|
|
|
// src/format.js
|
|
// src/format.js
|
|
|
-function format(pattern) {
|
|
|
|
|
|
|
+function format(pattern, ...args) {
|
|
|
if (pattern instanceof Date) {
|
|
if (pattern instanceof Date) {
|
|
|
pattern = pattern.toISOString();
|
|
pattern = pattern.toISOString();
|
|
|
} else if (typeof pattern !== "string") {
|
|
} else if (typeof pattern !== "string") {
|
|
|
pattern = String(pattern);
|
|
pattern = String(pattern);
|
|
|
}
|
|
}
|
|
|
const re = /(%?)(%([sdjvl]))/g;
|
|
const re = /(%?)(%([sdjvl]))/g;
|
|
|
- const args = Array.prototype.slice.call(arguments, 1);
|
|
|
|
|
- if (args.length) {
|
|
|
|
|
|
|
+ const argsQueue = [...args];
|
|
|
|
|
+ if (argsQueue.length) {
|
|
|
pattern = pattern.replace(re, function(match, escaped, ptn, flag) {
|
|
pattern = pattern.replace(re, function(match, escaped, ptn, flag) {
|
|
|
- let arg = args.shift();
|
|
|
|
|
|
|
+ let arg = argsQueue.shift();
|
|
|
switch (flag) {
|
|
switch (flag) {
|
|
|
case "s":
|
|
case "s":
|
|
|
arg = String(arg);
|
|
arg = String(arg);
|
|
@@ -100,11 +101,11 @@ function format(pattern) {
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
|
if (!escaped) return arg;
|
|
if (!escaped) return arg;
|
|
|
- args.unshift(arg);
|
|
|
|
|
|
|
+ argsQueue.unshift(arg);
|
|
|
return match;
|
|
return match;
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
- if (args.length) pattern += " " + args.join(" ");
|
|
|
|
|
|
|
+ if (argsQueue.length) pattern += " " + argsQueue.join(" ");
|
|
|
pattern = pattern.replace(/%{2}/g, "%");
|
|
pattern = pattern.replace(/%{2}/g, "%");
|
|
|
return "" + pattern;
|
|
return "" + pattern;
|
|
|
}
|
|
}
|
|
@@ -116,7 +117,7 @@ var _Errorf = class _Errorf extends Error {
|
|
|
* Constructor.
|
|
* Constructor.
|
|
|
*
|
|
*
|
|
|
* @param {string|undefined} pattern
|
|
* @param {string|undefined} pattern
|
|
|
- * @param {any} args
|
|
|
|
|
|
|
+ * @param {*} args
|
|
|
*/
|
|
*/
|
|
|
constructor(pattern = void 0, ...args) {
|
|
constructor(pattern = void 0, ...args) {
|
|
|
const message = pattern != null ? format(pattern, ...args) : void 0;
|
|
const message = pattern != null ? format(pattern, ...args) : void 0;
|