Skip to content

Commit

Permalink
[expressions] removing export * (#127450)
Browse files Browse the repository at this point in the history
  • Loading branch information
ppisljar authored Mar 15, 2022
1 parent f4bd49b commit def5ef5
Show file tree
Hide file tree
Showing 8 changed files with 230 additions and 37 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
*/
import type { ValueClickContext } from '../../../embeddable/public';
import { ChartsPluginSetup } from '../../../charts/public';
import { ExpressionsPublicPlugin, ExpressionsServiceStart } from '../../../expressions/public';
import {
Plugin as ExpressionsPublicPlugin,
ExpressionsServiceStart,
} from '../../../expressions/public';

export type ExpressionPartitionVisPluginSetup = void;
export type ExpressionPartitionVisPluginStart = void;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@ export const boolean: ExpressionTypeDefinition<'boolean', boolean> = {
name,
from: {
null: () => false,
number: (n) => Boolean(n),
string: (s) => Boolean(s),
number: (n: number) => Boolean(n),
string: (s: string) => Boolean(s),
},
to: {
render: (value): ExpressionValueRender<{ text: string }> => {
render: (value: boolean): ExpressionValueRender<{ text: string }> => {
const text = `${value}`;
return {
type: 'render',
as: 'text',
value: { text },
};
},
datatable: (value): Datatable => ({
datatable: (value: boolean): Datatable => ({
type: 'datatable',
columns: [{ id: 'value', name: 'value', meta: { type: name } }],
rows: [{ value }],
Expand Down
10 changes: 5 additions & 5 deletions src/plugins/expressions/common/expression_types/specs/num.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ export const num: ExpressionTypeDefinition<'num', ExpressionValueNum> = {
type: 'num',
value: 0,
}),
boolean: (b) => ({
boolean: (b: boolean) => ({
type: 'num',
value: Number(b),
}),
string: (n) => {
string: (n: string) => {
const value = Number(n);
if (Number.isNaN(value)) {
throw new Error(
Expand All @@ -46,21 +46,21 @@ export const num: ExpressionTypeDefinition<'num', ExpressionValueNum> = {
value,
};
},
'*': (value) => ({
'*': (value: unknown) => ({
type: 'num',
value: Number(value),
}),
},
to: {
render: ({ value }): ExpressionValueRender<{ text: string }> => {
render: ({ value }: { value: number }): ExpressionValueRender<{ text: string }> => {
const text = `${value}`;
return {
type: 'render',
as: 'text',
value: { text },
};
},
datatable: ({ value }): Datatable => ({
datatable: ({ value }: { value: number }): Datatable => ({
type: 'datatable',
columns: [{ id: 'value', name: 'value', meta: { type: 'number' } }],
rows: [{ value }],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ export const number: ExpressionTypeDefinition<typeof name, number> = {
name,
from: {
null: () => 0,
boolean: (b) => Number(b),
string: (n) => {
boolean: (b: boolean) => Number(b),
string: (n: number) => {
const value = Number(n);
if (Number.isNaN(value)) {
throw new Error(
Expand All @@ -42,7 +42,7 @@ export const number: ExpressionTypeDefinition<typeof name, number> = {
value: { text },
};
},
datatable: (value): Datatable => ({
datatable: (value: number): Datatable => ({
type: 'datatable',
columns: [{ id: 'value', name: 'value', meta: { type: 'number' } }],
rows: [{ value }],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ export const string: ExpressionTypeDefinition<typeof name, string> = {
name,
from: {
null: () => '',
boolean: (b) => String(b),
number: (n) => String(n),
boolean: (b: boolean) => String(b),
number: (n: number) => String(n),
},
to: {
render: <T>(text: T): ExpressionValueRender<{ text: T }> => {
Expand All @@ -27,7 +27,7 @@ export const string: ExpressionTypeDefinition<typeof name, string> = {
value: { text },
};
},
datatable: (value): Datatable => ({
datatable: (value: string): Datatable => ({
type: 'datatable',
columns: [{ id: 'value', name: 'value', meta: { type: 'string' } }],
rows: [{ value }],
Expand Down
223 changes: 210 additions & 13 deletions src/plugins/expressions/common/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,213 @@
* Side Public License, v 1.
*/

// TODO: https://github.com/elastic/kibana/issues/109902
/* eslint-disable @kbn/eslint/no_export_all */

export * from './types';
export * from './ast';
export * from './fonts';
export * from './expression_types';
export * from './expression_functions';
export * from './expression_renderers';
export * from './executor';
export * from './execution';
export * from './service';
export * from './util';
export {
BackgroundRepeat,
BackgroundSize,
Overflow,
FontStyle,
FontWeight,
FontSizeUnit,
TextDecoration,
TextAlignment,
} from './types';
export type {
ExpressionTypeStyle,
CSSStyle,
Style,
TypeString,
TypeToString,
UnmappedTypeStrings,
KnownTypeToString,
IRegistry,
ContainerStyle,
} from './types';
export {
buildExpression,
buildExpressionFunction,
formatExpression,
isExpressionAstBuilder,
parseExpression,
parse,
isExpressionAst,
format,
} from './ast';
export type {
ExpressionAstExpression,
ExpressionAstExpressionBuilder,
ExpressionAstFunction,
ExpressionAstFunctionBuilder,
ExpressionAstNode,
ExpressionAstArgument,
ExpressionAstFunctionDebug,
InferFunctionDefinition,
} from './ast';
export {
americanTypewriter,
inter,
arial,
fonts,
bookAntiqua,
brushScript,
didot,
futura,
chalkboard,
gillSans,
openSans,
helveticaNeue,
hoeflerText,
lucidaGrande,
myriad,
optima,
palatino,
baskerville,
} from './fonts';
export type { Font, FontLabel, FontValue } from './fonts';
export {
num,
filter,
error,
image,
render,
number,
datatable,
nullType,
range,
pointseries,
serializeProvider,
typeSpecs,
string,
shape,
style,
uiSetting,
boolean,
isExpressionValueError,
getType,
unboxExpressionValue,
isDatatable,
ExpressionType,
} from './expression_types';
export type {
AnyExpressionTypeDefinition,
ExpressionValueError,
ExpressionValueNum,
ExpressionValueRender,
ExpressionValueUnboxed,
ExpressionValueFilter,
ExpressionTypeDefinition,
ExpressionValueConverter,
ExpressionValueBoxed,
ExpressionValue,
Render,
ExpressionImage,
DatatableColumnType,
DatatableRow,
Datatable,
DatatableColumn,
DatatableColumnMeta,
InterpreterErrorType,
SerializedDatatable,
PointSeries,
PointSeriesColumn,
PointSeriesColumnName,
PointSeriesColumns,
PointSeriesRow,
Range,
UiSetting,
} from './expression_types';
export {
derivative,
movingAverage,
mapColumn,
math,
mathColumn,
clog,
createTable,
font,
variableSet,
variable,
theme,
cumulativeSum,
overallMetric,
getUiSettingFn,
buildResultColumns,
getBucketIdentifier,
ExpressionFunction,
} from './expression_functions';
export type {
AnyExpressionFunctionDefinition,
ExpressionFunctionDefinition,
ExpressionFunctionDefinitions,
ExpressionFunctionParameter,
ExpressionFunctionDerivative,
ExpressionFunctionClog,
CreateTableArguments,
CumulativeSumArgs,
ExpressionFunctionFont,
ExpressionFunctionTheme,
ExpressionFunctionUiSetting,
ExpressionFunctionVar,
ExpressionFunctionVarSet,
DerivativeArgs,
ExpressionFunctionCumulativeSum,
ExpressionFunctionMovingAverage,
ExpressionFunctionOverallMetric,
FontArguments,
MapColumnArguments,
MathColumnArguments,
MathArguments,
MovingAverageArgs,
OverallMetricArgs,
ArgumentType,
MathInput,
UiSettingArguments,
} from './expression_functions';
export { ExpressionRenderer } from './expression_renderers';
export type {
AnyExpressionRenderDefinition,
ExpressionRendererRegistry,
ExpressionRenderDefinition,
IInterpreterRenderEvent,
IInterpreterRenderHandlers,
IInterpreterRenderUpdateParams,
RenderMode,
} from './expression_renderers';
export { createExecutorContainer, pureSelectors, pureTransitions, defaultState } from './executor';
export type {
Executor,
ExecutorContainer,
ExecutorState,
ExecutorPureSelectors,
ExecutorPureTransitions,
ExpressionExecOptions,
FunctionsRegistry,
TypesRegistry,
} from './executor';
export { createExecutionContainer, executionPureTransitions } from './execution';
export type {
Execution,
ExecutionContract,
ExecutionContainer,
ExecutionContext,
ExecutionParams,
ExecutionState,
ExecutionPureTransitions,
ExecutionResult,
DefaultInspectorAdapters,
} from './execution';
export { ExpressionsService } from './service';
export type {
ExpressionsServiceSetup,
ExpressionsServiceStart,
ExpressionExecutionParams,
ExpressionServiceParams,
} from './service';
export {
createDefaultInspectorAdapters,
createMockContext,
createError,
getByAlias,
ExpressionsInspectorAdapter,
TablesAdapter,
} from './util';
export type { SerializedError, ErrorLike } from './util';
5 changes: 1 addition & 4 deletions src/plugins/expressions/public/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,14 @@
* Side Public License, v 1.
*/

// TODO: https://github.com/elastic/kibana/issues/109902
/* eslint-disable @kbn/eslint/no_export_all */

import './index.scss';

import { PluginInitializerContext } from '../../../core/public';
import { ExpressionsPublicPlugin } from './plugin';

// Kibana Platform.
export { ExpressionsPublicPlugin as Plugin };
export * from './plugin';
export type { ExpressionsSetup, ExpressionsStart } from './plugin';
export function plugin(initializerContext: PluginInitializerContext) {
return new ExpressionsPublicPlugin(initializerContext);
}
Expand Down
4 changes: 0 additions & 4 deletions src/plugins/expressions/server/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,13 @@
* Side Public License, v 1.
*/

// TODO: https://github.com/elastic/kibana/issues/109902
/* eslint-disable @kbn/eslint/no_export_all */

import { PluginInitializerContext } from 'src/core/server';
import { ExpressionsServerPlugin } from './plugin';

export type { ExpressionsServerSetup, ExpressionsServerStart } from './plugin';

// Kibana Platform.
export { ExpressionsServerPlugin as Plugin };
export * from './plugin';
export function plugin(initializerContext: PluginInitializerContext) {
return new ExpressionsServerPlugin(initializerContext);
}
Expand Down

0 comments on commit def5ef5

Please sign in to comment.