Fix build issues

Author: saulshanabrook

packages/dataregistry-csvviewer-extension/src/data_grid.ts

@@ -10,7 +10,7 @@ import {
   BasicKeyHandler,
   BasicMouseHandler,
   BasicSelectionModel,
-  DataGrid
+  DataGrid,
 } from '@lumino/datagrid';
 import { Message } from '@lumino/messaging';
 import { DSVModel } from '@jupyterlab/csvviewer';
@@ -63,7 +63,7 @@ class CSVDataGrid extends DataGrid {
       self.keyHandler = new BasicKeyHandler();
       self.mouseHandler = new BasicMouseHandler();
       self.selectionModel = new BasicSelectionModel({
-        dataModel: self.dataModel
+        dataModel: self.dataModel,
       });
     }
   }

packages/dataregistry-extension/src/active.ts

@@ -82,7 +82,7 @@ function getURL_(
   }
   const context = docManager.contextForWidget(widget);
   if (context) {
-    return new URL(context.session.path, 'file:').toString();
+    return new URL(context.path, 'file:').toString();
   }
   if (hasURL_(widget)) {
     return widget.url;

packages/dataregistry-extension/src/browser.tsx

@@ -10,20 +10,20 @@ import {
   ILayoutRestorer,
   JupyterFrontEnd,
   JupyterFrontEndPlugin,
-  ILabShell
+  ILabShell,
 } from '@jupyterlab/application';
 import { ReactWidget } from '@jupyterlab/apputils';
 import {
   Registry,
   relativeNestedDataType,
   nestedDataType,
-  URL_
+  URL_,
 } from '@jupyterlab/dataregistry';
 import { IRegistry } from '@jupyterlab/dataregistry-registry-extension';
 import { Widget } from '@lumino/widgets';
 import { widgetDataType, reactDataType } from './widgets';
 import { IActiveDataset } from '.';
-import { luminoWidget } from './utils';
+import { LuminoWidget } from './utils';
 import { Observable } from 'rxjs';
 
 function InnerBrowser({ registry, url }: { registry: Registry; url: URL_ }) {
@@ -56,9 +56,9 @@ function InnerBrowser({ registry, url }: { registry: Registry; url: URL_ }) {
   React.useEffect(() => {
     if (children$) {
       const subscription = children$.subscribe({
-        next: value => {
+        next: (value) => {
           setChildren([...value]);
-        }
+        },
       });
       return () => subscription.unsubscribe();
     }
@@ -81,7 +81,7 @@ function InnerBrowser({ registry, url }: { registry: Registry; url: URL_ }) {
   for (const child of children) {
     options.set(`child-${child}`, {
       value: child,
-      type: 'child'
+      type: 'child',
     });
   }
 
@@ -104,14 +104,14 @@ function InnerBrowser({ registry, url }: { registry: Registry; url: URL_ }) {
     const widgetCreator = widgets.get(name);
     return (
       components.get(name) ||
-      (widgetCreator && <luminoWidget widget={widgetCreator()} />)
+      (widgetCreator && <LuminoWidget widget={widgetCreator()} />)
     );
   }, [options, label, components, widgets]);
   // Use the widget creator to set the current widget
 
   return (
     <>
-      <select value={label} onChange={event => setLabel(event.target.value)}>
+      <select value={label} onChange={(event) => setLabel(event.target.value)}>
         {[...options.entries()].map(([idx, { value, type }]) => (
           <option key={idx} value={idx}>
             {type === 'child' && value.startsWith(url)
@@ -136,7 +136,7 @@ function InnerBrowser({ registry, url }: { registry: Registry; url: URL_ }) {
 
 function Browser({
   registry,
-  active
+  active,
 }: {
   registry: Registry;
   active: IActiveDataset;
@@ -152,10 +152,10 @@ function Browser({
   React.useEffect(() => {
     if (follow) {
       const subscription = active.subscribe({
-        next: value => {
+        next: (value) => {
           setURL(value || '');
           setSubmittedURL(value || '');
-        }
+        },
       });
       return () => subscription.unsubscribe();
     }
@@ -164,7 +164,7 @@ function Browser({
   return (
     <div className="jl-dr-browser">
       <form
-        onSubmit={event => {
+        onSubmit={(event) => {
           setSubmittedURL(url);
           event.preventDefault();
         }}
@@ -174,7 +174,7 @@ function Browser({
           type="text"
           value={url}
           placeholder="file:///data.csv"
-          onChange={event => setURL(event.target.value)}
+          onChange={(event) => setURL(event.target.value)}
           className="jl-dr-browser-url-text"
         />
         <input type="submit" value="Submit" />
@@ -184,7 +184,7 @@ function Browser({
         <input
           type="checkbox"
           checked={follow}
-          onChange={e => {
+          onChange={(e) => {
             if (e.target.checked) {
               setURL(active.value || '');
             }
@@ -201,7 +201,7 @@ export default {
   activate,
   id: '@jupyterlab/dataregistry-extension:browser',
   requires: [ILabShell, IRegistry, ILayoutRestorer, IActiveDataset],
-  autoStart: true
+  autoStart: true,
 } as JupyterFrontEndPlugin<void>;
 
 function activate(

packages/dataregistry-extension/src/notebooks.ts

@@ -26,7 +26,7 @@ import {
 import { IOutputModel } from '@jupyterlab/rendermime';
 import { IRegistry } from '@jupyterlab/dataregistry-registry-extension';
 import { NotebookPanel } from '@jupyterlab/notebook';
-import { ReadonlyJSONObject, ReadonlyJSONValue } from '@lumino/coreutils';
+import { ReadonlyPartialJSONObject } from '@lumino/coreutils';
 import { combineLatest, defer, Observable, of, from } from 'rxjs';
 import { map, switchMap, filter } from 'rxjs/operators';
 import { notebookContextDataType } from './documents';
@@ -99,15 +99,14 @@ const outputsDataType = new DataTypeNoArgs<Observable<Array<IOutputModel>>>(
 );
 
 // The data in the mimebundle of an output cell
-const mimeBundleDataType = new DataTypeNoArgs<Observable<ReadonlyJSONObject>>(
-  'application/x.jupyterlab.mime-bundle'
-);
+const mimeBundleDataType = new DataTypeNoArgs<
+  Observable<ReadonlyPartialJSONObject>
+>('application/x.jupyterlab.mime-bundle');
 
 // The data for a certain mimetype in an output.
-const mimeDataDataType = new DataTypeStringArg<Observable<ReadonlyJSONValue>>(
-  'application/x.jupyterlab.mimedata',
-  'mimeType'
-);
+const mimeDataDataType = new DataTypeStringArg<
+  Observable<ReadonlyPartialJSONObject>
+>('application/x.jupyterlab.mimedata', 'mimeType');
 
 /**
  * Converters
@@ -388,8 +387,8 @@ export function createConverters(
         )
     ),
     createConverter<
-      Observable<ReadonlyJSONValue>,
-      Observable<ReadonlyJSONValue>,
+      Observable<ReadonlyPartialJSONObject>,
+      Observable<ReadonlyPartialJSONObject>,
       string,
       string
     >({ from: mimeDataDataType }, ({ type, data }) => ({ type, data })),

packages/dataregistry-extension/src/snippets.ts

@@ -104,7 +104,7 @@ export default {
         ({ type, data }) => ({
           type,
           data: async () =>
-            notebookTracker.activeCell.model.value.insert(
+            notebookTracker.activeCell?.model.value.insert(
               0,
               await data({
                 path: notebookTracker.currentWidget!.context.path,

packages/dataregistry-extension/src/tableData.tsx

@@ -9,10 +9,11 @@ import { JupyterFrontEndPlugin } from '@jupyterlab/application';
 import {
   DataTypeNoArgs,
   Registry,
-  createConverter
+  createConverter,
 } from '@jupyterlab/dataregistry';
 
-import NteractDataExplorer, { Props } from '@nteract/data-explorer';
+import NteractDataExplorer from '@nteract/data-explorer';
+import { DataProps } from '@nteract/data-explorer/lib/utilities/types';
 import React from 'react';
 import { IRegistry } from '@jupyterlab/dataregistry-registry-extension';
 import { reactDataType } from './widgets';
@@ -23,7 +24,7 @@ import { UseObservable } from './utils';
  * Provides a table data type
  * https://frictionlessdata.io/specs/tabular-data-resource/
  */
-export const TableDataType = new DataTypeNoArgs<Observable<Props['data']>>(
+export const TableDataType = new DataTypeNoArgs<Observable<DataProps>>(
   'application/vnd.dataresource+json'
 );
 
@@ -38,7 +39,7 @@ const nteractDataExplorerConverter = createConverter(
     type: 'nteract Data Explorer',
     data: (
       <UseObservable observable={data} initial={undefined}>
-        {data =>
+        {(data) =>
           data ? (
             <NteractDataExplorer
               data={data}
@@ -51,7 +52,7 @@ const nteractDataExplorerConverter = createConverter(
           )
         }
       </UseObservable>
-    )
+    ),
   })
 );
 
@@ -61,5 +62,5 @@ export default {
   },
   id: '@jupyterlab/dataregistry-extension:table-data',
   requires: [IRegistry],
-  autoStart: true
+  autoStart: true,
 } as JupyterFrontEndPlugin<void>;

packages/dataregistry-extension/src/utils.tsx

@@ -19,7 +19,7 @@ interface IUseBehaviorSubjectProps<T> {
 
 export function UseBehaviorSubject<T>({
   subject,
-  children
+  children,
 }: IUseBehaviorSubjectProps<T>) {
   return (
     <UseObservable observable={subject} initial={subject.value}>
@@ -45,7 +45,7 @@ export class UseObservable<T, U> extends React.Component<
 
   componentDidMount() {
     this.subscription = this.props.observable.subscribe({
-      next: value => this.setState({ value })
+      next: (value) => this.setState({ value }),
     });
   }
 
@@ -58,7 +58,7 @@ export class UseObservable<T, U> extends React.Component<
   }
 }
 
-export function luminoWidget({ widget }: { widget: Widget }) {
+export function LuminoWidget({ widget }: { widget: Widget }) {
   const el = React.useRef<HTMLDivElement>(null);
 
   React.useEffect(() => {
@@ -72,7 +72,7 @@ export function luminoWidget({ widget }: { widget: Widget }) {
 export function signalToObservable<T, V>(
   signal: ISignal<T, V>
 ): Observable<[T, V]> {
-  return new Observable(subscriber => {
+  return new Observable((subscriber) => {
     function slot(sender: T, value: V) {
       subscriber.next([sender, value]);
     }