aleman 1.12.4 → 1.14.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2025.09.18, v1.14.0
+
+feature:
+- 9b7ceb5 aleman: beutify generated fixtues
+
+2025.09.17, v1.13.0
+
+fix:
+- 6c5e67c aleman: menu: select
+
 2025.09.16, v1.12.4
 
 fix:

package/aleman/add-listeners.js

@@ -1,4 +1,9 @@
 import {createVimParser} from './vim.js';
+import {
+    emitBefore,
+    emitIf,
+    emitRun,
+} from './emit.js';
 
 const queryElement = ({name}) => {
     return document.querySelector(`[data-name="${name}"]`);
@@ -65,34 +70,30 @@ export const addGlobalListeners = ({globalAddons, options, readState, writeState
 
 const createListener = ({options, addon, readState, writeState, parseVim = createVimParser()}) => (event) => {
     const {
-        keys,
-        listener,
         preventDefault,
         stopPropagation,
-        filter,
         after,
         afterIf,
-        commands,
     } = addon;
     
-    if (keys && !keys.includes(event.key))
-        return;
-    
-    const [command, count] = parseVim(event);
+    const [isEmitBefore, count] = emitBefore(addon, {
+        event,
+        parseVim,
+    });
     
-    if (commands && !commands.includes(command))
-        return;
+    if (!isEmitBefore)
+        return false;
     
     const state = readState();
     
-    const is = filter?.({
+    const is = emitIf(addon, {
         event,
         state,
         options,
     });
     
-    if (filter && !is)
-        return false;
+    if (!is)
+        return;
     
     if (preventDefault)
         event.preventDefault();
@@ -100,12 +101,11 @@ const createListener = ({options, addon, readState, writeState, parseVim = creat
     if (stopPropagation)
         event.stopPropagation();
     
-    const newState = listener({
+    const newState = emitRun(addon, {
         count,
         event,
         state,
         options,
-        writeState,
     });
     
     writeState(newState);

package/aleman/emit.js

@@ -0,0 +1,52 @@
+export const emit = (addon, {state, options, event, parseVim}) => {
+    const [isEmitBefore, count] = emitBefore(addon, {
+        event,
+        parseVim,
+    });
+    
+    if (!isEmitBefore)
+        return false;
+    
+    if (!emitIf(addon, {state, event}))
+        return state;
+    
+    return emitRun(addon, {
+        event,
+        state,
+        options,
+        count,
+    });
+};
+export const emitIf = (addon, {state, event, options}) => {
+    if (!addon.filter)
+        return true;
+    
+    return addon.filter({
+        state,
+        event,
+        options,
+    });
+};
+
+export const emitRun = (addon, {count, state, event, options}) => {
+    return addon.listener({
+        count,
+        event,
+        state,
+        options,
+    });
+};
+
+export const emitBefore = (addon, {event, parseVim}) => {
+    const {keys, commands} = addon;
+    
+    if (keys && !keys.includes(event.key))
+        return [false];
+    
+    const [command, count] = parseVim(event);
+    
+    if (commands && !commands.includes(command))
+        return [false];
+    
+    return [true, count];
+};

package/aleman/render.js

@@ -14,6 +14,7 @@ export const TRANSFORM = true;
 export const createRender = (html, {options, rules}) => {
     const {source} = branch(html)[0];
     const withDiv = `<template>${source}</template>`;
+    
     const ast = parse(withDiv);
     
     return function render(state) {
@@ -33,7 +34,7 @@ export const createRender = (html, {options, rules}) => {
         });
         
         if (!places.length)
-            return [SKIP];
+            return [SKIP, '', places];
         
         transform(ast, '', {
             rules: currentRules,
@@ -43,7 +44,7 @@ export const createRender = (html, {options, rules}) => {
         const code = print(ast, {
             printer: ['putout', {
                 format: {
-                    newline: '',
+                    newline: '\n',
                     endOfFile: '',
                 },
             }],
@@ -51,8 +52,14 @@ export const createRender = (html, {options, rules}) => {
         
         const prefix = '<template>';
         const suffix = '<\\template>\n';
+        
         const result = merge('', [code]).slice(prefix.length, -suffix.length);
         
-        return [TRANSFORM, result];
+        return [
+            TRANSFORM,
+            result,
+            places,
+        ];
     };
 };
+

package/menu/addons/index.js

@@ -5,10 +5,10 @@ import * as up from './up.js';
 import * as enter from './enter.js';
 import * as left from './left.js';
 import * as right from './right.js';
-import * as shiftG from './shift-g.js';
+import * as shiftG from './shift-g/shift-g.js';
 import * as gg from './gg.js';
 import * as j from './j.js';
-import * as k from './k.js';
+import * as k from './k/k.js';
 
 export const addons = [
     click,

package/menu/addons/k/fixture/k-fix.html

@@ -0,0 +1,9 @@
+
+    <ul data-name="menu" class="menu menu-hidden" style="left: 0px; top: 20px;">
+    <li data-name="menu-item" data-menu-index="0" class="menu-item icon icon-view menu-item-selected">
+    <label data-menu-path="View">View</label>
+</li>
+    <li data-name="menu-item" data-menu-index="1" class="menu-item icon icon-edit">
+    <label data-menu-path="Edit">Edit</label>
+</li>
+</ul>;

package/menu/addons/k/fixture/k.html

@@ -0,0 +1,8 @@
+<ul data-name="menu" className="menu menu-hidden" style="left: 0px; top: 20px;">
+    <li data-name="menu-item" data-menu-index="0" className="menu-item icon icon-view">
+        <label data-menu-path="View">View</label>
+    </li>
+    <li data-name="menu-item" data-menu-index="1" className="menu-item icon icon-edit menu-item-selected">
+        <label data-menu-path="Edit">Edit</label>
+    </li>
+</ul>;

package/menu/addons/k/fixture/m.html

@@ -0,0 +1,8 @@
+<ul data-name="menu" class="menu menu-hidden" style="left: 0px; top: 20px;">
+    <li data-name="menu-item" data-menu-index="0" className="menu-item icon icon-view">
+    <label data-menu-path="View">View</label>
+</li>
+    <li data-name="menu-item" data-menu-index="1" className="menu-item icon icon-edit menu-item-selected">
+    <label data-menu-path="Edit">Edit</label>
+</li>
+</ul>;

package/menu/addons/k/fixture/submenu-fix.html

@@ -0,0 +1,9 @@
+
+    <ul data-name="menu" class="menu menu-hidden" style="left: 0px; top: 20px;">
+    <li data-name="menu-item" data-menu-index="0" class="menu-item icon icon-view">
+    <label data-menu-path="View">View</label>
+</li>
+    <li data-name="menu-item" data-menu-index="1" class="menu-item icon icon-edit menu-item-selected">
+    <label data-menu-path="Edit">Edit</label>
+</li>
+</ul>;

package/menu/addons/k/fixture/submenu.html

@@ -0,0 +1,8 @@
+<ul data-name="menu" class="menu menu-hidden">
+    <li data-name="menu-item" data-menu-index="0" class="menu-item icon icon-view menu-item-selected">
+        <label data-menu-path="View">View</label>
+    </li>
+    <li data-name="menu-item" data-menu-index="1" class="menu-item icon icon-edit">
+        <label data-menu-path="Edit">Edit</label>
+    </li>
+</ul>;

package/menu/addons/{k.js → k/k.js}

@@ -1,6 +1,6 @@
-import * as down from './down.js';
+import * as up from '../up.js';
 
-export const {filter} = down;
+export const {filter} = up;
 export const commands = ['k'];
 
 export function listener({count, state, options}) {
@@ -10,8 +10,8 @@ export function listener({count, state, options}) {
         submenuIndex,
     } = state;
     
-    let newIndex = insideSubmenu ? index : index - count - 1;
-    let newSubmenuIndex = insideSubmenu ? submenuIndex - count - 1 : submenuIndex;
+    let newIndex = insideSubmenu ? index : index - count + 1;
+    let newSubmenuIndex = insideSubmenu ? submenuIndex - count + 1 : submenuIndex;
     
     if (newIndex < -1)
         newIndex = -1;
@@ -25,7 +25,7 @@ export function listener({count, state, options}) {
         submenuIndex: newSubmenuIndex,
     };
     
-    return down.listener({
+    return up.listener({
         state: newState,
         options,
     });

package/menu/addons/shift-g/fixture/hide.html

@@ -0,0 +1,8 @@
+<ul data-name="menu" className="menu menu-hidden" style="left: 0px; top: 20px;">
+    <li data-name="menu-item" data-menu-index="0" className="menu-item icon icon-view">
+        <label data-menu-path="View">View</label>
+    </li>
+    <li data-name="menu-item" data-menu-index="1" className="menu-item icon icon-edit menu-item-selected">
+        <label data-menu-path="Edit">Edit</label>
+    </li>
+</ul>;

package/menu/addons/shift-g/fixture/shift-g-fix.html

@@ -0,0 +1,9 @@
+
+    <ul data-name="menu" class="menu" style="left: 0px; top: 20px;">
+    <li data-name="menu-item" data-menu-index="0" class="menu-item icon icon-view">
+    <label data-menu-path="View">View</label>
+</li>
+    <li data-name="menu-item" data-menu-index="1" class="menu-item icon icon-edit menu-item-selected">
+    <label data-menu-path="Edit">Edit</label>
+</li>
+</ul>;

package/menu/addons/shift-g/fixture/shift-g.html

@@ -0,0 +1,8 @@
+<ul data-name="menu" className="menu menu-hidden" style="left: 0px; top: 20px;">
+    <li data-name="menu-item" data-menu-index="0" className="menu-item icon icon-view menu-item-selected">
+        <label data-menu-path="View">View</label>
+    </li>
+    <li data-name="menu-item" data-menu-index="1" className="menu-item icon icon-edit">
+        <label data-menu-path="Edit">Edit</label>
+    </li>
+</ul>;

package/menu/addons/{shift-g.js → shift-g/shift-g.js}

@@ -1,10 +1,12 @@
-import {getSubmenu} from './submenu/index.js';
+import {getSubmenu} from '../submenu/index.js';
 
 export const keys = [
     'G',
     '$',
 ];
 
+export const filter = ({state}) => state.command === 'show';
+
 export const preventDefault = true;
 
 export const listener = ({state, options}) => {

package/menu/addons/up.js

@@ -3,6 +3,7 @@ import {getSubmenu} from './submenu/index.js';
 export const keys = ['ArrowUp'];
 
 export const preventDefault = true;
+export const filter = ({state}) => state.command === 'show';
 
 export const listener = ({state, options}) => {
     const {menu} = options;

package/menu/importmap.js

@@ -1,6 +1,6 @@
 export const importmap = {
     imports: {
-        'putout': 'https://esm.sh/@putout/bundle@4.7.3',
+        'putout': 'https://esm.sh/@putout/bundle@4.7.4',
         '@putout/processor-html': 'https://esm.sh/@putout/processor-html',
         'fullstore': 'https://esm.sh/fullstore',
         'jessy': 'https://esm.sh/jessy',

package/menu/menu.css

@@ -28,7 +28,7 @@
 .menu-item {
     position: relative;
     padding: 3px 20px;
-    white-space: pre;
+    white-space: nowrap;
 }
 
 .menu-item::after {

package/menu/rules/build-menu/fixture/build-menu-fix.js

@@ -1 +1,8 @@
-<ul data-name="menu" class="menu menu-hidden"><li data-name="menu-item" data-menu-index="0" className="menu-item" data-menu-path="hello"><label data-menu-path="hello">hello</label></li><li data-name="menu-item" data-menu-index="1" className="menu-item" data-menu-path="world"><label data-menu-path="world">world</label></li></ul>;
+<ul data-name="menu" class="menu menu-hidden">
+    <li data-name="menu-item" data-menu-index="0" className="menu-item" data-menu-path="hello">
+    <label data-menu-path="">hello</label>
+</li>
+    <li data-name="menu-item" data-menu-index="1" className="menu-item" data-menu-path="world">
+    <label data-menu-path="">world</label>
+</li>
+</ul>;

package/menu/rules/build-menu/fixture/icon-fix.js

@@ -1 +1,8 @@
-<ul data-name="menu" class="menu menu-hidden"><li data-name="menu-item" data-menu-index="0" className="menu-item icon icon-hello" data-menu-path="hello"><label data-menu-path="hello">hello</label></li><li data-name="menu-item" data-menu-index="1" className="menu-item icon icon-world" data-menu-path="world"><label data-menu-path="world">world</label></li></ul>;
+<ul data-name="menu" class="menu menu-hidden">
+    <li data-name="menu-item" data-menu-index="0" className="menu-item icon icon-hello" data-menu-path="hello">
+    <label data-menu-path="">hello</label>
+</li>
+    <li data-name="menu-item" data-menu-index="1" className="menu-item icon icon-world" data-menu-path="world">
+    <label data-menu-path="">world</label>
+</li>
+</ul>;

package/menu/rules/build-menu/fixture/nested-fix.js

@@ -1 +1,9 @@
-<ul data-name="menu" class="menu menu-hidden"><li data-name="menu-item" data-menu-index="0" className="menu-item icon icon-hello menu-submenu" data-menu-path="hello"><label data-menu-path="hello">hello</label><ul data-name="menu" className="menu menu-hidden"><li data-name="menu-item" data-menu-index="0" className="menu-item icon icon-world" data-menu-path="hello.world"><label data-menu-path="hello.world">world</label></li></ul></li></ul>;
+<ul data-name="menu" class="menu menu-hidden">
+    <li data-name="menu-item" data-menu-index="0" className="menu-item icon icon-hello menu-submenu" data-menu-path="hello">
+    <label data-menu-path="">hello</label>
+    <ul data-name="menu" className="menu menu-hidden">
+        <li data-name="menu-item" data-menu-index="0" className="menu-item icon icon-world" data-menu-path="hello.world">
+        <label data-menu-path="">world</label>
+    </li>
+    </ul></li>
+</ul>;

package/menu/rules/build-menu/index.js

@@ -1,5 +1,10 @@
-import {template, operator} from 'putout';
+import {
+    template,
+    operator,
+    types,
+} from 'putout';
 
+const {jsxText} = types;
 const {
     setAttributeValue,
     hasDataName,
@@ -13,7 +18,9 @@ const isObject = (a) => a && typeof a === 'object';
 export const report = () => `Build menu`;
 
 const createMenuItem = template(`
-    <li data-name="menu-item" data-menu-index="" className="menu-item" data-menu-path=""><label data-menu-path="">NAME</label></li>
+    <li data-name="menu-item" data-menu-index="" className="menu-item" data-menu-path="">
+        <label data-menu-path="">NAME</label>
+    </li>
 `);
 
 const createMenu = template(`
@@ -25,6 +32,9 @@ const DefaultMenu = {
     world: null,
 };
 
+const NEWLINE = jsxText('\n');
+const INDENT = jsxText(' ');
+
 export const fix = ({path, menu, icon, name = ''}) => {
     const {children} = path.node;
     let i = 0;
@@ -32,23 +42,22 @@ export const fix = ({path, menu, icon, name = ''}) => {
     for (const [key, value] of entries(menu)) {
         const menuItem = createMenuItem();
         
-        menuItem.children[0].children[0].value = key;
+        menuItem.children[1].children[0].value = key;
         
         if (icon)
             setIcon(key, menuItem);
         
         setDataMenuIndex(i++, menuItem);
         setDataMenuPath(key, name, menuItem);
-        setDataMenuPath(key, name, menuItem.children[0]);
-        
-        children.push(menuItem);
+        // setDataMenuPath(key, name, menuItem.children[3]);
+        children.push(INDENT, menuItem);
         
         if (isObject(value)) {
             setSubmenu(menuItem);
             menuItem.children.push(createMenu());
             
             const elementPath = path.get('children').at(-1)
-                .get('children.1');
+                .get('children.3');
             
             fix({
                 path: elementPath,
@@ -58,6 +67,8 @@ export const fix = ({path, menu, icon, name = ''}) => {
             });
         }
     }
+    
+    children.push(NEWLINE);
 };
 
 export const traverse = ({options, push}) => ({

package/menu/rules/select/index.js

@@ -6,6 +6,8 @@ const {
     addClassName,
     hasDataName,
     removeClassName,
+    hasAttributeValue,
+    containsClassName,
 } = operator;
 
 const SELECTED = 'menu-item-selected';
@@ -31,6 +33,7 @@ export const traverse = ({options, push}) => ({
             name = 'menu',
             index = 1,
             showSubmenu,
+            insideSubmenu,
         } = options;
         
         if (!hasTagName(path, 'li'))
@@ -44,15 +47,18 @@ export const traverse = ({options, push}) => ({
         if (!hasDataName(parentPath, name))
             return;
         
+        if (!insideSubmenu && !hasAttributeValue(path, 'data-menu-index', String(index)))
+            return;
+        
+        if (!insideSubmenu && containsClassName(path, 'menu-item-selected'))
+            return;
+        
         const children = parentPath.get('children').filter(isJSXElement);
         
         const prev = children[index - 1];
         const current = children[index];
         const next = children[index + 1];
         
-        if (!current)
-            return;
-        
         push({
             path: current,
             prev,

package/menu/rules/unselect-all/fixture/hide.js

@@ -0,0 +1,8 @@
+<ul data-name="menu" class="menu menu-hidden">
+    <li data-name="menu-item" className="menu-item icon icon-view menu-item-selected">
+        <label data-menu-path="View">View</label>
+    </li>
+    <li data-name="menu-item" className="menu-item icon icon-edit menu-item-selected">
+        <label data-menu-path="Edit">Edit</label>
+    </li>
+</ul>;

package/menu/rules/unselect-all/index.js

@@ -18,7 +18,14 @@ export const fix = (path) => {
 
 export const traverse = ({push, options}) => ({
     JSXElement(path) {
-        const {index, name = 'menu'} = options;
+        const {
+            index,
+            name = 'menu',
+            command,
+        } = options;
+        
+        if (command === 'hide')
+            return;
         
         if (index !== -1)
             return;

package/menu/rules/unselect-wrongly-selected/fixture/hide.js

@@ -0,0 +1,17 @@
+// second selected
+<ul data-name="menu" class="menu menu-hidden">
+    <li data-menu-path="Upload" data-name="menu-item" data-menu-index="0" className="menu-item icon icon-view menu-item-selected">
+        <label data-menu-path="Upload">Upload</label>
+    </li>
+    <li data-menu-path="New" data-name="menu-item" data-menu-index="1" className="menu-item icon icon-edit menu-item-selected">
+        <label data-menu-path="New">New</label>
+        <ul data-name="menu" class="menu menu-hidden">
+            <li data-menu-path="New.File" data-name="menu-item" data-menu-index="0" className="menu-item icon icon-view menu-item-selected">
+                <label data-menu-path="Upload">Upload</label>
+            </li>
+            <li data-menu-path="Directory" data-name="menu-item" data-menu-index="1" className="menu-item icon icon-edit">
+                <label data-menu-path="New.Directory">New</label>
+            </li>
+        </ul>
+    </li>
+</ul>;

package/menu/rules/unselect-wrongly-selected/index.js

@@ -15,7 +15,10 @@ export const fix = (path) => {
 
 export const traverse = ({push, options}) => ({
     JSXElement(path) {
-        const {index = 1} = options;
+        const {index = 1, command} = options;
+        
+        if (command === 'hide')
+            return;
         
         if (!hasTagName(path, 'li'))
             return;

package/menu/state.js

@@ -1,19 +1,12 @@
-const {keys} = Object;
-
-export const initState = ({menu, name = 'menu'}) => {
-    const count = keys(menu).length;
-    
-    return {
-        name,
-        command: 'hide',
-        insideSubmenu: false,
-        submenuIndex: 0,
-        showSubmenu: false,
-        index: -1,
-        count,
-        position: {
-            x: 0,
-            y: 20,
-        },
-    };
-};
+export const initState = ({name = 'menu'}) => ({
+    name,
+    command: 'hide',
+    insideSubmenu: false,
+    submenuIndex: 0,
+    showSubmenu: false,
+    index: -1,
+    position: {
+        x: 0,
+        y: 20,
+    },
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aleman",
-  "version": "1.12.4",
+  "version": "1.14.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout-based framework for web",
@@ -23,6 +23,9 @@
     "coverage": "madrun coverage",
     "report": "madrun report"
   },
+  "imports": {
+    "#test": "./test/create-test.js"
+  },
   "dependencies": {
     "@putout/processor-html": "^14.0.2",
     "fullstore": "^3.0.0",