From 195c63506988bd9abc77c16b4412cbf04c7797b9 Mon Sep 17 00:00:00 2001
From: Garrett Stevens <stevens.garrett.j@gmail.com>
Date: Sat, 23 Oct 2021 11:08:23 -0600
Subject: [PATCH] Add extra re-exports for default modules (#2288)

* Add extra re-exports for default modules

* Make re-exports not so deep in the package

* Fix name
---
 packages/core/ReExports/list.ts               |  1 +
 packages/core/ReExports/modules.ts            |  4 +++-
 packages/core/pluggableElementTypes/index.ts  | 20 ++++++++++++++++---
 .../pluggableElementTypes/renderers/index.ts  | 17 ++++++++++++++++
 packages/core/util/index.ts                   |  1 +
 5 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 packages/core/pluggableElementTypes/renderers/index.ts

diff --git a/packages/core/ReExports/list.ts b/packages/core/ReExports/list.ts
index d54a933a4a..7fb2771a02 100644
--- a/packages/core/ReExports/list.ts
+++ b/packages/core/ReExports/list.ts
@@ -13,6 +13,7 @@ export default [
   '@mui/x-data-grid',
 
   '@jbrowse/core/Plugin',
+  '@jbrowse/core/pluggableElementTypes',
   '@jbrowse/core/pluggableElementTypes/ViewType',
   '@jbrowse/core/pluggableElementTypes/AdapterType',
   '@jbrowse/core/pluggableElementTypes/DisplayType',
diff --git a/packages/core/ReExports/modules.ts b/packages/core/ReExports/modules.ts
index f0c2c82eea..2577683cc8 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'
@@ -67,7 +68,7 @@ import * as FeatureRendererType from '../pluggableElementTypes/renderers/Feature
 import * as RendererType from '../pluggableElementTypes/renderers/RendererType'
 
 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'
@@ -136,6 +137,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,
diff --git a/packages/core/pluggableElementTypes/index.ts b/packages/core/pluggableElementTypes/index.ts
index 4c0b9ce623..f919176311 100644
--- a/packages/core/pluggableElementTypes/index.ts
+++ b/packages/core/pluggableElementTypes/index.ts
@@ -7,7 +7,21 @@ import DisplayType from './DisplayType'
 import ViewType from './ViewType'
 import RpcMethodType from './RpcMethodType'
 import InternetAccountType from './InternetAccountType'
-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
@@ -19,7 +33,7 @@ export type PluggableElementType =
   | ViewType
   | RpcMethodType
   | InternetAccountType
-  | TextSearchAdapter
+  | TextSearchAdapterType
 
 export type PluggableElementMember =
   | keyof AdapterType
@@ -31,4 +45,4 @@ export type PluggableElementMember =
   | keyof ViewType
   | keyof RpcMethodType
   | keyof InternetAccountType
-  | keyof TextSearchAdapter
+  | keyof TextSearchAdapterType
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,
+}
diff --git a/packages/core/util/index.ts b/packages/core/util/index.ts
index 2ffe6e0d82..cebea7d54f 100644
--- a/packages/core/util/index.ts
+++ b/packages/core/util/index.ts
@@ -27,6 +27,7 @@ import { isAbortException, checkAbortSignal } from './aborting'
 export * from './types'
 export * from './aborting'
 export * from './when'
+export * from './range'
 
 export * from './offscreenCanvasPonyfill'
 export * from './offscreenCanvasUtils'