utilitas 1999.1.25 → 1999.1.27

package/lib/bot.mjs

@@ -1,13 +1,10 @@
 // @todo: New text of the message, 1-4096 characters after entities parsing
 
 import {
-    log as _log,
-    base64Encode, countKeys, ensureArray, ensureString, getTimeIcon,
-    humanReadableBoolean, ignoreErrFunc, insensitiveCompare, insensitiveHas,
-    isSet, lastItem,
-    need, parseJson, prettyJson, splitArgs,
-    throwError,
-    timeout, trim, which,
+    log as _log, base64Encode, countKeys, ensureArray, ensureString,
+    getTimeIcon, humanReadableBoolean, ignoreErrFunc, insensitiveCompare,
+    insensitiveHas, isSet, lastItem, need, parseJson, prettyJson, splitArgs,
+    throwError, timeout, trim, which,
 } from './utilitas.mjs';
 
 import { readdirSync } from 'fs';
@@ -34,7 +31,6 @@ const lines = (arr, sep = '\n') => arr.join(sep);
 const lines2 = arr => lines(arr, '\n\n');
 const uList = arr => lines(arr.map(x => `- ${x}`));
 const oList = arr => lines(arr.map((v, k) => `${k + 1}. ${v}`));
-const map = obj => uList(Object.entries(obj).map(([k, v]) => `${k}: ${v}`));
 const isMarkdownError = e => e?.description?.includes?.("can't parse entities");
 const sendMd = (cId, cnt, opt) => send(cId, cnt, { parse_mode, ...opt || {} });
 const getFile = async (id, op) => (await get(await getFileUrl(id), op)).content;
@@ -424,12 +420,14 @@ const subconscious = [{
         ctx.complete = async (options) => await ctx.ok('☑️', options);
         ctx.json = async (obj, options) => await ctx.ok(json(obj), options);
         ctx.list = async (list, options) => await ctx.ok(uList(list), options);
-        ctx.map = async (obj, options) => await ctx.ok(map(obj), options);
         ctx.media = async (fnc, src, options) => ctx.done.push(await ctx[fnc]({
             [src?.toLowerCase?.()?.startsWith?.('http') ? 'url' : 'source']: src
         }, getExtra(ctx, options)));
         ctx.audio = async (sr, op) => await ctx.media('replyWithAudio', sr, op);
         ctx.image = async (sr, op) => await ctx.media('replyWithPhoto', sr, op);
+        ctx.sendConfig = async (obj, options, _ctx) => await ctx.ok(prettyJson(
+            obj, { code: true, md: true }
+        ), options);
         ctx.speech = async (cnt, options) => {
             let file;
             if (Buffer.isBuffer(cnt)) {
@@ -892,13 +890,13 @@ const subconscious = [{
                 try {
                     const _config = {
                         ...ctx.session.config = {
-                            ...ctx.session.config,
-                            ...ctx.config = parsed || await parseArgs(ctx.cmd.args),
+                            ...ctx.session.config, ...ctx.config = parsed
+                            || await parseArgs(ctx.cmd.args, ctx),
                         }
                     };
                     assert(countKeys(ctx.config), 'No option matched.');
-                    Object.keys(ctx.config).map(x => _config[x] += ' <-- SET');
-                    await ctx.map(_config);
+                    Object.keys(ctx.config).map(x => _config[x] += ' 🖋');
+                    await ctx.sendConfig(_config, null, ctx);
                 } catch (err) {
                     await ctx.er(err.message || err);
                 }
@@ -1038,7 +1036,7 @@ const establish = (bot, module, options) => {
     } : module.func);
 };
 
-const parseArgs = async args => {
+const parseArgs = async (args, ctx) => {
     const { values, tokens } = _parseArgs({
         args: splitArgs((args || '').replaceAll('—', '--')),
         options: bot._.args, tokens: true
@@ -1046,7 +1044,7 @@ const parseArgs = async args => {
     const result = {};
     for (let x of tokens) {
         result[x.name] = bot._.args[x.name]?.validate
-            ? await bot._.args[x.name].validate(values[x.name])
+            ? await bot._.args[x.name].validate(values[x.name], ctx)
             : values[x.name];
     }
     return result;
@@ -1155,14 +1153,20 @@ export {
     COMMAND_LIMIT,
     EMOJI_BOT,
     EMOJI_SPEECH,
-    EMOJI_THINKING, end, GROUP_LIMIT,
-    HELLO, init,
+    EMOJI_THINKING,
+    GROUP_LIMIT,
+    HELLO,
+    MESSAGE_LENGTH_LIMIT,
+    MESSAGE_SOFT_LIMIT,
+    PRIVATE_LIMIT,
+    end,
+    init,
     lines,
     lines2,
-    map, MESSAGE_LENGTH_LIMIT,
-    MESSAGE_SOFT_LIMIT, newCommand,
+    newCommand,
     oList,
-    paging, PRIVATE_LIMIT, send,
+    paging,
+    send,
     sendMd,
     uList
 };

package/lib/manifest.mjs

@@ -1,7 +1,7 @@
 const manifest = {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1999.1.25",
+    "version": "1999.1.27",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",

package/lib/utilitas.mjs

@@ -268,7 +268,9 @@ const assembleUrl = (url, componens) => {
 
 const prettyJson = (object, opt) => {
     let resp = JSON.stringify(object, opt?.replacer ?? null, ~~opt?.space || 2);
-    opt?.code ? (resp = renderCode(resp, opt)) : (opt?.log && console.log(resp));
+    opt?.code ? (
+        resp = renderCode(resp, { ...opt || {}, md: opt?.md && 'json' })
+    ) : (opt?.log && console.log(resp));
     return resp;
 };
 
@@ -549,7 +551,9 @@ const renderCode = (code, options) => {
     const resp = arrCode.map(
         x => `${String(i++).padStart(bits, '0')} ${s} ${ensureString(x).replace('```', '\\`\\`\\`')}`
     );
-    const output = options?.asArray ? resp : resp.join('\n');
+    const output = (
+        options?.md ? `\`\`\`${options.md === true ? '' : options.md}\n` : ''
+    ) + (options?.asArray ? resp : resp.join('\n')) + (options.md ? '\n```' : '');
     options?.log && console.log(output);
     return output;
 };

package/package.json

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