Merge pull request #44 from kanga333/fix-16

Fix a problem with escape characters

__tests__/mapper.test.ts

@@ -28,6 +28,38 @@ describe('JSONMapper', () => {
     }).toThrow()
   })
 
+  describe('Complex Regular Expression Key', () => {
+    const mapper = new JSONMapper(
+      '{"^key(-[\\\\w-]*)?$":{"env1":"value1"},".*":{"env1":"value2"}}',
+      'first_match'
+    )
+
+    it('holds the order of keys', () => {
+      const expects = ['^key(-[\\w-]*)?$', '.*']
+      for (const [index, pair] of mapper.pairs.entries()) {
+        expect(pair.key).toBe(expects[index])
+      }
+    })
+
+    it('can be matched with regular expressions', () => {
+      const got = mapper.match('key-match-string')
+      if (!got) {
+        throw new Error('No match')
+      }
+      expect(got.key).toBe('^key(-[\\w-]*)?$')
+      expect(got.variables).toMatchObject(new Map([['env1', 'value1']]))
+    })
+
+    it('can not be matched with regular expressions', () => {
+      const got = mapper.match('key-not+match+string')
+      if (!got) {
+        throw new Error('No match')
+      }
+      expect(got.key).toBe('.*')
+      expect(got.variables).toMatchObject(new Map([['env1', 'value2']]))
+    })
+  })
+
   describe('Overwrite Matcher', () => {
     const overwrite = new JSONMapper(
       '{"k.y":{"env1":"value1","env2":"value2"},".*":{"env2":"overwrite"}}',

src/mapper.ts

@@ -128,8 +128,9 @@ export class JSONMapper extends Mapper {
     const tmpPairs = new Array<KeyVariablesPair>()
     const minify = rawJSON.replace(/\s/g, '')
     for (const key in parsed) {
+      const json_key = JSON.stringify(key)
       //Gets the position of the input keys to keep their order.
-      const idx = minify.indexOf(`"${key}":{`)
+      const idx = minify.indexOf(`${json_key}:{`)
       if (idx === -1) {
         throw new Error(`Failed to get key index of ${key}`)
       }