Merge pull request #3570 from vidartf/unpack-typing

Stricter typescript + some cleanups

Author: martinRenou

packages/base/src/services-shim.ts

@@ -13,9 +13,9 @@ import { Kernel, KernelMessage } from '@jupyterlab/services';
  * Callbacks for services shim comms.
  */
 export interface ICallbacks {
-  shell?: { [key: string]: (msg: KernelMessage.IMessage) => void };
-  iopub?: { [key: string]: (msg: KernelMessage.IMessage) => void };
-  input?: (msg: KernelMessage.IMessage) => void;
+  shell?: { [key: string]: (msg: KernelMessage.IShellMessage) => void };
+  iopub?: { [key: string]: (msg: KernelMessage.IIOPubMessage) => void };
+  input?: (msg: KernelMessage.IStdinMessage) => void;
 }
 
 export interface IClassicComm {

packages/base/src/widget.ts

@@ -34,7 +34,7 @@ import { KernelMessage } from '@jupyterlab/services';
  */
 export function unpack_models(
   value: any | Dict<unknown> | string | (Dict<unknown> | string)[],
-  manager: IWidgetManager
+  manager?: IWidgetManager // actually required, but typed to be compatible with ISerializers
 ): Promise<WidgetModel | Dict<WidgetModel> | WidgetModel[] | any> {
   if (Array.isArray(value)) {
     const unpacked: any[] = [];
@@ -50,7 +50,7 @@ export function unpack_models(
     return utils.resolvePromisesDict(unpacked);
   } else if (typeof value === 'string' && value.slice(0, 10) === 'IPY_MODEL_') {
     // get_model returns a promise already
-    return manager.get_model(value.slice(10, value.length));
+    return manager!.get_model(value.slice(10, value.length));
   } else {
     return Promise.resolve(value);
   }

packages/controls/src/widget_controller.ts

@@ -389,8 +389,8 @@ export class ControllerView extends DOMWidgetView {
     const dummy = new Widget();
     this.button_box.addWidget(dummy);
 
-    return this.create_child_view(model)
-      .then((view: ControllerButtonView) => {
+    return this.create_child_view<ControllerButtonView>(model)
+      .then((view) => {
         // replace the dummy widget with the new one.
         const i = ArrayExt.firstIndexOf(this.button_box.widgets, dummy);
         this.button_box.insertWidget(i, view.luminoWidget);
@@ -406,8 +406,8 @@ export class ControllerView extends DOMWidgetView {
     const dummy = new Widget();
     this.axis_box.addWidget(dummy);
 
-    return this.create_child_view(model)
-      .then((view: ControllerAxisView) => {
+    return this.create_child_view<ControllerAxisView>(model)
+      .then((view) => {
         // replace the dummy widget with the new one.
         const i = ArrayExt.firstIndexOf(this.axis_box.widgets, dummy);
         this.axis_box.insertWidget(i, view.luminoWidget);

packages/controls/src/widget_selection.ts

@@ -317,8 +317,8 @@ export class RadioButtonsView extends DescriptionView {
   update(options?: any): void {
     const items: string[] = this.model.get('_options_labels');
     const radios = Array.from(
-      this.container.querySelectorAll('input[type="radio"]')
-    ).map((x: HTMLInputElement) => x.value);
+      this.container.querySelectorAll<HTMLInputElement>('input[type="radio"]')
+    ).map((x) => x.value);
     let stale = items.length !== radios.length;
 
     if (!stale) {

tsconfigbase.json

@@ -18,7 +18,6 @@
     "strict": true,
     "noImplicitThis": false,
     "strictPropertyInitialization": false,
-    "strictFunctionTypes": false,
     "target": "es2017"
   }
 }