Chore: filename cleanup (elastic#204)

* chore: move all the common functions

follow existing naming patterns

* chore: move common types files

* chore: move get_type to common/lib

* chore: rename public functions

* chore: add entry index.js to elements

* chore: move server functions, add index.js as needed

* chore: rename registries, add _registry to filenames

BREAKING CHANGE: this will affect how plugins import the public regirsties

common/functions/image/index.js

@@ -0,0 +1 @@
+export { image } from './image';

common/functions/index.js

@@ -1,30 +1,30 @@
-import { alterColumn } from './alterColumn/alterColumn';
-import { compare } from './compare/compare';
-import { containerStyle } from './containerStyle/containerStyle';
-import { date } from './date/date';
-import { exactly } from './exactly/exactly';
-import { font } from './font/font';
-import { grid } from './grid/grid';
-import { head } from './head/head';
-import { ifFn } from './if/if';
-import { image } from './image/image';
-import { jsonquery } from './jsonquery/jsonquery';
-import { mapColumn } from './mapColumn/mapColumn';
-import { markdown } from './markdown/markdown';
-import { math } from './math/math';
-import { palette } from './palette/palette';
-import { pie } from './pie/pie';
-import { plot } from './plot/plot';
-import { render } from './render/render';
-import { replace } from './replace/replace';
-import { rounddate } from './rounddate/rounddate';
-import { seriesStyle } from './seriesStyle/seriesStyle';
-import { sleep } from './sleep/sleep';
-import { sort } from './sort/sort';
-import { table } from './table/table';
-import { tail } from './tail/tail';
-import { timefilter } from './timefilter/timefilter';
-import { timefilterControl } from './timefilterControl/timefilterControl';
+import { alterColumn } from './alterColumn';
+import { compare } from './compare';
+import { containerStyle } from './containerStyle';
+import { date } from './date';
+import { exactly } from './exactly';
+import { font } from './font';
+import { grid } from './grid';
+import { head } from './head';
+import { ifFn } from './if';
+import { image } from './image';
+import { jsonquery } from './jsonquery';
+import { mapColumn } from './mapColumn';
+import { markdown } from './markdown';
+import { math } from './math';
+import { palette } from './palette';
+import { pie } from './pie';
+import { plot } from './plot';
+import { render } from './render';
+import { replace } from './replace';
+import { rounddate } from './rounddate';
+import { seriesStyle } from './seriesStyle';
+import { sleep } from './sleep';
+import { sort } from './sort';
+import { table } from './table';
+import { tail } from './tail';
+import { timefilter } from './timefilter';
+import { timefilterControl } from './timefilterControl';
 
 export const commonFunctions = [
   alterColumn,

common/functions/markdown/markdown.js → common/functions/markdown.js

@@ -1,4 +1,4 @@
-import { Handlebars } from '../../lib/handlebars.js';
+import { Handlebars } from '../lib/handlebars.js';
 
 export const markdown = {
   name: 'markdown',

common/functions/math/math.js → common/functions/math.js

@@ -1,6 +1,6 @@
 import { map } from 'lodash';
-import { math as mathjs } from '../../lib/math.js';
-import { pivotObjectArray } from '../../lib/pivot_object_array.js';
+import { math as mathjs } from '../lib/math.js';
+import { pivotObjectArray } from '../lib/pivot_object_array.js';
 
 export const math = {
   name: 'math',

common/functions/palette/palette.js → common/functions/palette.js

@@ -1,4 +1,4 @@
-import { palettes } from '../../lib/palettes';
+import { palettes } from '../lib/palettes';
 export const palette = {
   name: 'palette',
   aliases: [],

common/functions/to/to.js → common/functions/to.js

@@ -3,7 +3,7 @@
   it needs access to types and the registry of types is, obviously, different between the environments
 */
 
-import { castProvider } from '../../interpreter/cast';
+import { castProvider } from '../interpreter/cast';
 
 export function toProvider(types) {
   return {

common/interpreter/cast.js

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { getType } from '../types/get_type';
+import { getType } from '../lib/get_type';
 
 export function castProvider(types) {
   return function cast(node, toTypeNames) {

common/interpreter/interpret.js

@@ -1,8 +1,8 @@
 import { clone, each, keys, last, map, mapValues, values, zipObject, omitBy } from 'lodash';
 import { castProvider } from './cast';
-import { getType } from '../types/get_type';
+import { getType } from '../lib/get_type';
 import { fromExpression } from '../lib/ast';
-import { typesRegistry } from '../lib/types';
+import { typesRegistry } from '../lib/types_registry';
 
 export function interpretProvider(config) {
   const cast = castProvider(config.types);

common/lib/__tests__/ast.fromExpression.js

@@ -1,6 +1,6 @@
 import expect from 'expect.js';
 import { fromExpression } from '../ast';
-import { getType } from '../../types/get_type';
+import { getType } from '../../lib/get_type';
 
 describe('ast fromExpression', () => {
   describe('invalid expression', () => {

common/lib/ast.js

@@ -1,5 +1,5 @@
 import { parse } from './grammar';
-import { getType } from '../types/get_type';
+import { getType } from '../lib/get_type';
 
 function getArgumentString(arg, argKey) {
   const type = getType(arg);

common/types/dataurl/index.js → common/types/dataurl.js

@@ -1,4 +1,4 @@
-import { parse } from '../../lib/dataurl';
+import { parse } from '../lib/dataurl';
 
 export const dataurl = {
   name: 'dataurl',

common/types/pointseries/index.js → common/types/pointseries.js

@@ -1,4 +1,4 @@
-import { datatable } from '../datatable';
+import { datatable } from './datatable';
 
 export const pointseries = {
   name: 'pointseries',

common/types/type.js

@@ -1,6 +1,6 @@
 // All types must be universal and be castable on the client or on the server
 import { intersection, keys, constant } from 'lodash';
-import { getType } from './get_type';
+import { getType } from '../lib/get_type';
 
 // TODO: Currently all casting functions must be syncronous.
 

index.js

@@ -1,5 +1,5 @@
 import init from './init';
-import { functionsRegistry } from './common/lib/functions';
+import { functionsRegistry } from './common/lib/functions_registry';
 
 export default function (kibana) {
   return new kibana.Plugin({

init.js

@@ -1,13 +1,11 @@
 import { routes } from './server/routes';
-import { functionsRegistry } from './common/lib/functions';
+import { functionsRegistry } from './common/lib/functions_registry';
+import { typesRegistry } from './common/lib/types_registry';
 import { serverFunctions } from './server/functions';
 import { createIndices } from './server/lib/create_indices';
-
 import { commonFunctions } from './common/functions';
 import { typeSpecs } from './common/types';
 
-import { typesRegistry } from './common/lib/types';
-
 export default function (server, /*options*/) {
   server.plugins.canvas = {
     kibanaType: 'canvas_1',

public/components/element_wrapper/element_content.js

@@ -14,7 +14,7 @@ import { Loading } from '../loading';
 import { pure, compose, branch, renderComponent } from 'recompose';
 import { RenderElement } from '../render_element';
 import Style from 'style-it';
-import { getType } from '../../../common/types/get_type';
+import { getType } from '../../../common/lib/get_type';
 
 /*
   Branches

public/components/element_wrapper/index.js

@@ -12,7 +12,7 @@ import {
   getSelectedPage,
 } from '../../state/selectors/workpad';
 import { getState, getValue, getError } from '../../lib/resolved_arg';
-import { elementsRegistry } from '../../lib/elements';
+import { elementsRegistry } from '../../lib/elements_registry';
 import { createHandlers } from './lib/handlers';
 
 const mapStateToProps = (state, { element }) => ({

public/components/toolbar/element_types/index.js

@@ -1,5 +1,5 @@
 import { pure, compose, withProps, withState } from 'recompose';
-import { elementsRegistry } from '../../../lib/elements';
+import { elementsRegistry } from '../../../lib/elements_registry';
 
 import { ElementTypes as Component } from './element_types';
 

public/elements/advanced_filter/index.js

@@ -0,0 +1 @@
+export { advancedFilter } from './advanced_filter';

public/elements/debug/index.js

@@ -0,0 +1 @@
+export { debug } from './debug';

public/elements/grid/index.js

@@ -0,0 +1 @@
+export { grid } from './grid';

public/elements/image/index.js

@@ -0,0 +1 @@
+export { image } from './image';

public/elements/index.js

@@ -1,12 +1,12 @@
-import { advancedFilter } from './advanced_filter/advanced_filter';
-import { debug } from './debug/debug';
-import { grid } from './grid/grid';
-import { image } from './image/image';
-import { markdown } from './markdown/markdown';
-import { pie } from './pie/pie';
-import { plot } from './plot/plot';
-import { table } from './table/table';
-import { timeFilter } from './time_filter/time_filter';
+import { advancedFilter } from './advanced_filter';
+import { debug } from './debug';
+import { grid } from './grid';
+import { image } from './image';
+import { markdown } from './markdown';
+import { pie } from './pie';
+import { plot } from './plot';
+import { table } from './table';
+import { timeFilter } from './time_filter';
 
 export const elementSpecs = [
   advancedFilter,

public/elements/markdown/index.js

@@ -0,0 +1 @@
+export { markdown } from './markdown';

public/elements/pie/index.js

@@ -0,0 +1 @@
+export { pie } from './pie';

public/elements/plot/index.js

@@ -0,0 +1 @@
+export { plot } from './plot';

public/elements/table/index.js

@@ -0,0 +1 @@
+export { table } from './table';

public/elements/time_filter/index.js

@@ -0,0 +1 @@
+export { timeFilter } from './time_filter';

public/expression_types/arg_types/datacolumn/datacolumn.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { sortBy } from 'lodash';
 import { FormControl } from 'react-bootstrap';
 import { SimpleMathFunction } from './simple_math_function';
-import { getType } from '../../../../common/types/get_type';
+import { getType } from '../../../../common/lib/get_type';
 import { parse } from 'mathjs';
 
 import './datacolumn.less';

public/expression_types/arg_types/palette.js

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { get } from 'lodash';
 import { PalettePicker } from '../../components/palette_picker';
-import { getType } from '../../../common/types/get_type';
+import { getType } from '../../../common/lib/get_type';
 
 const template = ({ onValueChange, argValue, renderError }) => {
   // Why is this neccesary? Does the dialog really need to know what parameter it is setting?

public/functions/asset/asset.js → public/functions/asset.js

@@ -1,5 +1,5 @@
-import { getState } from '../../state/store';
-import { getAssetById } from '../../state/selectors/assets';
+import { getState } from '../state/store';
+import { getAssetById } from '../state/selectors/assets';
 
 export const asset = {
   name: 'asset',

public/functions/filters/filters.js → public/functions/filters.js

@@ -1,8 +1,8 @@
-import { fromExpression } from '../../../common/lib/ast';
-import { typesRegistry } from '../../../common/lib/types';
-import { getState } from '../../state/store';
-import { getGlobalFilterExpression } from '../../state/selectors/workpad';
-import { interpretAst } from '../../lib/interpreter';
+import { fromExpression } from '../../common/lib/ast';
+import { typesRegistry } from '../../common/lib/types_registry';
+import { getState } from '../state/store';
+import { getGlobalFilterExpression } from '../state/selectors/workpad';
+import { interpretAst } from '../lib/interpreter';
 
 export const filters = {
   name: 'filters',

public/functions/index.js

@@ -1,9 +1,9 @@
-import { asset } from './asset/asset';
-import { filters } from './filters/filters';
-import { geoip } from './geoip/geoip';
-import { location } from './location/location';
-import { toFn } from './to/to';
-import { urlparam } from './urlparam/urlparam';
+import { asset } from './asset';
+import { filters } from './filters';
+import { geoip } from './geoip';
+import { location } from './location';
+import { toFn } from './to';
+import { urlparam } from './urlparam';
 
 export const clientFunctions = [
   geoip,

public/functions/to.js

@@ -0,0 +1,4 @@
+import { toProvider } from '../../common/functions/to';
+import { typesRegistry } from '../../common/lib/types_registry';
+
+export const toFn = toProvider(typesRegistry);

public/lib/arg_helpers.js

@@ -1,5 +1,5 @@
 import { isArray, includes } from 'lodash';
-import { getType } from '../../common/types/get_type';
+import { getType } from '../../common/lib/get_type';
 
 /*
 

public/lib/functions.js → public/lib/functions_registry.js

@@ -1,2 +1,2 @@
 // export the common registry here, so it's available in plugin public code
-export { functionsRegistry } from '../../common/lib/functions';
+export { functionsRegistry } from '../../common/lib/functions_registry';

public/lib/interpreter.js

@@ -1,8 +1,8 @@
 import { socketInterpreterProvider } from '../../common/interpreter/socket_interpret';
-import { typesRegistry } from '../../common/lib/types';
 import { socket } from '../socket';
-import { functionsRegistry } from './functions';
 import { createHandlers } from './create_handlers';
+import { typesRegistry } from '../../common/lib/types_registry';
+import { functionsRegistry } from './functions_registry';
 
 // Create the function list
 socket.emit('getFunctionList');

public/lib/load_elements.js

@@ -1,4 +1,4 @@
-import { elementsRegistry } from './elements';
+import { elementsRegistry } from './elements_registry';
 import { elementSpecs } from '../elements';
 
 elementSpecs.forEach(elDef => elementsRegistry.register(elDef));

public/lib/load_functions.js

@@ -1,4 +1,4 @@
-import { functionsRegistry } from '../../common/lib/functions';
+import { functionsRegistry } from '../../common/lib/functions_registry';
 import { commonFunctions } from '../../common/functions';
 import { clientFunctions } from '../functions';
 

public/lib/load_types.js

@@ -1,4 +1,4 @@
-import { typesRegistry } from '../../common/lib/types';
+import { typesRegistry } from '../../common/lib/types_registry';
 import { typeSpecs } from '../../common/types';
 
 typeSpecs.forEach(typeDef => typesRegistry.register(typeDef));

public/socket.js

@@ -1,7 +1,7 @@
 import { map } from 'lodash';
 import io from 'socket.io-client';
 import chrome from 'ui/chrome';
-import { functionsRegistry } from '../common/lib/functions';
+import { functionsRegistry } from '../common/lib/functions_registry';
 
 const basePath = chrome.getBasePath();
 export const socket = io(undefined, { path: `${basePath}/socket.io` });

public/state/actions/elements.js

@@ -6,7 +6,7 @@ import * as args from './resolved_args';
 import { getPages, getElementById } from '../selectors/workpad';
 import { getValue } from '../selectors/resolved_args';
 import { getDefaultElement } from '../defaults';
-import { getType } from '../../../common/types/get_type';
+import { getType } from '../../../common/lib/get_type';
 import { fromExpression, toExpression, safeElementFromExpression } from '../../../common/lib/ast';
 import { interpretAst } from '../../lib/interpreter';
 import { notify } from '../../lib/notify';

public/state/store_service.js

@@ -1,10 +1,10 @@
+import { uniqBy } from 'lodash';
 import { uiModules } from 'ui/modules';
-import { historyProvider } from '../lib/history_provider';
 import { onStart } from './on_start';
-import { uniqBy } from 'lodash';
-import { functionsRegistry } from '../../common/lib/functions';
 import { getInitialState } from './initial_state';
 import { setStore } from './store';
+import { historyProvider } from '../lib/history_provider';
+import { functionsRegistry } from '../../common/lib/functions_registry';
 
 const app = uiModules.get('apps/canvas');
 

server/functions/demodata/index.js

@@ -0,0 +1 @@
+export { demodata } from './demodata';

server/functions/demoprices/index.js

@@ -0,0 +1 @@
+export { demoprices } from './demoprices';

server/functions/escount/escount.js → server/functions/escount.js

@@ -1,4 +1,4 @@
-import { buildESRequest } from '../esdocs/lib/build_es_request';
+import { buildESRequest } from './esdocs/lib/build_es_request';
 
 export const escount = {
   name: 'escount',

server/functions/esdocs/index.js

@@ -0,0 +1 @@
+export { esdocs } from './esdocs';

server/functions/index.js

@@ -1,10 +1,10 @@
-import { demodata } from './demodata/demodata';
-import { demoprices } from './demoprices/demoprices';
-import { escount } from './escount/escount';
-import { esdocs } from './esdocs/esdocs';
-import { pointseries } from './pointseries/pointseries';
-import { timelion } from './timelion/timelion';
-import { toFn } from './to/to';
+import { demodata } from './demodata';
+import { demoprices } from './demoprices';
+import { escount } from './escount';
+import { esdocs } from './esdocs';
+import { pointseries } from './pointseries';
+import { timelion } from './timelion';
+import { toFn } from './to';
 
 export const serverFunctions = [
   esdocs,