From c7b36a3817d1b769a556840acaf9abf3180b2655 Mon Sep 17 00:00:00 2001 From: Nick Coutsos Date: Mon, 20 Dec 2021 18:00:18 -0500 Subject: Move default keybind and template into separate module --- api/services/zmk/defaults.js | 29 ++++++++++++++++++++ api/services/zmk/keymap.js | 64 +++++++++++++++++--------------------------- 2 files changed, 54 insertions(+), 39 deletions(-) create mode 100644 api/services/zmk/defaults.js diff --git a/api/services/zmk/defaults.js b/api/services/zmk/defaults.js new file mode 100644 index 0000000..1d6d5e1 --- /dev/null +++ b/api/services/zmk/defaults.js @@ -0,0 +1,29 @@ +const keymapTemplate = ` +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + + +/* THIS FILE WAS GENERATED! + * + * This file was generated automatically. You may or may not want to + * edit it directly. + */ + +#include +{{behaviour_includes}} + +/ { + keymap { + compatible = "zmk,keymap"; + +{{rendered_layers}} + }; +}; +` + +module.exports = { + keymapTemplate +} diff --git a/api/services/zmk/keymap.js b/api/services/zmk/keymap.js index 4eafb88..21c044a 100644 --- a/api/services/zmk/keymap.js +++ b/api/services/zmk/keymap.js @@ -8,6 +8,7 @@ const map = require('lodash/map') const uniq = require('lodash/uniq') const { renderTable } = require('./layout') +const defaults = require('./defaults') class KeymapValidationError extends Error { constructor (errors) { @@ -77,40 +78,21 @@ function parseKeymap (keymap) { }) } -const header = ` -/* - * Copyright (c) 2020 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - - -/* THIS FILE WAS GENERATED! - * - * This file was generated automatically. You may or may not want to - * edit it directly. - */ - -#include -#include -` - -function generateKeymap (layout, keymap) { +function generateKeymap (layout, keymap, template) { const encoded = encodeKeymap(keymap) return { - code: generateKeymapCode(layout, keymap, encoded), + code: generateKeymapCode(layout, keymap, encoded, template || defaults.keymapTemplate), json: generateKeymapJSON(layout, keymap, encoded) } } -function generateKeymapCode (layout, keymap, encoded) { - const { layer_names: names = [] } = keymap - const behaviourHeaders = flatten(getBehavioursUsed(keymap).map( - bind => get(behavioursByBind, [bind, 'includes'], []) - )) - const layers = encoded.layers.map((layer, i) => { - const name = i === 0 ? 'default_layer' : `layer_${names[i] || i}` - const rendered = renderTable(layout, layer, { +function renderTemplate(template, params) { + const includesPattern = /\{\{\s*behaviour_includes\s*\}\}/ + const layersPattern = /\{\{\s*rendered_layers\s*\}\}/ + + const renderedLayers = params.layers.map((layer, i) => { + const name = i === 0 ? 'default_layer' : `layer_${params.layerNames[i] || i}` + const rendered = renderTable(params.layout, layer, { linePrefix: '', columnSeparator: ' ' }) @@ -124,19 +106,23 @@ ${rendered} ` }) - const keymapOut = `${header} -${behaviourHeaders.join('\n')} - -/ { - keymap { - compatible = "zmk,keymap"; + return template + .replace(includesPattern, params.behaviourHeaders.join('\n')) + .replace(layersPattern, renderedLayers.join('')) +} -${layers.join('')} - }; -}; -` +function generateKeymapCode (layout, keymap, encoded, template) { + const { layer_names: names = [] } = keymap + const behaviourHeaders = flatten(getBehavioursUsed(keymap).map( + bind => get(behavioursByBind, [bind, 'includes'], []) + )) - return keymapOut + return renderTemplate(template, { + layout, + behaviourHeaders, + layers: encoded.layers, + layerNames: names + }) } function generateKeymapJSON (layout, keymap, encoded) { -- cgit v1.2.3