diff --git a/plugins/bufferlines/barbecue.nix b/plugins/bufferlines/barbecue.nix index 0e535381..dbf733c4 100644 --- a/plugins/bufferlines/barbecue.nix +++ b/plugins/bufferlines/barbecue.nix @@ -173,10 +173,10 @@ in { show_dirname = showDirname; show_basename = showBasename; show_modified = showModified; - modified = helpers.ifNonNull' modified (helpers.mkRaw modified); + modified = helpers.mkRaw modified; show_navic = showNavic; - lead_custom_section = helpers.ifNonNull' leadCustomSection (helpers.mkRaw leadCustomSection); - custom_section = helpers.ifNonNull' customSection (helpers.mkRaw customSection); + lead_custom_section = helpers.mkRaw leadCustomSection; + custom_section = helpers.mkRaw customSection; inherit theme; context_follow_icon_color = contextFollowIconColor; symbols = { diff --git a/plugins/bufferlines/bufferline.nix b/plugins/bufferlines/bufferline.nix index b2e2de34..cdfecec0 100644 --- a/plugins/bufferlines/bufferline.nix +++ b/plugins/bufferlines/bufferline.nix @@ -299,18 +299,14 @@ in { left_trunc_marker = leftTruncMarker; right_trunc_marker = rightTruncMarker; separator_style = separatorStyle; - name_formatter = - helpers.ifNonNull' nameFormatter - (helpers.mkRaw nameFormatter); + name_formatter = helpers.mkRaw nameFormatter; truncate_names = truncateNames; tab_size = tabSize; max_name_length = maxNameLength; color_icons = colorIcons; show_buffer_icons = showBufferIcons; show_buffer_close_icons = showBufferCloseIcons; - get_element_icon = - helpers.ifNonNull' getElementIcon - (helpers.mkRaw getElementIcon); + get_element_icon = helpers.mkRaw getElementIcon; show_close_icon = showCloseIcon; show_tab_indicators = showTabIndicators; show_duplicate_prefix = showDuplicatePrefix; @@ -320,9 +316,7 @@ in { max_prefix_length = maxPrefixLength; sort_by = sortBy; inherit diagnostics; - diagnostics_indicator = - helpers.ifNonNull' diagnosticsIndicator - (helpers.mkRaw diagnosticsIndicator); + diagnostics_indicator = helpers.mkRaw diagnosticsIndicator; diagnostics_update_in_insert = diagnosticsUpdateInInsert; inherit offsets; groups = helpers.ifNonNull' groups { @@ -333,9 +327,7 @@ in { }; inherit hover; inherit debug; - custom_filter = - helpers.ifNonNull' customFilter - (helpers.mkRaw customFilter); + custom_filter = helpers.mkRaw customFilter; } // cfg.extraOptions; diff --git a/plugins/colorschemes/tokyonight.nix b/plugins/colorschemes/tokyonight.nix index be495834..62b5ccd6 100644 --- a/plugins/colorschemes/tokyonight.nix +++ b/plugins/colorschemes/tokyonight.nix @@ -79,12 +79,8 @@ in { dim_inactive = dimInactive; lualine_bold = lualineBold; day_brightness = dayBrightness; - on_colors = - helpers.ifNonNull' cfg.onColors - (helpers.mkRaw onColors); - on_highlights = - helpers.ifNonNull' cfg.onHighlights - (helpers.mkRaw onHighlights); + on_colors = helpers.mkRaw onColors; + on_highlights = helpers.mkRaw onHighlights; }; in '' require("tokyonight").setup(${helpers.toLuaObject setupOptions}) diff --git a/plugins/completion/nvim-cmp/default.nix b/plugins/completion/nvim-cmp/default.nix index cb1c2400..77e68487 100644 --- a/plugins/completion/nvim-cmp/default.nix +++ b/plugins/completion/nvim-cmp/default.nix @@ -573,9 +573,7 @@ in { formatting = with formatting; { expandable_indicator = expandableIndicator; inherit fields; - format = - helpers.ifNonNull' format - (helpers.mkRaw format); + format = helpers.mkRaw format; }; matching = with matching; { @@ -657,11 +655,11 @@ in { max_width = if isInt maxWidth then maxWidth - else helpers.ifNonNull' maxWidth (helpers.mkRaw maxWidth); + else helpers.mkRaw maxWidth; max_height = if isInt maxHeight then maxHeight - else helpers.ifNonNull' maxHeight (helpers.mkRaw maxHeight); + else helpers.mkRaw maxHeight; }; }; inherit experimental; diff --git a/plugins/dap/dap-ui.nix b/plugins/dap/dap-ui.nix index 2880596d..a5da42f7 100644 --- a/plugins/dap/dap-ui.nix +++ b/plugins/dap/dap-ui.nix @@ -212,7 +212,7 @@ in { max_value_lines = maxValueLines; }); - select_window = helpers.ifNonNull' selectWindow (helpers.mkRaw selectWindow); + select_window = helpers.mkRaw selectWindow; } // cfg.extraOptions; in diff --git a/plugins/dap/dap-virtual-text.nix b/plugins/dap/dap-virtual-text.nix index 9a576bd6..21dd9a49 100644 --- a/plugins/dap/dap-virtual-text.nix +++ b/plugins/dap/dap-virtual-text.nix @@ -72,7 +72,7 @@ in { only_first_definition = onlyFirstDefinition; all_references = allReferences; clear_on_continue = clearOnContinue; - display_callback = helpers.ifNonNull' displayCallback (helpers.mkRaw displayCallback); + display_callback = helpers.mkRaw displayCallback; virt_text_pos = virtTextPos; all_frames = allFrames; virt_lines = virtLines; diff --git a/plugins/dap/dapHelpers.nix b/plugins/dap/dapHelpers.nix index 64afb001..6ef9faaa 100644 --- a/plugins/dap/dapHelpers.nix +++ b/plugins/dap/dapHelpers.nix @@ -129,7 +129,7 @@ in rec { adapter // { inherit type; - enrich_config = helpers.ifNonNull' adapter.enrichConfig (helpers.mkRaw adapter.enrichConfig); + enrich_config = helpers.mkRaw adapter.enrichConfig; } )) adapters; diff --git a/plugins/filetrees/neo-tree.nix b/plugins/filetrees/neo-tree.nix index 57ee5445..d21ed8f7 100644 --- a/plugins/filetrees/neo-tree.nix +++ b/plugins/filetrees/neo-tree.nix @@ -1059,9 +1059,7 @@ in { popup_border_style = cfg.popupBorderStyle; resize_timer_interval = cfg.resizeTimerInterval; sort_case_insensitive = cfg.sortCaseInsensitive; - sort_function = - ifNonNull' cfg.sortFunction - (mkRaw cfg.sortFunction); + sort_function = mkRaw cfg.sortFunction; use_popups_for_input = cfg.usePopupsForInput; use_default_mappings = cfg.useDefaultMappings; source_selector = with cfg.sourceSelector; { diff --git a/plugins/languages/clangd-extensions.nix b/plugins/languages/clangd-extensions.nix index 4b652554..0fe5b8dd 100644 --- a/plugins/languages/clangd-extensions.nix +++ b/plugins/languages/clangd-extensions.nix @@ -159,7 +159,7 @@ in { setupOptions = with cfg; { inlay_hints = with inlayHints; { - inline = helpers.ifNonNull' inline (helpers.mkRaw inline); + inline = helpers.mkRaw inline; only_current_line = onlyCurrentLine; only_current_line_autocmd = onlyCurrentLineAutocmd; show_parameter_hints = showParameterHints; diff --git a/plugins/languages/lean.nix b/plugins/languages/lean.nix index 12297833..9ae01359 100644 --- a/plugins/languages/lean.nix +++ b/plugins/languages/lean.nix @@ -302,9 +302,7 @@ in { enable height ; - on_lines = - helpers.ifNonNull' onLines - (helpers.mkRaw onLines); + on_lines = helpers.mkRaw onLines; }; inherit lsp3; } diff --git a/plugins/languages/lint.nix b/plugins/languages/lint.nix index ed646c1d..a81f9cfe 100644 --- a/plugins/languages/lint.nix +++ b/plugins/languages/lint.nix @@ -86,7 +86,7 @@ with lib; let example = '' require('lint.parser').from_pattern(pattern, groups, severity_map, defaults, opts) ''; - apply = s: helpers.ifNonNull' s (helpers.mkRaw s); + apply = helpers.mkRaw; mandatory = true; }; }; diff --git a/plugins/languages/rust.nix b/plugins/languages/rust.nix index 18f16e8a..8355af91 100644 --- a/plugins/languages/rust.nix +++ b/plugins/languages/rust.nix @@ -144,9 +144,7 @@ in { helpers.ifNonNull' cfg.executor (helpers.mkRaw "require(${rust-tools.executors}).${cfg.executor}"); - on_initialized = - helpers.ifNonNull' cfg.onInitialized - (helpers.mkRaw cfg.onInitialized); + on_initialized = helpers.mkRaw cfg.onInitialized; reload_workspace_from_cargo_toml = cfg.reloadWorkspaceFromCargoToml; inlay_hints = with cfg.inlayHints; diff --git a/plugins/languages/treesitter/treesitter-context.nix b/plugins/languages/treesitter/treesitter-context.nix index 14907647..3944dae7 100644 --- a/plugins/languages/treesitter/treesitter-context.nix +++ b/plugins/languages/treesitter/treesitter-context.nix @@ -86,9 +86,7 @@ in { separator zindex ; - on_attach = - helpers.ifNonNull' onAttach - (helpers.mkRaw onAttach); + on_attach = helpers.mkRaw onAttach; } // cfg.extraOptions; in diff --git a/plugins/lsp/helpers.nix b/plugins/lsp/helpers.nix index bddf1c89..9340e9de 100644 --- a/plugins/lsp/helpers.nix +++ b/plugins/lsp/helpers.nix @@ -129,9 +129,7 @@ extraOptions = { inherit (cfg) cmd filetypes autostart; - root_dir = - helpers.ifNonNull' cfg.rootDir - (helpers.mkRaw cfg.rootDir); + root_dir = helpers.mkRaw cfg.rootDir; on_attach = helpers.ifNonNull' cfg.onAttach ( diff --git a/plugins/lsp/inc-rename.nix b/plugins/lsp/inc-rename.nix index aaccfba4..feb3b41b 100644 --- a/plugins/lsp/inc-rename.nix +++ b/plugins/lsp/inc-rename.nix @@ -43,7 +43,7 @@ with lib; { preview_empty_name = cfg.previewEmptyName; show_message = cfg.showMessage; input_buffer_type = cfg.inputBufferType; - post_hook = helpers.ifNonNull' cfg.postHook (helpers.mkRaw cfg.postHook); + post_hook = helpers.mkRaw cfg.postHook; }; in mkIf cfg.enable { diff --git a/plugins/none-ls/default.nix b/plugins/none-ls/default.nix index 8928c5c0..fabdaf48 100644 --- a/plugins/none-ls/default.nix +++ b/plugins/none-ls/default.nix @@ -225,21 +225,11 @@ in { else cfg.fallbackSeverity; log_level = cfg.logLevel; notify_format = cfg.notifyFormat; - on_attach = - helpers.ifNonNull' cfg.onAttach - (helpers.mkRaw cfg.onAttach); - on_init = - helpers.ifNonNull' cfg.onInit - (helpers.mkRaw cfg.onInit); - on_exit = - helpers.ifNonNull' cfg.onExit - (helpers.mkRaw cfg.onExit); - root_dir = - helpers.ifNonNull' cfg.rootDir - (helpers.mkRaw cfg.rootDir); - should_attach = - helpers.ifNonNull' cfg.shouldAttach - (helpers.mkRaw cfg.shouldAttach); + on_attach = helpers.mkRaw cfg.onAttach; + on_init = helpers.mkRaw cfg.onInit; + on_exit = helpers.mkRaw cfg.onExit; + root_dir = helpers.mkRaw cfg.rootDir; + should_attach = helpers.mkRaw cfg.shouldAttach; temp_dir = cfg.tempDir; update_in_insert = cfg.updateInInsert; diff --git a/plugins/pluginmanagers/packer.nix b/plugins/pluginmanagers/packer.nix index 91635813..54ebefac 100644 --- a/plugins/pluginmanagers/packer.nix +++ b/plugins/pluginmanagers/packer.nix @@ -159,13 +159,9 @@ in { inherit (plugin) disable as; - installer = - helpers.ifNonNull' plugin.installer - (helpers.mkRaw plugin.installer); + installer = helpers.mkRaw plugin.installer; - updater = - helpers.ifNonNull' plugin.updater - (helpers.mkRaw plugin.updater); + updater = helpers.mkRaw plugin.updater; inherit (plugin) diff --git a/plugins/telescope/file-browser.nix b/plugins/telescope/file-browser.nix index da6e587a..233d07c0 100644 --- a/plugins/telescope/file-browser.nix +++ b/plugins/telescope/file-browser.nix @@ -151,12 +151,8 @@ in { ; add_dirs = addDirs; auto_depth = autoDepth; - browse_files = - helpers.ifNonNull' browseFiles - (helpers.mkRaw browseFiles); - browse_folders = - helpers.ifNonNull' browseFolders - (helpers.mkRaw browseFolders); + browse_files = helpers.mkRaw browseFiles; + browse_folders = helpers.mkRaw browseFolders; collapse_dirs = collapseDirs; cwd_to_path = cwdToPath; dir_icon = dirIcon; @@ -172,7 +168,7 @@ in { else attr // { - display = helpers.ifNonNull' attr.display (helpers.mkRaw attr.display); + display = helpers.mkRaw attr.display; } ) displayStat diff --git a/plugins/telescope/undo.nix b/plugins/telescope/undo.nix index 400461c7..264bf976 100644 --- a/plugins/telescope/undo.nix +++ b/plugins/telescope/undo.nix @@ -30,7 +30,7 @@ in { ''; diffContextLines = helpers.defaultNullOpts.mkNullable (with types; either ints.unsigned str) "vim.o.scrolloff" '' - Defaults to the scrolloff + Defaults to the scrolloff. ''; entryFormat = helpers.defaultNullOpts.mkStr "state #$ID, $STAT, $TIME" '' @@ -79,8 +79,8 @@ in { use_custom_command = useCustomCommand; side_by_side = sideBySide; diff_context_lines = - if isInt diffContextLines - then helpers.mkRaw "diffContextLines" + if isString diffContextLines + then helpers.mkRaw diffContextLines else diffContextLines; entry_format = entryFormat; time_format = timeFormat; diff --git a/plugins/utils/auto-save.nix b/plugins/utils/auto-save.nix index 85e6f56b..9ccd1fbf 100644 --- a/plugins/utils/auto-save.nix +++ b/plugins/utils/auto-save.nix @@ -120,13 +120,11 @@ in { cleaning_interval = cleaningInterval; }; trigger_events = cfg.triggerEvents; - condition = - helpers.ifNonNull' cfg.condition - (helpers.mkRaw cfg.condition); + condition = helpers.mkRaw cfg.condition; write_all_buffers = cfg.writeAllBuffers; debounce_delay = cfg.debounceDelay; callbacks = with cfg.callbacks; - mapAttrs (name: value: helpers.ifNonNull' value (helpers.mkRaw value)) { + mapAttrs (_: helpers.mkRaw) { inherit enabling disabling; before_asserting_save = beforeAssertingSave; before_saving = beforeSaving; diff --git a/plugins/utils/auto-session.nix b/plugins/utils/auto-session.nix index c67237cd..cd646d2e 100644 --- a/plugins/utils/auto-session.nix +++ b/plugins/utils/auto-session.nix @@ -160,8 +160,8 @@ in { then with cfg.cwdChangeHandling; { restore_upcoming_session = restoreUpcomingSession; - pre_cwd_changed_hook = helpers.ifNonNull' preCwdChangedHook (helpers.mkRaw preCwdChangedHook); - post_cwd_changed_hook = helpers.ifNonNull' postCwdChangedHook (helpers.mkRaw postCwdChangedHook); + pre_cwd_changed_hook = helpers.mkRaw preCwdChangedHook; + post_cwd_changed_hook = helpers.mkRaw postCwdChangedHook; } else cfg.cwdChangeHandling; bypass_session_save_file_types = cfg.bypassSessionSaveFileTypes; diff --git a/plugins/utils/better-escape.nix b/plugins/utils/better-escape.nix index 19d27b1f..642c593c 100644 --- a/plugins/utils/better-escape.nix +++ b/plugins/utils/better-escape.nix @@ -60,8 +60,8 @@ in { { inherit mapping; timeout = - if isInt timeout - then helpers.mkRaw "timeout" + if isString timeout + then helpers.mkRaw timeout else timeout; clear_empty_lines = clearEmptyLines; inherit keys; diff --git a/plugins/utils/coverage.nix b/plugins/utils/coverage.nix index 70530112..28c034e2 100644 --- a/plugins/utils/coverage.nix +++ b/plugins/utils/coverage.nix @@ -278,7 +278,7 @@ in { summary_pass = summaryPass; summary_fail = summaryFail; }; - load_coverage_cb = helpers.ifNonNull' loadCoverageCb (helpers.mkRaw loadCoverageCb); + load_coverage_cb = helpers.mkRaw loadCoverageCb; inherit signs; sign_group = signGroup; summary = with summary; { diff --git a/plugins/utils/flash.nix b/plugins/utils/flash.nix index ecafd05e..3f84c4fd 100644 --- a/plugins/utils/flash.nix +++ b/plugins/utils/flash.nix @@ -387,8 +387,6 @@ in { // configOpts; config = let - mkRawIfNonNull = v: helpers.ifNonNull' v (helpers.mkRaw v); - mkGlobalConfig = c: { inherit (c) labels; search = @@ -408,14 +406,14 @@ in { rainbow = { inherit (c.label.rainbow) enabled shade; }; - format = mkRawIfNonNull c.label.format; + format = helpers.mkRaw c.label.format; }; highlight = { inherit (c.highlight) backdrop matches priority groups; }; - action = mkRawIfNonNull c.action; + action = helpers.mkRaw c.action; inherit (c) pattern continue; - config = mkRawIfNonNull c.config; + config = helpers.mkRaw c.config; prompt = { inherit (c.prompt) enabled prefix; win_config = c.prompt.winConfig; @@ -446,7 +444,7 @@ in { jump_labels = c.jumpLabels; multi_line = c.multiLine; inherit (c) keys; - char_actions = mkRawIfNonNull c.charActions; + char_actions = helpers.mkRaw c.charActions; }); treesitter = mkModeConfig cfg.modes.treesitter (c: {}); treesitter_search = mkModeConfig cfg.modes.treesitterSearch (c: {}); diff --git a/plugins/utils/notify.nix b/plugins/utils/notify.nix index 80f301a0..45c1f80b 100644 --- a/plugins/utils/notify.nix +++ b/plugins/utils/notify.nix @@ -139,8 +139,8 @@ in { } ) icons; - on_open = helpers.ifNonNull' onOpen (helpers.mkRaw onOpen); - on_close = helpers.ifNonNull' onClose (helpers.mkRaw onClose); + on_open = helpers.mkRaw onOpen; + on_close = helpers.mkRaw onClose; inherit render; minimum_width = minimumWidth; inherit fps; diff --git a/plugins/utils/nvim-autopairs.nix b/plugins/utils/nvim-autopairs.nix index 88398fd2..04b22ccd 100644 --- a/plugins/utils/nvim-autopairs.nix +++ b/plugins/utils/nvim-autopairs.nix @@ -81,9 +81,7 @@ in { disable_in_macro = cfg.disableInMacro; disable_in_visualblock = cfg.disableInVisualblock; disable_in_replace_mode = cfg.disableInReplaceMode; - ignored_next_char = - helpers.ifNonNull' cfg.ignoredNextChar - (helpers.mkRaw cfg.ignoredNextChar); + ignored_next_char = helpers.mkRaw cfg.ignoredNextChar; enable_moveright = cfg.enableMoveright; enable_afterquote = cfg.enableAfterQuote; enable_check_bracket_line = cfg.enableCheckBracketLine; diff --git a/plugins/utils/nvim-bqf.nix b/plugins/utils/nvim-bqf.nix index 156eac49..97fd4eac 100644 --- a/plugins/utils/nvim-bqf.nix +++ b/plugins/utils/nvim-bqf.nix @@ -135,10 +135,7 @@ in { win_vheight = winVheight; inherit wrap; buf_label = bufLabel; - should_preview_cb = - if (shouldPreviewCb == null) - then null - else helpers.mkRaw shouldPreviewCb; + should_preview_cb = helpers.mkRaw shouldPreviewCb; }; func_map = cfg.funcMap; filter = { diff --git a/plugins/utils/nvim-ufo.nix b/plugins/utils/nvim-ufo.nix index 9daf548b..4b29b419 100644 --- a/plugins/utils/nvim-ufo.nix +++ b/plugins/utils/nvim-ufo.nix @@ -58,9 +58,9 @@ in { options = with cfg; { open_fold_hl_timeout = openFoldHlTimeout; - provider_selector = helpers.ifNonNull' providerSelector (helpers.mkRaw providerSelector); + provider_selector = helpers.mkRaw providerSelector; close_fold_kinds = closeFoldKinds; - fold_virt_text_handler = helpers.ifNonNull' foldVirtTextHandler (helpers.mkRaw foldVirtTextHandler); + fold_virt_text_handler = helpers.mkRaw foldVirtTextHandler; enable_get_fold_virt_text = enableGetFoldVirtText; preview = with preview; { diff --git a/plugins/utils/oil.nix b/plugins/utils/oil.nix index ca11ef77..eea27500 100644 --- a/plugins/utils/oil.nix +++ b/plugins/utils/oil.nix @@ -381,12 +381,8 @@ in { use_default_keymaps = cfg.useDefaultKeymaps; view_options = with cfg.viewOptions; { show_hidden = showHidden; - is_hidden_file = - helpers.ifNonNull' isHiddenFile - (helpers.mkRaw isHiddenFile); - is_always_hidden = - helpers.ifNonNull' isAlwaysHidden - (helpers.mkRaw isAlwaysHidden); + is_hidden_file = helpers.mkRaw isHiddenFile; + is_always_hidden = helpers.mkRaw isAlwaysHidden; }; float = with cfg.float; { inherit padding; diff --git a/plugins/utils/persistence.nix b/plugins/utils/persistence.nix index 96c4bf3f..a42bc10e 100644 --- a/plugins/utils/persistence.nix +++ b/plugins/utils/persistence.nix @@ -57,7 +57,7 @@ with lib; { extraConfigLua = let opts = { inherit (cfg) dir options; - pre_save = helpers.mkRawIfNonNull cfg.preSave; + pre_save = helpers.mkRaw cfg.preSave; save_empty = cfg.saveEmpty; }; in '' diff --git a/plugins/utils/toggleterm.nix b/plugins/utils/toggleterm.nix index d646d2da..b64b29e2 100644 --- a/plugins/utils/toggleterm.nix +++ b/plugins/utils/toggleterm.nix @@ -177,12 +177,12 @@ in { else helpers.mkRaw size ); open_mapping = helpers.ifNonNull' openMapping (helpers.mkRaw "[[${openMapping}]]"); - on_create = helpers.ifNonNull' onCreate (helpers.mkRaw onCreate); - on_open = helpers.ifNonNull' onOpen (helpers.mkRaw onOpen); - on_close = helpers.ifNonNull' onClose (helpers.mkRaw onClose); - on_stdout = helpers.ifNonNull' onStdout (helpers.mkRaw onStdout); - on_stderr = helpers.ifNonNull' onStderr (helpers.mkRaw onStderr); - on_exit = helpers.ifNonNull' onExit (helpers.mkRaw onExit); + on_create = helpers.mkRaw onCreate; + on_open = helpers.mkRaw onOpen; + on_close = helpers.mkRaw onClose; + on_stdout = helpers.mkRaw onStdout; + on_stderr = helpers.mkRaw onStderr; + on_exit = helpers.mkRaw onExit; hide_numbers = hideNumbers; shade_filetypes = shadeFiletypes; shade_terminals = shadeTerminals; @@ -197,7 +197,7 @@ in { float_opts = floatOpts; winbar = with winbar; { inherit enabled; - name_formatter = helpers.ifNonNull' nameFormatter (helpers.mkRaw nameFormatter); + name_formatter = helpers.mkRaw nameFormatter; }; }; in diff --git a/plugins/utils/wilder.nix b/plugins/utils/wilder.nix index 3ba21b9c..bdc8f1ea 100644 --- a/plugins/utils/wilder.nix +++ b/plugins/utils/wilder.nix @@ -237,15 +237,9 @@ in { pipeline = helpers.ifNonNull' pipeline (map helpers.mkRaw pipeline); - render = - helpers.ifNonNull' render - (helpers.mkRaw render); - preHook = - helpers.ifNonNull' preHook - (helpers.mkRaw preHook); - postHook = - helpers.ifNonNull' postHook - (helpers.mkRaw postHook); + render = helpers.mkRaw render; + preHook = helpers.mkRaw preHook; + postHook = helpers.mkRaw postHook; } // cfg.extraOptions; in