feat: add pyjj shuangpin scheme

将 flypy 模块抽象为 char_map，支持多种双拼方案切换。
新增拼音加加（pyjj）作为内置方案，通过 setup({ scheme = "pyjj" }) 选择。

Author: kanlac

README.md

@@ -1,6 +1,6 @@
 # flash-zh.nvim
 
-基于[flash.nvim](https://github.com/folke/flash.nvim)以及小鹤双拼，neovim 中文跳转插件。
+基于[flash.nvim](https://github.com/folke/flash.nvim)的 Neovim 中文跳转插件，支持小鹤双拼（默认）与拼音加加双拼。
 
 ![iShot_2023-10-05_19 32 53](https://github.com/rainzm/flash-zh.nvim/assets/22927169/4c3ca124-0fee-48a2-b7c6-17391afe8d0e)
 
@@ -44,6 +44,19 @@ return {{
 
 **如果想要跳转的地方没有 label 出现，接着输入即可，和查找一样。**
 
+### 选择双拼方案
+
+插件内置两套方案：
+
+- `flypy`：小鹤双拼（默认）
+- `pyjj`：拼音加加双拼
+
+```lua
+require("flash-zh").setup({
+  scheme = "pyjj",
+})
+```
+
 ### 自定义匹配字符
 
 - 你可以覆盖、或是追加字符到默认的匹配字符集。
@@ -73,4 +86,3 @@ return {{
 ## 感谢
 
 - [hop-zh-by-flypy](https://github.com/zzhirong/hop-zh-by-flypy)
-

lua/flash-zh/char_map.lua

@@ -0,0 +1,54 @@
+local flypy = require("flash-zh.flypy")
+
+local M = {}
+
+---@class FlashZhCharMap
+---@field comma table<string,string>
+---@field escape table<string,string>
+---@field char1patterns table<string,string>
+---@field char2patterns table<string,string>
+
+local current_name = "flypy"
+---@type FlashZhCharMap
+local current_map = flypy
+
+---@type table<string, FlashZhCharMap>
+local cache = {
+	flypy = flypy,
+}
+
+local function build(name)
+	if cache[name] then
+		return cache[name]
+	end
+	if name == "pyjj" then
+		local pyjj = require("flash-zh.pyjj")
+		cache.pyjj = pyjj.from_flypy(flypy)
+		return cache.pyjj
+	end
+	error("unknown scheme: " .. tostring(name))
+end
+
+---@return string
+function M.name()
+	return current_name
+end
+
+---@return FlashZhCharMap
+function M.get()
+	return current_map
+end
+
+---@param name string
+function M.set(name)
+	name = name or "flypy"
+	current_map = build(name)
+	current_name = name
+end
+
+function M.available()
+	return { "flypy", "pyjj" }
+end
+
+return M
+

lua/flash-zh/init.lua

@@ -1,28 +1,18 @@
 local flash = require("flash")
-local flypy = require("flash-zh.flypy")
+local char_map = require("flash-zh.char_map")
 
 local M = {}
 
 function M.jump(opts)
 	opts = opts or {}
-	local mode = M.mix_mode
-	if opts.chinese_only then
-		mode = M.zh_mode
+
+	-- Allow per-jump override so users can verify schemes quickly,
+	-- and so it still works even if setup() was not called (common with lazy.nvim misconfig).
+	if opts.scheme then
+		require("flash-zh.char_map").set(opts.scheme)
+		opts.scheme = nil
 	end
-	opts = vim.tbl_deep_extend("force", {
-		labels = "asdfghjklqwertyuiopzxcvbnm",
-		search = {
-			mode = mode,
-		},
-		labeler = function(_, state)
-			require("flash-zh.labeler").new(state):update()
-		end,
-	}, opts)
-	flash.jump(opts)
-end
 
-function M.remote(opts)
-	opts = opts or {}
 	local mode = M.mix_mode
 	if opts.chinese_only then
 		mode = M.zh_mode
@@ -36,7 +26,7 @@ function M.remote(opts)
 			require("flash-zh.labeler").new(state):update()
 		end,
 	}, opts)
-	flash.remote(opts)
+	flash.jump(opts)
 end
 
 function M.mix_mode(str)
@@ -52,38 +42,45 @@ function M.mix_mode(str)
 end
 
 function M.zh_mode(str)
+	local map = char_map.get()
 	local regexs = {}
 	while string.len(str) > 1 do
-		regexs[#regexs + 1] = flypy.char2patterns[string.sub(str, 1, 2)]
+		local k = string.sub(str, 1, 2)
+		-- Be defensive: unknown keys should not crash the search.
+		regexs[#regexs + 1] = map.char2patterns[k] or ("[" .. k .. string.upper(k) .. "]")
 		str = string.sub(str, 3)
 	end
 	if string.len(str) == 1 then
-		regexs[#regexs + 1] = flypy.char1patterns[str]
+		regexs[#regexs + 1] = map.char1patterns[str] or ("[" .. str .. string.upper(str) .. "]")
 	end
 	local ret = table.concat(regexs)
 	return ret, ret
 end
 
-local nodes = {
-	alpha = function(str)
-		return "[" .. str .. string.upper(str) .. "]"
-	end,
-	pinyin = function(str)
-		return flypy.char2patterns[str]
-	end,
-	comma = function(str)
-		return flypy.comma[str]
-	end,
-	singlepin = function(str)
-		return flypy.char1patterns[str]
-	end,
-	other = function(str)
-		str = flypy.escape[str] or str
-		return str
-	end,
-}
+local function get_nodes(map)
+	return {
+		alpha = function(str)
+			return "[" .. str .. string.upper(str) .. "]"
+		end,
+		pinyin = function(str)
+			return map.char2patterns[str]
+		end,
+		comma = function(str)
+			return map.comma[str]
+		end,
+		singlepin = function(str)
+			return map.char1patterns[str]
+		end,
+		other = function(str)
+			str = map.escape[str] or str
+			return str
+		end,
+	}
+end
 
 function M.regex(parser)
+	local map = char_map.get()
+	local nodes = get_nodes(map)
 	local regexs = {}
 	for _, v in ipairs(parser) do
 		regexs[#regexs + 1] = nodes[v.type](v.str)
@@ -92,10 +89,11 @@ function M.regex(parser)
 end
 
 function M.parser(str, prefix)
+	local map = char_map.get()
 	prefix = prefix or {}
 	local firstchar = string.sub(str, 1, 1)
 	local chars = {}
-	for k, _ in pairs(flypy.comma) do
+	for k, _ in pairs(map.comma) do
 		table.insert(chars, k)
 	end
 	if firstchar == "" then
@@ -108,7 +106,7 @@ function M.parser(str, prefix)
 			prefix2[#prefix2 + 1] = { str = firstchar, type = "singlepin" }
 			return { prefix, prefix2 }
 		elseif string.match(secondchar, "%a") then
-			if flypy.char2patterns[firstchar .. secondchar] then
+			if map.char2patterns[firstchar .. secondchar] then
 				local prefix2 = M.copy(prefix)
 				prefix2[#prefix2 + 1] = { str = firstchar, type = "alpha" }
 				prefix[#prefix + 1] = { str = firstchar .. secondchar, type = "pinyin" }
@@ -158,24 +156,32 @@ function M.copy(table)
 end
 
 -- @param opts table
+-- @field[opt] opts.scheme string Choose the built-in shuangpin scheme. One of: "flypy", "pyjj".
 -- @field opts.char_map table Char map for flypy.
 -- @field[opt] opts.char_map.comma table Override the default comma map.
 -- @field[opt] opts.char_map.append_comma table Append to the default comma map.
 -- @field[opt] opts.char_map.append_char1 table Append to the default char1patterns map.
 -- @field[opt] opts.char_map.append_char2 table Append to the default char2patterns map.
 function M.setup(opts)
 	opts = opts or {}
+
+	if opts.scheme then
+		char_map.set(opts.scheme)
+	end
+
 	if not opts.char_map then
 		return
 	end
+
+	local map = char_map.get()
 	local to_escape = "\\^$*+?.%|[]()"
 	if opts.char_map.comma then
 		for k, v in pairs(opts.char_map.comma) do
 			if #k ~= 1 then
 				error("comma key must be a single character")
 			else
 				v = vim.fn.escape(v, to_escape)
-				flypy.comma[k] = "[" .. v .. "]"
+				map.comma[k] = "[" .. v .. "]"
 			end
 		end
 	end
@@ -184,9 +190,9 @@ function M.setup(opts)
 			if #k ~= 1 then
 				error("append_comma key must be a single character")
 			else
-				local chars = flypy.comma[k] or ""
+				local chars = map.comma[k] or ""
 				chars = string.sub(chars, 2, -2) .. vim.fn.escape(v, to_escape)
-				flypy.comma[k] = "[" .. chars .. "]"
+				map.comma[k] = "[" .. chars .. "]"
 			end
 		end
 	end
@@ -195,9 +201,9 @@ function M.setup(opts)
 			if #k ~= 1 then
 				error("append_char1 key must be a single character")
 			else
-				local chars = flypy.char1patterns[k] or ""
+				local chars = map.char1patterns[k] or ""
 				chars = string.sub(chars, 2, -2) .. vim.fn.escape(v, to_escape)
-				flypy.char1patterns[k] = "[" .. chars .. "]"
+				map.char1patterns[k] = "[" .. chars .. "]"
 			end
 		end
 	end
@@ -206,9 +212,9 @@ function M.setup(opts)
 			if #k ~= 2 then
 				error("append_char2 key must be two characters")
 			else
-				local chars = flypy.char2patterns[k] or ""
+				local chars = map.char2patterns[k] or ""
 				chars = string.sub(chars, 2, -2) .. vim.fn.escape(v, to_escape)
-				flypy.char2patterns[k] = "[" .. chars .. "]"
+				map.char2patterns[k] = "[" .. chars .. "]"
 			end
 		end
 	end

lua/flash-zh/pinyin.lua

@@ -1,20 +1,26 @@
-local flypy = require("flash-zh.flypy")
+local char_map = require("flash-zh.char_map")
 
 local M = {}
 
-local py_table = {}
-local mt = {}
-setmetatable(py_table, { __index = mt })
+local caches = {} ---@type table<string, table>
 
-function py_table:insert(char, pinyin)
-	if not self[char] then
-		self[char] = {}
+local function new_py_table()
+	local t = {}
+	local mt = {}
+	setmetatable(t, { __index = mt })
+
+	function t:insert(char, pinyin)
+		if not self[char] then
+			self[char] = {}
+		end
+		table.insert(self[char], pinyin)
+	end
+
+	function t:find(char)
+		return self[char]
 	end
-	table.insert(self[char], pinyin)
-end
 
-function py_table:find(char)
-	return self[char]
+	return t
 end
 
 local function get_char_size(char) --获取单个字符长度
@@ -62,22 +68,27 @@ local function utf8_sub(str, startChar, numChars) --截取中文字符串
 end
 
 local function init_py_table()
-	for k, v in pairs(flypy.char2patterns) do
+	local map = char_map.get()
+	local py_table = new_py_table()
+
+	for k, v in pairs(map.char2patterns) do
 		local start_char, end_char = v:find("%[(.-)%]")
 		v = v:sub(start_char + 1, end_char - 1)
 		for i = 1, utf8_len(v) do
 			local char = utf8_sub(v, i, 1)
 			py_table:insert(char, k)
 		end
 	end
-	for k, v in pairs(flypy.comma) do
+	for k, v in pairs(map.comma) do
 		local start_char, end_char = v:find("%[(.-)%]")
 		v = v:sub(start_char + 1, end_char - 1)
 		for i = 1, utf8_len(v) do
 			local char = utf8_sub(v, i, 1)
 			py_table:insert(char, k)
 		end
 	end
+
+	return py_table
 end
 
 local function append_to_pinyins(pinyins, suffixes)
@@ -94,6 +105,13 @@ local function append_to_pinyins(pinyins, suffixes)
 end
 
 function M.pinyin(chars)
+	local name = char_map.name()
+	local py_table = caches[name]
+	if not py_table then
+		py_table = init_py_table()
+		caches[name] = py_table
+	end
+
 	local pinyins = {}
 	for i = 1, utf8_len(chars) do
 		local char = utf8_sub(chars, i, 1)
@@ -116,5 +134,4 @@ function M.pinyin(chars)
 	return result
 end
 
-init_py_table()
 return M