refact(NA): move kbn interpretor to a trully package.

elastic · Nov 22, 2018 · 51bcf08 · 51bcf08
1 parent 7ab6dcc
commit 51bcf08
Show file tree

Hide file tree

Showing 51 changed files with 15 additions and 7 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -27,8 +27,7 @@ bower_components
 /x-pack/coverage
 /x-pack/build
 /x-pack/plugins/**/__tests__/fixtures/**
-/packages/kbn-interpreter/common/lib/grammar.js
-/packages/kbn-interpreter/plugin
+/packages/kbn-interpreter/src/common/lib/grammar.js
 /x-pack/plugins/canvas/canvas_plugin
 /x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts
 **/*.js.snap

diff --git a/packages/kbn-interpreter/.gitignore b/packages/kbn-interpreter/.gitignore
@@ -0,0 +1,4 @@
+common
+plugin
+public
+server
diff --git a/packages/kbn-interpreter/package.json b/packages/kbn-interpreter/package.json
@@ -2,9 +2,14 @@
   "name": "@kbn/interpreter",
   "version": "1.0.0",
   "license": "Apache-2.0",
+  "main": "./index.js",
   "scripts": {
-    "build": "node tasks/build.js",
+    "build": "babel src --out-dir . --ignore 'src/plugin/**/*' && node tasks/build.js",
     "canvas:peg": "pegjs common/lib/grammar.peg",
     "kbn:bootstrap": "yarn build"
+  },
+  "devDependencies": {
+    "@kbn/babel-preset": "1.0.0",
+    "babel-cli": "^6.26.0"
   }
 }
diff --git a/...bn-interpreter/common/interpreter/cast.js → ...nterpreter/src/common/interpreter/cast.js b/...bn-interpreter/common/interpreter/cast.js → ...nterpreter/src/common/interpreter/cast.js
diff --git a/...preter/common/interpreter/create_error.js → ...er/src/common/interpreter/create_error.js b/...preter/common/interpreter/create_error.js → ...er/src/common/interpreter/create_error.js
diff --git a/...terpreter/common/interpreter/interpret.js → ...reter/src/common/interpreter/interpret.js b/...terpreter/common/interpreter/interpret.js → ...reter/src/common/interpreter/interpret.js
diff --git a/...er/common/interpreter/socket_interpret.js → ...rc/common/interpreter/socket_interpret.js b/...er/common/interpreter/socket_interpret.js → ...rc/common/interpreter/socket_interpret.js
diff --git a/packages/kbn-interpreter/common/lib/arg.js → ...ges/kbn-interpreter/src/common/lib/arg.js b/packages/kbn-interpreter/common/lib/arg.js → ...ges/kbn-interpreter/src/common/lib/arg.js
diff --git a/...es/kbn-interpreter/common/lib/arg.test.js → ...bn-interpreter/src/common/lib/arg.test.js b/...es/kbn-interpreter/common/lib/arg.test.js → ...bn-interpreter/src/common/lib/arg.test.js
diff --git a/...er/common/lib/ast.from_expression.test.js → ...rc/common/lib/ast.from_expression.test.js b/...er/common/lib/ast.from_expression.test.js → ...rc/common/lib/ast.from_expression.test.js
diff --git a/packages/kbn-interpreter/common/lib/ast.js → ...ges/kbn-interpreter/src/common/lib/ast.js b/packages/kbn-interpreter/common/lib/ast.js → ...ges/kbn-interpreter/src/common/lib/ast.js
diff --git a/...eter/common/lib/ast.to_expression.test.js → .../src/common/lib/ast.to_expression.test.js b/...eter/common/lib/ast.to_expression.test.js → .../src/common/lib/ast.to_expression.test.js
diff --git a/packages/kbn-interpreter/common/lib/fn.js → ...ages/kbn-interpreter/src/common/lib/fn.js b/packages/kbn-interpreter/common/lib/fn.js → ...ages/kbn-interpreter/src/common/lib/fn.js
diff --git a/...erpreter/common/lib/functions_registry.js → ...eter/src/common/lib/functions_registry.js b/...erpreter/common/lib/functions_registry.js → ...eter/src/common/lib/functions_registry.js
diff --git a/...bn-interpreter/common/lib/get_by_alias.js → ...nterpreter/src/common/lib/get_by_alias.js b/...bn-interpreter/common/lib/get_by_alias.js → ...nterpreter/src/common/lib/get_by_alias.js
diff --git a/...terpreter/common/lib/get_by_alias.test.js → ...reter/src/common/lib/get_by_alias.test.js b/...terpreter/common/lib/get_by_alias.test.js → ...reter/src/common/lib/get_by_alias.test.js
diff --git a/...es/kbn-interpreter/common/lib/get_type.js → ...bn-interpreter/src/common/lib/get_type.js b/...es/kbn-interpreter/common/lib/get_type.js → ...bn-interpreter/src/common/lib/get_type.js
diff --git a/...ges/kbn-interpreter/common/lib/grammar.js → ...kbn-interpreter/src/common/lib/grammar.js b/...ges/kbn-interpreter/common/lib/grammar.js → ...kbn-interpreter/src/common/lib/grammar.js
diff --git a/...es/kbn-interpreter/common/lib/grammar.peg → ...bn-interpreter/src/common/lib/grammar.peg b/...es/kbn-interpreter/common/lib/grammar.peg → ...bn-interpreter/src/common/lib/grammar.peg
diff --git a/...-interpreter/common/lib/paths_registry.js → ...erpreter/src/common/lib/paths_registry.js b/...-interpreter/common/lib/paths_registry.js → ...erpreter/src/common/lib/paths_registry.js
diff --git a/...rpreter/common/lib/paths_registry.test.js → ...ter/src/common/lib/paths_registry.test.js b/...rpreter/common/lib/paths_registry.test.js → ...ter/src/common/lib/paths_registry.test.js
diff --git a/...es/kbn-interpreter/common/lib/registry.js → ...bn-interpreter/src/common/lib/registry.js b/...es/kbn-interpreter/common/lib/registry.js → ...bn-interpreter/src/common/lib/registry.js
diff --git a/...n-interpreter/common/lib/registry.test.js → ...terpreter/src/common/lib/registry.test.js b/...n-interpreter/common/lib/registry.test.js → ...terpreter/src/common/lib/registry.test.js
diff --git a/...s/kbn-interpreter/common/lib/serialize.js → ...n-interpreter/src/common/lib/serialize.js b/...s/kbn-interpreter/common/lib/serialize.js → ...n-interpreter/src/common/lib/serialize.js
diff --git a/packages/kbn-interpreter/common/lib/type.js → ...es/kbn-interpreter/src/common/lib/type.js b/packages/kbn-interpreter/common/lib/type.js → ...es/kbn-interpreter/src/common/lib/type.js
diff --git a/...-interpreter/common/lib/types_registry.js → ...erpreter/src/common/lib/types_registry.js b/...-interpreter/common/lib/types_registry.js → ...erpreter/src/common/lib/types_registry.js
diff --git a/...reter/plugin_src/functions/common/clog.js → ...reter/src/plugin/functions/common/clog.js b/...reter/plugin_src/functions/common/clog.js → ...reter/src/plugin/functions/common/clog.js
diff --git a/...eter/plugin_src/functions/common/index.js → ...eter/src/plugin/functions/common/index.js b/...eter/plugin_src/functions/common/index.js → ...eter/src/plugin/functions/common/index.js
diff --git a/...r/plugin_src/functions/common/register.js → ...r/src/plugin/functions/common/register.js b/...r/plugin_src/functions/common/register.js → ...r/src/plugin/functions/common/register.js
diff --git a/...n-interpreter/plugin_src/types/boolean.js → ...n-interpreter/src/plugin/types/boolean.js b/...n-interpreter/plugin_src/types/boolean.js → ...n-interpreter/src/plugin/types/boolean.js
diff --git a/...interpreter/plugin_src/types/datatable.js → ...interpreter/src/plugin/types/datatable.js b/...interpreter/plugin_src/types/datatable.js → ...interpreter/src/plugin/types/datatable.js
diff --git a/...kbn-interpreter/plugin_src/types/error.js → ...kbn-interpreter/src/plugin/types/error.js b/...kbn-interpreter/plugin_src/types/error.js → ...kbn-interpreter/src/plugin/types/error.js
diff --git a/...bn-interpreter/plugin_src/types/filter.js → ...bn-interpreter/src/plugin/types/filter.js b/...bn-interpreter/plugin_src/types/filter.js → ...bn-interpreter/src/plugin/types/filter.js
diff --git a/...kbn-interpreter/plugin_src/types/image.js → ...kbn-interpreter/src/plugin/types/image.js b/...kbn-interpreter/plugin_src/types/image.js → ...kbn-interpreter/src/plugin/types/image.js
diff --git a/...kbn-interpreter/plugin_src/types/index.js → ...kbn-interpreter/src/plugin/types/index.js b/...kbn-interpreter/plugin_src/types/index.js → ...kbn-interpreter/src/plugin/types/index.js
diff --git a/.../kbn-interpreter/plugin_src/types/null.js → .../kbn-interpreter/src/plugin/types/null.js b/.../kbn-interpreter/plugin_src/types/null.js → .../kbn-interpreter/src/plugin/types/null.js
diff --git a/...bn-interpreter/plugin_src/types/number.js → ...bn-interpreter/src/plugin/types/number.js b/...bn-interpreter/plugin_src/types/number.js → ...bn-interpreter/src/plugin/types/number.js
diff --git a/...terpreter/plugin_src/types/pointseries.js → ...terpreter/src/plugin/types/pointseries.js b/...terpreter/plugin_src/types/pointseries.js → ...terpreter/src/plugin/types/pointseries.js
diff --git a/...-interpreter/plugin_src/types/register.js → ...-interpreter/src/plugin/types/register.js b/...-interpreter/plugin_src/types/register.js → ...-interpreter/src/plugin/types/register.js
diff --git a/...bn-interpreter/plugin_src/types/render.js → ...bn-interpreter/src/plugin/types/render.js b/...bn-interpreter/plugin_src/types/render.js → ...bn-interpreter/src/plugin/types/render.js
diff --git a/...kbn-interpreter/plugin_src/types/shape.js → ...kbn-interpreter/src/plugin/types/shape.js b/...kbn-interpreter/plugin_src/types/shape.js → ...kbn-interpreter/src/plugin/types/shape.js
diff --git a/...bn-interpreter/plugin_src/types/string.js → ...bn-interpreter/src/plugin/types/string.js b/...bn-interpreter/plugin_src/types/string.js → ...bn-interpreter/src/plugin/types/string.js
diff --git a/...kbn-interpreter/plugin_src/types/style.js → ...kbn-interpreter/src/plugin/types/style.js b/...kbn-interpreter/plugin_src/types/style.js → ...kbn-interpreter/src/plugin/types/style.js
diff --git a/...-interpreter/public/browser_registries.js → ...erpreter/src/public/browser_registries.js b/...-interpreter/public/browser_registries.js → ...erpreter/src/public/browser_registries.js
diff --git a/...kbn-interpreter/public/create_handlers.js → ...interpreter/src/public/create_handlers.js b/...kbn-interpreter/public/create_handlers.js → ...interpreter/src/public/create_handlers.js
diff --git a/...ges/kbn-interpreter/public/interpreter.js → ...kbn-interpreter/src/public/interpreter.js b/...ges/kbn-interpreter/public/interpreter.js → ...kbn-interpreter/src/public/interpreter.js
diff --git a/packages/kbn-interpreter/public/socket.js → ...ages/kbn-interpreter/src/public/socket.js b/packages/kbn-interpreter/public/socket.js → ...ages/kbn-interpreter/src/public/socket.js
diff --git a/...bn-interpreter/server/get_plugin_paths.js → ...nterpreter/src/server/get_plugin_paths.js b/...bn-interpreter/server/get_plugin_paths.js → ...nterpreter/src/server/get_plugin_paths.js
diff --git a/...n-interpreter/server/server_registries.js → ...terpreter/src/server/server_registries.js b/...n-interpreter/server/server_registries.js → ...terpreter/src/server/server_registries.js
diff --git a/packages/kbn-interpreter/tasks/webpack.plugins.js b/packages/kbn-interpreter/tasks/webpack.plugins.js
@@ -19,7 +19,7 @@
 
 const path = require('path');
 
-const sourceDir = path.resolve(__dirname, '../plugin_src');
+const sourceDir = path.resolve(__dirname, '../src/plugin');
 const buildDir = path.resolve(__dirname, '../plugin');
 
 module.exports = {

diff --git a/src/setup_node_env/babel_register/register.js b/src/setup_node_env/babel_register/register.js
@@ -41,9 +41,9 @@ var ignore = [
   // is `x-pack` and `b` is not `node_modules`
   /\/node_modules\/(?!x-pack\/(?!node_modules)([^\/]+))([^\/]+\/[^\/]+)/,
 
-  // ignore paths matching `/@kbn-interpreter/plugin/{a}/{b}` unless
-  // `a` is `functions` and `b` is `common`
-  /\/@kbn-interpreter\/plugin\/(?!functions\/common)([^\/]+\/[^\/]+)/,
+  // ignore paths matching `/kbn-interpreter/{a}, unless `a`
+  // is common
+  /\/kbn-interpreter\//,
 
   // ignore paths matching `/canvas/canvas_plugin/{a}/{b}` unless
   // `a` is `functions` and `b` is `server`
-Original file line number
+Diff line change
@@ -0,0 +1,4 @@
+    common
+    plugin
+    public
+    server