feat(api): New module util. Integrated first fun

lua/user/init.lua

@@ -3,6 +3,7 @@
 
 local Types = require('user.types') -- Source all API annotations
 local Check = require('user.check') -- Checker utilities
+local Util = require('user.util') -- Coding utilities
 
 local is_nil = Check.value.is_nil
 local is_tbl = Check.value.is_tbl
@@ -14,6 +15,7 @@ local empty = Check.value.empty
 ---@type UserMod
 local M = {
 	types = Types,
+	util = Util,
 	check = Check,
 	maps = require('user.maps'),
 	highlight = require('user.highlight'),

lua/user/maps.lua

@@ -5,6 +5,7 @@
 require('user.types.user.maps')
 
 local Check = require('user.check')
+local Util = require('user.util')
 
 local is_nil = Check.value.is_nil
 local is_tbl = Check.value.is_tbl
@@ -15,6 +16,7 @@ local is_int = Check.value.is_int
 local is_bool = Check.value.is_bool
 local empty = Check.value.empty
 local field = Check.value.field
+local strip_fields = Util.strip_fields
 
 local kmap = vim.keymap.set
 local map = vim.api.nvim_set_keymap
@@ -23,44 +25,6 @@ local bufmap = vim.api.nvim_buf_set_keymap
 ---@type Modes
 local MODES = { 'n', 'i', 'v', 't', 'o', 'x' }
 
----@type fun(T: UserMaps.Api.Opts|UserMaps.Keymap.Opts|UserMaps.Buf.Opts, fields: string|string[]): UserMaps.Api.Opts|UserMaps.Keymap.Opts|UserMaps.Buf.Opts
-local strip_options = function(T, fields)
-	if not is_tbl(T) then
-		error('(maps:strip_options): Empty table')
-	end
-
-	if empty(T) then
-		return T
-	end
-
-	if not (is_str(fields) or is_tbl(fields)) or empty(fields) then
-		return T
-	end
-
-	---@type UserMaps.Keymap.Opts
-	local res = {}
-
-	if is_str(fields) then
-		if not field(fields, T) then
-			return T
-		end
-
-		for k, v in next, T do
-			if k ~= fields then
-				res[k] = v
-			end
-		end
-	else
-		for k, v in next, T do
-			if not vim.tbl_contains(fields, k) then
-				res[k] = v
-			end
-		end
-	end
-
-	return res
-end
-
 ---@type fun(mode: string, func: MapFuncs, with_buf: boolean?): KeyMapFunction|ApiMapFunction|BufMapFunction
 local function variant(mode, func, with_buf)
 	if not (is_fun(func) and is_str(mode) and vim.tbl_contains(MODES, mode)) then
@@ -177,7 +141,8 @@ function M.nop(T, opts, mode)
 	opts.silent = is_bool(opts.silent) and opts.silent or true
 
 	if is_int(opts.buffer) then
-		opts = strip_options(vim.deepcopy(opts), 'buffer')
+		---@type UserMaps.Keymap.Opts
+		opts = strip_fields(opts, 'buffer')
 	end
 
 	if is_str(T) then

lua/user/types/init.lua

@@ -36,6 +36,7 @@
 ---@field opts UserOpts
 ---@field types UserTypes
 ---@field ft_get fun(scope: ('local'|'global')?): string
+---@field util UserUtils
 
 ---@type UserTypes
 local M = {

lua/user/types/user/init.lua

@@ -7,6 +7,7 @@
 ---@field autocmd table
 ---@field opts table
 ---@field check table
+---@field util table
 
 ---@type UserSubTypes
 local M = {
@@ -15,6 +16,7 @@ local M = {
 	highlight = require('user.types.user.highlight'),
 	maps = require('user.types.user.maps'),
 	opts = require('user.types.user.opts'),
+	util = require('user.types.user.util'),
 }
 
 return M

lua/user/types/user/util.lua

@@ -0,0 +1,5 @@
+---@diagnostic disable:unused-local
+---@diagnostic disable:unused-function
+
+---@class UserUtils
+---@field strip_fields fun(T: table, fields: string|string[]): table

lua/user/util/init.lua

@@ -0,0 +1,52 @@
+---@diagnostic disable:unused-function
+---@diagnostic disable:unused-local
+
+require('user.types.user.util')
+
+local Value = require('user.check.value')
+local is_tbl = Value.is_tbl
+local is_str = Value.is_str
+local empty = Value.empty
+local field = Value.field
+
+---@type UserUtils
+local M = {}
+
+function M.strip_fields(T, fields)
+	if not is_tbl(T) then
+		error('(maps:strip_options): Empty table')
+	end
+
+	if empty(T) then
+		return T
+	end
+
+	if not (is_str(fields) or is_tbl(fields)) or empty(fields) then
+		return T
+	end
+
+	---@type UserMaps.Keymap.Opts
+	local res = {}
+
+	if is_str(fields) then
+		if not field(fields, T) then
+			return T
+		end
+
+		for k, v in next, T do
+			if k ~= fields then
+				res[k] = v
+			end
+		end
+	else
+		for k, v in next, T do
+			if not vim.tbl_contains(fields, k) then
+				res[k] = v
+			end
+		end
+	end
+
+	return res
+end
+
+return M