Add check for validity of awaitOptions #11

tshino · Dec 1, 2021 · a2a1d5e · a2a1d5e
1 parent 7e1a3a8
commit a2a1d5e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/generator/gen_keymap_wrapper.js b/generator/gen_keymap_wrapper.js
@@ -32,6 +32,15 @@ function makeWrapper(keybinding) {
     return wrapped;
 }
 
+function checkAwaitOptions(awaitOptions) {
+    for (const awaitOption of awaitOptions.values()) {
+        if (!genWrapperUtil.isValidAwaitOption(awaitOption)) {
+            console.error('Error: Invalid awaitOption found:', awaitOption);
+            process.exit(1);
+        }
+    }
+}
+
 function resolveWildcardInAwaitOptions(awaitOptions, baseKeybindings) {
     const newAwaitOptions = new Map;
     for (const [ command, awaitOption ] of awaitOptions) {
@@ -64,6 +73,7 @@ async function makeKeymapWrapper(configPath) {
 
     const rawAwaitOptions = new Map(config['awaitOptions'] || []);
     const awaitOptions = resolveWildcardInAwaitOptions(rawAwaitOptions, baseKeybindings);
+    checkAwaitOptions(awaitOptions);
 
     const wrappers = baseKeybindings.map(
         keybinding => {

diff --git a/generator/gen_wrapper.js b/generator/gen_wrapper.js
@@ -31,12 +31,22 @@ function makeWrapper(keybinding) {
     return wrapped;
 }
 
+function checkAwaitOptions(awaitOptions) {
+    for (const awaitOption of awaitOptions.values()) {
+        if (!genWrapperUtil.isValidAwaitOption(awaitOption)) {
+            console.error('Invalid awaitOption found:', awaitOption);
+            process.exit(1);
+        }
+    }
+}
+
 async function main() {
     const packageJson = await genWrapperUtil.readJSON(PackageJsonPath);
     const config = await genWrapperUtil.readJSON(ConfigPath);
 
     const exclusion = new Set(config['exclusion'] || []);
     const awaitOptions = new Map(config['awaitOptions'] || []);
+    checkAwaitOptions(awaitOptions);
 
     const baseKeybindings = await genWrapperUtil.loadBaseKeybindings(config['baseKeybindings'] || []);