utilitas 1989.9.44 → 1989.9.45

package/lib/utilitas.mjs

@@ -83,7 +83,7 @@ const mapKeys = (any, map, strict, path) => {
 
 const pad = (any, len, options) => {
     options = options || {};
-    options.pad = options.pad || ' ';
+    options.pad = options.pad ?? ' ';
     any = String(any);
     while (any.length < ~~len) {
         any = !!options.right ? `${any}${options.pad}` : `${options.pad}${any}`;
@@ -108,7 +108,7 @@ const rawEnsureString = (any, options) => {
     if (isObject(any)) { return JSON.stringify(any); }
     else if (isDate(any)) { return any.toISOString(); }
     else if (isError(any)) { return options?.trace ? any.stack : any.message; }
-    return String(any || '');
+    return String(any ?? '');
 };
 
 const ensureString = (str, options) => {
@@ -128,11 +128,12 @@ const ensureString = (str, options) => {
                 throwError(`Invalid case option: '${options?.case}'.`, 500);
         }
     }
+    options?.trim && (str = str.trim());
     return str;
 };
 
 const trim = (str, options) => {
-    return ensureString(str, options).trim();
+    return ensureString(str, { trim: true, ...options || {} });
 };
 
 const ensureDate = (dt, options) => {
@@ -221,7 +222,7 @@ const verifyUuid = (uuid) => {
 
 // https://github.com/validatorjs/validator.js
 const verifyUrl = (url) => {
-    const str = String(url || '');
+    const str = String(url ?? '');
     const reg = '^(?!mailto:)(?:(?:http|https|ftp)://)(?:\\S+(?::\\S*)?@)?(?:(?'
         + ':(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])(?:\\.(?:1?\\d{1,2}|2[0-4]\\d'
         + '|25[0-5])){2}(?:\\.(?:[0-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))|(?:(?:[a'
@@ -325,7 +326,7 @@ const parseJson = (any, fallback = {}) => {
 const extract = function() {
     let r = null;
     for (let i = 0; i < arguments.length; i++) {
-        if (i) { r = r && r[arguments[i]] || null; } else { r = arguments[i]; }
+        if (i) { r = r?.[arguments[i]] ?? null; } else { r = arguments[i]; }
     }
     return r;
 };
@@ -417,7 +418,7 @@ const uniqueArray = (arr) => {
 
 const basename = (filename) => {
     return path.basename(String(filename
-        || __filename)).replace(/\.[^\.]*$/, '').trim();
+        ?? __filename)).replace(/\.[^\.]*$/, '').trim();
 };
 
 const modLog = (content, filename, options) => {
@@ -470,7 +471,7 @@ const insensitiveCompare = (strA, strB, options) => {
 };
 
 const makeStringByLength = (string, length) => {
-    string = String(string || '')[0] || '';
+    string = String(string ?? '')[0] ?? '';
     length = parseInt(length) || 0;
     let result = '';
     while (string && length && result.length < length) {
@@ -553,9 +554,9 @@ const matchVersion = (curVer, tgtVer) => {
 
 const fullLengthLog = (string, options) => {
     options = options || {};
-    string = String(string || '');
+    string = String(string ?? '');
     const maxLength = ensureInt(options.maxLength) || process.stdout.columns;
-    const pad = options.padding || '=';
+    const pad = options.padding ?? '=';
     if (string.length + 4 > maxLength) {
         const full = makeStringByLength(pad, maxLength);
         console.log(`${full} \n${string} \n${full} `);
@@ -583,7 +584,7 @@ const range = (from, to, options) => {
 };
 
 const shiftTime = (diff, baseTime) => {
-    return new Date((baseTime || new Date()).getTime() + diff);
+    return new Date((baseTime ?? new Date()).getTime() + diff);
 };
 
 const checkInterval = (itv, sed) => {
@@ -609,6 +610,12 @@ const tryUntil = async (fnTry, options) => {
     return result;
 };
 
+const split = (str, options) => {
+    return trim(str, options).split(
+        options?.separator ?? /[,|;\ \t\n]+/
+    ).map(x => x.trim()).filter(x => x.length);
+};
+
 // https://www.unicode.org/Public/13.0.0/ucd/emoji/emoji-data.txt
 // https://stackoverflow.com/questions/10992921/how-to-remove-emoji-code-using-javascript
 // https://twitter.com/_cxa/status/1384304473493831681?s=20
@@ -689,6 +696,7 @@ export {
     range,
     rotate,
     shiftTime,
+    split,
     throwError,
     timeout,
     toExponential,

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "utilitas",
     "description": "Just another common utility for Node.js.",
-    "version": "1989.9.44",
+    "version": "1989.9.45",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",
@@ -25,16 +25,16 @@
         "url": "https://github.com/Leask/utilitas.git"
     },
     "dependencies": {
-        "@sentry/node": "^6.18.1",
+        "@sentry/node": "^6.18.2",
         "base64url": "^3.0.1",
         "colors": "1.4.0",
-        "fast-geoip": "^1.1.61",
+        "fast-geoip": "^1.1.62",
         "file-type": "^17.1.1",
         "ini": "github:Leask/ini",
         "ioredis": "^4.28.5",
         "jsonwebtoken": "^8.5.1",
         "mailgun-js": "^0.22.0",
-        "mathjs": "^10.3.0",
+        "mathjs": "^10.4.0",
         "mysql2": "^2.3.3",
         "node-fetch": "^2.6.7",
         "node-mailjet": "^3.3.7",
@@ -43,7 +43,7 @@
         "tail": "^2.2.4",
         "telegraf": "^4.7.0",
         "telesignsdk": "^2.2.1",
-        "twilio": "^3.75.0",
+        "twilio": "^3.75.1",
         "uuid": "^8.3.2"
     }
 }