Merge pull request #16 from segmentio/fix-escape-after-dot

unlex: Escape identifiers after dots

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@segment/fql",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "main": "dist/index.js",
   "browser": "dist/index.js",
   "bin": "dist/index.js",

src/unlexer.test.ts

@@ -9,9 +9,8 @@ test('Unlexer can convert tokens into a string', () => {
 })
 
 test('Unlexer escapes', () => {
-  const str = unlex([t.Ident('a \\ b $')]).code
-
-  expect(str).toEqual('a\\ \\\\\\ b\\ \\$')
+  expect(unlex([t.Ident('a \\ b $')]).code).toEqual('a\\ \\\\\\ b\\ \\$')
+  expect(unlex([t.Ident('a'), t.Dot(), t.Ident('b c')]).code).toEqual('a.b\\ c')
 })
 
 test('Unlexer and lexer play nicely together', () => {

src/unlexer.ts

@@ -37,16 +37,15 @@ export default function unlex(tokens: Token[]): UnLexResponse {
       continue
     }
 
-    // Don't add unnecessary spaces after dots
-    if (i !== 0 && tokens[i - 1].type === TokenType.Dot) {
-      str += token.value
-      continue
+    // Add a space, but not after dots
+    if (i > 0 && tokens[i - 1].type !== TokenType.Dot) {
+      str += ' '
     }
 
     if (token.type === TokenType.Ident) {
-      str += ' ' + escape(token.value)
+      str += escape(token.value)
     } else {
-      str += ' ' + token.value
+      str += token.value
     }
   }