fix(ElasticApiParser): Support new format of the api list in elasticsearch 13.0

closes #1

Author: nodkz

package.json

@@ -36,7 +36,7 @@
     "babel-plugin-transform-object-rest-spread": "^6.22.0",
     "babel-preset-env": "^1.4.0",
     "cz-conventional-changelog": "^2.0.0",
-    "elasticsearch": "^12.1.3",
+    "elasticsearch": "^13.0.0",
     "eslint": "^3.19.0",
     "eslint-config-airbnb-base": "^11.1.3",
     "eslint-config-prettier": "^1.7.0",
@@ -46,7 +46,7 @@
     "express": "^4.15.2",
     "express-graphql": "^0.6.4",
     "flow-bin": "^0.45.0",
-    "graphql": "^0.9.4",
+    "graphql": "^0.9.6",
     "graphql-compose": "^1.18.1",
     "jest": "^19.0.2",
     "jest-babel": "^1.0.1",

src/ElasticApiParser.js

@@ -130,11 +130,23 @@ export default class ElasticApiParser {
     const apiFolder = './node_modules/elasticsearch/src/lib/apis/';
     const apiListFile = path.resolve(apiFolder, 'index.js');
     const apiListCode = ElasticApiParser.loadApiListFile(apiListFile);
-    const re = new RegExp(`\\'${version}\\':\\srequire\\(\\'(.+)\\'\\)`, 'gi');
+
+    // parsing elasticsearch module 13.x and above
+    //   get '5.3'() { return require('./5_3'); },
+    const re = new RegExp(`\\'${version}\\'\\(\\).*require\\(\\'(.+)\\'\\)`, 'gi');
     const match = re.exec(apiListCode);
     if (match && match[1]) {
       return path.resolve(apiFolder, `${match[1]}.js`);
     }
+
+    // parsing elasticsearch module 12.x and below
+    //   '5.0': require('./5_0'),
+    const re12 = new RegExp(`\\'${version}\\':\\srequire\\(\\'(.+)\\'\\)`, 'gi');
+    const match12 = re12.exec(apiListCode);
+    if (match12 && match12[1]) {
+      return path.resolve(apiFolder, `${match12[1]}.js`);
+    }
+
     throw new Error(
       `Can not found Elastic version '${version}' in ${apiListFile}`
     );

src/__tests__/ElasticApiParser-test.js

@@ -45,7 +45,7 @@ describe('ElasticApiParser', () => {
     });
 
     describe('findApiVersionFile()', () => {
-      it('should find proper version', () => {
+      it('should find proper version in elasticsearch 12.x', () => {
         const loadApiListFile = ElasticApiParser.loadApiListFile;
         // $FlowFixMe
         ElasticApiParser.loadApiListFile = () =>
@@ -82,6 +82,46 @@ describe('ElasticApiParser', () => {
         // $FlowFixMe
         ElasticApiParser.loadApiListFile = loadApiListFile;
       });
+
+      it('should find proper version in elasticsearch 13.x', () => {
+        const loadApiListFile = ElasticApiParser.loadApiListFile;
+        // $FlowFixMe
+        ElasticApiParser.loadApiListFile = () =>
+          `
+          module.exports = {
+            get '_default'() { return require('./5_3'); },
+            get '5.3'() { return require('./5_3'); },
+            get '5.2'() { return require('./5_2'); },
+            get '5.1'() { return require('./5_1'); },
+            get '5.0'() { return require('./5_0'); },
+            get '2.4'() { return require('./2_4'); },
+            get '1.7'() { return require('./1_7'); },
+            get '0.90'() { return require('./0_90'); },
+            get '5.x'() { return require('./5_x'); },
+            get 'master'() { return require('./master'); },
+          };
+        `;
+
+        expect(ElasticApiParser.findApiVersionFile('5.0')).toMatch(
+          // $FlowFixMe
+          'elasticsearch/src/lib/apis/5_0.js'
+        );
+        expect(ElasticApiParser.findApiVersionFile('2.4')).toMatch(
+          // $FlowFixMe
+          'elasticsearch/src/lib/apis/2_4.js'
+        );
+        expect(ElasticApiParser.findApiVersionFile('1.7')).toMatch(
+          // $FlowFixMe
+          'elasticsearch/src/lib/apis/1_7.js'
+        );
+        expect(ElasticApiParser.findApiVersionFile('_default')).toMatch(
+          // $FlowFixMe
+          'elasticsearch/src/lib/apis/5_3.js'
+        );
+
+        // $FlowFixMe
+        ElasticApiParser.loadApiListFile = loadApiListFile;
+      });
     });
 
     describe('cleanupDescription()', () => {