@k03mad/actual-versions 1.0.2 → 1.1.1

package/README.md

@@ -1,11 +1,13 @@
 # Get tool actual version string
 
-## Global
+## CLI
 
 ```bash
-npm i @k03mad/acver -g
+npm i @k03mad/actual-versions -g
 acver
 # ╔════════╤════════════════╗
+# ║ aria   │ 1.37.0         ║
+# ╟────────┼────────────────╢
 # ║ chrome │ 126.0.6478.182 ║
 # ╟────────┼────────────────╢
 # ║ curl   │ 8.8.0          ║
@@ -15,15 +17,22 @@ acver
 ## API
 
 ```bash
-npm i @k03mad/acver
+npm i @k03mad/actual-versions
 ```
 
 ```js
-import {getChromeVersion, getCurlVersion} from '@k03mad/acver';
+import {
+    getAriaVersion
+    getChromeVersion,
+    getCurlVersion
+} from '@k03mad/actual-versions';
+
+const ariaVersion = await getAriaVersion();
+// '1.37.0'
 
-const chrome = await getChromeVersion();
+const chromeVersion = await getChromeVersion();
 // '126.0.6478.182'
 
-const curl = await getCurlVersion();
+const curlVersion = await getCurlVersion();
 // '8.8.0'
 ```

package/app/cli.js

@@ -2,18 +2,30 @@
 
 import {log} from '@k03mad/simple-log';
 import chalk from 'chalk';
-import {table} from 'table';
+import {getBorderCharacters, table} from 'table';
+
+import config from '../config.js';
 
 import * as api from './api.js';
 
-const {blue, bold, green} = chalk;
+const {blue, bold, green, red} = chalk;
+
+const TOOL_NAME_RE = /get(.+)Version/;
 
 const output = await Promise.all(
     Object.entries(api).map(async ([key, value]) => {
         const version = await value();
-        const tool = key.replaceAll(/Version|get/g, '').toLowerCase();
-        return [blue(bold(tool)), green(version)];
+        const tool = key.match(TOOL_NAME_RE)[1].toLowerCase();
+
+        return [
+            blue(bold(tool)),
+            version ? green(version) : red('———'),
+        ];
     }),
 );
 
-log(table(output));
+const formattedTable = table(output, {
+    border: getBorderCharacters(config.table.border),
+});
+
+log(formattedTable);

package/app/tools/aria.js

@@ -8,5 +8,5 @@ const ARIA_VERSION_RE = /href=".+\/releases\/tag\/release-([\d.]+)"/;
  */
 export default async () => {
     const {body} = await requestCache(ARIA_VERSIONS_URL);
-    return body.match(ARIA_VERSION_RE)[1];
+    return body.match(ARIA_VERSION_RE)?.[1];
 };

package/app/tools/chrome.js

@@ -7,5 +7,5 @@ const CHROME_VERSIONS_URL = 'https://googlechromelabs.github.io/chrome-for-testi
  */
 export default async () => {
     const {body} = await requestCache(CHROME_VERSIONS_URL);
-    return body.channels.Stable.version;
+    return body?.channels?.Stable?.version;
 };

package/app/tools/curl.js

@@ -8,5 +8,5 @@ const CURL_VERSION_RE = /href="\/download\/curl-([\d.]+).tar.gz"/;
  */
 export default async () => {
     const {body} = await requestCache(CURL_VERSIONS_URL);
-    return body.match(CURL_VERSION_RE)[1];
+    return body.match(CURL_VERSION_RE)?.[1];
 };

package/config.js

@@ -0,0 +1,9 @@
+export default {
+    version: {
+        re: String.raw`\d[\d.]+$`,
+    },
+    table: {
+        // https://www.npmjs.com/package/table#getbordercharacters
+        border: 'honeywell',
+    },
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k03mad/actual-versions",
-  "version": "1.0.2",
+  "version": "1.1.1",
   "description": "Get tool actual version string",
   "maintainers": [
     "Kirill Molchanov <k03.mad@gmail.com"
@@ -19,7 +19,7 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@k03mad/request": "5.8.1",
+    "@k03mad/request": "6.0.1",
     "@k03mad/simple-log": "2.2.1",
     "chalk": "5.3.0",
     "table": "6.8.2"

package/tests/api.js

@@ -2,24 +2,25 @@ import assert from 'node:assert/strict';
 import {describe, it} from 'node:test';
 
 import * as api from '../app/api.js';
+import config from '../config.js';
 
-const TESTS = {
-    getAriaVersion: /^\d\.\d+\.\d$/,
-    getChromeVersion: /^\d{3}(?:\.\d+){3}$/,
-    getCurlVersion: /^\d\.\d\.\d$/,
-};
+const API_FUNCTIONS = [
+    'getAriaVersion',
+    'getChromeVersion',
+    'getCurlVersion',
+];
 
-describe('api', () => {
-    const steps = Object.entries(TESTS);
+const versionRe = new RegExp(`^${config.version.re}`);
 
-    it('coverage', () => {
-        assert.equal(steps.length, Object.keys(api).length);
+describe('api', () => {
+    it('check tests count', () => {
+        assert.equal(API_FUNCTIONS.length, Object.keys(api).length);
     });
 
-    Object.entries(TESTS).forEach(([key, value]) => {
-        it(key, async () => {
-            const version = await api[key]();
-            assert.match(version, value);
+    API_FUNCTIONS.forEach(fn => {
+        it(`check fn output: ${fn}()`, async () => {
+            const version = await api[fn]();
+            assert.match(version, versionRe);
         });
     });
 });

package/tests/cli.js

@@ -4,17 +4,23 @@ import {before, describe, it} from 'node:test';
 import {promisify} from 'node:util';
 
 import stripAnsi from 'strip-ansi';
+import {getBorderCharacters} from 'table';
+
+import config from '../config.js';
 
 const cliFile = process.env.npm_package_bin_acver;
 const exec = promisify(cp.exec);
 
-const TESTS = [
-    /^aria\s+\d\.\d+\.\d$/,
-    /^chrome\s+\d{3}(?:\.\d+){3}$/,
-    /^curl\s+\d\.\d\.\d$/,
+const tableBorderChars = Object.values(getBorderCharacters(config.table.border));
+const tableBorderCharsRe = new RegExp(tableBorderChars.join('|'), 'g');
+
+const STDOUT_TOOLS = [
+    'aria',
+    'chrome',
+    'curl',
 ];
 
-const TABLE_CHARS_RE = /[─│┼═║╔╗╚╝╟╢╤╧]+/g;
+const versionRe = tool => new RegExp(`^${tool}\\s+${config.version.re}`);
 
 describe('cli', () => {
     let versions;
@@ -25,17 +31,19 @@ describe('cli', () => {
         versions = stdout
             .split('\n')
             .map(elem => stripAnsi(elem)
-                .replaceAll(TABLE_CHARS_RE, '')
+                .replaceAll(tableBorderCharsRe, '')
                 .trim(),
             )
             .filter(Boolean);
     });
 
-    it('coverage', () => {
-        assert.equal(TESTS.length, versions.length);
+    it('check tests count', () => {
+        assert.equal(STDOUT_TOOLS.length, versions.length);
     });
 
-    TESTS.forEach((re, i) => {
-        it(String(re), () => assert.match(versions[i], re));
+    STDOUT_TOOLS.forEach((tool, i) => {
+        it(`check stdout output: #${i + 1} tool: ${tool}`, () => {
+            assert.match(versions[i], versionRe(tool));
+        });
     });
 });