keycomfort 0.5.0 → 0.7.0

package/dist/keycomfort.js

@@ -14337,7 +14337,7 @@ function requireKarabinerge () {
 	karabinerge.unless_var = unless_var;
 	return karabinerge;
 }var name = "keycomfort";
-var version = "0.4.0";
+var version = "0.7.0";
 var description = "Comfortable keyboard remaps for Karabiner/AutoHotKey";
 var require$$9 = {
 	name: name,
@@ -14358,6 +14358,7 @@ function requireRules () {
 	} = requireKarabinerge();
 
 	const modding = if_var('keycomfort_layer', 1);
+	const mouse_mode = 'keycomfort_mode_mouse';
 	const any = {optional: 'any'};
 	const rules = {
 
@@ -14433,64 +14434,68 @@ function requireRules () {
 		},
 
 		'prev/next word': {
-			sonicpi(c, r) {
-				r.cond(modding)
-				.remap({
-					from: key(c.prev),
-					to:   key('b', 'command')
-				})
-				.remap({
-					from: key(c.next),
-					to:   key('f', 'command')
-				});
+			apps: {
+				sonicpi(c, r) {
+					r.cond(modding)
+					.remap({
+						from: key(c.prev),
+						to:   key('b', 'command')
+					})
+					.remap({
+						from: key(c.next),
+						to:   key('f', 'command')
+					});
+				},
+				others(c, r) {
+					r.cond(modding)
+					.remap({
+						from: key(c.prev),
+						to:   key('left_arrow', 'option')
+					})
+					.remap({
+						from: key(c.next),
+						to:   key('right_arrow', 'option')
+					});
+				},
 			},
-			others(c, r) {
-				r.cond(modding)
-				.remap({
-					from: key(c.prev),
-					to:   key('left_arrow', 'option')
-				})
-				.remap({
-					from: key(c.next),
-					to:   key('right_arrow', 'option')
-				});
-			}
 		},
 
 		'line start/end': {
-			terminal(c, r) {
-				r.cond(modding)
-				.remap({
-					from: key(c.start),
-					to:   key('home')
-				})
-				.remap({
-					from: key(c.end),
-					to:   key('end')
-				});
-			},
-			sonicpi(c, r) {
-				r.cond(modding)
-				.remap({
-					from: key(c.start),
-					to:   key('a', 'control')
-				})
-				.remap({
-					from: key(c.end),
-					to:   key('e', 'control')
-				});
+			apps: {
+				terminal(c, r) {
+					r.cond(modding)
+					.remap({
+						from: key(c.start),
+						to:   key('home')
+					})
+					.remap({
+						from: key(c.end),
+						to:   key('end')
+					});
+				},
+				sonicpi(c, r) {
+					r.cond(modding)
+					.remap({
+						from: key(c.start),
+						to:   key('a', 'control')
+					})
+					.remap({
+						from: key(c.end),
+						to:   key('e', 'control')
+					});
+				},
+				others(c, r) {
+					r.cond(modding)
+					.remap({
+						from: key(c.start),
+						to:   key('left_arrow', 'command')
+					})
+					.remap({
+						from: key(c.end),
+						to:   key('right_arrow', 'command')
+					});
+				},
 			},
-			others(c, r) {
-				r.cond(modding)
-				.remap({
-					from: key(c.start),
-					to:   key('left_arrow', 'command')
-				})
-				.remap({
-					from: key(c.end),
-					to:   key('right_arrow', 'command')
-				});
-			}
 		},
 
 		'select'(c, r) {
@@ -14566,133 +14571,141 @@ function requireRules () {
 		},
 
 		'delete line': {
-			atom(c, r) {
-				r.cond(modding)
-				.remap({
-					from: key(c.key),
-					to:   key('k', ['control', 'shift'])
-				});
-			},
-			vscode(c, r) {
-				r.cond(modding)
-				.remap({
-					from: key(c.key),
-					to:   key('k', ['command', 'shift'])
-				});
-			},
-			eclipse(c, r) {
-				r.cond(modding)
-				.remap({
-					from: key(c.key),
-					to:   key('d', 'command')
-				});
+			apps: {
+				atom(c, r) {
+					r.cond(modding)
+					.remap({
+						from: key(c.key),
+						to:   key('k', ['control', 'shift'])
+					});
+				},
+				vscode(c, r) {
+					r.cond(modding)
+					.remap({
+						from: key(c.key),
+						to:   key('k', ['command', 'shift'])
+					});
+				},
+				eclipse(c, r) {
+					r.cond(modding)
+					.remap({
+						from: key(c.key),
+						to:   key('d', 'command')
+					});
+				},
 			},
 		},
 
 		'insert line': {
-			atom(c, r) {
-				r.cond(modding)
-				.remap({
-					from: key(c.key),
-					to:   key('return_or_enter', 'command')
-				});
-			},
-			vscode(c, r) {
-				r.cond(modding)
-				.remap({
-					from: key(c.key),
-					to:   key('return_or_enter', 'command')
-				});
-			},
-			eclipse(c, r) {
-				r.cond(modding)
-				.remap({
-					from: key(c.key),
-					to:   key('return_or_enter', 'shift')
-				});
+			apps: {
+				atom(c, r) {
+					r.cond(modding)
+					.remap({
+						from: key(c.key),
+						to:   key('return_or_enter', 'command')
+					});
+				},
+				vscode(c, r) {
+					r.cond(modding)
+					.remap({
+						from: key(c.key),
+						to:   key('return_or_enter', 'command')
+					});
+				},
+				eclipse(c, r) {
+					r.cond(modding)
+					.remap({
+						from: key(c.key),
+						to:   key('return_or_enter', 'shift')
+					});
+				},
 			},
 		},
 
 		'move line': {
-			atom(c, r) {
-				r.cond(modding)
-				.remap({
-					from: key(c.up),
-					to:   key('up_arrow', ['command', 'control'])
-				})
-				.remap({
-					from: key(c.down),
-					to:   key('down_arrow', ['command', 'control'])
-				});
-			},
-			vscode(c, r) {
-				r.cond(modding)
-				.remap({
-					from: key(c.up),
-					to:   key('up_arrow', 'option')
-				})
-				.remap({
-					from: key(c.down),
-					to:   key('down_arrow', 'option')
-				});
-			},
-			eclipse(c, r) {
-				r.cond(modding)
-				.remap({
-					from: key(c.up),
-					to:   key('up_arrow', 'option')
-				})
-				.remap({
-					from: key(c.down),
-					to:   key('down_arrow', 'option')
-				});
-			},
-			sonicpi(c, r) {
-				r.cond(modding)
-				.remap({
-					from: key(c.up),
-					to:   key('p', ['command', 'control'])
-				})
-				.remap({
-					from: key(c.down),
-					to:   key('n', ['command', 'control'])
-				});
+			apps: {
+				atom(c, r) {
+					r.cond(modding)
+					.remap({
+						from: key(c.up),
+						to:   key('up_arrow', ['command', 'control'])
+					})
+					.remap({
+						from: key(c.down),
+						to:   key('down_arrow', ['command', 'control'])
+					});
+				},
+				vscode(c, r) {
+					r.cond(modding)
+					.remap({
+						from: key(c.up),
+						to:   key('up_arrow', 'option')
+					})
+					.remap({
+						from: key(c.down),
+						to:   key('down_arrow', 'option')
+					});
+				},
+				eclipse(c, r) {
+					r.cond(modding)
+					.remap({
+						from: key(c.up),
+						to:   key('up_arrow', 'option')
+					})
+					.remap({
+						from: key(c.down),
+						to:   key('down_arrow', 'option')
+					});
+				},
+				sonicpi(c, r) {
+					r.cond(modding)
+					.remap({
+						from: key(c.up),
+						to:   key('p', ['command', 'control'])
+					})
+					.remap({
+						from: key(c.down),
+						to:   key('n', ['command', 'control'])
+					});
+				},
 			},
 		},
 
 		'left/right tab': {
-			vscode(c, r) {
-				r.cond(modding)
-				.remap({
-					from: key(c.left),
-					to:   key('left_arrow', ['command', 'option'])
-				})
-				.remap({
-					from: key(c.right),
-					to:   key('right_arrow', ['command', 'option'])
-				});
-			},
-			eclipse(c, r) {
-				r.cond(modding)
-				.remap({
-					from: key(c.left),
-					to:   key('page_up', 'control')
-				})
-				.remap({
-					from: key(c.right),
-					to:   key('page_down', 'control')
-				});
-			},
-			others(c, r) {
-				r.cond(modding)
-				.remap({
-					from: key(c.left),
-					to:   key('tab', ['control', 'shift'])
-				})
-				.remap({
-					from: key(c.right),
-					to:   key('tab', 'control')
-				});
+			apps: {
+				vscode(c, r) {
+					r.cond(modding)
+					.remap({
+						from: key(c.left),
+						to:   key('left_arrow', ['command', 'option'])
+					})
+					.remap({
+						from: key(c.right),
+						to:   key('right_arrow', ['command', 'option'])
+					});
+				},
+				eclipse(c, r) {
+					r.cond(modding)
+					.remap({
+						from: key(c.left),
+						to:   key('page_up', 'control')
+					})
+					.remap({
+						from: key(c.right),
+						to:   key('page_down', 'control')
+					});
+				},
+				others(c, r) {
+					r.cond(modding)
+					.remap({
+						from: key(c.left),
+						to:   key('tab', ['control', 'shift'])
+					})
+					.remap({
+						from: key(c.right),
+						to:   key('tab', 'control')
+					});
+				},
 			},
 		},
 
@@ -14917,32 +14930,132 @@ function requireRules () {
 			});
 		},
 
-		'l-click'(c, r) {
-			r.cond(if_touched(1))
-			.remap({
-				from: key(c.from, any),
-				to:   {pointing_button: c.to}
-			});
+		'mouse mode': {
+			'on'(c, r) {
+				r.cond(modding)
+				.cond(if_var(mouse_mode, 0))
+				.remap({
+					from: key(c.on),
+					to:   set_var(mouse_mode, 1)
+				});
+			},
+			'off'(c, r) {
+				r.cond(modding)
+				.cond(if_var(mouse_mode, 1))
+				.remap({
+					from: key(c.off),
+					to:   set_var(mouse_mode, 0)
+				});
+			},
 		},
 
-		'r-click'(c, r) {
-			r.cond(if_touched(1))
-			.remap({
-				from: key(c.from, any),
-				to:   {pointing_button: c.to}
-			});
+		'mouse move'(c, r) {
+			r.cond(if_var(mouse_mode, 1))
+			.cond(if_touched(0));
+			mouse_move(c, r);
 		},
 
-		'm-click'(c, r) {
-			r.cond(if_touched(1))
-			.remap({
-				from: key(c.from, any),
-				to:   {pointing_button: c.to}
-			});
+		'mouse buttons'(c, r) {
+			r.cond(if_var(mouse_mode, 1))
+			.cond(if_touched(0));
+			mouse_buttons(c, r);
+		},
+
+		'mouse wheel up/down'(c, r) {
+			r.cond(if_var(mouse_mode, 1))
+			.cond(if_touched(0));
+			mouse_wheel_v(c, r);
+		},
+
+		'mouse wheel left/right'(c, r) {
+			r.cond(if_var(mouse_mode, 1))
+			.cond(if_touched(0));
+			mouse_wheel_h(c, r);
+		},
+
+		'touch to mouse move'(c, r) {
+			r.cond(if_touched(1));
+			mouse_move(c, r);
+		},
+
+		'touch to mouse buttons'(c, r) {
+			r.cond(if_touched(1));
+			mouse_buttons(c, r);
+		},
+
+		'touch to mouse wheel up/down'(c, r) {
+			r.cond(if_touched(1));
+			mouse_wheel_v(c, r);
+		},
+
+		'touch to mouse wheel left/right'(c, r) {
+			r.cond(if_touched(1));
+			mouse_wheel_h(c, r);
 		},
 
 	};
 
+	function mouse_move(c, r) {
+		let speed = Math.round(1536 * c.speed);
+		r.remap({
+			from: key(c.up, any),
+			to:   {mouse_key: {y: -speed}}
+		})
+		.remap({
+			from: key(c.right, any),
+			to:   {mouse_key: {x: speed}}
+		})
+		.remap({
+			from: key(c.down, any),
+			to:   {mouse_key: {y: speed}}
+		})
+		.remap({
+			from: key(c.left, any),
+			to:   {mouse_key: {x: -speed}}
+		});
+	}
+
+	function mouse_buttons(c, r) {
+		r.remap({
+			from: key(c.left, any),
+			to:   {pointing_button: 'button1'}
+		})
+		.remap({
+			from: key(c.right, any),
+			to:   {pointing_button: 'button2'}
+		});
+		r.remap({
+			from: key(c.middle, any),
+			to:   {pointing_button: 'button3'}
+		});
+	}
+
+	function mouse_wheel_v(c, r) {
+		let speed = Math.round(32 * c.speed);
+		let flip = c.reverse ? -1 : 1;
+		r.remap({
+			from: key(c.up, any),
+			to:   {mouse_key: {vertical_wheel: -speed * flip}}
+		})
+		.remap({
+			from: key(c.down, any),
+			to:   {mouse_key: {vertical_wheel: speed * flip}}
+		});
+	}
+
+	function mouse_wheel_h(c, r) {
+		let speed = Math.round(32 * c.speed);
+		let flip = c.reverse ? -1 : 1;
+		r.remap({
+			from: key(c.left, any),
+			to:   {mouse_key: {horizontal_wheel: speed * flip}}
+		})
+		.remap({
+			from: key(c.right, any),
+			to:   {mouse_key: {horizontal_wheel: -speed * flip}}
+		});
+	}
+
 	rules_1 = rules;
 	return rules_1;
 }var hasRequiredMain;
@@ -14995,7 +15108,7 @@ function requireMain () {
 
 	const pkg = require$$9;
 	const rules = requireRules();
-	const defaultsYML = "# === KEYCOMFORT CONFIG ===\n# NOTE:\n#   0 means \"No\"\n#   1 means \"Yes\"\n\npaths:\n  karabiner:\n    save_as:    ~/.config/karabiner/assets/complex_modifications/keycomfort.json\n    apply_to:   ~/.config/karabiner/karabiner.json\n  ahk:\n    save_as:    ~/Desktop/keycomfort.ahk\n    apply_to:\n\nvim_like: 0  # prefer vim-like mappings?\n\nrules:  # mapping rules\n\n  modifier:\n    desc:       Use [key] as a special modifier key (Required)\n    enable:     1\n    key:        spacebar\n    alone:      spacebar\n\n  cancel modifier:\n    desc:       Cancel modifier (<modifier>) with [key]\n    enable:     1\n    key:        left_shift\n\n  disable modifier:\n    desc:       Disable modifier (<modifier>) with <modifier> + [key]\n    enable:     1\n    key:        right_shift + escape\n\n  enable modifier:\n    desc:       Enable modifier (<modifier>) with [key]\n    enable:     1\n    key:        right_shift + escape\n\n  arrows:\n    desc:       <modifier> + { [up] / [right] / [down] / [left] } = Up / Right / Down / Left\n    enable:     1\n    up:         e\n    right:      f\n    down:       d\n    left:       s\n\n  page up/down:\n    desc:       <modifier> + { [up] / [down] } = Page Up / Down\n    enable:     1\n    up:         w\n    down:       r\n\n  prev/next word:\n    desc:       <modifier> + { [prev] / [next] } = Prev / Next Word\n    enable:     1\n    prev:       a\n    next:       g\n    apps:\n      sonicpi:  1\n      others:   1\n\n  line start/end:\n    desc:       <modifier> + { [start] / [end] } = Line Start / End\n    enable:     1\n    start:      q\n    end:        t\n    apps:\n      terminal: 1\n      sonicpi:  1\n      others:   1\n\n  select:\n    desc:       <modifier> + { [up] / [right] / [down] / [left] } = Select Up / Right / Down / Left\n    enable:     1\n    up:         i\n    right:      l\n    down:       k\n    left:       j\n    vim:\n      left:     h\n      down:     j\n      up:       k\n      right:    l\n\n  indent/outdent:\n    desc:       <modifier> + { [indent] / [outdent] } = Indent / Outdent\n    enable:     1\n    indent:     o\n    outdent:    u\n\n  backspace/delete:\n    desc:       <modifier> + { [backspace] / [delete] } = Backspace / Delete\n    enable:     1\n    backspace:  n\n    delete:     m\n\n  delete word:\n    desc:       <modifier> + [key] = Delete Word\n    enable:     1\n    key:        b\n\n  edit:\n    desc:       <modifier> + { [undo] / [cut] / [copy] / [paste] } = Undo / Cut / Copy / Paste\n    enable:     1\n    undo:       z\n    cut:        x\n    copy:       c\n    paste:      v\n\n  delete line:\n    desc:       <modifier> + [key] = Delete Line\n    enable:     1\n    key:        shift + m\n    apps:\n      atom:     1\n      vscode:   1\n      eclipse:  1\n\n  insert line:\n    desc:       <modifier> + [key] = New Line Below\n    enable:     1\n    key:        return_or_enter\n    apps:\n      atom:     1\n      vscode:   1\n      eclipse:  1\n\n  move line:\n    desc:       <modifier> + { [up] / [down] } = Move Line Up / Down\n    enable:     1\n    up:         shift + i\n    down:       shift + k\n    vim:\n      up:       shift + k\n      down:     shift + j\n    apps:\n      atom:     1\n      vscode:   1\n      eclipse:  1\n      sonicpi:  1\n\n  left/right tab:\n    desc:       <modifier> + { [left] / [right] } = Left / Right Tab\n    enable:     1\n    left:       2\n    right:      3\n    apps:\n      vscode:   1\n      eclipse:  1\n      others:   1\n\n  close/open tab:\n    desc:       <modifier> + { [close] / [open] } = Close / Open Tab\n    enable:     1\n    close:      1\n    open:       4\n\n  numpad:\n    desc:       <modifier> + [trigger] = Numpad Mode ([num1]=1, [num5]=5, [num9]=9)\n    enable:     1\n    trigger:    left_control\n\n    num0:       b\n    num1:       n\n    num2:       m\n    num3:       comma\n\n    num4:       j\n    num5:       k\n    num6:       l\n\n    num7:       u\n    num8:       i\n    num9:       o\n\n    slash:      8\n    asterisk:   9\n    hyphen:     0\n    plus:       p\n\n    enter:      slash\n    delete:     semicolon\n    backspace:  h\n\n  plus/minus:\n    desc:       <modifier> + { [plus] / [minus] } = Plus / Minus\n    enable:     1\n    plus:       p\n    minus:      shift + p\n    to:\n      plus:     shift + equal_sign\n      minus:    hyphen\n\n  backslash:\n    desc:       <modifier> + [from] = Backslash\n    enable:     1\n    from:       slash\n    to:         backslash\n\n  backtick:\n    desc:       <modifier> + [from] = Backtick\n    enable:     1\n    from:       quote\n    to:         grave_accent_and_tilde\n\n  tilde:\n    desc:       <modifier> + [from] = Tilde\n    enable:     1\n    from:       hyphen\n    to:         shift + grave_accent_and_tilde\n\n  pipe:\n    desc:       <modifier> + [from] = Pipe\n    enable:     1\n    from:       7\n    to:         shift + backslash\n\n  equal:\n    desc:       <modifier> + [from] = Equal Sign\n    enable:     1\n    from:       semicolon\n    to:         equal_sign\n\n  enter:\n    desc:       <modifier> + [from] = Enter\n    enable:     1\n    from:       tab\n    to:         return_or_enter\n\n  underscore:\n    desc:       <modifier> + [from] = Underscore\n    enable:     1\n    from:       period\n    to:         shift + hyphen\n\n  custom:\n    desc:       <modifier> + Custom Keys\n    enable:     1\n    rules:\n      # Examples\n      # - from: p\n      #   to:   shift + equal_sign\n\n  remap capslock:\n    desc:       Caps Lock = [to] / [alone]\n    enable:     1\n    to:         left_control\n    alone:      escape\n\n  remap l-control:\n    desc:       Left Control = [to] / [alone]\n    enable:     1\n    to:         left_control\n    alone:      escape\n\n  remap r-control:\n    desc:       Right Control = [to] / [alone]\n    enable:     0\n    to:         right_control\n    alone:      escape\n\n  remap l-command:\n    desc:       Left Command = [to] / [alone]\n    enable:     0\n    to:         left_command\n    alone:      left_command\n\n  remap r-command:\n    desc:       Right Command = [to] / [alone]\n    enable:     0\n    to:         right_command\n    alone:      right_command\n\n  remap l-shift:\n    desc:       Left Shift = [to] / [alone]\n    enable:     0\n    to:         left_shift\n    alone:      left_shift\n\n  remap r-shift:\n    desc:       Right Shift = [to] / [alone]\n    enable:     0\n    to:         right_shift\n    alone:      right_shift\n\n  l-click:\n    desc:       (MultiTouchExtension) Touchpad + [from] = [to]\n    enable:     1\n    from:       j\n    to:         button1\n\n  r-click:\n    desc:       (MultiTouchExtension) Touchpad + [from] = [to]\n    enable:     1\n    from:       l\n    to:         button2\n\n  m-click:\n    desc:       (MultiTouchExtension) Touchpad + [from] = [to]\n    enable:     1\n    from:       k\n    to:         button3\n\n\napps:\n  others:\n    enable: 1\n\n  login:\n    enable: 1\n    id:\n    - com.apple.loginwindow\n\n  terminal:\n    enable: 1\n    id:\n    - com.apple.Terminal\n    - com.googlecode.iterm2\n    - org.alacritty\n    exe:\n    - cmd.exe\n\n  vscode:\n    enable: 0\n    id:\n    - com.microsoft.VSCode\n    - com.vscodium\n    exe:\n    - Code.exe\n\n  atom:\n    enable: 0\n    id:\n    - com.github.atom\n    - dev.pulsar-edit.pulsar\n\n  eclipse:\n    enable: 0\n    id:\n    - org.eclipse.platform.ide\n    exe:\n    - eclipse.exe\n\n  sonicpi:\n    enable: 0\n    id:\n    - net.sonic-pi.app\n\n\nkey_labels:  # display names for key codes\n  spacebar: Space\n  return_or_enter: Enter\n  grave_accent_and_tilde: Backtick\n  button1: Left Click\n  button2: Right Click\n  button3: Middle Click\n  japanese_eisuu: 英数\n  japanese_kana: かな\n\n";
+	const defaultsYML = "# === KEYCOMFORT CONFIG ===\n# NOTE:\n#   0 means \"No\"\n#   1 means \"Yes\"\n\npaths:\n  karabiner:\n    save_as:    ~/.config/karabiner/assets/complex_modifications/keycomfort.json\n    apply_to:   ~/.config/karabiner/karabiner.json\n  ahk:\n    save_as:    ~/Desktop/keycomfort.ahk\n    apply_to:\n\nvim_like: 0  # prefer vim-like mappings?\n\nrules:  # mapping rules\n\n  modifier:\n    desc:       Use [key] as a special modifier key (Required)\n    enable:     1\n    key:        spacebar\n    alone:      spacebar\n\n  cancel modifier:\n    desc:       Cancel modifier (<modifier>) with [key]\n    enable:     1\n    key:        left_shift\n\n  disable modifier:\n    desc:       Disable modifier (<modifier>) with <modifier> + [key]\n    enable:     1\n    key:        right_shift + escape\n\n  enable modifier:\n    desc:       Enable modifier (<modifier>) with [key]\n    enable:     1\n    key:        right_shift + escape\n\n  arrows:\n    desc:       <modifier> + { [up] / [right] / [down] / [left] } = Up / Right / Down / Left\n    enable:     1\n    up:         e\n    right:      f\n    down:       d\n    left:       s\n\n  page up/down:\n    desc:       <modifier> + { [up] / [down] } = Page Up / Down\n    enable:     1\n    up:         w\n    down:       r\n\n  prev/next word:\n    desc:       <modifier> + { [prev] / [next] } = Prev / Next Word\n    enable:     1\n    prev:       a\n    next:       g\n    apps:\n      sonicpi:  1\n      others:   1\n\n  line start/end:\n    desc:       <modifier> + { [start] / [end] } = Line Start / End\n    enable:     1\n    start:      q\n    end:        t\n    apps:\n      terminal: 1\n      sonicpi:  1\n      others:   1\n\n  select:\n    desc:       <modifier> + { [up] / [right] / [down] / [left] } = Select Up / Right / Down / Left\n    enable:     1\n    up:         i\n    right:      l\n    down:       k\n    left:       j\n    vim:\n      left:     h\n      down:     j\n      up:       k\n      right:    l\n\n  indent/outdent:\n    desc:       <modifier> + { [indent] / [outdent] } = Indent / Outdent\n    enable:     1\n    indent:     o\n    outdent:    u\n\n  backspace/delete:\n    desc:       <modifier> + { [backspace] / [delete] } = Backspace / Delete\n    enable:     1\n    backspace:  n\n    delete:     m\n\n  delete word:\n    desc:       <modifier> + [key] = Delete Word\n    enable:     1\n    key:        b\n\n  edit:\n    desc:       <modifier> + { [undo] / [cut] / [copy] / [paste] } = Undo / Cut / Copy / Paste\n    enable:     1\n    undo:       z\n    cut:        x\n    copy:       c\n    paste:      v\n\n  delete line:\n    desc:       <modifier> + [key] = Delete Line\n    enable:     1\n    key:        shift + m\n    apps:\n      atom:     1\n      vscode:   1\n      eclipse:  1\n\n  insert line:\n    desc:       <modifier> + [key] = New Line Below\n    enable:     1\n    key:        return_or_enter\n    apps:\n      atom:     1\n      vscode:   1\n      eclipse:  1\n\n  move line:\n    desc:       <modifier> + { [up] / [down] } = Move Line Up / Down\n    enable:     1\n    up:         shift + i\n    down:       shift + k\n    vim:\n      up:       shift + k\n      down:     shift + j\n    apps:\n      atom:     1\n      vscode:   1\n      eclipse:  1\n      sonicpi:  1\n\n  left/right tab:\n    desc:       <modifier> + { [left] / [right] } = Left / Right Tab\n    enable:     1\n    left:       2\n    right:      3\n    apps:\n      vscode:   1\n      eclipse:  1\n      others:   1\n\n  close/open tab:\n    desc:       <modifier> + { [close] / [open] } = Close / Open Tab\n    enable:     1\n    close:      1\n    open:       4\n\n  numpad:\n    desc:       <modifier> + [trigger] = Numpad Mode ([num1]=1, [num5]=5, [num9]=9)\n    enable:     1\n    trigger:    left_control\n\n    num0:       b\n    num1:       n\n    num2:       m\n    num3:       comma\n\n    num4:       j\n    num5:       k\n    num6:       l\n\n    num7:       u\n    num8:       i\n    num9:       o\n\n    slash:      8\n    asterisk:   9\n    hyphen:     0\n    plus:       p\n\n    enter:      slash\n    delete:     semicolon\n    backspace:  h\n\n  plus/minus:\n    desc:       <modifier> + { [plus] / [minus] } = Plus / Minus\n    enable:     1\n    plus:       p\n    minus:      shift + p\n    to:\n      plus:     shift + equal_sign\n      minus:    hyphen\n\n  backslash:\n    desc:       <modifier> + [from] = Backslash\n    enable:     1\n    from:       slash\n    to:         backslash\n\n  backtick:\n    desc:       <modifier> + [from] = Backtick\n    enable:     1\n    from:       quote\n    to:         grave_accent_and_tilde\n\n  tilde:\n    desc:       <modifier> + [from] = Tilde\n    enable:     1\n    from:       hyphen\n    to:         shift + grave_accent_and_tilde\n\n  pipe:\n    desc:       <modifier> + [from] = Pipe\n    enable:     1\n    from:       7\n    to:         shift + backslash\n\n  equal:\n    desc:       <modifier> + [from] = Equal Sign\n    enable:     1\n    from:       semicolon\n    to:         equal_sign\n\n  enter:\n    desc:       <modifier> + [from] = Enter\n    enable:     1\n    from:       tab\n    to:         return_or_enter\n\n  underscore:\n    desc:       <modifier> + [from] = Underscore\n    enable:     1\n    from:       period\n    to:         shift + hyphen\n\n  custom:\n    desc:       <modifier> + Custom Keys\n    enable:     1\n    rules:\n      # Examples\n      # - from: p\n      #   to:   shift + equal_sign\n\n  remap capslock:\n    desc:       Caps Lock = [to] / [alone]\n    enable:     1\n    to:         left_control\n    alone:      escape\n\n  remap l-control:\n    desc:       Left Control = [to] / [alone]\n    enable:     1\n    to:         left_control\n    alone:      escape\n\n  remap r-control:\n    desc:       Right Control = [to] / [alone]\n    enable:     0\n    to:         right_control\n    alone:      escape\n\n  remap l-command:\n    desc:       Left Command = [to] / [alone]\n    enable:     0\n    to:         left_command\n    alone:      left_command\n\n  remap r-command:\n    desc:       Right Command = [to] / [alone]\n    enable:     0\n    to:         right_command\n    alone:      right_command\n\n  remap l-shift:\n    desc:       Left Shift = [to] / [alone]\n    enable:     0\n    to:         left_shift\n    alone:      left_shift\n\n  remap r-shift:\n    desc:       Right Shift = [to] / [alone]\n    enable:     0\n    to:         right_shift\n    alone:      right_shift\n\n  mouse mode:\n    desc:       <modifier> + { [on] / [off] } = Mouse Mode On / Off\n    enable:     1\n    on:         9\n    off:        0\n\n  mouse move:\n    desc:       (Mouse Mode) [up] / [right] / [down] / [left] = Move Mouse Up / Right / Down / Left\n    enable:     1\n    up:         e\n    right:      f\n    down:       d\n    left:       s\n    speed:      1.0\n\n  mouse buttons:\n    desc:       (Mouse Mode) [left] / [middle] / [right] = Mouse Buttons Left / Middle / Right\n    enable:     1\n    left:       j\n    middle:     m\n    right:      l\n\n  mouse wheel up/down:\n    desc:       (Mouse Mode) [up] / [down] = Mouse Wheel Up / Down\n    enable:     1\n    up:         i\n    down:       k\n    speed:      1.0\n\n  mouse wheel left/right:\n    desc:       (Mouse Mode) [left] / [right] = Mouse Wheel Left / Right\n    enable:     1\n    left:       h\n    right:      semicolon\n    speed:      1.0\n\n  touch to mouse move:\n    desc:       Touchpad + { [up] / [right] / [down] / [left] } = Move Mouse Up / Right / Down / Left\n    enable:     1\n    up:         e\n    right:      f\n    down:       d\n    left:       s\n    speed:      1.0\n\n  touch to mouse buttons:\n    desc:       Touchpad + { [left] / [middle] / [right] } = Mouse Buttons Left / Middle / Right\n    enable:     1\n    left:       j\n    middle:     m\n    right:      l\n\n  touch to mouse wheel up/down:\n    desc:       Touchpad + { [up] / [down] } = Mouse Wheel Up / Down\n    enable:     1\n    up:         i\n    down:       k\n    speed:      1.0\n\n  touch to mouse wheel left/right:\n    desc:       Touchpad + { [left] / [right] } = Mouse Wheel Left / Right\n    enable:     1\n    left:       h\n    right:      semicolon\n    speed:      1.0\n\n\napps:\n  others:\n    enable: 1\n\n  login:\n    enable: 1\n    id:\n    - com.apple.loginwindow\n\n  terminal:\n    enable: 1\n    id:\n    - com.apple.Terminal\n    - com.googlecode.iterm2\n    - org.alacritty\n    exe:\n    - cmd.exe\n\n  vscode:\n    enable: 0\n    id:\n    - com.microsoft.VSCode\n    - com.vscodium\n    exe:\n    - Code.exe\n\n  atom:\n    enable: 0\n    id:\n    - com.github.atom\n    - dev.pulsar-edit.pulsar\n\n  eclipse:\n    enable: 0\n    id:\n    - org.eclipse.platform.ide\n    exe:\n    - eclipse.exe\n\n  sonicpi:\n    enable: 0\n    id:\n    - net.sonic-pi.app\n\n\nkey_labels:  # display names for key codes\n  spacebar: Space\n  return_or_enter: Enter\n  grave_accent_and_tilde: Backtick\n  button1: Left Click\n  button2: Right Click\n  button3: Middle Click\n  japanese_eisuu: 英数\n  japanese_kana: かな\n\n";
 	const defaults = yaml.parse(defaultsYML);
 	const defaultConfig = loc(io.home, '.config', 'keycomfort', 'config.yml');
 
@@ -15176,57 +15289,67 @@ function requireMain () {
 			if (userConfig) config = merge(config, userConfig);
 		}
 		let modifier = config.rules.modifier.key;
-		let apps = config.apps;
-		let labels = config.key_labels;
-		let vim = config.vim_like;
+		let apps     = config.apps;
+		let labels   = config.key_labels;
+		let vim      = config.vim_like;
 
-		// run rules
 		let ruleSet = new RuleSet('KeyComfort');
-		for (let i in rules) {
-
-			// rule config
-			let rc = config.rules[i];
-			if (!rc) continue;
-			if (!rc.enable) continue; // rule disabled
 
+		function addRule(rule, rc, desc = undefined) {
 			// overwrite conf with vim-like mappings
-			if (rc.vim && vim) rc = merge(rc, rc.vim);
+			if (vim && rc.vim) rc = merge(rc, rc.vim);
 
 			// format rule description
-			let desc = rc.desc.replaceAll(/(?:<modifier>|\[([_0-9a-z]+)\])/gi, (_, m1) => {
-				return label(m1 ? rc[m1] : modifier, labels);
-			});
-
-			let rule = rules[i];
-			let newRule;
+			if (!desc) {
+				desc = rc.desc.replaceAll(/(?:<modifier>|\[([_0-9a-z]+)\])/gi, (_, m1) => {
+					return label(m1 ? rc[m1] : modifier, labels);
+				});
+			}
 
-			// non app-specific rule
+			// apply rule
 			if (typeof rule == 'function') {
-				newRule = ruleSet.add(desc);
-				rule(rc, newRule);
-				continue;
+				rule(rc, ruleSet.add(desc));
+				return;
 			}
 
-			// app-specific rule
-			let enabled = []; // enabled apps
-			for (let app in rule) {
-				if (app == 'others') continue;
-				if (!apps[app]) continue; // invalid app
-				if (!apps[app].enable) continue; // globally disabled
-				if (!rc.apps[app]) continue; // disabled for this rule
-				if (isEmpty(apps[app].id)) continue; // no app-id
-				enabled = enabled.concat(apps[app].id);
-				newRule = ruleSet.add(desc + ` (${app})`);
-				newRule.cond(if_app(...apps[app].id));
-				rule[app](rc, newRule);
+			// apply app-specific rules
+			if (rule.apps) {
+				let newRule;
+				let enabled = []; // enabled apps
+				for (let app in rule.apps) {
+					if (app == 'others') continue;
+					if (!apps[app]) continue; // uknown app
+					if (!apps[app].enable) continue; // globally disabled
+					if (!rc.apps[app]) continue; // disabled for this rule
+					if (isEmpty(apps[app].id)) continue; // no app-id
+					enabled = enabled.concat(apps[app].id);
+					newRule = ruleSet.add(desc + ` (${app})`);
+					newRule.cond(if_app(...apps[app].id));
+					rule.apps[app](rc, newRule);
+				}
+				if (apps.others.enable && rc.apps.others) {
+					newRule = ruleSet.add(desc);
+					if (enabled.length) newRule.cond(unless_app(...enabled));
+					rule.apps.others(rc, newRule);
+				}
+				delete rule.apps;
 			}
-			if (apps.others.enable && rc.apps.others) {
-				newRule = ruleSet.add(desc);
-				if (enabled.length) newRule.cond(unless_app(...enabled));
-				rule.others(rc, newRule);
+
+			// apply branching rules
+			for (let k in rule) {
+				addRule(rule[k], rc, `${desc} :: ${k}`); // RECURSION
 			}
 		}
 
+		for (let i in rules) {
+			// rule config
+			let rc = config.rules[i];
+			if (!rc) continue;
+			if (!rc.enable) continue; // rule disabled
+
+			addRule(rules[i], rc);
+		}
+
 		let data = ruleSet.toJSON();
 		let result = JSON.stringify(data, null, 2);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "keycomfort",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "description": "Comfortable keyboard remaps for Karabiner/AutoHotKey",
   "files": [
     "dist/keycomfort.js"
@@ -11,9 +11,10 @@
   "scripts": {
     "dev": "rollup -c --watch",
     "test": "echo noop",
-    "build": "rollup -c && chmod +x ./dist/keycomfort.js",
+    "version": "npm --no-git-tag-version version",
+    "build": "rollup -c && chmod u+x ./dist/keycomfort.js",
     "clean": "rm -rf ./dist",
-    "dist": "npm run clean; NODE_ENV=production npm run build"
+    "dist": "npm run clean; NODE_ENV=production npm run build && npm run test"
   },
   "repository": {
     "type": "git",
@@ -22,6 +23,8 @@
   "keywords": [
     "keyboard",
     "remap",
+    "accessibility",
+    "a11y",
     "karabiner",
     "mac",
     "macos",