feat(schema-compiler): Upgrade babel and support objectRestSpread for schema generation

Author: paveltiunov

packages/cubejs-schema-compiler/compiler/CubePropContextTranspiler.js

@@ -1,4 +1,4 @@
-const t = require('babel-types');
+const t = require('@babel/types');
 const R = require('ramda');
 
 class CubePropContextTranspiler {

packages/cubejs-schema-compiler/compiler/DataSchemaCompiler.js

@@ -2,9 +2,9 @@ const vm = require('vm');
 const syntaxCheck = require('syntax-error');
 const CompileError = require('./CompileError');
 const UserError = require('./UserError');
-const babylon = require("babylon");
-const babelGenerator = require("babel-generator").default;
-const babelTraverse = require("babel-traverse").default;
+const { parse } = require("@babel/parser");
+const babelGenerator = require("@babel/generator").default;
+const babelTraverse = require("@babel/traverse").default;
 const fs = require('fs');
 const path = require('path');
 
@@ -105,8 +105,14 @@ class DataSchemaCompiler {
 
   transpileFile(file, errorsReport) {
     try {
-      babelTraverse.clearCache();
-      const ast = babylon.parse(file.content, { sourceFilename: file.fileName, sourceType: 'module' });
+      const ast = parse(
+        file.content,
+        {
+          sourceFilename: file.fileName,
+          sourceType: 'module',
+          plugins: ['objectRestSpread']
+        },
+      );
       this.transpilers.forEach((t) => babelTraverse(ast, t.traverseObject()));
       const content = babelGenerator(ast, {}, file.content).code;
       return Object.assign({}, file, { content });

packages/cubejs-schema-compiler/compiler/ImportExportTranspiler.js

@@ -1,4 +1,4 @@
-const t = require('babel-types');
+const t = require('@babel/types');
 const R = require('ramda');
 
 class ImportExportTranspiler {

packages/cubejs-schema-compiler/package.json

@@ -16,10 +16,12 @@
   },
   "dependencies": {
     "@hapi/joi": "^14.3.1",
-    "babel-generator": "^6.25.0",
-    "babel-traverse": "^6.25.0",
-    "babel-types": "^6.25.0",
-    "babylon": "^6.17.4",
+    "@babel/generator": "^7.4.0",
+    "@babel/parser": "^7.4.2",
+    "@babel/preset-env": "^7.3.4",
+    "@babel/standalone": "^7.3.4",
+    "@babel/traverse": "^7.4.0",
+    "@babel/types": "^7.4.0",
     "humps": "^2.0.1",
     "inflection": "^1.12.0",
     "moment-range": "^4.0.1",

packages/cubejs-schema-compiler/test/SQLGenerationTest.js

@@ -99,7 +99,8 @@ describe('SQL Generation', function test() {
         averageCheckins: {
           type: 'avg',
           sql: \`\${doubledCheckings}\`
-        }
+        },
+        ...(['foo', 'bar'].map(m => ({ [m]: { type: 'count' } })).reduce((a, b) => ({ ...a, ...b })))
       },
 
       dimensions: {
@@ -1441,4 +1442,18 @@ describe('SQL Generation', function test() {
 
     query.dataSource.should.be.deepEqual('oracle');
   }));
+
+  it(
+    'objectRestSpread generator',
+    () => runQueryTest({
+      measures: ['visitors.foo'],
+      dimensions: [],
+      timeDimensions: [],
+      timezone: 'America/Los_Angeles',
+      filters: [],
+      order: []
+    }, [
+      { "visitors__foo": '6' }
+    ])
+  );
 });