aleman 1.6.2 → 1.7.1

package/ChangeLog

@@ -1,3 +1,13 @@
+2025.09.13, v1.7.1
+
+feature:
+- c5ddd5d vim: restructure
+
+2025.09.13, v1.7.0
+
+feature:
+- 176eb02 aleman: menu: Number + j, Number + k
+
 2025.09.12, v1.6.2
 
 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/index.js

@@ -6,7 +6,7 @@ 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 {createVim} from './vim.js';
+import {createVim} from './vim/index.js';
 
 export const addons = [
     click,

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/gg.js

@@ -0,0 +1,20 @@
+import * as up from '../up.js';
+
+export function gg({state, options}) {
+    const {
+        insideSubmenu,
+        index,
+        submenuIndex,
+    } = state;
+    
+    const newState = {
+        ...state,
+        index: insideSubmenu ? index : 1,
+        submenuIndex: insideSubmenu ? 1 : submenuIndex,
+    };
+    
+    return up.listener({
+        state: newState,
+        options,
+    });
+}

package/menu/addons/vim/index.js

@@ -0,0 +1,69 @@
+import {k} from './k.js';
+import {gg} from './gg.js';
+import {j} from './j.js';
+
+const isNumber = (a) => !Number.isNaN(a) && typeof a === 'number';
+
+export const createVim = () => {
+    const buffer = [];
+    
+    return {
+        events,
+        filter,
+        listener: createListener(buffer),
+    };
+};
+
+const events = ['keydown'];
+
+const filter = ({state}) => state.command === 'show';
+
+const createListener = (buffer) => ({event, state, options}) => {
+    const {key} = event;
+    
+    if (!buffer.length && key === 'g') {
+        buffer.push('g');
+        return null;
+    }
+    
+    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 [count] = buffer;
+    
+    if (isNumber(count) && key === 'j') {
+        buffer = [];
+        return j({
+            count,
+            state,
+            options,
+        });
+    }
+    
+    if (isNumber(count) && key === 'k') {
+        buffer = [];
+        return k({
+            count,
+            state,
+            options,
+        });
+    }
+    
+    if (count === 'g' && key === 'g') {
+        buffer = [];
+        return gg({
+            state,
+            options,
+        });
+    }
+    
+    buffer = [];
+};

package/menu/addons/vim/j.js

@@ -0,0 +1,36 @@
+import * as down from '../down.js';
+import {getSubmenu} from '../submenu/index.js';
+
+export function j({count, state, options}) {
+    const {
+        index,
+        insideSubmenu,
+        submenuIndex,
+    } = state;
+    
+    const menuCount = Object.keys(options.menu).length;
+    const submenuCount = Object.keys(getSubmenu({
+        index,
+        options,
+    })).length;
+    
+    let newIndex = insideSubmenu ? index : index + count - 1;
+    let newSubmenuIndex = insideSubmenu ? submenuIndex + count : 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,
+    });
+}

package/menu/addons/vim/k.js

@@ -0,0 +1,29 @@
+import * as down from '../down.js';
+
+export function k({count, state, options}) {
+    const {
+        insideSubmenu,
+        index,
+        submenuIndex,
+    } = state;
+    
+    let newIndex = insideSubmenu ? index : index - count - 1;
+    let newSubmenuIndex = insideSubmenu ? submenuIndex - count - 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,
+    });
+}

package/package.json

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

package/menu/addons/vim.js

@@ -1,46 +0,0 @@
-import * as up from './up.js';
-
-export const createVim = () => {
-    const buffer = [];
-    
-    return {
-        events,
-        filter,
-        listener: createListener(buffer),
-    };
-};
-
-const events = ['keydown'];
-
-const filter = ({state}) => state.command === 'show';
-
-const createListener = (buffer) => ({event, state, options}) => {
-    const {key} = event;
-    
-    if (!buffer.length && key === 'g') {
-        buffer.push('g');
-        return null;
-    }
-    
-    if (buffer[0] === 'g' && key === 'g') {
-        buffer = [];
-        const {
-            insideSubmenu,
-            index,
-            submenuIndex,
-        } = state;
-        
-        const newState = {
-            ...state,
-            index: insideSubmenu ? index : 1,
-            submenuIndex: insideSubmenu ? 1 : submenuIndex,
-        };
-        
-        return up.listener({
-            state: newState,
-            options,
-        });
-    }
-    
-    buffer = [];
-};