cloudcmd 17.2.0 → 17.3.0

package/server/{route.js → route.mjs}

@@ -1,24 +1,23 @@
-'use strict';
-
-const {extname} = require('node:path');
-
-const _win32 = require('win32');
-const ponse = require('ponse');
-const rendy = require('rendy');
-const format = require('format-io');
-const currify = require('currify');
-const wraptile = require('wraptile');
-const tryToCatch = require('try-to-catch');
-const once = require('once');
-const pipe = require('pipe-io');
-const {contentType} = require('mime-types');
-
-const root = require(`./root`);
-const prefixer = require(`./prefixer`);
-const CloudFunc = require(`../common/cloudfunc`);
-const {getColumns} = require(`./columns`);
-const Template = require(`./template`);
+import {createRequire} from 'node:module';
+import {extname} from 'node:path';
+import _win32 from 'win32';
+import ponse from 'ponse';
+import rendy from 'rendy';
+import format from 'format-io';
+import currify from 'currify';
+import wraptile from 'wraptile';
+import tryToCatch from 'try-to-catch';
+import once from 'once';
+import pipe from 'pipe-io';
+import {contentType} from 'mime-types';
+import root from './root.js';
+import prefixer from './prefixer.js';
+import CloudFunc from '../common/cloudfunc.js';
+import Template from './template.js';
+import {getColumns} from './columns.mjs';
+import {getThemes} from './theme.mjs';
 
+const require = createRequire(import.meta.url);
 const {stringify} = JSON;
 const {FS} = CloudFunc;
 
@@ -46,7 +45,7 @@ const getReadDir = (config, {win32 = _win32} = {}) => {
 /**
  * routing of server queries
  */
-module.exports = currify((config, options, request, response, next) => {
+export default currify((config, options, request, response, next) => {
     const name = ponse.getPathName(request);
     const isFS = RegExp(`^/$|^${FS}`).test(name);
     
@@ -61,7 +60,7 @@ module.exports = currify((config, options, request, response, next) => {
     }).catch(next);
 });
 
-module.exports._getReadDir = getReadDir;
+export const _getReadDir = getReadDir;
 
 async function route({config, options, request, response}) {
     const name = ponse.getPathName(request);
@@ -166,6 +165,7 @@ function indexProcessing(config, options) {
         prefix: getPrefix(config),
         config: stringify(config('*')),
         columns: getColumns()[config('columns')],
+        themes: getThemes()[config('theme')],
     });
     
     return data;
@@ -184,7 +184,8 @@ function buildIndex(config, html, data) {
     });
 }
 
-module.exports._hideKeysPanel = hideKeysPanel;
+export const _hideKeysPanel = hideKeysPanel;
+
 function hideKeysPanel(html) {
     const keysPanel = '<div id="js-keyspanel" class="{{ className }}"';
     const keysPanelRegExp = '<div id="?js-keyspanel"? class="?{{ className }}"?';

package/server/route.spec.mjs

@@ -6,7 +6,7 @@ import tryToCatch from 'try-to-catch';
 import {test, stub} from 'supertape';
 import serveOnce from 'serve-once';
 import cloudcmd from './cloudcmd.mjs';
-import {_getReadDir} from './route.js';
+import {_getReadDir} from './route.mjs';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -325,7 +325,7 @@ test('cloudcmd: route: buttons: no terminal', async (t) => {
     t.end();
 });
 
-test('cloudcmd: route: no termianl: /fs', async (t) => {
+test('cloudcmd: route: no terminal: /fs', async (t) => {
     const config = {
         terminal: false,
     };

package/server/theme.mjs

@@ -0,0 +1,33 @@
+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 nanomemoizeDefault from 'nano-memoize';
+import readFilesSync from '@cloudcmd/read-files-sync';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const isMap = (a) => /\.map$/.test(a);
+const not = (fn) => (a) => !fn(a);
+
+const _isDev = fullstore(process.env.NODE_ENV === 'development');
+const getDist = (isDev) => isDev ? 'dist-dev' : 'dist';
+
+export const isDev = _isDev;
+
+export const getThemes = ({isDev = _isDev()} = {}) => {
+    return readFilesSyncMemo(isDev);
+};
+
+const {nanomemoize} = nanomemoizeDefault;
+
+const readFilesSyncMemo = nanomemoize((isDev) => {
+    const dist = getDist(isDev);
+    const themesDir = path.join(__dirname, '..', dist, 'themes');
+    const names = fs
+        .readdirSync(themesDir)
+        .filter(not(isMap));
+    
+    return readFilesSync(themesDir, names, 'utf8');
+});

package/server/themes.spec.mjs

@@ -0,0 +1,31 @@
+import {dirname} from 'node:path';
+import {fileURLToPath} from 'node:url';
+import test from 'supertape';
+import fs from 'node:fs';
+import {getThemes, isDev} from './theme.mjs';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+test('themes: dev', (t) => {
+    const themes = getThemes({
+        isDev: true,
+    });
+    
+    const css = fs.readFileSync(`${__dirname}/../css/themes/dark.css`, 'utf8');
+    
+    t.equal(themes.dark, css);
+    t.end();
+});
+
+test('themes: no args', (t) => {
+    const currentIsDev = isDev();
+    isDev(true);
+    const themes = getThemes();
+    
+    const css = fs.readFileSync(`${__dirname}/../css/themes/light.css`, 'utf8');
+    isDev(currentIsDev);
+    
+    t.equal(themes.light, css);
+    t.end();
+});

package/server/{validate.js → validate.mjs}

@@ -1,13 +1,12 @@
-'use strict';
+import {statSync as _statSync} from 'node:fs';
+import tryCatch from 'try-catch';
+import _exit from './exit.js';
+import {getColumns as _getColumns} from './columns.mjs';
+import {getThemes as _getThemes} from './theme.mjs';
 
-const {statSync: _statSync} = require('node:fs');
-const tryCatch = require('try-catch');
-
-const _exit = require('./exit');
-const {getColumns: _getColumns} = require('./columns');
 const isString = (a) => typeof a === 'string';
 
-module.exports.root = (dir, config, {exit = _exit, statSync = _statSync} = {}) => {
+export const root = (dir, config, {exit = _exit, statSync = _statSync} = {}) => {
     if (!isString(dir))
         throw Error('dir should be a string');
     
@@ -23,21 +22,21 @@ module.exports.root = (dir, config, {exit = _exit, statSync = _statSync} = {}) =
         return exit('cloudcmd --root: %s', error.message);
 };
 
-module.exports.editor = (name, {exit = _exit} = {}) => {
+export const editor = (name, {exit = _exit} = {}) => {
     const reg = /^(dword|edward|deepword)$/;
     
     if (!reg.test(name))
         exit('cloudcmd --editor: could be "dword", "edward" or "deepword" only');
 };
 
-module.exports.packer = (name, {exit = _exit} = {}) => {
+export const packer = (name, {exit = _exit} = {}) => {
     const reg = /^(tar|zip)$/;
     
     if (!reg.test(name))
         exit('cloudcmd --packer: could be "tar" or "zip" only');
 };
 
-module.exports.columns = (type, {exit = _exit, getColumns = _getColumns} = {}) => {
+export const columns = (type, {exit = _exit, getColumns = _getColumns} = {}) => {
     const addQuotes = (a) => `"${a}"`;
     const all = Object
         .keys(getColumns())
@@ -51,3 +50,18 @@ module.exports.columns = (type, {exit = _exit, getColumns = _getColumns} = {}) =
     if (!all.includes(type))
         exit(`cloudcmd --columns: can be only one of: ${names}`);
 };
+
+export const theme = (type, {exit = _exit, getThemes = _getThemes} = {}) => {
+    const addQuotes = (a) => `"${a}"`;
+    const all = Object
+        .keys(getThemes())
+        .concat('');
+    
+    const names = all
+        .filter(Boolean)
+        .map(addQuotes)
+        .join(', ');
+    
+    if (!all.includes(type))
+        exit(`cloudcmd --theme: can be only one of: ${names}`);
+};

package/server/validate.spec.mjs

@@ -1,6 +1,6 @@
 import {test, stub} from 'supertape';
 import tryCatch from 'try-catch';
-import validate from './validate.js';
+import * as validate from './validate.mjs';
 import cloudcmd from './cloudcmd.mjs';
 
 test('validate: root: bad', (t) => {
@@ -102,3 +102,32 @@ test('validate: columns: wrong', (t) => {
     t.calledWith(exit, [msg], 'should call exit');
     t.end();
 });
+
+test('validate: theme', (t) => {
+    const exit = stub();
+    
+    validate.theme('dark', {
+        exit,
+    });
+    
+    t.notCalled(exit, 'should not call exit');
+    t.end();
+});
+
+test('validate: theme: wrong', (t) => {
+    const getThemes = stub().returns({
+        light: '',
+        dark: '',
+    });
+    
+    const exit = stub();
+    const msg = 'cloudcmd --theme: can be only one of: "light", "dark"';
+    
+    validate.theme('hello', {
+        exit,
+        getThemes,
+    });
+    
+    t.calledWith(exit, [msg], 'should call exit');
+    t.end();
+});

package/tmpl/config.hbs

@@ -43,8 +43,14 @@
             Zip
          </label>
     </li>
+    <li title="Theme">
+        <select data-name="js-theme" class="form-control full-width" title="Theme">
+            <option {{ light-selected }}>light</option>
+            <option {{ dark-selected }}>dark</option>
+        </select>
+    </li>
     <li title="Visible Columns">
-        <select data-name="js-columns" class="form-control full-width" title="Visible Columns">
+        <select data-name="js-themes" class="form-control full-width" title="Visible Columns">
             <option {{ name-size-date-owner-mode-selected }}>name-size-date-owner-mode</option>
             <option {{ name-size-date-selected }}>name-size-date</option>
             <option {{ name-size-selected }}>name-size</option>