aleman 1.6.1 → 1.7.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2025.09.13, v1.7.0
+
+feature:
+- 176eb02 aleman: menu: Number + j, Number + k
+
+2025.09.12, v1.6.2
+
+fix:
+- acc7a86 aleman: menu: vim: gg: showSubmenu
+
 2025.09.12, v1.6.1
 
 fix:

package/menu/addons/down.js

@@ -1,9 +1,6 @@
 import {getSubmenu} from './submenu/index.js';
 
-export const keys = [
-    'ArrowDown',
-    'j',
-];
+export const keys = ['ArrowDown'];
 export const preventDefault = true;
 
 export const filter = ({state}) => state.command === 'show';

package/menu/addons/shift-g.js

@@ -14,18 +14,18 @@ export const listener = ({state, options}) => {
     
     const menuValues = Object.values(menu);
     
-    if (insideSubmenu && submenuIndex > 0)
-        submenuIndex = 0;
-    
-    if (!insideSubmenu)
-        index = menuValues.length - 1;
-    
     const submenu = getSubmenu({
         index,
         options,
     });
     
     const submenuCount = Object.keys(submenu).length;
+    
+    if (insideSubmenu)
+        submenuIndex = submenuCount - 1;
+    else
+        index = menuValues.length - 1;
+    
     const showSubmenu = submenuCount > 0;
     
     return {

package/menu/addons/up.js

@@ -1,9 +1,6 @@
 import {getSubmenu} from './submenu/index.js';
 
-export const keys = [
-    'ArrowUp',
-    'k',
-];
+export const keys = ['ArrowUp'];
 
 export const preventDefault = true;
 

package/menu/addons/vim.js

@@ -1,4 +1,8 @@
 import * as up from './up.js';
+import * as down from './down.js';
+import {getSubmenu} from './submenu/index.js';
+
+const isNumber = (a) => !Number.isNaN(a) && typeof a === 'number';
 
 export const createVim = () => {
     const buffer = [];
@@ -16,19 +20,102 @@ const filter = ({state}) => state.command === 'show';
 
 const createListener = (buffer) => ({event, state, options}) => {
     const {key} = event;
+    const {index} = state;
+    
+    const menuCount = Object.keys(options.menu).length;
+    const submenuCount = Object.keys(getSubmenu({
+        index,
+        options,
+    })).length;
     
     if (!buffer.length && key === 'g') {
         buffer.push('g');
         return null;
     }
     
-    if (buffer[0] === 'g' && key === 'g') {
+    if (!buffer.length && /\d/.test(key)) {
+        buffer.push(Number(key));
+        return null;
+    }
+    
+    if (!buffer.length && key === 'j')
+        buffer.push(1);
+    
+    if (!buffer.length && key === 'k')
+        buffer.push(1);
+    
+    const [first] = buffer;
+    
+    if (isNumber(first) && key === 'j') {
+        buffer = [];
+        const {insideSubmenu, submenuIndex} = state;
+        
+        let newIndex = insideSubmenu ? index : index + first - 1;
+        let newSubmenuIndex = insideSubmenu ? submenuIndex + first : submenuIndex;
+        
+        if (newIndex > menuCount - 1)
+            newIndex = menuCount - 1;
+        
+        if (newSubmenuIndex > submenuCount - 1)
+            newSubmenuIndex = submenuCount - 1;
+        
+        const newState = {
+            ...state,
+            index: newIndex,
+            submenuIndex: newSubmenuIndex,
+        };
+        
+        return down.listener({
+            state: newState,
+            options,
+        });
+    }
+    
+    if (isNumber(first) && key === 'k') {
+        buffer = [];
+        const {
+            insideSubmenu,
+            index,
+            submenuIndex,
+        } = state;
+        
+        let newIndex = insideSubmenu ? index : index - first - 1;
+        let newSubmenuIndex = insideSubmenu ? submenuIndex - first - 1 : submenuIndex;
+        
+        if (newIndex < -1)
+            newIndex = -1;
+        
+        if (newSubmenuIndex < -1)
+            newSubmenuIndex = -1;
+        
+        const newState = {
+            ...state,
+            index: newIndex,
+            submenuIndex: newSubmenuIndex,
+        };
+        
+        return down.listener({
+            state: newState,
+            options,
+        });
+    }
+    
+    if (first === 'g' && key === 'g') {
         buffer = [];
+        const {
+            insideSubmenu,
+            index,
+            submenuIndex,
+        } = state;
+        
+        const newState = {
+            ...state,
+            index: insideSubmenu ? index : 1,
+            submenuIndex: insideSubmenu ? 1 : submenuIndex,
+        };
+        
         return up.listener({
-            state: {
-                ...state,
-                index: 1,
-            },
+            state: newState,
             options,
         });
     }

package/package.json

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