chore: cloudcmd: v19.1.9

.eslintrc.js

@@ -1,38 +0,0 @@
-'use strict';
-
-module.exports = {
-    extends: [
-        'plugin:putout/safe+align',
-    ],
-    plugins: [
-        'putout',
-        'n',
-    ],
-    rules: {
-        'key-spacing': 'off',
-        'n/prefer-node-protocol': 'error',
-    },
-    overrides: [{
-        files: ['bin/release.js'],
-        rules: {
-            'no-console': 'off',
-            'n/shebang': 'off',
-        },
-    }, {
-        files: ['client/dom/index.js'],
-        rules: {
-            'no-multi-spaces': 'off',
-        },
-    }, {
-        files: ['bin/cloudcmd.js'],
-        rules: {
-            'no-console': 'off',
-        },
-    }, {
-        files: ['{client,common,static}/**/*.js'],
-        env: {
-            browser: true,
-        },
-    }],
-    ignorePatterns: ['*.md{js}'],
-};

.github/workflows/docker.yml

@@ -11,12 +11,12 @@ jobs:
       packages: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
-      - uses: oven-sh/setup-bun@v1
+      - uses: oven-sh/setup-bun@v2
         with:
           bun-version: latest
       - name: Use Node.js 22.x
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: 22.x
       - name: Install Redrun

.github/workflows/nodejs.yml

@@ -9,16 +9,16 @@ jobs:
     strategy:
       matrix:
         node-version:
-          - 20.x
           - 22.x
           - 24.x
+          - 25.x
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
-      - uses: oven-sh/setup-bun@v1
+      - uses: oven-sh/setup-bun@v2
         with:
           bun-version: latest
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: ${{ matrix.node-version }}
       - name: Install Redrun

.npmignore

@@ -18,6 +18,7 @@ now.json
 app.json
 bower.json
 manifest.yml
+deno.json
 
 bin/release.mjs
 

.putout.json

@@ -7,6 +7,9 @@
         "fontello.json",
         "*.md"
     ],
+    "rules": {
+        "package-json/add-type": "off"
+    },
     "match": {
         "base64": {
             "types/convert-typeof-to-is-type": "off"
@@ -26,9 +29,12 @@
         "server/{server,exit,terminal,distribute/log}.{js,mjs}": {
             "remove-console": "off"
         },
-        "client/{client,cloudcmd,load-module}.js": {
+        "client/{client,cloudcmd,load-module}.{js,mjs}": {
             "remove-console": "off"
         },
+        "client": {
+            "nodejs": "off"
+        },
         "client/sw": {
             "remove-console": "off"
         },
@@ -43,6 +49,9 @@
         },
         "vim.js": {
             "merge-duplicate-functions": "off"
+        },
+        "common": {
+            "nodejs/declare": "off"
         }
     }
 }

.webpack/css.mjs

@@ -1,9 +1,6 @@
-'use strict';
+import {env} from 'node:process';
-
+import OptimizeCssAssetsPlugin from 'optimize-css-assets-webpack-plugin';
-const {env} = require('node:process');
+import MiniCssExtractPlugin from 'mini-css-extract-plugin';
-
-const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
-const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
 const isDev = env.NODE_ENV === 'development';
 
@@ -29,7 +26,7 @@ const rules = [{
     type: 'asset/inline',
 }];
 
-module.exports = {
+export default {
     plugins,
     module: {
         rules,

.webpack/html.mjs

@@ -1,11 +1,9 @@
-'use strict';
+import {env} from 'node:process';
-
+import HtmlWebpackPlugin from 'html-webpack-plugin';
-const {env} = require('node:process');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
 
 const isDev = env.NODE_ENV === 'development';
 
-const plugins = [
+export const plugins = [
     new HtmlWebpackPlugin({
         inject: false,
         template: 'html/index.html',
@@ -13,10 +11,6 @@ const plugins = [
     }),
 ];
 
-module.exports = {
-    plugins,
-};
-
 function getMinifyHtmlOptions() {
     return {
         removeComments: true,

.webpack/js.mjs

@@ -1,18 +1,12 @@
-'use strict';
+import {resolve, sep} from 'node:path';
+import {env} from 'node:process';
+import webpack from 'webpack';
+import WebpackBar from 'webpackbar';
 
-const {
-    resolve,
-    sep,
-    join,
-} = require('node:path');
-
-const {env} = require('node:process');
 const {
     EnvironmentPlugin,
     NormalModuleReplacementPlugin,
-} = require('webpack');
+} = webpack;
-
-const WebpackBar = require('webpackbar');
 
 const modules = './modules';
 const dirModules = './client/modules';
@@ -23,7 +17,7 @@ const dir = './client';
 const {NODE_ENV} = env;
 const isDev = NODE_ENV === 'development';
 
-const rootDir = join(__dirname, '..');
+const rootDir = new URL('..', import.meta.url).pathname;
 const dist = resolve(rootDir, 'dist');
 const distDev = resolve(rootDir, 'dist-dev');
 const devtool = isDev ? 'eval' : 'source-map';
@@ -31,7 +25,7 @@ const devtool = isDev ? 'eval' : 'source-map';
 const notEmpty = (a) => a;
 const clean = (array) => array.filter(notEmpty);
 
-const noParse = (a) => /\.spec\.js$/.test(a);
+const noParse = (a) => a.endsWith('.spec.js');
 const options = {
     babelrc: true,
 };
@@ -92,7 +86,7 @@ const splitChunks = {
     },
 };
 
-module.exports = {
+export default {
     resolve: {
         symlinks: false,
         alias: {
@@ -100,8 +94,8 @@ module.exports = {
             'node:path': 'path',
         },
         fallback: {
-            path: require.resolve('path-browserify'),
+            path: import.meta.resolve('path-browserify'),
-            process: require.resolve('process/browser'),
+            process: import.meta.resolve('process/browser'),
         },
     },
     devtool,
@@ -120,7 +114,7 @@ module.exports = {
         'terminal': `${dirCss}/terminal.css`,
         'user-menu': `${dirCss}/user-menu.css`,
         'sw': `${dir}/sw/sw.js`,
-        'cloudcmd': `${dir}/cloudcmd.js`,
+        'cloudcmd': `${dir}/cloudcmd.mjs`,
         [`${modules}/edit`]: `${dirModules}/edit.js`,
         [`${modules}/edit-file`]: `${dirModules}/edit-file.js`,
         [`${modules}/edit-file-vim`]: `${dirModules}/edit-file-vim.js`,
@@ -133,7 +127,7 @@ module.exports = {
         [`${modules}/config`]: `${dirModules}/config/index.js`,
         [`${modules}/contact`]: `${dirModules}/contact.js`,
         [`${modules}/upload`]: `${dirModules}/upload.js`,
-        [`${modules}/operation`]: `${dirModules}/operation/index.js`,
+        [`${modules}/operation`]: `${dirModules}/operation/index.mjs`,
         [`${modules}/konsole`]: `${dirModules}/konsole.js`,
         [`${modules}/terminal`]: `${dirModules}/terminal.js`,
         [`${modules}/terminal-run`]: `${dirModules}/terminal-run.js`,

ChangeLog

@@ -1,3 +1,176 @@
+2026.01.21, v19.1.9
+
+feature:
+- 75ad4415 cloudcmd: @putout/eslint-flat v4.0.0
+- c5d9bd7c client: key: vim: get rid of mock-require
+- f437a52f client: images: migrate to EMS
+- 7192a56e client: dom: current-file: migrate to ESM
+
+2026.01.20, v19.1.8
+
+fix:
+- 8a769fd5 client: modules: operation: no update after copy
+
+feature:
+- d574a93d client: key: migrate to ESM
+- 3b409074 client: modules: operation: migrate to ESM
+- 3b6b0b5a client: buffer: migrate to ESM
+- 8876f050 cloudcmd: eslint-plugin-putout v30.0.0
+
+2026.01.17, v19.1.7
+
+feature:
+- 23a6a698 client: dom/events -> #dom/events
+- 9cebb241 client: dom: events: migrate to ESM
+- a94fa0d4 client: cloudcmd: migrate to ESM
+- 3bdf47a5 client: migrate to ESM
+
+2026.01.16, v19.1.6
+
+fix:
+- a523ef65 tests
+
+feature:
+- 64654e8d common: cloudfunc: migrate to ESM
+- add31607 common: cloudfunc: get rid of bas64
+- e36de00c modulas: migrate to ESM
+
+2026.01.16, v19.1.5
+
+feature:
+- 450f1461 client: improve testability
+- d979e949 server: env: migrate to ESM
+
+2026.01.15, v19.1.4
+
+feature:
+- 6e778a35 client: sort: migrate to ESM
+- e27ef51d client: sort: migrate to ESM
+- 917f5851 client: load-module: migrate to ESM
+- 9950caca client: get-json-from-file-table: migrate to ESM
+
+2026.01.15, v19.1.3
+
+feature:
+- f903c5c9 cloudcmd: multi-rename v3.0.0
+
+2026.01.14, v19.1.2
+
+fix:
+- 9e2c5ac6 client: edit-names: group rename not renaming (#453)
+- f0dcbe94 client: key: config
+
+feature:
+- 6856207d server: env -> env.parse
+- dc99417c client: key: get rid of mock-require
+- 4bb7d704 client: modules: view: get rid of mock-require
+
+2026.01.12, v19.1.1
+
+feature:
+- 5cc6f79d cloudcmd: @cloudcmd/stub v5.0.0
+- 024bc413 cloudcmd: fullstore v4.0.0
+- 53f6f9e7 cloudcmd: globals v17.0.0
+- 6d21c539 cloudcmd: madrun v12.1.0
+- 253389ea cloudcmd: supertape v12.0.0
+
+2025.12.31, v19.1.0
+
+feature:
+- 0ff16314 cloudcmd: redlint v5.0.0
+- 43edba8c cloudcmd: try-to-catch v4.0.0
+- 06f3b782 cloudcmd: try-catch v4.0.4
+- dfcd6557 deno config: add
+- ab20a462 server: bun support (oven-sh/bun#25674)
+
+2025.12.24, v19.0.17
+
+feature:
+- 0222d177 cloudcmd: gritty v9.0.0
+
+2025.12.05, v19.0.16
+
+feature:
+- 14ec19e8 cloudcmd: find-up v8.0.0
+- e6a00979 cloudcmd: eslint-plugin-putout v29.0.2
+- 5b5352c7 cloudcmd: putout v41.0.0
+
+2025.11.28, v19.0.15
+
+feature:
+- 00676531 cloudcmd: aleman v1.16.5
+
+2025.11.27, v19.0.14
+
+fix:
+- 2a525e9b aleman: copy paste in text editor (#449)
+
+feature:
+- 3ceb9a8c cloudcmd: open v11.0.0
+
+2025.09.26, v19.0.13
+
+feature:
+- 8477f3e4 cloudcmd: aleman v1.16.3 (#446)
+
+2025.09.25, v19.0.12
+
+feature:
+- 836e908e cloudcmd: aleman v1.16.2
+
+2025.09.24, v19.0.11
+
+feature:
+- f4386a6f cloudcmd: aleman v1.16.1
+
+2025.09.23, v19.0.10
+
+feature:
+- 2e667ba6 cloudcmd: aleman v1.15.0
+
+2025.09.22, v19.0.9
+
+feature:
+- 60c56164 cloudcmd: aleman v1.14.4
+
+2025.09.20, v19.0.8
+
+feature:
+- efe81320 cloudcmd: aleman v1.14.3
+
+2025.09.18, v19.0.7
+
+feature:
+- 5b972e2e cloudcmd: aleman v1.14.0
+
+2025.09.17, v19.0.6
+
+feature:
+- 39a24028 cloudcmd: aleman v1.13.0
+
+2025.09.16, v19.0.5
+
+fix:
+- 64df81bc cloudcmd: client: listeners: f9: stopPropagation
+
+feature:
+- 38dd5101 cloudcmd: aleman v1.12.4
+
+2025.09.15, v19.0.4
+
+feature:
+- 66db798c cloudcmd: aleman v1.12.3
+
+2025.09.15, v19.0.3
+
+feature:
+- c5aed16f cloudcmd: aleman v1.12.2
+
+2025.09.14, v19.0.2
+
+feature:
+- 511347d3 cloudcmd: aleman v1.11.0
+
 2025.09.14, v19.0.1
 
 fix:

HELP.md

@@ -1,4 +1,4 @@
-# Cloud Commander v19.0.1
+# Cloud Commander v19.1.9
 
 ### [Main][MainURL] [Blog][BlogURL] [Support][SupportURL] [Demo][DemoURL]
 
@@ -1111,6 +1111,32 @@ There are a lot of ways to be involved in `Cloud Commander` development:
 
 ## Version history
 
+- *2026.01.21*, **[v19.1.9](//github.com/coderaiser/cloudcmd/releases/tag/v19.1.9)**
+- *2026.01.20*, **[v19.1.8](//github.com/coderaiser/cloudcmd/releases/tag/v19.1.8)**
+- *2026.01.17*, **[v19.1.7](//github.com/coderaiser/cloudcmd/releases/tag/v19.1.7)**
+- *2026.01.16*, **[v19.1.6](//github.com/coderaiser/cloudcmd/releases/tag/v19.1.6)**
+- *2026.01.16*, **[v19.1.5](//github.com/coderaiser/cloudcmd/releases/tag/v19.1.5)**
+- *2026.01.15*, **[v19.1.4](//github.com/coderaiser/cloudcmd/releases/tag/v19.1.4)**
+- *2026.01.15*, **[v19.1.3](//github.com/coderaiser/cloudcmd/releases/tag/v19.1.3)**
+- *2026.01.14*, **[v19.1.2](//github.com/coderaiser/cloudcmd/releases/tag/v19.1.2)**
+- *2026.01.12*, **[v19.1.1](//github.com/coderaiser/cloudcmd/releases/tag/v19.1.1)**
+- *2025.12.31*, **[v19.1.0](//github.com/coderaiser/cloudcmd/releases/tag/v19.1.0)**
+- *2025.12.24*, **[v19.0.17](//github.com/coderaiser/cloudcmd/releases/tag/v19.0.17)**
+- *2025.12.05*, **[v19.0.16](//github.com/coderaiser/cloudcmd/releases/tag/v19.0.16)**
+- *2025.11.28*, **[v19.0.15](//github.com/coderaiser/cloudcmd/releases/tag/v19.0.15)**
+- *2025.11.27*, **[v19.0.14](//github.com/coderaiser/cloudcmd/releases/tag/v19.0.14)**
+- *2025.09.26*, **[v19.0.13](//github.com/coderaiser/cloudcmd/releases/tag/v19.0.13)**
+- *2025.09.25*, **[v19.0.12](//github.com/coderaiser/cloudcmd/releases/tag/v19.0.12)**
+- *2025.09.24*, **[v19.0.11](//github.com/coderaiser/cloudcmd/releases/tag/v19.0.11)**
+- *2025.09.23*, **[v19.0.10](//github.com/coderaiser/cloudcmd/releases/tag/v19.0.10)**
+- *2025.09.22*, **[v19.0.9](//github.com/coderaiser/cloudcmd/releases/tag/v19.0.9)**
+- *2025.09.20*, **[v19.0.8](//github.com/coderaiser/cloudcmd/releases/tag/v19.0.8)**
+- *2025.09.18*, **[v19.0.7](//github.com/coderaiser/cloudcmd/releases/tag/v19.0.7)**
+- *2025.09.17*, **[v19.0.6](//github.com/coderaiser/cloudcmd/releases/tag/v19.0.6)**
+- *2025.09.16*, **[v19.0.5](//github.com/coderaiser/cloudcmd/releases/tag/v19.0.5)**
+- *2025.09.15*, **[v19.0.4](//github.com/coderaiser/cloudcmd/releases/tag/v19.0.4)**
+- *2025.09.15*, **[v19.0.3](//github.com/coderaiser/cloudcmd/releases/tag/v19.0.3)**
+- *2025.09.14*, **[v19.0.2](//github.com/coderaiser/cloudcmd/releases/tag/v19.0.2)**
 - *2025.09.14*, **[v19.0.1](//github.com/coderaiser/cloudcmd/releases/tag/v19.0.1)**
 - *2025.09.14*, **[v19.0.0](//github.com/coderaiser/cloudcmd/releases/tag/v19.0.0)**
 - *2025.09.14*, **[v18.8.11](//github.com/coderaiser/cloudcmd/releases/tag/v18.8.11)**

README.md

@@ -1,4 +1,4 @@
-# Cloud Commander v19.0.1 [![Build Status][BuildStatusIMGURL]][BuildStatusURL] [![Codacy][CodacyIMG]][CodacyURL] [![Gitter][GitterIMGURL]][GitterURL]
+# Cloud Commander v19.1.9 [![Build Status][BuildStatusIMGURL]][BuildStatusURL] [![Codacy][CodacyIMG]][CodacyURL] [![Gitter][GitterIMGURL]][GitterURL]
 
 ### [Main][MainURL] [Blog][BlogURL] [Support][SupportURL] [Demo][DemoURL]
 

bin/cloudcmd.mjs

@@ -3,12 +3,12 @@
 import process from 'node:process';
 import {createRequire} from 'node:module';
 import {promisify} from 'node:util';
-import tryToCatch from 'try-to-catch';
+import {tryToCatch} from 'try-to-catch';
 import {createSimport} from 'simport';
 import parse from 'yargs-parser';
 import exit from '../server/exit.js';
-import {createConfig, configPath} from '../server/config.js';
+import {createConfig, configPath} from '../server/config.mjs';
-import env from '../server/env.js';
+import * as env from '../server/env.mjs';
 import prefixer from '../server/prefixer.js';
 import * as validate from '../server/validate.mjs';
 
@@ -101,27 +101,27 @@ const yargsOptions = {
     ],
     default: {
         'server': true,
-        'name': choose(env('name'), config('name')),
+        'name': choose(env.parse('name'), config('name')),
         'auth': choose(env.bool('auth'), config('auth')),
         'port': config('port'),
         'online': config('online'),
         'open': choose(env.bool('open'), config('open')),
-        'editor': env('editor') || config('editor'),
+        'editor': env.parse('editor') || config('editor'),
-        'menu': env('menu') || config('menu'),
+        'menu': env.parse('menu') || config('menu'),
         'packer': config('packer') || 'tar',
         'zip': config('zip'),
-        'username': env('username') || config('username'),
+        'username': env.parse('username') || config('username'),
-        'root': choose(env('root'), config('root')),
+        'root': choose(env.parse('root'), config('root')),
-        'prefix': choose(env('prefix'), config('prefix')),
+        'prefix': choose(env.parse('prefix'), config('prefix')),
         'console': choose(env.bool('console'), config('console')),
         'contact': choose(env.bool('contact'), config('contact')),
         'terminal': choose(env.bool('terminal'), config('terminal')),
-        'columns': env('columns') || config('columns') || '',
+        'columns': env.parse('columns') || config('columns') || '',
-        'theme': env('theme') || config('theme') || '',
+        'theme': env.parse('theme') || config('theme') || '',
         'vim': choose(env.bool('vim'), config('vim')),
         'log': config('log'),
         
-        'import-url': env('import_url') || config('importUrl'),
+        'import-url': env.parse('import_url') || config('importUrl'),
         'import-listen': choose(env.bool('import_listen'), config('importListen')),
         'import': choose(env.bool('import'), config('import')),
         'export': choose(env.bool('export'), config('export')),
@@ -132,15 +132,15 @@ const yargsOptions = {
         'sync-console-path': choose(env.bool('sync_console_path'), config('syncConsolePath')),
         'config-dialog': choose(env.bool('config_dialog'), config('configDialog')),
         'config-auth': choose(env.bool('config_auth'), config('configAuth')),
-        'terminal-path': env('terminal_path') || config('terminalPath'),
+        'terminal-path': env.parse('terminal_path') || config('terminalPath'),
-        'terminal-command': env('terminal_command') || config('terminalCommand'),
+        'terminal-command': env.parse('terminal_command') || config('terminalCommand'),
         'terminal-auto-restart': choose(env.bool('terminal_auto_restart'), config('terminalAutoRestart')),
         'one-file-panel': choose(env.bool('one_file_panel'), config('oneFilePanel')),
         'confirm-copy': choose(env.bool('confirm_copy'), config('confirmCopy')),
         'confirm-move': choose(env.bool('confirm_move'), config('confirmMove')),
         'keys-panel': env.bool('keys_panel') || config('keysPanel'),
-        'import-token': env('import_token') || config('importToken'),
+        'import-token': env.parse('import_token') || config('importToken'),
-        'export-token': env('export_token') || config('exportToken'),
+        'export-token': env.parse('export_token') || config('exportToken'),
         
         'dropbox': config('dropbox'),
         'dropbox-token': config('dropboxToken') || '',
@@ -238,7 +238,7 @@ async function main() {
         menu: config('menu'),
     };
     
-    const password = env('password') || args.password;
+    const password = env.parse('password') || args.password;
     
     if (password)
         config('password', await getPassword(password));

bin/release.mjs

@@ -2,7 +2,7 @@
 
 import {promisify} from 'node:util';
 import process from 'node:process';
-import tryToCatch from 'try-to-catch';
+import {tryToCatch} from 'try-to-catch';
 import {createSimport} from 'simport';
 import minor from 'minor';
 import _place from 'place';

client/client.mjs

@@ -1,30 +1,24 @@
-'use strict';
+import process from 'node:process';
-
-const process = require('node:process');
 
 /* global DOM */
-const Emitify = require('emitify');
+import Emitify from 'emitify';
-const inherits = require('inherits');
+import inherits from 'inherits';
-const rendy = require('rendy');
+import rendy from 'rendy';
-const load = require('load.js');
+import load from 'load.js';
-const tryToCatch = require('try-to-catch');
+import {tryToCatch} from 'try-to-catch';
-const {addSlashToEnd} = require('format-io');
+import {addSlashToEnd} from 'format-io';
-const pascalCase = require('just-pascal-case');
+import pascalCase from 'just-pascal-case';
-const currify = require('currify');
+import currify from 'currify';
-
+import * as Images from './dom/images.mjs';
-const Images = require('./dom/images');
+import {unregisterSW} from './sw/register.js';
-
+import {getJsonFromFileTable} from './get-json-from-file-table.mjs';
-const {unregisterSW} = require('./sw/register');
+import {Key} from './key/index.mjs';
-const getJsonFromFileTable = require('./get-json-from-file-table');
+import {
-const Key = require('./key');
-
-const {
     apiURL,
     formatMsg,
     buildFromJSON,
-} = require('../common/cloudfunc');
+} from '../common/cloudfunc.mjs';
-
+import {loadModule} from './load-module.mjs';
-const loadModule = require('./load-module');
 
 const noJS = (a) => a.replace(/.js$/, '');
 
@@ -32,16 +26,19 @@ const isDev = process.env.NODE_ENV === 'development';
 
 inherits(CloudCmdProto, Emitify);
 
-module.exports = new CloudCmdProto(DOM);
+export const createCloudCmd = ({DOM, Listeners}) => {
+    return new CloudCmdProto({
+        DOM,
+        Listeners,
+    });
+};
 
 load.addErrorListener((e, src) => {
     const msg = `file ${src} could not be loaded`;
     Images.show.error(msg);
 });
 
-function CloudCmdProto(DOM) {
+function CloudCmdProto({DOM, Listeners}) {
-    let Listeners;
-    
     Emitify.call(this);
     
     const CloudCmd = this;
@@ -49,11 +46,9 @@ function CloudCmdProto(DOM) {
     
     const {Storage, Files} = DOM;
     
-    this.log = (...a) => {
+    this.log = () => {
         if (!isDev)
             return;
-        
-        console.log(...a);
     };
     this.prefix = '';
     this.prefixSocket = '';
@@ -151,7 +146,7 @@ function CloudCmdProto(DOM) {
         const [kebabModule] = query;
         const module = noJS(pascalCase(kebabModule.slice(1)));
         
-        const file = query[1];
+        const [, file] = query;
         const current = DOM.getCurrentByName(file);
         
         if (file && !current) {
@@ -230,7 +225,6 @@ function CloudCmdProto(DOM) {
         
         const dirPath = DOM.getCurrentDirPath();
         
-        ({Listeners} = CloudCmd);
         Listeners.init();
         
         const panels = getPanels();

client/cloudcmd.mjs

@@ -1,39 +1,44 @@
-'use strict';
+import process from 'node:process';
-
+import wraptile from 'wraptile';
-const process = require('node:process');
+import load from 'load.js';
-require('../css/main.css');
+import '../css/main.css';
-
+import {registerSW, listenSW} from './sw/register.js';
-const wraptile = require('wraptile');
+import {initSortPanel, sortPanel} from './sort.mjs';
-const load = require('load.js');
+import Util from '../common/util.js';
-
+import * as CloudFunc from '../common/cloudfunc.mjs';
-const {registerSW, listenSW} = require('./sw/register');
+import DOM from './dom/index.js';
+import {createCloudCmd} from './client.mjs';
+import * as Listeners from './listeners/index.js';
 
 const isDev = process.env.NODE_ENV === 'development';
 
-module.exports = async (config) => {
+export default init;
-    window.Util = require('../common/util');
+
-    window.CloudFunc = require('../common/cloudfunc');
+globalThis.CloudCmd = init;
-    
+
-    window.DOM = require('./dom');
+async function init(config) {
-    window.CloudCmd = require('./client');
+    globalThis.CloudCmd = createCloudCmd({
+        DOM,
+        Listeners,
+    });
+    globalThis.DOM = DOM;
+    globalThis.Util = Util;
+    globalThis.CloudFunc = CloudFunc;
     
     await register(config);
     
-    require('./listeners');
+    initSortPanel();
-    require('./key');
+    globalThis.CloudCmd.sortPanel = sortPanel;
-    require('./sort');
-    
     const prefix = getPrefix(config.prefix);
     
-    window.CloudCmd.init(prefix, config);
+    globalThis.CloudCmd.init(prefix, config);
     
-    if (window.CloudCmd.config('menu') === 'aleman')
+    if (globalThis.CloudCmd.config('menu') === 'aleman')
         setTimeout(() => {
             import('https://esm.sh/@putout/processor-html');
             import('https://esm.sh/@putout/bundle');
         }, 100);
-};
+}
-window.CloudCmd = module.exports;
 
 function getPrefix(prefix) {
     if (!prefix)
@@ -49,7 +54,7 @@ const onUpdateFound = wraptile(async (config) => {
     if (isDev)
         return;
     
-    const {DOM} = window;
+    const {DOM} = globalThis;
     const prefix = getPrefix(config.prefix);
     
     await load.js(`${prefix}/dist/cloudcmd.common.js`);
@@ -58,7 +63,7 @@ const onUpdateFound = wraptile(async (config) => {
     console.log('cloudcmd: sw: updated');
     
     DOM.Events.removeAll();
-    window.CloudCmd(config);
+    globalThis.CloudCmd(config);
 });
 
 async function register(config) {

client/dom/buffer.js

@@ -1,135 +0,0 @@
-'use strict';
-
-/* global CloudCmd */
-const tryToPromiseAll = require('../../common/try-to-promise-all');
-const Storage = require('./storage');
-const DOM = require('./');
-
-module.exports = new BufferProto();
-
-function BufferProto() {
-    const Info = DOM.CurrentInfo;
-    const CLASS = 'cut-file';
-    const COPY = 'copy';
-    const CUT = 'cut';
-    
-    const Buffer = {
-        cut: callIfEnabled.bind(null, cut),
-        copy: callIfEnabled.bind(null, copy),
-        clear: callIfEnabled.bind(null, clear),
-        paste: callIfEnabled.bind(null, paste),
-    };
-    
-    function showMessage(msg) {
-        DOM.Dialog.alert(msg);
-    }
-    
-    function getNames() {
-        const files = DOM.getActiveFiles();
-        
-        return DOM.getFilenames(files);
-    }
-    
-    function addCutClass() {
-        const files = DOM.getActiveFiles();
-        
-        for (const element of files) {
-            element.classList.add(CLASS);
-        }
-    }
-    
-    function rmCutClass() {
-        const files = DOM.getByClassAll(CLASS);
-        
-        for (const element of files) {
-            element.classList.remove(CLASS);
-        }
-    }
-    
-    function callIfEnabled(callback) {
-        const is = CloudCmd.config('buffer');
-        
-        if (is)
-            return callback();
-        
-        showMessage('Buffer disabled in config!');
-    }
-    
-    async function readBuffer() {
-        const [e, cp, ct] = await tryToPromiseAll([
-            Storage.getJson(COPY),
-            Storage.getJson(CUT),
-        ]);
-        
-        return [
-            e,
-            cp,
-            ct,
-        ];
-    }
-    
-    async function copy() {
-        const names = getNames();
-        const from = Info.dirPath;
-        
-        await clear();
-        
-        if (!names.length)
-            return;
-        
-        await Storage.remove(CUT);
-        await Storage.setJson(COPY, {
-            from,
-            names,
-        });
-    }
-    
-    async function cut() {
-        const names = getNames();
-        const from = Info.dirPath;
-        
-        await clear();
-        
-        if (!names.length)
-            return;
-        
-        addCutClass();
-        
-        await Storage.setJson(CUT, {
-            from,
-            names,
-        });
-    }
-    
-    async function clear() {
-        await Storage.remove(COPY);
-        await Storage.remove(CUT);
-        
-        rmCutClass();
-    }
-    
-    async function paste() {
-        const [error, cp, ct] = await readBuffer();
-        
-        if (error || !cp && !ct)
-            return showMessage(error || 'Buffer is empty!');
-        
-        const opStr = cp ? 'copy' : 'move';
-        const data = cp || ct;
-        const {Operation} = CloudCmd;
-        const msg = 'Path is same!';
-        const to = Info.dirPath;
-        
-        if (data.from === to)
-            return showMessage(msg);
-        
-        Operation.show(opStr, {
-            ...data,
-            to,
-        });
-        
-        await clear();
-    }
-    
-    return Buffer;
-}

client/dom/buffer.mjs

@@ -0,0 +1,124 @@
+/* global CloudCmd*/
+import tryToPromiseAll from '../../common/try-to-promise-all.js';
+import Storage from './storage.js';
+
+const CLASS = 'cut-file';
+const COPY = 'copy';
+const CUT = 'cut';
+
+function showMessage(msg) {
+    globalThis.DOM.Dialog.alert(msg);
+}
+
+function getNames() {
+    const {DOM} = globalThis;
+    const files = DOM.getActiveFiles();
+    
+    return DOM.getFilenames(files);
+}
+
+function addCutClass() {
+    const {DOM} = globalThis;
+    const files = DOM.getActiveFiles();
+    
+    for (const element of files) {
+        element.classList.add(CLASS);
+    }
+}
+
+function rmCutClass() {
+    const {DOM} = globalThis;
+    const files = DOM.getByClassAll(CLASS);
+    
+    for (const element of files) {
+        element.classList.remove(CLASS);
+    }
+}
+
+const checkEnabled = (fn) => () => {
+    const is = CloudCmd.config('buffer');
+    
+    if (is)
+        return fn();
+    
+    showMessage('Buffer disabled in config!');
+};
+
+async function readBuffer() {
+    const [e, cp, ct] = await tryToPromiseAll([
+        Storage.getJson(COPY),
+        Storage.getJson(CUT),
+    ]);
+    
+    return [
+        e,
+        cp,
+        ct,
+    ];
+}
+
+export const copy = checkEnabled(async () => {
+    const Info = globalThis.DOM.CurrentInfo;
+    const names = getNames();
+    const from = Info.dirPath;
+    
+    await clear();
+    
+    if (!names.length)
+        return;
+    
+    await Storage.remove(CUT);
+    await Storage.setJson(COPY, {
+        from,
+        names,
+    });
+});
+
+export const cut = checkEnabled(async () => {
+    const Info = globalThis.DOM.CurrentInfo;
+    const names = getNames();
+    const from = Info.dirPath;
+    
+    await clear();
+    
+    if (!names.length)
+        return;
+    
+    addCutClass();
+    
+    await Storage.setJson(CUT, {
+        from,
+        names,
+    });
+});
+
+export const clear = checkEnabled(async () => {
+    await Storage.remove(COPY);
+    await Storage.remove(CUT);
+    
+    rmCutClass();
+});
+
+export const paste = checkEnabled(async () => {
+    const Info = globalThis.DOM.CurrentInfo;
+    const [error, cp, ct] = await readBuffer();
+    
+    if (error || !cp && !ct)
+        return showMessage(error || 'Buffer is empty!');
+    
+    const opStr = cp ? 'copy' : 'move';
+    const data = cp || ct;
+    const {Operation} = CloudCmd;
+    const msg = 'Path is same!';
+    const to = Info.dirPath;
+    
+    if (data.from === to)
+        return showMessage(msg);
+    
+    Operation.show(opStr, {
+        ...data,
+        to,
+    });
+    
+    await clear();
+});

client/dom/current-file.mjs

@@ -1,13 +1,8 @@
-'use strict';
-
 /* global DOM */
 /* global CloudCmd */
-const createElement = require('@cloudcmd/create-element');
+import createElement from '@cloudcmd/create-element';
-const {atob, btoa} = require('../../common/base64');
+import {encode, decode} from '../../common/entity.js';
-
+import {getTitle, FS} from '../../common/cloudfunc.mjs';
-const {encode, decode} = require('../../common/entity');
-
-const {getTitle, FS} = require('../../common/cloudfunc');
 
 let Title;
 
@@ -15,14 +10,15 @@ const CURRENT_FILE = 'current-file';
 const encodeNBSP = (a) => a?.replace('\xa0', ' ');
 const decodeNBSP = (a) => a?.replace(' ', '\xa0');
 
-module.exports._CURRENT_FILE = CURRENT_FILE;
+export const _CURRENT_FILE = CURRENT_FILE;
+
 /**
  * set name from current (or param) file
  *
  * @param name
  * @param current
  */
-module.exports.setCurrentName = (name, current) => {
+export const setCurrentName = (name, current) => {
     const Info = DOM.CurrentInfo;
     const {link} = Info;
     const {prefix} = CloudCmd;
@@ -44,7 +40,7 @@ module.exports.setCurrentName = (name, current) => {
  *
  * @param currentFile
  */
-module.exports.getCurrentName = (currentFile) => {
+export const getCurrentName = (currentFile) => {
     const current = currentFile || DOM.getCurrentFile();
     
     if (!current)
@@ -71,18 +67,19 @@ const parseNameAttribute = (attribute) => {
     return decodeNBSP(decodeURI(atob(attribute)));
 };
 
-module.exports._parseNameAttribute = parseNameAttribute;
+export const _parseNameAttribute = parseNameAttribute;
 
 const parseHrefAttribute = (prefix, attribute) => {
     attribute = attribute.replace(RegExp('^' + prefix + FS), '');
     return decode(decodeNBSP(attribute));
 };
 
-module.exports._parseHrefAttribute = parseHrefAttribute;
+export const _parseHrefAttribute = parseHrefAttribute;
+
 /**
  * get current direcotory path
  */
-module.exports.getCurrentDirPath = (panel = DOM.getPanel()) => {
+export const getCurrentDirPath = (panel = DOM.getPanel()) => {
     const path = DOM.getByDataName('js-path', panel);
     return path.textContent;
 };
@@ -92,7 +89,7 @@ module.exports.getCurrentDirPath = (panel = DOM.getPanel()) => {
  *
  * @param currentFile - current file by default
  */
-module.exports.getCurrentPath = (currentFile) => {
+export const getCurrentPath = (currentFile) => {
     const current = currentFile || DOM.getCurrentFile();
     const [element] = DOM.getByTag('a', current);
     const {prefix} = CloudCmd;
@@ -103,7 +100,7 @@ module.exports.getCurrentPath = (currentFile) => {
 /**
  * get current direcotory name
  */
-module.exports.getCurrentDirName = () => {
+export const getCurrentDirName = () => {
     const href = DOM
         .getCurrentDirPath()
         .replace(/\/$/, '');
@@ -116,7 +113,7 @@ module.exports.getCurrentDirName = () => {
 /**
  * get current direcotory path
  */
-module.exports.getParentDirPath = (panel) => {
+export const getParentDirPath = (panel) => {
     const path = DOM.getCurrentDirPath(panel);
     const dirName = DOM.getCurrentDirName() + '/';
     const index = path.lastIndexOf(dirName);
@@ -130,7 +127,7 @@ module.exports.getParentDirPath = (panel) => {
 /**
  * get not current direcotory path
  */
-module.exports.getNotCurrentDirPath = () => {
+export const getNotCurrentDirPath = () => {
     const panel = DOM.getPanel({
         active: false,
     });
@@ -143,14 +140,14 @@ module.exports.getNotCurrentDirPath = () => {
  *
  * @currentFile
  */
-module.exports.getCurrentFile = () => {
+export const getCurrentFile = () => {
     return DOM.getByClass(CURRENT_FILE);
 };
 
 /**
  * get current file by name
  */
-module.exports.getCurrentByName = (name, panel = DOM.CurrentInfo.panel) => {
+export const getCurrentByName = (name, panel = DOM.CurrentInfo.panel) => {
     const dataName = 'js-file-' + btoa(encodeURI(encodeNBSP(name)));
     return DOM.getByDataName(dataName, panel);
 };
@@ -172,7 +169,7 @@ function unsetCurrentFile(currentFile) {
 /**
  * unified way to set current file
  */
-module.exports.setCurrentFile = (currentFile, options) => {
+export const setCurrentFile = (currentFile, options) => {
     const o = options;
     const currentFileWas = DOM.getCurrentFile();
     
@@ -219,7 +216,7 @@ module.exports.setCurrentFile = (currentFile, options) => {
     return DOM;
 };
 
-this.setCurrentByName = (name) => {
+export const setCurrentByName = (name) => {
     const current = DOM.getCurrentByName(name);
     return DOM.setCurrentFile(current);
 };
@@ -230,7 +227,7 @@ this.setCurrentByName = (name) => {
   * @param layer    - element
   * @param          - position {x, y}
   */
-module.exports.getCurrentByPosition = ({x, y}) => {
+export const getCurrentByPosition = ({x, y}) => {
     const element = document.elementFromPoint(x, y);
     
     const getEl = (el) => {
@@ -262,7 +259,7 @@ module.exports.getCurrentByPosition = ({x, y}) => {
  *
  * @param currentFile
  */
-module.exports.isCurrentFile = (currentFile) => {
+export const isCurrentFile = (currentFile) => {
     if (!currentFile)
         return false;
     
@@ -274,7 +271,7 @@ module.exports.isCurrentFile = (currentFile) => {
  *
  * @param name
  */
-module.exports.setTitle = (name) => {
+export const setTitle = (name) => {
     if (!Title)
         Title = DOM.getByTag('title')[0] || createElement('title', {
             innerHTML: name,
@@ -291,18 +288,18 @@ module.exports.setTitle = (name) => {
  *
  * @param currentFile
  */
-module.exports.isCurrentIsDir = (currentFile) => {
+export const isCurrentIsDir = (currentFile) => {
     const current = currentFile || DOM.getCurrentFile();
     const path = DOM.getCurrentPath(current);
     const fileType = DOM.getCurrentType(current);
     
-    const isZip = /\.zip$/.test(path);
+    const isZip = path.endsWith('.zip');
     const isDir = /^directory(-link)?/.test(fileType);
     
     return isDir || isZip;
 };
 
-module.exports.getCurrentType = (currentFile) => {
+export const getCurrentType = (currentFile) => {
     const current = currentFile || DOM.getCurrentFile();
     const el = DOM.getByDataName('js-type', current);
     const type = el.className

client/dom/current-file.spec.mjs

@@ -1,20 +1,18 @@
-'use strict';
+import {test, stub} from 'supertape';
+import {create} from 'auto-globals';
+import wraptile from 'wraptile';
+import * as currentFile from './current-file.mjs';
 
-const {test, stub} = require('supertape');
-
-const {create} = require('auto-globals');
-const wraptile = require('wraptile');
-const currentFile = require('./current-file');
 const id = (a) => a;
 
 const returns = wraptile(id);
 const {_CURRENT_FILE} = currentFile;
 
 test('current-file: setCurrentName: setAttribute', (t) => {
-    const {DOM, CloudCmd} = global;
+    const {DOM, CloudCmd} = globalThis;
     
-    global.DOM = getDOM();
+    globalThis.DOM = getDOM();
-    global.CloudCmd = getCloudCmd();
+    globalThis.CloudCmd = getCloudCmd();
     
     const current = create();
     const {setAttribute} = current;
@@ -23,17 +21,17 @@ test('current-file: setCurrentName: setAttribute', (t) => {
     
     t.calledWith(setAttribute, ['data-name', 'js-file-aGVsbG8='], 'should call setAttribute');
     
-    global.DOM = DOM;
+    globalThis.DOM = DOM;
-    global.CloudCmd = CloudCmd;
+    globalThis.CloudCmd = CloudCmd;
     
     t.end();
 });
 
 test('current-file: setCurrentName: setAttribute: cyrillic', (t) => {
-    const {DOM, CloudCmd} = global;
+    const {DOM, CloudCmd} = globalThis;
     
-    global.DOM = getDOM();
+    globalThis.DOM = getDOM();
-    global.CloudCmd = getCloudCmd();
+    globalThis.CloudCmd = getCloudCmd();
     
     const current = create();
     const {setAttribute} = current;
@@ -42,8 +40,8 @@ test('current-file: setCurrentName: setAttribute: cyrillic', (t) => {
     
     t.calledWith(setAttribute, ['data-name', 'js-file-JUQwJUIwJUQwJUI5'], 'should call setAttribute');
     
-    global.DOM = DOM;
+    globalThis.DOM = DOM;
-    global.CloudCmd = CloudCmd;
+    globalThis.CloudCmd = CloudCmd;
     
     t.end();
 });
@@ -59,12 +57,12 @@ test('current-file: getCurrentName', (t) => {
 });
 
 test('current-file: emit', (t) => {
-    const {DOM, CloudCmd} = global;
+    const {DOM, CloudCmd} = globalThis;
     
     const emit = stub();
     
-    global.DOM = getDOM();
+    globalThis.DOM = getDOM();
-    global.CloudCmd = getCloudCmd({
+    globalThis.CloudCmd = getCloudCmd({
         emit,
     });
     
@@ -74,22 +72,22 @@ test('current-file: emit', (t) => {
     
     t.calledWith(emit, ['current-file', current], 'should call emit');
     
-    global.DOM = DOM;
+    globalThis.DOM = DOM;
-    global.CloudCmd = CloudCmd;
+    globalThis.CloudCmd = CloudCmd;
     
     t.end();
 });
 
 test('current-file: setCurrentName: return', (t) => {
-    const {DOM, CloudCmd} = global;
+    const {DOM, CloudCmd} = globalThis;
     
     const link = {};
     
-    global.DOM = getDOM({
+    globalThis.DOM = getDOM({
         link,
     });
     
-    global.CloudCmd = getCloudCmd();
+    globalThis.CloudCmd = getCloudCmd();
     
     const current = create();
     
@@ -97,19 +95,19 @@ test('current-file: setCurrentName: return', (t) => {
     
     t.equal(result, link, 'should return link');
     
-    global.DOM = DOM;
+    globalThis.DOM = DOM;
-    global.CloudCmd = CloudCmd;
+    globalThis.CloudCmd = CloudCmd;
     
     t.end();
 });
 
 test('current-file: getParentDirPath: result', (t) => {
-    const {DOM} = global;
+    const {DOM} = globalThis;
     
     const getCurrentDirPath = returns('/D/Films/+++favorite films/');
     const getCurrentDirName = returns('+++favorite films');
     
-    global.DOM = getDOM({
+    globalThis.DOM = getDOM({
         getCurrentDirPath,
         getCurrentDirName,
     });
@@ -117,55 +115,55 @@ test('current-file: getParentDirPath: result', (t) => {
     const result = currentFile.getParentDirPath();
     const expected = '/D/Films/';
     
-    global.DOM = DOM;
+    globalThis.DOM = DOM;
     
     t.equal(result, expected, 'should return parent dir path');
     t.end();
 });
 
 test('current-file: isCurrentFile: no', (t) => {
-    const {DOM, CloudCmd} = global;
+    const {DOM, CloudCmd} = globalThis;
     
-    global.DOM = getDOM();
+    globalThis.DOM = getDOM();
-    global.CloudCmd = getCloudCmd();
+    globalThis.CloudCmd = getCloudCmd();
     
     const result = currentFile.isCurrentFile();
     
-    global.DOM = DOM;
+    globalThis.DOM = DOM;
-    global.CloudCmd = CloudCmd;
+    globalThis.CloudCmd = CloudCmd;
     
     t.notOk(result);
     t.end();
 });
 
 test('current-file: isCurrentFile', (t) => {
-    const {DOM, CloudCmd} = global;
+    const {DOM, CloudCmd} = globalThis;
     
     const isContainClass = stub();
     
-    global.DOM = getDOM({
+    globalThis.DOM = getDOM({
         isContainClass,
     });
     
-    global.CloudCmd = getCloudCmd();
+    globalThis.CloudCmd = getCloudCmd();
     
     const current = {};
     currentFile.isCurrentFile(current);
     
-    global.DOM = DOM;
+    globalThis.DOM = DOM;
-    global.CloudCmd = CloudCmd;
+    globalThis.CloudCmd = CloudCmd;
     
     t.calledWith(isContainClass, [current, _CURRENT_FILE], 'should call isContainClass');
     t.end();
 });
 
 test('current-file: getCurrentType', (t) => {
-    const {DOM, CloudCmd} = global;
+    const {DOM, CloudCmd} = globalThis;
     
-    global.DOM = getDOM();
+    globalThis.DOM = getDOM();
-    global.CloudCmd = getCloudCmd();
+    globalThis.CloudCmd = getCloudCmd();
     
-    const {getByDataName} = global.DOM;
+    const {getByDataName} = globalThis.DOM;
     
     getByDataName.returns({
         className: 'mini-icon directory',
@@ -175,87 +173,87 @@ test('current-file: getCurrentType', (t) => {
     
     currentFile.getCurrentType(current);
     
-    global.DOM = DOM;
+    globalThis.DOM = DOM;
-    global.CloudCmd = CloudCmd;
+    globalThis.CloudCmd = CloudCmd;
     
     t.calledWith(getByDataName, ['js-type', current]);
     t.end();
 });
 
 test('current-file: isCurrentIsDir: getCurrentType', (t) => {
-    const {DOM, CloudCmd} = global;
+    const {DOM, CloudCmd} = globalThis;
     
-    global.DOM = getDOM();
+    globalThis.DOM = getDOM();
-    global.CloudCmd = getCloudCmd();
+    globalThis.CloudCmd = getCloudCmd();
     
-    const {getCurrentType} = global.DOM;
+    const {getCurrentType} = globalThis.DOM;
     
     const current = create();
     
     currentFile.isCurrentIsDir(current);
     
-    global.DOM = DOM;
+    globalThis.DOM = DOM;
-    global.CloudCmd = CloudCmd;
+    globalThis.CloudCmd = CloudCmd;
     
     t.calledWith(getCurrentType, [current]);
     t.end();
 });
 
 test('current-file: isCurrentIsDir: directory', (t) => {
-    const {DOM, CloudCmd} = global;
+    const {DOM, CloudCmd} = globalThis;
     
-    global.DOM = getDOM({
+    globalThis.DOM = getDOM({
         getCurrentType: stub().returns('directory'),
     });
     
-    global.CloudCmd = getCloudCmd();
+    globalThis.CloudCmd = getCloudCmd();
     
     const current = create();
     
     const result = currentFile.isCurrentIsDir(current);
     
-    global.DOM = DOM;
+    globalThis.DOM = DOM;
-    global.CloudCmd = CloudCmd;
+    globalThis.CloudCmd = CloudCmd;
     
     t.ok(result);
     t.end();
 });
 
 test('current-file: isCurrentIsDir: directory-link', (t) => {
-    const {DOM, CloudCmd} = global;
+    const {DOM, CloudCmd} = globalThis;
     
-    global.DOM = getDOM({
+    globalThis.DOM = getDOM({
         getCurrentType: stub().returns('directory-link'),
     });
     
-    global.CloudCmd = getCloudCmd();
+    globalThis.CloudCmd = getCloudCmd();
     
     const current = create();
     
     const result = currentFile.isCurrentIsDir(current);
     
-    global.DOM = DOM;
+    globalThis.DOM = DOM;
-    global.CloudCmd = CloudCmd;
+    globalThis.CloudCmd = CloudCmd;
     
     t.ok(result);
     t.end();
 });
 
 test('current-file: isCurrentIsDir: file', (t) => {
-    const {DOM, CloudCmd} = global;
+    const {DOM, CloudCmd} = globalThis;
     
-    global.DOM = getDOM({
+    globalThis.DOM = getDOM({
         getCurrentType: stub().returns('file'),
     });
     
-    global.CloudCmd = getCloudCmd();
+    globalThis.CloudCmd = getCloudCmd();
     
     const current = create();
     
     const result = currentFile.isCurrentIsDir(current);
     
-    global.DOM = DOM;
+    globalThis.DOM = DOM;
-    global.CloudCmd = CloudCmd;
+    globalThis.CloudCmd = CloudCmd;
     
     t.notOk(result);
     t.end();
@@ -291,7 +289,7 @@ function getDOM(overrides = {}) {
         getByDataName = stub(),
         isContainClass = stub(),
         getCurrentType = stub(),
-        getCurrentPath = stub(),
+        getCurrentPath = stub().returns(''),
     } = overrides;
     
     return {

client/dom/dialog.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const tryToCatch = require('try-to-catch');
+const {tryToCatch} = require('try-to-catch');
 
 const {
     alert,

client/dom/directory.js

@@ -3,8 +3,8 @@
 /* global CloudCmd */
 const philip = require('philip');
 
-const Images = require('./images');
+const Images = require('./images.mjs');
-const {FS} = require('../../common/cloudfunc');
+const {FS} = require('../../common/cloudfunc.mjs');
 const DOM = require('.');
 const Dialog = require('./dialog');
 

client/dom/dom-tree.spec.js

@@ -2,7 +2,7 @@
 
 const test = require('supertape');
 const {create} = require('auto-globals');
-const tryCatch = require('try-catch');
+const {tryCatch} = require('try-catch');
 
 const {isContainClass} = require('./dom-tree');
 

client/dom/events/index.js

@@ -1,198 +0,0 @@
-'use strict';
-
-const itype = require('itype');
-const EventStore = require('./event-store');
-
-module.exports = new EventsProto();
-
-function EventsProto() {
-    const Events = this;
-    
-    const getEventOptions = (eventName) => {
-        if (eventName !== 'touchstart')
-            return false;
-        
-        return {
-            passive: true,
-        };
-    };
-    
-    function parseArgs(eventName, element, listener, callback) {
-        let isFunc;
-        const args = [
-            eventName,
-            element,
-            listener,
-            callback,
-        ];
-        
-        const EVENT_NAME = 1;
-        const ELEMENT = 0;
-        const type = itype(eventName);
-        
-        switch(type) {
-        default:
-            if (!type.endsWith('element'))
-                throw Error(`unknown eventName: ${type}`);
-            
-            parseArgs(args[EVENT_NAME], args[ELEMENT], listener, callback);
-            break;
-        
-        case 'string':
-            isFunc = itype.function(element);
-            
-            if (isFunc) {
-                listener = element;
-                element = null;
-            }
-            
-            if (!element)
-                element = window;
-            
-            callback(element, [
-                eventName,
-                listener,
-                getEventOptions(eventName),
-            ]);
-            break;
-        
-        case 'array':
-            
-            for (const name of eventName) {
-                parseArgs(name, element, listener, callback);
-            }
-            
-            break;
-        
-        case 'object':
-            
-            for (const name of Object.keys(eventName)) {
-                const eventListener = eventName[name];
-                
-                parseArgs(name, element, eventListener, callback);
-            }
-            
-            break;
-        }
-    }
-    
-    /**
-     * safe add event listener
-     *
-     * @param type
-     * @param element - document by default
-     * @param listener
-     */
-    this.add = (type, element, listener) => {
-        checkType(type);
-        
-        parseArgs(type, element, listener, (element, args) => {
-            const [name, fn, options] = args;
-            
-            element.addEventListener(name, fn, options);
-            EventStore.add(element, name, fn);
-        });
-        
-        return Events;
-    };
-    
-    /**
-     * safe add event listener
-     *
-     * @param type
-     * @param listener
-     * @param element - document by default
-     */
-    this.addOnce = (type, element, listener) => {
-        const once = (event) => {
-            Events.remove(type, element, once);
-            listener(event);
-        };
-        
-        if (!listener) {
-            listener = element;
-            element = null;
-        }
-        
-        this.add(type, element, once);
-        
-        return Events;
-    };
-    
-    /**
-     * safe remove event listener
-     *
-     * @param type
-     * @param listener
-     * @param element - document by default
-     */
-    this.remove = (type, element, listener) => {
-        checkType(type);
-        
-        parseArgs(type, element, listener, (element, args) => {
-            element.removeEventListener(...args);
-        });
-        
-        return Events;
-    };
-    
-    /**
-     * remove all added event listeners
-     */
-    this.removeAll = () => {
-        const events = EventStore.get();
-        
-        for (const [el, name, fn] of events)
-            el.removeEventListener(name, fn);
-        
-        EventStore.clear();
-    };
-    
-    /**
-     * safe add event keydown listener
-     *
-     * @param args
-     */
-    this.addKey = function(...args) {
-        return Events.add('keydown', ...args);
-    };
-    
-    /**
-     * safe remove event click listener
-     *
-     * @param args
-     */
-    this.rmKey = function(...args) {
-        return Events.remove('keydown', ...args);
-    };
-    
-    /**
-     * safe add event click listener
-     */
-    this.addClick = function(...args) {
-        return Events.add('click', ...args);
-    };
-    
-    /**
-     * safe remove event click listener
-     */
-    this.rmClick = function(...args) {
-        return Events.remove('click', ...args);
-    };
-    
-    this.addContextMenu = function(...args) {
-        return Events.add('contextmenu', ...args);
-    };
-    
-    /**
-     * safe add load listener
-     */
-    this.addLoad = function(...args) {
-        return Events.add('load', ...args);
-    };
-    
-    function checkType(type) {
-        if (!type)
-            throw Error('type could not be empty!');
-    }
-}

client/dom/events/index.mjs

@@ -0,0 +1,203 @@
+import itype from 'itype';
+import EventStore from './event-store.js';
+
+/**
+ * safe add event listener
+ *
+ * @param type
+ * @param element - document by default
+ * @param listener
+ */
+export const add = (type, element, listener) => {
+    checkType(type);
+    
+    parseArgs(type, element, listener, (element, args) => {
+        const [name, fn, options] = args;
+        
+        element.addEventListener(name, fn, options);
+        EventStore.add(element, name, fn);
+    });
+    
+    return Events;
+};
+
+/**
+ * safe add event listener
+ *
+ * @param type
+ * @param listener
+ * @param element - document by default
+ */
+export const addOnce = (type, element, listener) => {
+    const once = (event) => {
+        Events.remove(type, element, once);
+        listener(event);
+    };
+    
+    if (!listener) {
+        listener = element;
+        element = null;
+    }
+    
+    add(type, element, once);
+    
+    return Events;
+};
+
+/**
+ * safe remove event listener
+ *
+ * @param type
+ * @param listener
+ * @param element - document by default
+ */
+export const remove = (type, element, listener) => {
+    checkType(type);
+    
+    parseArgs(type, element, listener, (element, args) => {
+        element.removeEventListener(...args);
+    });
+    
+    return Events;
+};
+
+/**
+ * remove all added event listeners
+ */
+export const removeAll = () => {
+    const events = EventStore.get();
+    
+    for (const [el, name, fn] of events)
+        el.removeEventListener(name, fn);
+    
+    EventStore.clear();
+};
+
+/**
+ * safe add event keydown listener
+ *
+ * @param args
+ */
+export const addKey = function(...args) {
+    return add('keydown', ...args);
+};
+
+/**
+ * safe remove event click listener
+ *
+ * @param args
+ */
+export const rmKey = function(...args) {
+    return Events.remove('keydown', ...args);
+};
+
+/**
+ * safe add event click listener
+ */
+export const addClick = function(...args) {
+    return Events.add('click', ...args);
+};
+
+/**
+ * safe remove event click listener
+ */
+export const rmClick = function(...args) {
+    return remove('click', ...args);
+};
+
+export const addContextMenu = function(...args) {
+    return add('contextmenu', ...args);
+};
+
+/**
+ * safe add load listener
+ */
+export const addLoad = function(...args) {
+    return add('load', ...args);
+};
+
+function checkType(type) {
+    if (!type)
+        throw Error('type could not be empty!');
+}
+
+const getEventOptions = (eventName) => {
+    if (eventName !== 'touchstart')
+        return false;
+    
+    return {
+        passive: true,
+    };
+};
+
+function parseArgs(eventName, element, listener, callback) {
+    let isFunc;
+    const args = [
+        eventName,
+        element,
+        listener,
+        callback,
+    ];
+    
+    const EVENT_NAME = 1;
+    const ELEMENT = 0;
+    const type = itype(eventName);
+    
+    switch(type) {
+    default:
+        if (!type.endsWith('element'))
+            throw Error(`unknown eventName: ${type}`);
+        
+        parseArgs(args[EVENT_NAME], args[ELEMENT], listener, callback);
+        break;
+    
+    case 'string':
+        isFunc = itype.function(element);
+        
+        if (isFunc) {
+            listener = element;
+            element = null;
+        }
+        
+        if (!element)
+            element = window;
+        
+        callback(element, [
+            eventName,
+            listener,
+            getEventOptions(eventName),
+        ]);
+        break;
+    
+    case 'array':
+        
+        for (const name of eventName) {
+            parseArgs(name, element, listener, callback);
+        }
+        
+        break;
+    
+    case 'object':
+        
+        for (const name of Object.keys(eventName)) {
+            const eventListener = eventName[name];
+            
+            parseArgs(name, element, eventListener, callback);
+        }
+        
+        break;
+    }
+}
+
+const Events = {
+    add,
+    addClick,
+    addContextMenu,
+    addKey,
+    addLoad,
+    addOnce,
+    remove,
+    removeAll,
+    rmClick,
+    rmKey,
+};

client/dom/images.mjs

@@ -1,10 +1,5 @@
 /* global DOM */
-
+import createElement from '@cloudcmd/create-element';
-'use strict';
-
-const createElement = require('@cloudcmd/create-element');
-
-const Images = module.exports;
 
 const LOADING = 'loading';
 const HIDDEN = 'hidden';
@@ -12,7 +7,8 @@ const ERROR = 'error';
 
 const getLoadingType = () => isSVG() ? '-svg' : '-gif';
 
-module.exports.get = getElement;
+export const get = getElement;
+
 /**
  * check SVG SMIL animation support
  */
@@ -40,7 +36,7 @@ function getElement() {
 }
 
 /* Функция создаёт картинку загрузки */
-module.exports.loading = () => {
+export const loading = () => {
     const element = getElement();
     const {classList} = element;
     const loadingImage = LOADING + getLoadingType();
@@ -52,7 +48,7 @@ module.exports.loading = () => {
 };
 
 /* Функция создаёт картинку ошибки загрузки */
-module.exports.error = () => {
+export const error = () => {
     const element = getElement();
     const {classList} = element;
     const loadingImage = LOADING + getLoadingType();
@@ -63,14 +59,21 @@ module.exports.error = () => {
     return element;
 };
 
-module.exports.show = show;
+show.load = show;
-module.exports.show.load = show;
+show.error = (text) => {
-module.exports.show.error = error;
+    const image = Images.error();
+    
+    DOM.show(image);
+    image.title = text;
+    
+    return image;
+};
+
 /**
 * Function shows loading spinner
 * position = {top: true};
 */
-function show(position, panel) {
+export function show(position, panel) {
     const image = Images.loading();
     const parent = image.parentElement;
     const refreshButton = DOM.getRefreshButton(panel);
@@ -96,19 +99,10 @@ function show(position, panel) {
     return image;
 }
 
-function error(text) {
-    const image = Images.error();
-    
-    DOM.show(image);
-    image.title = text;
-    
-    return image;
-}
-
 /**
 * hide load image
 */
-module.exports.hide = () => {
+export const hide = () => {
     const element = Images.get();
     
     DOM.hide(element);
@@ -116,7 +110,7 @@ module.exports.hide = () => {
     return Images;
 };
 
-module.exports.setProgress = (value, title) => {
+export const setProgress = (value, title) => {
     const DATA = 'data-progress';
     const element = Images.get();
     
@@ -131,7 +125,7 @@ module.exports.setProgress = (value, title) => {
     return Images;
 };
 
-module.exports.clearProgress = () => {
+export const clearProgress = () => {
     const DATA = 'data-progress';
     const element = Images.get();
     
@@ -143,3 +137,13 @@ module.exports.clearProgress = () => {
     
     return Images;
 };
+
+const Images = {
+    clearProgress,
+    setProgress,
+    show,
+    hide,
+    get,
+    error,
+    loading,
+};

client/dom/index.js

@@ -3,12 +3,12 @@
 /* global CloudCmd */
 const Util = require('../../common/util');
 
-const Images = require('./images');
+const Images = require('./images.mjs');
 const RESTful = require('./rest');
 const Storage = require('./storage');
 const renameCurrent = require('./operations/rename-current');
 
-const CurrentFile = require('./current-file');
+const CurrentFile = require('./current-file.mjs');
 const DOMTree = require('./dom-tree');
 
 const Cmd = module.exports;
@@ -32,8 +32,8 @@ DOM.CurrentInfo = CurrentInfo;
 module.exports = DOM;
 
 DOM.uploadDirectory = require('./directory');
-DOM.Buffer = require('./buffer');
+DOM.Buffer = require('./buffer.mjs');
-DOM.Events = require('./events');
+DOM.Events = require('#dom/events');
 
 const loadRemote = require('./load-remote');
 const selectByPattern = require('./select-by-pattern');
@@ -416,7 +416,7 @@ module.exports.shrinkSelection = () => {
  * setting history wrapper
  */
 module.exports.setHistory = (data, title, url) => {
-    const ret = window.history;
+    const ret = globalThis.history;
     const {prefix} = CloudCmd;
     
     url = prefix + url;
@@ -554,7 +554,7 @@ module.exports.getPanel = (options) => {
      * then always work with passive
      * panel
      */
-    if (window.innerWidth < CloudCmd.MIN_ONE_PANEL_WIDTH)
+    if (globalThis.innerWidth < CloudCmd.MIN_ONE_PANEL_WIDTH)
         panel = DOM.getByDataName('js-left');
     
     if (!panel)
@@ -729,17 +729,19 @@ module.exports.getPackerExt = (type) => {
     return '.tar.gz';
 };
 
-module.exports.goToDirectory = async () => {
+module.exports.goToDirectory = async (overrides = {}) => {
-    const msg = 'Go to directory:';
     const {Dialog} = DOM;
+    const {prompt = Dialog.prompt, changeDir = CloudCmd.changeDir} = overrides;
+    
+    const msg = 'Go to directory:';
     const {dirPath} = CurrentInfo;
     
-    const [cancel, path = dirPath] = await Dialog.prompt(msg, dirPath);
+    const [cancel, path = dirPath] = await prompt(msg, dirPath);
     
     if (cancel)
         return;
     
-    await CloudCmd.changeDir(path);
+    await changeDir(path);
 };
 
 module.exports.duplicatePanel = async () => {

client/dom/index.spec.js

@@ -3,30 +3,20 @@
 require('css-modules-require-hook/preset');
 
 const {test, stub} = require('supertape');
-const mockRequire = require('mock-require');
+const {getCSSVar, goToDirectory} = require('./index');
-const {getCSSVar} = require('./index');
-const {reRequire, stopAll} = mockRequire;
 
-global.CloudCmd = {};
+globalThis.CloudCmd = {};
 
 test('cloudcmd: client: dom: goToDirectory', async (t) => {
     const path = '';
-    const {CloudCmd} = global;
     const changeDir = stub();
     const prompt = stub().returns([null, path]);
     
-    CloudCmd.changeDir = changeDir;
+    await goToDirectory({
-    
-    mockRequire('./dialog', {
         prompt,
+        changeDir,
     });
     
-    const {goToDirectory} = reRequire('.');
-    
-    await goToDirectory();
-    
-    stopAll();
-    
     t.calledWith(changeDir, [path]);
     t.end();
 });
@@ -35,14 +25,14 @@ test('cloudcmd: client: dom: getCSSVar', (t) => {
     const body = {};
     const getPropertyValue = stub().returns(0);
     
-    global.getComputedStyle = stub().returns({
+    globalThis.getComputedStyle = stub().returns({
         getPropertyValue,
     });
     const result = getCSSVar('hello', {
         body,
     });
     
-    delete global.getComputedStyle;
+    delete globalThis.getComputedStyle;
     
     t.notOk(result);
     t.end();
@@ -52,14 +42,14 @@ test('cloudcmd: client: dom: getCSSVar: 1', (t) => {
     const body = {};
     const getPropertyValue = stub().returns(1);
     
-    global.getComputedStyle = stub().returns({
+    globalThis.getComputedStyle = stub().returns({
         getPropertyValue,
     });
     const result = getCSSVar('hello', {
         body,
     });
     
-    delete global.getComputedStyle;
+    delete globalThis.getComputedStyle;
     
     t.ok(result);
     t.end();

client/dom/io/index.js

@@ -1,14 +1,14 @@
 'use strict';
 
-const {FS} = require('../../../common/cloudfunc');
+const {FS} = require('../../../common/cloudfunc.mjs');
-const sendRequest = require('./send-request');
+const _sendRequest = require('./send-request');
 
 const imgPosition = {
     top: true,
 };
 
 module.exports.delete = async (url, data) => {
-    return await sendRequest({
+    return await _sendRequest({
         method: 'DELETE',
         url: FS + url,
         data,
@@ -19,7 +19,7 @@ module.exports.delete = async (url, data) => {
 };
 
 module.exports.patch = async (url, data) => {
-    return await sendRequest({
+    return await _sendRequest({
         method: 'PATCH',
         url: FS + url,
         data,
@@ -28,7 +28,7 @@ module.exports.patch = async (url, data) => {
 };
 
 module.exports.write = async (url, data) => {
-    return await sendRequest({
+    return await _sendRequest({
         method: 'PUT',
         url: FS + url,
         data,
@@ -36,7 +36,11 @@ module.exports.write = async (url, data) => {
     });
 };
 
-module.exports.createDirectory = async (url) => {
+module.exports.createDirectory = async (url, overrides = {}) => {
+    const {
+        sendRequest = _sendRequest,
+    } = overrides;
+    
     return await sendRequest({
         method: 'PUT',
         url: `${FS}${url}?dir`,
@@ -47,7 +51,7 @@ module.exports.createDirectory = async (url) => {
 module.exports.read = async (url, dataType = 'text') => {
     const notLog = !url.includes('?');
     
-    return await sendRequest({
+    return await _sendRequest({
         method: 'GET',
         url: FS + url,
         notLog,
@@ -56,7 +60,7 @@ module.exports.read = async (url, dataType = 'text') => {
 };
 
 module.exports.copy = async (from, to, names) => {
-    return await sendRequest({
+    return await _sendRequest({
         method: 'PUT',
         url: '/copy',
         data: {
@@ -69,7 +73,7 @@ module.exports.copy = async (from, to, names) => {
 };
 
 module.exports.pack = async (data) => {
-    return await sendRequest({
+    return await _sendRequest({
         method: 'PUT',
         url: '/pack',
         data,
@@ -77,7 +81,7 @@ module.exports.pack = async (data) => {
 };
 
 module.exports.extract = async (data) => {
-    return await sendRequest({
+    return await _sendRequest({
         method: 'PUT',
         url: '/extract',
         data,
@@ -85,7 +89,7 @@ module.exports.extract = async (data) => {
 };
 
 module.exports.move = async (from, to, names) => {
-    return await sendRequest({
+    return await _sendRequest({
         method: 'PUT',
         url: '/move',
         data: {
@@ -98,7 +102,7 @@ module.exports.move = async (from, to, names) => {
 };
 
 module.exports.rename = async (from, to) => {
-    return await sendRequest({
+    return await _sendRequest({
         method: 'PUT',
         url: '/rename',
         data: {
@@ -111,7 +115,7 @@ module.exports.rename = async (from, to) => {
 
 module.exports.Config = {
     read: async () => {
-        return await sendRequest({
+        return await _sendRequest({
             method: 'GET',
             url: '/config',
             imgPosition,
@@ -120,7 +124,7 @@ module.exports.Config = {
     },
     
     write: async (data) => {
-        return await sendRequest({
+        return await _sendRequest({
             method: 'PATCH',
             url: '/config',
             data,
@@ -131,7 +135,7 @@ module.exports.Config = {
 
 module.exports.Markdown = {
     read: async (url) => {
-        return await sendRequest({
+        return await _sendRequest({
             method: 'GET',
             url: `/markdown${url}`,
             imgPosition,
@@ -140,7 +144,7 @@ module.exports.Markdown = {
     },
     
     render: async (data) => {
-        return await sendRequest({
+        return await _sendRequest({
             method: 'PUT',
             url: '/markdown',
             data,

client/dom/io/index.spec.js

@@ -1,18 +1,14 @@
 'use strict';
 
 const {test, stub} = require('supertape');
-
+const io = require('.');
-const mockRequire = require('mock-require');
-
-const {reRequire, stopAll} = mockRequire;
 
 test('client: dom: io', (t) => {
     const sendRequest = stub();
-    mockRequire('./send-request', sendRequest);
     
-    const io = reRequire('.');
+    io.createDirectory('/hello', {
-    
+        sendRequest,
-    io.createDirectory('/hello');
+    });
     
     const expected = {
         imgPosition: {
@@ -22,8 +18,6 @@ test('client: dom: io', (t) => {
         url: '/fs/hello?dir',
     };
     
-    stopAll();
-    
     t.calledWith(sendRequest, [expected]);
     t.end();
 });

client/dom/io/send-request.js

@@ -3,7 +3,7 @@
 /* global CloudCmd */
 const {promisify} = require('es6-promisify');
 
-const Images = require('../images');
+const Images = require('../images.mjs');
 const load = require('../load');
 
 module.exports = promisify((params, callback) => {

client/dom/load-remote.js

@@ -4,7 +4,7 @@
 const rendy = require('rendy');
 const itype = require('itype');
 const load = require('load.js');
-const tryToCatch = require('try-to-catch');
+const {tryToCatch} = require('try-to-catch');
 
 const {findObjByNameInArr} = require('../../common/util');
 

client/dom/load.js

@@ -4,7 +4,7 @@ const itype = require('itype');
 const jonny = require('jonny');
 const Emitify = require('emitify');
 const exec = require('execon');
-const Images = require('./images');
+const Images = require('./images.mjs');
 
 module.exports.getIdBySrc = getIdBySrc;
 /**

client/dom/operations/rename-current.js

@@ -3,21 +3,29 @@
 /* global CloudCmd */
 const capitalize = require('just-capitalize');
 
-const Dialog = require('../dialog');
+const _Dialog = require('../dialog');
 const Storage = require('../storage');
 const RESTful = require('../rest');
 
-const {
+const _currentFile = require('../current-file.mjs');
-    isCurrentFile,
-    getCurrentName,
-    getCurrentFile,
-    getCurrentByName,
-    getCurrentType,
-    getCurrentDirPath,
-    setCurrentName,
-} = require('../current-file');
 
-module.exports = async (current) => {
+module.exports = async (current, overrides = {}) => {
+    const {
+        refresh = CloudCmd.refresh,
+        Dialog = _Dialog,
+        currentFile = _currentFile,
+    } = overrides;
+    
+    const {
+        isCurrentFile,
+        getCurrentName,
+        getCurrentFile,
+        getCurrentByName,
+        getCurrentType,
+        getCurrentDirPath,
+        setCurrentName,
+    } = currentFile;
+    
     if (!isCurrentFile(current))
         current = getCurrentFile();
     
@@ -58,5 +66,5 @@ module.exports = async (current) => {
     setCurrentName(to, current);
     
     Storage.remove(dirPath);
-    CloudCmd.refresh();
+    refresh();
 };

client/dom/operations/rename-current.spec.js

@@ -2,23 +2,20 @@
 
 const {test, stub} = require('supertape');
 
-const mockRequire = require('mock-require');
+const renameCurrent = require('./rename-current');
-
-const {reRequire, stopAll} = mockRequire;
 
 test('cloudcmd: client: dom: renameCurrent: isCurrentFile', async (t) => {
     const current = {};
     const isCurrentFile = stub();
     
-    mockRequire('../dialog', stubDialog());
+    const currentFile = stubCurrentFile({
-    mockRequire('../current-file', stubCurrentFile({
         isCurrentFile,
-    }));
+    });
     
-    const renameCurrent = reRequire('./rename-current');
+    await renameCurrent(current, {
-    await renameCurrent(current);
+        Dialog: stubDialog(),
-    
+        currentFile,
-    stopAll();
+    });
     
     t.calledWith(isCurrentFile, [current], 'should call isCurrentFile');
     t.end();
@@ -27,11 +24,6 @@ test('cloudcmd: client: dom: renameCurrent: isCurrentFile', async (t) => {
 test('cloudcmd: client: dom: renameCurrent: file exist', async (t) => {
     const current = {};
     const name = 'hello';
-    const {CloudCmd} = global;
-    
-    global.CloudCmd = {
-        refresh: stub(),
-    };
     
     const prompt = stub().returns([null, name]);
     const confirm = stub().returns([true]);
@@ -39,25 +31,23 @@ test('cloudcmd: client: dom: renameCurrent: file exist', async (t) => {
     const getCurrentByName = stub().returns(current);
     const getCurrentType = stub().returns('directory');
     
-    mockRequire('../dialog', stubDialog({
+    const Dialog = stubDialog({
         confirm,
         prompt,
-    }));
+    });
     
-    mockRequire('../current-file', stubCurrentFile({
+    const currentFile = stubCurrentFile({
         getCurrentByName,
         getCurrentType,
-    }));
+    });
     
-    const renameCurrent = reRequire('./rename-current');
+    await renameCurrent(null, {
-    await renameCurrent();
+        Dialog,
+        currentFile,
+    });
     
     const expected = 'Directory "hello" already exists. Proceed?';
     
-    global.CloudCmd = CloudCmd;
-    
-    stopAll();
-    
     t.calledWith(confirm, [expected], 'should call confirm');
     t.end();
 });

client/dom/rest.js

@@ -1,10 +1,10 @@
 'use strict';
 
-const tryToCatch = require('try-to-catch');
+const {tryToCatch} = require('try-to-catch');
 
 const {encode} = require('../../common/entity');
 
-const Images = require('./images');
+const Images = require('./images.mjs');
 const IO = require('./io');
 const Dialog = require('./dialog');
 

client/dom/storage.spec.js

@@ -7,58 +7,58 @@ const storage = require('./storage');
 const {stringify} = JSON;
 
 test('cloudcmd: client: storage: set', async (t) => {
-    const {localStorage} = global;
+    const {localStorage} = globalThis;
     const setItem = stub();
     
-    global.localStorage = {
+    globalThis.localStorage = {
         setItem,
     };
     
     await storage.set('hello', 'world');
-    global.localStorage = localStorage;
+    globalThis.localStorage = localStorage;
     
     t.calledWith(setItem, ['hello', 'world'], 'should call setItem');
     t.end();
 });
 
 test('cloudcmd: client: storage: get', async (t) => {
-    const {localStorage} = global;
+    const {localStorage} = globalThis;
     const getItem = stub().returns('world');
     
-    global.localStorage = {
+    globalThis.localStorage = {
         getItem,
     };
     
     const result = await storage.get('hello');
     
-    global.localStorage = localStorage;
+    globalThis.localStorage = localStorage;
     
     t.equal(result, 'world');
     t.end();
 });
 
 test('cloudcmd: client: storage: getJson', async (t) => {
-    const {localStorage} = global;
+    const {localStorage} = globalThis;
     const expected = {
         hello: 'world',
     };
     
     const getItem = stub().returns(stringify(expected));
     
-    global.localStorage = {
+    globalThis.localStorage = {
         getItem,
     };
     
     const result = await storage.getJson('hello');
     
-    global.localStorage = localStorage;
+    globalThis.localStorage = localStorage;
     
     t.deepEqual(result, expected);
     t.end();
 });
 
 test('cloudcmd: client: storage: setJson', async (t) => {
-    const {localStorage} = global;
+    const {localStorage} = globalThis;
     const data = {
         hello: 'world',
     };
@@ -66,42 +66,42 @@ test('cloudcmd: client: storage: setJson', async (t) => {
     const expected = stringify(data);
     const setItem = stub();
     
-    global.localStorage = {
+    globalThis.localStorage = {
         setItem,
     };
     
     await storage.setJson('hello', data);
-    global.localStorage = localStorage;
+    globalThis.localStorage = localStorage;
     
     t.calledWith(setItem, ['hello', expected]);
     t.end();
 });
 
 test('cloudcmd: client: storage: remove', async (t) => {
-    const {localStorage} = global;
+    const {localStorage} = globalThis;
     const removeItem = stub();
     
-    global.localStorage = {
+    globalThis.localStorage = {
         removeItem,
     };
     
     await storage.remove('hello');
-    global.localStorage = localStorage;
+    globalThis.localStorage = localStorage;
     
     t.calledWith(removeItem, ['hello'], 'should call removeItem');
     t.end();
 });
 
 test('cloudcmd: client: storage: clear', async (t) => {
-    const {localStorage} = global;
+    const {localStorage} = globalThis;
     const clear = stub();
     
-    global.localStorage = {
+    globalThis.localStorage = {
         clear,
     };
     
     await storage.clear();
-    global.localStorage = localStorage;
+    globalThis.localStorage = localStorage;
     
     t.calledWithNoArgs(clear, 'should call clear');
     t.end();

client/dom/upload-files.js

@@ -5,10 +5,10 @@ const {eachSeries} = require('execon');
 const wraptile = require('wraptile');
 
 const load = require('./load');
-const Images = require('./images');
+const Images = require('./images.mjs');
 const {alert} = require('./dialog');
 
-const {FS} = require('../../common/cloudfunc');
+const {FS} = require('../../common/cloudfunc.mjs');
 
 const {getCurrentDirPath: getPathWhenRootEmpty} = require('.');
 const loadFile = wraptile(_loadFile);

client/get-json-from-file-table.js

@@ -1,47 +0,0 @@
-'use strict';
-
-/* global DOM */
-const Info = DOM.CurrentInfo;
-
-/**
- * Функция генерирует JSON из html-таблицы файлов и
- * используеться при первом заходе в корень
- */
-module.exports = () => {
-    const path = DOM.getCurrentDirPath();
-    const infoFiles = Info.files || [];
-    
-    const notParent = (current) => {
-        const name = DOM.getCurrentName(current);
-        return name !== '..';
-    };
-    
-    const parse = (current) => {
-        const name = DOM.getCurrentName(current);
-        const size = DOM.getCurrentSize(current);
-        const owner = DOM.getCurrentOwner(current);
-        const mode = DOM.getCurrentMode(current);
-        const date = DOM.getCurrentDate(current);
-        const type = DOM.getCurrentType(current);
-        
-        return {
-            name,
-            size,
-            mode,
-            owner,
-            date,
-            type,
-        };
-    };
-    
-    const files = infoFiles
-        .filter(notParent)
-        .map(parse);
-    
-    const fileTable = {
-        path,
-        files,
-    };
-    
-    return fileTable;
-};

client/get-json-from-file-table.mjs

@@ -0,0 +1,44 @@
+/* global DOM */
+/**
+ * Функция генерирует JSON из html-таблицы файлов и
+ * используеться при первом заходе в корень
+ */
+export const getJsonFromFileTable = () => {
+    const Info = DOM.CurrentInfo;
+    const path = DOM.getCurrentDirPath();
+    const infoFiles = Info.files || [];
+    
+    const files = infoFiles
+        .filter(notParent)
+        .map(parse);
+    
+    const fileTable = {
+        path,
+        files,
+    };
+    
+    return fileTable;
+};
+
+const notParent = (current) => {
+    const name = DOM.getCurrentName(current);
+    return name !== '..';
+};
+
+const parse = (current) => {
+    const name = DOM.getCurrentName(current);
+    const size = DOM.getCurrentSize(current);
+    const owner = DOM.getCurrentOwner(current);
+    const mode = DOM.getCurrentMode(current);
+    const date = DOM.getCurrentDate(current);
+    const type = DOM.getCurrentType(current);
+    
+    return {
+        name,
+        size,
+        mode,
+        owner,
+        date,
+        type,
+    };
+};

client/key/index.mjs

@@ -1,22 +1,17 @@
-'use strict';
-
 /* global CloudCmd, DOM */
-const clipboard = require('@cloudcmd/clipboard');
+import clipboard from '@cloudcmd/clipboard';
-const fullstore = require('fullstore');
+import {fullstore} from 'fullstore';
+import * as Events from '#dom/events';
+import * as Buffer from '../dom/buffer.mjs';
+import KEY from './key.js';
+import _vim from './vim/index.js';
+import setCurrentByChar from './set-current-by-char.js';
+import {createBinder} from './binder.js';
 
-const Buffer = require('../dom/buffer');
-const Events = require('../dom/events');
-const KEY = require('./key');
-
-const vim = require('./vim');
-const setCurrentByChar = require('./set-current-by-char');
-const {createBinder} = require('./binder');
-
-const Info = DOM.CurrentInfo;
 const Chars = fullstore();
 
-const toggleVim = (keyCode) => {
+const toggleVim = (keyCode, overrides = {}) => {
-    const {_config, config} = CloudCmd;
+    const {_config, config} = overrides;
     
     if (keyCode === KEY.ESC)
         _config('vim', !config('vim'));
@@ -29,13 +24,16 @@ Chars([]);
 const {assign} = Object;
 const binder = createBinder();
 
-module.exports = assign(binder, KEY);
+const bind = () => {
-module.exports.bind = () => {
     Events.addKey(listener, true);
     binder.setBind();
 };
 
-module.exports._listener = listener;
+export const Key = assign(binder, KEY, {
+    bind,
+});
+
+export const _listener = listener;
 
 function getChar(event) {
     /*
@@ -55,7 +53,14 @@ function getChar(event) {
     return [symbol, char];
 }
 
-async function listener(event) {
+async function listener(event, overrides = {}) {
+    const {
+        config = CloudCmd.config,
+        _config = CloudCmd._config,
+        switchKey = _switchKey,
+        vim = _vim,
+    } = overrides;
+    
     const {keyCode} = event;
     
     // strange chrome bug calles listener twice
@@ -74,8 +79,12 @@ async function listener(event) {
     if (!binder.isBind())
         return;
     
-    toggleVim(keyCode);
+    toggleVim(keyCode, {
-    const isVim = CloudCmd.config('vim');
+        config,
+        _config,
+    });
+    
+    const isVim = config('vim');
     
     if (!isVim && !isNumpad && !alt && !ctrl && !meta && (isBetween || symbol))
         return setCurrentByChar(char, Chars);
@@ -112,7 +121,8 @@ function fromCharCode(keyIdentifier) {
     return String.fromCharCode(hex);
 }
 
-async function switchKey(event) {
+async function _switchKey(event) {
+    const Info = DOM.CurrentInfo;
     let i;
     let isSelected;
     let prev;

client/key/index.spec.js

@@ -3,27 +3,23 @@
 require('css-modules-require-hook/preset');
 
 const autoGlobals = require('auto-globals');
-const mockRequire = require('mock-require');
 const supertape = require('supertape');
 
 const {ESC} = require('./key');
+
+const {Key, _listener} = require('./index.mjs');
+
 const {getDOM, getCloudCmd} = require('./vim/globals.fixture');
 const test = autoGlobals(supertape);
-const {reRequire, stopAll} = mockRequire;
 const {stub} = supertape;
 
-global.DOM = getDOM();
+globalThis.DOM = getDOM();
-global.CloudCmd = getCloudCmd();
+globalThis.CloudCmd = getCloudCmd();
 
 test('cloudcmd: client: key: enable vim', async (t) => {
     const vim = stub();
-    const {CloudCmd} = global;
+    const config = stub().returns(true);
-    const {config} = CloudCmd;
+    const _config = stub();
-    
-    CloudCmd.config = stub().returns(true);
-    CloudCmd._config = stub();
-    mockRequire('./vim', vim);
-    const {_listener, setBind} = reRequire('.');
     
     const event = {
         keyCode: ESC,
@@ -31,11 +27,14 @@ test('cloudcmd: client: key: enable vim', async (t) => {
         altKey: false,
     };
     
-    setBind();
+    Key.setBind();
-    await _listener(event);
     
-    CloudCmd.config = config;
+    await _listener(event, {
-    stopAll();
+        vim,
+        config,
+        _config,
+        switchKey: stub(),
+    });
     
     t.calledWith(vim, ['Escape', event]);
     t.end();
@@ -43,25 +42,20 @@ test('cloudcmd: client: key: enable vim', async (t) => {
 
 test('cloudcmd: client: key: disable vim', async (t) => {
     const _config = stub();
+    const config = stub();
     const event = {
         keyCode: ESC,
         key: 'Escape',
         altKey: false,
     };
     
-    const {CloudCmd} = global;
+    Key.setBind();
-    const {config} = CloudCmd;
+    await _listener(event, {
+        config,
+        _config,
+        switchKey: stub(),
+    });
     
-    global.CloudCmd.config = _config;
+    t.calledWith(_config, ['vim', true]);
-    global.CloudCmd._config = _config;
-    
-    const {_listener, setBind} = reRequire('.');
-    
-    setBind();
-    await _listener(event);
-    
-    CloudCmd.config = config;
-    
-    t.calledWith(_config, ['vim']);
     t.end();
 });

client/key/set-current-by-char.js

@@ -3,9 +3,9 @@
 'use strict';
 
 const {escapeRegExp} = require('../../common/util');
-const Info = DOM.CurrentInfo;
 
 module.exports = function setCurrentByChar(char, charStore) {
+    const Info = DOM.CurrentInfo;
     let firstByName;
     let skipCount = 0;
     let setted = false;

client/key/vim/find.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const fullstore = require('fullstore');
+const {fullstore} = require('fullstore');
 const limier = require('limier');
 
 const searchStore = fullstore([]);

client/key/vim/find.spec.js

@@ -5,7 +5,7 @@ const dir = './';
 
 const {getDOM} = require('./globals.fixture');
 
-global.DOM = getDOM();
+globalThis.DOM = getDOM();
 
 const {_next, _previous} = require(`${dir}find`);
 

client/key/vim/index.js

@@ -9,32 +9,43 @@ const {
     selectFileNotParent,
 } = require('./set-current');
 
-const {Dialog} = DOM;
+module.exports = (key, event, overrides = {}) => {
-
+    const defaults = {
-const DEPS = {
+        ...globalThis.DOM,
-    ...DOM,
+        ...globalThis.CloudCmd,
-    ...CloudCmd,
+    };
-};
+    
-
+    const deps = {
-module.exports = async (key, event, deps = DEPS) => {
+        ...defaults,
+        ...overrides,
+    };
+    
     const operations = getOperations(event, deps);
-    await vim(key, operations);
+    
+    vim(key, operations, deps);
 };
 
 const getOperations = (event, deps) => {
     const {
-        Info = DOM.CurrentInfo,
+        Info = globalThis.DOM.CurrentInfo,
+        CloudCmd = globalThis.CloudCmd,
         Operation,
         unselectFiles,
         setCurrentFile,
         setCurrentByName,
         getCurrentName,
+        prompt = globalThis.DOM.Dialog.prompt,
+        preventDefault = event?.preventDefault?.bind(event),
         
         toggleSelectedFile,
         Buffer = {},
+        createFindNext = _createFindNext,
     } = deps;
     
     return {
+        findNext: createFindNext({
+            setCurrentByName,
+        }),
         escape: unselectFiles,
         
         remove: () => {
@@ -100,8 +111,8 @@ const getOperations = (event, deps) => {
         },
         
         find: async () => {
-            event.preventDefault();
+            preventDefault();
-            const [, value] = await Dialog.prompt('Find', '');
+            const [, value] = await prompt('Find', '');
             
             if (!value)
                 return;
@@ -112,11 +123,6 @@ const getOperations = (event, deps) => {
             setCurrentByName(result);
         },
         
-        findNext: () => {
-            const name = finder.findNext();
-            setCurrentByName(name);
-        },
-        
         findPrevious: () => {
             const name = finder.findPrevious();
             setCurrentByName(name);
@@ -125,3 +131,10 @@ const getOperations = (event, deps) => {
 };
 
 module.exports.selectFile = selectFileNotParent;
+
+const _createFindNext = (overrides = {}) => () => {
+    const {setCurrentByName} = overrides;
+    const name = finder.findNext();
+    
+    setCurrentByName(name);
+};

client/key/vim/index.spec.js

@@ -10,13 +10,13 @@ const pathVim = join(dir, 'vim');
 
 const {getDOM, getCloudCmd} = require('./globals.fixture');
 
-global.DOM = getDOM();
+globalThis.DOM = getDOM();
-global.CloudCmd = getCloudCmd();
+globalThis.CloudCmd = getCloudCmd();
 
-const vim = require(pathVim);
+const vim = require('./index.js');
 
 const {assign} = Object;
-const {DOM} = global;
+const {DOM} = globalThis;
 const {Buffer} = DOM;
 const pathFind = join(dir, 'vim', 'find');
 const {reRequire, stopAll} = mockRequire;
@@ -520,15 +520,26 @@ test('cloudcmd: client: key: Enter', async (t) => {
 test('cloudcmd: client: key: /', (t) => {
     const preventDefault = stub();
     const element = {};
+    const Info = {
+        element,
+        files: [],
+    };
     
-    DOM.CurrentInfo.element = element;
+    const getCurrentName = stub().returns('');
-    DOM.getCurrentName = () => '';
     
-    vim('/', {
+    const event = {
         preventDefault,
+    };
+    
+    const prompt = stub().returns([]);
+    
+    vim('/', event, {
+        getCurrentName,
+        Info,
+        prompt,
     });
     
-    t.calledWithNoArgs(preventDefault, 'should call preventDefault');
+    t.calledWithNoArgs(preventDefault);
     t.end();
 });
 
@@ -559,17 +570,13 @@ test('cloudcmd: client: find', (t) => {
 
 test('cloudcmd: client: key: n', (t) => {
     const findNext = stub();
+    const createFindNext = stub().returns(findNext);
     
-    mockRequire(pathFind, {
-        findNext,
-    });
-    
-    const vim = reRequire(pathVim);
     const event = {};
     
-    vim('n', event);
+    vim('n', event, {
-    
+        createFindNext,
-    stopAll();
+    });
     
     t.calledWithNoArgs(findNext, 'should call findNext');
     t.end();
@@ -595,7 +602,7 @@ test('cloudcmd: client: key: N', (t) => {
 
 test('cloudcmd: client: key: make directory', async (t) => {
     const vim = reRequire(pathVim);
-    const {DOM} = global;
+    const {DOM} = globalThis;
     
     assign(DOM, {
         promptNewDir: stub(),
@@ -615,7 +622,7 @@ test('cloudcmd: client: key: make directory', async (t) => {
 
 test('cloudcmd: client: key: make file', (t) => {
     const vim = reRequire(pathVim);
-    const {DOM} = global;
+    const {DOM} = globalThis;
     
     assign(DOM, {
         promptNewFile: stub(),
@@ -634,28 +641,30 @@ test('cloudcmd: client: key: make file', (t) => {
 });
 
 test('cloudcmd: client: vim: terminal', (t) => {
-    const {CloudCmd} = global;
+    const CloudCmd = {
-    
-    assign(CloudCmd, {
         Terminal: {
             show: stub(),
         },
-    });
+    };
     
     const event = {};
     
-    vim('t', event);
+    vim('t', event, {
-    vim('t', event);
+        CloudCmd,
+    });
+    vim('t', event, {
+        CloudCmd,
+    });
     
     t.calledWithNoArgs(CloudCmd.Terminal.show);
     t.end();
 });
 
 test('cloudcmd: client: vim: edit', async (t) => {
-    global.DOM = getDOM();
+    globalThis.DOM = getDOM();
-    global.CloudCmd = getCloudCmd();
+    globalThis.CloudCmd = getCloudCmd();
     
-    const {CloudCmd} = global;
+    const {CloudCmd} = globalThis;
     
     assign(CloudCmd, {
         EditFileVim: {

client/key/vim/vim.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const fullstore = require('fullstore');
+const {fullstore} = require('fullstore');
 const store = fullstore('');
 const visual = fullstore(false);
 

client/listeners/index.js

@@ -5,12 +5,13 @@
 const exec = require('execon');
 const itype = require('itype');
 const currify = require('currify');
-const tryToCatch = require('try-to-catch');
+const {tryToCatch} = require('try-to-catch');
 const clipboard = require('@cloudcmd/clipboard');
 
 const getRange = require('./get-range');
 const uploadFiles = require('../dom/upload-files');
-const {FS} = require('../../common/cloudfunc');
+const {FS} = require('../../common/cloudfunc.mjs');
+const Events = require('#dom/events');
 
 const getIndex = currify(require('./get-index'));
 
@@ -29,10 +30,8 @@ module.exports.init = async () => {
     ]);
 };
 
-CloudCmd.Listeners = module.exports;
-
 const unselect = (event) => {
-    const isMac = /Mac/.test(window.navigator.platform);
+    const isMac = /Mac/.test(globalThis.navigator.platform);
     const {
         shiftKey,
         metaKey,
@@ -50,9 +49,6 @@ const execAll = currify((funcs, event) => {
         fn(event);
 });
 
-const Info = DOM.CurrentInfo;
-const {Events} = DOM;
-
 const EventsFiles = {
     mousedown: exec.with(execIfNotUL, setCurrentFileByEvent),
     click: execAll([onClick, exec.with(execIfNotMobile, unselect)]),
@@ -112,8 +108,6 @@ module.exports.initKeysPanel = () => {
         return;
     
     Events.addClick(keysElement, (event) => {
-        event.stopPropagation();
-        
         const {target} = event;
         const {id} = target;
         
@@ -132,7 +126,10 @@ module.exports.initKeysPanel = () => {
             'f6': operation('move'),
             'f7': DOM.promptNewDir,
             'f8': operation('delete'),
-            'f9': CloudCmd.Menu.show,
+            'f9': () => {
+                event.stopPropagation();
+                CloudCmd.Menu.show();
+            },
             'f10': CloudCmd.Config.show,
             '~': CloudCmd.Konsole.show,
             'shift~': CloudCmd.Terminal.show,
@@ -166,6 +163,7 @@ function getPathListener(panel) {
 }
 
 function isNoCurrent(panel) {
+    const Info = DOM.CurrentInfo;
     const infoPanel = Info.panel;
     
     if (!infoPanel)
@@ -190,6 +188,7 @@ function decodePath(path) {
 }
 
 async function onPathElementClick(panel, event) {
+    const Info = DOM.CurrentInfo;
     event.preventDefault();
     
     const element = event.target;
@@ -245,7 +244,7 @@ function onClick(event) {
 }
 
 function toggleSelect(key, files) {
-    const isMac = /Mac/.test(window.navigator.platform);
+    const isMac = /Mac/.test(globalThis.navigator.platform);
     
     if (!key)
         throw Error('key should not be undefined!');
@@ -260,6 +259,7 @@ function toggleSelect(key, files) {
 }
 
 function changePanel(element) {
+    const Info = DOM.CurrentInfo;
     const {panel} = Info;
     const files = DOM.getByDataName('js-files', panel);
     const ul = getULElement(element);
@@ -301,6 +301,7 @@ async function onTouch(event) {
   * in Chrome (HTML5)
   */
 function onDragStart(event) {
+    const Info = DOM.CurrentInfo;
     const {prefixURL} = CloudCmd;
     const element = getLIElement(event.target);
     const {isDir} = Info;
@@ -337,6 +338,7 @@ function getULElement(element) {
 }
 
 function setCurrentFileByEvent(event) {
+    const Info = DOM.CurrentInfo;
     const BUTTON_LEFT = 0;
     
     const key = {
@@ -450,7 +452,7 @@ function dragndrop() {
 }
 
 function unload() {
-    DOM.Events.add(['unload', 'beforeunload'], (event) => {
+    Events.add(['unload', 'beforeunload'], (event) => {
         const {Key} = CloudCmd;
         const isBind = Key?.isBind();
         
@@ -479,7 +481,8 @@ function pop() {
 
 function resize() {
     Events.add('resize', () => {
-        const is = window.innerWidth < CloudCmd.MIN_ONE_PANEL_WIDTH;
+        const Info = DOM.CurrentInfo;
+        const is = globalThis.innerWidth < CloudCmd.MIN_ONE_PANEL_WIDTH;
         
         if (!is)
             return;

client/load-module.mjs

@@ -1,18 +1,16 @@
-'use strict';
-
 /* global CloudCmd */
-const exec = require('execon');
+import exec from 'execon';
-const tryToCatch = require('try-to-catch');
+import {tryToCatch} from 'try-to-catch';
-const loadJS = require('load.js').js;
+import {js as loadJS} from 'load.js';
+import pascalCase from 'just-pascal-case';
 
-const pascalCase = require('just-pascal-case');
 const noJS = (a) => a.replace(/.js$/, '');
 
 /**
  * function load modules
  * @params = {name, path, func, dobefore, arg}
  */
-module.exports = function loadModule(params) {
+export const loadModule = (params) => {
     if (!params)
         return;
     
@@ -51,7 +49,7 @@ module.exports = function loadModule(params) {
         const [e, a] = await tryToCatch(m);
         
         if (e)
-            return console.error(e);
+            return;
         
         return await a.show(...args);
     };

client/modules/cloud.js

@@ -9,7 +9,7 @@ const load = require('load.js');
 const {ajax} = require('../dom/load');
 
 const Files = require('../dom/files');
-const Images = require('../dom/images');
+const Images = require('../dom/images.mjs');
 const {log} = CloudCmd;
 
 const upload = currify(_upload);

client/modules/config/index.js

@@ -8,16 +8,16 @@ const currify = require('currify');
 const wraptile = require('wraptile');
 const squad = require('squad');
 const {promisify} = require('es6-promisify');
-const tryToCatch = require('try-to-catch');
+const {tryToCatch} = require('try-to-catch');
 const load = require('load.js');
 const createElement = require('@cloudcmd/create-element');
 
 const input = require('./input');
-const Images = require('../../dom/images');
+const Images = require('../../dom/images.mjs');
-const Events = require('../../dom/events');
+const Events = require('#dom/events');
 const Files = require('../../dom/files');
 
-const {getTitle} = require('../../../common/cloudfunc');
+const {getTitle} = require('../../../common/cloudfunc.mjs');
 const {Dialog, setTitle} = DOM;
 
 const Name = 'Config';

client/modules/contact.js

@@ -6,7 +6,7 @@
 CloudCmd.Contact = exports;
 
 const olark = require('@cloudcmd/olark');
-const Images = require('../dom/images');
+const Images = require('../dom/images.mjs');
 
 const {Events} = DOM;
 const {Key} = CloudCmd;

client/modules/edit-file-vim.js

@@ -3,7 +3,7 @@
 /* global CloudCmd */
 CloudCmd.EditFileVim = exports;
 
-const Events = require('../dom/events');
+const Events = require('#dom/events');
 
 const {Key} = CloudCmd;
 

client/modules/edit-file.js

@@ -4,7 +4,7 @@
 CloudCmd.EditFile = exports;
 
 const Format = require('format-io');
-const fullstore = require('fullstore');
+const {fullstore} = require('fullstore');
 const exec = require('execon');
 const supermenu = require('supermenu');
 

client/modules/edit-names-vim.js

@@ -3,7 +3,7 @@
 /* global CloudCmd */
 CloudCmd.EditNamesVim = exports;
 
-const Events = require('../dom/events');
+const Events = require('#dom/events');
 const {Key} = CloudCmd;
 
 const ConfigView = {

client/modules/edit-names.js

@@ -1,21 +1,17 @@
 'use strict';
 
+const {tryToCatch} = require('try-to-catch');
+
 /* global CloudCmd, DOM */
 CloudCmd.EditNames = exports;
 
-const currify = require('currify');
 const exec = require('execon');
 const supermenu = require('supermenu');
-const multiRename = require('multi-rename');
+const {multiRename} = require('multi-rename');
-
-const reject = Promise.reject.bind(Promise);
 
 const Info = DOM.CurrentInfo;
 const {Dialog} = DOM;
 
-const refresh = currify(_refresh);
-const rename = currify(_rename);
-
 let Menu;
 
 const ConfigView = {
@@ -93,7 +89,7 @@ function setListeners() {
     DOM.Events.addOnce('contextmenu', element, setMenu);
 }
 
-function applyNames() {
+async function applyNames() {
     const dir = Info.dirPath;
     const from = getActiveNames();
     const nameIndex = from.indexOf(Info.name);
@@ -105,18 +101,18 @@ function applyNames() {
     
     const root = CloudCmd.config('root');
     
-    Promise
+    const response = rename(dir, from, to, root);
-        .resolve(root)
+    const [error] = await tryToCatch(refresh, to, nameIndex, response);
-        .then(rename(dir, from, to))
+    
-        .then(refresh(to, nameIndex))
+    if (error)
-        .catch(alert);
+        alert(error);
 }
 
-function _refresh(to, nameIndex, res) {
+function refresh(to, nameIndex, res) {
-    if (res.status === 404)
+    if (res.status === 404) {
-        return res
+        const error = res.text();
-            .text()
+        throw error;
-            .then(reject);
+    }
     
     const currentName = to[nameIndex];
     
@@ -132,7 +128,7 @@ function getDir(root, dir) {
     return root + dir;
 }
 
-function _rename(path, from, to, root) {
+function rename(path, from, to, root) {
     const dir = getDir(root, path);
     const {prefix} = CloudCmd;
     
@@ -172,8 +168,8 @@ function setMenu(event) {
     };
     
     const menuData = {
-        'Save           Ctrl+S': () => {
+        'Save           Ctrl+S': async () => {
-            applyNames();
+            await applyNames();
             hide();
         },
         'Go To Line     Ctrl+G': () => {
@@ -214,6 +210,7 @@ async function isChanged() {
     if (!editor.isChanged())
         return;
     
-    const [, names] = await Dialog.confirm(msg);
+    const [cancel] = await Dialog.confirm(msg);
-    names && applyNames();
+    
+    !cancel && await applyNames();
 }

client/modules/edit.js

@@ -5,10 +5,10 @@
 const montag = require('montag');
 
 const {promisify} = require('es6-promisify');
-const tryToCatch = require('try-to-catch');
+const {tryToCatch} = require('try-to-catch');
 const createElement = require('@cloudcmd/create-element');
 const load = require('load.js');
-const {MAX_FILE_SIZE: maxSize} = require('../../common/cloudfunc');
+const {MAX_FILE_SIZE: maxSize} = require('../../common/cloudfunc.mjs');
 
 const {time, timeEnd} = require('../../common/util');
 const getEditor = () => editor;

client/modules/help.js

@@ -3,7 +3,7 @@
 /* global CloudCmd */
 CloudCmd.Help = exports;
 
-const Images = require('../dom/images');
+const Images = require('../dom/images.mjs');
 
 module.exports.init = () => {
     Images.show.load('top');

client/modules/konsole.js

@@ -8,11 +8,11 @@ CloudCmd.Konsole = exports;
 
 const exec = require('execon');
 const currify = require('currify');
-const tryToCatch = require('try-to-catch');
+const {tryToCatch} = require('try-to-catch');
 const loadJS = require('load.js').js;
 const createElement = require('@cloudcmd/create-element');
 
-const Images = require('../dom/images');
+const Images = require('../dom/images.mjs');
 const {Dialog, CurrentInfo: Info} = DOM;
 
 const rmLastSlash = (a) => a.replace(/\/$/, '') || '/';

client/modules/markdown.js

@@ -5,7 +5,7 @@ CloudCmd.Markdown = exports;
 
 const createElement = require('@cloudcmd/create-element');
 
-const Images = require('../dom/images');
+const Images = require('../dom/images.mjs');
 const {Markdown} = require('../dom/rest');
 const {alert} = require('../dom/dialog');
 

client/modules/menu/cloudmenu.mjs

@@ -14,7 +14,7 @@ export const createCloudMenu = async (fm, options, menuData) => {
 
 async function loadMenu() {
     if (CloudCmd.config('menu') === 'aleman') {
-        const {host, protocol} = window.location;
+        const {host, protocol} = globalThis.location;
         const url = `${protocol}//${host}/node_modules/aleman/menu/menu.js`;
         const {createMenu} = await import(/* webpackIgnore: true */url);
         

client/modules/menu/index.js

@@ -6,7 +6,7 @@ const exec = require('execon');
 const wrap = require('wraptile');
 const createElement = require('@cloudcmd/create-element');
 
-const {FS} = require('../../../common/cloudfunc');
+const {FS} = require('../../../common/cloudfunc.mjs');
 const {getIdBySrc} = require('../../dom/load');
 const RESTful = require('../../dom/rest');
 
@@ -109,6 +109,7 @@ function getOptions({type}) {
     
     const options = {
         icon: true,
+        infiniteScroll: false,
         beforeClose: Key.setBind,
         beforeHide: Key.setBind,
         beforeShow: exec.with(beforeShow, func),

client/modules/operation/index.mjs

@@ -1,28 +1,20 @@
-/* global CloudCmd */
+import currify from 'currify';
-/* global Util */
+import wraptile from 'wraptile';
-/* global DOM */
+import {promisify} from 'es6-promisify';
-/* global fileop */
+import exec from 'execon';
+import load from 'load.js';
+import {tryToCatch} from 'try-to-catch';
+import {encode} from '../../../common/entity.js';
+import removeExtension from './remove-extension.js';
+import {setListeners} from './set-listeners.mjs';
+import getNextCurrentName from './get-next-current-name.js';
 
-'use strict';
+const {DOM, CloudCmd} = globalThis;
-
-const currify = require('currify');
-const wraptile = require('wraptile');
-const {promisify} = require('es6-promisify');
-const exec = require('execon');
-const load = require('load.js');
-const tryToCatch = require('try-to-catch');
-
-const {encode} = require('../../../common/entity');
-const removeExtension = require('./remove-extension');
-const setListeners = require('./set-listeners');
-const getNextCurrentName = require('./get-next-current-name');
 
 const removeQuery = (a) => a.replace(/\?.*/, '');
 
 const Name = 'Operation';
 
-CloudCmd[Name] = exports;
-
 const {config} = CloudCmd;
 const {Dialog, Images} = DOM;
 
@@ -53,7 +45,7 @@ const noFilesCheck = () => {
     return is;
 };
 
-module.exports.init = promisify((callback) => {
+export const init = promisify((callback) => {
     showLoad();
     
     exec.series([
@@ -92,7 +84,7 @@ const onConnect = currify((fn, operator) => {
 async function initOperations(prefix, socketPrefix, fn) {
     socketPrefix = `${socketPrefix}/fileop`;
     
-    const operator = await fileop({
+    const operator = await globalThis.fileop({
         prefix,
         socketPrefix,
     });
@@ -198,11 +190,11 @@ function getPacker(type) {
     return packTarFn;
 }
 
-module.exports.hide = () => {
+export const hide = () => {
     CloudCmd.View.hide();
 };
 
-module.exports.show = (operation, data) => {
+export const show = (operation, data) => {
     if (!Loaded)
         return;
     
@@ -505,8 +497,14 @@ async function prompt(msg, to, names) {
     return await Dialog.prompt(msg, to);
 }
 
+globalThis.CloudCmd[Name] = {
+    init,
+    hide,
+    show,
+};
+
 async function loadAll() {
-    const {prefix} = CloudCmd;
+    const {prefix} = globalThis.CloudCmd;
     const file = `${prefix}/fileop/fileop.js`;
     
     const [error] = await tryToCatch(load.js, file);

client/modules/operation/remove-extension.js

@@ -9,10 +9,10 @@ module.exports = (name) => {
 };
 
 function getExtension(name) {
-    if (/\.tar\.gz$/.test(name))
+    if (name.endsWith('.tar.gz'))
         return '.tar.gz';
     
-    if (/\.tar\.bz2$/.test(name))
+    if (name.endsWith('.tar.bz2'))
         return '.tar.bz2';
     
     return getExt(name);

client/modules/operation/set-listeners.mjs

@@ -1,14 +1,11 @@
-'use strict';
-
 /* global DOM */
-const forEachKey = require('for-each-key');
+import forEachKey from 'for-each-key';
-
+import wraptile from 'wraptile';
-const wraptile = require('wraptile');
+import format from './format.js';
-const format = require('./format');
 
 const {Dialog, Images} = DOM;
 
-module.exports = (options) => (emitter) => {
+export const setListeners = (options) => (emitter) => {
     const {
         operation,
         callback,
@@ -43,10 +40,13 @@ module.exports = (options) => (emitter) => {
         operation,
     }));
     
+    let noProgress = true;
+    
     const listeners = {
         progress: (value) => {
             done = value === 100;
             progress.setProgress(value);
+            noProgress = false;
         },
         
         end: () => {
@@ -54,7 +54,7 @@ module.exports = (options) => (emitter) => {
             forEachKey(removeListener, listeners);
             progress.remove();
             
-            if (lastError || done)
+            if (lastError || done || noProgress)
                 callback();
         },
         

client/modules/polyfill.js

@@ -1,10 +1,20 @@
 'use strict';
 
-/* global DOM */
 require('domtokenlist-shim');
 
-const scrollIntoViewIfNeeded = require('scroll-into-view-if-needed');
+const _scrollIntoViewIfNeeded = require('scroll-into-view-if-needed');
 
-DOM.scrollIntoViewIfNeeded = (el) => scrollIntoViewIfNeeded(el, {
+globalThis.DOM = globalThis.DOM || {};
-    block: 'nearest',
+
-});
+const scrollIntoViewIfNeeded = (el, overrides = {}) => {
+    const {
+        scroll = _scrollIntoViewIfNeeded,
+    } = overrides;
+    
+    return scroll(el, {
+        block: 'nearest',
+    });
+};
+
+globalThis.DOM.scrollIntoViewIfNeeded = scrollIntoViewIfNeeded;
+module.exports.scrollIntoViewIfNeeded = scrollIntoViewIfNeeded;

client/modules/polyfill.spec.js

@@ -1,24 +1,15 @@
 'use strict';
 
 const {test, stub} = require('supertape');
-
+const {scrollIntoViewIfNeeded} = require('./polyfill');
-const mockRequire = require('mock-require');
-
-const {stopAll} = mockRequire;
 
 test('cloudcmd: client: polyfill: scrollIntoViewIfNeaded', (t) => {
-    const {DOM} = global;
     const scroll = stub();
     const el = {};
     
-    global.DOM = {};
+    scrollIntoViewIfNeeded(el, {
-    
+        scroll,
-    mockRequire('scroll-into-view-if-needed', scroll);
+    });
-    mockRequire.reRequire('./polyfill');
-    
-    global.DOM.scrollIntoViewIfNeeded(el);
-    mockRequire.stop('scroll-into-view-if-neaded');
-    global.DOM = DOM;
     
     const args = [
         el, {
@@ -26,8 +17,6 @@ test('cloudcmd: client: polyfill: scrollIntoViewIfNeaded', (t) => {
         },
     ];
     
-    stopAll();
-    
     t.calledWith(scroll, args, 'should call scrollIntoViewIfNeaded');
     t.end();
 });

client/modules/terminal-run.js

@@ -2,15 +2,15 @@
 
 /* global CloudCmd, gritty */
 const {promisify} = require('es6-promisify');
-const tryToCatch = require('try-to-catch');
+const {tryToCatch} = require('try-to-catch');
-const fullstore = require('fullstore');
+const {fullstore} = require('fullstore');
 
 require('../../css/terminal.css');
 
 const exec = require('execon');
 const load = require('load.js');
 const DOM = require('../dom');
-const Images = require('../dom/images');
+const Images = require('../dom/images.mjs');
 
 const {Dialog} = DOM;
 const {Key, config} = CloudCmd;
@@ -33,7 +33,7 @@ const loadAll = async () => {
     const [e] = await tryToCatch(load.parallel, [js, css]);
     
     if (e) {
-        const src = e.target.src.replace(window.location.href, '');
+        const src = e.target.src.replace(globalThis.location.href, '');
         return Dialog.alert(`file ${src} could not be loaded`);
     }
     

client/modules/terminal.js

@@ -2,14 +2,14 @@
 
 /* global CloudCmd */
 /* global gritty */
-const tryToCatch = require('try-to-catch');
+const {tryToCatch} = require('try-to-catch');
 
 require('../../css/terminal.css');
 
 const exec = require('execon');
 const load = require('load.js');
 const DOM = require('../dom');
-const Images = require('../dom/images');
+const Images = require('../dom/images.mjs');
 
 const loadParallel = load.parallel;
 
@@ -32,7 +32,7 @@ const loadAll = async () => {
     const [e] = await tryToCatch(loadParallel, [js, css]);
     
     if (e) {
-        const src = e.target.src.replace(window.location.href, '');
+        const src = e.target.src.replace(globalThis.location.href, '');
         return Dialog.alert(`file ${src} could not be loaded`);
     }
     

client/modules/upload.js

@@ -6,7 +6,7 @@ CloudCmd.Upload = exports;
 
 const createElement = require('@cloudcmd/create-element');
 const Files = require('../dom/files');
-const Images = require('../dom/images');
+const Images = require('../dom/images.mjs');
 const uploadFiles = require('../dom/upload-files');
 
 module.exports.init = async () => {

client/modules/user-menu/index.js

@@ -5,14 +5,14 @@ require('../../../css/user-menu.css');
 
 const currify = require('currify');
 const wraptile = require('wraptile');
-const fullstore = require('fullstore');
+const {fullstore} = require('fullstore');
 const load = require('load.js');
 const createElement = require('@cloudcmd/create-element');
-const tryCatch = require('try-catch');
+const {tryCatch} = require('try-catch');
-const tryToCatch = require('try-to-catch');
+const {tryToCatch} = require('try-to-catch');
 const {codeFrameColumns} = require('@babel/code-frame');
 
-const Images = require('../../dom/images');
+const Images = require('../../dom/images.mjs');
 const Dialog = require('../../dom/dialog');
 const getUserMenu = require('./get-user-menu');
 const navigate = require('./navigate');

client/modules/user-menu/navigate.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const fullstore = require('fullstore');
+const {fullstore} = require('fullstore');
 
 const {
     J,

client/modules/view/get-type.js

@@ -5,7 +5,7 @@ const testRegExp = currify((name, reg) => reg.test(name));
 const getRegExp = (ext) => RegExp(`\\.${ext}$`, 'i');
 
 const isPDF = (a) => /\.pdf$/i.test(a);
-const isHTML = (a) => /\.html$/.test(a);
+const isHTML = (a) => a.endsWith('.html');
 const isMarkdown = (a) => /.\.md$/.test(a);
 
 module.exports = (name) => {

client/modules/view/index.js

@@ -2,19 +2,22 @@
 
 'use strict';
 
+const CloudCmd = globalThis.CloudCmd || {};
+const DOM = globalThis.DOM || {};
+
 require('../../../css/view.css');
 
 const rendy = require('rendy');
 const currify = require('currify');
 const wraptile = require('wraptile');
-const tryToCatch = require('try-to-catch');
+const {tryToCatch} = require('try-to-catch');
 const load = require('load.js');
 
-const modal = require('@cloudcmd/modal');
+const _modal = require('@cloudcmd/modal');
-const createElement = require('@cloudcmd/create-element');
+const _createElement = require('@cloudcmd/create-element');
 
 const {time} = require('../../../common/util');
-const {FS} = require('../../../common/cloudfunc');
+const {FS} = require('../../../common/cloudfunc.mjs');
 
 const {
     isImage,
@@ -23,8 +26,8 @@ const {
 } = require('./types');
 
 const Files = require('../../dom/files');
-const Events = require('../../dom/events');
+const Events = require('#dom/events');
-const Images = require('../../dom/images');
+const Images = require('../../dom/images.mjs');
 
 const {encode} = require('../../../common/entity');
 const isString = (a) => typeof a === 'string';
@@ -113,7 +116,7 @@ async function show(data, options = {}) {
     if (!options || options.bindKeys !== false)
         Events.addKey(listener);
     
-    El = createElement('div', {
+    El = _createElement('div', {
         className: 'view',
         notAppend: true,
     });
@@ -126,7 +129,7 @@ async function show(data, options = {}) {
         else
             El.append(data);
         
-        modal.open(El, initConfig(options));
+        _modal.open(El, initConfig(options));
         return;
     }
     
@@ -157,7 +160,11 @@ async function show(data, options = {}) {
 }
 
 module.exports._createIframe = createIframe;
-function createIframe(src) {
+function createIframe(src, overrides = {}) {
+    const {
+        createElement = _createElement,
+    } = overrides;
+    
     const element = createElement('iframe', {
         src,
         width: '100%',
@@ -172,7 +179,8 @@ function createIframe(src) {
 }
 
 module.exports._viewHtml = viewHtml;
-function viewHtml(src) {
+function viewHtml(src, overrides = {}) {
+    const {modal = _modal} = overrides;
     modal.open(createIframe(src), Config);
 }
 
@@ -184,7 +192,7 @@ function viewPDF(src) {
     if (CloudCmd.config('showFileName'))
         options.title = Info.name;
     
-    modal.open(element, options);
+    _modal.open(element, options);
 }
 
 async function viewMedia(path) {
@@ -205,7 +213,7 @@ async function viewMedia(path) {
         },
     };
     
-    modal.open(element, allConfig);
+    _modal.open(element, allConfig);
 }
 
 async function viewFile() {
@@ -221,7 +229,7 @@ async function viewFile() {
         options.title = Info.name;
     
     El.append(element);
-    modal.open(El, options);
+    _modal.open(El, options);
 }
 
 const copy = (a) => assign({}, a);
@@ -253,7 +261,7 @@ function initConfig(options) {
 }
 
 function hide() {
-    modal.close();
+    _modal.close();
 }
 
 function viewImage(path, prefixURL) {
@@ -286,7 +294,7 @@ function viewImage(path, prefixURL) {
         ...imageConfig,
     };
     
-    modal.open(titles, config);
+    _modal.open(titles, config);
 }
 
 async function getMediaElement(src) {
@@ -311,7 +319,7 @@ async function getMediaElement(src) {
         name,
     });
     
-    const element = createElement('div', {
+    const element = _createElement('div', {
         innerHTML,
     });
     

client/modules/view/index.spec.js

@@ -3,22 +3,20 @@
 require('css-modules-require-hook/preset');
 
 const autoGlobals = require('auto-globals');
-const stub = require('@cloudcmd/stub');
+const {stub} = require('@cloudcmd/stub');
-const mockRequire = require('mock-require');
+
 const test = autoGlobals(require('supertape'));
-const {reRequire, stopAll} = mockRequire;
+const {
+    _initConfig,
+    _viewHtml,
+    _Config,
+    _createIframe,
+} = require('.');
 
 test('cloudcmd: client: view: initConfig', (t) => {
     let config;
     let i = 0;
     
-    const {CloudCmd, DOM} = global;
-    
-    global.CloudCmd = {};
-    global.DOM = {};
-    
-    const {_initConfig} = reRequire('.');
-    
     const afterClose = () => ++i;
     const options = {
         afterClose,
@@ -30,54 +28,32 @@ test('cloudcmd: client: view: initConfig', (t) => {
     config = _initConfig(options);
     config.afterClose();
     
-    global.CloudCmd = CloudCmd;
-    global.DOM = DOM;
-    
     t.equal(i, 2, 'should not change default config');
     t.end();
 });
 
 test('cloudcmd: client: view: initConfig: no options', (t) => {
-    const {CloudCmd, DOM} = global;
-    
-    global.CloudCmd = {};
-    global.DOM = {};
-    
-    const {_initConfig} = reRequire('.');
     const config = _initConfig();
     
-    global.CloudCmd = CloudCmd;
-    global.DOM = DOM;
-    
     t.equal(typeof config, 'object');
     t.end();
 });
 
 test('cloudcmd: client: view: html', (t) => {
-    const {CloudCmd, DOM} = global;
-    
-    global.CloudCmd = {};
-    global.DOM = {};
     const open = stub();
-    
+    const modal = {
-    mockRequire('@cloudcmd/modal', {
         open,
-    });
+    };
-    
-    const {_viewHtml, _Config} = reRequire('.');
     
     const src = '/hello.html';
     
-    _viewHtml(src);
+    _viewHtml(src, {
-    
+        modal,
-    global.CloudCmd = CloudCmd;
+    });
-    global.DOM = DOM;
     
     const [first] = open.args;
     const [arg] = first;
     
-    stopAll();
-    
     t.deepEqual(first, [arg, _Config]);
     t.end();
 });
@@ -89,12 +65,11 @@ test('cloudcmd: client: view: createIframe', (t) => {
     };
     
     const createElement = stub().returns(el);
-    
-    mockRequire('@cloudcmd/create-element', createElement);
-    const {_createIframe} = reRequire('.');
-    
     const src = '/hello.html';
-    _createIframe(src);
+    
+    _createIframe(src, {
+        createElement,
+    });
     
     const expected = {
         src,
@@ -102,8 +77,6 @@ test('cloudcmd: client: view: createIframe', (t) => {
         width: '100%',
     };
     
-    stopAll();
-    
     t.calledWith(createElement, ['iframe', expected]);
     t.end();
 });
@@ -116,13 +89,10 @@ test('cloudcmd: client: view: createIframe: returns', (t) => {
     
     const createElement = stub().returns(el);
     
-    mockRequire('@cloudcmd/create-element', createElement);
-    const {_createIframe} = reRequire('.');
-    
     const src = '/hello.html';
-    const result = _createIframe(src);
+    const result = _createIframe(src, {
-    
+        createElement,
-    stopAll();
+    });
     
     t.equal(result, el);
     t.end();

client/modules/view/types.js

@@ -7,7 +7,7 @@ const testRegExp = currify((name, reg) => reg.test(name));
 const getRegExp = (ext) => RegExp(`\\.${ext}$`, 'i');
 
 const isPDF = (a) => /\.pdf$/i.test(a);
-const isHTML = (a) => /\.html$/.test(a);
+const isHTML = (a) => a.endsWith('.html');
 const isMarkdown = (a) => /.\.md$/.test(a);
 
 module.exports.getType = async (path) => {

client/modules/view/types.spec.js

@@ -22,12 +22,9 @@ test('cloudcmd: client: view: types: detectType', async (t) => {
         headers: [],
     });
     
-    const originalFetch = global.fetch;
+    globalThis.fetch = fetch;
-    
-    global.fetch = fetch;
     await _detectType('/hello');
     
-    global.fetch = originalFetch;
     const expected = ['/hello', {
         method: 'HEAD',
     }];
@@ -37,17 +34,13 @@ test('cloudcmd: client: view: types: detectType', async (t) => {
 });
 
 test('cloudcmd: client: view: types: detectType: found', async (t) => {
-    const originalFetch = global.fetch;
+    globalThis.fetch = stub().returns({
-    
-    global.fetch = stub().returns({
         headers: [
             ['content-type', 'image/png'],
         ],
     });
     const result = await _detectType('/hello');
     
-    global.fetch = originalFetch;
-    
     t.equal(result, '.png');
     t.end();
 });

client/sort.js

@@ -1,31 +0,0 @@
-'use strict';
-
-/* global CloudCmd */
-const DOM = require('./dom');
-
-const Info = DOM.CurrentInfo;
-const {sort, order} = CloudCmd;
-const position = DOM.getPanelPosition();
-let sortPrevious = sort[position];
-
-const {getPanel} = DOM;
-
-CloudCmd.sortPanel = (name, panel = getPanel()) => {
-    const position = panel.dataset.name.replace('js-', '');
-    
-    if (name !== sortPrevious)
-        order[position] = 'asc';
-    else if (order[position] === 'asc')
-        order[position] = 'desc';
-    else
-        order[position] = 'asc';
-    
-    sortPrevious = name;
-    sort[position] = name;
-    const noCurrent = position !== Info.panelPosition;
-    
-    CloudCmd.refresh({
-        panel,
-        noCurrent,
-    });
-};

client/sort.mjs

@@ -0,0 +1,36 @@
+/* global CloudCmd */
+import {fullstore} from 'fullstore';
+import DOM from './dom/index.js';
+
+const sortPrevious = fullstore();
+
+const {getPanel} = DOM;
+
+export const initSortPanel = () => {
+    const {sort} = CloudCmd;
+    const position = DOM.getPanelPosition();
+    
+    sortPrevious(sort[position]);
+};
+
+export const sortPanel = (name, panel = getPanel()) => {
+    const {sort, order} = CloudCmd;
+    const Info = DOM.CurrentInfo;
+    const position = panel.dataset.name.replace('js-', '');
+    
+    if (name !== sortPrevious())
+        order[position] = 'asc';
+    else if (order[position] === 'asc')
+        order[position] = 'desc';
+    else
+        order[position] = 'asc';
+    
+    sortPrevious(name);
+    sort[position] = name;
+    const noCurrent = position !== Info.panelPosition;
+    
+    CloudCmd.refresh({
+        panel,
+        noCurrent,
+    });
+};

client/sw/register.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const tryToCatch = require('try-to-catch');
+const {tryToCatch} = require('try-to-catch');
 
 module.exports.registerSW = registerSW;
 module.exports.unregisterSW = unregisterSW;

client/sw/register.spec.js

@@ -3,14 +3,18 @@
 const autoGlobals = require('auto-globals');
 const tape = require('supertape');
 
-const stub = require('@cloudcmd/stub');
+const {stub} = require('@cloudcmd/stub');
+
+const {tryCatch} = require('try-catch');
+const {
+    listenSW,
+    registerSW,
+    unregisterSW,
+} = require('./register');
 
-const tryCatch = require('try-catch');
-const {reRequire} = require('mock-require');
 const test = autoGlobals(tape);
 
 test('sw: listen', (t) => {
-    const {listenSW} = reRequire('./register');
     const addEventListener = stub();
     const sw = {
         addEventListener,
@@ -23,7 +27,6 @@ test('sw: listen', (t) => {
 });
 
 test('sw: lesten: no sw', (t) => {
-    const {listenSW} = reRequire('./register');
     const [e] = tryCatch(listenSW, null, 'hello', 'world');
     
     t.notOk(e, 'should not throw');
@@ -31,8 +34,6 @@ test('sw: lesten: no sw', (t) => {
 });
 
 test('sw: register: registerSW: no serviceWorker', async (t, {navigator}) => {
-    const {registerSW} = reRequire('./register');
-    
     delete navigator.serviceWorker;
     
     await registerSW();
@@ -46,8 +47,6 @@ test('sw: register: registerSW: no https', async (t, {location, navigator}) => {
     
     location.protocol = 'http:';
     
-    const {registerSW} = reRequire('./register');
-    
     await registerSW();
     
     t.notCalled(register, 'should not call register');
@@ -62,8 +61,6 @@ test('sw: register: registerSW: http', async (t, {location, navigator}) => {
     
     const {register} = navigator.serviceWorker;
     
-    const {registerSW} = reRequire('./register');
-    
     await registerSW();
     
     t.notCalled(register, 'should not call register');
@@ -79,8 +76,6 @@ test('sw: register: registerSW: https self-signed', async (t, {location, navigat
     const {register} = navigator.serviceWorker;
     register.throws(Error('Cannot register service worker!'));
     
-    const {registerSW} = reRequire('./register');
-    
     const result = await registerSW();
     
     t.notOk(result, 'should not throw');
@@ -91,8 +86,6 @@ test('sw: register: registerSW', async (t, {location, navigator}) => {
     location.hostname = 'localhost';
     
     const {register} = navigator.serviceWorker;
-    const {registerSW} = reRequire('./register');
-    
     await registerSW('/hello');
     
     t.calledWith(register, ['/hello/sw.js'], 'should call register');
@@ -107,8 +100,6 @@ test('sw: register: unregisterSW', async (t, {location, navigator}) => {
     
     register.returns(serviceWorker);
     
-    const {unregisterSW} = reRequire('./register');
-    
     await unregisterSW('/hello');
     
     t.calledWith(register, ['/hello/sw.js'], 'should call register');

client/sw/sw.js

@@ -2,7 +2,7 @@
 
 const process = require('node:process');
 const codegen = require('codegen.macro');
-const tryToCatch = require('try-to-catch');
+const {tryToCatch} = require('try-to-catch');
 const currify = require('currify');
 
 const isDev = process.env.NODE_ENV === 'development';
@@ -50,14 +50,14 @@ const getRequest = (a, request) => {
     return createRequest('/');
 };
 
-self.addEventListener('install', wait(onInstall));
+globalThis.addEventListener('install', wait(onInstall));
-self.addEventListener('fetch', respondWith(onFetch));
+globalThis.addEventListener('fetch', respondWith(onFetch));
-self.addEventListener('activate', wait(onActivate));
+globalThis.addEventListener('activate', wait(onActivate));
 
 async function onActivate() {
     console.info(`cloudcmd: sw: activate: ${NAME}`);
     
-    await self.clients.claim();
+    await globalThis.clients.claim();
     const keys = await caches.keys();
     const deleteCache = caches.delete.bind(caches);
     
@@ -67,7 +67,7 @@ async function onActivate() {
 async function onInstall() {
     console.info(`cloudcmd: sw: install: ${NAME}`);
     
-    await self.skipWaiting();
+    await globalThis.skipWaiting();
 }
 
 async function onFetch(event) {

common/base64.js

@@ -1,19 +0,0 @@
-'use strict';
-
-module.exports.btoa = (str) => {
-    if (typeof btoa === 'function')
-        return btoa(str);
-    
-    return Buffer
-        .from(str)
-        .toString('base64');
-};
-
-module.exports.atob = (str) => {
-    if (typeof atob === 'function')
-        return atob(str);
-    
-    return Buffer
-        .from(str, 'base64')
-        .toString('binary');
-};

common/base64.spec.js

@@ -1,55 +0,0 @@
-'use strict';
-
-const {test, stub} = require('supertape');
-
-const {btoa, atob} = require('./base64');
-
-test('btoa: browser', (t) => {
-    const btoaOriginal = global.btoa;
-    const btoaStub = stub();
-    const str = 'hello';
-    
-    global.btoa = btoaStub;
-    
-    btoa(str);
-    global.btoa = btoaOriginal;
-    
-    t.calledWith(btoaStub, [str], 'should call global.btoa');
-    t.end();
-});
-
-test('btoa: node', (t) => {
-    const str = 'hello';
-    const expected = 'aGVsbG8=';
-    
-    const result = btoa(str);
-    
-    t.equal(result, expected, 'should encode base64');
-    t.end();
-});
-
-test('atob: browser', (t) => {
-    const atobOriginal = global.atob;
-    const atobStub = stub();
-    
-    const str = 'hello';
-    
-    global.atob = atobStub;
-    
-    atob(str);
-    
-    global.atob = atobOriginal;
-    
-    t.calledWith(atobStub, [str], 'should call global.btoa');
-    t.end();
-});
-
-test('atob: node', (t) => {
-    const str = 'aGVsbG8=';
-    const expected = 'hello';
-    
-    const result = atob(str);
-    
-    t.equal(result, expected, 'should encode base64');
-    t.end();
-});

common/callbackify.spec.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const {promisify} = require('node:util');
-const tryToCatch = require('try-to-catch');
+const {tryToCatch} = require('try-to-catch');
 
 const {test, stub} = require('supertape');
 

common/cloudfunc.mjs

@@ -1,17 +1,16 @@
-'use strict';
+import rendy from 'rendy';
+import currify from 'currify';
+import store from 'fullstore';
+import {encode} from './entity.js';
 
-const rendy = require('rendy');
+export const getHeaderField = currify(_getHeaderField);
-const currify = require('currify');
-const store = require('fullstore');
-const {encode} = require('./entity');
-const {btoa} = require('./base64');
-
-const getHeaderField = currify(_getHeaderField);
 
 /* КОНСТАНТЫ (общие для клиента и сервера)*/
 /* название программы */
 const NAME = 'Cloud Commander';
-const FS = '/fs';
+
+export const FS = '/fs';
+
 const Path = store();
 
 Path('/');
@@ -23,14 +22,10 @@ const filterOutDotFiles = ({showDotFiles}) => ({name}) => {
     return !name.startsWith('.');
 };
 
-module.exports.FS = FS;
+export const apiURL = '/api/v1';
-module.exports.apiURL = '/api/v1';
+export const MAX_FILE_SIZE = 500 * 1024;
-module.exports.MAX_FILE_SIZE = 500 * 1024;
-module.exports.getHeaderField = getHeaderField;
-module.exports.getPathLink = getPathLink;
-module.exports.getDotDot = getDotDot;
 
-module.exports.formatMsg = (msg, name, status) => {
+export const formatMsg = (msg, name, status) => {
     status = status || 'ok';
     name = name || '';
     
@@ -44,7 +39,7 @@ module.exports.formatMsg = (msg, name, status) => {
  * Функция возвращает заголовок веб страницы
  * @path
  */
-module.exports.getTitle = (options) => {
+export const getTitle = (options) => {
     options = options || {};
     
     const {path = Path(), name} = options;
@@ -63,7 +58,7 @@ module.exports.getTitle = (options) => {
  * возвращаеться массив каталогов
  * @param url -  адрес каталога
  */
-function getPathLink(url, prefix, template) {
+export function getPathLink(url, prefix, template) {
     if (!url)
         throw Error('url could not be empty!');
     
@@ -109,17 +104,17 @@ function getPathLink(url, prefix, template) {
     return lines.join('');
 }
 
-const getDataName = (name) => {
+export function _getDataName(name) {
     const encoded = btoa(encodeURI(name));
     return `data-name="js-file-${encoded}" `;
-};
+}
 
 /**
  * Функция строит таблицу файлв из JSON-информации о файлах
  * @param params - информация о файлах
  *
  */
-module.exports.buildFromJSON = (params) => {
+export const buildFromJSON = (params) => {
     const {
         prefix,
         template,
@@ -185,7 +180,7 @@ module.exports.buildFromJSON = (params) => {
             name: '..',
         });
         
-        const dataName = getDataName('..');
+        const dataName = _getDataName('..');
         const attribute = `draggable="true" ${dataName}`;
         
         /* Сохраняем путь к каталогу верхнего уровня*/
@@ -226,7 +221,7 @@ module.exports.buildFromJSON = (params) => {
                 attribute: getAttribute(file.type),
             });
             
-            const dataName = getDataName(file.name);
+            const dataName = _getDataName(file.name);
             const attribute = `draggable="true" ${dataName}`;
             
             return rendy(templateFile, {
@@ -262,7 +257,8 @@ function getAttribute(type) {
     return 'target="_blank" ';
 }
 
-module.exports._getSize = getSize;
+export const _getSize = getSize;
+
 function getSize({size, type}) {
     if (type === 'directory')
         return '<dir>';
@@ -285,7 +281,7 @@ function _getHeaderField(sort, order, name) {
     return `${name}${arrow}`;
 }
 
-function getDotDot(path) {
+export function getDotDot(path) {
     // убираем последний слеш и каталог в котором мы сейчас находимся
     const lastSlash = path.substr(path, path.lastIndexOf('/'));
     const dotDot = lastSlash.substr(lastSlash, lastSlash.lastIndexOf('/'));

common/cloudfunc.spec.mjs

@@ -1,19 +1,15 @@
-'use strict';
+import {readFileSync} from 'node:fs';
-
+import test from 'supertape';
-const {join} = require('node:path');
+import montag from 'montag';
-const {readFileSync} = require('node:fs');
+import * as cheerio from 'cheerio';
-
+import {
-const test = require('supertape');
-const montag = require('montag');
-const cheerio = require('cheerio');
-
-const {
     _getSize,
     getPathLink,
     buildFromJSON,
-} = require('./cloudfunc');
+    _getDataName,
+} from './cloudfunc.mjs';
 
-const templatePath = join(__dirname, '../tmpl/fs');
+const templatePath = new URL('../tmpl/fs', import.meta.url).pathname;
 
 const template = {
     pathLink: readFileSync(`${templatePath}/pathLink.hbs`, 'utf8'),
@@ -175,3 +171,11 @@ test('cloudfunc: buildFromJSON: showDotFiles: false', (t) => {
     t.equal(result, expected);
     t.end();
 });
+
+test('cloudfunc: _getDataName', (t) => {
+    const result = _getDataName('s');
+    const expected = 'data-name="js-file-cw==" ';
+    
+    t.equal(result, expected);
+    t.end();
+});

common/datetime.spec.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('supertape');
-const tryCatch = require('try-catch');
+const {tryCatch} = require('try-catch');
 
 const datetime = require('./datetime');
 
@@ -16,11 +16,11 @@ test('common: datetime', (t) => {
 });
 
 test('common: datetime: no arg', (t) => {
-    const {Date} = global;
+    const {Date} = globalThis;
     
     let called = false;
     
-    global.Date = class extends Date {
+    globalThis.Date = class extends Date {
         constructor() {
             super();
             called = true;
@@ -29,7 +29,7 @@ test('common: datetime: no arg', (t) => {
     
     datetime();
     
-    global.Date = Date;
+    globalThis.Date = Date;
     
     t.ok(called, 'should call new Date');
     t.end();

common/try-to-promise-all.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const tryToCatch = require('try-to-catch');
+const {tryToCatch} = require('try-to-catch');
 const all = Promise.all.bind(Promise);
 
 module.exports = async (a) => {

common/util.spec.js

@@ -1,8 +1,7 @@
 'use strict';
 
 const test = require('supertape');
-const {reRequire} = require('mock-require');
+const {tryCatch} = require('try-catch');
-const tryCatch = require('try-catch');
 const Util = require('./util');
 
 const {
@@ -117,15 +116,3 @@ test('util: escapeRegExp', (t) => {
     t.equal(escapeRegExp('#hello'), '\\#hello');
     t.end();
 });
-
-test('util: scope', (t) => {
-    global.window = {};
-    
-    reRequire('./util');
-    
-    t.pass('should set window in scope');
-    
-    delete global.window;
-    
-    t.end();
-});

cssnano.config.mjs

@@ -1,9 +1,7 @@
-'use strict';
-
 // used by OptimizeCssAssetsPlugin
-const defaultPreset = require('cssnano-preset-default');
+import defaultPreset from 'cssnano-preset-default';
 
-module.exports = defaultPreset({
+export default defaultPreset({
     svgo: {
         plugins: [{
             convertPathData: false,

deno.json

@@ -0,0 +1,14 @@
+{
+    "tasks": {
+        "start": "deno run -P=cloudcmd bin/cloudcmd.mjs"
+    },
+    "permissions": {
+        "cloudcmd": {
+            "env": true,
+            "read": true,
+            "sys": true,
+            "net": true,
+            "run": true
+        }
+    }
+}

eslint.config.mjs

@@ -19,9 +19,6 @@ export const match = {
     'bin/cloudcmd.js': {
         'no-console': 'off',
     },
-    'cssnano.config.js': {
-        'n/no-extraneous-require': 'off',
-    },
 };
 export default defineConfig([
     safeAlign, {
@@ -36,9 +33,7 @@ export default defineConfig([
     }, {
         files: ['{client,common,static}/**/*.js'],
         languageOptions: {
-            globals: {
+            globals: globals.browser,
-                ...globals.browser,
-            },
         },
     },
     ...matchToFlat(match),

html/index.html

@@ -45,7 +45,7 @@
         <script data-name="aleman-importmap" type="importmap">
         {
             "imports": {
-                "putout": "https://esm.sh/@putout/bundle@4.6.10",
+                "putout": "https://esm.sh/@putout/bundle@4.7.6",
                 "@putout/processor-html": "https://esm.sh/@putout/processor-html",
                 "fullstore": "https://esm.sh/fullstore",
                 "jessy": "https://esm.sh/jessy"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudcmd",
-  "version": "19.0.1",
+  "version": "19.1.9",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "File manager for the web with console and editor",
@@ -89,7 +89,7 @@
     "@cloudcmd/move-files": "^8.0.0",
     "@cloudcmd/read-files-sync": "^2.0.0",
     "@putout/cli-validate-args": "^2.0.0",
-    "aleman": "^1.10.0",
+    "aleman": "^1.16.5",
     "apart": "^2.0.0",
     "chalk": "^5.3.0",
     "compression": "^1.7.4",
@@ -105,10 +105,10 @@
     "execon": "^1.2.0",
     "express": "^5.1.0",
     "files-io": "^4.0.0",
-    "find-up": "^7.0.0",
+    "find-up": "^8.0.0",
     "for-each-key": "^2.0.0",
     "format-io": "^2.0.0",
-    "fullstore": "^3.0.0",
+    "fullstore": "^4.0.0",
     "http-auth": "^4.2.1",
     "inly": "^5.0.0",
     "jaguar": "^6.0.0",
@@ -124,12 +124,12 @@
     "object.omit": "^3.0.0",
     "once": "^1.4.0",
     "onezip": "^6.0.1",
-    "open": "^10.0.3",
+    "open": "^11.0.0",
     "package-json": "^10.0.0",
     "pipe-io": "^4.0.1",
     "ponse": "^7.0.0",
     "pullout": "^5.0.0",
-    "putout": "^40.0.3",
+    "putout": "^41.0.0",
     "redzip": "^3.0.0",
     "rendy": "^4.1.3",
     "restafary": "^12.0.0",
@@ -140,8 +140,8 @@
     "socket.io-client": "^4.0.1",
     "squad": "^3.0.0",
     "table": "^6.0.1",
-    "try-catch": "^3.0.0",
+    "try-catch": "^4.0.4",
-    "try-to-catch": "^3.0.0",
+    "try-to-catch": "^4.0.0",
     "tryrequire": "^3.0.0",
     "win32": "^7.0.0",
     "wraptile": "^3.0.0",
@@ -156,9 +156,9 @@
     "@cloudcmd/create-element": "^2.0.0",
     "@cloudcmd/modal": "^3.0.0",
     "@cloudcmd/olark": "^3.0.2",
-    "@cloudcmd/stub": "^4.0.1",
+    "@cloudcmd/stub": "^5.0.0",
     "@iocmd/wait": "^2.1.0",
-    "@putout/eslint-flat": "^3.0.1",
+    "@putout/eslint-flat": "^4.0.0",
     "@putout/plugin-cloudcmd": "^4.0.0",
     "@types/node-fetch": "^2.6.11",
     "auto-globals": "^4.0.0",
@@ -170,27 +170,29 @@
     "codegen.macro": "^4.0.0",
     "css-loader": "^7.1.2",
     "css-modules-require-hook": "^4.2.3",
+    "cssnano-preset-default": "^7.0.10",
     "domtokenlist-shim": "^1.2.0",
     "emitify": "^4.0.1",
     "eslint": "^9.23.0",
     "eslint-plugin-n": "^17.0.0-4",
-    "eslint-plugin-putout": "^28.0.0",
+    "eslint-plugin-putout": "^30.0.0",
-    "globals": "^16.3.0",
+    "globals": "^17.0.0",
-    "gritty": "^8.0.0",
+    "gritty": "^9.0.0",
     "gunzip-maybe": "^1.3.1",
     "html-webpack-plugin": "^5.6.3",
     "inherits": "^2.0.3",
+    "itype": "^3.0.1",
     "just-capitalize": "^3.2.0",
     "just-pascal-case": "^3.2.0",
     "limier": "^3.0.0",
     "load.js": "^3.0.0",
-    "madrun": "^11.0.0",
+    "madrun": "^12.1.0",
     "memfs": "^4.2.0",
     "mini-css-extract-plugin": "^2.9.2",
     "minor": "^1.2.2",
     "mock-require": "^3.0.1",
     "morgan": "^1.6.1",
-    "multi-rename": "^2.0.0",
+    "multi-rename": "^3.0.0",
     "nodemon": "^3.0.1",
     "optimize-css-assets-webpack-plugin": "^6.0.1",
     "path-browserify": "^1.0.1",
@@ -199,7 +201,7 @@
     "postcss": "^8.5.3",
     "process": "^0.11.10",
     "readjson": "^2.0.1",
-    "redlint": "^4.1.1",
+    "redlint": "^5.0.0",
     "request": "^2.76.0",
     "rimraf": "^6.0.1",
     "scroll-into-view-if-needed": "^3.0.4",
@@ -207,7 +209,7 @@
     "smalltalk": "^4.0.0",
     "style-loader": "^4.0.0",
     "supermenu": "^4.0.1",
-    "supertape": "^11.0.4",
+    "supertape": "^12.0.0",
     "tar-stream": "^3.0.0",
     "unionfs": "^4.0.0",
     "url-loader": "^4.0.0",
@@ -216,6 +218,9 @@
     "webpack-merge": "^6.0.1",
     "webpackbar": "^7.0.0"
   },
+  "imports": {
+    "#dom/events": "./client/dom/events/index.mjs"
+  },
   "engines": {
     "node": ">=22"
   },

server/cloudcmd.mjs

@@ -2,7 +2,7 @@ import path, {dirname, join} from 'node:path';
 import {fileURLToPath} from 'node:url';
 import process from 'node:process';
 import fs from 'node:fs';
-import fullstore from 'fullstore';
+import {fullstore} from 'fullstore';
 import currify from 'currify';
 import apart from 'apart';
 import ponse from 'ponse';
@@ -14,12 +14,12 @@ import dword from 'dword';
 import deepword from 'deepword';
 import nomine from 'nomine';
 import fileop from '@cloudcmd/fileop';
-import cloudfunc from '../common/cloudfunc.js';
+import * as cloudfunc from '../common/cloudfunc.mjs';
 import authentication from './auth.js';
-import {createConfig, configPath} from './config.js';
+import {createConfig, configPath} from './config.mjs';
-import modulas from './modulas.js';
+import modulas from './modulas.mjs';
 import userMenu from './user-menu.mjs';
-import rest from './rest/index.js';
+import rest from './rest/index.mjs';
 import route from './route.mjs';
 import * as validate from './validate.mjs';
 import prefixer from './prefixer.js';

server/columns.mjs

@@ -2,11 +2,12 @@ import path, {dirname} from 'node:path';
 import {fileURLToPath} from 'node:url';
 import process from 'node:process';
 import fs from 'node:fs';
-import fullstore from 'fullstore';
+import {fullstore} from 'fullstore';
-import nanomemoizeDefault from 'nano-memoize';
+import * as nanomemoizeDefault from 'nano-memoize';
 import readFilesSync from '@cloudcmd/read-files-sync';
 
-const {nanomemoize} = nanomemoizeDefault;
+const nanomemoize = nanomemoizeDefault.default.nanomemoize || nanomemoizeDefault.default;
+
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const isMap = (a) => /\.(map|js)$/.test(a);

server/config.mjs

@@ -1,7 +1,12 @@
-'use strict';
+import {fileURLToPath} from 'node:url';
+import {dirname} from 'node:path';
+import {createRequire} from 'node:module';
 
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const require = createRequire(import.meta.url);
 const DIR_SERVER = `${__dirname}/`;
-const DIR_COMMON = '../common/';
+
 const path = require('node:path');
 
 const fs = require('node:fs');
@@ -11,17 +16,17 @@ const {homedir} = require('node:os');
 const currify = require('currify');
 
 const wraptile = require('wraptile');
-const tryToCatch = require('try-to-catch');
+const {tryToCatch} = require('try-to-catch');
 const pullout = require('pullout');
 const ponse = require('ponse');
 const jonny = require('jonny');
 const jju = require('jju');
 const writejson = require('writejson');
-const tryCatch = require('try-catch');
+const {tryCatch} = require('try-catch');
 const criton = require('criton');
 const exit = require(`${DIR_SERVER}exit`);
 
-const CloudFunc = require(`${DIR_COMMON}cloudfunc`);
+const CloudFunc = require('../common/cloudfunc.mjs');
 const isUndefined = (a) => typeof a === 'undefined';
 const DIR = `${DIR_SERVER}../`;
 const HOME = homedir();
@@ -36,7 +41,6 @@ const key = (a) => Object
     .pop();
 
 const ConfigPath = path.join(DIR, 'json/config.json');
-const ConfigHome = path.join(HOME, '.cloudcmd.json');
 
 const connection = currify(_connection);
 const connectionWrapped = wraptile(_connection);
@@ -65,8 +69,7 @@ function read(filename) {
     };
 }
 
-module.exports.createConfig = createConfig;
+export const configPath = path.join(HOME, '.cloudcmd.json');
-module.exports.configPath = ConfigHome;
 
 const manageListen = currify((manage, socket, auth) => {
     if (!manage('configDialog'))
@@ -84,7 +87,7 @@ function initWrite(filename, configManager) {
     return resolve;
 }
 
-function createConfig({configPath} = {}) {
+export function createConfig({configPath} = {}) {
     const config = {};
     const changeEmitter = new Emitter();
     
@@ -237,7 +240,8 @@ function traverse([manage, json]) {
     }
 }
 
-module.exports._cryptoPass = cryptoPass;
+export const _cryptoPass = cryptoPass;
+
 function cryptoPass(manage, json) {
     const algo = manage('algo');
     

server/config.spec.mjs

@@ -1,7 +1,7 @@
 import {createRequire} from 'node:module';
 import {test, stub} from 'supertape';
-import {createConfig, _cryptoPass} from './config.js';
+import {createConfig, _cryptoPass} from './config.mjs';
-import {apiURL} from '../common/cloudfunc.js';
+import {apiURL} from '../common/cloudfunc.mjs';
 import {connect} from '../test/before.mjs';
 
 const require = createRequire(import.meta.url);

server/depstore.js

@@ -1,11 +1,11 @@
 'use strict';
 
 module.exports.createDepStore = () => {
-    let deps = {};
+    const deps = {};
     
     return (name, value) => {
         if (!name)
-            return deps = {};
+            return false;
         
         if (!value)
             return deps[name];