feature: client: dom: images -> #images

coderaiser · coderaiser · commit c3b71653bb28 · 2026-02-02T19:18:08.000+02:00
diff --git a/client/client.mjs b/client/client.mjs
@@ -1,6 +1,4 @@
 import process from 'node:process';
-
-/* global DOM */
 import Emitify from 'emitify';
 import inherits from 'inherits';
 import rendy from 'rendy';
@@ -9,15 +7,15 @@ import {tryToCatch} from 'try-to-catch';
 import {addSlashToEnd} from 'format-io';
 import pascalCase from 'just-pascal-case';
 import currify from 'currify';
-import * as Images from './dom/images.mjs';
-import {unregisterSW} from './sw/register.mjs';
-import {getJsonFromFileTable} from './get-json-from-file-table.mjs';
-import {Key} from './key/index.mjs';
 import {
     apiURL,
     formatMsg,
     buildFromJSON,
 } from '#common/cloudfunc';
+import * as Images from '#dom/images';
+import {unregisterSW} from './sw/register.mjs';
+import {getJsonFromFileTable} from './get-json-from-file-table.mjs';
+import {Key} from './key/index.mjs';
 import {loadModule} from './load-module.mjs';
 
 const noJS = (a) => a.replace(/.js$/, '');
diff --git a/client/cloudcmd.mjs b/client/cloudcmd.mjs
@@ -1,11 +1,11 @@
+import '../css/main.css';
 import process from 'node:process';
 import wraptile from 'wraptile';
 import load from 'load.js';
 import * as Util from '#common/util';
-import '../css/main.css';
+import * as CloudFunc from '#common/cloudfunc';
 import {registerSW, listenSW} from './sw/register.mjs';
 import {initSortPanel, sortPanel} from './sort.mjs';
-import * as CloudFunc from '#common/cloudfunc';
 import DOM from './dom/index.mjs';
 import {createCloudCmd} from './client.mjs';
 import * as Listeners from './listeners/index.mjs';
diff --git a/client/dom/current-file.mjs b/client/dom/current-file.mjs
@@ -1,8 +1,8 @@
 /* global DOM */
 /* global CloudCmd */
 import createElement from '@cloudcmd/create-element';
-import {encode, decode} from '../../common/entity.js';
 import {getTitle, FS} from '#common/cloudfunc';
+import {encode, decode} from '../../common/entity.js';
 
 let Title;
 
diff --git a/client/dom/directory.mjs b/client/dom/directory.mjs
@@ -1,8 +1,8 @@
 /* global DOM, CloudCmd */
 import philip from 'philip';
 import * as Dialog from '#dom/dialog';
-import * as Images from './images.mjs';
 import {FS} from '#common/cloudfunc';
+import * as Images from '#dom/images';
 
 export const uploadDirectory = (items) => {
     if (items.length)
diff --git a/client/dom/index.mjs b/client/dom/index.mjs
@@ -6,7 +6,7 @@ import * as Events from '#dom/events';
 import {getExt} from '#common/util';
 import * as Storage from '#dom/storage';
 import * as RESTful from '#dom/rest';
-import * as Images from './images.mjs';
+import * as Images from '#dom/images';
 import renameCurrent from './operations/rename-current.mjs';
 import * as CurrentFile from './current-file.mjs';
 import * as DOMTree from './dom-tree.mjs';
diff --git a/client/dom/io/send-request.js b/client/dom/io/send-request.js
@@ -3,7 +3,7 @@
 /* global CloudCmd */
 const {promisify} = require('es6-promisify');
 
-const Images = require('../images.mjs');
+const Images = require('#dom/images');
 const load = require('#dom/load');
 
 module.exports = promisify((params, callback) => {
diff --git a/client/dom/load.mjs b/client/dom/load.mjs
@@ -2,7 +2,7 @@ import itype from 'itype';
 import jonny from 'jonny';
 import Emitify from 'emitify';
 import exec from 'execon';
-import * as Images from './images.mjs';
+import * as Images from '#dom/images';
 
 /**
  * Function gets id by src
diff --git a/client/dom/rest.mjs b/client/dom/rest.mjs
@@ -1,7 +1,7 @@
 import {tryToCatch} from 'try-to-catch';
 import * as Dialog from '#dom/dialog';
 import {encode} from '../../common/entity.js';
-import * as Images from './images.mjs';
+import * as Images from '#dom/images';
 import IO from './io/index.js';
 
 const handleError = (promise) => async (...args) => {
diff --git a/client/dom/upload-files.mjs b/client/dom/upload-files.mjs
@@ -3,8 +3,8 @@ import {eachSeries} from 'execon';
 import wraptile from 'wraptile';
 import * as load from '#dom/load';
 import {alert} from '#dom/dialog';
-import * as Images from './images.mjs';
 import {FS} from '#common/cloudfunc';
+import * as Images from '#dom/images';
 import {getCurrentDirPath} from './current-file.mjs';
 
 const loadFile = wraptile(_loadFile);
diff --git a/client/listeners/index.mjs b/client/listeners/index.mjs
@@ -6,8 +6,8 @@ import {tryToCatch} from 'try-to-catch';
 import clipboard from '@cloudcmd/clipboard';
 import * as Events from '#dom/events';
 import {uploadFiles} from '#dom/upload-files';
-import {getRange} from './get-range.mjs';
 import {FS} from '#common/cloudfunc';
+import {getRange} from './get-range.mjs';
 import {getIndex} from './get-index.mjs';
 
 const NBSP_REG = RegExp(String.fromCharCode(160), 'g');
diff --git a/client/modules/cloud.mjs b/client/modules/cloud.mjs
@@ -4,7 +4,7 @@ import currify from 'currify';
 import load from 'load.js';
 import {ajax} from '#dom/load';
 import * as Files from '#dom/files';
-import * as Images from '../dom/images.mjs';
+import * as Images from '#dom/images';
 
 const {log} = CloudCmd;
 
diff --git a/client/modules/config/index.mjs b/client/modules/config/index.mjs
@@ -1,4 +1,5 @@
 /* global CloudCmd, DOM, io */
+import '../../../css/config.css';
 import rendy from 'rendy';
 import currify from 'currify';
 import wraptile from 'wraptile';
@@ -9,10 +10,9 @@ import load from 'load.js';
 import createElement from '@cloudcmd/create-element';
 import * as Events from '#dom/events';
 import * as Files from '#dom/files';
-import '../../../css/config.css';
-import * as input from './input.mjs';
-import * as Images from '../../dom/images.mjs';
 import {getTitle} from '#common/cloudfunc';
+import * as input from './input.mjs';
+import * as Images from '#dom/images';
 
 const {Dialog, setTitle} = DOM;
 
diff --git a/client/modules/contact.js b/client/modules/contact.js
@@ -6,7 +6,7 @@
 CloudCmd.Contact = exports;
 
 const olark = require('@cloudcmd/olark');
-const Images = require('../dom/images.mjs');
+const Images = require('#dom/images');
 
 const {Events} = DOM;
 const {Key} = CloudCmd;
diff --git a/client/modules/help.js b/client/modules/help.js
@@ -3,7 +3,7 @@
 /* global CloudCmd */
 CloudCmd.Help = exports;
 
-const Images = require('../dom/images.mjs');
+const Images = require('#dom/images');
 
 module.exports.init = () => {
     Images.show.load('top');
diff --git a/client/modules/konsole.js b/client/modules/konsole.js
@@ -12,7 +12,7 @@ const {tryToCatch} = require('try-to-catch');
 const loadJS = require('load.js').js;
 const createElement = require('@cloudcmd/create-element');
 
-const Images = require('../dom/images.mjs');
+const Images = require('#dom/images');
 const {Dialog, CurrentInfo: Info} = DOM;
 
 const rmLastSlash = (a) => a.replace(/\/$/, '') || '/';
diff --git a/client/modules/markdown.js b/client/modules/markdown.js
@@ -5,7 +5,7 @@ CloudCmd.Markdown = exports;
 
 const createElement = require('@cloudcmd/create-element');
 
-const Images = require('../dom/images.mjs');
+const Images = require('#dom/images');
 const {Markdown} = require('#dom/rest');
 const {alert} = require('#dom/dialog');
 
diff --git a/client/modules/terminal-run.js b/client/modules/terminal-run.js
@@ -10,7 +10,7 @@ require('../../css/terminal.css');
 const exec = require('execon');
 const load = require('load.js');
 const DOM = require('../dom/index.mjs');
-const Images = require('../dom/images.mjs');
+const Images = require('#dom/images');
 
 const {Dialog} = DOM;
 const {Key, config} = CloudCmd;
diff --git a/client/modules/terminal.js b/client/modules/terminal.js
@@ -9,7 +9,7 @@ require('../../css/terminal.css');
 const exec = require('execon');
 const load = require('load.js');
 const DOM = require('../dom/index.mjs');
-const Images = require('../dom/images.mjs');
+const Images = require('#dom/images');
 
 const loadParallel = load.parallel;
 
diff --git a/client/modules/upload.mjs b/client/modules/upload.mjs
@@ -2,7 +2,7 @@
 import createElement from '@cloudcmd/create-element';
 import * as Files from '#dom/files';
 import {uploadFiles} from '#dom/upload-files';
-import * as Images from '../dom/images.mjs';
+import * as Images from '#dom/images';
 
 CloudCmd.Upload = {
     init,
diff --git a/client/modules/user-menu/index.mjs b/client/modules/user-menu/index.mjs
@@ -9,7 +9,7 @@ import {tryToCatch} from 'try-to-catch';
 import {codeFrameColumns} from '@babel/code-frame';
 import * as Dialog from '#dom/dialog';
 import '../../../css/user-menu.css';
-import * as Images from '../../dom/images.mjs';
+import * as Images from '#dom/images';
 import {getUserMenu} from './get-user-menu.mjs';
 import {navigate} from './navigate.mjs';
 import {parseError} from './parse-error.mjs';
diff --git a/client/modules/view/index.mjs b/client/modules/view/index.mjs
@@ -15,7 +15,7 @@ import {
     isAudio,
     getType,
 } from './types.mjs';
-import * as Images from '../../dom/images.mjs';
+import * as Images from '#dom/images';
 import {encode} from '../../../common/entity.js';
 
 const CloudCmd = globalThis.CloudCmd || {};
diff --git a/package.json b/package.json
@@ -224,6 +224,7 @@
     "#dom/events": "./client/dom/events/index.mjs",
     "#dom/load": "./client/dom/load.mjs",
     "#dom/dialog": "./client/dom/dialog.mjs",
+    "#dom/images": "./client/dom/images.mjs",
     "#dom/files": "./client/dom/files.mjs",
     "#dom/upload-files": "./client/dom/upload-files.mjs",
     "#dom/storage": "./client/dom/storage.mjs",
diff --git a/server/config.spec.mjs b/server/config.spec.mjs
@@ -1,7 +1,7 @@
 import {createRequire} from 'node:module';
 import {test, stub} from 'supertape';
-import {createConfig, _cryptoPass} from './config.mjs';
 import {apiURL} from '#common/cloudfunc';
+import {createConfig, _cryptoPass} from './config.mjs';
 import {connect} from '../test/before.mjs';
 
 const require = createRequire(import.meta.url);
diff --git a/server/rest/index.mjs b/server/rest/index.mjs
@@ -11,8 +11,8 @@ import json from 'jonny';
 import ponse from 'ponse';
 import copymitter from 'copymitter';
 import _moveFiles from '@cloudcmd/move-files';
-import root from '../root.js';
 import * as CloudFunc from '#common/cloudfunc';
+import root from '../root.js';
 import markdown from '../markdown/index.js';
 import info from './info.js';
 
diff --git a/server/route.mjs b/server/route.mjs
@@ -10,9 +10,9 @@ import {tryToCatch} from 'try-to-catch';
 import once from 'once';
 import pipe from 'pipe-io';
 import {contentType} from 'mime-types';
+import * as CloudFunc from '#common/cloudfunc';
 import root from './root.js';
 import prefixer from './prefixer.js';
-import * as CloudFunc from '#common/cloudfunc';
 import Template from './template.js';
 import {getColumns} from './columns.mjs';
 import {getThemes} from './theme.mjs';
diff --git a/test/common/cloudfunc.js b/test/common/cloudfunc.js
@@ -6,8 +6,8 @@ const {tryCatch} = require('try-catch');
 const {test} = require('supertape');
 const readFilesSync = require('@cloudcmd/read-files-sync');
 
-const {time, timeEnd} = require(`../../common/util.mjs`);
 const CloudFunc = require('#common/cloudfunc');
+const {time, timeEnd} = require(`../../common/util.mjs`);
 
 const DIR = `${__dirname}/../../`;
 
@@ -43,8 +43,7 @@ const data = {
     }],
 };
 
-let Expect =
-    '<div data-name="js-path" class="reduce-text" title="/etc/X11/">' +
+let Expect = '<div data-name="js-path" class="reduce-text" title="/etc/X11/">' +
     '<span data-name="js-copy-path" class="path-icon icon-copy-to-clipboard"' +
     ' title="copy path (Ctrl+P)">' +
     '</span>' +
@@ -74,13 +73,13 @@ test('cloudfunc: render', (t) => {
     const isNotOk = Expect
         .split('')
         .some((item, number) => {
-        const ret = result[number] !== item;
-        
-        if (ret)
-            i = number;
-        
-        return ret;
-    });
+            const ret = result[number] !== item;
+            
+            if (ret)
+                i = number;
+            
+            return ret;
+        });
     
     timeEnd('CloudFunc.buildFromJSON');
     
