chore: lint

Author: coderaiser

.eslintrc.js

@@ -0,0 +1,23 @@
+{
+    "extends": [
+        "plugin:putout/recommended"
+    ],
+    "plugins": [
+        "putout",
+        "n"
+    ],
+    "overrides": [{
+        "files": ["bin/**/*.js"],
+        "rules": {
+            "no-console": 0
+        },
+        "extends": [
+            "plugin:n/recommended"
+        ]
+    }, {
+        "files": ["client/**/*.js"],
+        "env": {
+            "browser": true
+        }
+    }]
+}

.eslintrc.json

@@ -1,36 +1,30 @@
 name: Node CI
-
-on: [push, pull_request]
-
+on:
+  - push
+  - pull_request
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
     strategy:
       matrix:
-        node-version: [14.x, 15.x]
-
+        node-version:
+          - 18.x
+          - 20.x
+          - 21.x
     steps:
-    - uses: actions/checkout@v1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    
-    - name: Install Redrun
-      run:
-        npm i redrun -g
-    
-    - name: Install
-      run:
-        npm install
-    
-    - name: Bootstrap
-      run:
-        redrun bootstrap
-    
-    - name: Lint
-      run:
-        redrun lint
-    
+      - uses: actions/checkout@v4
+      - uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: latest
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Install Redrun
+        run: bun i redrun -g --no-save
+      - name: Install
+        run: bun i --no-save
+      - name: Bootstrap
+        run: redrun bootstrap
+      - name: Lint
+        run: redrun lint

.github/workflows/nodejs.yml

@@ -10,3 +10,4 @@ yarn-error.log
 *.swp.*
 *.swp
 coverage
+.idea

.gitignore

@@ -3,7 +3,7 @@ import {run} from 'madrun';
 export default {
     'start': () => 'bin/deepword.js package.json',
     'start:dev': () => 'NODE_ENV=development npm start',
-    'test': () => 'tape \'{client,common,server}/**/*.spec.js\'',
+    'test': () => `tape '{client,common,server}/**/*.spec.js'`,
     'coverage': () => 'c8 npm test',
     'report': () => 'c8 report --reporter=lcov',
     'watcher:test': () => 'nodemon -e spec.js -w client -w server -w common -x ',
@@ -12,7 +12,12 @@ export default {
     'fresh:lint': () => run('lint', '--fresh'),
     'lint:fresh': () => run('lint', '--fresh'),
     'wisdom': () => run('build'),
-    'build': () => run(['clean', 'mkdir', 'build:client*', 'cp:*']),
+    'build': () => run([
+        'clean',
+        'mkdir',
+        'build:client*',
+        'cp:*',
+    ]),
     'cp:socket.io:dist': () => 'cp node_modules/socket.io-client/dist/socket.io.js dist/socket.io.js',
     'cp:socket.io:dist-dev': () => 'cp node_modules/socket.io-client/dist/socket.io.js dist-dev/socket.io.js',
     'cp:socket.io.map:dist': () => 'cp node_modules/socket.io-client/dist/socket.io.js.map dist/socket.io.js.map',
@@ -27,4 +32,3 @@ export default {
     'mkdir': () => 'mkdirp dist dist-dev',
     'clean': () => 'rimraf dist dist-dev',
 };
-

.madrun.mjs

@@ -1,4 +1,4 @@
-# Deepword [![License][LicenseIMGURL]][LicenseURL] [![NPM version][NPMIMGURL]][NPMURL] [![Dependency Status][DependencyStatusIMGURL]][DependencyStatusURL] [![Build Status][BuildStatusIMGURL]][BuildStatusURL] [![Coverage Status][CoverageIMGURL]][CoverageURL]
+# Deepword [![License][LicenseIMGURL]][LicenseURL] [![NPM version][NPMIMGURL]][NPMURL] [![Build Status][BuildStatusIMGURL]][BuildStatusURL] [![Coverage Status][CoverageIMGURL]][CoverageURL]
 
 Web editor used in [Cloud Commander](http://cloudcmd.io) based on [Monaco](https://microsoft.github.io/monaco-editor/ "Monaco").
 
@@ -15,7 +15,7 @@ Web editor used in [Cloud Commander](http://cloudcmd.io) based on [Monaco](https
 npm i deepword -g
 ```
 
-![NPM_INFO][NPM_INFO_IMG]
+![NPM\_INFO][NPM_INFO_IMG]
 
 ## Command line parameters
 
@@ -66,11 +66,11 @@ const express = require('express');
 const app = express();
 
 app.use(deepword({
-    root: '/',              // default
-    diff: true,             // default
-    zip: true,             // default
-    dropbox: false,         // optional
-    dropboxToken: 'token',  // optional
+    root: '/', // default
+    diff: true, // default
+    zip: true, // default
+    dropbox: false, // optional
+    dropboxToken: 'token', // optional
 }));
 
 app.listen(31_337);
@@ -86,7 +86,8 @@ const socket = io.listen(server);
 
 deepword.listen(socket, {
     prefixSocket: '/deepword', // optional
-    auth: (accept, reject) => (username, password) => { // optional
+    auth: (accept, reject) => (username, password) => {
+        // optional
         accept();
     },
 });
@@ -142,13 +143,11 @@ For more information you could always look into `html` and `bin` directory.
 MIT
 
 [NPMIMGURL]: https://img.shields.io/npm/v/deepword.svg?style=flat
-[DependencyStatusIMGURL]: https://img.shields.io/david/cloudcmd/deepword.svg?style=flat
 [BuildStatusURL]: https://github.com/cloudcmd/deepword/actions?query=workflow%3A%22Node+CI%22 "Build Status"
 [BuildStatusIMGURL]: https://github.com/cloudcmd/deepword/workflows/Node%20CI/badge.svg
 [LicenseIMGURL]: https://img.shields.io/badge/license-MIT-317BF9.svg?style=flat
 [NPM_INFO_IMG]: https://nodei.co/npm/deepword.png?downloads=true&&stars&&downloadRank "npm install deepword"
 [NPMURL]: https://npmjs.org/package/deepword "npm"
-[DependencyStatusURL]: https://david-dm.org/cloudcmd/deepword "Dependency Status"
 [LicenseURL]: https://tldrlegal.com/license/mit-license "MIT License"
 [CoverageURL]: https://coveralls.io/github/cloudcmd/deepword?branch=master
 [CoverageIMGURL]: https://coveralls.io/repos/cloudcmd/deepword/badge.svg?branch=master&service=github

README.md

@@ -1,8 +1,15 @@
 #!/usr/bin/env node
 
-'use strict';
+import {createRequire} from 'node:module';
+import {dirname} from 'node:path';
+import process from 'node:process';
+import fs from 'node:fs';
+import {fileURLToPath} from 'node:url';
+import http from 'node:http';
 
-const fs = require('fs');
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const require = createRequire(import.meta.url);
 const [name] = process.argv.slice(2);
 
 if (!name)
@@ -12,9 +19,9 @@ else if (/^(-v|--v)$/.test(name))
 else if (/^(-h|--help)$/.test(name))
     help();
 else
-    checkFile(name, (error) => {
+    checkFile(name, async (error) => {
         if (!error)
-            return main(name);
+            return await main(name);
 
         console.error(error.message);
     });
@@ -28,27 +35,22 @@ function getPath(name) {
     return name;
 }
 
-function main(name) {
+async function main(name) {
     const filename = getPath(name);
-    const DIR = __dirname + '/../html/';
-    const deepword = require('..');
-    const http = require('http');
-    const express = require('express');
+    const DIR = `${__dirname}/../html/`;
+    const {default: deepword} = await import('../server/index.cjs');
+    const {default: express} = await import('express');
     const io = require('socket.io');
 
     const app = express();
     const server = http.createServer(app);
 
     const {env} = process;
+    const port = env.PORT || 1337;
+    const ip = env.IP || '0.0.0.0';
 
-    const port = env.PORT || /* c9           */
-                    env.app_port || /* nodester     */
-                    env.VCAP_APP_PORT || /* cloudfoundry */
-                    1337;
-    const ip = env.IP || /* c9           */
-                '0.0.0.0';
-    
-    app .use(express.static(DIR))
+    app
+        .use(express.static(DIR))
         .use(deepword({
             diff: true,
             zip: true,

bin/deepword.js

@@ -4,7 +4,6 @@ const addId = (a) => {
 };
 
 export default function _addCommands() {
-    debugger;
     const {_monaco, _eddy} = this;
     const {KeyCode, KeyMod} = _monaco;
 
@@ -21,10 +20,7 @@ export default function _addCommands() {
         KeyS,
     } = KeyCode;
 
-    const {
-        CtrlCmd,
-        WinCtrl,
-    } = KeyMod;
+    const {CtrlCmd, WinCtrl} = KeyMod;
 
     const actions = [{
         id: 'evaluate',
@@ -47,4 +43,3 @@ export default function _addCommands() {
         .map(addId)
         .forEach(addAction);
 }
-

client/api/_add-commands.js

@@ -1,14 +1,12 @@
 /* global io*/
 import {alert} from 'smalltalk';
 import {applyPatch} from 'daffy';
-
 import {promisify} from 'es6-promisify';
 
 const getHost = () => {
     const l = location;
-    const href = l.origin || l.protocol + '//' + l.host;
 
-    return href;
+    return l.origin || l.protocol + '//' + l.host;
 };
 
 export default function _initSocket(prefix = '', socketPath = '') {
@@ -26,7 +24,7 @@ export default function _initSocket(prefix = '', socketPath = '') {
     const socket = io.connect(href, {
         'max reconnection attempts': 2 ** 32,
         'reconnection limit': FIVE_SECONDS,
-        'path': socketPath + '/socket.io',
+        'path': `${socketPath}/socket.io`,
     });
 
     socket.on('reject', () => {
@@ -86,4 +84,3 @@ export default function _initSocket(prefix = '', socketPath = '') {
         alert(this._TITLE, error);
     });
 }
-

client/api/_init-socket.js

@@ -14,20 +14,24 @@ export default function _onSave(error, text) {
         if (error.message)
             msg = error.message + '\n' + msg;
         else
-            msg = 'Can\'t save.' + msg;
+            msg = `Can't save.${msg}`;
 
-        confirm(this._TITLE, msg).then(() => {
-            write(_filename, _value, onSave);
-        }).catch(empty).then(() => {
-            this.focus();
-        });
+        confirm(this._TITLE, msg)
+            .then(() => {
+                write(_filename, _value, onSave);
+            })
+            .catch(empty)
+            .then(() => {
+                this.focus();
+            });
     } else {
         this.showMessage(text);
 
-        this._story.setData(_filename, _value)
+        this
+            ._story
+            .setData(_filename, _value)
             .setHash(_filename, this.sha());
 
         this.emit('save', _value.length);
     }
 }
-