aleman 1.3.2 → 1.4.0

package/ChangeLog

@@ -1,3 +1,9 @@
+2025.09.04, v1.4.0
+
+feature:
+- 2749907 aleman: menu: select: jsx-operator
+- 43294ec aleman: menu: jsx-operator
+
 2025.09.04, v1.3.2
 
 feature:

package/menu/rules/jsx-operator.js

@@ -41,11 +41,17 @@ export function getAttributePath(path, name) {
     return result;
 }
 
-export function appendAttributeValue(node, name, value) {
+export function appendAttributeValue(path, name, value) {
+    const node = path.node || path;
     const attributeNode = getAttributeNode(node, name);
     
-    if (attributeNode)
-        setLiteralValue(attributeNode.value, `${attributeNode.value.value} ${value}`);
+    if (!attributeNode)
+        return;
+    
+    if (attributeNode.value.value.includes(value))
+        return;
+    
+    setLiteralValue(attributeNode.value, `${attributeNode.value.value} ${value}`);
 }
 
 export function setAttributeValue(node, name, value) {
@@ -54,3 +60,19 @@ export function setAttributeValue(node, name, value) {
     if (attributeNode)
         setLiteralValue(attributeNode.value, value);
 }
+
+export function removeAttributeValue(path, name, attributeValue) {
+    if (!path)
+        return;
+    
+    const node = path.node || path;
+    const classAttribute = getAttributeNode(node, name);
+    
+    if (!classAttribute)
+        return;
+    
+    const {value} = classAttribute.value;
+    
+    if (value.includes(attributeValue))
+        setLiteralValue(classAttribute.value, value.replace(RegExp(`\\s?${attributeValue}`), ''));
+}

package/menu/rules/select/index.js

@@ -1,5 +1,10 @@
 import {operator, types} from 'putout';
 import {checkDataName} from '../check-data-name.js';
+import {
+    appendAttributeValue,
+    getAttributePath,
+    removeAttributeValue,
+} from '../jsx-operator.js';
 
 const {isJSXElement} = types;
 const {setLiteralValue} = operator;
@@ -53,75 +58,30 @@ export const traverse = ({options, push}) => ({
         if (!current)
             return;
         
-        for (const attr of current.get('openingElement.attributes')) {
-            const {name} = attr.node;
-            
-            if (name.name !== 'className')
-                continue;
-            
-            push({
-                path: attr,
-                current,
-                prev,
-                next,
-                showSubmenu,
-            });
-            break;
-        }
+        const currentOpeningElement = current.get('openingElement');
+        const attributePath = getAttributePath(currentOpeningElement, 'className');
+        
+        push({
+            path: attributePath,
+            current,
+            prev,
+            next,
+            showSubmenu,
+        });
     },
 });
 
 function unselect(path) {
-    if (!path)
-        return;
-    
-    for (const attr of path.get('openingElement.attributes')) {
-        const {name, value} = attr.node;
-        
-        if (name.name !== 'className')
-            continue;
-        
-        if (value.value.includes('menu-item-selected'))
-            setLiteralValue(value, value.value.replace(' menu-item-selected', ''));
-    }
+    removeAttributeValue(path, 'className', 'menu-item-selected');
 }
 
 function addShowSubmenu(path, {showSubmenu}) {
-    for (const attr of path.get('openingElement.attributes')) {
-        const {name, value} = attr.node;
-        
-        if (name.name !== 'className')
-            continue;
-        
-        const currentValue = value.value;
-        
-        if (showSubmenu && !currentValue.includes('menu-submenu-show')) {
-            setLiteralValue(value, `${currentValue} menu-submenu-show`);
-            break;
-        }
-        
-        if (!showSubmenu && currentValue.includes('menu-submenu-show')) {
-            setLiteralValue(value, currentValue.replace('menu-submenu-show', ''));
-            break;
-        }
-    }
+    if (showSubmenu)
+        return appendAttributeValue(path, 'className', 'menu-submenu-show');
+    
+    removeAttributeValue(path, 'className', 'menu-submenu-show');
 }
 
 function removeShowSubmenu(path) {
-    if (!path)
-        return;
-    
-    for (const attr of path.get('openingElement.attributes')) {
-        const {name, value} = attr.node;
-        
-        if (name.name !== 'className')
-            continue;
-        
-        const currentValue = value.value;
-        
-        if (currentValue.includes('menu-submenu-show')) {
-            setLiteralValue(value, currentValue.replace(' menu-submenu-show', ''));
-            break;
-        }
-    }
+    removeAttributeValue(path, 'className', 'menu-submenu-show');
 }

package/menu/rules/submenu/fixture/li.js

@@ -0,0 +1,3 @@
+<li data-menu-path="Upload" data-name="menu-item" className="menu-item icon icon-view">
+    <label data-menu-path="Upload">Upload</label>
+</li>

package/menu/rules/submenu/fixture/not-menu.js

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

package/menu/rules/submenu/index.js

@@ -1,5 +1,10 @@
 import {operator, types} from 'putout';
 import {checkDataName} from '../check-data-name.js';
+import {
+    getAttributePath,
+    getAttributeValue,
+    removeAttributeValue,
+} from '../jsx-operator.js';
 
 const {isJSXElement} = types;
 const {setLiteralValue} = operator;
@@ -29,6 +34,9 @@ export const traverse = ({options, push}) => ({
         if (path.node.name.name !== 'li')
             return;
         
+        if (!isJSXElement(path.parentPath.parentPath))
+            return;
+        
         const {insideSubmenu = true, submenuIndex = 1} = options;
         const parentMenu = path.parentPath.parentPath.parentPath;
         
@@ -38,9 +46,6 @@ export const traverse = ({options, push}) => ({
         if (!isParentSelected(parentMenu))
             return;
         
-        if (!isJSXElement(path.parentPath.parentPath))
-            return;
-        
         const openingElementPath = path.parentPath.parentPath.get('openingElement');
         
         if (!checkDataName(openingElementPath))
@@ -58,7 +63,8 @@ export const traverse = ({options, push}) => ({
         if (!current)
             return;
         
-        const [currentClassPath] = getClassPath(current);
+        const currentOpeningElementPath = current.get('openingElement');
+        const currentClassPath = getAttributePath(currentOpeningElementPath, 'className');
         
         push({
             path: currentClassPath,
@@ -70,46 +76,15 @@ export const traverse = ({options, push}) => ({
 });
 
 function isParentSelected(path) {
-    const attributes = path.get('openingElement.attributes');
+    const openingElement = path.get('openingElement');
+    const classAttributeValue = getAttributeValue(openingElement, 'className');
     
-    for (const attr of attributes) {
-        const {name, value} = attr.node;
-        
-        if (name.name === 'className')
-            return value.value.includes('menu-item-selected');
-    }
-    
-    return false;
+    return classAttributeValue.includes('menu-item-selected');
 }
 
 function unselect(path) {
     if (!path)
         return;
     
-    for (const attr of path.get('openingElement.attributes')) {
-        const {name, value} = attr.node;
-        
-        if (name.name !== 'className')
-            continue;
-        
-        if (value.value.includes('menu-item-selected'))
-            setLiteralValue(value, value.value.replace(' menu-item-selected', ''));
-    }
-}
-
-function getClassPath(path) {
-    if (!path)
-        return [null, ''];
-    
-    for (const attr of path.get('openingElement.attributes')) {
-        const {name, value} = attr.node;
-        
-        if (name.name !== 'className')
-            continue;
-        
-        return [
-            attr,
-            value.value,
-        ];
-    }
+    removeAttributeValue(path, 'className', 'menu-item-selected');
 }

package/package.json

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