chuijs 4.0.2 → 4.0.3

package/framework/modules/chui_services/chui_services.js

@@ -1,8 +1,8 @@
-const {globalShortcut, clipboard, app, dialog, nativeImage, nativeTheme, shell, BrowserWindow} = require("electron");
+const { globalShortcut, clipboard, app, dialog, nativeImage, nativeTheme, shell, BrowserWindow } = require("electron");
 const fs = require("fs");
-const {Log} = require("../chui_logger/chui_logger");
-const {SERVICES_CHANNELS} = require("./chui_channels");
-const {I18n} = require("../chui_i18n/chui_i18n");
+const { Log } = require("../chui_logger/chui_logger");
+const { SERVICES_CHANNELS } = require("./chui_channels");
+const { I18n } = require("../chui_i18n/chui_i18n");
 
 /**
  * Десктоп-сервисы main-процесса. Имена IPC-каналов живут в `chui_channels.js` — тот модуль
@@ -173,7 +173,7 @@ class RecentDocuments {
     #items = [];
     #limit = RecentDocuments.MAX;
 
-    constructor(options = {limit: RecentDocuments.MAX}) {
+    constructor(options = { limit: RecentDocuments.MAX }) {
         if (options.limit !== undefined) this.#limit = options.limit;
     }
 
@@ -183,8 +183,10 @@ class RecentDocuments {
         }
         app.addRecentDocument(path);
         // Один и тот же файл не должен появляться дважды
-        this.#items = [{path: path, name: name === undefined ? path : name}, ...this.#items.filter((item) => item.path !== path)]
-            .slice(0, this.#limit);
+        this.#items = [
+            { path: path, name: name === undefined ? path : name },
+            ...this.#items.filter((item) => item.path !== path),
+        ].slice(0, this.#limit);
         return this;
     }
 
@@ -207,7 +209,7 @@ class RecentDocuments {
         return {
             role: "recentDocuments",
             label: pageTitle,
-            submenu: [{label: clearLabel, role: "clearRecentDocuments"}]
+            submenu: [{ label: clearLabel, role: "clearRecentDocuments" }],
         };
     }
 }
@@ -223,7 +225,7 @@ class TaskbarProgress {
         NORMAL: "normal",
         ERROR: "error",
         PAUSED: "paused",
-        INDETERMINATE: "indeterminate"
+        INDETERMINATE: "indeterminate",
     };
     #window = undefined;
     #value = 0;
@@ -285,7 +287,7 @@ class TaskbarProgress {
         const window = this.#window;
         if (window === undefined || window === null || typeof window.setProgressBar !== "function") return;
         if (window.isDestroyed()) return;
-        window.setProgressBar(value, {mode: mode});
+        window.setProgressBar(value, { mode: mode });
     }
 
     /**
@@ -320,7 +322,7 @@ class Theme {
     static SOURCE = {
         SYSTEM: "system",
         LIGHT: "light",
-        DARK: "dark"
+        DARK: "dark",
     };
     static #KEY = "theme_source";
     #store = undefined;
@@ -414,7 +416,7 @@ class ClipboardHistory {
     #limit = ClipboardHistory.MAX;
     #store = undefined;
 
-    constructor(options = {limit: ClipboardHistory.MAX, store: undefined}) {
+    constructor(options = { limit: ClipboardHistory.MAX, store: undefined }) {
         if (options.limit !== undefined) this.#limit = options.limit;
         this.#store = options.store;
         this.restore();
@@ -477,7 +479,7 @@ class ClipboardHistory {
     }
 }
 
-exports.Shortcuts = Shortcuts
+exports.Shortcuts = Shortcuts;
 /**
  * Печать: текущее окно, произвольный HTML и PDF.
  *
@@ -492,15 +494,18 @@ exports.Shortcuts = Shortcuts
 class Print {
     static DEFAULT_OPTIONS = {
         printBackground: true,
-        pageSize: "A4"
+        pageSize: "A4",
     };
 
     /** Печать окна; возвращает `{success, failureReason}` — печать асинхронна и не бросает */
     page(window = undefined, options = {}) {
-        if (window === undefined || window === null || window.isDestroyed()) return Promise.resolve({success: false, failureReason: I18n.t("feedback.printNoWindow")});
-        const settings = {...Print.DEFAULT_OPTIONS, ...options};
+        if (window === undefined || window === null || window.isDestroyed())
+            return Promise.resolve({ success: false, failureReason: I18n.t("feedback.printNoWindow") });
+        const settings = { ...Print.DEFAULT_OPTIONS, ...options };
         return new Promise((resolve) => {
-            window.webContents.print(settings, (success, failureReason) => resolve({success: success, failureReason: failureReason}));
+            window.webContents.print(settings, (success, failureReason) =>
+                resolve({ success: success, failureReason: failureReason })
+            );
         });
     }
 
@@ -526,19 +531,22 @@ class Print {
             let file = options.path;
             if (file === undefined) {
                 const suggested = options.fileName === undefined ? "document.pdf" : options.fileName;
-                const result = await dialog.showSaveDialog(options.parent, {defaultPath: suggested, filters: [{name: "PDF", extensions: ["pdf"]}]});
-                if (result.canceled || result.filePath === undefined) return {saved: false, canceled: true};
+                const result = await dialog.showSaveDialog(options.parent, {
+                    defaultPath: suggested,
+                    filters: [{ name: "PDF", extensions: ["pdf"] }],
+                });
+                if (result.canceled || result.filePath === undefined) return { saved: false, canceled: true };
                 file = result.filePath;
             }
             fs.writeFileSync(file, data);
-            return {saved: true, path: file, canceled: false};
+            return { saved: true, path: file, canceled: false };
         } finally {
             if (!window.isDestroyed()) window.close();
         }
     }
 
     static #pdfOptions(options = {}) {
-        const pdf = {...Print.DEFAULT_OPTIONS};
+        const pdf = { ...Print.DEFAULT_OPTIONS };
         for (const key of ["landscape", "pageSize", "scale", "printBackground", "margins", "preferCSSPageSize"]) {
             if (options[key] !== undefined) pdf[key] = options[key];
         }
@@ -550,7 +558,7 @@ class Print {
         const window = new BrowserWindow({
             show: false,
             parent: options.parent,
-            webPreferences: {sandbox: true, contextIsolation: true, nodeIntegration: false}
+            webPreferences: { sandbox: true, contextIsolation: true, nodeIntegration: false },
         });
         const source = `data:text/html;charset=utf-8,${encodeURIComponent(String(html))}`;
         await window.loadURL(source);
@@ -558,12 +566,12 @@ class Print {
     }
 }
 
-exports.Shell = Shell
-exports.Clipboard = Clipboard
-exports.ClipboardHistory = ClipboardHistory
-exports.Theme = Theme
-exports.Locale = Locale
-exports.RecentDocuments = RecentDocuments
-exports.Print = Print
-exports.TaskbarProgress = TaskbarProgress
-exports.SERVICES_CHANNELS = SERVICES_CHANNELS
+exports.Shell = Shell;
+exports.Clipboard = Clipboard;
+exports.ClipboardHistory = ClipboardHistory;
+exports.Theme = Theme;
+exports.Locale = Locale;
+exports.RecentDocuments = RecentDocuments;
+exports.Print = Print;
+exports.TaskbarProgress = TaskbarProgress;
+exports.SERVICES_CHANNELS = SERVICES_CHANNELS;

package/framework/modules/chui_services/desktop.js

@@ -1,4 +1,4 @@
-const {SERVICES_CHANNELS, SERVICES_CALLS, SERVICES_SYNC_CALLS, APP_PATH_NAMES} = require("./chui_channels");
+const { SERVICES_CHANNELS, SERVICES_CALLS, SERVICES_SYNC_CALLS, APP_PATH_NAMES } = require("./chui_channels");
 
 /**
  * Десктоп-сервисы со стороны страницы: буфер обмена, последние документы, прогресс на иконке
@@ -43,25 +43,25 @@ class Desktop {
             remove: (target = undefined) => Desktop.#call("clipboardHistoryRemove", target),
             clear: () => Desktop.#call("clipboardHistoryClear"),
             /** Подписка на изменение истории; возвращает функцию отписки */
-            onChange: (listener = () => {}) => Desktop.#subscribeHistory(listener)
-        }
+            onChange: (listener = () => {}) => Desktop.#subscribeHistory(listener),
+        },
     };
 
     static recent = {
         add: (path = String(), name = undefined) => Desktop.#call("recentAdd", path, name),
         clear: () => Desktop.#call("recentClear"),
-        list: () => Desktop.#call("recentList")
+        list: () => Desktop.#call("recentList"),
     };
 
     static progress = {
         /** `progress.set(0.4)` — 40%; `mode` — TaskbarProgress.MODE */
         set: (value = Number(), mode = "normal") => Desktop.#call("progressSet", value, mode),
-        clear: () => Desktop.#call("progressClear")
+        clear: () => Desktop.#call("progressClear"),
     };
 
     static shell = {
         /** Открыть адрес в браузере по умолчанию; `false` — схема не разрешена */
-        openExternal: (url = String()) => Desktop.#call("shellOpenExternal", String(url))
+        openExternal: (url = String()) => Desktop.#call("shellOpenExternal", String(url)),
     };
 
     /**
@@ -78,7 +78,7 @@ class Desktop {
         page: (options = {}) => Desktop.#call("printPage", options),
         html: (html = String(), options = {}) => Desktop.#call("printHtml", String(html), options),
         /** `{saved, path, canceled}`; с `options.path` диалог сохранения не открывается */
-        pdf: (html = String(), options = {}) => Desktop.#call("printPdf", String(html), options)
+        pdf: (html = String(), options = {}) => Desktop.#call("printPdf", String(html), options),
     };
 
     static shortcuts = {
@@ -86,7 +86,7 @@ class Desktop {
         off: (accelerator = String(), handler = () => {}) => Desktop.#unsubscribe(accelerator, handler),
         offAll: () => Desktop.#unsubscribeAll(),
         /** Комбинации, на которые подписано это окно */
-        get: () => [...Desktop.#shortcut_handlers.keys()]
+        get: () => [...Desktop.#shortcut_handlers.keys()],
     };
 
     /**
@@ -99,14 +99,14 @@ class Desktop {
      * ```
      */
     static theme = {
-        SOURCE: {SYSTEM: "system", LIGHT: "light", DARK: "dark"},
+        SOURCE: { SYSTEM: "system", LIGHT: "light", DARK: "dark" },
         /** @returns {Promise<{theme: string, source: string}>} фактическая тема и выбранный источник */
         get: () => Desktop.#call("themeGet"),
         set: (source = String()) => Desktop.#call("themeSet", String(source)),
         /** Переключить светлую и тёмную */
         toggle: () => Desktop.#call("themeToggle"),
         /** Подписка на смену темы; возвращает функцию отписки */
-        onChange: (listener = () => {}) => Desktop.#subscribeTheme(listener)
+        onChange: (listener = () => {}) => Desktop.#subscribeTheme(listener),
     };
 
     /**
@@ -122,7 +122,7 @@ class Desktop {
         get: () => Desktop.#call("localeGet"),
         set: (locale = String()) => Desktop.#call("localeSet", String(locale)),
         /** Подписка на смену языка; возвращает функцию отписки */
-        onChange: (listener = () => {}) => Desktop.#subscribeLocale(listener)
+        onChange: (listener = () => {}) => Desktop.#subscribeLocale(listener),
     };
 
     /**
@@ -194,7 +194,7 @@ class Desktop {
          * Отвечает значением, а не промисом (синхронный канал), как и `quit()`.
          * @returns {boolean} `true` — перезапуск начат
          */
-        restart: () => Desktop.#callSync("appRestartSync")
+        restart: () => Desktop.#callSync("appRestartSync"),
     };
 
     /**
@@ -208,7 +208,7 @@ class Desktop {
     static dialog = {
         open: (options = Object()) => Desktop.#call("dialogOpen", options),
         save: (options = Object()) => Desktop.#call("dialogSave", options),
-        message: (options = Object()) => Desktop.#call("dialogMessage", options)
+        message: (options = Object()) => Desktop.#call("dialogMessage", options),
     };
 
     /**
@@ -223,7 +223,7 @@ class Desktop {
         /** @returns {Promise<number>} размер кеша в байтах */
         getCacheSize: () => Desktop.#call("sessionCacheSize"),
         clearCache: () => Desktop.#call("sessionClearCache"),
-        clearStorageData: (options = Object()) => Desktop.#call("sessionClearStorage", options)
+        clearStorageData: (options = Object()) => Desktop.#call("sessionClearStorage", options),
     };
 
     // accelerator → набор обработчиков этого окна
@@ -252,7 +252,7 @@ class Desktop {
     static #call(method = String(), ...args) {
         const services = Desktop.#bridge();
         if (services !== undefined && typeof services[method] === "function") return services[method](...args);
-        const {ipcRenderer} = require("electron");
+        const { ipcRenderer } = require("electron");
         return ipcRenderer.invoke(SERVICES_CALLS[method], ...args);
     }
 
@@ -263,9 +263,10 @@ class Desktop {
      */
     static #callSync(method = String(), ...args) {
         const services = Desktop.#bridge();
-        const answer = services !== undefined && typeof services[method] === "function"
-            ? services[method](...args)
-            : require("electron").ipcRenderer.sendSync(SERVICES_SYNC_CALLS[method], ...args);
+        const answer =
+            services !== undefined && typeof services[method] === "function"
+                ? services[method](...args)
+                : require("electron").ipcRenderer.sendSync(SERVICES_SYNC_CALLS[method], ...args);
         if (answer === null || typeof answer !== "object") return answer;
         if (answer.error !== undefined) throw new Error(answer.error);
         return answer.value;
@@ -281,9 +282,7 @@ class Desktop {
      */
     static #appPath(name = String()) {
         if (Desktop.#app_paths.has(name)) return Desktop.#app_paths.get(name);
-        const value = Desktop.#inMainProcess()
-            ? Desktop.#appPathInMain(name)
-            : Desktop.#callSync("appPathSync", name);
+        const value = Desktop.#inMainProcess() ? Desktop.#appPathInMain(name) : Desktop.#callSync("appPathSync", name);
         Desktop.#app_paths.set(name, value);
         return value;
     }
@@ -310,7 +309,9 @@ class Desktop {
      */
     static #electronObject(name = String()) {
         if (Desktop.#inMainProcess() === false) {
-            throw new Error(`Desktop.app: сырой «${name}» доступен только в main-процессе — со страницы возьмите Desktop.app.info(), Desktop.session.* или свой канал из security.channels`);
+            throw new Error(
+                `Desktop.app: сырой «${name}» доступен только в main-процессе — со страницы возьмите Desktop.app.info(), Desktop.session.* или свой канал из security.channels`
+            );
         }
         return require("electron")[name];
     }
@@ -361,7 +362,7 @@ class Desktop {
             Desktop.#shortcut_bridge_unsubscribe = services.onShortcut(Desktop.#onShortcutEvent);
             return;
         }
-        const {ipcRenderer} = require("electron");
+        const { ipcRenderer } = require("electron");
         ipcRenderer.on(SERVICES_CHANNELS.SHORTCUT_EVENT, Desktop.#ipcShortcutEvent);
     }
 
@@ -373,7 +374,7 @@ class Desktop {
             Desktop.#shortcut_bridge_unsubscribe = undefined;
             return;
         }
-        const {ipcRenderer} = require("electron");
+        const { ipcRenderer } = require("electron");
         ipcRenderer.removeListener(SERVICES_CHANNELS.SHORTCUT_EVENT, Desktop.#ipcShortcutEvent);
     }
 
@@ -406,7 +407,7 @@ class Desktop {
             Desktop.#theme_bridge_unsubscribe = theme.onChange(Desktop.#onThemeEvent);
             return;
         }
-        const {ipcRenderer} = require("electron");
+        const { ipcRenderer } = require("electron");
         ipcRenderer.on(SERVICES_CHANNELS.THEME_EVENT, Desktop.#ipcThemeEvent);
     }
 
@@ -418,7 +419,7 @@ class Desktop {
             Desktop.#theme_bridge_unsubscribe = undefined;
             return;
         }
-        const {ipcRenderer} = require("electron");
+        const { ipcRenderer } = require("electron");
         ipcRenderer.removeListener(SERVICES_CHANNELS.THEME_EVENT, Desktop.#ipcThemeEvent);
     }
 
@@ -451,7 +452,7 @@ class Desktop {
             Desktop.#locale_bridge_unsubscribe = locale.onChange(Desktop.#onLocaleEvent);
             return;
         }
-        const {ipcRenderer} = require("electron");
+        const { ipcRenderer } = require("electron");
         ipcRenderer.on(SERVICES_CHANNELS.LOCALE_EVENT, Desktop.#ipcLocaleEvent);
     }
 
@@ -463,7 +464,7 @@ class Desktop {
             Desktop.#locale_bridge_unsubscribe = undefined;
             return;
         }
-        const {ipcRenderer} = require("electron");
+        const { ipcRenderer } = require("electron");
         ipcRenderer.removeListener(SERVICES_CHANNELS.LOCALE_EVENT, Desktop.#ipcLocaleEvent);
     }
 
@@ -494,7 +495,7 @@ class Desktop {
             Desktop.#history_bridge_unsubscribe = services.onClipboardHistory(Desktop.#onHistoryEvent);
             return;
         }
-        const {ipcRenderer} = require("electron");
+        const { ipcRenderer } = require("electron");
         ipcRenderer.on(SERVICES_CHANNELS.CLIPBOARD_HISTORY_EVENT, Desktop.#ipcHistoryEvent);
     }
 
@@ -506,7 +507,7 @@ class Desktop {
             Desktop.#history_bridge_unsubscribe = undefined;
             return;
         }
-        const {ipcRenderer} = require("electron");
+        const { ipcRenderer } = require("electron");
         ipcRenderer.removeListener(SERVICES_CHANNELS.CLIPBOARD_HISTORY_EVENT, Desktop.#ipcHistoryEvent);
     }
 
@@ -515,4 +516,4 @@ class Desktop {
     };
 }
 
-exports.Desktop = Desktop
+exports.Desktop = Desktop;

package/framework/modules/chui_sortable/chui_sortable.js

@@ -1,4 +1,4 @@
-const {setStyles} = require("../chui_functions");
+const { setStyles } = require("../chui_functions");
 
 /**
  * Перестановка элементов внутри контейнера: строки списка, карточки, пункты меню.
@@ -27,7 +27,7 @@ const {setStyles} = require("../chui_functions");
 class Sortable {
     static AXIS = {
         Y: "y",
-        X: "x"
+        X: "x",
     };
 
     #container = undefined;
@@ -43,13 +43,16 @@ class Sortable {
     #baseline = [];
     #bound = false;
 
-    constructor(container = new HTMLElement(), options = {
-        itemSelector: String(),
-        handleSelector: String(),
-        axis: String(),
-        enabled: Boolean(),
-        onReorder: undefined
-    }) {
+    constructor(
+        container = new HTMLElement(),
+        options = {
+            itemSelector: String(),
+            handleSelector: String(),
+            axis: String(),
+            enabled: Boolean(),
+            onReorder: undefined,
+        }
+    ) {
         setStyles(__dirname + "/styles.css", "chUiJS_Sortable");
         this.#container = container;
         this.#item_selector = options.itemSelector === undefined ? "*" : options.itemSelector;
@@ -172,7 +175,7 @@ class Sortable {
         this.#before = undefined;
         if (Sortable.#sameOrder(this.#order_before, this.#items())) return;
         this.#order_before = this.#items();
-        if (this.#on_reorder !== undefined) this.#on_reorder(this.getOrder(), {source: source, before: before});
+        if (this.#on_reorder !== undefined) this.#on_reorder(this.getOrder(), { source: source, before: before });
     }
 
     static #sameOrder(left = [], right = []) {
@@ -218,7 +221,9 @@ class Sortable {
         const forward = this.#axis === Sortable.AXIS.X ? "ArrowRight" : "ArrowDown";
         if (event.key !== backward && event.key !== forward) return;
         const items = this.#items();
-        const current = items.findIndex((item) => item === document.activeElement || item.contains(document.activeElement));
+        const current = items.findIndex(
+            (item) => item === document.activeElement || item.contains(document.activeElement)
+        );
         if (current === -1) return;
         const next = event.key === backward ? current - 1 : current + 1;
         if (next < 0 || next >= items.length) return;
@@ -235,4 +240,4 @@ class Sortable {
     };
 }
 
-exports.Sortable = Sortable
+exports.Sortable = Sortable;

package/framework/modules/chui_validate/chui_validate.js

@@ -15,7 +15,7 @@
  * Общие тексты берутся из словаря текущего языка (`I18n`), поэтому и они переводятся
  * вместе с интерфейсом; свои тексты поля (`messages`) задаются строками и не переводятся.
  */
-const {I18n} = require("../chui_i18n/chui_i18n");
+const { I18n } = require("../chui_i18n/chui_i18n");
 
 /** Ключ словаря для каждого правила: значения-параметры подставляет `I18n.t` */
 const MESSAGE_KEYS = {
@@ -25,7 +25,7 @@ const MESSAGE_KEYS = {
     minLength: "validate.minLength",
     maxLength: "validate.maxLength",
     pattern: "validate.pattern",
-    email: "validate.email"
+    email: "validate.email",
 };
 
 // Сборник общих сообщений остаётся доступен как прежде, но текст берётся из текущей локали:
@@ -34,7 +34,7 @@ const DEFAULT_MESSAGES = {};
 for (const rule of Object.keys(MESSAGE_KEYS)) {
     Object.defineProperty(DEFAULT_MESSAGES, rule, {
         enumerable: true,
-        get: () => I18n.t(MESSAGE_KEYS[rule])
+        get: () => I18n.t(MESSAGE_KEYS[rule]),
     });
 }
 
@@ -63,7 +63,10 @@ const fail = (rule, rules) => ({ valid: false, rule: rule, message: messageFor(r
 
 /** Проверка значения по правилам: {valid, rule?, message?} */
 function check(value, rules = {}) {
-    const empty = typeof value === "boolean" ? value === false : String(value === undefined || value === null ? "" : value).trim() === "";
+    const empty =
+        typeof value === "boolean"
+            ? value === false
+            : String(value === undefined || value === null ? "" : value).trim() === "";
     if (empty) {
         return rules.required === true ? fail("required", rules) : { valid: true };
     }