update services for TS 2.4

packages/services/src/contents/index.ts

@@ -10,7 +10,7 @@ import {
 } from '@phosphor/coreutils';
 
 import {
-  each 
+  each
 } from '@phosphor/algorithm';
 
 import {
@@ -454,7 +454,7 @@ namespace Contents {
      * @returns A promise which resolves with the new checkpoint model when the
      *   checkpoint is created.
      */
-    createCheckpoint(localPath: string): Promise<IModel>;
+    createCheckpoint(localPath: string): Promise<ICheckpointModel>;
 
     /**
      * List available checkpoints for a file.
@@ -585,7 +585,7 @@ class ContentsManager implements Contents.IManager {
           path: this._toGlobalPath(drive, localPath)
         } as Contents.IModel;
       }
-    }); 
+    });
   }
 
   /**

packages/services/src/kernel/default.ts

@@ -396,8 +396,8 @@ class DefaultKernel implements Kernel.IKernel {
     };
     let msg = KernelMessage.createShellMessage(options);
     return Private.handleShellMessage(this, msg).then(reply => {
-      this._info = reply.content as KernelMessage.IInfoReply;
-      return reply;
+      this._info = (reply as KernelMessage.IInfoReplyMsg).content;
+      return reply as KernelMessage.IInfoReplyMsg;
     });
   }
 
@@ -418,7 +418,7 @@ class DefaultKernel implements Kernel.IKernel {
       session: this._clientId
     };
     let msg = KernelMessage.createShellMessage(options, content);
-    return Private.handleShellMessage(this, msg);
+    return Private.handleShellMessage(this, msg) as Promise<KernelMessage.ICompleteReplyMsg>;
   }
 
   /**
@@ -438,7 +438,7 @@ class DefaultKernel implements Kernel.IKernel {
       session: this._clientId
     };
     let msg = KernelMessage.createShellMessage(options, content);
-    return Private.handleShellMessage(this, msg);
+    return Private.handleShellMessage(this, msg) as Promise<KernelMessage.IInspectReplyMsg>;
   }
 
   /**
@@ -458,7 +458,7 @@ class DefaultKernel implements Kernel.IKernel {
       session: this._clientId
     };
     let msg = KernelMessage.createShellMessage(options, content);
-    return Private.handleShellMessage(this, msg);
+    return Private.handleShellMessage(this, msg) as Promise<KernelMessage.IHistoryReplyMsg>;
   }
 
   /**
@@ -512,7 +512,7 @@ class DefaultKernel implements Kernel.IKernel {
       session: this._clientId
     };
     let msg = KernelMessage.createShellMessage(options, content);
-    return Private.handleShellMessage(this, msg);
+    return Private.handleShellMessage(this, msg) as Promise<KernelMessage.IIsCompleteReplyMsg>;
   }
 
   /**
@@ -530,7 +530,7 @@ class DefaultKernel implements Kernel.IKernel {
       session: this._clientId
     };
     let msg = KernelMessage.createShellMessage(options, content);
-    return Private.handleShellMessage(this, msg);
+    return Private.handleShellMessage(this, msg) as Promise<KernelMessage.ICommInfoReplyMsg>;
   }
 
   /**
@@ -1512,11 +1512,7 @@ namespace Private {
     } catch (e) {
       return Promise.reject(e);
     }
-    return new Promise<any>((resolve, reject) => {
-      future.onReply = (reply: KernelMessage.IMessage) => {
-        resolve(reply);
-      };
-    });
+    return new Promise(resolve => { future.onReply = resolve; });
   }
 
   /**

packages/services/src/manager.ts

@@ -199,5 +199,10 @@ namespace ServiceManager {
      * The server settings of the manager.
      */
     readonly serverSettings?: ServerConnection.ISettings;
+
+    /**
+     * The default drive for the contents manager.
+     */
+    readonly defaultDrive?: Contents.IDrive;
   }
 }

packages/services/src/serverconnection.ts

@@ -307,7 +307,7 @@ namespace Private {
    */
   export
   function handleRequest(xhr: XMLHttpRequest, request: ServerConnection.IRequest, settings: ServerConnection.ISettings): Promise<ServerConnection.IResponse> {
-    let delegate = new PromiseDelegate();
+    let delegate = new PromiseDelegate<ServerConnection.IResponse>();
 
     xhr.onload = (event: ProgressEvent) => {
       if (xhr.status >= 300) {

packages/services/src/session/default.ts

@@ -79,7 +79,7 @@ class DefaultSession implements Session.ISession {
   /**
    * A signal emitted for a kernel messages.
    */
-  get iopubMessage(): ISignal<this, KernelMessage.IMessage> {
+  get iopubMessage(): ISignal<this, KernelMessage.IIOPubMessage> {
     return this._iopubMessage;
   }
 
@@ -391,7 +391,7 @@ class DefaultSession implements Session.ISession {
   private _updating = false;
   private _kernelChanged = new Signal<this, Kernel.IKernelConnection>(this);
   private _statusChanged = new Signal<this, Kernel.Status>(this);
-  private _iopubMessage = new Signal<this, KernelMessage.IMessage>(this);
+  private _iopubMessage = new Signal<this, KernelMessage.IIOPubMessage>(this);
   private _unhandledMessage = new Signal<this, KernelMessage.IMessage>(this);
   private _propertyChanged = new Signal<this, 'path' | 'name' | 'type'>(this);
 }
@@ -507,8 +507,8 @@ namespace Private {
    * @returns - A promise that resolves with a started session.
    */
   export
-  function createSession(model: Session.IModel, options: Session.IOptions): Promise<DefaultSession> {
-    let settings = options.serverSettings || ServerConnection.makeSettings();
+  function createSession(model: Session.IModel, settings?: ServerConnection.ISettings): Promise<DefaultSession> {
+    settings = settings || ServerConnection.makeSettings();
     return Kernel.connectTo(model.kernel.id, settings).then(kernel => {
       return new DefaultSession({
         path: model.path,
@@ -692,7 +692,7 @@ namespace Private {
       return Promise.reject(new Error('Must specify a path'));
     }
     return startSession(options).then(model => {
-      return createSession(model, options);
+      return createSession(model, options.serverSettings);
     });
   }
 

packages/services/src/session/session.ts

@@ -43,17 +43,17 @@ namespace Session {
     /**
      * A signal emitted when the session is shut down.
      */
-    terminated: ISignal<ISession, void>;
+    terminated: ISignal<this, void>;
 
     /**
      * A signal emitted when the kernel changes.
      */
-    kernelChanged: ISignal<ISession, Kernel.IKernelConnection>;
+    kernelChanged: ISignal<this, Kernel.IKernelConnection>;
 
     /**
      * A signal emitted when the session status changes.
      */
-    statusChanged: ISignal<ISession, Kernel.Status>;
+    statusChanged: ISignal<this, Kernel.Status>;
 
     /**
      * A signal emitted when a session property changes.
@@ -63,12 +63,12 @@ namespace Session {
     /**
      * A signal emitted for iopub kernel messages.
      */
-    iopubMessage: ISignal<ISession, KernelMessage.IIOPubMessage>;
+    iopubMessage: ISignal<this, KernelMessage.IIOPubMessage>;
 
     /**
      * A signal emitted for unhandled kernel message.
      */
-    unhandledMessage: ISignal<ISession, KernelMessage.IMessage>;
+    unhandledMessage: ISignal<this, KernelMessage.IMessage>;
 
     /**
      * Unique id of the session.
@@ -150,7 +150,7 @@ namespace Session {
      * This shuts down the existing kernel and creates a new kernel,
      * keeping the existing session ID and path.
      */
-    changeKernel(options: Kernel.IModel): Promise<Kernel.IKernel>;
+    changeKernel(options: Kernel.IModel): Promise<Kernel.IKernelConnection>;
 
     /**
      * Kill the kernel and shutdown the session.
@@ -354,12 +354,12 @@ namespace Session {
     /**
      * A signal emitted when the kernel specs change.
      */
-    specsChanged: ISignal<IManager, Kernel.ISpecModels>;
+    specsChanged: ISignal<this, Kernel.ISpecModels>;
 
     /**
      * A signal emitted when the running sessions change.
      */
-    runningChanged: ISignal<IManager, IModel[]>;
+    runningChanged: ISignal<this, IModel[]>;
 
     /**
      * The server settings for the manager.