utilitas 1989.9.5 → 1989.9.9

package/index.mjs

@@ -1,76 +1,39 @@
-import * as fileType from 'file-type';
-import * as math from 'mathjs';
-import * as uuid from 'uuid';
-import base64url from 'base64url';
-import cache from './lib/cache.mjs';
-import colors from 'colors/safe.js';
-import dbio from './lib/dbio.mjs';
-import email from './lib/email.mjs';
-import encryption from './lib/encryption.mjs';
-import event from './lib/event.mjs';
-import fetch from 'node-fetch';
-import geoIp from 'fast-geoip';
-import ini from 'ini';
-import jwt from 'jsonwebtoken';
-import mailgun from 'mailgun-js';
-import mailjet from 'node-mailjet';
-import mysql from 'mysql2/promise';
-import network from './lib/network.mjs';
-import ping from 'ping';
-import publicIp from 'public-ip';
-import qs from 'qs';
-import redis from 'ioredis';
-import sentinel from './lib/sentinel.mjs';
-import sentry from '@sentry/node';
-import shell from './lib/shell.mjs';
-import shot from './lib/shot.mjs';
-import sms from './lib/sms.mjs';
-import storage from './lib/storage.mjs';
-import tape from './lib/tape.mjs';
-import telesign from 'telesignsdk';
-import twilio from 'twilio';
-import uoid from './lib/uoid.mjs';
-import utilitas from './lib/utilitas.mjs';
-import winston from 'winston';
-import winstonPapertrail from 'winston-papertrail-mproved';
+// dependencies
+export * as base64url from 'base64url';
+export * as fetch from 'node-fetch';
+export * as fileType from 'file-type';
+export * as geoIp from 'fast-geoip';
+export * as ini from 'ini';
+export * as jwt from 'jsonwebtoken';
+export * as mailgun from 'mailgun-js';
+export * as mailjet from 'node-mailjet';
+export * as math from 'mathjs';
+export * as mysql from 'mysql2/promise';
+export * as ping from 'ping';
+export * as publicIp from 'public-ip';
+export * as qs from 'qs';
+export * as redis from 'ioredis';
+export * as sentry from '@sentry/node';
+export * as telesign from 'telesignsdk';
+export * as twilio from 'twilio';
+export * as uuid from 'uuid';
+export * as winston from 'winston';
+export * as winstonPapertrail from 'winston-papertrail-mproved';
+export { default as colors } from 'colors/safe.js';
 
-export {
-    // dependencies
-    base64url,
-    colors,
-    fetch,
-    fileType,
-    geoIp,
-    ini,
-    jwt,
-    mailgun,
-    mailjet,
-    math,
-    mysql,
-    ping,
-    publicIp,
-    qs,
-    redis,
-    sentry,
-    telesign,
-    twilio,
-    uuid,
-    winston,
-    winstonPapertrail,
-    // features
-    cache,
-    dbio,
-    utilitas as default,
-    email,
-    encryption,
-    event,
-    network,
-    sentinel,
-    shell,
-    shot,
-    sms,
-    storage,
-    tape,
-    uoid,
-    utilitas,
-};
+// features
+export * as cache from './lib/cache.mjs';
+export * as dbio from './lib/dbio.mjs';
+export * as email from './lib/email.mjs';
+export * as encryption from './lib/encryption.mjs';
+export * as event from './lib/event.mjs';
+export * as network from './lib/network.mjs';
+export * as sentinel from './lib/sentinel.mjs';
+export * as shell from './lib/shell.mjs';
+export * as shot from './lib/shot.mjs';
+export * as sms from './lib/sms.mjs';
+export * as storage from './lib/storage.mjs';
+export * as tape from './lib/tape.mjs';
+export * as uoid from './lib/uoid.mjs';
+export * as utilitas from './lib/utilitas.mjs';
+export * as default from './lib/utilitas.mjs';

package/lib/cache.mjs

@@ -1,4 +1,4 @@
-import utilitas from './utilitas.mjs';
+import * as utilitas from './utilitas.mjs';
 
 const log = (content) => { return utilitas.modLog(content, 'cache'); };
 
@@ -21,7 +21,7 @@ const init = async (options) => {
     return redis;
 };
 
-export default {
+export {
     init,
     //     set,
     //     get,

package/lib/dbio.mjs

@@ -1,4 +1,4 @@
-import utilitas from './utilitas.mjs';
+import * as utilitas from './utilitas.mjs';
 
 const defaultPort = 3306;
 const orders = { '+': 'ASC', '-': 'DESC' };
@@ -261,7 +261,7 @@ const deleteAll = async (table, options) => {
     return await execute(assembleDelete(table));
 };
 
-export default {
+export {
     assembleInsert,
     assembleQuery,
     assembleSet,

package/lib/email.mjs

@@ -1,4 +1,4 @@
-import utilitas from './utilitas.mjs';
+import * as utilitas from './utilitas.mjs';
 
 const log = (content) => { return utilitas.modLog(content, 'email'); };
 
@@ -88,7 +88,7 @@ const send = async (email, subject, text, html, args, options) => {
     }, html ? { html } : {}));
 }
 
-export default {
+export {
     getSenderName,
     init,
     rawSend,

package/lib/encryption.mjs

@@ -47,7 +47,7 @@ const digestObject = (object, algorithm) => {
     return hash(getSortedQueryString(object), algorithm);
 };
 
-export default {
+export {
     defaultAlgorithm,
     digestObject,
     getSortedQueryString,

package/lib/event.mjs

@@ -1,8 +1,10 @@
-import { fileURLToPath } from 'url';
 import { v4 as uuidv4 } from 'uuid';
+import * as utilitas from './utilitas.mjs';
 import fs from 'fs';
 import path from 'path';
-import utilitas from './utilitas.mjs';
+
+const fileURLToPath = (await import('url')).fileURLToPath
+    || ((url) => { return new URL('', url).pathname; });
 
 const __filename = fileURLToPath(import.meta.url);
 const jobs = {};
@@ -79,7 +81,7 @@ const bulk = async (absDir, options) => {
         file => /\.mjs$/i.test(file) && !file.startsWith('.')
     ), []];
     for (let file of files) {
-        const mod = (await import(path.join(absDir, file))).default;
+        const mod = await import(path.join(absDir, file));
         if (!mod.run) { continue; }
         mod.name = mod.name || file.replace(/^(.*)\.mjs$/i, '$1');
         pmsRun.push(load(mod, options));
@@ -101,7 +103,7 @@ const end = async () => {
     log('Terminated.');
 };
 
-export default {
+export {
     bulk,
     end,
     list,

package/lib/network.mjs

@@ -1,9 +1,9 @@
+import * as shell from './shell.mjs';
+import * as utilitas from './utilitas.mjs';
 import fetch from 'node-fetch';
 import geoIp from 'fast-geoip';
 import libPing from 'ping';
 import publicIp from 'public-ip';
-import shell from './shell.mjs';
-import utilitas from './utilitas.mjs';
 
 const log = (content) => { return utilitas.modLog(content, 'network'); };
 
@@ -94,7 +94,7 @@ const getCurrentPosition = async () => {
     return Object.assign(loc, { ip });
 };
 
-export default {
+export {
     getCurrentPosition,
     httping,
     pickFastestHost,

package/lib/sentinel.mjs

@@ -1,4 +1,4 @@
-import utilitas from './utilitas.mjs';
+import * as utilitas from './utilitas.mjs';
 
 const log = (str, opts) => { return utilitas.modLog(str, 'sentinel', opts); };
 
@@ -21,6 +21,6 @@ const init = async (options) => {
     return sentry;
 };
 
-export default {
+export {
     init,
 };

package/lib/shell.mjs

@@ -1,6 +1,6 @@
+import * as utilitas from './utilitas.mjs';
 import childProcess from 'child_process';
 import util from 'util';
-import utilitas from './utilitas.mjs';
 
 const log = (content) => { return utilitas.modLog(content, 'shell'); };
 const vF = (cmd, cbf) => { log(`Can not run in browser: ${cmd}`); cbf(); };
@@ -34,7 +34,7 @@ const assertExist = async (bin, er, code = 500) => {
     utilitas.assert(await exist(bin), er || `Command not found: ${bin}.`, code);
 };
 
-export default {
+export {
     assertExist,
     exec,
     exist,

package/lib/shot.mjs

@@ -1,7 +1,7 @@
 import * as fileType from 'file-type';
+import * as storage from './storage.mjs';
+import * as utilitas from './utilitas.mjs';
 import fetch from 'node-fetch';
-import storage from './storage.mjs';
-import utilitas from './utilitas.mjs';
 
 const defFetchOpt = { redirect: 'follow', follow: 3, timeout: 1000 * 10 };
 
@@ -67,7 +67,7 @@ const get = async (url, options) => {
     };
 }
 
-export default {
+export {
     checkVersion,
     get,
     getCurrentPosition,

package/lib/sms.mjs

@@ -1,5 +1,5 @@
+import * as utilitas from './utilitas.mjs';
 import util from 'util';
-import utilitas from './utilitas.mjs';
 
 const defaultTeleSignApi = 'https://rest-api.telesign.com';
 const defaultTimeout = 1000 * 10 // 10 secs
@@ -60,7 +60,7 @@ const send = async (phone, message) => {
     }
 };
 
-export default {
+export {
     init,
     send,
 };

package/lib/storage.mjs

@@ -1,9 +1,9 @@
 import { v4 as uuidv4 } from 'uuid';
+import * as utilitas from './utilitas.mjs';
 import fs from 'fs';
 import ini from 'ini';
 import os from 'os';
 import path from 'path';
-import utilitas from './utilitas.mjs';
 
 const [encoding, mode] = ['utf8', '0644'];
 
@@ -149,7 +149,7 @@ const exists = async (fp) => {
     try { return await fs.promises.stat(fp); } catch (_) { return null; }
 };
 
-export default {
+export {
     assertPath,
     encodeBase64DataURL,
     exists,

package/lib/tape.mjs

@@ -1,4 +1,4 @@
-import utilitas from './utilitas.mjs';
+import * as utilitas from './utilitas.mjs';
 
 // https://github.com/winstonjs/winston#logging-levels
 // const levels = ['error', 'warn', 'info', 'http', 'verbose', 'debug', 'silly'];
@@ -88,7 +88,7 @@ const end = async () => {
     }, 1000);
 };
 
-export default {
+export {
     end,
     getLogger,
     init,

package/lib/uoid.mjs

@@ -1,7 +1,9 @@
-import { fileURLToPath } from 'url';
+import * as encryption from './encryption.mjs';
+import * as utilitas from './utilitas.mjs';
 import * as uuid from 'uuid';
-import encryption from './encryption.mjs';
-import utilitas from './utilitas.mjs';
+
+const fileURLToPath = (await import('url')).fileURLToPath
+    || ((url) => { return new URL('', url).pathname; });
 
 const __filename = fileURLToPath(import.meta.url);
 const uuidRegTxt = '[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}';
@@ -30,7 +32,7 @@ const getRfcUrlNamespaceUuid = (url) => {
     return uuid.v5(url, uuid.v5.URL);
 };
 
-export default {
+export {
     uuidRegTxt,
     create,
     getRfcUrlNamespaceUuid,

package/lib/utilitas.mjs

@@ -1,7 +1,6 @@
-import { fileURLToPath } from 'url';
+import * as storage from './storage.mjs';
 import colors from 'colors/safe.js';
 import path from 'path';
-import storage from './storage.mjs';
 
 Object.values = Object.values || ((obj) => {
     return Object.keys(obj).map((key) => {
@@ -13,6 +12,9 @@ RegExp.escape = RegExp.escape || ((str) => { //$& means the whole matched string
     return String(str).replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }); // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions
 
+const fileURLToPath = (await import('url')).fileURLToPath
+    || ((url) => { return new URL('', url).pathname; });
+
 const __filename = fileURLToPath(import.meta.url);
 const invalidTime = 'Invalid time.';
 
@@ -613,7 +615,7 @@ const purgeEmoji = (any, replace = '') => {
     );
 };
 
-export default {
+export {
     arrayEqual,
     assembleApiUrl,
     assembleUrl,

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "utilitas",
     "description": "Just another common utility for Node.js.",
-    "version": "1989.9.5",
+    "version": "1989.9.9",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",