aleman 1.1.36 → 1.1.38

package/ChangeLog

@@ -0,0 +1,9 @@
+2025.08.30, v1.1.38
+
+fix:
+- c235f46 aleman: menu: submenu
+
+2025.08.29, v1.1.37
+
+fix:
+- abf2a68 aleman: menu: click

package/aleman/index.js

@@ -45,7 +45,7 @@ export const hydrate = (element, {addons, options, state, rules, stateName = 'al
     });
     
     return {
-        run: (event, fn = id, condition) => {
+        run: (event, fn = id) => {
             const state = readState();
             const newState = fn({
                 state,
@@ -60,4 +60,3 @@ export const hydrate = (element, {addons, options, state, rules, stateName = 'al
         },
     };
 };
-

package/menu/addons/click.js

@@ -1,12 +1,10 @@
 export const events = ['click'];
 
-export const filter = ({state}) => {
-    return state.command === 'show';
-};
+export const filter = ({state}) => state.command === 'show';
 
 export const listener = ({options, state}) => {
     options.beforeClick?.(state);
-    options.beforeHide?.(state);
+    options.beforeClose?.(state);
     
     return {
         command: 'hide',

package/menu/addons/context-menu.js

@@ -16,6 +16,7 @@ export const listener = ({event, state, options}) => {
     });
     
     const command = is ? 'show' : 'hide';
+    
     return {
         command,
         position: {

package/menu/addons/enter.js

@@ -2,9 +2,7 @@ const {values} = Object;
 
 export const key = 'Enter';
 
-export const filter = ({state}) => {
-    return state.command === 'show';
-};
+export const filter = ({state}) => state.command === 'show';
 
 export const listener = ({options, state}) => {
     const {index} = state;

package/menu/addons/f9.js

@@ -9,8 +9,6 @@ export const filter = ({state, options}) => {
     return options.beforeShow?.(state);
 };
 
-export const listener = ({options, state}) => {
-    return {
-        command: 'show',
-    };
-};
+export const listener = () => ({
+    command: 'show',
+});

package/menu/hydrate-menu.js

@@ -33,6 +33,7 @@ export const hydrateMenu = (element, options, menu) => {
                 clientX,
                 clientY,
             };
+            
             run(event, contextMenu.listener, options.beforeShow);
         },
         hide: () => run({}, click.listener, options.beforeHide),

package/menu/importmap.json

@@ -1,7 +1,7 @@
 {
-  "imports": {
-    "putout": "https://esm.sh/@putout/bundle",
-    "@putout/processor-html": "https://esm.sh/@putout/processor-html",
-    "fullstore": "https://esm.sh/fullstore"
-  }
+    "imports": {
+        "putout": "https://esm.sh/@putout/bundle",
+        "@putout/processor-html": "https://esm.sh/@putout/processor-html",
+        "fullstore": "https://esm.sh/fullstore"
+    }
 }

package/menu/menu.js

@@ -73,6 +73,7 @@ async function createMap() {
         return;
     
     const script = document.createElement('script');
+    
     const {default: importmap} = await import('./importmap.json', {
         with: {
             type: 'json',

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

@@ -1 +1 @@
-<ul data-name="menu" class="menu menu-hidden"><li data-name='menu-item' className='menu-item icon icon-hello'><label>hello</label></li><li data-name='menu-item' className='menu-item icon icon-world'><label>world</label></li></ul>;
+<ul data-name="menu" class="menu menu-hidden"><li data-name='menu-item' className="menu-item icon icon-hello"><label>hello</label></li><li data-name='menu-item' className="menu-item icon icon-world"><label>world</label></li></ul>;

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

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

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

@@ -0,0 +1 @@
+<ul data-name="menu" class="menu menu-hidden"></ul>;

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

@@ -1,8 +1,13 @@
-import {types, template} from 'putout';
+import {template, operator} from 'putout';
+import {checkDataName} from '../check-data-name.js';
+
+const {setLiteralValue} = operator;
+
+const isObject = (a) => a && typeof a === 'object';
+
+const {entries} = Object;
 
-const {entries, keys} = Object;
 const noop = () => {};
-const {jsxText} = types;
 
 export const report = () => `Build menu`;
 
@@ -10,8 +15,9 @@ const createMenuItem = template(`
     <li data-name="menu-item" className="menu-item"><label>NAME</label></li>
 `);
 
-const NEWLINE = jsxText('\n');
-const INDENT = jsxText(' ');
+const createMenu = template(`
+    <ul data-name="menu" className="menu menu-hidden"></ul>
+`);
 
 const DefaultMenu = {
     hello: noop,
@@ -19,9 +25,9 @@ const DefaultMenu = {
 };
 
 export const fix = ({path, menu, icon}) => {
-    const items = [];
+    const {children} = path.parentPath.node;
     
-    for (const key of keys(menu)) {
+    for (const [key, value] of entries(menu)) {
         const menuItem = createMenuItem();
         
         menuItem.children[0].children[0].value = key;
@@ -29,10 +35,24 @@ export const fix = ({path, menu, icon}) => {
         if (icon)
             setIcon(key, menuItem);
         
-        items.push(menuItem);
+        children.push(menuItem);
+        
+        if (isObject(value)) {
+            setSubmenu(menuItem);
+            menuItem.children.push(createMenu());
+            
+            const openingElement = path.parentPath
+                .get('children')
+                .at(-1)
+                .get('children.1.openingElement');
+            
+            fix({
+                path: openingElement,
+                icon,
+                menu: value,
+            });
+        }
     }
-    
-    path.parentPath.node.children = items;
 };
 
 export const traverse = ({options, push}) => ({
@@ -57,15 +77,15 @@ export const traverse = ({options, push}) => ({
     },
 });
 
-function checkDataName(path, dataName) {
-    const {attributes} = path.node;
+function setSubmenu(menuItem) {
+    const {attributes} = menuItem.openingElement;
     
-    for (const {name, value} of attributes) {
-        if (name.name === 'data-name')
-            return value.value === dataName;
+    for (const attr of attributes) {
+        if (attr.name.name === 'className') {
+            setLiteralValue(attr.value, `${attr.value.value} menu-submenu`);
+            break;
+        }
     }
-    
-    return false;
 }
 
 function setIcon(name, menuItem) {
@@ -73,8 +93,8 @@ function setIcon(name, menuItem) {
     
     for (const attr of attributes) {
         if (attr.name.name === 'className') {
-            attr.value.value += ` icon ${getIconName(name)}`;
-            return;
+            setLiteralValue(attr.value, `${attr.value.value} icon ${getIconName(name)}`);
+            break;
         }
     }
 }
@@ -85,3 +105,4 @@ function getIconName(name) {
         .replace(/\s/g, '-')
         .toLowerCase();
 }
+

package/menu/rules/check-data-name.js

@@ -1,9 +1,7 @@
 export function checkDataName(path, dataName = 'menu') {
-    const attributes = path.get('openingElement.attributes');
+    const {attributes} = path.node;
     
-    for (const attr of attributes) {
-        const {name, value} = attr.node;
-        
+    for (const {name, value} of attributes) {
         if (name.name === 'data-name')
             return value.value === dataName;
     }

package/menu/rules/menu/index.js

@@ -26,7 +26,9 @@ export const traverse = ({push, options}) => ({
         const {name, command} = options;
         const attributes = path.get('attributes');
         
-        if (!checkDataName(path.parentPath, name))
+        const opengineElementPath = path.parentPath.get('openingElement');
+        
+        if (!checkDataName(opengineElementPath, name))
             return false;
         
         for (const attr of attributes) {

package/menu/rules/select/index.js

@@ -24,7 +24,9 @@ export const traverse = ({options, push}) => ({
         if (!isJSXElement(path.parentPath.parentPath))
             return;
         
-        if (!checkDataName(path.parentPath.parentPath, name))
+        const openingElementPath = path.parentPath.parentPath.get('openingElement');
+        
+        if (!checkDataName(openingElementPath, name))
             return;
         
         const children = path.parentPath

package/menu/rules/set-position/index.js

@@ -32,7 +32,9 @@ export const traverse = ({options, push}) => ({
         const {name = 'menu', position = {}} = options;
         const {x = 0, y = 20} = position;
         
-        if (!checkDataName(path.parentPath, name))
+        const openingElementPath = path.parentPath.get('openingElement');
+        
+        if (!checkDataName(openingElementPath, name))
             return;
         
         for (const attr of path.node.attributes) {

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

@@ -26,7 +26,9 @@ export const traverse = ({push, options}) => ({
         if (!isJSXElement(path.parentPath.parentPath))
             return;
         
-        if (!checkDataName(path.parentPath.parentPath, name))
+        const openingElementPath = path.parentPath.parentPath.get('openingElement');
+        
+        if (!checkDataName(openingElementPath, name))
             return;
         
         const children = path.parentPath

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aleman",
-  "version": "1.1.36",
+  "version": "1.1.38",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout-based framework for web",