From 407d5f293810dc070c61172f75b31f8565bcafed Mon Sep 17 00:00:00 2001
From: Akshay Karthik <akshay.karthik@gmail.com>
Date: Mon, 28 Jan 2019 14:50:26 -0500
Subject: [PATCH] [moo] Add type definitions for keywords value transform

---
 types/moo/index.d.ts   | 19 +++++++++++++++----
 types/moo/moo-tests.ts |  9 +++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/types/moo/index.d.ts b/types/moo/index.d.ts
index fd53f98e0a..2dd1a4b4db 100644
--- a/types/moo/index.d.ts
+++ b/types/moo/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for moo 0.4
+// Type definitions for moo 0.5
 // Project: https://github.com/tjvr/moo#readme
 // Definitions by: Nikita Litvin <https://github.com/deltaidea>
 //                 Jörg Vehlow <https://github.com/MofX>
@@ -11,6 +11,15 @@ export as namespace moo;
  */
 export const error: { error: true };
 
+/**
+ * Reserved token for indicating a fallback rule.
+ */
+export const fallback: { fallback: true };
+
+export type TypeMapper = (x: string) => string;
+
+export function keywords(kws: {[k: string]: string | string[]}): TypeMapper;
+
 export function compile(rules: Rules): Lexer;
 
 export function states(states: {[x: string]: Rules}, start?: string): Lexer;
@@ -45,9 +54,11 @@ export interface Rule {
      */
     value?: (x: string) => string;
 
-    keywords?: {
-        [x: string]: string | string[]
-    };
+    /**
+     * Used for mapping one set of types to another.
+     * See https://github.com/no-context/moo#keywords for an example
+     */
+    type?: TypeMapper;
 }
 export interface Rules {
     [x: string]: RegExp | string | string[] | Rule | Rule[];
diff --git a/types/moo/moo-tests.ts b/types/moo/moo-tests.ts
index c82bedd219..5cb9fa6f5b 100644
--- a/types/moo/moo-tests.ts
+++ b/types/moo/moo-tests.ts
@@ -20,20 +20,21 @@ lexer = moo.compile({
 
 lexer = moo.compile({
     IDEN: {
-        match: /[a-zA-Z]+/, keywords: {
+        match: /[a-zA-Z]+/,
+        type: moo.keywords({
             KW: ['while', 'if', 'else', 'moo', 'reloacows']
-        }
+        })
     },
     SPACE: { match: /\s+/, lineBreaks: true }
 });
 
 lexer = moo.compile({
     name: {
-        match: /[a-zA-Z]+/, keywords: {
+        match: /[a-zA-Z]+/, type: moo.keywords({
             'kw-class': 'class',
             'kw-def': 'def',
             'kw-if': 'if',
-        }
+        })
     }
 });