From f776756f63996c8c5e24f005feccd5f0fc37dac9 Mon Sep 17 00:00:00 2001 From: Garrett Stevens Date: Thu, 2 Sep 2021 17:28:34 -0600 Subject: [PATCH 1/3] Add extra re-exports for default modules --- packages/core/ReExports/list.ts | 2 ++ packages/core/ReExports/modules.ts | 6 +++++- .../pluggableElementTypes/renderers/index.ts | 17 +++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 packages/core/pluggableElementTypes/renderers/index.ts diff --git a/packages/core/ReExports/list.ts b/packages/core/ReExports/list.ts index 00e5d031b3..ba4a521d92 100644 --- a/packages/core/ReExports/list.ts +++ b/packages/core/ReExports/list.ts @@ -25,6 +25,7 @@ export default [ '@jbrowse/core/pluggableElementTypes/renderers/BoxRendererType', '@jbrowse/core/pluggableElementTypes/renderers/FeatureRendererType', '@jbrowse/core/pluggableElementTypes/renderers/RendererType', + '@jbrowse/core/pluggableElementTypes/renderers', '@jbrowse/core/configuration', '@jbrowse/core/util/types/mst', '@jbrowse/core/ui', @@ -34,6 +35,7 @@ export default [ '@jbrowse/core/util/Base1DViewModel', '@jbrowse/core/util/io', '@jbrowse/core/util/mst-reflection', + '@jbrowse/core/util/range', '@jbrowse/core/util/rxjs', '@jbrowse/core/BaseFeatureWidget/BaseFeatureDetail', diff --git a/packages/core/ReExports/modules.ts b/packages/core/ReExports/modules.ts index 43748a0b4c..64f1acb085 100644 --- a/packages/core/ReExports/modules.ts +++ b/packages/core/ReExports/modules.ts @@ -65,15 +65,17 @@ import CircularChordRendererType from '../pluggableElementTypes/renderers/Circul import * as BoxRendererType from '../pluggableElementTypes/renderers/BoxRendererType' import * as FeatureRendererType from '../pluggableElementTypes/renderers/FeatureRendererType' import * as RendererType from '../pluggableElementTypes/renderers/RendererType' +import * as renderers from '../pluggableElementTypes/renderers' import * as Configuration from '../configuration' -import * as Plugin from '../Plugin' +import Plugin from '../Plugin' import * as coreUi from '../ui' import * as coreUtil from '../util' import * as coreColor from '../util/color' import * as trackUtils from '../util/tracks' import * as coreIo from '../util/io' import * as coreMstReflection from '../util/mst-reflection' +import * as range from '../util/range' import * as rxjs from '../util/rxjs' import * as MUIColors from './material-ui-colors' import * as mstTypes from '../util/types/mst' @@ -147,6 +149,7 @@ const libs = { '@jbrowse/core/pluggableElementTypes/renderers/BoxRendererType': BoxRendererType, '@jbrowse/core/pluggableElementTypes/renderers/FeatureRendererType': FeatureRendererType, '@jbrowse/core/pluggableElementTypes/renderers/RendererType': RendererType, + '@jbrowse/core/pluggableElementTypes/renderers': renderers, '@jbrowse/core/configuration': Configuration, '@jbrowse/core/util/types/mst': mstTypes, '@jbrowse/core/ui': coreUi, @@ -156,6 +159,7 @@ const libs = { '@jbrowse/core/util/Base1DViewModel': Base1DView, '@jbrowse/core/util/io': coreIo, '@jbrowse/core/util/mst-reflection': coreMstReflection, + '@jbrowse/core/util/range': range, '@jbrowse/core/util/rxjs': rxjs, '@jbrowse/core/BaseFeatureWidget/BaseFeatureDetail': BaseFeatureDetail, diff --git a/packages/core/pluggableElementTypes/renderers/index.ts b/packages/core/pluggableElementTypes/renderers/index.ts new file mode 100644 index 0000000000..a2aa71037c --- /dev/null +++ b/packages/core/pluggableElementTypes/renderers/index.ts @@ -0,0 +1,17 @@ +import BoxRendererType from './BoxRendererType' +import CircularChordRendererType from './CircularChordRendererType' +import ComparativeServerSideRendererType from './ComparativeServerSideRendererType' +import FeatureRendererType from './FeatureRendererType' +import RendererType from './RendererType' +import ServerSideRenderedContent from './ServerSideRenderedContent' +import ServerSideRendererType from './ServerSideRendererType' + +export { + BoxRendererType, + CircularChordRendererType, + ComparativeServerSideRendererType, + FeatureRendererType, + RendererType, + ServerSideRenderedContent, + ServerSideRendererType, +} From 34ee2f57fd1eb591ae0bd5c1a3f02d32b24d539d Mon Sep 17 00:00:00 2001 From: Garrett Stevens Date: Fri, 22 Oct 2021 15:17:01 -0600 Subject: [PATCH 2/3] Make re-exports not so deep in the package --- packages/core/ReExports/list.ts | 3 +-- packages/core/ReExports/modules.ts | 6 ++---- packages/core/pluggableElementTypes/index.ts | 20 +++++++++++++++++--- packages/core/util/index.ts | 1 + 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/packages/core/ReExports/list.ts b/packages/core/ReExports/list.ts index ba4a521d92..165bfbb2f4 100644 --- a/packages/core/ReExports/list.ts +++ b/packages/core/ReExports/list.ts @@ -13,6 +13,7 @@ export default [ '@material-ui/data-grid', '@jbrowse/core/Plugin', + '@jbrowse/core/pluggableElementTypes', '@jbrowse/core/pluggableElementTypes/ViewType', '@jbrowse/core/pluggableElementTypes/AdapterType', '@jbrowse/core/pluggableElementTypes/DisplayType', @@ -25,7 +26,6 @@ export default [ '@jbrowse/core/pluggableElementTypes/renderers/BoxRendererType', '@jbrowse/core/pluggableElementTypes/renderers/FeatureRendererType', '@jbrowse/core/pluggableElementTypes/renderers/RendererType', - '@jbrowse/core/pluggableElementTypes/renderers', '@jbrowse/core/configuration', '@jbrowse/core/util/types/mst', '@jbrowse/core/ui', @@ -35,7 +35,6 @@ export default [ '@jbrowse/core/util/Base1DViewModel', '@jbrowse/core/util/io', '@jbrowse/core/util/mst-reflection', - '@jbrowse/core/util/range', '@jbrowse/core/util/rxjs', '@jbrowse/core/BaseFeatureWidget/BaseFeatureDetail', diff --git a/packages/core/ReExports/modules.ts b/packages/core/ReExports/modules.ts index 64f1acb085..0bdd933577 100644 --- a/packages/core/ReExports/modules.ts +++ b/packages/core/ReExports/modules.ts @@ -53,6 +53,7 @@ import * as BaseAdapterExports from '../data_adapters/BaseAdapter' import * as BaseFeatureDetail from '../BaseFeatureWidget/BaseFeatureDetail' import Base1DView from '../util/Base1DViewModel' +import * as pluggableElementTypes from '../pluggableElementTypes' import ViewType from '../pluggableElementTypes/ViewType' import AdapterType from '../pluggableElementTypes/AdapterType' import DisplayType from '../pluggableElementTypes/DisplayType' @@ -65,7 +66,6 @@ import CircularChordRendererType from '../pluggableElementTypes/renderers/Circul import * as BoxRendererType from '../pluggableElementTypes/renderers/BoxRendererType' import * as FeatureRendererType from '../pluggableElementTypes/renderers/FeatureRendererType' import * as RendererType from '../pluggableElementTypes/renderers/RendererType' -import * as renderers from '../pluggableElementTypes/renderers' import * as Configuration from '../configuration' import Plugin from '../Plugin' @@ -75,7 +75,6 @@ import * as coreColor from '../util/color' import * as trackUtils from '../util/tracks' import * as coreIo from '../util/io' import * as coreMstReflection from '../util/mst-reflection' -import * as range from '../util/range' import * as rxjs from '../util/rxjs' import * as MUIColors from './material-ui-colors' import * as mstTypes from '../util/types/mst' @@ -137,6 +136,7 @@ const libs = { '@material-ui/lab/ToggleButtonGroup': ToggleButtonGroup, '@jbrowse/core/Plugin': Plugin, + '@jbrowse/core/pluggableElementTypes': pluggableElementTypes, '@jbrowse/core/pluggableElementTypes/ViewType': ViewType, '@jbrowse/core/pluggableElementTypes/AdapterType': AdapterType, '@jbrowse/core/pluggableElementTypes/DisplayType': DisplayType, @@ -149,7 +149,6 @@ const libs = { '@jbrowse/core/pluggableElementTypes/renderers/BoxRendererType': BoxRendererType, '@jbrowse/core/pluggableElementTypes/renderers/FeatureRendererType': FeatureRendererType, '@jbrowse/core/pluggableElementTypes/renderers/RendererType': RendererType, - '@jbrowse/core/pluggableElementTypes/renderers': renderers, '@jbrowse/core/configuration': Configuration, '@jbrowse/core/util/types/mst': mstTypes, '@jbrowse/core/ui': coreUi, @@ -159,7 +158,6 @@ const libs = { '@jbrowse/core/util/Base1DViewModel': Base1DView, '@jbrowse/core/util/io': coreIo, '@jbrowse/core/util/mst-reflection': coreMstReflection, - '@jbrowse/core/util/range': range, '@jbrowse/core/util/rxjs': rxjs, '@jbrowse/core/BaseFeatureWidget/BaseFeatureDetail': BaseFeatureDetail, diff --git a/packages/core/pluggableElementTypes/index.ts b/packages/core/pluggableElementTypes/index.ts index 526e70ebd5..4ce28359bb 100644 --- a/packages/core/pluggableElementTypes/index.ts +++ b/packages/core/pluggableElementTypes/index.ts @@ -6,7 +6,21 @@ import TrackType from './TrackType' import DisplayType from './DisplayType' import ViewType from './ViewType' import RpcMethodType from './RpcMethodType' -import TextSearchAdapter from './TextSearchAdapterType' +import TextSearchAdapterType from './TextSearchAdapterType' + +export * from './renderers' + +export { + AdapterType, + ConnectionType, + RendererType, + WidgetType, + TrackType, + DisplayType, + ViewType, + RpcMethodType, + TextSearchAdapterType, +} export type PluggableElementType = | AdapterType @@ -17,7 +31,7 @@ export type PluggableElementType = | DisplayType | ViewType | RpcMethodType - | TextSearchAdapter + | TextSearchAdapterType export type PluggableElementMember = | keyof AdapterType @@ -28,4 +42,4 @@ export type PluggableElementMember = | keyof DisplayType | keyof ViewType | keyof RpcMethodType - | keyof TextSearchAdapter + | keyof TextSearchAdapterType diff --git a/packages/core/util/index.ts b/packages/core/util/index.ts index e5baf140e9..9a345b0524 100644 --- a/packages/core/util/index.ts +++ b/packages/core/util/index.ts @@ -28,6 +28,7 @@ import { isAbortException, checkAbortSignal } from './aborting' export * from './types' export * from './aborting' export * from './when' +export * from './range' export * from './offscreenCanvasPonyfill' export * from './offscreenCanvasUtils' From 7a822e1f06cf44b110291bcf31c1f4da9e58658d Mon Sep 17 00:00:00 2001 From: Garrett Stevens Date: Fri, 22 Oct 2021 16:36:50 -0600 Subject: [PATCH 3/3] Fix name --- packages/core/pluggableElementTypes/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/pluggableElementTypes/index.ts b/packages/core/pluggableElementTypes/index.ts index 4dc65cd97b..f919176311 100644 --- a/packages/core/pluggableElementTypes/index.ts +++ b/packages/core/pluggableElementTypes/index.ts @@ -33,7 +33,7 @@ export type PluggableElementType = | ViewType | RpcMethodType | InternetAccountType - | TextSearchAdapter + | TextSearchAdapterType export type PluggableElementMember = | keyof AdapterType @@ -45,4 +45,4 @@ export type PluggableElementMember = | keyof ViewType | keyof RpcMethodType | keyof InternetAccountType - | keyof TextSearchAdapter + | keyof TextSearchAdapterType